diff --git a/.github/workflows/ios-testflight.yml b/.github/workflows/ios-testflight.yml
index 386867873c..7ec27bd2a8 100644
--- a/.github/workflows/ios-testflight.yml
+++ b/.github/workflows/ios-testflight.yml
@@ -74,6 +74,23 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
         run: |
           set -euo pipefail
+          xcode_path="$(python3 - <<'PY'
+          import glob
+          import re
+
+          candidates = []
+          for path in glob.glob("/Applications/Xcode_26*.app"):
+              match = re.search(r"Xcode_(26(?:\.\d+)*)", path)
+              if match:
+                  version = tuple(int(part) for part in match.group(1).split("."))
+                  candidates.append((version, path))
+          if not candidates:
+              raise SystemExit("Xcode 26 is not installed on this runner")
+          print(max(candidates)[1])
+          PY
+          )"
+          export DEVELOPER_DIR="$xcode_path/Contents/Developer"
+          echo "DEVELOPER_DIR=$DEVELOPER_DIR" >> "$GITHUB_ENV"
           node scripts/ios-release/readiness.mjs config > "$RUNNER_TEMP/ios-release-config.json"
           xcodebuild -version
           major=$(xcodebuild -version | awk '/Xcode/{split($2,v,".");print v[1]}')
@@ -87,6 +104,8 @@ jobs:
           command -v xcodegen >/dev/null || brew install xcodegen
 
       - name: Run mobile regression checks
+        env:
+          NODE_OPTIONS: --max-old-space-size=6144
         run: |
           pnpm exec tsc --noEmit
           pnpm test src/modules/MobileRemote
@@ -95,14 +114,160 @@ jobs:
           pnpm build:mobile-native
           cargo check --locked --manifest-path apps/remote-ios/src-tauri/Cargo.toml --target aarch64-apple-ios
 
-      - name: Build signed release with bundled frontend
+      - name: Install isolated iOS signing materials
         env:
           IOS_CERTIFICATE: ${{ secrets.IOS_CERTIFICATE }}
           IOS_CERTIFICATE_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
           IOS_MOBILE_PROVISION: ${{ secrets.IOS_MOBILE_PROVISION }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        run: |
+          set +x
+          set -euo pipefail
+          umask 077
+
+          certificate_path="$RUNNER_TEMP/ios-distribution.p12"
+          profile_path="$RUNNER_TEMP/ios-app-store.mobileprovision"
+          profile_plist="$RUNNER_TEMP/ios-app-store.plist"
+          keychain_path="$RUNNER_TEMP/ios-signing.keychain-db"
+          keychain_password="$(uuidgen)$(uuidgen)"
+          echo "::add-mask::$keychain_password"
+          {
+            echo "IOS_KEYCHAIN_PATH=$keychain_path"
+            echo "IOS_KEYCHAIN_PASSWORD=$keychain_password"
+          } >> "$GITHUB_ENV"
+
+          CERTIFICATE_PATH="$certificate_path" PROFILE_PATH="$profile_path" python3 - <<'PY'
+          import base64
+          import os
+          from pathlib import Path
+
+          for source, target in (
+              ("IOS_CERTIFICATE", "CERTIFICATE_PATH"),
+              ("IOS_MOBILE_PROVISION", "PROFILE_PATH"),
+          ):
+              try:
+                  encoded = "".join(os.environ[source].split())
+                  decoded = base64.b64decode(encoded, validate=True)
+              except Exception as error:
+                  raise SystemExit(f"Invalid base64 signing material: {source}") from error
+              if not decoded:
+                  raise SystemExit(f"Empty decoded signing material: {source}")
+              Path(os.environ[target]).write_bytes(decoded)
+          PY
+
+          security create-keychain -p "$keychain_password" "$keychain_path"
+          security set-keychain-settings -lut 3600 "$keychain_path"
+          security unlock-keychain -p "$keychain_password" "$keychain_path"
+          security import "$certificate_path" \
+            -k "$keychain_path" \
+            -P "$IOS_CERTIFICATE_PASSWORD" \
+            -f pkcs12 \
+            -t cert \
+            -T /usr/bin/codesign \
+            -T /usr/bin/security >/dev/null
+          security set-key-partition-list \
+            -S apple-tool:,apple:,codesign: \
+            -s \
+            -k "$keychain_password" \
+            "$keychain_path" >/dev/null
+          security list-keychains -d user -s "$keychain_path"
+          IOS_KEYCHAIN_PATH="$keychain_path" IOS_SIGNING_IDENTITY_FILE="$RUNNER_TEMP/ios-signing-identity" python3 - <<'PY'
+          import os
+          import re
+          import subprocess
+          from pathlib import Path
+
+          output = subprocess.check_output(
+              ["security", "find-identity", "-v", "-p", "codesigning", os.environ["IOS_KEYCHAIN_PATH"]],
+              text=True,
+          )
+          identities = re.findall(
+              r'^\s*\d+\)\s+[A-Fa-f0-9]+\s+"((?:Apple|iPhone) Distribution: [^"]+)"\s*$',
+              output,
+              re.MULTILINE,
+          )
+          if len(identities) != 1:
+              raise SystemExit("Expected exactly one Apple Distribution signing identity")
+          Path(os.environ["IOS_SIGNING_IDENTITY_FILE"]).write_text(identities[0], encoding="utf-8")
+          PY
+
+          security cms -D -i "$profile_path" > "$profile_plist"
+          PROFILE_PLIST="$profile_plist" PROFILE_UUID_FILE="$RUNNER_TEMP/ios-profile-uuid" python3 - <<'PY'
+          import os
+          import plistlib
+          import re
+          from datetime import datetime, timezone
+          from pathlib import Path
+
+          with open(os.environ["PROFILE_PLIST"], "rb") as source:
+              profile = plistlib.load(source)
+          team = os.environ["APPLE_TEAM_ID"]
+          bundle_id = "org2ai.org2.remote"
+          entitlements = profile.get("Entitlements", {})
+          app_id = entitlements.get("application-identifier", "")
+          prefix, separator, profile_bundle_id = app_id.partition(".")
+
+          if team not in profile.get("TeamIdentifier", []):
+              raise SystemExit("Provisioning profile Team ID mismatch")
+          if not separator or prefix not in profile.get("ApplicationIdentifierPrefix", []):
+              raise SystemExit("Provisioning profile application prefix mismatch")
+          if profile_bundle_id != bundle_id:
+              raise SystemExit("Provisioning profile bundle ID mismatch")
+          if profile.get("ProvisionedDevices") is not None or profile.get("ProvisionsAllDevices") is True:
+              raise SystemExit("Expected an App Store Connect provisioning profile")
+          if entitlements.get("get-task-allow") is not False:
+              raise SystemExit("Provisioning profile allows debugging")
+          if entitlements.get("beta-reports-active") is not True:
+              raise SystemExit("Provisioning profile is not for App Store distribution")
+          expiration = profile.get("ExpirationDate")
+          if not isinstance(expiration, datetime):
+              raise SystemExit("Provisioning profile expiration is missing")
+          if expiration.replace(tzinfo=expiration.tzinfo or timezone.utc) <= datetime.now(timezone.utc):
+              raise SystemExit("Provisioning profile has expired")
+
+          uuid = profile.get("UUID", "")
+          if not re.fullmatch(r"[A-Fa-f0-9-]{36}", uuid):
+              raise SystemExit("Provisioning profile UUID is invalid")
+          Path(os.environ["PROFILE_UUID_FILE"]).write_text(uuid, encoding="utf-8")
+          PY
+
+          profile_uuid="$(cat "$RUNNER_TEMP/ios-profile-uuid")"
+          profiles_dir="$HOME/Library/MobileDevice/Provisioning Profiles"
+          xcode_profiles_dir="$HOME/Library/Developer/Xcode/UserData/Provisioning Profiles"
+          installed_profile="$profiles_dir/$profile_uuid.mobileprovision"
+          installed_xcode_profile="$xcode_profiles_dir/$profile_uuid.mobileprovision"
+          mkdir -p "$profiles_dir" "$xcode_profiles_dir"
+          cp "$profile_path" "$installed_profile"
+          cp "$profile_path" "$installed_xcode_profile"
+
+          xcode_project="$GITHUB_WORKSPACE/apps/remote-ios/src-tauri/gen/apple/org2-remote.xcodeproj/project.pbxproj"
+          export_options="$GITHUB_WORKSPACE/apps/remote-ios/src-tauri/gen/apple/ExportOptions.plist"
+          signing_xcconfig="$RUNNER_TEMP/ios-signing.xcconfig"
+          cp "$xcode_project" "$RUNNER_TEMP/ios-project.pbxproj.backup"
+          cp "$export_options" "$RUNNER_TEMP/ios-export-options.plist.backup"
+          IOS_XCODE_PROJECT_FILE="$xcode_project" \
+          IOS_EXPORT_OPTIONS_FILE="$export_options" \
+          IOS_SIGNING_XCCONFIG="$signing_xcconfig" \
+          IOS_SIGNING_IDENTITY_FILE="$RUNNER_TEMP/ios-signing-identity" \
+          IOS_PROFILE_UUID_FILE="$RUNNER_TEMP/ios-profile-uuid" \
+          node scripts/ios-release/manual-signing.mjs
+          plutil -lint "$export_options"
+
+          {
+            echo "IOS_INSTALLED_PROFILE=$installed_profile"
+            echo "IOS_INSTALLED_XCODE_PROFILE=$installed_xcode_profile"
+            echo "IOS_XCODE_PROJECT_FILE=$xcode_project"
+            echo "IOS_EXPORT_OPTIONS_FILE=$export_options"
+            echo "XCODE_XCCONFIG_FILE=$signing_xcconfig"
+          } >> "$GITHUB_ENV"
+
+      - name: Build signed release with bundled frontend
+        env:
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_DEVELOPMENT_TEAM: ${{ secrets.APPLE_TEAM_ID }}
         run: |
           set -euo pipefail
+          security unlock-keychain -p "$IOS_KEYCHAIN_PASSWORD" "$IOS_KEYCHAIN_PATH"
           pnpm tauri:ios:build --ci --export-method app-store-connect --config "$RUNNER_TEMP/ios-release-config.json"
 
       - name: Validate the exported IPA, not just source configuration
@@ -146,3 +311,23 @@ jobs:
           xcrun altool --validate-app -f "$ipa" --type ios --apiKey "$ASC_KEY_ID" --apiIssuer "$ASC_ISSUER_ID"
           xcrun altool --upload-app -f "$ipa" --type ios --apiKey "$ASC_KEY_ID" --apiIssuer "$ASC_ISSUER_ID"
           echo 'Upload accepted. Processing, export-compliance questions, tester access and review are separate App Store Connect steps.' >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Remove iOS signing materials
+        if: always()
+        run: |
+          set +x
+          set +e
+          [[ -z "${IOS_INSTALLED_PROFILE:-}" ]] || rm -f "$IOS_INSTALLED_PROFILE"
+          [[ -z "${IOS_INSTALLED_XCODE_PROFILE:-}" ]] || rm -f "$IOS_INSTALLED_XCODE_PROFILE"
+          [[ -z "${IOS_KEYCHAIN_PATH:-}" ]] || security delete-keychain "$IOS_KEYCHAIN_PATH"
+          [[ -z "${IOS_XCODE_PROJECT_FILE:-}" || ! -f "$RUNNER_TEMP/ios-project.pbxproj.backup" ]] || cp "$RUNNER_TEMP/ios-project.pbxproj.backup" "$IOS_XCODE_PROJECT_FILE"
+          [[ -z "${IOS_EXPORT_OPTIONS_FILE:-}" || ! -f "$RUNNER_TEMP/ios-export-options.plist.backup" ]] || cp "$RUNNER_TEMP/ios-export-options.plist.backup" "$IOS_EXPORT_OPTIONS_FILE"
+          rm -f \
+            "$RUNNER_TEMP/ios-distribution.p12" \
+            "$RUNNER_TEMP/ios-app-store.mobileprovision" \
+            "$RUNNER_TEMP/ios-app-store.plist" \
+            "$RUNNER_TEMP/ios-profile-uuid" \
+            "$RUNNER_TEMP/ios-signing-identity" \
+            "$RUNNER_TEMP/ios-signing.xcconfig" \
+            "$RUNNER_TEMP/ios-project.pbxproj.backup" \
+            "$RUNNER_TEMP/ios-export-options.plist.backup"
diff --git a/apps/remote-ios/src-tauri/.gitignore b/apps/remote-ios/src-tauri/.gitignore
index 6993591f6b..a0736c032b 100644
--- a/apps/remote-ios/src-tauri/.gitignore
+++ b/apps/remote-ios/src-tauri/.gitignore
@@ -1,3 +1,4 @@
 # Generated by Cargo and Tauri tooling
 /target/
 /gen/schemas/
+/plugins/*/.tauri/
diff --git a/apps/remote-ios/src-tauri/Cargo.lock b/apps/remote-ios/src-tauri/Cargo.lock
index e5951caeae..ff12cb4cc4 100644
--- a/apps/remote-ios/src-tauri/Cargo.lock
+++ b/apps/remote-ios/src-tauri/Cargo.lock
@@ -504,12 +504,6 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "cookie"
 version = "0.18.2"
@@ -609,23 +603,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "cssparser"
-version = "0.29.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "matches",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
- "smallvec",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "cssparser"
 version = "0.36.0"
@@ -635,7 +612,7 @@ dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa",
- "phf 0.13.1",
+ "phf",
  "smallvec",
 ]
 
@@ -699,6 +676,17 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "dbus"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "defmt"
 version = "1.1.1"
@@ -739,19 +727,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "derive_more"
-version = "0.99.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "derive_more"
 version = "2.1.1"
@@ -866,12 +841,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89"
 dependencies = [
  "bit-set",
- "cssparser 0.36.0",
+ "cssparser",
  "foldhash",
- "html5ever 0.38.0",
+ "html5ever",
  "precomputed-hash",
- "selectors 0.36.1",
- "tendril 0.5.1",
+ "selectors",
+ "tendril",
 ]
 
 [[package]]
@@ -1109,16 +1084,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.34"
@@ -1203,15 +1168,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "gdk"
 version = "0.18.2"
@@ -1321,17 +1277,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -1340,7 +1285,7 @@ checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
@@ -1556,18 +1501,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "html5ever"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.14.1",
- "match_token",
-]
-
 [[package]]
 name = "html5ever"
 version = "0.38.0"
@@ -1575,7 +1508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
 dependencies = [
  "log",
- "markup5ever 0.38.0",
+ "markup5ever",
 ]
 
 [[package]]
@@ -1691,7 +1624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
 dependencies = [
  "byteorder",
- "png",
+ "png 0.17.16",
 ]
 
 [[package]]
@@ -2031,18 +1964,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "kuchikiki"
-version = "0.8.8-speedreader"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
-dependencies = [
- "cssparser 0.29.6",
- "html5ever 0.29.1",
- "indexmap 2.14.1",
- "selectors 0.24.0",
-]
-
 [[package]]
 name = "libappindicator"
 version = "0.9.0"
@@ -2073,6 +1994,15 @@ version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -2119,26 +2049,6 @@ version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "markup5ever"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18"
-dependencies = [
- "log",
- "phf 0.11.3",
- "phf_codegen 0.11.3",
- "string_cache 0.8.9",
- "string_cache_codegen 0.5.4",
- "tendril 0.4.3",
-]
-
 [[package]]
 name = "markup5ever"
 version = "0.38.0"
@@ -2146,27 +2056,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
 dependencies = [
  "log",
- "tendril 0.5.1",
+ "tendril",
  "web_atoms",
 ]
 
-[[package]]
-name = "match_token"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "memchr"
 version = "2.8.3"
@@ -2215,15 +2108,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "muda"
-version = "0.17.2"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9fec5a4e89860383d778d10563a605838f8f0b2f9303868937e5ff32e86177"
+checksum = "1dd04e60bc0b07438a6771710ee1698f98f6ebbc7f89b61264af1563b8aeb878"
 dependencies = [
  "crossbeam-channel",
  "dpi",
@@ -2234,10 +2127,10 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.18.1",
  "serde",
  "thiserror 2.0.20",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2255,12 +2148,6 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
 [[package]]
 name = "ndk-sys"
 version = "0.6.0+11769913"
@@ -2276,12 +2163,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "num-conv"
 version = "0.2.2"
@@ -2342,6 +2223,27 @@ dependencies = [
  "objc2-foundation",
 ]
 
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-core-foundation"
 version = "0.3.2"
@@ -2366,6 +2268,38 @@ dependencies = [
  "objc2-io-surface",
 ]
 
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.1.0"
@@ -2423,8 +2357,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.13.1",
+ "block2",
  "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
  "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -2496,6 +2449,7 @@ dependencies = [
  "tauri-build",
  "tauri-plugin-deep-link",
  "tauri-plugin-opener",
+ "tauri-plugin-speech",
 ]
 
 [[package]]
@@ -2558,104 +2512,25 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_shared 0.11.3",
-]
-
 [[package]]
 name = "phf"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_macros 0.13.1",
- "phf_shared 0.13.1",
+ "phf_macros",
+ "phf_shared",
  "serde",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.8",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared 0.11.3",
- "rand 0.8.8",
+ "phf_generator",
+ "phf_shared",
 ]
 
 [[package]]
@@ -2665,21 +2540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared 0.13.1",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "phf_shared",
 ]
 
 [[package]]
@@ -2688,47 +2549,20 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher 0.3.11",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher 0.3.11",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher 1.0.3",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 dependencies = [
- "siphasher 1.0.3",
+ "siphasher",
 ]
 
 [[package]]
@@ -2780,6 +2614,19 @@ dependencies = [
  "miniz_oxide 0.8.9",
 ]
 
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.13.1",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide 0.8.9",
+]
+
 [[package]]
 name = "polling"
 version = "3.11.0"
@@ -2824,15 +2671,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -2892,12 +2730,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -2937,87 +2769,6 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.17",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -3260,24 +3011,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "selectors"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
-dependencies = [
- "bitflags 1.3.2",
- "cssparser 0.29.6",
- "derive_more 0.99.20",
- "fxhash",
- "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
- "precomputed-hash",
- "servo_arc 0.2.0",
- "smallvec",
-]
-
 [[package]]
 name = "selectors"
 version = "0.36.1"
@@ -3285,15 +3018,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
 dependencies = [
  "bitflags 2.13.1",
- "cssparser 0.36.0",
- "derive_more 2.1.1",
+ "cssparser",
+ "derive_more",
  "log",
  "new_debug_unreachable",
- "phf 0.13.1",
- "phf_codegen 0.13.1",
+ "phf",
+ "phf_codegen",
  "precomputed-hash",
  "rustc-hash",
- "servo_arc 0.4.3",
+ "servo_arc",
  "smallvec",
 ]
 
@@ -3457,16 +3190,6 @@ dependencies = [
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "servo_arc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "servo_arc"
 version = "0.4.3"
@@ -3509,12 +3232,6 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
 
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
 [[package]]
 name = "siphasher"
 version = "1.0.3"
@@ -3597,19 +3314,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
-[[package]]
-name = "string_cache"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
-dependencies = [
- "new_debug_unreachable",
- "parking_lot",
- "phf_shared 0.11.3",
- "precomputed-hash",
- "serde",
-]
-
 [[package]]
 name = "string_cache"
 version = "0.9.0"
@@ -3618,30 +3322,18 @@ checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
 dependencies = [
  "new_debug_unreachable",
  "parking_lot",
- "phf_shared 0.13.1",
+ "phf_shared",
  "precomputed-hash",
 ]
 
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "string_cache_codegen"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
 dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
 ]
@@ -3670,7 +3362,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote",
  "unicode-ident",
 ]
 
@@ -3731,15 +3422,16 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.34.8"
+version = "0.35.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9103edf55f2da3c82aea4c7fab7c4241032bfeea0e71fa557d98e00e7ce7cc20"
+checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
 dependencies = [
  "bitflags 2.13.1",
  "block2",
  "core-foundation",
  "core-graphics",
  "crossbeam-channel",
+ "dbus",
  "dispatch2",
  "dlopen2",
  "dpi",
@@ -3750,13 +3442,14 @@ dependencies = [
  "libc",
  "log",
  "ndk",
- "ndk-context",
  "ndk-sys",
  "objc2",
  "objc2-app-kit",
  "objc2-foundation",
+ "objc2-ui-kit",
  "once_cell",
  "parking_lot",
+ "percent-encoding",
  "raw-window-handle",
  "tao-macros",
  "unicode-segmentation",
@@ -3786,9 +3479,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.10.3"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da77cc00fb9028caf5b5d4650f75e31f1ef3693459dfca7f7e506d1ecef0ba2d"
+checksum = "b93bd86d231f0a8138f11a02a584769fe4b703dc36ae133d783228dbc4801405"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3867,7 +3560,7 @@ dependencies = [
  "ico",
  "json-patch",
  "plist",
- "png",
+ "png 0.17.16",
  "proc-macro2",
  "quote",
  "semver",
@@ -3956,11 +3649,21 @@ dependencies = [
  "zbus",
 ]
 
+[[package]]
+name = "tauri-plugin-speech"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.20",
+]
+
 [[package]]
 name = "tauri-runtime"
-version = "2.10.1"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2826d79a3297ed08cd6ea7f412644ef58e32969504bc4fbd8d7dbeabc4445ea2"
+checksum = "b0b4bc95aed361b0019067d189a1174a603d460d0f6c72606512d59fc9c12ec8"
 dependencies = [
  "cookie",
  "dpi",
@@ -3983,9 +3686,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.10.1"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e11ea2e6f801d275fdd890d6c9603736012742a1c33b96d0db788c9cdebf7f9e"
+checksum = "4e6fac707727b7a2f48e4ded90976324267371073edbb415ffb73bb0458d203f"
 dependencies = [
  "gtk",
  "http",
@@ -4020,14 +3723,12 @@ dependencies = [
  "dom_query",
  "dunce",
  "glob",
- "html5ever 0.29.1",
  "http",
  "infer",
  "json-patch",
- "kuchikiki",
  "log",
  "memchr",
- "phf 0.13.1",
+ "phf",
  "plist",
  "proc-macro2",
  "quote",
@@ -4071,17 +3772,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
 [[package]]
 name = "tendril"
 version = "0.5.1"
@@ -4420,9 +4110,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.21.3"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
+checksum = "15edbb0d80583e85ee8df283410038e17314df5cba30da2087a54a85216c0773"
 dependencies = [
  "crossbeam-channel",
  "dirs",
@@ -4434,10 +4124,10 @@ dependencies = [
  "objc2-core-graphics",
  "objc2-foundation",
  "once_cell",
- "png",
+ "png 0.18.1",
  "serde",
  "thiserror 2.0.20",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4547,12 +4237,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4622,12 +4306,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -4727,10 +4405,10 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba8b815c1b593dc0baf78dd0f4fc8fdb2de53198fb1163738093e9a311c33fb3"
 dependencies = [
- "phf 0.13.1",
- "phf_codegen 0.13.1",
- "string_cache 0.9.0",
- "string_cache_codegen 0.6.1",
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
 ]
 
 [[package]]
@@ -5027,15 +4705,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -5069,30 +4738,13 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link 0.2.1",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
-]
-
 [[package]]
 name = "windows-threading"
 version = "0.1.0"
@@ -5123,12 +4775,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -5141,12 +4787,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -5159,24 +4799,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -5189,12 +4817,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -5207,12 +4829,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -5225,12 +4841,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -5243,12 +4853,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winnow"
 version = "0.5.40"
@@ -5297,9 +4901,9 @@ checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
 
 [[package]]
 name = "wry"
-version = "0.54.4"
+version = "0.55.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a8135d8676225e5744de000d4dff5a082501bf7db6a1c1495034f8c314edbc"
+checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"
 dependencies = [
  "base64 0.22.1",
  "block2",
@@ -5453,26 +5057,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "zerocopy"
-version = "0.8.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "zerofrom"
 version = "0.1.8"
diff --git a/apps/remote-ios/src-tauri/Cargo.toml b/apps/remote-ios/src-tauri/Cargo.toml
index 4a679467c1..e6be444f77 100644
--- a/apps/remote-ios/src-tauri/Cargo.toml
+++ b/apps/remote-ios/src-tauri/Cargo.toml
@@ -16,9 +16,10 @@ tauri-build = { version = "2.5.6", features = [] }
 
 [dependencies]
 serde_json = "1"
-tauri = { version = "=2.10.3", features = [] }
+tauri = { version = "=2.11.1", features = [] }
 tauri-plugin-deep-link = "2"
 tauri-plugin-opener = "2"
+tauri-plugin-speech = { path = "plugins/speech" }
 
 [target.'cfg(target_vendor = "apple")'.dependencies]
 security-framework = "3.7.0"
diff --git a/apps/remote-ios/src-tauri/Info.ios.plist b/apps/remote-ios/src-tauri/Info.ios.plist
index ea6a12bc16..ab9bed7222 100644
--- a/apps/remote-ios/src-tauri/Info.ios.plist
+++ b/apps/remote-ios/src-tauri/Info.ios.plist
@@ -4,6 +4,12 @@
 <dict>
   <key>NSCameraUsageDescription</key>
   <string>扫描电脑上的配对二维码以连接 ORG2 Remote / Scan your desktop pairing QR code to connect ORG2 Remote</string>
+  <key>NSMicrophoneUsageDescription</key>
+  <string>使用麦克风将语音转成消息文字 / Use the microphone to turn speech into message text</string>
+  <key>NSSpeechRecognitionUsageDescription</key>
+  <string>将语音识别为消息文字 / Recognize speech as message text</string>
+  <key>ITSAppUsesNonExemptEncryption</key>
+  <false/>
   <key>CFBundleURLTypes</key>
   <array>
     <dict>
diff --git a/apps/remote-ios/src-tauri/capabilities/mobile.json b/apps/remote-ios/src-tauri/capabilities/mobile.json
index c4c7de9373..4f435718ec 100644
--- a/apps/remote-ios/src-tauri/capabilities/mobile.json
+++ b/apps/remote-ios/src-tauri/capabilities/mobile.json
@@ -8,6 +8,7 @@
     "core:default",
     "core:event:default",
     "deep-link:default",
+    "speech:default",
     {
       "identifier": "opener:allow-open-url",
       "allow": [
diff --git a/apps/remote-ios/src-tauri/gen/apple/org2-remote.xcodeproj/project.pbxproj b/apps/remote-ios/src-tauri/gen/apple/org2-remote.xcodeproj/project.pbxproj
index 04ed3de8b7..ad1f1a055f 100644
--- a/apps/remote-ios/src-tauri/gen/apple/org2-remote.xcodeproj/project.pbxproj
+++ b/apps/remote-ios/src-tauri/gen/apple/org2-remote.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 		652A1C1A2C4650C0DBB0D107 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA94EAB943C480C6D901740E /* WebKit.framework */; };
 		848449A8A26D5ABCBB9D3D44 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 09999C01BEF32C9D12B9594C /* main.mm */; };
 		A9FBA82AAABB47D494C53BBC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1386F1869ECC7C9F605BB80 /* UIKit.framework */; };
+		E06BB14DC03A735D21DDB446 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 5659F41309F2BBE4AB265FEA /* PrivacyInfo.xcprivacy */; };
 		FD65BF213E21D25393C10432 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 09BEDDA01D3B6AF50AB4C557 /* Assets.xcassets */; };
 /* End PBXBuildFile section */
 
@@ -26,6 +27,7 @@
 		09999C01BEF32C9D12B9594C /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		09BEDDA01D3B6AF50AB4C557 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		4E8C456B445C726BEF9E9257 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
+		5659F41309F2BBE4AB265FEA /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		582265530F2F2E7B757D7C0E /* org2-remote_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "org2-remote_iOS.entitlements"; sourceTree = "<group>"; };
 		680653A546C7ECEDBC792278 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		796E95FE899E78FC89082DC8 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
@@ -66,6 +68,7 @@
 			children = (
 				E49FDFC669F6670256C4A142 /* Info.plist */,
 				582265530F2F2E7B757D7C0E /* org2-remote_iOS.entitlements */,
+				5659F41309F2BBE4AB265FEA /* PrivacyInfo.xcprivacy */,
 			);
 			path = "org2-remote_iOS";
 			sourceTree = "<group>";
@@ -210,6 +213,7 @@
 			files = (
 				FD65BF213E21D25393C10432 /* Assets.xcassets in Resources */,
 				52049DEC689E516DA7E7B1D6 /* LaunchScreen.storyboard in Resources */,
+				E06BB14DC03A735D21DDB446 /* PrivacyInfo.xcprivacy in Resources */,
 				0E9EE0CB965D103591BBD989 /* assets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/Info.plist b/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/Info.plist
index 10884ad5c3..40a18dcf0f 100644
--- a/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/Info.plist
+++ b/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/Info.plist
@@ -2,8 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>NSCameraUsageDescription</key>
-  <string>扫描电脑上的配对二维码以连接 ORG2 Remote / Scan your desktop pairing QR code to connect ORG2 Remote</string>
+	<key>NSCameraUsageDescription</key>
+	<string>扫描电脑上的配对二维码以连接 ORG2 Remote / Scan your desktop pairing QR code to connect ORG2 Remote</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>使用麦克风将语音转成消息文字 / Use the microphone to turn speech into message text</string>
+	<key>NSSpeechRecognitionUsageDescription</key>
+	<string>将语音识别为消息文字 / Recognize speech as message text</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
diff --git a/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/PrivacyInfo.xcprivacy b/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000000..bfae8b7ba9
--- /dev/null
+++ b/apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/PrivacyInfo.xcprivacy
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeName</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeEmailAddress</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeUserID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeDeviceID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeProductInteraction</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeOtherUserContent</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePhotosorVideos</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/apps/remote-ios/src-tauri/plugins/speech/Cargo.toml b/apps/remote-ios/src-tauri/plugins/speech/Cargo.toml
new file mode 100644
index 0000000000..d4e235eda9
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "tauri-plugin-speech"
+version = "0.1.0"
+edition = "2021"
+rust-version = "1.85.0"
+links = "tauri-plugin-speech"
+
+[lib]
+name = "tauri_plugin_speech"
+path = "src/lib.rs"
+
+[dependencies]
+serde = { version = "1", features = ["derive"] }
+tauri = { version = "=2.11.1", features = [] }
+thiserror = "2"
+
+[build-dependencies]
+tauri-plugin = { version = "2", features = ["build"] }
diff --git a/apps/remote-ios/src-tauri/plugins/speech/build.rs b/apps/remote-ios/src-tauri/plugins/speech/build.rs
new file mode 100644
index 0000000000..0889d08a3f
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/build.rs
@@ -0,0 +1,5 @@
+const COMMANDS: &[&str] = &["is_supported", "start", "stop", "cancel"];
+
+fn main() {
+    tauri_plugin::Builder::new(COMMANDS).ios_path("ios").build();
+}
diff --git a/apps/remote-ios/src-tauri/plugins/speech/ios/Package.resolved b/apps/remote-ios/src-tauri/plugins/speech/ios/Package.resolved
new file mode 100644
index 0000000000..e32718c299
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/ios/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-rs",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Brendonovich/swift-rs",
+      "state" : {
+        "revision" : "f64a4514de07f450ec5b6aa297624cd3479d9579",
+        "version" : "1.0.7"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/apps/remote-ios/src-tauri/plugins/speech/ios/Package.swift b/apps/remote-ios/src-tauri/plugins/speech/ios/Package.swift
new file mode 100644
index 0000000000..9207bce90a
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/ios/Package.swift
@@ -0,0 +1,24 @@
+// swift-tools-version:5.9
+import PackageDescription
+
+let package = Package(
+    name: "tauri-plugin-speech",
+    platforms: [.iOS(.v17)],
+    products: [
+        .library(
+            name: "tauri-plugin-speech",
+            type: .static,
+            targets: ["tauri-plugin-speech"]
+        )
+    ],
+    dependencies: [
+        .package(name: "Tauri", path: "../.tauri/tauri-api")
+    ],
+    targets: [
+        .target(
+            name: "tauri-plugin-speech",
+            dependencies: [.byName(name: "Tauri")],
+            path: "Sources"
+        )
+    ]
+)
diff --git a/apps/remote-ios/src-tauri/plugins/speech/ios/Sources/SpeechPlugin.swift b/apps/remote-ios/src-tauri/plugins/speech/ios/Sources/SpeechPlugin.swift
new file mode 100644
index 0000000000..b4156e32f8
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/ios/Sources/SpeechPlugin.swift
@@ -0,0 +1,370 @@
+import AVFoundation
+import Speech
+import SwiftRs
+import Tauri
+import UIKit
+
+private struct StartArgs: Decodable {
+    let lang: String?
+    let sessionId: String
+}
+
+private struct SessionArgs: Decodable {
+    let sessionId: String
+}
+
+private struct SupportResponse: Encodable {
+    let supported: Bool
+}
+
+private struct SpeechEvent: Encodable {
+    let sessionId: String
+    let kind: String
+    let transcript: String?
+    let code: String?
+    let message: String?
+}
+
+final class SpeechPlugin: Plugin {
+    private let audioEngine = AVAudioEngine()
+    private var recognitionRequest: SFSpeechAudioBufferRecognitionRequest?
+    private var recognitionTask: SFSpeechRecognitionTask?
+    private var activeSessionId: String?
+    private var pendingSessionId: String?
+    private var latestTranscript = ""
+    private var finishing = false
+    private var tapInstalled = false
+    private var deadline: DispatchWorkItem?
+    private var backgroundObserver: NSObjectProtocol?
+
+    override init() {
+        super.init()
+        backgroundObserver = NotificationCenter.default.addObserver(
+            forName: UIApplication.didEnterBackgroundNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            self?.pendingSessionId = nil
+            self?.finishSession(kind: "cancelled", cancelTask: true)
+        }
+    }
+
+    deinit {
+        if let backgroundObserver {
+            NotificationCenter.default.removeObserver(backgroundObserver)
+        }
+        deadline?.cancel()
+        cleanupResources(cancelTask: true)
+    }
+
+    @objc func isSupported(_ invoke: Invoke) {
+        invoke.resolve(SupportResponse(supported: SFSpeechRecognizer() != nil))
+    }
+
+    @objc func start(_ invoke: Invoke) throws {
+        let args = try invoke.parseArgs(StartArgs.self)
+        DispatchQueue.main.async { [weak self] in
+            self?.requestPermissionsAndStart(args: args, invoke: invoke)
+        }
+    }
+
+    @objc func stop(_ invoke: Invoke) throws {
+        let args = try invoke.parseArgs(SessionArgs.self)
+        DispatchQueue.main.async { [weak self] in
+            guard let self, self.activeSessionId == args.sessionId else {
+                invoke.resolve()
+                return
+            }
+            self.finishing = true
+            self.stopAudioCapture()
+            self.recognitionRequest?.endAudio()
+            invoke.resolve()
+        }
+    }
+
+    @objc func cancel(_ invoke: Invoke) throws {
+        let args = try invoke.parseArgs(SessionArgs.self)
+        DispatchQueue.main.async { [weak self] in
+            guard let self else {
+                invoke.resolve()
+                return
+            }
+            if self.pendingSessionId == args.sessionId {
+                self.pendingSessionId = nil
+                invoke.resolve()
+                return
+            }
+            guard self.activeSessionId == args.sessionId else {
+                invoke.resolve()
+                return
+            }
+            self.finishSession(kind: "cancelled", cancelTask: true)
+            invoke.resolve()
+        }
+    }
+
+    private func requestPermissionsAndStart(args: StartArgs, invoke: Invoke) {
+        guard activeSessionId == nil, pendingSessionId == nil else {
+            invoke.reject("Speech recognition is already active", code: "busy")
+            return
+        }
+        pendingSessionId = args.sessionId
+
+        requestSpeechPermission { [weak self] speechGranted in
+            guard let self else { return }
+            guard self.pendingSessionId == args.sessionId else {
+                invoke.reject("Speech recognition was cancelled", code: "cancelled")
+                return
+            }
+            guard speechGranted else {
+                self.pendingSessionId = nil
+                invoke.reject("Speech recognition permission denied", code: "permission-denied")
+                return
+            }
+            self.requestMicrophonePermission { [weak self] microphoneGranted in
+                guard let self else { return }
+                guard self.pendingSessionId == args.sessionId else {
+                    invoke.reject("Speech recognition was cancelled", code: "cancelled")
+                    return
+                }
+                guard microphoneGranted else {
+                    self.pendingSessionId = nil
+                    invoke.reject("Microphone permission denied", code: "permission-denied")
+                    return
+                }
+                self.pendingSessionId = nil
+                self.beginRecognition(args: args, invoke: invoke)
+            }
+        }
+    }
+
+    private func requestSpeechPermission(completion: @escaping (Bool) -> Void) {
+        switch SFSpeechRecognizer.authorizationStatus() {
+        case .authorized:
+            completion(true)
+        case .notDetermined:
+            SFSpeechRecognizer.requestAuthorization { status in
+                DispatchQueue.main.async { completion(status == .authorized) }
+            }
+        case .denied, .restricted:
+            completion(false)
+        @unknown default:
+            completion(false)
+        }
+    }
+
+    private func requestMicrophonePermission(completion: @escaping (Bool) -> Void) {
+        if #available(iOS 17.0, *) {
+            switch AVAudioApplication.shared.recordPermission {
+            case .granted:
+                completion(true)
+            case .undetermined:
+                AVAudioApplication.requestRecordPermission { granted in
+                    DispatchQueue.main.async { completion(granted) }
+                }
+            case .denied:
+                completion(false)
+            @unknown default:
+                completion(false)
+            }
+            return
+        }
+
+        switch AVAudioSession.sharedInstance().recordPermission {
+        case .granted:
+            completion(true)
+        case .undetermined:
+            AVAudioSession.sharedInstance().requestRecordPermission { granted in
+                DispatchQueue.main.async { completion(granted) }
+            }
+        case .denied:
+            completion(false)
+        @unknown default:
+            completion(false)
+        }
+    }
+
+    private func beginRecognition(args: StartArgs, invoke: Invoke) {
+        let locale = args.lang.map(Locale.init(identifier:)) ?? Locale.current
+        guard let recognizer = SFSpeechRecognizer(locale: locale), recognizer.isAvailable else {
+            invoke.reject("Speech recognition is unavailable", code: "unsupported")
+            return
+        }
+
+        cleanupResources(cancelTask: true)
+        let request = SFSpeechAudioBufferRecognitionRequest()
+        request.shouldReportPartialResults = true
+        recognitionRequest = request
+        activeSessionId = args.sessionId
+        latestTranscript = ""
+        finishing = false
+
+        let inputNode = audioEngine.inputNode
+        let recordingFormat = inputNode.outputFormat(forBus: 0)
+        guard recordingFormat.sampleRate > 0, recordingFormat.channelCount > 0 else {
+            finishSession(
+                kind: "error",
+                code: "audio-capture",
+                message: "No microphone input is available",
+                cancelTask: true
+            )
+            invoke.reject("No microphone input is available", code: "audio-capture")
+            return
+        }
+
+        inputNode.installTap(
+            onBus: 0,
+            bufferSize: 1_024,
+            format: recordingFormat
+        ) { [weak request] buffer, _ in
+            request?.append(buffer)
+        }
+        tapInstalled = true
+
+        do {
+            let session = AVAudioSession.sharedInstance()
+            try session.setCategory(.record, mode: .measurement, options: [.duckOthers])
+            try session.setActive(true, options: .notifyOthersOnDeactivation)
+            audioEngine.prepare()
+            try audioEngine.start()
+        } catch {
+            finishSession(
+                kind: "error",
+                code: "audio-capture",
+                message: error.localizedDescription,
+                cancelTask: true
+            )
+            invoke.reject(error.localizedDescription, code: "audio-capture")
+            return
+        }
+
+        recognitionTask = recognizer.recognitionTask(with: request) { [weak self] result, error in
+            DispatchQueue.main.async {
+                self?.handleRecognitionResult(
+                    result: result,
+                    error: error,
+                    sessionId: args.sessionId
+                )
+            }
+        }
+        let deadline = DispatchWorkItem { [weak self] in
+            guard let self, self.activeSessionId == args.sessionId else { return }
+            self.finishing = true
+            self.stopAudioCapture()
+            self.recognitionRequest?.endAudio()
+        }
+        self.deadline = deadline
+        DispatchQueue.main.asyncAfter(deadline: .now() + 55, execute: deadline)
+        emit(kind: "started", sessionId: args.sessionId)
+        invoke.resolve()
+    }
+
+    private func handleRecognitionResult(
+        result: SFSpeechRecognitionResult?,
+        error: Error?,
+        sessionId: String
+    ) {
+        guard activeSessionId == sessionId else { return }
+
+        if let result {
+            latestTranscript = result.bestTranscription.formattedString
+            emit(
+                kind: result.isFinal ? "final" : "partial",
+                sessionId: sessionId,
+                transcript: latestTranscript
+            )
+            if result.isFinal {
+                finishSession(kind: "ended", transcript: latestTranscript, cancelTask: false)
+                return
+            }
+        }
+
+        if let error {
+            if finishing, !latestTranscript.isEmpty {
+                finishSession(kind: "ended", transcript: latestTranscript, cancelTask: false)
+            } else {
+                let nsError = error as NSError
+                let code = nsError.domain == "kAFAssistantErrorDomain" && nsError.code == 1101
+                    ? "network"
+                    : (latestTranscript.isEmpty ? "no-speech" : "unknown")
+                finishSession(
+                    kind: "error",
+                    transcript: latestTranscript.isEmpty ? nil : latestTranscript,
+                    code: code,
+                    message: error.localizedDescription,
+                    cancelTask: false
+                )
+            }
+        }
+    }
+
+    private func stopAudioCapture() {
+        if audioEngine.isRunning {
+            audioEngine.stop()
+        }
+        if tapInstalled {
+            audioEngine.inputNode.removeTap(onBus: 0)
+            tapInstalled = false
+        }
+    }
+
+    private func cleanupResources(cancelTask: Bool) {
+        deadline?.cancel()
+        deadline = nil
+        stopAudioCapture()
+        if cancelTask {
+            recognitionTask?.cancel()
+        }
+        recognitionTask = nil
+        recognitionRequest = nil
+        try? AVAudioSession.sharedInstance().setActive(
+            false,
+            options: .notifyOthersOnDeactivation
+        )
+    }
+
+    private func finishSession(
+        kind: String,
+        transcript: String? = nil,
+        code: String? = nil,
+        message: String? = nil,
+        cancelTask: Bool
+    ) {
+        guard let sessionId = activeSessionId else { return }
+        activeSessionId = nil
+        finishing = false
+        cleanupResources(cancelTask: cancelTask)
+        emit(
+            kind: kind,
+            sessionId: sessionId,
+            transcript: transcript,
+            code: code,
+            message: message
+        )
+        latestTranscript = ""
+    }
+
+    private func emit(
+        kind: String,
+        sessionId: String,
+        transcript: String? = nil,
+        code: String? = nil,
+        message: String? = nil
+    ) {
+        try? trigger(
+            "speech",
+            data: SpeechEvent(
+                sessionId: sessionId,
+                kind: kind,
+                transcript: transcript,
+                code: code,
+                message: message
+            )
+        )
+    }
+}
+
+@_cdecl("init_plugin_speech")
+func initPlugin() -> Plugin {
+    SpeechPlugin()
+}
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/cancel.toml b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/cancel.toml
new file mode 100644
index 0000000000..91efeaa00e
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/cancel.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-cancel"
+description = "Enables the cancel command without any pre-configured scope."
+commands.allow = ["cancel"]
+
+[[permission]]
+identifier = "deny-cancel"
+description = "Denies the cancel command without any pre-configured scope."
+commands.deny = ["cancel"]
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/is_supported.toml b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/is_supported.toml
new file mode 100644
index 0000000000..caefef3e2b
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/is_supported.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-is-supported"
+description = "Enables the is_supported command without any pre-configured scope."
+commands.allow = ["is_supported"]
+
+[[permission]]
+identifier = "deny-is-supported"
+description = "Denies the is_supported command without any pre-configured scope."
+commands.deny = ["is_supported"]
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/start.toml b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/start.toml
new file mode 100644
index 0000000000..9af51d6097
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/start.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-start"
+description = "Enables the start command without any pre-configured scope."
+commands.allow = ["start"]
+
+[[permission]]
+identifier = "deny-start"
+description = "Denies the start command without any pre-configured scope."
+commands.deny = ["start"]
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/stop.toml b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/stop.toml
new file mode 100644
index 0000000000..6230cb91bb
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/commands/stop.toml
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-stop"
+description = "Enables the stop command without any pre-configured scope."
+commands.allow = ["stop"]
+
+[[permission]]
+identifier = "deny-stop"
+description = "Denies the stop command without any pre-configured scope."
+commands.deny = ["stop"]
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/reference.md b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/reference.md
new file mode 100644
index 0000000000..54ce712aa4
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/autogenerated/reference.md
@@ -0,0 +1,123 @@
+## Default Permission
+
+Allows ORG2 Remote to run iOS speech recognition
+
+#### This default permission set includes the following:
+
+- `allow-is-supported`
+- `allow-start`
+- `allow-stop`
+- `allow-cancel`
+
+## Permission Table
+
+<table>
+<tr>
+<th>Identifier</th>
+<th>Description</th>
+</tr>
+
+<tr>
+<td>
+
+`speech:allow-cancel`
+
+</td>
+<td>
+
+Enables the cancel command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:deny-cancel`
+
+</td>
+<td>
+
+Denies the cancel command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:allow-is-supported`
+
+</td>
+<td>
+
+Enables the is_supported command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:deny-is-supported`
+
+</td>
+<td>
+
+Denies the is_supported command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:allow-start`
+
+</td>
+<td>
+
+Enables the start command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:deny-start`
+
+</td>
+<td>
+
+Denies the start command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:allow-stop`
+
+</td>
+<td>
+
+Enables the stop command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`speech:deny-stop`
+
+</td>
+<td>
+
+Denies the stop command without any pre-configured scope.
+
+</td>
+</tr>
+</table>
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/default.toml b/apps/remote-ios/src-tauri/plugins/speech/permissions/default.toml
new file mode 100644
index 0000000000..1eea1c3c9c
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/default.toml
@@ -0,0 +1,8 @@
+[default]
+description = "Allows ORG2 Remote to run iOS speech recognition"
+permissions = [
+  "allow-is-supported",
+  "allow-start",
+  "allow-stop",
+  "allow-cancel",
+]
diff --git a/apps/remote-ios/src-tauri/plugins/speech/permissions/schemas/schema.json b/apps/remote-ios/src-tauri/plugins/speech/permissions/schemas/schema.json
new file mode 100644
index 0000000000..47bad24d7e
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/permissions/schemas/schema.json
@@ -0,0 +1,315 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "PermissionFile",
+  "description": "Permission file that can define a default permission, a set of permissions or a list of inlined permissions.",
+  "type": "object",
+  "properties": {
+    "default": {
+      "description": "The default permission set for the plugin",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/DefaultPermission"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "set": {
+      "description": "A list of permissions sets defined",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/PermissionSet"
+      }
+    },
+    "permission": {
+      "description": "A list of inlined permissions",
+      "default": [],
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Permission"
+      }
+    }
+  },
+  "definitions": {
+    "DefaultPermission": {
+      "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
+      "type": "object",
+      "required": ["permissions"],
+      "properties": {
+        "version": {
+          "description": "The version of the permission.",
+          "type": ["integer", "null"],
+          "format": "uint64",
+          "minimum": 1.0
+        },
+        "description": {
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "type": ["string", "null"]
+        },
+        "permissions": {
+          "description": "All permissions this set contains.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "PermissionSet": {
+      "description": "A set of direct permissions grouped together under a new name.",
+      "type": "object",
+      "required": ["description", "identifier", "permissions"],
+      "properties": {
+        "identifier": {
+          "description": "A unique identifier for the permission.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Human-readable description of what the permission does.",
+          "type": "string"
+        },
+        "permissions": {
+          "description": "All permissions this set contains.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PermissionKind"
+          }
+        }
+      }
+    },
+    "Permission": {
+      "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
+      "type": "object",
+      "required": ["identifier"],
+      "properties": {
+        "version": {
+          "description": "The version of the permission.",
+          "type": ["integer", "null"],
+          "format": "uint64",
+          "minimum": 1.0
+        },
+        "identifier": {
+          "description": "A unique identifier for the permission.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "type": ["string", "null"]
+        },
+        "commands": {
+          "description": "Allowed or denied commands when using this permission.",
+          "default": {
+            "allow": [],
+            "deny": []
+          },
+          "allOf": [
+            {
+              "$ref": "#/definitions/Commands"
+            }
+          ]
+        },
+        "scope": {
+          "description": "Allowed or denied scoped when using this permission.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Scopes"
+            }
+          ]
+        },
+        "platforms": {
+          "description": "Target platforms this permission applies. By default all platforms are affected by this permission.",
+          "type": ["array", "null"],
+          "items": {
+            "$ref": "#/definitions/Target"
+          }
+        }
+      }
+    },
+    "Commands": {
+      "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
+      "type": "object",
+      "properties": {
+        "allow": {
+          "description": "Allowed command.",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "deny": {
+          "description": "Denied command, which takes priority.",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "Scopes": {
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "type": "object",
+      "properties": {
+        "allow": {
+          "description": "Data that defines what is allowed by the scope.",
+          "type": ["array", "null"],
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        },
+        "deny": {
+          "description": "Data that defines what is denied by the scope. This should be prioritized by validation logic.",
+          "type": ["array", "null"],
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        }
+      }
+    },
+    "Value": {
+      "description": "All supported ACL values.",
+      "anyOf": [
+        {
+          "description": "Represents a null JSON value.",
+          "type": "null"
+        },
+        {
+          "description": "Represents a [`bool`].",
+          "type": "boolean"
+        },
+        {
+          "description": "Represents a valid ACL [`Number`].",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Number"
+            }
+          ]
+        },
+        {
+          "description": "Represents a [`String`].",
+          "type": "string"
+        },
+        {
+          "description": "Represents a list of other [`Value`]s.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        },
+        {
+          "description": "Represents a map of [`String`] keys to [`Value`]s.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/Value"
+          }
+        }
+      ]
+    },
+    "Number": {
+      "description": "A valid ACL number.",
+      "anyOf": [
+        {
+          "description": "Represents an [`i64`].",
+          "type": "integer",
+          "format": "int64"
+        },
+        {
+          "description": "Represents a [`f64`].",
+          "type": "number",
+          "format": "double"
+        }
+      ]
+    },
+    "Target": {
+      "description": "Platform target.",
+      "oneOf": [
+        {
+          "description": "MacOS.",
+          "type": "string",
+          "enum": ["macOS"]
+        },
+        {
+          "description": "Windows.",
+          "type": "string",
+          "enum": ["windows"]
+        },
+        {
+          "description": "Linux.",
+          "type": "string",
+          "enum": ["linux"]
+        },
+        {
+          "description": "Android.",
+          "type": "string",
+          "enum": ["android"]
+        },
+        {
+          "description": "iOS.",
+          "type": "string",
+          "enum": ["iOS"]
+        }
+      ]
+    },
+    "PermissionKind": {
+      "type": "string",
+      "oneOf": [
+        {
+          "description": "Enables the cancel command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-cancel",
+          "markdownDescription": "Enables the cancel command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the cancel command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-cancel",
+          "markdownDescription": "Denies the cancel command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the is_supported command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-is-supported",
+          "markdownDescription": "Enables the is_supported command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the is_supported command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-is-supported",
+          "markdownDescription": "Denies the is_supported command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the start command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-start",
+          "markdownDescription": "Enables the start command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-start",
+          "markdownDescription": "Denies the start command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the stop command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-stop",
+          "markdownDescription": "Enables the stop command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the stop command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-stop",
+          "markdownDescription": "Denies the stop command without any pre-configured scope."
+        },
+        {
+          "description": "Allows ORG2 Remote to run iOS speech recognition\n#### This default permission set includes:\n\n- `allow-is-supported`\n- `allow-start`\n- `allow-stop`\n- `allow-cancel`",
+          "type": "string",
+          "const": "default",
+          "markdownDescription": "Allows ORG2 Remote to run iOS speech recognition\n#### This default permission set includes:\n\n- `allow-is-supported`\n- `allow-start`\n- `allow-stop`\n- `allow-cancel`"
+        }
+      ]
+    }
+  }
+}
diff --git a/apps/remote-ios/src-tauri/plugins/speech/src/error.rs b/apps/remote-ios/src-tauri/plugins/speech/src/error.rs
new file mode 100644
index 0000000000..9734cf5c66
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/src/error.rs
@@ -0,0 +1,21 @@
+use serde::ser::Serializer;
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+    #[cfg(target_os = "ios")]
+    #[error(transparent)]
+    PluginInvoke(#[from] tauri::plugin::mobile::PluginInvokeError),
+}
+
+impl serde::Serialize for Error {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
diff --git a/apps/remote-ios/src-tauri/plugins/speech/src/lib.rs b/apps/remote-ios/src-tauri/plugins/speech/src/lib.rs
new file mode 100644
index 0000000000..ad5e4fb0c2
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/src/lib.rs
@@ -0,0 +1,19 @@
+use tauri::{plugin::TauriPlugin, Runtime};
+#[cfg(target_os = "ios")]
+use tauri::Manager;
+
+mod error;
+#[cfg(target_os = "ios")]
+mod mobile;
+
+pub use error::{Error, Result};
+
+pub fn init<R: Runtime>() -> TauriPlugin<R> {
+    tauri::plugin::Builder::new("speech")
+        .setup(|_app, _api| {
+            #[cfg(target_os = "ios")]
+            _app.manage(mobile::init(_app, _api)?);
+            Ok(())
+        })
+        .build()
+}
diff --git a/apps/remote-ios/src-tauri/plugins/speech/src/mobile.rs b/apps/remote-ios/src-tauri/plugins/speech/src/mobile.rs
new file mode 100644
index 0000000000..50060deb3a
--- /dev/null
+++ b/apps/remote-ios/src-tauri/plugins/speech/src/mobile.rs
@@ -0,0 +1,18 @@
+use serde::de::DeserializeOwned;
+use tauri::{
+    plugin::{PluginApi, PluginHandle},
+    AppHandle, Runtime,
+};
+
+#[cfg(target_os = "ios")]
+tauri::ios_plugin_binding!(init_plugin_speech);
+
+pub fn init<R: Runtime, C: DeserializeOwned>(
+    _app: &AppHandle<R>,
+    api: PluginApi<R, C>,
+) -> crate::Result<Speech<R>> {
+    let handle = api.register_ios_plugin(init_plugin_speech)?;
+    Ok(Speech(handle))
+}
+
+pub struct Speech<R: Runtime>(#[allow(dead_code)] PluginHandle<R>);
diff --git a/apps/remote-ios/src-tauri/src/lib.rs b/apps/remote-ios/src-tauri/src/lib.rs
index 522e28e609..5a7934326a 100644
--- a/apps/remote-ios/src-tauri/src/lib.rs
+++ b/apps/remote-ios/src-tauri/src/lib.rs
@@ -101,6 +101,7 @@ pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_opener::init())
+        .plugin(tauri_plugin_speech::init())
         .invoke_handler(tauri::generate_handler![
             mobile_keychain_read,
             mobile_keychain_write,
diff --git a/config/rspack.config.js b/config/rspack.config.js
index 0d155f4f08..407aa7841d 100644
--- a/config/rspack.config.js
+++ b/config/rspack.config.js
@@ -363,6 +363,7 @@ module.exports = () => {
       new ReactRefreshPlugin({ overlay: false }),
       new rspack.DefinePlugin({
         "process.env.NODE_ENV": JSON.stringify("development"),
+        "process.env.ORGII_MOBILE_REMOTE_NATIVE": JSON.stringify("false"),
         "process.env.ORGII_DEV_EAGER_APP": JSON.stringify(String(eagerDevApp)),
         // Match webpack: browser startup must never read a runtime process global.
         "process.env.ORGII_E2E": JSON.stringify(isE2E ? "1" : "0"),
diff --git a/config/webpack.config.js b/config/webpack.config.js
index a29fc1fd76..21224d05eb 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -686,6 +686,9 @@ module.exports = (env, argv) => {
         }),
       new webpack.DefinePlugin({
         "process.env.NODE_ENV": JSON.stringify(argv.mode),
+        "process.env.ORGII_MOBILE_REMOTE_NATIVE": JSON.stringify(
+          String(isMobileRemoteNativeBuild)
+        ),
         // Inline-compared in src/index.tsx so webpack constant-folds the
         // `webpackMode: "eager"` App import away on platforms that don't need it.
         "process.env.ORGII_DEV_EAGER_APP": JSON.stringify(String(eagerDevApp)),
diff --git a/docs/frontend-ui-audit-2026-09-16/MobileTestFlight.md b/docs/frontend-ui-audit-2026-09-16/MobileTestFlight.md
new file mode 100644
index 0000000000..a145291d60
--- /dev/null
+++ b/docs/frontend-ui-audit-2026-09-16/MobileTestFlight.md
@@ -0,0 +1,32 @@
+# Mobile TestFlight UI audit
+
+Release-snapshot control review. TypeScript AST inspection covered the 118 changed production TS/TSX files; manually inspected the native-element results, shared Button props/presentation, session menu and tool-detail close control. This is a focused control audit, not a claim of full visual or accessibility acceptance across the feature set. Real-device VoiceOver, large text, dark theme and post-login screenshots remain unverified.
+
+| Line                                                                                 | Element                   | Verdict          | Reason                                                                                             | Suggested change |
+| ------------------------------------------------------------------------------------ | ------------------------- | ---------------- | -------------------------------------------------------------------------------------------------- | ---------------- |
+| `src/modules/MobileRemote/components/composer/MobileComposerAttachmentButton.tsx:39` | Native file input         | keep with reason | Hidden browser file-picker boundary; a shared text input cannot replace file selection             | None             |
+| `src/modules/MobileRemote/platform/writeClipboardText.ts:18`                         | Temporary native textarea | keep with reason | Synchronous legacy clipboard DOM boundary restores focus/selection and removes the node in finally | None             |
+| `src/modules/MobileRemote/components/SessionViewMenu.tsx:35`                         | Grouping dropdown         | keep with reason | Reuses shared Dropdown and its item icon/spacing tokens; mobile CSS constrains viewport sizing     | None             |
+| `src/modules/MobileRemote/components/SessionViewMenu.tsx:108`                        | Menu trigger              | keep with reason | Shared Button with iconOnly, accessible name and expanded state; touch geometry uses mobile token  | None             |
+| `src/modules/MobileRemote/components/transcript/MobileToolDetailModal.tsx:91`        | Close action              | keep with reason | Shared Button and Modal; named icon action uses a small glyph within a token-sized touch target    | None             |
+
+AST review found no raw JSX action buttons or clickable div/span substitutes in the changed production files. Native creation inspection found only the clipboard textarea boundary above. Role-bearing status/log/dialog containers are informational or structural, not action substitutes.
+
+Verdict totals: **0 fix**, **5 keep with reason**, **0 abstract**.
+
+## CI follow-up: provider ownership and lifecycle
+
+The provider was over the 700-line gate. Context, connection state, authenticated handshake, RPC notifications and session actions now have separate owners. The existing socket wait helpers are reused. Three former connection helper modules had no production callers (only references among themselves); they were removed rather than retaining a second obsolete connection implementation.
+
+Architecture review covered compilation, live call paths/dead helpers, names, responsibility boundaries, fallback/error branches, initialization and resolver parity (layers 1–7, 9–10). Layer 8 wire verification is limited to the existing transport contract tests: no payload fields changed in this CI follow-up, and no production relay session was exercised. The provider remains the generation/retry dispatcher; extracted hooks receive its same stable refs. RPC availability is now React state as well as the imperative transport ref, so read-state and inbox consumers update on disconnect. Authentication/connection ref mirrors update in layout effects; successful handshake still publishes connection identity synchronously before restoring the transcript.
+
+The reconnect factory only stores its callbacks and never invokes them during construction. Two narrowly documented React Compiler ref warnings at that factory call are false positives; event-time generation guards remain intact. No general lint rule or baseline was relaxed. Promise rejections from background teardown and observer callbacks now have final handlers; normal RPC errors retain their existing UI paths.
+
+| Area               | Verdict | Evidence                                                                              | Change or reason kept                                    | Verification                                                                 |
+| ------------------ | ------- | ------------------------------------------------------------------------------------- | -------------------------------------------------------- | ---------------------------------------------------------------------------- |
+| Background work    | keep    | Reconnect controller owns one timer/flight; provider closes transport on hide/unmount | Extraction preserves teardown and visibility dispatch    | Existing provider/reconnect tests; physical-device idle measurements not run |
+| Memory             | keep    | Read-state batches 200, watched IDs 1200, paired-desktop inventory 20                 | No additional cache or polling                           | Existing read-state/inbox tests                                              |
+| Scope/isolation    | keep    | Account/endpoint/desktop draft key, connection generation, selection intent           | Preserve scoped draft recreation and stale-result guards | Provider pairing/revocation/recovery tests                                   |
+| Rendering/hot path | fix     | RPC ref previously read directly for rendered consumers                               | Publish matching RPC state at client creation/release    | Provider and read-state regression suite                                     |
+
+Performance verdict: blocked for full-device acceptance: physical-device visible/hidden CPU/RSS and production relay transitions were not measured. Unit lifecycle coverage is not a claim of production performance improvement. UI control verdict remains 0 fix, 5 keep with reason, 0 abstract; callback wiring still uses shared Button controls.
diff --git a/scripts/ios-release/manual-signing.mjs b/scripts/ios-release/manual-signing.mjs
new file mode 100644
index 0000000000..2d4976e6ca
--- /dev/null
+++ b/scripts/ios-release/manual-signing.mjs
@@ -0,0 +1,141 @@
+import assert from "node:assert/strict";
+import { readFileSync, writeFileSync } from "node:fs";
+import { pathToFileURL } from "node:url";
+import { resolve } from "node:path";
+
+export const iosBundleId = "org2ai.org2.remote";
+
+function xmlEscape(value) {
+  return value
+    .replaceAll("&", "&amp;")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;");
+}
+
+function validateInputs({ team, identity, profileUuid }) {
+  assert.match(team, /^[A-Z0-9]{10}$/, "Invalid Apple Team ID");
+  assert.match(
+    profileUuid,
+    /^[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}$/,
+    "Invalid provisioning profile UUID",
+  );
+  assert.ok(
+    /^(Apple Distribution|iPhone Distribution): /.test(identity),
+    "Expected an Apple Distribution identity",
+  );
+  assert.ok(!/[\r\n\0]/.test(identity), "Invalid signing identity");
+  assert.ok(
+    identity.endsWith(`(${team})`),
+    "Signing identity Team ID mismatch",
+  );
+}
+
+function setBuildSetting(block, key, value) {
+  const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const setting = new RegExp(`^(\\s*)${escapedKey} = .*;$`, "m");
+  if (setting.test(block)) {
+    return block.replace(setting, `$1${key} = ${value};`);
+  }
+  return block.replace(
+    /^(\s*)CODE_SIGN_ENTITLEMENTS = .*;$/m,
+    `$&\n$1${key} = ${value};`,
+  );
+}
+
+export function patchProjectForManualSigning(source, inputs) {
+  validateInputs(inputs);
+  const { team, identity, profileUuid } = inputs;
+  const marker = /^\s*CODE_SIGN_ENTITLEMENTS = .*;$/gm;
+  const positions = [...source.matchAll(marker)].map((match) => match.index);
+  assert.equal(
+    positions.length,
+    2,
+    "Expected exactly two iOS target build configurations",
+  );
+
+  let result = source;
+  for (const position of positions.reverse()) {
+    const start = result.lastIndexOf("buildSettings = {", position);
+    const blockEnd = result.slice(position).match(/\n\s*};/);
+    const end = blockEnd ? position + blockEnd.index : -1;
+    assert.ok(start >= 0 && end > position, "Invalid Xcode project structure");
+    let block = result.slice(start, end);
+    block = setBuildSetting(block, "CODE_SIGN_STYLE", "Manual");
+    block = setBuildSetting(block, "CODE_SIGN_IDENTITY", `\"${identity}\"`);
+    block = setBuildSetting(block, "DEVELOPMENT_TEAM", `\"${team}\"`);
+    block = setBuildSetting(
+      block,
+      "PROVISIONING_PROFILE_SPECIFIER",
+      `\"${profileUuid}\"`,
+    );
+    result = result.slice(0, start) + block + result.slice(end);
+  }
+  return result;
+}
+
+export function signingXcconfig(inputs) {
+  validateInputs(inputs);
+  return [
+    "CODE_SIGN_STYLE = Manual",
+    `CODE_SIGN_IDENTITY = ${inputs.identity}`,
+    `CODE_SIGN_IDENTITY[sdk=iphoneos*] = ${inputs.identity}`,
+    `DEVELOPMENT_TEAM = ${inputs.team}`,
+    `PROVISIONING_PROFILE_SPECIFIER = ${inputs.profileUuid}`,
+    `PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*] = ${inputs.profileUuid}`,
+    "",
+  ].join("\n");
+}
+
+export function exportOptionsPlist(inputs) {
+  validateInputs(inputs);
+  const identity = xmlEscape(inputs.identity);
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>method</key><string>app-store-connect</string>
+  <key>signingStyle</key><string>manual</string>
+  <key>signingCertificate</key><string>${identity}</string>
+  <key>teamID</key><string>${inputs.team}</string>
+  <key>manageAppVersionAndBuildNumber</key><false/>
+  <key>provisioningProfiles</key>
+  <dict><key>${iosBundleId}</key><string>${inputs.profileUuid}</string></dict>
+</dict>
+</plist>
+`;
+}
+
+export function prepareManualSigning({
+  projectPath,
+  exportOptionsPath,
+  xcconfigPath,
+  ...inputs
+}) {
+  const project = readFileSync(projectPath, "utf8");
+  writeFileSync(
+    projectPath,
+    patchProjectForManualSigning(project, inputs),
+    "utf8",
+  );
+  writeFileSync(exportOptionsPath, exportOptionsPlist(inputs), "utf8");
+  writeFileSync(xcconfigPath, signingXcconfig(inputs), { mode: 0o600 });
+}
+
+if (
+  process.argv[1] &&
+  import.meta.url === pathToFileURL(resolve(process.argv[1])).href
+) {
+  try {
+    prepareManualSigning({
+      projectPath: process.env.IOS_XCODE_PROJECT_FILE,
+      exportOptionsPath: process.env.IOS_EXPORT_OPTIONS_FILE,
+      xcconfigPath: process.env.IOS_SIGNING_XCCONFIG,
+      team: process.env.APPLE_TEAM_ID,
+      identity: readFileSync(process.env.IOS_SIGNING_IDENTITY_FILE, "utf8").trim(),
+      profileUuid: readFileSync(process.env.IOS_PROFILE_UUID_FILE, "utf8").trim(),
+    });
+  } catch (error) {
+    console.error(`Failed to prepare explicit iOS signing: ${error.message}`);
+    process.exitCode = 1;
+  }
+}
diff --git a/scripts/ios-release/manual-signing.test.mjs b/scripts/ios-release/manual-signing.test.mjs
new file mode 100644
index 0000000000..b23b7c1d0e
--- /dev/null
+++ b/scripts/ios-release/manual-signing.test.mjs
@@ -0,0 +1,76 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+import {
+  exportOptionsPlist,
+  patchProjectForManualSigning,
+  signingXcconfig,
+} from "./manual-signing.mjs";
+
+const inputs = {
+  team: "ABCDEFGHIJ",
+  identity: "Apple Distribution: Example, Inc. (ABCDEFGHIJ)",
+  profileUuid: "12345678-1234-1234-1234-1234567890ab",
+};
+
+const project = `
+1 /* debug */ = {
+  isa = XCBuildConfiguration;
+  buildSettings = {
+    CODE_SIGN_ENTITLEMENTS = app.entitlements;
+    CODE_SIGN_IDENTITY = "iPhone Developer";
+  };
+  name = debug;
+};
+2 /* release */ = {
+  isa = XCBuildConfiguration;
+  buildSettings = {
+    CODE_SIGN_ENTITLEMENTS = app.entitlements;
+    CODE_SIGN_IDENTITY = "iPhone Developer";
+  };
+  name = release;
+};
+`;
+
+test("patches both target configurations without emitting detached settings", () => {
+  const result = patchProjectForManualSigning(project, inputs);
+  assert.equal(result.match(/CODE_SIGN_STYLE = Manual;/g)?.length, 2);
+  assert.equal(result.match(/PROVISIONING_PROFILE_SPECIFIER =/g)?.length, 2);
+  assert.equal(result.match(/iPhone Developer/g), null);
+  for (const block of result.matchAll(/buildSettings = \{([\s\S]*?)\n\s*\};/g)) {
+    assert.match(block[1], /CODE_SIGN_STYLE = Manual;/);
+    assert.match(block[1], /PROVISIONING_PROFILE_SPECIFIER =/);
+  }
+});
+
+test("patches the checked-in generated Xcode project", () => {
+  const source = readFileSync(
+    new URL(
+      "../../apps/remote-ios/src-tauri/gen/apple/org2-remote.xcodeproj/project.pbxproj",
+      import.meta.url,
+    ),
+    "utf8",
+  );
+  const result = patchProjectForManualSigning(source, inputs);
+  assert.equal(result.match(/CODE_SIGN_STYLE = Manual;/g)?.length, 2);
+  assert.equal(result.match(/PROVISIONING_PROFILE_SPECIFIER =/g)?.length, 2);
+});
+
+test("writes matching manual archive and export settings", () => {
+  const xcconfig = signingXcconfig(inputs);
+  const exportOptions = exportOptionsPlist(inputs);
+  assert.match(xcconfig, /CODE_SIGN_STYLE = Manual/);
+  assert.match(xcconfig, /Apple Distribution: Example, Inc\./);
+  assert.match(exportOptions, /<key>signingStyle<\/key><string>manual<\/string>/);
+  assert.match(exportOptions, /<key>org2ai\.org2\.remote<\/key>/);
+  assert.match(exportOptions, /12345678-1234-1234-1234-1234567890ab/);
+});
+
+test("rejects identities from another team", () => {
+  assert.throws(() =>
+    signingXcconfig({
+      ...inputs,
+      identity: "Apple Distribution: Example, Inc. (OTHERTEAM1)",
+    }),
+  );
+});
diff --git a/scripts/ios-release/readiness.mjs b/scripts/ios-release/readiness.mjs
index 7b52922b63..8ba05724fa 100644
--- a/scripts/ios-release/readiness.mjs
+++ b/scripts/ios-release/readiness.mjs
@@ -48,6 +48,14 @@ export function validateDistribution(
     info.NSCameraUsageDescription?.trim(),
     "Camera purpose string missing",
   );
+  assert.ok(
+    info.NSMicrophoneUsageDescription?.trim(),
+    "Microphone purpose string missing",
+  );
+  assert.ok(
+    info.NSSpeechRecognitionUsageDescription?.trim(),
+    "Speech recognition purpose string missing",
+  );
   assert.ok(
     info.CFBundleURLTypes?.some((t) =>
       t.CFBundleURLSchemes?.includes("org2remote"),
@@ -158,19 +166,54 @@ export function validateApp(app, expected) {
     "Compiled app icon/assets are missing",
   );
   const privacy = parsePlist(readFileSync(join(app, "PrivacyInfo.xcprivacy")));
-  for (const key of [
-    "NSPrivacyCollectedDataTypes",
-    "NSPrivacyAccessedAPITypes",
-    "NSPrivacyTrackingDomains",
-  ]) {
-    assert.ok(Array.isArray(privacy[key]), `Privacy manifest missing ${key}`);
-  }
+  validatePrivacyManifest(privacy);
+  // Structural validation cannot prove that the declarations match the app's
+  // actual data retention, third-party SDKs, or required-reason API usage.
+}
+
+export function validatePrivacyManifest(privacy) {
   assert.equal(
     typeof privacy.NSPrivacyTracking,
     "boolean",
     "Privacy tracking declaration missing",
   );
-  // This structural check is not an audit of the accuracy of privacy declarations.
+  const optionalArrays = [
+    "NSPrivacyCollectedDataTypes",
+    "NSPrivacyAccessedAPITypes",
+    "NSPrivacyTrackingDomains",
+  ];
+  for (const key of optionalArrays) {
+    if (privacy[key] === undefined) continue;
+    assert.ok(Array.isArray(privacy[key]), `Privacy manifest ${key} must be an array`);
+    assert.ok(privacy[key].length > 0, `Privacy manifest must omit empty ${key}`);
+  }
+  for (const entry of privacy.NSPrivacyCollectedDataTypes ?? []) {
+    assert.equal(typeof entry.NSPrivacyCollectedDataType, "string");
+    assert.equal(typeof entry.NSPrivacyCollectedDataTypeLinked, "boolean");
+    assert.equal(typeof entry.NSPrivacyCollectedDataTypeTracking, "boolean");
+    assert.ok(Array.isArray(entry.NSPrivacyCollectedDataTypePurposes));
+    assert.ok(entry.NSPrivacyCollectedDataTypePurposes.length > 0);
+    assert.ok(
+      entry.NSPrivacyCollectedDataTypePurposes.every(
+        (purpose) => typeof purpose === "string" && purpose.length > 0,
+      ),
+    );
+  }
+  for (const entry of privacy.NSPrivacyAccessedAPITypes ?? []) {
+    assert.equal(typeof entry.NSPrivacyAccessedAPIType, "string");
+    assert.ok(Array.isArray(entry.NSPrivacyAccessedAPITypeReasons));
+    assert.ok(entry.NSPrivacyAccessedAPITypeReasons.length > 0);
+    assert.ok(
+      entry.NSPrivacyAccessedAPITypeReasons.every(
+        (reason) => typeof reason === "string" && reason.length > 0,
+      ),
+    );
+  }
+  assert.ok(
+    (privacy.NSPrivacyTrackingDomains ?? []).every(
+      (domain) => typeof domain === "string" && domain.length > 0,
+    ),
+  );
 }
 
 if (
diff --git a/scripts/ios-release/readiness.test.mjs b/scripts/ios-release/readiness.test.mjs
index a48ca8524f..ea72d6e6bc 100644
--- a/scripts/ios-release/readiness.test.mjs
+++ b/scripts/ios-release/readiness.test.mjs
@@ -1,8 +1,10 @@
 import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
 import test from "node:test";
 import {
   releaseConfig,
   validateDistribution,
+  validatePrivacyManifest,
   bundleId,
   parsePlist,
 } from "./readiness.mjs";
@@ -32,6 +34,8 @@ function fixture() {
     CFBundleShortVersionString: expected.version,
     CFBundleVersion: expected.build,
     NSCameraUsageDescription: "Scan pairing codes",
+    NSMicrophoneUsageDescription: "Record dictation",
+    NSSpeechRecognitionUsageDescription: "Transcribe dictation",
     CFBundleURLTypes: [{ CFBundleURLSchemes: ["org2remote"] }],
     ITSAppUsesNonExemptEncryption: false,
   };
@@ -61,6 +65,70 @@ test("accepts matching distribution metadata, including legacy App ID prefixes",
   const f = fixture();
   validateDistribution(f.info, f.profile, f.entitlements, f.expected);
 });
+
+test("accepts a minimal privacy manifest without invalid empty declarations", () => {
+  validatePrivacyManifest({ NSPrivacyTracking: false });
+});
+
+test("rejects empty optional privacy declarations", () => {
+  for (const key of [
+    "NSPrivacyCollectedDataTypes",
+    "NSPrivacyAccessedAPITypes",
+    "NSPrivacyTrackingDomains",
+  ]) {
+    assert.throws(() =>
+      validatePrivacyManifest({ NSPrivacyTracking: false, [key]: [] }),
+    );
+  }
+});
+
+test("requires reasons for declared required-reason APIs", () => {
+  assert.throws(() =>
+    validatePrivacyManifest({
+      NSPrivacyTracking: false,
+      NSPrivacyAccessedAPITypes: [
+        {
+          NSPrivacyAccessedAPIType: "NSPrivacyAccessedAPICategoryFileTimestamp",
+          NSPrivacyAccessedAPITypeReasons: [],
+        },
+      ],
+    }),
+  );
+});
+
+test("ships the reviewed iOS privacy declarations", () => {
+  const privacy = parsePlist(
+    readFileSync(
+      new URL(
+        "../../apps/remote-ios/src-tauri/gen/apple/org2-remote_iOS/PrivacyInfo.xcprivacy",
+        import.meta.url,
+      ),
+    ),
+  );
+  validatePrivacyManifest(privacy);
+  assert.equal(privacy.NSPrivacyTracking, false);
+  assert.deepEqual(
+    privacy.NSPrivacyCollectedDataTypes.map(
+      (entry) => entry.NSPrivacyCollectedDataType,
+    ),
+    [
+      "NSPrivacyCollectedDataTypeName",
+      "NSPrivacyCollectedDataTypeEmailAddress",
+      "NSPrivacyCollectedDataTypeUserID",
+      "NSPrivacyCollectedDataTypeDeviceID",
+      "NSPrivacyCollectedDataTypeProductInteraction",
+      "NSPrivacyCollectedDataTypeOtherUserContent",
+      "NSPrivacyCollectedDataTypePhotosorVideos",
+    ],
+  );
+  assert.deepEqual(privacy.NSPrivacyAccessedAPITypes, [
+    {
+      NSPrivacyAccessedAPIType: "NSPrivacyAccessedAPICategoryFileTimestamp",
+      NSPrivacyAccessedAPITypeReasons: ["C617.1"],
+    },
+  ]);
+  assert.equal(privacy.NSPrivacyTrackingDomains, undefined);
+});
 for (const [name, mutate] of [
   [
     "debug app",
@@ -116,6 +184,18 @@ for (const [name, mutate] of [
       delete f.info.NSCameraUsageDescription;
     },
   ],
+  [
+    "missing microphone permission",
+    (f) => {
+      delete f.info.NSMicrophoneUsageDescription;
+    },
+  ],
+  [
+    "missing speech recognition permission",
+    (f) => {
+      delete f.info.NSSpeechRecognitionUsageDescription;
+    },
+  ],
   [
     "missing callback",
     (f) => {
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 5788810136..2174487085 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -3440,10 +3440,23 @@ checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
+ "image-webp",
  "moxcms",
  "num-traits",
  "png 0.18.1",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
 ]
 
 [[package]]
@@ -5024,6 +5037,7 @@ dependencies = [
  "futures-util",
  "git",
  "git_api",
+ "image",
  "inbox",
  "insta",
  "integrations",
@@ -6634,9 +6648,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.40"
+version = "0.23.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
+checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
 dependencies = [
  "log",
  "once_cell",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index c49a6aca01..072ddbd739 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -431,6 +431,7 @@ dirs = "6.0"             # Get user directories (~/.orgii/data)
 chrono = { workspace = true }  # Date/time handling
 zip = { workspace = true }
 base64 = { workspace = true }
+image = { version = "0.25.10", default-features = false, features = ["png", "jpeg", "webp"] }
 
 # AWS SDK for SSO OIDC archived alongside `crates/cursor-bridge` notes.
 # `aws-config` + `aws-sdk-ssooidc` (and the transitive `aws-lc-sys` BoringSSL
diff --git a/src-tauri/crates/agent-core/src/core/interaction/permission.rs b/src-tauri/crates/agent-core/src/core/interaction/permission.rs
index d43977f5e8..6cd3ecc23c 100644
--- a/src-tauri/crates/agent-core/src/core/interaction/permission.rs
+++ b/src-tauri/crates/agent-core/src/core/interaction/permission.rs
@@ -66,6 +66,26 @@ struct PendingPermission {
     session_id: String,
     tool_name: String,
     tool_call_id: String,
+    tool_args: serde_json::Value,
+    created_at_ms: i64,
+}
+
+struct PendingPermissionGuard {
+    pending: Arc<std::sync::Mutex<HashMap<String, PendingPermission>>>,
+    request_id: String,
+}
+
+impl Drop for PendingPermissionGuard {
+    fn drop(&mut self) {
+        // Cleanup must not panic again while a producer is unwinding.
+        let entry = match self.pending.lock() {
+            Ok(mut pending) => pending.remove(&self.request_id),
+            Err(poisoned) => poisoned.into_inner().remove(&self.request_id),
+        };
+        if let Some(entry) = entry {
+            AgentPermissionManager::broadcast_pending_changed(&entry.session_id);
+        }
+    }
 }
 
 /// Manages pending permission requests for any agent session.
@@ -74,7 +94,7 @@ struct PendingPermission {
 /// `broadcast_event` (routed to the frontend over the Tauri IPC Channel).
 pub struct AgentPermissionManager {
     /// Pending requests keyed by `request_id`.
-    pending: Arc<Mutex<HashMap<String, PendingPermission>>>,
+    pending: Arc<std::sync::Mutex<HashMap<String, PendingPermission>>>,
     /// Session-scoped always-allow rules (tool name or tool+pattern).
     session_rules: Arc<Mutex<Vec<PermissionRule>>>,
     /// Persistent rules loaded from `.orgii/permissions.json`.
@@ -112,7 +132,7 @@ impl AgentPermissionManager {
             .take(8)
             .collect::<String>();
         Self {
-            pending: Arc::new(Mutex::new(HashMap::new())),
+            pending: Arc::new(std::sync::Mutex::new(HashMap::new())),
             session_rules: Arc::new(Mutex::new(Vec::new())),
             persistent_store: Arc::new(Mutex::new(PermissionStore::default())),
             workspace: Arc::new(Mutex::new(None)),
@@ -144,16 +164,34 @@ impl AgentPermissionManager {
         session_id: &str,
         tool_name: &str,
         tool_call_id: &str,
+    ) -> (String, oneshot::Receiver<PermissionResponse>) {
+        self.register_with_args(
+            session_id,
+            tool_name,
+            tool_call_id,
+            &serde_json::Value::Null,
+        )
+        .await
+    }
+
+    async fn register_with_args(
+        &self,
+        session_id: &str,
+        tool_name: &str,
+        tool_call_id: &str,
+        tool_args: &serde_json::Value,
     ) -> (String, oneshot::Receiver<PermissionResponse>) {
         let request_id = format!("{}-{}-{}", self.id_prefix, session_id, uuid::Uuid::new_v4());
         let (tx, rx) = oneshot::channel();
-        self.pending.lock().await.insert(
+        self.pending.lock().expect("permission registry").insert(
             request_id.clone(),
             PendingPermission {
                 sender: tx,
                 session_id: session_id.to_string(),
                 tool_name: tool_name.to_string(),
                 tool_call_id: tool_call_id.to_string(),
+                tool_args: tool_args.clone(),
+                created_at_ms: chrono::Utc::now().timestamp_millis(),
             },
         );
         (request_id, rx)
@@ -168,36 +206,65 @@ impl AgentPermissionManager {
         &self,
         request_id: &str,
         response: PermissionResponse,
-        tool_name: Option<&str>,
-        tool_args: Option<&serde_json::Value>,
+        _tool_name: Option<&str>,
+        _tool_args: Option<&serde_json::Value>,
     ) -> bool {
+        self.respond_scoped(None, request_id, response).await
+    }
+
+    /// Remote callers must prove both request and owning session identity.
+    pub async fn respond_for_session(
+        &self,
+        session_id: &str,
+        request_id: &str,
+        response: PermissionResponse,
+    ) -> bool {
+        self.respond_scoped(Some(session_id), request_id, response)
+            .await
+    }
+
+    async fn respond_scoped(
+        &self,
+        session_id: Option<&str>,
+        request_id: &str,
+        response: PermissionResponse,
+    ) -> bool {
+        // Claim before any side effect; stale or duplicate replies cannot grant rules.
+        let entry = {
+            let mut pending = self.pending.lock().expect("permission registry");
+            if pending
+                .get(request_id)
+                .is_some_and(|entry| session_id.is_none_or(|id| entry.session_id == id))
+            {
+                pending.remove(request_id)
+            } else {
+                None
+            }
+        };
+        let Some(entry) = entry else {
+            return false;
+        };
+        Self::broadcast_pending_changed(&entry.session_id);
         if response == PermissionResponse::AlwaysAllow {
-            if let Some(name) = tool_name {
-                let rule = Self::build_rule(name, tool_args);
-                info!("[permission] Always-allow granted: {}", rule.rule);
-
-                // Add to session rules
-                let mut session = self.session_rules.lock().await;
-                if !session.contains(&rule) {
-                    session.push(rule.clone());
-                }
+            let rule = Self::build_rule(&entry.tool_name, Some(&entry.tool_args));
+            info!("[permission] Always-allow granted: {}", rule.rule);
 
-                // Persist to .orgii/permissions.json
-                let mut store = self.persistent_store.lock().await;
-                store.add_allow(rule);
-                if let Some(ref ws) = *self.workspace.lock().await {
-                    if let Err(err) = store.save(ws) {
-                        warn!("[permission] Failed to persist rule: {}", err);
-                    }
+            // Add to session rules
+            let mut session = self.session_rules.lock().await;
+            if !session.contains(&rule) {
+                session.push(rule.clone());
+            }
+
+            // Persist to .orgii/permissions.json
+            let mut store = self.persistent_store.lock().await;
+            store.add_allow(rule);
+            if let Some(ref ws) = *self.workspace.lock().await {
+                if let Err(err) = store.save(ws) {
+                    warn!("[permission] Failed to persist rule: {}", err);
                 }
             }
         }
 
-        let Some(entry) = self.pending.lock().await.remove(request_id) else {
-            warn!("[permission] No pending request found for {}", request_id);
-            return false;
-        };
-
         let (status, content) = match response {
             PermissionResponse::Allow => (
                 FinalizedStatus::Answered,
@@ -246,9 +313,15 @@ impl AgentPermissionManager {
     /// adding a new `FinalizedStatus` variant forces a compiler error here
     /// rather than silently mapping it to a generic "terminated" string.
     async fn cancel_pending(&self, request_id: &str, status: FinalizedStatus) {
-        let Some(entry) = self.pending.lock().await.remove(request_id) else {
+        let Some(entry) = self
+            .pending
+            .lock()
+            .expect("permission registry")
+            .remove(request_id)
+        else {
             return;
         };
+        Self::broadcast_pending_changed(&entry.session_id);
 
         let content = match status {
             FinalizedStatus::Cancelled => "User stopped the session before responding.",
@@ -276,12 +349,41 @@ impl AgentPermissionManager {
 
     /// Check if there are any pending permission requests.
     pub async fn has_pending(&self) -> bool {
-        !self.pending.lock().await.is_empty()
+        !self.pending.lock().expect("permission registry").is_empty()
     }
 
     /// Get the IDs of all pending permission requests.
     pub async fn pending_ids(&self) -> Vec<String> {
-        self.pending.lock().await.keys().cloned().collect()
+        self.pending
+            .lock()
+            .expect("permission registry")
+            .keys()
+            .cloned()
+            .collect()
+    }
+
+    /// Recoverable projection of the actual parked requests, not an event cache.
+    pub async fn pending_snapshot(&self, limit: usize) -> Vec<serde_json::Value> {
+        self.pending
+            .lock()
+            .expect("permission registry")
+            .iter()
+            .take(limit)
+            .map(|(id, entry)| {
+                serde_json::json!({
+                    "kind": "permission", "origin": "rust_agent", "sessionId": entry.session_id,
+                    "requestId": id, "toolName": entry.tool_name, "toolCallId": entry.tool_call_id,
+                    "toolArgs": entry.tool_args, "createdAtMs": entry.created_at_ms,
+                })
+            })
+            .collect()
+    }
+
+    fn broadcast_pending_changed(session_id: &str) {
+        crate::bus::broadcast_event(
+            "permission:pending_changed",
+            serde_json::json!({"sessionId": session_id}),
+        );
     }
 
     /// Build a permission rule from tool name + args.
@@ -364,7 +466,13 @@ impl PermissionProvider for AgentPermissionManager {
             return Ok(PermissionVerdict::AlwaysAllow);
         }
 
-        let (request_id, rx) = self.register(session_id, tool_name, tool_call_id).await;
+        let (request_id, rx) = self
+            .register_with_args(session_id, tool_name, tool_call_id, args)
+            .await;
+        let _pending_guard = PendingPermissionGuard {
+            pending: Arc::clone(&self.pending),
+            request_id: request_id.clone(),
+        };
 
         crate::bus::broadcast_event(
             "permission:request",
@@ -430,9 +538,140 @@ impl PermissionProvider for AgentPermissionManager {
             InteractionOutcome::Dropped => {
                 // Sender was dropped without cancel_pending (shouldn't happen in
                 // the normal flow, but be defensive).
-                self.pending.lock().await.remove(&request_id);
+                self.pending
+                    .lock()
+                    .expect("permission registry")
+                    .remove(&request_id);
                 Err(())
             }
         }
     }
 }
+
+#[cfg(test)]
+mod pending_snapshot_tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn cleanup_does_not_panic_when_registry_was_poisoned() {
+        let manager = AgentPermissionManager::for_agent("poison-test");
+        let (request_id, rx) = manager.register("session-a", "read_file", "call-a").await;
+        let guard = PendingPermissionGuard {
+            pending: manager.pending.clone(),
+            request_id,
+        };
+        let pending = manager.pending.clone();
+        assert!(std::thread::spawn(move || {
+            let _lock = pending.lock().unwrap();
+            panic!("poison fixture");
+        })
+        .join()
+        .is_err());
+        drop(guard);
+        assert!(rx.await.is_err());
+        let pending = manager
+            .pending
+            .lock()
+            .unwrap_or_else(|poisoned| poisoned.into_inner());
+        assert!(pending.is_empty());
+    }
+
+    #[tokio::test]
+    async fn aborted_permission_future_releases_its_authoritative_entry() {
+        let manager = Arc::new(AgentPermissionManager::for_agent("abort-test"));
+        let task = tokio::spawn({
+            let manager = manager.clone();
+            async move {
+                manager
+                    .request_permission(
+                        "session-a",
+                        "read_file",
+                        "call-a",
+                        &serde_json::json!({"path":"a.rs"}),
+                    )
+                    .await
+            }
+        });
+        for _ in 0..100 {
+            if manager.has_pending().await {
+                break;
+            }
+            tokio::task::yield_now().await;
+        }
+        assert!(manager.has_pending().await);
+        task.abort();
+        let _ = task.await;
+        assert!(manager.pending_snapshot(10).await.is_empty());
+    }
+
+    #[tokio::test]
+    async fn snapshot_recovers_arguments_and_claim_prevents_duplicate_rules() {
+        let manager = AgentPermissionManager::for_agent("snapshot-test");
+        let args = serde_json::json!({"command": "git status"});
+        let (id, rx) = manager
+            .register_with_args("session-a", "run_shell", "call-a", &args)
+            .await;
+        let snapshot = manager.pending_snapshot(10).await;
+        assert_eq!(snapshot.len(), 1);
+        assert_eq!(snapshot[0]["toolArgs"], args);
+        assert_eq!(snapshot[0]["toolCallId"], "call-a");
+        assert!(snapshot[0]["createdAtMs"].as_i64().unwrap() > 0);
+        assert!(
+            !manager
+                .respond(
+                    "stale",
+                    PermissionResponse::AlwaysAllow,
+                    Some("foreign_tool"),
+                    None
+                )
+                .await
+        );
+        assert!(manager.session_rules.lock().await.is_empty());
+        assert!(
+            !manager
+                .respond_for_session("foreign", &id, PermissionResponse::AlwaysAllow)
+                .await
+        );
+        assert_eq!(manager.pending_snapshot(10).await.len(), 1);
+        assert!(
+            manager
+                .respond(
+                    &id,
+                    PermissionResponse::AlwaysAllow,
+                    Some("foreign_tool"),
+                    None
+                )
+                .await
+        );
+        assert_eq!(rx.await.unwrap(), PermissionResponse::AlwaysAllow);
+        assert!(
+            !manager
+                .respond(
+                    &id,
+                    PermissionResponse::AlwaysAllow,
+                    Some("foreign_tool"),
+                    None
+                )
+                .await
+        );
+        let rules = manager.session_rules.lock().await;
+        assert_eq!(rules.len(), 1);
+        assert_eq!(rules[0].rule, "run_shell(git *)");
+        assert!(manager.pending_snapshot(10).await.is_empty());
+    }
+
+    #[tokio::test]
+    async fn another_session_manager_cannot_claim_foreign_request() {
+        let owner = AgentPermissionManager::for_agent("owner");
+        let other = AgentPermissionManager::for_agent("other");
+        let (id, _rx) = owner.register("session-a", "read_file", "call-a").await;
+        assert!(
+            !other
+                .respond(&id, PermissionResponse::Allow, None, None)
+                .await
+        );
+        assert_eq!(owner.pending_snapshot(1).await.len(), 1);
+        owner.cancel_pending(&id, FinalizedStatus::Cancelled).await;
+        assert!(owner.pending_snapshot(1).await.is_empty());
+    }
+}
diff --git a/src-tauri/crates/agent-core/src/core/tools/file_history/mod.rs b/src-tauri/crates/agent-core/src/core/tools/file_history/mod.rs
index 9caf59c331..104ec0dcbe 100644
--- a/src-tauri/crates/agent-core/src/core/tools/file_history/mod.rs
+++ b/src-tauri/crates/agent-core/src/core/tools/file_history/mod.rs
@@ -50,6 +50,7 @@ mod capture;
 mod cleanup;
 mod inspect;
 mod paths;
+mod review;
 mod rewind;
 mod types;
 
@@ -63,6 +64,7 @@ pub use cleanup::{
 };
 pub use inspect::{has_changes_after_message, session_numstat, session_unified_diff};
 pub use paths::read_snapshot_created_at as get_snapshot_created_at;
+pub use review::read_pre_tool_file;
 pub use rewind::{
     restore_snapshot, rewind_file, rewind_file_to_message, rewind_to_message,
     REDO_SNAPSHOT_TOOL_CALL_ID,
diff --git a/src-tauri/crates/agent-core/src/core/tools/file_history/review.rs b/src-tauri/crates/agent-core/src/core/tools/file_history/review.rs
new file mode 100644
index 0000000000..e26e7d6b2a
--- /dev/null
+++ b/src-tauri/crates/agent-core/src/core/tools/file_history/review.rs
@@ -0,0 +1,109 @@
+//! Bounded historical read for review surfaces. Never consult the live file.
+use super::{paths, types::FileSnapshot};
+use rusqlite::OptionalExtension;
+use std::{
+    fs::File,
+    io::{self, Read},
+    path::{Component, Path},
+};
+
+const MAX_BYTES: u64 = 512 * 1024;
+
+fn safe_segment(value: &str) -> bool {
+    !value.is_empty()
+        && Path::new(value).components().count() == 1
+        && matches!(
+            Path::new(value).components().next(),
+            Some(Component::Normal(_))
+        )
+}
+
+fn bounded_bytes(path: &Path) -> io::Result<Vec<u8>> {
+    if !std::fs::symlink_metadata(path)?.is_file() {
+        return Err(io::Error::other("not a regular backup"));
+    }
+    let file = File::open(path)?;
+    if !file.metadata()?.is_file() {
+        return Err(io::Error::other("not a regular backup"));
+    }
+    let mut bytes = Vec::new();
+    file.take(MAX_BYTES + 1).read_to_end(&mut bytes)?;
+    if bytes.len() as u64 > MAX_BYTES {
+        return Err(io::Error::other("snapshot exceeds review budget"));
+    }
+    Ok(bytes)
+}
+
+/// Return the pre-tool whole file only when the exact owner/tool/path backup
+/// exists and its content hash verifies. Missing/evicted/binary backups stay
+/// unavailable. An empty string means a captured non-existent file, not error.
+pub fn read_pre_tool_file(session_id: &str, tool_call_id: &str, file_path: &str) -> Option<String> {
+    if !safe_segment(session_id) {
+        return None;
+    }
+    let conn = database::db::get_connection().ok()?;
+    let id: Option<String> = conn.query_row(
+        "SELECT hash FROM agent_snapshots WHERE session_id = ?1 AND tool_call_id = ?2 ORDER BY created_at ASC LIMIT 1",
+        rusqlite::params![session_id, tool_call_id], |row| row.get(0)
+    ).optional().ok()?;
+    read_file(session_id, &id?, file_path).ok()
+}
+
+fn read_file(session_id: &str, id: &str, file_path: &str) -> io::Result<String> {
+    if !safe_segment(session_id) || !safe_segment(id) {
+        return Err(io::Error::other("invalid snapshot identity"));
+    }
+    let snapshot: FileSnapshot =
+        serde_json::from_slice(&bounded_bytes(&paths::snapshot_file(session_id, id))?)
+            .map_err(io::Error::other)?;
+    let backup = snapshot
+        .backups
+        .get(file_path)
+        .ok_or_else(|| io::Error::other("file not captured"))?;
+    if backup.untrackable {
+        return Err(io::Error::other("untrackable file"));
+    }
+    let Some(hash) = &backup.content_hash else {
+        return Ok(String::new());
+    };
+    if hash.len() != 64 || !hash.bytes().all(|b| b.is_ascii_hexdigit()) {
+        return Err(io::Error::other("invalid backup hash"));
+    }
+    let bytes = bounded_bytes(&paths::backup_file(session_id, hash))?;
+    if bytes.contains(&0) || paths::hash_bytes(&bytes) != *hash {
+        return Err(io::Error::other("unavailable backup"));
+    }
+    String::from_utf8(bytes).map_err(io::Error::other)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn historical_reader_uses_capture_not_current_file_and_rejects_corruption() {
+        let sandbox = test_helpers::test_env::sandbox();
+        let path = sandbox.path().join("review.txt");
+        std::fs::write(&path, "before\n").unwrap();
+        let id = super::super::make_tool_snapshot("review-owner", std::slice::from_ref(&path)).unwrap();
+        let conn = database::db::get_connection().unwrap();
+        crate::persistence::session_snapshots::ensure_tables_with(&conn).unwrap();
+        crate::core::session::persistence::save_snapshot("review-owner", "edit-call", &id).unwrap();
+        std::fs::write(&path, "unrelated later change\n").unwrap();
+        assert_eq!(
+            read_file("review-owner", &id, path.to_str().unwrap()).unwrap(),
+            "before\n"
+        );
+        assert_eq!(
+            read_pre_tool_file("review-owner", "edit-call", path.to_str().unwrap()).as_deref(),
+            Some("before\n")
+        );
+        assert!(
+            read_pre_tool_file("review-owner", "unrelated-call", path.to_str().unwrap()).is_none()
+        );
+        assert!(read_file("other-owner", &id, path.to_str().unwrap()).is_err());
+        assert!(read_file("../outside", &id, path.to_str().unwrap()).is_err());
+        let hash = paths::hash_bytes(b"before\n");
+        std::fs::write(paths::backup_file("review-owner", &hash), "corrupt").unwrap();
+        assert!(read_file("review-owner", &id, path.to_str().unwrap()).is_err());
+    }
+}
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/desktop_exec.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/desktop_exec.rs
index ad4daec1e3..aeb0d739a9 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/desktop_exec.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/desktop_exec.rs
@@ -150,6 +150,16 @@ fn tool_args(script: &str, name: &str, expression: &str) -> Value {
     }
 }
 
+/// Share the same non-evaluating scanner with metadata ingestion. Return each
+/// patch once, before normalization splits a multi-file patch into tool rows.
+pub(super) fn exec_patches(input: &str) -> Vec<String> {
+    tool_invocations(input)
+        .into_iter()
+        .filter(|(name, _)| normalize_tool_name_key(name) == "apply_patch")
+        .filter_map(|(_, expression)| resolve_string_expression(input, expression))
+        .collect()
+}
+
 /// Scan source-order calls while ignoring tool-looking text inside strings.
 fn tool_invocations(script: &str) -> Vec<(&str, &str)> {
     let bytes = script.as_bytes();
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/impact.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/impact.rs
index 6221ce4184..3a24a13b19 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/impact.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/impact.rs
@@ -134,7 +134,7 @@ fn patch_from_codex_args(args: &Value) -> Option<String> {
         .map(str::to_string)
 }
 
-fn accumulate_patch_impact(
+pub(super) fn accumulate_patch_impact(
     patch: &str,
     impact: &mut ImportedHistoryImpactStats,
     touched_files: &mut BTreeSet<String>,
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/index.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/index.rs
index 19f54f5661..1c4264672b 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/index.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/index.rs
@@ -94,6 +94,10 @@ pub fn load_codex_app_for_session(
     Ok(chunks)
 }
 
+pub fn codex_app_review_path(conn: &Connection, session_id: &str) -> Result<PathBuf, String> {
+    resolve_codex_session_path(conn, codex_file_stem_from_session_id(session_id)?)
+}
+
 pub fn load_codex_app_initial_window_for_session(
     conn: &Connection,
     session_id: &str,
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/meta.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/meta.rs
index d7f6e07030..5bb28fedb9 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/meta.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/meta.rs
@@ -88,6 +88,8 @@ struct CodexSessionMetaState {
     touched_files: BTreeSet<String>,
     fallback_impact: ImportedHistoryImpactStats,
     fallback_touched: BTreeSet<String>,
+    #[serde(default)]
+    pending_exec_patches: std::collections::BTreeMap<String, Vec<String>>,
     parent_thread_id: Option<String>,
     source_metadata: CodexAppSourceMetadata,
 }
@@ -226,6 +228,55 @@ impl CodexSessionMetaState {
             &mut self.fallback_impact,
             &mut self.fallback_touched,
         );
+        // A wrapper is an intent, not proof of an edit. Attribute it only when
+        // its matching result confirms completion, including across append scans.
+        let payload = &parsed.payload;
+        if payload.get("type").and_then(Value::as_str) == Some("custom_tool_call")
+            && payload.get("name").and_then(Value::as_str) == Some("exec")
+        {
+            if let (Some(id), Some(input)) = (
+                payload.get("call_id").and_then(Value::as_str),
+                payload.get("input").and_then(Value::as_str),
+            ) {
+                let patches = super::desktop_exec::exec_patches(input);
+                let retained: usize = self
+                    .pending_exec_patches
+                    .values()
+                    .flatten()
+                    .map(String::len)
+                    .sum();
+                if !patches.is_empty()
+                    && self.pending_exec_patches.len() < 64
+                    && retained + patches.iter().map(String::len).sum::<usize>() <= 2 * 1024 * 1024
+                {
+                    self.pending_exec_patches.insert(id.to_string(), patches);
+                }
+            }
+        } else if payload.get("type").and_then(Value::as_str) == Some("custom_tool_call_output") {
+            if let Some(patches) = payload
+                .get("call_id")
+                .and_then(Value::as_str)
+                .and_then(|id| self.pending_exec_patches.remove(id))
+            {
+                let output = super::desktop_exec::codex_tool_output_text(payload.get("output"));
+                if output.starts_with("Script completed")
+                    && !super::desktop_exec::codex_tool_output_failed(
+                        &output,
+                        super::desktop_exec::codex_tool_exit_code(&output),
+                    )
+                    && !output.contains("\"isError\":true")
+                    && !output.contains("\"isError\": true")
+                {
+                    for patch in patches {
+                        super::impact::accumulate_patch_impact(
+                            &patch,
+                            &mut self.fallback_impact,
+                            &mut self.fallback_touched,
+                        );
+                    }
+                }
+            }
+        }
     }
 
     fn finish(
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/mod.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/mod.rs
index a48d109379..096c7e2205 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/mod.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/mod.rs
@@ -25,7 +25,7 @@ pub use index::load_codex_context_usage_for_session;
 
 // Public API — preserved at `...::sources::codex::app::*`.
 pub use index::{
-    codex_thread_id_from_file_stem, list_codex_app_recent_paths,
+    codex_app_review_path, codex_thread_id_from_file_stem, list_codex_app_recent_paths,
     list_codex_app_reconciliation_sessions, list_codex_app_sessions_paginated,
     load_codex_app_cloud_turn_for_session, load_codex_app_for_session,
     load_codex_app_initial_window_for_session, load_codex_app_mobile_tail_window_for_session,
@@ -35,11 +35,11 @@ pub use index::{
 pub use meta::{resolve_codex_transcript_for_thread_id_near_path, CodexTranscriptLocator};
 pub(crate) use normalize::normalize_codex_tool_calls;
 pub use transcript::{
-    load_codex_image_from_path,
     load_codex_app_from_path, load_codex_app_initial_window_from_path,
-    load_codex_app_mobile_tail_window_from_path, load_codex_app_turn_from_path,
-    load_codex_app_window_turn_from_path, visit_codex_app_from_path, CodexAppInitialWindow,
-    CodexAppTurnWindow,
+    load_codex_app_mobile_tail_window_from_path, load_codex_app_review_context_from_path,
+    load_codex_app_review_from_path, load_codex_app_turn_from_path,
+    load_codex_app_window_turn_from_path, load_codex_image_from_path, visit_codex_app_from_path,
+    CodexAppInitialWindow, CodexAppTurnWindow,
 };
 
 // Internal re-exports so the sibling `app_tests.rs` (`use super::*`) resolves.
@@ -74,7 +74,8 @@ pub(crate) use transcript::{
 // as no workspace.
 // v15: count completed `item_completed`/`FileChange` items. Codex Desktop
 // never persists `patch_apply_end`, so every `exec`-wrapped edit tallied zero.
-const CODEX_APP_METADATA_PARSER_VERSION: i64 = 15;
+// v16: retain empty successful results so mixed exec batches preserve edit status/order.
+const CODEX_APP_METADATA_PARSER_VERSION: i64 = 16;
 
 pub type CodexAppSessionRow = ImportedHistorySessionRow;
 pub type CodexAppSessionPage = ImportedHistorySessionPage;
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript.rs
index bf087ebfbb..888e4f095e 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript.rs
@@ -14,6 +14,8 @@ const NATIVE_SOURCE_EVENT_ID_ARG: &str = "__orgiiSourceEventId";
 const NATIVE_SOURCE_EVENT_ID_PREFIX: &str = "orgii_evt_";
 
 pub use reader::{
+    load_codex_app_review_from_path,
+    load_codex_app_review_context_from_path,
     load_codex_app_from_path, load_codex_app_initial_window_from_path,
     load_codex_app_mobile_tail_window_from_path, load_codex_app_turn_from_path,
     load_codex_app_window_turn_from_path, visit_codex_app_from_path, CodexAppInitialWindow,
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/collector.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/collector.rs
index 870f089a32..0ba2d12b77 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/collector.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/collector.rs
@@ -22,6 +22,7 @@ pub(super) enum CodexTranscriptCollectionMode<'a> {
     Visit(&'a mut dyn FnMut(Vec<ActivityChunk>) -> Result<(), String>),
     Initial { recent_turn_count: usize },
     Turn { turn_id: &'a str },
+    ReviewThroughCall { call_id: &'a str },
     FirstTurn,
 }
 
@@ -100,6 +101,13 @@ impl<'a> CodexTranscriptCollector<'a> {
         };
         let turn_id = user_chunk.chunk_id.clone();
         match &self.mode {
+            CodexTranscriptCollectionMode::ReviewThroughCall { call_id } => {
+                self.selected_turn_found = self.current.iter().any(|chunk| {
+                    chunk.result.get("call_id").and_then(Value::as_str) == Some(*call_id)
+                });
+                self.output.append(&mut self.current);
+                return Ok(());
+            }
             CodexTranscriptCollectionMode::Full => {
                 self.output.append(&mut self.current);
                 return Ok(());
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/parser.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/parser.rs
index 6e9941bb98..7e090ccba4 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/parser.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/parser.rs
@@ -1,5 +1,5 @@
 use std::fs;
-use std::io::{BufRead, BufReader, Seek, SeekFrom};
+use std::io::{BufRead, BufReader, Read, Seek, SeekFrom};
 use std::path::Path;
 
 use core_types::activity::ActivityChunk;
@@ -110,6 +110,24 @@ pub(super) fn parse_codex_app_from_path_with_mode<'a>(
     mode: CodexTranscriptCollectionMode<'a>,
     start_offset: u64,
     initial_sequence: usize,
+) -> Result<CodexTranscriptLoad, String> {
+    parse_codex_app_bounded(
+        session_id,
+        path,
+        mode,
+        start_offset,
+        initial_sequence,
+        u64::MAX,
+    )
+}
+
+pub(super) fn parse_codex_app_bounded<'a>(
+    session_id: &'a str,
+    path: &Path,
+    mode: CodexTranscriptCollectionMode<'a>,
+    start_offset: u64,
+    initial_sequence: usize,
+    max_bytes: u64,
 ) -> Result<CodexTranscriptLoad, String> {
     let mut file = fs::File::open(path)
         .map_err(|err| format!("Failed to open Codex history {}: {err}", path.display()))?;
@@ -121,7 +139,7 @@ pub(super) fn parse_codex_app_from_path_with_mode<'a>(
             )
         })?;
     }
-    let mut reader = BufReader::new(file);
+    let mut reader = BufReader::new(file.take(max_bytes));
 
     let mut collector = CodexTranscriptCollector::new(session_id, mode);
     let mut pending_tool_calls: imported_history::PendingCallMap<Vec<ImportedToolCall>> =
@@ -170,6 +188,9 @@ pub(super) fn parse_codex_app_from_path_with_mode<'a>(
             break;
         }
         next_byte_offset = next_byte_offset.saturating_add(bytes_read as u64);
+        if next_byte_offset.saturating_sub(start_offset) >= max_bytes {
+            return Err("Codex review exceeds transcript byte budget".into());
+        }
         strip_ignored_embedded_images(&mut line);
         let trimmed = line.trim();
         if trimmed.is_empty() {
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/reader.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/reader.rs
index 81969f6538..a3517ae26f 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/reader.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/reader.rs
@@ -28,6 +28,61 @@ use super::CODEX_PROVIDER_SLUG;
 const CODEX_TURN_HEADER_PROBE_BYTES: u64 = 8 * 1024 * 1024;
 const CODEX_MOBILE_HISTORY_SCAN_MAX_BYTES: u64 = 32 * 1024 * 1024;
 
+/// Bounded context for historical file replay in a large rollout. Seek near
+/// the selected turn and include at most eight earlier turns / 32 MiB, then
+/// stop after the turn containing the exact provider call. No whole-log scan.
+pub fn load_codex_app_review_context_from_path(
+    session_id: &str,
+    path: &Path,
+    turn_id: &str,
+    call_id: &str,
+) -> Result<Vec<ActivityChunk>, String> {
+    let signature = codex_transcript_file_signature(path)?;
+    let offset = codex_turn_offset_cache()
+        .lock()
+        .unwrap_or_else(|e| e.into_inner())
+        .get(path, signature, turn_id)
+        .map(|entry| entry.0)
+        .or_else(|| codex_lazy_turn_offset(turn_id))
+        .filter(|offset| *offset < signature.size_bytes)
+        .ok_or("Review turn has no bounded source offset")?;
+    let previous = find_recent_codex_user_offsets_bounded(path, offset, 8, 32 * 1024 * 1024)?;
+    let start = previous
+        .iter()
+        .map(|e| e.byte_offset)
+        .min()
+        .unwrap_or(offset);
+    let (chunks, _, _) = super::parser::parse_codex_app_bounded(
+        session_id,
+        path,
+        CodexTranscriptCollectionMode::ReviewThroughCall { call_id },
+        start,
+        codex_lazy_turn_sequence(start),
+        64 * 1024 * 1024,
+    )?;
+    if codex_transcript_file_signature(path)? != signature {
+        return Err("History changed during review; retry".into());
+    }
+    Ok(chunks)
+}
+
+/// Explicit review only: reject oversized histories instead of claiming an
+/// incomplete suffix represents the whole session. Never updates raw history.
+pub fn load_codex_app_review_from_path(
+    session_id: &str,
+    path: &Path,
+) -> Result<Vec<ActivityChunk>, String> {
+    let (chunks, _, _) = super::parser::parse_codex_app_bounded(
+        session_id,
+        path,
+        CodexTranscriptCollectionMode::Full,
+        0,
+        0,
+        64 * 1024 * 1024,
+    )?;
+    Ok(chunks)
+}
+
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CodexAppInitialWindow {
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/exec_results.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/exec_results.rs
index 576a30cfa5..233c425216 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/exec_results.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/exec_results.rs
@@ -5,6 +5,7 @@ pub(super) struct CodexExecResult {
     pub(super) output: String,
     pub(super) session_id: Option<String>,
     pub(super) exit_code: Option<i64>,
+    pub(super) empty_tool_value: bool,
 }
 
 pub(super) fn append_incremental_output(existing: &mut String, next: &str) {
@@ -74,6 +75,17 @@ fn codex_exec_results_from_value(value: Value) -> Vec<CodexExecResult> {
 
 fn codex_exec_result_from_value(value: Value) -> Option<CodexExecResult> {
     let object = value.as_object()?;
+    // apply_patch returns an empty successful value. Keep its position in a
+    // Desktop exec batch; dropping it assigns the following shell's exit/
+    // background status to the already-completed edit.
+    if object.is_empty() {
+        return Some(CodexExecResult {
+            output: "{}".into(),
+            session_id: None,
+            exit_code: Some(0),
+            empty_tool_value: true,
+        });
+    }
     if !object.contains_key("output")
         && !object.contains_key("session_id")
         && !object.contains_key("sessionId")
@@ -83,6 +95,7 @@ fn codex_exec_result_from_value(value: Value) -> Option<CodexExecResult> {
         return None;
     }
     Some(CodexExecResult {
+        empty_tool_value: false,
         output: object
             .get("output")
             .and_then(Value::as_str)
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/mod.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/mod.rs
index dcca63eec4..4e39e20d9a 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/mod.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app/transcript/tool_calls/mod.rs
@@ -107,6 +107,17 @@ pub(super) fn resolve_codex_tool_outputs(
     background_tool_calls: &mut imported_history::PendingCallMap<PendingBackgroundToolCall>,
 ) {
     let mut results = codex_exec_results(output_value);
+    // An empty value has no explicit success flag. Do not promote it over an
+    // outer script failure; only typed per-command results can stand alone.
+    let envelope = fallback_output.trim_start();
+    if envelope.starts_with("Script failed") || envelope.starts_with("Script error") {
+        for result in &mut results {
+            if result.empty_tool_value {
+                result.exit_code = Some(1);
+                result.output = fallback_output.to_owned();
+            }
+        }
+    }
     if results.len() == calls.len() {
         for (call, result) in calls.into_iter().zip(results.drain(..)) {
             resolve_codex_call_group(
@@ -121,7 +132,7 @@ pub(super) fn resolve_codex_tool_outputs(
         }
         return;
     }
-    if results.len() == 1 {
+    if results.len() == 1 && !results[0].empty_tool_value {
         resolve_codex_call_group(
             transcript_session_id,
             calls,
diff --git a/src-tauri/crates/orgtrack-core/src/sources/codex/app_tests.rs b/src-tauri/crates/orgtrack-core/src/sources/codex/app_tests.rs
index 2cfd84f9b1..33794c71cc 100644
--- a/src-tauri/crates/orgtrack-core/src/sources/codex/app_tests.rs
+++ b/src-tauri/crates/orgtrack-core/src/sources/codex/app_tests.rs
@@ -1,6 +1,60 @@
 use super::*;
 use crate::sources::imported_history::client_origin::ImportedClientOrigin;
 
+#[test]
+fn codex_exec_empty_patch_result_stays_completed_before_shell_failure_or_background() {
+    let dir = std::env::temp_dir().join(format!("orgii-mixed-results-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("mixed-results.jsonl");
+    for (shell, envelope, patch_success) in [
+        (json!({"exit_code":1,"output":"failed"}), "Script completed", true),
+        (json!({"session_id":71,"output":"running"}), "Script completed", true),
+        (json!({"exit_code":1,"output":"failed"}), "Script failed", false),
+    ] {
+        let patch = "*** Begin Patch\n*** Add File: a\n+whole file\n*** End Patch";
+        let script = format!(
+            "text(await tools.apply_patch({})); text(await tools.exec_command({{cmd:\"check\"}}));",
+            serde_json::to_string(patch).unwrap()
+        );
+        let lines = [
+            json!({"type":"response_item","payload":{"type":"custom_tool_call","name":"exec","call_id":"mixed","input":script}}),
+            json!({"type":"response_item","payload":{"type":"custom_tool_call_output","call_id":"mixed","output":[{"type":"input_text","text":envelope},{"type":"input_text","text":"{}"},{"type":"input_text","text":shell.to_string()}]}}),
+        ];
+        std::fs::write(
+            &path,
+            lines
+                .iter()
+                .map(ToString::to_string)
+                .collect::<Vec<_>>()
+                .join("\n"),
+        )
+        .unwrap();
+        let chunks = load_codex_app_from_path("codexapp-mixed", &path).unwrap();
+        let edit = chunks
+            .iter()
+            .find(|chunk| chunk.result["call_id"] == "mixed:part-0")
+            .expect("completed patch");
+        assert_eq!(edit.result["success"], patch_success);
+        assert_eq!(edit.result["status"], if patch_success { "completed" } else { "failed" });
+        assert_eq!(edit.result["exit_code"], if patch_success { 0 } else { 1 });
+        assert_eq!(
+            chunks[0].result["call_id"], "mixed:part-0",
+            "a following shell must not delay the edit"
+        );
+        let command = chunks
+            .iter()
+            .find(|chunk| chunk.result["call_id"] == "mixed:part-1")
+            .unwrap();
+        if shell.get("exit_code").is_some() {
+            assert_eq!(command.result["success"], false);
+        } else {
+            assert_ne!(command.result["status"], "completed");
+        }
+    }
+    std::fs::remove_file(&path).unwrap();
+    std::fs::remove_dir(&dir).unwrap();
+}
+
 #[test]
 fn includes_codex_session_dir_candidates() {
     let home = std::path::Path::new("/Users/example");
@@ -1794,6 +1848,50 @@ fn codex_rollout_without_session_start_still_recovers_exec_apply_patch() {
     std::fs::remove_dir(&temp_dir).expect("remove temp dir");
 }
 
+#[test]
+fn codex_metadata_counts_only_completed_exec_patches() {
+    let path =
+        std::env::temp_dir().join(format!("rollout-exec-impact-{}.jsonl", std::process::id()));
+    let patch = "*** Begin Patch\n*** Add File: src/a.ts\n+hello\n*** End Patch";
+    let call = json!({"timestamp":"2026-09-11T00:00:00Z", "payload": {
+        "type":"custom_tool_call", "name":"exec", "call_id":"c1",
+        "input":format!("text(await tools.apply_patch({}));", serde_json::to_string(patch).unwrap())
+    }});
+    for (output, expected) in [
+        ("Script completed\nOutput:\n{}", 1),
+        ("Script failed", 0),
+        ("", 0),
+    ] {
+        std::fs::write(
+            &path,
+            format!(
+                "{}\n{}\n",
+                call,
+                json!({"payload": {
+                    "type":"custom_tool_call_output", "call_id":"c1",
+                    "output":[{"type":"input_text","text":output}]
+                }})
+            ),
+        )
+        .unwrap();
+        let (source_mtime_ms, source_size_bytes) =
+            imported_paths::file_metadata_signature(&path, "Codex").unwrap();
+        let record = ImportedHistoryDiscoveredRecord {
+            source_session_id: "rollout-exec-impact".into(),
+            source_path: path.clone(),
+            source_record_key: "rollout-exec-impact".into(),
+            source_mtime_ms,
+            source_size_bytes,
+            source_fingerprint: String::new(),
+            parser_version: CODEX_APP_METADATA_PARSER_VERSION,
+        };
+        let meta = parse_codex_session_meta(&record).unwrap().unwrap();
+        assert_eq!(meta.impact.files_changed, expected);
+        assert_eq!(meta.impact.lines_added, expected);
+    }
+    std::fs::remove_file(path).unwrap();
+}
+
 #[test]
 fn codex_desktop_exec_unwraps_web_search_query() {
     let payload = json!({
diff --git a/src-tauri/src/agent_sessions/cli/hook_approvals.rs b/src-tauri/src/agent_sessions/cli/hook_approvals.rs
index cf58d0904f..89e481ecb0 100644
--- a/src-tauri/src/agent_sessions/cli/hook_approvals.rs
+++ b/src-tauri/src/agent_sessions/cli/hook_approvals.rs
@@ -69,6 +69,37 @@ impl HookApprovalDecision {
 struct PendingHookApproval {
     session_id: String,
     sender: oneshot::Sender<HookApprovalDecision>,
+    tool_name: String,
+    tool_args: serde_json::Value,
+    created_at_ms: i64,
+}
+
+pub fn pending_snapshot_for_session(
+    session_id: Option<&str>,
+    limit: usize,
+) -> Result<Vec<serde_json::Value>, String> {
+    let pending = PENDING_HOOK_APPROVALS
+        .lock()
+        .map_err(|_| "Hook approval registry lock is poisoned")?;
+    Ok(pending
+        .iter()
+        .filter(|(_, entry)| session_id.is_none_or(|id| entry.session_id == id))
+        .take(limit)
+        .map(|(id, entry)| {
+            serde_json::json!({
+                "kind": "permission", "origin": "cli_hook", "sessionId": entry.session_id,
+                "requestId": id, "toolName": entry.tool_name, "toolCallId": id,
+                "toolArgs": entry.tool_args, "createdAtMs": entry.created_at_ms,
+            })
+        })
+        .collect())
+}
+
+fn pending_changed(session_id: &str) {
+    websocket_handler::broadcast(
+        serde_json::json!({"type": "permission:pending_changed", "session_id": session_id})
+            .to_string(),
+    );
 }
 
 /// Pending hook approvals keyed by `request_id`.
@@ -99,26 +130,7 @@ pub fn unregister_session(session_id: &str) {
     if let Ok(mut pending) = PENDING_HOOK_APPROVALS.lock() {
         pending.retain(|_, entry| entry.session_id != session_id);
     }
-}
-
-fn session_permission_mode(session_id: &str) -> Option<CliPermissionMode> {
-    SESSION_PERMISSION_MODES
-        .lock()
-        .ok()
-        .and_then(|map| map.get(session_id).copied())
-}
-
-/// Whether hook approvals should block for this session.
-///
-/// Only `Manual` launches get an interactive gate: AutoEdit /
-/// FullPermission / Plan flags already tell Claude what to auto-approve,
-/// and an unknown session (restarted desktop, external session that
-/// spoofed the env var) must never be blocked by a GUI it can't reach.
-fn session_wants_interactive_approval(session_id: &str) -> bool {
-    matches!(
-        session_permission_mode(session_id),
-        Some(CliPermissionMode::Manual)
-    )
+    pending_changed(session_id);
 }
 
 fn broadcast_permission_request(
@@ -154,23 +166,32 @@ pub async fn park_hook_approval(
     tool_args: serde_json::Value,
     timeout: Duration,
 ) -> HookApprovalDecision {
-    if !session_wants_interactive_approval(session_id) {
-        return HookApprovalDecision::Passthrough;
-    }
-
     let request_id = format!("hookperm-{}", uuid::Uuid::new_v4());
     let (tx, rx) = oneshot::channel::<HookApprovalDecision>();
-    match PENDING_HOOK_APPROVALS.lock() {
-        Ok(mut pending) => {
-            pending.insert(
-                request_id.clone(),
-                PendingHookApproval {
-                    session_id: session_id.to_string(),
-                    sender: tx,
-                },
-            );
+    {
+        // Hold launch ownership through insertion: unregister cannot finish
+        // between a Manual check and parking a new request for that session.
+        let Ok(modes) = SESSION_PERMISSION_MODES.lock() else {
+            return HookApprovalDecision::Passthrough;
+        };
+        if !matches!(modes.get(session_id), Some(CliPermissionMode::Manual)) {
+            return HookApprovalDecision::Passthrough;
+        }
+        match PENDING_HOOK_APPROVALS.lock() {
+            Ok(mut pending) => {
+                pending.insert(
+                    request_id.clone(),
+                    PendingHookApproval {
+                        session_id: session_id.to_string(),
+                        sender: tx,
+                        tool_name: tool_name.to_string(),
+                        tool_args: tool_args.clone(),
+                        created_at_ms: chrono::Utc::now().timestamp_millis(),
+                    },
+                );
+            }
+            Err(_) => return HookApprovalDecision::Passthrough,
         }
-        Err(_) => return HookApprovalDecision::Passthrough,
     }
 
     let _lifetime = super::permission_lifecycle::PermissionLifetime::new(
@@ -202,8 +223,9 @@ pub async fn park_hook_approval(
 }
 
 fn remove_pending_hook_approval(request_id: &str) {
-    if let Ok(mut pending) = PENDING_HOOK_APPROVALS.lock() {
-        pending.remove(request_id);
+    let removed = PENDING_HOOK_APPROVALS.lock().ok().and_then(|mut pending| pending.remove(request_id));
+    if let Some(approval) = removed {
+        pending_changed(&approval.session_id);
     }
 }
 
@@ -226,8 +248,7 @@ pub fn resolve_hook_approval(
                 .get(request_id)
                 .filter(|entry| entry.session_id == session_id)
                 .map(|_| request_id.to_string()),
-            // No request id: fall back to the session's only
-            // pending entry — Claude blocks on one permission at a time.
+            // Only legacy callers omitting an ID may select by session.
             None => pending
                 .iter()
                 .find(|(_, entry)| entry.session_id == session_id)
@@ -237,6 +258,7 @@ pub fn resolve_hook_approval(
             key.ok_or_else(|| format!("No pending hook approval for session {session_id}"))?;
         pending.remove(&key).expect("key was just found")
     };
+    pending_changed(session_id);
 
     let decision = if approved {
         HookApprovalDecision::Allow
@@ -460,4 +482,80 @@ mod tests {
         assert_resolved(&session);
         unregister_session(&session);
     }
+
+    #[tokio::test]
+    async fn stale_foreign_and_cancelled_requests_cannot_resolve_another_prompt() {
+        let session = unique_session("scoped-snapshot");
+        register_session_permission_mode(&session, CliPermissionMode::Manual);
+        let park = tokio::spawn({
+            let session = session.clone();
+            async move {
+                park_hook_approval(
+                    &session,
+                    "Bash",
+                    serde_json::json!({"command":"pwd"}),
+                    Duration::from_secs(10),
+                )
+                .await
+            }
+        });
+        for _ in 0..100 {
+            if has_pending_hook_approval(&session, None) {
+                break;
+            }
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+        let rows = pending_snapshot_for_session(Some(&session), 10).unwrap();
+        assert_eq!(rows.len(), 1);
+        let id = rows[0]["requestId"].as_str().unwrap();
+        assert_eq!(rows[0]["toolArgs"]["command"], "pwd");
+        assert!(resolve_hook_approval(&session, Some("stale"), true).is_err());
+        assert!(resolve_hook_approval("foreign", Some(id), true).is_err());
+        assert!(!has_pending_hook_approval("foreign", Some(id)));
+        assert_eq!(
+            pending_snapshot_for_session(Some(&session), 10)
+                .unwrap()
+                .len(),
+            1
+        );
+        park.abort();
+        let _ = park.await;
+        assert!(pending_snapshot_for_session(Some(&session), 10)
+            .unwrap()
+            .is_empty());
+        unregister_session(&session);
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn concurrent_session_end_cannot_leave_a_new_parked_request() {
+        for _ in 0..32 {
+            let session = unique_session("unregister-race");
+            register_session_permission_mode(&session, CliPermissionMode::Manual);
+            let barrier = std::sync::Arc::new(std::sync::Barrier::new(2));
+            let park = tokio::spawn({
+                let session = session.clone();
+                let barrier = barrier.clone();
+                async move {
+                    barrier.wait();
+                    park_hook_approval(
+                        &session,
+                        "Bash",
+                        serde_json::json!({}),
+                        Duration::from_secs(5),
+                    )
+                    .await
+                }
+            });
+            barrier.wait();
+            unregister_session(&session);
+            let decision = tokio::time::timeout(Duration::from_secs(1), park)
+                .await
+                .expect("session end releases pending wait")
+                .unwrap();
+            assert_eq!(decision, HookApprovalDecision::Passthrough);
+            assert!(pending_snapshot_for_session(Some(&session), 10)
+                .unwrap()
+                .is_empty());
+        }
+    }
 }
diff --git a/src-tauri/src/agent_sessions/cli/parsers/acp_common/approval.rs b/src-tauri/src/agent_sessions/cli/parsers/acp_common/approval.rs
index eb7412b55a..b2c8975c35 100644
--- a/src-tauri/src/agent_sessions/cli/parsers/acp_common/approval.rs
+++ b/src-tauri/src/agent_sessions/cli/parsers/acp_common/approval.rs
@@ -25,6 +25,10 @@ pub struct ApprovalResponse {
 struct PendingAcpApproval {
     session_id: String,
     sender: oneshot::Sender<ApprovalResponse>,
+    tool_name: String,
+    tool_args: Value,
+    tool_call_id: String,
+    created_at_ms: i64,
 }
 
 type PendingApprovalsMap = HashMap<String, PendingAcpApproval>;
@@ -35,6 +39,48 @@ type PendingApprovalsMap = HashMap<String, PendingAcpApproval>;
 static PENDING_APPROVALS: std::sync::LazyLock<Arc<Mutex<PendingApprovalsMap>>> =
     std::sync::LazyLock::new(|| Arc::new(Mutex::new(HashMap::new())));
 
+pub fn pending_snapshot_for_session(
+    session_id: Option<&str>,
+    limit: usize,
+) -> Result<Vec<Value>, String> {
+    let pending = PENDING_APPROVALS
+        .lock()
+        .map_err(|_| "ACP approval registry lock is poisoned")?;
+    Ok(pending
+        .iter()
+        .filter(|(_, entry)| session_id.is_none_or(|id| entry.session_id == id))
+        .take(limit)
+        .map(|(id, entry)| {
+            serde_json::json!({
+                "kind": "permission", "origin": "acp", "sessionId": entry.session_id,
+                "requestId": id, "toolName": entry.tool_name, "toolCallId": entry.tool_call_id,
+                "toolArgs": entry.tool_args, "createdAtMs": entry.created_at_ms,
+            })
+        })
+        .collect())
+}
+
+fn pending_changed(session_id: &str) {
+    crate::api::websocket_handler::broadcast(
+        serde_json::json!({"type": "permission:pending_changed", "session_id": session_id})
+            .to_string(),
+    );
+}
+
+/// Lives with the protocol wait, including cancellation of its owning future.
+pub(super) struct AcpApprovalGuard(String);
+impl Drop for AcpApprovalGuard {
+    fn drop(&mut self) {
+        let entry = PENDING_APPROVALS
+            .lock()
+            .ok()
+            .and_then(|mut pending| pending.remove(&self.0));
+        if let Some(entry) = entry {
+            pending_changed(&entry.session_id);
+        }
+    }
+}
+
 /// How long an ACP permission request waits for the user before the
 /// legacy auto-approve fallback fires.
 pub const ACP_APPROVAL_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(300);
@@ -55,7 +101,7 @@ pub async fn resolve_approval(
     let entry = {
         let mut pending = PENDING_APPROVALS
             .lock()
-            .expect("ACP approval registry poisoned");
+            .map_err(|_| "ACP approval registry lock is poisoned")?;
         let key = match request_id {
             Some(request_id) => pending
                 .get(request_id)
@@ -69,6 +115,7 @@ pub async fn resolve_approval(
         let key = key.ok_or_else(|| format!("No pending approval for session {}", session_id))?;
         pending.remove(&key).expect("key was just found")
     };
+    pending_changed(session_id);
     entry
         .sender
         .send(ApprovalResponse {
@@ -83,6 +130,9 @@ pub async fn resolve_approval(
 /// the protocol loop awaits on.
 pub(super) async fn register_acp_approval(
     session_id: &str,
+    tool_name: &str,
+    tool_args: &Value,
+    tool_call_id: Option<&str>,
 ) -> (
     String,
     oneshot::Receiver<ApprovalResponse>,
@@ -98,21 +148,21 @@ pub(super) async fn register_acp_approval(
             PendingAcpApproval {
                 session_id: session_id.to_string(),
                 sender: tx,
+                tool_name: tool_name.to_string(),
+                tool_args: tool_args.clone(),
+                tool_call_id: tool_call_id.unwrap_or(&request_id).to_string(),
+                created_at_ms: chrono::Utc::now().timestamp_millis(),
             },
         );
+    pending_changed(session_id);
     let lifetime = crate::agent_sessions::cli::permission_lifecycle::PermissionLifetime::new(
-        session_id,
-        &request_id,
-        remove_pending_acp_approval,
+        session_id, &request_id, remove_pending_acp_approval,
     );
     (request_id, rx, lifetime)
 }
 
 fn remove_pending_acp_approval(request_id: &str) {
-    PENDING_APPROVALS
-        .lock()
-        .expect("ACP approval registry poisoned")
-        .remove(request_id);
+    drop(AcpApprovalGuard(request_id.to_string()));
 }
 
 /// Await a parked approval. On timeout or a dropped sender the legacy
@@ -126,10 +176,7 @@ pub(super) async fn await_acp_approval(
         Ok(Ok(resp)) => resp,
         _ => {
             tracing::info!("[ACP] Approval timed out or channel closed — auto-approving");
-            PENDING_APPROVALS
-                .lock()
-                .expect("ACP approval registry poisoned")
-                .remove(request_id);
+            drop(AcpApprovalGuard(request_id.to_string()));
             ApprovalResponse {
                 approved: true,
                 always_allow: false,
@@ -297,7 +344,7 @@ mod lifecycle_tests {
     async fn permission_lifetime_cleans_timeout_response_and_cancel() {
         for mode in ["timeout", "response", "cancel"] {
             let session = format!("acp-lifetime-{}", uuid::Uuid::new_v4());
-            let (id, rx, lifetime) = register_acp_approval(&session).await;
+            let (id, rx, lifetime) = register_acp_approval(&session, "read_file", &Value::Null, None).await;
             assert!(resolve_approval(&session, Some("stale-id"), true, false)
                 .await
                 .is_err());
@@ -335,3 +382,58 @@ mod lifecycle_tests {
         }
     }
 }
+
+#[cfg(test)]
+mod pending_tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn scoped_snapshot_rejects_stale_foreign_and_duplicate_replies() {
+        let session = format!("acp-test-{}", uuid::Uuid::new_v4());
+        let (id, rx, guard) = register_acp_approval(
+            &session,
+            "read_file",
+            &serde_json::json!({"path":"a.rs"}),
+            Some("call-a"),
+        )
+        .await;
+        let rows = pending_snapshot_for_session(Some(&session), 10).unwrap();
+        assert_eq!(rows.len(), 1);
+        assert_eq!(rows[0]["toolCallId"], "call-a");
+        assert!(resolve_approval(&session, Some("stale"), true, true)
+            .await
+            .is_err());
+        assert!(resolve_approval("foreign", Some(&id), true, true)
+            .await
+            .is_err());
+        assert_eq!(
+            pending_snapshot_for_session(Some(&session), 10)
+                .unwrap()
+                .len(),
+            1
+        );
+        resolve_approval(&session, Some(&id), false, false)
+            .await
+            .unwrap();
+        assert!(!rx.await.unwrap().approved);
+        assert!(resolve_approval(&session, Some(&id), true, true)
+            .await
+            .is_err());
+        drop(guard);
+        assert!(pending_snapshot_for_session(Some(&session), 10)
+            .unwrap()
+            .is_empty());
+    }
+
+    #[tokio::test]
+    async fn dropped_owner_removes_recoverable_request() {
+        let session = format!("acp-test-{}", uuid::Uuid::new_v4());
+        let (_id, rx, guard) =
+            register_acp_approval(&session, "read_file", &Value::Null, None).await;
+        drop(guard);
+        assert!(rx.await.is_err());
+        assert!(pending_snapshot_for_session(Some(&session), 10)
+            .unwrap()
+            .is_empty());
+    }
+}
diff --git a/src-tauri/src/agent_sessions/cli/parsers/acp_common/mod.rs b/src-tauri/src/agent_sessions/cli/parsers/acp_common/mod.rs
index ea7abaec25..f440ee2641 100644
--- a/src-tauri/src/agent_sessions/cli/parsers/acp_common/mod.rs
+++ b/src-tauri/src/agent_sessions/cli/parsers/acp_common/mod.rs
@@ -20,7 +20,9 @@ use serde_json::Value;
 
 use core_types::activity::ActivityChunk;
 
-pub use approval::{resolve_approval, ApprovalResponse, ACP_APPROVAL_TIMEOUT};
+pub use approval::{
+    pending_snapshot_for_session, resolve_approval, ApprovalResponse, ACP_APPROVAL_TIMEOUT,
+};
 pub(crate) use parser::AcpNotificationParser;
 pub use protocol::run_acp_protocol;
 
diff --git a/src-tauri/src/agent_sessions/cli/parsers/acp_common/protocol.rs b/src-tauri/src/agent_sessions/cli/parsers/acp_common/protocol.rs
index d9dd2a8ff2..dac77f655a 100644
--- a/src-tauri/src/agent_sessions/cli/parsers/acp_common/protocol.rs
+++ b/src-tauri/src/agent_sessions/cli/parsers/acp_common/protocol.rs
@@ -431,7 +431,9 @@ async fn process_notification<A: AcpAgentAdapter>(
 
                 // Register the oneshot BEFORE broadcasting so a fast
                 // frontend response always finds the entry.
-                let (request_id, rx, permission_lifetime) = register_acp_approval(session_id).await;
+                let (request_id, rx, permission_lifetime) = register_acp_approval(
+                    session_id, &tool_name, &info.tool_args, info.tool_call_id.as_deref(),
+                ).await;
 
                 // Emit an ask_user_permissions chunk (transcript record)
                 let mut chunk =
diff --git a/src-tauri/src/api/mobile_bridge/adapters/change_review.rs b/src-tauri/src/api/mobile_bridge/adapters/change_review.rs
new file mode 100644
index 0000000000..8fe4c0fbdd
--- /dev/null
+++ b/src-tauri/src/api/mobile_bridge/adapters/change_review.rs
@@ -0,0 +1,449 @@
+//! Read-only, bounded historical change review. Never reads today's files to
+//! fill missing historical snapshots, and never labels summed edits as net diff.
+
+use std::collections::BTreeMap;
+
+use database::db::get_connection;
+use orgtrack_core::canonical::SessionDiffChunkRecord;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+use crate::api::mobile_bridge::rpc::RpcError;
+use crate::orgtrack::imported_changes::reconstruction::{self, FileVersion, RecordedEdit};
+
+const MAX_RECORDS: usize = 500;
+const MAX_BYTES: usize = 2 * 1024 * 1024;
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+struct Params {
+    session_id: String,
+    round_id: Option<String>,
+    file_path: Option<String>,
+    scope: Scope,
+}
+
+#[derive(Debug, Deserialize, PartialEq)]
+#[serde(rename_all = "snake_case")]
+enum Scope {
+    Turn,
+    Session,
+    Workspace,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ChangeFile {
+    path: String,
+    additions: Option<i32>,
+    deletions: Option<i32>,
+    /// Ordered edit patches; NOT a fabricated whole-file or net snapshot.
+    patches: Vec<String>,
+    before: Option<String>,
+    after: Option<String>,
+    availability: &'static str,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ChangeReview {
+    files: Vec<ChangeFile>,
+    complete: bool,
+}
+
+fn attach_version(file: &mut ChangeFile, version: FileVersion) {
+    if version.before.is_some() || version.after.is_some() {
+        file.before = version.before;
+        file.after = version.after;
+        file.availability = "reconstructed_from_history";
+    }
+}
+
+fn project(chunks: Vec<SessionDiffChunkRecord>) -> ChangeReview {
+    let mut grouped: BTreeMap<String, Vec<SessionDiffChunkRecord>> = BTreeMap::new();
+    for chunk in chunks {
+        grouped
+            .entry(chunk.file_path.clone())
+            .or_default()
+            .push(chunk);
+    }
+    let files = grouped
+        .into_iter()
+        .map(|(path, chunks)| {
+            // Even exact chunk contents may be local old_string/new_string spans.
+            // Multiple patches may overlap or reverse each other; summing their
+            // counters would violate the net-change contract.
+            let single = (chunks.len() == 1)
+                .then(|| &chunks[0])
+                .and_then(|c| c.diff.as_deref())
+                .filter(|d| !d.is_empty())
+                .and_then(super::change_review_stats::numstat);
+            let patches = chunks
+                .iter()
+                .filter_map(|chunk| chunk.diff.clone())
+                .collect();
+            ChangeFile {
+                path,
+                additions: single.map(|(added, _)| added),
+                deletions: single.map(|(_, removed)| removed),
+                patches,
+                before: None,
+                after: None,
+                availability: "patch_only",
+            }
+        })
+        .collect();
+    ChangeReview {
+        files,
+        complete: false,
+    }
+}
+
+/// Read historical artifacts without claiming partial fragments are full files.
+pub async fn historical_changes(params: &Value) -> Result<Value, RpcError> {
+    let params: Params = serde_json::from_value(params.clone())
+        .map_err(|_| RpcError::invalid_params("invalid historical change request"))?;
+    for value in std::iter::once(&params.session_id)
+        .chain(params.round_id.iter())
+        .chain(params.file_path.iter())
+    {
+        if value.trim().is_empty() || value.len() > 1024 {
+            return Err(RpcError::invalid_params(
+                "invalid session or round identity",
+            ));
+        }
+    }
+    if params.scope == Scope::Workspace {
+        return super::workspace_changes::read(&params.session_id, params.file_path.as_deref())
+            .await;
+    }
+    if params.scope == Scope::Turn && params.round_id.is_none() {
+        return Err(RpcError::invalid_params(
+            "roundId is required for turn scope",
+        ));
+    }
+    if params.scope == Scope::Turn {
+        // The transcript is the authority for a round, including imported
+        // history not yet materialized in the orgtrack artifact index.
+        let round = params.round_id.as_deref().unwrap();
+        let events = super::session::authoritative_round_events(&params.session_id, round).await?;
+        let mut chunks = Vec::new();
+        let mut bytes = 0;
+        let mut first_call = None;
+        let mut history = Vec::new();
+        for (index, event) in events.into_iter().enumerate() {
+            if event.display_status != core_types::session_event::EventDisplayStatus::Completed {
+                continue;
+            }
+            if let Some(core_types::extracted::ExtractedData::Edit(ref edit)) = event.extracted {
+                let context = orgtrack_core::edit_extraction::EditArtifactContext {
+                    source: "mobile_round_projection".into(),
+                    source_session_id: None,
+                    session_id: params.session_id.clone(),
+                    source_event_id: Some(event.id.clone()),
+                    turn_id: Some(round.to_owned()),
+                    sequence_index: index as i64,
+                    timestamp: None,
+                    workspace_path: None,
+                    metadata: Default::default(),
+                };
+                let artifacts =
+                    orgtrack_core::edit_extraction::artifacts_from_extracted_edit(&context, edit);
+                if params.file_path.is_some() {
+                    history.push(RecordedEdit::from_event(
+                        &event,
+                        artifacts
+                            .chunks
+                            .iter()
+                            .map(|c| c.file_path.clone())
+                            .collect(),
+                    ));
+                    bytes += history
+                        .last()
+                        .and_then(|e| e.patch.as_ref())
+                        .map_or(0, String::len);
+                }
+                for chunk in artifacts.chunks {
+                    bytes += chunk.diff.as_ref().map_or(0, String::len)
+                        + chunk.old_content.as_ref().map_or(0, String::len)
+                        + chunk.new_content.as_ref().map_or(0, String::len);
+                    if bytes > MAX_BYTES || chunks.len() >= MAX_RECORDS {
+                        return Err(RpcError::invalid_params("round exceeds review budget"));
+                    }
+                    if params
+                        .file_path
+                        .as_ref()
+                        .is_none_or(|path| path == &chunk.file_path)
+                    {
+                        if chunks.is_empty() {
+                            first_call = event.call_id.clone();
+                        }
+                        chunks.push(chunk);
+                    }
+                }
+            }
+        }
+        let selected: Vec<_> = history
+            .iter()
+            .filter(|e| {
+                params
+                    .file_path
+                    .as_ref()
+                    .is_some_and(|path| e.paths.contains(path))
+            })
+            .collect();
+        let range = selected
+            .first()
+            .map(|e| e.event_id.clone())
+            .zip(selected.last().map(|e| e.event_id.clone()));
+        let mut result = project(chunks);
+        if let (Some(path), Some(range)) = (params.file_path.as_ref(), range) {
+            let id = params.session_id.clone();
+            let path = path.clone();
+            let round = round.to_owned();
+            let version = tokio::task::spawn_blocking(move || -> Result<FileVersion, String> {
+                let before = first_call.and_then(|call| {
+                    agent_core::tools::file_history::read_pre_tool_file(&id, &call, &path)
+                });
+                let local = reconstruction::replay(&history, &path, None, before);
+                if local.before.is_some() || local.after.is_some() {
+                    return Ok(local);
+                }
+                let conn = get_connection().map_err(|e| e.to_string())?;
+                crate::orgtrack::imported_changes::read_file_version(
+                    &conn,
+                    &id,
+                    &path,
+                    Some((&round, &range.0, &range.1)),
+                )
+            })
+            .await
+            .map_err(|_| RpcError::invalid_params("snapshot reader failed"))?
+            .map_err(RpcError::invalid_params)?;
+            if let Some(file) = result.files.first_mut() {
+                attach_version(file, version);
+            }
+        }
+        if params.file_path.is_none() {
+            for file in &mut result.files {
+                file.patches.clear();
+            }
+        }
+        return serde_json::to_value(result)
+            .map_err(|_| RpcError::invalid_params("change serialization failed"));
+    }
+    let review = tokio::task::spawn_blocking(move || -> Result<ChangeReview, String> {
+        let conn = get_connection().map_err(|error| error.to_string())?;
+        load_history(&conn, &params)
+    })
+    .await
+    .map_err(|_| RpcError::invalid_params("change reader failed"))?
+    .map_err(RpcError::invalid_params)?;
+    serde_json::to_value(review)
+        .map_err(|_| RpcError::invalid_params("change serialization failed"))
+}
+
+fn load_history(conn: &rusqlite::Connection, params: &Params) -> Result<ChangeReview, String> {
+    if params.scope == Scope::Session {
+        if let Some(imported) = crate::orgtrack::imported_changes::read(conn, &params.session_id)? {
+            let mut review = project(
+                imported
+                    .chunks
+                    .into_iter()
+                    .filter(|chunk| {
+                        params
+                            .file_path
+                            .as_ref()
+                            .is_none_or(|path| path == &chunk.file_path)
+                    })
+                    .collect(),
+            );
+            if params.file_path.is_none() {
+                for file in &mut review.files {
+                    file.patches.clear();
+                }
+            } else if let Some(file) = review.files.first_mut() {
+                let version = crate::orgtrack::imported_changes::read_file_version(
+                    conn,
+                    &params.session_id,
+                    &file.path,
+                    None,
+                )?;
+                attach_version(file, version);
+            }
+            return Ok(review);
+        }
+    }
+    let round_id = if params.scope == Scope::Turn {
+        params.round_id.clone()
+    } else {
+        None
+    };
+    // Bound payload size in SQL before materializing JSON in the process.
+    // Select only the exact owner; never query every session then filter.
+    let mut statement = conn.prepare(
+            "SELECT CASE WHEN length(c.payload_json) <= 2097152 THEN c.payload_json ELSE NULL END FROM orgtrack_core_diff_chunks c
+             WHERE c.session_id = ?1 AND (?2 IS NULL OR EXISTS (
+               SELECT 1 FROM orgtrack_core_edit_artifacts e
+               WHERE e.record_id = c.edit_record_id
+                 AND e.session_id = c.session_id
+                 AND json_extract(e.payload_json, '$.turnId') = ?2
+             )) AND (?3 IS NULL OR c.file_path = ?3)
+             ORDER BY c.sequence_index, c.chunk_index LIMIT ?4"
+        ).map_err(|error| error.to_string())?;
+    let rows = statement
+        .query_map(
+            rusqlite::params![
+                params.session_id,
+                round_id,
+                params.file_path,
+                (MAX_RECORDS + 1) as i64
+            ],
+            |row| row.get::<_, String>(0),
+        )
+        .map_err(|error| error.to_string())?;
+    let mut chunks = Vec::new();
+    let mut bytes = 0;
+    for row in rows {
+        let payload = row.map_err(|error| error.to_string())?;
+        bytes += payload.len();
+        if bytes > MAX_BYTES || chunks.len() == MAX_RECORDS {
+            return Err("historical change window exceeds review budget".into());
+        }
+        chunks.push(
+            serde_json::from_str(&payload)
+                .map_err(|error| format!("invalid change artifact: {error}"))?,
+        );
+    }
+    let mut review = project(chunks);
+    for file in &mut review.files {
+        if params.file_path.as_deref() != Some(&file.path) {
+            file.patches.clear();
+        }
+    }
+    Ok(review)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use orgtrack_core::{
+        canonical::{AgentMetadata, ArtifactQuality, SessionEditArtifactRecord, SessionEditKind},
+        store::{sqlite::SqliteRecordStore, RecordStore},
+    };
+
+    #[test]
+    fn reconstructed_version_is_serialized_as_full_content_not_patch_fragments() {
+        let mut file = ChangeFile {
+            path: "a".into(),
+            additions: Some(1),
+            deletions: Some(1),
+            patches: vec!["fragment".into()],
+            before: None,
+            after: None,
+            availability: "patch_only",
+        };
+        attach_version(
+            &mut file,
+            FileVersion {
+                before: Some("head\nold\ntail\n".into()),
+                after: Some("head\nnew\ntail\n".into()),
+            },
+        );
+        let wire = serde_json::to_value(&file).unwrap();
+        assert_eq!(wire["after"], "head\nnew\ntail\n");
+        assert_eq!(wire["before"], "head\nold\ntail\n");
+        assert_eq!(wire["availability"], "reconstructed_from_history");
+        attach_version(
+            &mut file,
+            FileVersion {
+                before: None,
+                after: Some(String::new()),
+            },
+        );
+        assert_eq!(serde_json::to_value(&file).unwrap()["after"], "");
+    }
+
+    fn seed(conn: &rusqlite::Connection, owner: &str, turn: &str, index: i64) {
+        let store = SqliteRecordStore::new(conn);
+        let id = format!("{owner}:{turn}:{index}");
+        store
+            .upsert_edit_artifact(&SessionEditArtifactRecord {
+                schema_version: 1,
+                record_id: id.clone(),
+                source: "fixture".into(),
+                source_session_id: None,
+                session_id: owner.into(),
+                source_event_id: Some(id.clone()),
+                turn_id: Some(turn.into()),
+                sequence_index: index,
+                timestamp: None,
+                workspace_path: None,
+                file_path: "file.ts".into(),
+                path_hash: "fixture".into(),
+                edit_kind: SessionEditKind::Patch,
+                old_start_line: Some(1),
+                new_start_line: Some(1),
+                start_line: Some(1),
+                end_line: Some(1),
+                lines_added: 1,
+                lines_removed: 1,
+                quality: ArtifactQuality::Exact,
+                metadata: AgentMetadata::default(),
+            })
+            .unwrap();
+        store
+            .upsert_diff_chunk(&SessionDiffChunkRecord {
+                schema_version: 1,
+                record_id: id.clone(),
+                edit_record_id: id.clone(),
+                source: "fixture".into(),
+                session_id: owner.into(),
+                source_event_id: Some(id),
+                sequence_index: index,
+                chunk_index: 0,
+                file_path: "file.ts".into(),
+                old_start_line: Some(1),
+                new_start_line: Some(1),
+                old_content: Some("a".into()),
+                new_content: Some("b".into()),
+                diff: Some("@@ -1 +1 @@\n-a\n+b\n".into()),
+                lines_added: 1,
+                lines_removed: 1,
+                is_deleted: false,
+                quality: ArtifactQuality::Exact,
+            })
+            .unwrap();
+    }
+
+    #[test]
+    fn owner_and_round_are_scoped_and_fragments_never_become_full_files() {
+        let conn = rusqlite::Connection::open_in_memory().unwrap();
+        SqliteRecordStore::init_tables(&conn).unwrap();
+        seed(&conn, "a", "one", 1);
+        seed(&conn, "a", "two", 2);
+        seed(&conn, "b", "one", 3);
+        let mut params = Params {
+            session_id: "a".into(),
+            round_id: Some("one".into()),
+            file_path: Some("file.ts".into()),
+            scope: Scope::Turn,
+        };
+        let round = load_history(&conn, &params).unwrap();
+        assert_eq!(round.files.len(), 1);
+        assert_eq!(round.files[0].patches.len(), 1);
+        assert_eq!(round.files[0].additions, Some(1));
+        assert!(round.files[0].before.is_none());
+        assert!(round.files[0].after.is_none());
+        params.scope = Scope::Session;
+        let session = load_history(&conn, &params).unwrap();
+        assert_eq!(session.files[0].patches.len(), 2);
+        assert_eq!(session.files[0].additions, None); // Not summed as net.
+        params.file_path = None;
+        assert!(load_history(&conn, &params).unwrap().files[0]
+            .patches
+            .is_empty());
+        params.file_path = Some("unrelated.ts".into());
+        assert!(load_history(&conn, &params).unwrap().files.is_empty());
+    }
+}
diff --git a/src-tauri/src/api/mobile_bridge/adapters/change_review_stats.rs b/src-tauri/src/api/mobile_bridge/adapters/change_review_stats.rs
new file mode 100644
index 0000000000..ea332d5752
--- /dev/null
+++ b/src-tauri/src/api/mobile_bridge/adapters/change_review_stats.rs
@@ -0,0 +1,46 @@
+//! Count only unified-diff body lines. A code line beginning with `++` or
+//! `--` must not be mistaken for a file header; binary counts stay unknown.
+pub(super) fn numstat(patch: &str) -> Option<(i32, i32)> {
+    if patch.is_empty() {
+        return Some((0, 0));
+    }
+    let mut in_hunk = false;
+    let mut saw_hunk = false;
+    let mut added = 0;
+    let mut removed = 0;
+    for line in patch.lines() {
+        if line.starts_with("Binary files ") || line == "GIT binary patch" {
+            return None;
+        }
+        if line.starts_with("diff --git ") {
+            in_hunk = false;
+        } else if line.starts_with("@@ ") && line.contains(" @@") {
+            in_hunk = true;
+            saw_hunk = true;
+        } else if in_hunk {
+            match line.as_bytes().first() {
+                Some(b'+') => added += 1,
+                Some(b'-') => removed += 1,
+                Some(b' ' | b'\\') => {}
+                _ => return None,
+            }
+        }
+    }
+    saw_hunk.then_some((added, removed))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::numstat;
+
+    #[test]
+    fn headers_are_not_code_and_binary_is_not_zero() {
+        assert_eq!(
+            numstat("--- a\n+++ b\n@@ -1 +1 @@\n---old\n+++new\n"),
+            Some((1, 1))
+        );
+        assert_eq!(numstat("Binary files a and b differ\n"), None);
+        assert_eq!(numstat("rename from a\nrename to b\n"), None);
+        assert_eq!(numstat(""), Some((0, 0)));
+    }
+}
diff --git a/src-tauri/src/api/mobile_bridge/adapters/file_navigation.rs b/src-tauri/src/api/mobile_bridge/adapters/file_navigation.rs
index a903193346..bff611a451 100644
--- a/src-tauri/src/api/mobile_bridge/adapters/file_navigation.rs
+++ b/src-tauri/src/api/mobile_bridge/adapters/file_navigation.rs
@@ -104,7 +104,7 @@ fn file_target_from_event(
     }
 }
 
-fn session_workspace_root(session_id: &str) -> Result<PathBuf, RpcError> {
+pub(super) fn session_workspace_root(session_id: &str) -> Result<PathBuf, RpcError> {
     let filter = SessionFilter {
         session_ids: Some(vec![session_id.to_string()]),
         limit: Some(1),
diff --git a/src-tauri/src/api/mobile_bridge/adapters/images.rs b/src-tauri/src/api/mobile_bridge/adapters/images.rs
new file mode 100644
index 0000000000..50360f4de7
--- /dev/null
+++ b/src-tauri/src/api/mobile_bridge/adapters/images.rs
@@ -0,0 +1,324 @@
+//! Read-only, event-scoped image previews. Never accept a caller-supplied path.
+use std::io::{BufRead, BufReader, Cursor, Read};
+use std::path::Path;
+
+use base64::{engine::general_purpose::STANDARD, Engine};
+use serde::Deserialize;
+use serde_json::{json, Value};
+
+use crate::agent_sessions::session_directory::aggregation::list_all_sessions;
+use crate::agent_sessions::session_directory::types::SessionFilter;
+use crate::api::mobile_bridge::rpc::RpcError;
+
+const MAX_IMAGES: usize = 8;
+const MAX_INPUT: usize = 12 * 1024 * 1024;
+const MAX_PREVIEW: usize = 384 * 1024;
+const MAX_SCAN: u64 = 256 * 1024 * 1024;
+static IMAGE_WORK: tokio::sync::Semaphore = tokio::sync::Semaphore::const_new(2);
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase", deny_unknown_fields)]
+struct ImageParams {
+    session_id: String,
+    round_id: String,
+    event_id: String,
+    image_index: usize,
+}
+
+fn refs(result: &Value) -> impl Iterator<Item = &str> {
+    result
+        .get("images")
+        .and_then(Value::as_array)
+        .into_iter()
+        .flatten()
+        .filter_map(Value::as_str)
+        .filter(|value| !value.trim().is_empty())
+        .take(MAX_IMAGES)
+}
+
+pub(super) fn image_count(result: &Value) -> usize {
+    refs(result).count()
+}
+
+fn invalid() -> RpcError {
+    RpcError::invalid_params("image is unavailable or unsupported")
+}
+
+fn decode_data_url(value: &str) -> Result<Vec<u8>, RpcError> {
+    if value.len() > MAX_INPUT * 4 / 3 + 128 {
+        return Err(invalid());
+    }
+    let (header, data) = value.split_once(',').ok_or_else(invalid)?;
+    if !matches!(
+        header,
+        "data:image/png;base64" | "data:image/jpeg;base64" | "data:image/webp;base64"
+    ) {
+        return Err(invalid());
+    }
+    STANDARD.decode(data).map_err(|_| invalid())
+}
+
+/// Recover only an embedded user attachment whose image marker names the exact
+/// event-owned reference. Do not search other sessions or parse tool outputs.
+fn recover_embedded(reader: impl Read, image_ref: &str) -> Result<Vec<u8>, RpcError> {
+    let mut reader = BufReader::new(reader.take(MAX_SCAN));
+    let mut line = Vec::new();
+    let marker = format!("path=\"{image_ref}\"");
+    loop {
+        line.clear();
+        // Bound individual rows too; discard oversized tool-output rows without
+        // materializing them. The entire scan is separately bounded.
+        let size = reader
+            .by_ref()
+            .take((MAX_INPUT * 2 + 1) as u64)
+            .read_until(b'\n', &mut line)
+            .map_err(|_| invalid())?;
+        if size == 0 {
+            return Err(invalid());
+        }
+        if size > MAX_INPUT * 2 {
+            if line.last() == Some(&b'\n') {
+                continue;
+            }
+            loop {
+                let buf = reader.fill_buf().map_err(|_| invalid())?;
+                let end = buf.iter().position(|b| *b == b'\n');
+                let n = end.map_or(buf.len(), |i| i + 1);
+                if n == 0 {
+                    return Err(invalid());
+                }
+                reader.consume(n);
+                if end.is_some() {
+                    break;
+                }
+            }
+            continue;
+        }
+        // A cheap substring check avoids JSON allocations for unrelated rows.
+        if !line
+            .windows(image_ref.len())
+            .any(|window| window == image_ref.as_bytes())
+        {
+            continue;
+        }
+        let Ok(row) = serde_json::from_slice::<Value>(&line) else {
+            continue;
+        };
+        if row["type"] != "response_item" || row["payload"]["role"] != "user" {
+            continue;
+        }
+        let Some(parts) = row["payload"]["content"].as_array() else {
+            continue;
+        };
+        let mut matched = false;
+        for part in parts {
+            match part["type"].as_str() {
+                Some("input_text") => {
+                    let text = part["text"].as_str().unwrap_or_default();
+                    if text.starts_with("<image ") {
+                        matched = text.contains(&marker);
+                    }
+                    if text == "</image>" {
+                        matched = false;
+                    }
+                }
+                Some("input_image") if matched => {
+                    return decode_data_url(part["image_url"].as_str().ok_or_else(invalid)?);
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+fn load_bytes(session_id: &str, image_ref: &str) -> Result<Vec<u8>, RpcError> {
+    if image_ref.starts_with("data:") {
+        return decode_data_url(image_ref);
+    }
+    // Remote URLs are deliberately not fetched: no SSRF or credential forwarding.
+    let path = Path::new(image_ref);
+    if !path.is_absolute() {
+        return Err(invalid());
+    }
+    let mut options = std::fs::OpenOptions::new();
+    options.read(true);
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::OpenOptionsExt;
+        options.custom_flags(libc::O_NONBLOCK | libc::O_NOFOLLOW);
+    }
+    match options.open(path) {
+        Ok(file) => {
+            let metadata = file.metadata().map_err(|_| invalid())?;
+            if !metadata.is_file() || metadata.len() > MAX_INPUT as u64 {
+                return Err(invalid());
+            }
+            let mut bytes = Vec::new();
+            file.take((MAX_INPUT + 1) as u64)
+                .read_to_end(&mut bytes)
+                .map_err(|_| invalid())?;
+            if bytes.len() > MAX_INPUT {
+                return Err(invalid());
+            }
+            Ok(bytes)
+        }
+        Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
+            let filter = SessionFilter {
+                session_ids: Some(vec![session_id.to_owned()]),
+                ..Default::default()
+            };
+            let response = list_all_sessions(Some(&filter)).map_err(|_| invalid())?;
+            let row = response
+                .sessions
+                .into_iter()
+                .find(|row| row.session_id == session_id)
+                .ok_or_else(invalid)?;
+            let source = row.storage_path.ok_or_else(invalid)?;
+            // Only Codex JSONL has the response-item/image-marker contract above.
+            if row.external_history_source.as_deref() != Some("codex_app")
+                || !source.ends_with(".jsonl")
+            {
+                return Err(invalid());
+            }
+            recover_embedded(
+                std::fs::File::open(source).map_err(|_| invalid())?,
+                image_ref,
+            )
+        }
+        Err(_) => Err(invalid()),
+    }
+}
+
+fn preview(bytes: &[u8]) -> Result<Value, RpcError> {
+    let mut reader = image::ImageReader::new(Cursor::new(bytes))
+        .with_guessed_format()
+        .map_err(|_| invalid())?;
+    if !matches!(
+        reader.format(),
+        Some(image::ImageFormat::Png | image::ImageFormat::Jpeg | image::ImageFormat::WebP)
+    ) {
+        return Err(invalid());
+    }
+    let mut limits = image::Limits::default();
+    limits.max_image_width = Some(8192);
+    limits.max_image_height = Some(8192);
+    limits.max_alloc = Some(96 * 1024 * 1024);
+    reader.limits(limits);
+    let decoded = reader.decode().map_err(|_| invalid())?;
+    for edge in [1280, 960, 640, 320] {
+        let small = decoded.thumbnail(edge, edge).to_rgb8();
+        let mut output = Vec::new();
+        image::codecs::jpeg::JpegEncoder::new_with_quality(&mut output, 80)
+            .encode_image(&small)
+            .map_err(|_| invalid())?;
+        if output.len() <= MAX_PREVIEW {
+            return Ok(
+                json!({ "dataUrl": format!("data:image/jpeg;base64,{}", STANDARD.encode(output)),
+                "width": small.width(), "height": small.height() }),
+            );
+        }
+    }
+    Err(invalid())
+}
+
+pub async fn session_image(params: &Value) -> Result<Value, RpcError> {
+    let parsed: ImageParams = serde_json::from_value(params.clone()).map_err(|_| invalid())?;
+    if [&parsed.session_id, &parsed.round_id, &parsed.event_id]
+        .iter()
+        .any(|id| id.trim().is_empty() || id.len() > 1024)
+        || parsed.image_index >= MAX_IMAGES
+    {
+        return Err(invalid());
+    }
+    // No unbounded queue; thumbnails are explicitly retriable by the caller.
+    let permit = IMAGE_WORK
+        .try_acquire()
+        .map_err(|_| RpcError::invalid_params("image service is busy; retry"))?;
+    let events =
+        super::session::authoritative_round_events(&parsed.session_id, &parsed.round_id).await?;
+    let event = events
+        .iter()
+        .find(|event| event.id == parsed.event_id)
+        .ok_or_else(invalid)?;
+    let image_ref = refs(&event.result)
+        .nth(parsed.image_index)
+        .ok_or_else(invalid)?
+        .to_owned();
+    drop(events);
+    tokio::task::spawn_blocking(move || {
+        let _permit = permit;
+        preview(&load_bytes(&parsed.session_id, &image_ref)?)
+    })
+    .await
+    .map_err(|_| invalid())?
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[tokio::test]
+    async fn rejects_client_paths_and_invalid_indexes_before_loading_history() {
+        let mut params = json!({"sessionId":"s", "roundId":"r", "eventId":"e", "imageIndex":0, "path":"/tmp/private.png"});
+        assert!(session_image(&params).await.is_err());
+        params.as_object_mut().unwrap().remove("path");
+        params["imageIndex"] = json!(8);
+        assert!(session_image(&params).await.is_err());
+        params["imageIndex"] = json!(-1);
+        assert!(session_image(&params).await.is_err());
+    }
+    #[test]
+    fn local_image_reads_are_bounded_and_remote_urls_are_not_fetched() {
+        assert!(load_bytes("s", "https://localhost/private.png").is_err());
+        assert!(load_bytes("s", "../private.png").is_err());
+        let file = tempfile::NamedTempFile::new().unwrap();
+        file.as_file().set_len((MAX_INPUT + 1) as u64).unwrap();
+        assert!(load_bytes("s", file.path().to_str().unwrap()).is_err());
+    }
+    #[test]
+    #[ignore = "requires an explicitly supplied local Codex transcript and image reference"]
+    fn local_history_image_recovery() {
+        let path = std::env::var("ORG2_TEST_IMAGE_TRANSCRIPT").expect("transcript fixture");
+        let image_ref = std::env::var("ORG2_TEST_IMAGE_REF").expect("image reference");
+        let bytes = recover_embedded(std::fs::File::open(path).unwrap(), &image_ref).unwrap();
+        let result = preview(&bytes).unwrap();
+        assert!(result["width"].as_u64().unwrap() > 0);
+        eprintln!("Recovered preview: {}x{}, {} encoded bytes", result["width"], result["height"], result["dataUrl"].as_str().unwrap().len());
+    }
+    #[test]
+    fn reference_projection_is_bounded_and_has_no_payload() {
+        assert_eq!(
+            image_count(&json!({"images": [null, "", "/tmp/a.png", "data:image/png;base64,AA=="]})),
+            2
+        );
+        assert_eq!(image_count(&json!({"images": vec!["x"; 100]})), MAX_IMAGES);
+    }
+    #[test]
+    fn recovers_only_the_matching_user_image_marker() {
+        let row = json!({"type":"response_item","payload":{"role":"user","content":[
+            {"type":"input_text","text":"<image name=[Image #1] path=\"/tmp/a.png\">"},
+            {"type":"input_image","image_url":"data:image/png;base64,aGVsbG8="},
+            {"type":"input_text","text":"</image>"}]}})
+        .to_string();
+        assert_eq!(
+            recover_embedded(row.as_bytes(), "/tmp/a.png").unwrap(),
+            b"hello"
+        );
+        assert!(recover_embedded(row.as_bytes(), "/tmp/b.png").is_err());
+        assert!(recover_embedded(
+            row.replace("\"user\"", "\"assistant\"").as_bytes(),
+            "/tmp/a.png"
+        )
+        .is_err());
+    }
+    #[test]
+    fn preview_rejects_text_and_svg_and_bounds_output() {
+        assert!(preview(b"secret text").is_err());
+        assert!(preview(b"<svg xmlns='http://www.w3.org/2000/svg'/>").is_err());
+        let image = image::RgbImage::new(2000, 1000);
+        let mut png = Cursor::new(Vec::new());
+        image.write_to(&mut png, image::ImageFormat::Png).unwrap();
+        let result = preview(png.get_ref()).unwrap();
+        assert_eq!(result["width"], 1280);
+        assert!(result["dataUrl"].as_str().unwrap().len() < 512 * 1024 + 128);
+    }
+}
diff --git a/src-tauri/src/api/mobile_bridge/adapters/interaction.rs b/src-tauri/src/api/mobile_bridge/adapters/interaction.rs
index c0327aeb8b..a1266136b5 100644
--- a/src-tauri/src/api/mobile_bridge/adapters/interaction.rs
+++ b/src-tauri/src/api/mobile_bridge/adapters/interaction.rs
@@ -121,15 +121,16 @@ pub async fn respond_permission(params: &Value) -> Result<Value, RpcError> {
                 )
             })?;
 
-            session
+            let accepted = session
                 .permission_manager
-                .respond(
-                    &parsed.request_id,
-                    parsed.response,
-                    parsed.tool_name.as_deref(),
-                    parsed.tool_args.as_ref(),
-                )
+                .respond_for_session(&parsed.session_id, &parsed.request_id, parsed.response)
                 .await;
+            if !accepted {
+                return Err(RpcError::new(
+                    RpcErrorCode::InvalidRequest,
+                    "permission request is no longer pending",
+                ));
+            }
         }
         MobilePermissionExecution::ManagedCli => {
             let (approved, always_allow) = cli_permission_decision(parsed.response);
@@ -171,33 +172,200 @@ pub async fn pending(params: &Value) -> Result<Value, RpcError> {
     let handle = crate::api::get_app_handle()
         .ok_or_else(|| RpcError::new(RpcErrorCode::InvalidRequest, "desktop agent not ready"))?;
     let state = handle.state::<agent_core::state::AgentAppState>();
-    let session = state.get_session(session_id).await.ok_or_else(|| {
-        RpcError::new(
-            RpcErrorCode::SessionNotFound,
-            format!("session not found: {session_id}"),
+    let mut interactions = match state.get_session(session_id).await {
+        Some(session) => {
+            session
+                .permission_manager
+                .pending_snapshot(PENDING_LIMIT + 1)
+                .await
+        }
+        None => Vec::new(), // CLI sessions are owned by their own registries.
+    };
+    append_cli_pending(&mut interactions, Some(session_id))?;
+    Ok(enriched_snapshot_result(interactions).await)
+}
+
+const PENDING_LIMIT: usize = 2000;
+
+fn append_cli_pending(rows: &mut Vec<Value>, session_id: Option<&str>) -> Result<(), RpcError> {
+    // Each owner bounds its projection; scoped snapshots filter at the owner,
+    // rather than losing a selected session behind an unrelated global cap.
+    for snapshot in [
+        crate::agent_sessions::cli::hook_approvals::pending_snapshot_for_session(
+            session_id,
+            PENDING_LIMIT + 1,
+        ),
+        crate::agent_sessions::cli::parsers::acp_common::pending_snapshot_for_session(
+            session_id,
+            PENDING_LIMIT + 1,
+        ),
+    ] {
+        rows.extend(snapshot.map_err(|err| RpcError::new(RpcErrorCode::InvalidRequest, err))?);
+    }
+    Ok(())
+}
+
+fn snapshot_result(mut interactions: Vec<Value>) -> Value {
+    let mut complete = interactions.len() <= PENDING_LIMIT;
+    interactions.sort_by_key(|row| {
+        (
+            row["createdAtMs"].as_i64().unwrap_or(0),
+            row["requestId"].as_str().unwrap_or("").to_string(),
         )
-    })?;
-    let interactions = session
-        .permission_manager
-        .pending_ids()
-        .await
+    });
+    interactions.truncate(PENDING_LIMIT);
+    // Reserve the response wrapper and JSON-RPC envelope as well as row commas.
+    let mut bytes = 128;
+    let mut bounded = Vec::new();
+    for mut row in interactions {
+        let (args, truncated) = super::session::mobile_tool_data(&row["toolArgs"]);
+        // The mobile permission card consumes a field map. Preserve other
+        // valid JSON inputs under `input` rather than emitting an invalid map.
+        row["toolArgs"] = if args.is_object() {
+            args
+        } else {
+            json!({"input": args})
+        };
+        row["toolArgsTruncated"] = json!(truncated || row["toolArgsTruncated"] == true);
+        bytes += row.to_string().len() + 1;
+        if bytes > 512 * 1024 {
+            complete = false;
+            break;
+        }
+        bounded.push(row);
+    }
+    json!({"interactions": bounded, "complete": complete})
+}
+
+fn read_session_names(
+    conn: &rusqlite::Connection,
+    ids: &[String],
+) -> Result<std::collections::HashMap<String, String>, String> {
+    use rusqlite::OptionalExtension;
+    let mut statement = conn
+        .prepare_cached(
+            "SELECT substr(title, 1, 512) FROM orgtrack_core_sessions WHERE session_id = ?1",
+        )
+        .map_err(|err| err.to_string())?;
+    let mut names = std::collections::HashMap::new();
+    for id in ids.iter().take(PENDING_LIMIT) {
+        let title: Option<String> = statement
+            .query_row([id], |row| row.get(0))
+            .optional()
+            .map_err(|err| err.to_string())?;
+        if let Some(title) = title.filter(|title| !title.trim().is_empty()) {
+            names.insert(id.clone(), title);
+        }
+    }
+    Ok(names)
+}
+
+async fn enriched_snapshot_result(interactions: Vec<Value>) -> Value {
+    let mut result = snapshot_result(interactions);
+    let complete = result["complete"] == true;
+    let rows = result["interactions"]
+        .as_array_mut()
+        .expect("snapshot row array");
+    let ids = rows
+        .iter()
+        .filter_map(|row| row["sessionId"].as_str().map(str::to_string))
+        .collect::<std::collections::HashSet<_>>()
         .into_iter()
-        .map(|request_id| {
-            json!({
-                "kind": "permission",
-                "origin": "rust_agent",
-                "sessionId": session_id,
-                "requestId": request_id,
-            })
+        .collect::<Vec<_>>();
+    if !ids.is_empty() {
+        // Optional labels never gate the authoritative pending decisions. One
+        // bounded indexed lookup batch; no history scan or render-thread I/O.
+        let names = tokio::task::spawn_blocking(move || {
+            let conn = database::db::get_connection().map_err(|err| err.to_string())?;
+            read_session_names(&conn, &ids)
         })
+        .await;
+        if let Ok(Ok(names)) = names {
+            for row in rows.iter_mut() {
+                if let Some(name) = row["sessionId"].as_str().and_then(|id| names.get(id)) {
+                    row["sessionName"] = json!(name);
+                }
+            }
+        }
+    }
+    let mut enriched = snapshot_result(std::mem::take(rows));
+    enriched["complete"] = json!(complete && enriched["complete"] == true);
+    enriched
+}
+
+pub async fn pending_all(_params: &Value) -> Result<Value, RpcError> {
+    let handle = crate::api::get_app_handle()
+        .ok_or_else(|| RpcError::new(RpcErrorCode::InvalidRequest, "desktop agent not ready"))?;
+    let state = handle.state::<agent_core::state::AgentAppState>();
+    let sessions = state
+        .sessions
+        .lock()
+        .await
+        .values()
+        .cloned()
         .collect::<Vec<_>>();
-    Ok(json!({ "interactions": interactions }))
+    let mut interactions = Vec::new();
+    for session in sessions {
+        let remaining = (PENDING_LIMIT + 1).saturating_sub(interactions.len());
+        if remaining == 0 {
+            break;
+        }
+        interactions.extend(session.permission_manager.pending_snapshot(remaining).await);
+    }
+    append_cli_pending(&mut interactions, None)?;
+    Ok(enriched_snapshot_result(interactions).await)
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn pending_session_labels_use_canonical_titles_without_loading_roster() {
+        let conn = rusqlite::Connection::open_in_memory().unwrap();
+        conn.execute_batch("CREATE TABLE orgtrack_core_sessions (session_id TEXT PRIMARY KEY, title TEXT); INSERT INTO orgtrack_core_sessions VALUES ('old-session', 'History beyond the first page')").unwrap();
+        let names =
+            read_session_names(&conn, &["old-session".into(), "missing-session".into()]).unwrap();
+        assert_eq!(
+            names.get("old-session").unwrap(),
+            "History beyond the first page"
+        );
+        assert!(!names.contains_key("missing-session"));
+        let row = snapshot_result(vec![
+            json!({"toolArgs": ["one", "two"], "toolArgsTruncated": true}),
+        ]);
+        assert!(row["interactions"][0]["toolArgs"].is_object());
+        assert_eq!(row["interactions"][0]["toolArgsTruncated"], true);
+    }
+
+    #[test]
+    fn inbox_projection_is_bounded_and_never_claims_truncated_count_is_complete() {
+        let rows = (0..PENDING_LIMIT + 1)
+            .map(|index| {
+                json!({
+                    "requestId": format!("p-{index}"), "createdAtMs": index,
+                    "toolArgs": {"description": "x".repeat(10000)},
+                })
+            })
+            .collect();
+        let result = snapshot_result(rows);
+        assert_eq!(result["complete"], false);
+        assert!(result.to_string().len() < 513 * 1024);
+        assert!(result["interactions"].as_array().unwrap().len() < PENDING_LIMIT);
+        assert_eq!(result["interactions"][0]["toolArgsTruncated"], true);
+        assert_eq!(
+            snapshot_result(vec![]),
+            json!({"interactions": [], "complete": true})
+        );
+        let at_limit = (0..PENDING_LIMIT)
+            .map(|index| json!({"requestId": index.to_string()}))
+            .collect::<Vec<_>>();
+        assert_eq!(snapshot_result(at_limit.clone())["complete"], true);
+        let mut over_limit = at_limit;
+        over_limit.push(json!({"requestId": "sentinel"}));
+        assert_eq!(snapshot_result(over_limit)["complete"], false);
+    }
+
     #[test]
     fn parse_respond_permission_params_requires_session_and_request_ids() {
         let err = parse_respond_permission_params(&json!({
diff --git a/src-tauri/src/api/mobile_bridge/adapters/mod.rs b/src-tauri/src/api/mobile_bridge/adapters/mod.rs
index 50968a0fb3..19d830b346 100644
--- a/src-tauri/src/api/mobile_bridge/adapters/mod.rs
+++ b/src-tauri/src/api/mobile_bridge/adapters/mod.rs
@@ -1,5 +1,9 @@
 mod external_send;
+pub mod change_review;
+mod change_review_stats;
+mod workspace_changes;
 pub mod file_navigation;
+pub mod images;
 pub mod interaction;
 pub mod model;
 pub mod session;
diff --git a/src-tauri/src/api/mobile_bridge/adapters/session.rs b/src-tauri/src/api/mobile_bridge/adapters/session.rs
index 9e00923822..b678dc5f47 100644
--- a/src-tauri/src/api/mobile_bridge/adapters/session.rs
+++ b/src-tauri/src/api/mobile_bridge/adapters/session.rs
@@ -163,14 +163,28 @@ pub fn mobile_session_name(name: &str, display_label: Option<&str>) -> String {
         .to_string()
 }
 
-fn is_mobile_list_category(category: SessionCategory) -> bool {
-    matches!(
-        category,
-        SessionCategory::Agent | SessionCategory::Os | SessionCategory::Cli
-    )
+/// Only the display resolver's inputs cross this boundary, never the full
+/// aggregate (which also contains account, storage and provider provenance).
+fn mobile_session_display(record: &SessionAggregateRecord) -> Value {
+    let mut display = Map::new();
+    for (key, value) in [
+        ("cliAgentType", record.cli_agent_type.as_deref()),
+        ("agentOrgId", record.agent_org_id.as_deref()),
+        ("agentDefinitionId", record.agent_definition_id.as_deref()),
+        ("agentIconId", record.agent_icon_id.as_deref()),
+        ("model", record.model.as_deref()),
+        (
+            "externalHistorySource",
+            record.external_history_source.as_deref(),
+        ),
+    ] {
+        if let Some(value) = value.filter(|value| !value.is_empty() && value.len() <= 512) {
+            display.insert(key.to_string(), json!(value));
+        }
+    }
+    Value::Object(display)
 }
 
-/// Keep directory metadata on the wire; do not reconstruct it from a title.
 fn mobile_directory_session_row(record: &SessionAggregateRecord, send_capability: &str) -> Value {
     let updated_at_ms = chrono::DateTime::parse_from_rfc3339(&record.updated_at)
         .ok()
@@ -178,14 +192,25 @@ fn mobile_directory_session_row(record: &SessionAggregateRecord, send_capability
     json!({
         "id": record.session_id,
         "name": mobile_session_name(&record.name, record.display_label.as_deref()),
-        "status": map_session_status_to_mobile(&record.status),
         "repoPath": record.repo_path,
         "repoName": record.repo_name,
         "updatedAtMs": updated_at_ms,
+        // Retained for old clients; new clients read the lossless lifecycle.
+        "status": map_session_status_to_mobile(&record.status),
+        "lifecycleStatus": record.status,
+        "mergeStatus": record.merge_status,
+        "display": mobile_session_display(record),
         "sendCapability": send_capability,
     })
 }
 
+fn is_mobile_list_category(category: SessionCategory) -> bool {
+    matches!(
+        category,
+        SessionCategory::Agent | SessionCategory::Os | SessionCategory::Cli
+    )
+}
+
 fn session_list_from_sidebar_snapshot(
     snapshot: Vec<MobileSidebarSessionSnapshotRow>,
     status_filter: &str,
@@ -1191,7 +1216,7 @@ fn compact_mobile_tool_json(
     }
 }
 
-fn mobile_tool_data(value: &Value) -> (Value, bool) {
+pub(super) fn mobile_tool_data(value: &Value) -> (Value, bool) {
     let mut truncated = false;
     let regular_limits = MobileToolDataLimits {
         max_depth: MAX_MOBILE_TOOL_DATA_DEPTH,
@@ -1436,6 +1461,7 @@ fn mobile_event_from_session(event: &SessionEvent) -> Option<(Value, bool)> {
         "displayText": display_text,
         "createdAt": event.created_at,
     });
+    mobile_event["imageCount"] = json!(super::images::image_count(&event.result));
     let extracted = event
         .extracted
         .as_ref()
@@ -1528,6 +1554,9 @@ fn mobile_event_from_wire(event: &Value) -> Option<(Value, bool)> {
     } else {
         false
     };
+    mobile_event["imageCount"] = json!(super::images::image_count(
+        event.get("result").unwrap_or(&Value::Null)
+    ));
     let turn_intent_id = wire_string(event, "turnIntentId", "turn_intent_id");
     let turn_intent_id = if turn_intent_id.is_empty() {
         event
@@ -1708,6 +1737,54 @@ fn build_subscription_snapshot(
     value
 }
 
+/// Resolve the authoritative owner and return its first body in one round trip.
+/// The lease can be closed before its canonical ID is known to the phone.
+pub async fn session_open(conn_id: u64, params: &Value) -> Result<Value, RpcError> {
+    session_open_with_loader(conn_id, params, |id, latest| async move {
+        load_subscription_history(&id, latest).await
+    })
+    .await
+}
+
+async fn session_open_with_loader<F, Fut>(
+    conn_id: u64,
+    params: &Value,
+    load: F,
+) -> Result<Value, RpcError>
+where
+    F: FnOnce(String, bool) -> Fut,
+    Fut: std::future::Future<Output = Result<(MobileHistoryWindow, bool), RpcError>>,
+{
+    let token = params
+        .get("subscriptionId")
+        .and_then(Value::as_str)
+        .filter(|id| !id.is_empty() && id.len() <= 128)
+        .ok_or_else(|| RpcError::invalid_params("subscriptionId is required"))?;
+    let identity = super::session_identity::resolve(params).await?;
+    let session_id = identity["sessionId"]
+        .as_str()
+        .ok_or_else(|| RpcError::invalid_params("invalid session identity"))?;
+    if !fanout::open_session(conn_id, token, session_id, MAX_CONCURRENT_SUBSCRIPTIONS) {
+        return Err(RpcError::new(
+            RpcErrorCode::InvalidRequest,
+            "connection not registered",
+        ));
+    }
+    let latest_only = params.get("latestOnly").and_then(Value::as_bool) == Some(true);
+    let history = match load(session_id.to_owned(), latest_only).await {
+        Ok(history) => history,
+        Err(error) => {
+            fanout::close_open_session(conn_id, token);
+            return Err(error);
+        }
+    };
+    let mut response = subscription_history_response(session_id, history.0, history.1);
+    response["managed"] = identity["managed"].clone();
+    response["subscriptionId"] = Value::String(token.to_owned());
+    response["subscribed"] = Value::Bool(true);
+    Ok(response)
+}
+
 /// Subscribe a mobile connection to session event fanout and return one
 /// authoritative, bounded history snapshot for the selected session.
 pub async fn session_subscribe(conn_id: u64, params: &Value) -> Result<Value, RpcError> {
@@ -1733,13 +1810,74 @@ pub async fn session_subscribe(conn_id: u64, params: &Value) -> Result<Value, Rp
         ));
     }
 
-    let history = match load_mobile_initial_history(session_id).await {
+    let latest_only = params.get("latestOnly").and_then(Value::as_bool) == Some(true);
+    let history = match load_subscription_history(session_id, latest_only).await {
         Ok(loaded) => loaded,
         Err(err) => {
             fanout::unsubscribe_session(conn_id, session_id);
             return Err(err);
         }
     };
+    let mut response = subscription_history_response(session_id, history.0, history.1);
+    response["subscribed"] = Value::Bool(true);
+    Ok(response)
+}
+
+/// Read the full directory after a fast subscription response, without changing
+/// subscription state or occupying the mutation lane.
+pub async fn session_history(params: &Value) -> Result<Value, RpcError> {
+    let session_id = params
+        .get("sessionId")
+        .and_then(Value::as_str)
+        .filter(|id| !id.is_empty())
+        .ok_or_else(|| RpcError::invalid_params("sessionId is required"))?;
+    let history = load_mobile_initial_history(session_id).await?;
+    Ok(subscription_history_response(session_id, history, false))
+}
+
+async fn load_subscription_history(
+    session_id: &str,
+    latest_only: bool,
+) -> Result<(MobileHistoryWindow, bool), RpcError> {
+    let history_id = mobile_history_session_id(session_id);
+    if latest_only && history_id.starts_with(orgtrack_core::sources::codex::SESSION_PREFIX) {
+        // This bounded tail reader does not build the full turn catalog. Empty
+        // or exceptionally large latest turns retain the existing full reader.
+        if let Ok(window) =
+            crate::orgtrack::history_commands::codex_app_mobile_tail_window(history_id).await
+        {
+            return mobile_codex_preview(session_id, window)
+                .await
+                .map(|history| (history, true));
+        }
+    }
+    load_mobile_initial_history(session_id)
+        .await
+        .map(|history| (history, false))
+}
+
+async fn mobile_codex_preview(
+    session_id: &str,
+    window: orgtrack_core::sources::codex::app::CodexAppInitialWindow,
+) -> Result<MobileHistoryWindow, RpcError> {
+    let rounds = mobile_rounds_from_projected(&window.turns);
+    let latest_round_id = rounds.last().map(|round| round.id.clone());
+    let chunks = latest_round_chunks(window.chunks, latest_round_id.as_deref());
+    let loaded = events_from_chunks(chunks, session_id.to_string()).await?;
+    Ok(MobileHistoryWindow {
+        rounds,
+        rounds_complete: false,
+        latest_round_id,
+        events: loaded.events,
+        events_truncated: loaded.truncated,
+    })
+}
+
+fn subscription_history_response(
+    session_id: &str,
+    history: MobileHistoryWindow,
+    history_deferred: bool,
+) -> Value {
     let snapshot = build_subscription_snapshot(
         session_id,
         history.latest_round_id.as_deref(),
@@ -1748,15 +1886,15 @@ pub async fn session_subscribe(conn_id: u64, params: &Value) -> Result<Value, Rp
         0,
     );
 
-    Ok(json!({
-        "subscribed": true,
+    json!({
         "sessionId": session_id,
+        "historyDeferred": history_deferred,
         "rounds": {
             "items": history.rounds,
             "complete": history.rounds_complete,
         },
         "snapshot": snapshot,
-    }))
+    })
 }
 
 /// Load one exact round body without mutating the desktop EventStore window.
@@ -1784,6 +1922,15 @@ pub async fn session_round(params: &Value) -> Result<Value, RpcError> {
 
 /// Unsubscribe from a session fanout stream.
 pub fn session_unsubscribe(conn_id: u64, params: &Value) -> Result<Value, RpcError> {
+    if let Some(token) = params.get("subscriptionId") {
+        let token = token
+            .as_str()
+            .filter(|id| !id.is_empty() && id.len() <= 128)
+            .ok_or_else(|| RpcError::invalid_params("invalid subscriptionId"))?;
+        fanout::close_open_session(conn_id, token);
+        return Ok(json!({ "unsubscribed": true }));
+    }
+
     let session_id = params
         .get("sessionId")
         .and_then(|value| value.as_str())
@@ -1802,6 +1949,125 @@ pub fn session_unsubscribe(conn_id: u64, params: &Value) -> Result<Value, RpcErr
 mod tests {
     use super::*;
 
+    #[tokio::test]
+    async fn opening_owns_snapshot_and_closes_by_lease_without_known_canonical_id() {
+        let _guard = super::super::super::fanout::TEST_REGISTRY_LOCK.lock().await;
+        let (tx, _rx) = tokio::sync::mpsc::channel(8);
+        let conn = fanout::register_connection(tx);
+        let response = session_open_with_loader(
+            conn,
+            &json!({
+                "sessionId": "cliagent-opening", "subscriptionId": "first", "latestOnly": true
+            }),
+            |id, latest| async move {
+                assert_eq!(id, "cliagent-opening");
+                assert!(latest);
+                assert!(fanout::is_subscribed(conn, &id));
+                Ok((
+                    MobileHistoryWindow {
+                        rounds: vec![],
+                        rounds_complete: true,
+                        latest_round_id: None,
+                        events: vec![],
+                        events_truncated: false,
+                    },
+                    false,
+                ))
+            },
+        )
+        .await
+        .unwrap();
+        assert_eq!(response["sessionId"], "cliagent-opening");
+        assert_eq!(response["managed"], false);
+        assert_eq!(response["subscriptionId"], "first");
+        assert_eq!(response["snapshot"]["sessionId"], "cliagent-opening");
+        session_unsubscribe(conn, &json!({"subscriptionId":"first"})).unwrap();
+        assert!(!fanout::is_subscribed(conn, "cliagent-opening"));
+        let failed = session_open_with_loader(
+            conn,
+            &json!({
+                "sessionId":"cliagent-opening", "subscriptionId":"failed"
+            }),
+            |_, _| async { Err(RpcError::invalid_params("history unavailable")) },
+        )
+        .await;
+        assert!(failed.is_err());
+        assert_eq!(fanout::subscription_count(conn), 0);
+        fanout::unregister_connection(conn);
+    }
+
+    #[tokio::test]
+    #[ignore = "requires an explicitly supplied local transcript path; reads only"]
+    async fn mobile_history_read_latency_probe() {
+        use orgtrack_core::sources::codex::app;
+        let path = std::path::PathBuf::from(
+            std::env::var("ORG2_HISTORY_PROBE_PATH").expect("fixture path"),
+        );
+        let start = std::time::Instant::now();
+        let tail =
+            app::load_codex_app_mobile_tail_window_from_path("codexapp-probe", &path).unwrap();
+        let tail = mobile_codex_preview("codexapp-probe", tail).await.unwrap();
+        let tail_elapsed = start.elapsed();
+        let start = std::time::Instant::now();
+        let full =
+            app::load_codex_app_initial_window_from_path("codexapp-probe", &path, 1).unwrap();
+        let rounds = mobile_rounds_from_projected(&full.turns);
+        let full_latest = rounds.last().map(|round| round.id.clone());
+        let chunks = latest_round_chunks(full.chunks, full_latest.as_deref());
+        let _events = events_from_chunks(chunks, "codexapp-probe".into())
+            .await
+            .unwrap();
+        let full_elapsed = start.elapsed();
+        assert_eq!(tail.latest_round_id, full_latest);
+        eprintln!(
+            "history probe: bytes={}, latest_ms={}, full_ms={}, rounds={}",
+            std::fs::metadata(&path).unwrap().len(),
+            tail_elapsed.as_millis(),
+            full_elapsed.as_millis(),
+            rounds.len()
+        );
+    }
+
+    #[tokio::test]
+    async fn mobile_preview_projects_real_latest_turn_and_defers_the_directory() {
+        use std::io::Write;
+        let mut file = tempfile::NamedTempFile::new().unwrap();
+        for (kind, message) in [
+            ("user_message", "older"),
+            ("agent_message", "old answer"),
+            ("user_message", "latest"),
+            ("agent_message", "latest answer"),
+        ] {
+            writeln!(
+                file,
+                "{}",
+                json!({"timestamp":"2026-09-12T00:00:00Z",
+                "payload":{"type":kind,"message":message}})
+            )
+            .unwrap();
+        }
+        let id = "codexapp-preview-fixture";
+        let window =
+            orgtrack_core::sources::codex::app::load_codex_app_mobile_tail_window_from_path(
+                id,
+                file.path(),
+            )
+            .unwrap();
+        let history = mobile_codex_preview(id, window).await.unwrap();
+        let response = subscription_history_response(id, history, true);
+        assert_eq!(response["historyDeferred"], true);
+        assert_eq!(response["rounds"]["complete"], false);
+        assert_eq!(response["rounds"]["items"].as_array().unwrap().len(), 1);
+        assert!(
+            response.get("subscribed").is_none(),
+            "history read does not mutate subscription"
+        );
+        let encoded = serde_json::to_string(&response).unwrap();
+        assert!(encoded.contains("latest answer"));
+        assert!(!encoded.contains("old answer"));
+        assert_eq!(response["snapshot"]["sessionId"], id);
+    }
+
     #[tokio::test]
     async fn managed_codex_native_reply_keeps_submit_identity_after_append() {
         use orgtrack_core::sources::{codex::app, imported_history::turn_correlation};
@@ -2245,6 +2511,45 @@ mod tests {
         assert!(missing["updatedAtMs"].is_null());
     }
 
+    #[test]
+    fn mobile_session_display_projects_only_bounded_resolver_inputs() {
+        let mut record: SessionAggregateRecord = serde_json::from_value(json!({
+            "sessionId": "sdeagent-custom", "name": "Raw name", "status": "waiting_for_user",
+            "createdAt": "2026-09-09T00:00:00Z", "updatedAt": "2026-09-09T00:00:00Z",
+            "category": "agent", "keySource": "own_key", "isActive": true,
+            "agentDefinitionId": "custom:reviewer", "agentIconId": "review-icon",
+            "model": "claude-sonnet", "cliAgentType": "claude_code",
+            "externalHistorySource": "claude_code", "agentOrgId": "org-agent",
+            "accountId": "private-account", "userInput": "private-prompt",
+            "storagePath": "/private/session.json"
+        }))
+        .expect("valid aggregate fixture");
+        assert_eq!(
+            mobile_session_display(&record),
+            json!({
+                "agentDefinitionId": "custom:reviewer", "agentIconId": "review-icon",
+                "model": "claude-sonnet", "cliAgentType": "claude_code",
+                "externalHistorySource": "claude_code", "agentOrgId": "org-agent"
+            })
+        );
+        record.model = Some("x".repeat(513));
+        assert!(mobile_session_display(&record).get("model").is_none());
+        record.agent_icon_id = None;
+        assert!(mobile_session_display(&record).get("agentIconId").is_none());
+        record.merge_status = Some("pending".into());
+        for status in ["waiting_for_user", "paused", "completed", "future_status"] {
+            record.status = status.to_string();
+            let wire = mobile_directory_session_row(&record, "read_only");
+            assert_eq!(wire["lifecycleStatus"], status);
+            assert_eq!(wire["mergeStatus"], "pending");
+            assert_eq!(wire["status"], map_session_status_to_mobile(status));
+            assert_eq!(wire["sendCapability"], "read_only");
+            assert!(wire.get("accountId").is_none());
+            assert!(wire.get("userInput").is_none());
+            assert!(wire.get("storagePath").is_none());
+        }
+    }
+
     #[test]
     fn sidebar_snapshot_list_preserves_desktop_order_and_running_filter() {
         let snapshot = vec![
@@ -2459,7 +2764,8 @@ mod tests {
                 .with_result(json!({
                     "type": "user",
                     "message": { "role": "user", "content": "historic prompt" },
-                    "turnIntentId": "intent-history"
+                    "turnIntentId": "intent-history",
+                    "images": ["/tmp/screenshot.png"]
                 }));
         let assistant =
             core_types::activity::ActivityChunk::new("codexapp-history", "assistant", "assistant")
@@ -2487,6 +2793,12 @@ mod tests {
             .and_then(Value::as_array)
             .expect("snapshot upserts");
         assert_eq!(upserts.len(), 2);
+        assert_eq!(upserts[0]["imageCount"], 1);
+        assert!(upserts[0].get("result").is_none());
+        let wire = serde_json::to_value(&events[0]).expect("wire event");
+        let (projected, _) = mobile_event_from_wire(&wire).expect("projection");
+        assert_eq!(projected["imageCount"], 1);
+        assert!(projected.get("result").is_none());
         assert_eq!(
             upserts[0].get("source").and_then(Value::as_str),
             Some("user")
@@ -2505,6 +2817,32 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    #[ignore = "requires an explicitly supplied local history session"]
+    async fn local_history_image_projection() {
+        let id = std::env::var("ORG2_TEST_IMAGE_SESSION").expect("session fixture");
+        let started = std::env::var("ORG2_TEST_IMAGE_STARTED").expect("round timestamp");
+        let window = load_mobile_initial_history(&id)
+            .await
+            .expect("initial history");
+        let round = window
+            .rounds
+            .iter()
+            .find(|round| round.started_at.starts_with(&started))
+            .expect("round");
+        let loaded = load_mobile_round_events(&id, &round.id)
+            .await
+            .expect("round history");
+        let counts: Vec<_> = loaded
+            .events
+            .iter()
+            .filter_map(mobile_event_from_session)
+            .map(|(event, _)| event["imageCount"].as_u64().unwrap_or(0))
+            .collect();
+        eprintln!("Authoritative round image counts: {counts:?}");
+        assert!(counts.iter().any(|count| *count > 0));
+    }
+
     #[test]
     fn mobile_tool_projection_keeps_structured_context_with_hard_limits() {
         let event = json!({
diff --git a/src-tauri/src/api/mobile_bridge/adapters/workspace_changes.rs b/src-tauri/src/api/mobile_bridge/adapters/workspace_changes.rs
new file mode 100644
index 0000000000..d00a876358
--- /dev/null
+++ b/src-tauri/src/api/mobile_bridge/adapters/workspace_changes.rs
@@ -0,0 +1,229 @@
+//! On-demand bounded workspace review. No writes, external diff drivers or shell.
+use crate::api::mobile_bridge::rpc::RpcError;
+use serde_json::{json, Value};
+use std::{path::Path, process::Stdio, time::Duration};
+use tokio::io::AsyncReadExt;
+
+const BUDGET: u64 = 512 * 1024;
+
+async fn git(root: &Path, args: &[&str]) -> Result<String, RpcError> {
+    let result = tokio::time::timeout(Duration::from_secs(5), async {
+        let mut child = tokio::process::Command::new("git")
+            .arg("--literal-pathspecs")
+            .args(args)
+            .current_dir(root)
+            .env("GIT_OPTIONAL_LOCKS", "0")
+            .stdin(Stdio::null())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::null())
+            .kill_on_drop(true)
+            .spawn()
+            .map_err(|_| RpcError::invalid_params("git unavailable"))?;
+        let mut bytes = Vec::new();
+        child
+            .stdout
+            .take()
+            .ok_or_else(|| RpcError::invalid_params("git output unavailable"))?
+            .take(BUDGET + 1)
+            .read_to_end(&mut bytes)
+            .await
+            .map_err(|_| RpcError::invalid_params("git read failed"))?;
+        if bytes.len() > BUDGET as usize {
+            return Err(RpcError::invalid_params(
+                "workspace change exceeds preview budget",
+            ));
+        }
+        if !child
+            .wait()
+            .await
+            .map_err(|_| RpcError::invalid_params("git wait failed"))?
+            .success()
+        {
+            return Err(RpcError::invalid_params("workspace git query failed"));
+        }
+        String::from_utf8(bytes).map_err(|_| RpcError::invalid_params("binary content unavailable"))
+    })
+    .await;
+    result.map_err(|_| RpcError::invalid_params("workspace query timed out"))?
+}
+
+pub(super) async fn read(session_id: &str, selected: Option<&str>) -> Result<Value, RpcError> {
+    let id = session_id.to_owned();
+    let root =
+        tokio::task::spawn_blocking(move || super::file_navigation::session_workspace_root(&id))
+            .await
+            .map_err(|_| RpcError::invalid_params("workspace lookup failed"))??;
+    let root = tokio::fs::canonicalize(root)
+        .await
+        .map_err(|_| RpcError::invalid_params("workspace unavailable"))?;
+    read_at(&root, selected).await
+}
+
+async fn read_at(root: &Path, selected: Option<&str>) -> Result<Value, RpcError> {
+    let status = git(
+        root,
+        &["status", "--porcelain=v1", "-z", "--untracked-files=all"],
+    )
+    .await?;
+    let mut entries = status.split('\0').filter(|entry| !entry.is_empty());
+    let mut files = Vec::new();
+    while let Some(entry) = entries.next() {
+        if entry.len() < 4 || !entry.is_char_boundary(3) {
+            return Err(RpcError::invalid_params("invalid git status"));
+        }
+        let path = &entry[3..];
+        let renamed = entry[..2].contains('R') || entry[..2].contains('C');
+        let original = if renamed {
+            entries
+                .next()
+                .ok_or_else(|| RpcError::invalid_params("invalid rename"))?
+        } else {
+            path
+        };
+        if files.len() >= 500 {
+            return Err(RpcError::invalid_params("too many changed files"));
+        }
+        let mut file = json!({"path":path, "additions":null, "deletions":null, "patches":[], "before":null, "after":null, "availability":"current_workspace"});
+        if selected == Some(path) {
+            let candidate = root.join(path);
+            if let Ok(canonical) = tokio::fs::canonicalize(&candidate).await {
+                if !canonical.starts_with(root) {
+                    return Err(RpcError::invalid_params("file outside workspace"));
+                }
+                let handle = tokio::fs::File::open(canonical)
+                    .await
+                    .map_err(|_| RpcError::invalid_params("file unavailable"))?;
+                if handle
+                    .metadata()
+                    .await
+                    .map_err(|_| RpcError::invalid_params("file unavailable"))?
+                    .is_file()
+                {
+                    let mut bytes = Vec::new();
+                    handle
+                        .take(BUDGET + 1)
+                        .read_to_end(&mut bytes)
+                        .await
+                        .map_err(|_| RpcError::invalid_params("file read failed"))?;
+                    if bytes.len() <= BUDGET as usize && !bytes.contains(&0) {
+                        if let Ok(text) = String::from_utf8(bytes) {
+                            file["after"] = json!(text);
+                        }
+                    }
+                }
+            }
+            if &entry[..2] != "??" {
+                let spec = format!("HEAD:{original}");
+                if let Ok(before) = git(root, &["show", &spec]).await {
+                    if !before.contains('\0') {
+                        file["before"] = json!(before);
+                    }
+                }
+                if let Ok(patch) = git(
+                    root,
+                    &[
+                        "diff",
+                        "--no-ext-diff",
+                        "--no-textconv",
+                        "HEAD",
+                        "--",
+                        original,
+                        path,
+                    ],
+                )
+                .await
+                {
+                    if let Some((added, removed)) = super::change_review_stats::numstat(&patch) {
+                        file["additions"] = json!(added);
+                        file["deletions"] = json!(removed);
+                    }
+                    file["patches"] = json!([patch]);
+                }
+            } else if let Some(after) = file["after"].as_str() {
+                let added = after.lines().count();
+                file["additions"] = json!(added);
+                file["deletions"] = json!(0);
+                file["before"] = json!("");
+            }
+        }
+        files.push(file);
+    }
+    Ok(json!({"files":files,"complete":true}))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn reads_current_and_head_without_writes_and_rejects_external_symlink() {
+        let temp = tempfile::tempdir().unwrap();
+        let root = temp.path().canonicalize().unwrap();
+        git(&root, &["init"]).await.unwrap();
+        std::fs::write(root.join("a file.ts"), "old\n").unwrap();
+        git(&root, &["add", "a file.ts"]).await.unwrap();
+        git(
+            &root,
+            &[
+                "-c",
+                "user.name=Fixture",
+                "-c",
+                "user.email=fixture@example.invalid",
+                "commit",
+                "-m",
+                "initial",
+            ],
+        )
+        .await
+        .unwrap();
+        std::fs::write(root.join("a file.ts"), "new\n").unwrap();
+        let before_status = git(&root, &["status", "--porcelain=v1", "-z"])
+            .await
+            .unwrap();
+        let manifest = read_at(&root, None).await.unwrap();
+        assert!(manifest["files"][0]["after"].is_null());
+        let detail = read_at(&root, Some("a file.ts")).await.unwrap();
+        assert_eq!(detail["files"][0]["before"], "old\n");
+        assert_eq!(detail["files"][0]["after"], "new\n");
+        assert_eq!(detail["files"][0]["additions"], 1);
+        assert_eq!(detail["files"][0]["deletions"], 1);
+        // The authoritative git boundary must distinguish a binary edit from
+        // a zero-line text change, and preserve deleted/new file contents.
+        std::fs::write(root.join("a file.ts"), b"binary\0payload").unwrap();
+        let binary = read_at(&root, Some("a file.ts")).await.unwrap();
+        assert!(binary["files"][0]["additions"].is_null());
+        assert!(binary["files"][0]["after"].is_null());
+        std::fs::remove_file(root.join("a file.ts")).unwrap();
+        let deleted = read_at(&root, Some("a file.ts")).await.unwrap();
+        assert_eq!(deleted["files"][0]["before"], "old\n");
+        assert_eq!(deleted["files"][0]["deletions"], 1);
+        assert!(deleted["files"][0]["after"].is_null());
+        std::fs::write(root.join("new.ts"), "new file\n").unwrap();
+        let new = read_at(&root, Some("new.ts")).await.unwrap();
+        let new = new["files"]
+            .as_array()
+            .unwrap()
+            .iter()
+            .find(|f| f["path"] == "new.ts")
+            .unwrap();
+        assert_eq!(new["before"], "");
+        assert_eq!(new["after"], "new file\n");
+        assert_eq!(new["additions"], 1);
+        std::fs::remove_file(root.join("new.ts")).unwrap();
+        std::fs::write(root.join("a file.ts"), "new\n").unwrap();
+        assert_eq!(
+            before_status,
+            git(&root, &["status", "--porcelain=v1", "-z"])
+                .await
+                .unwrap()
+        );
+        let unknown = read_at(&root, Some("../outside")).await.unwrap();
+        assert!(unknown["files"][0]["after"].is_null());
+        #[cfg(unix)]
+        {
+            let outside = tempfile::NamedTempFile::new().unwrap();
+            std::os::unix::fs::symlink(outside.path(), root.join("external")).unwrap();
+            assert!(read_at(&root, Some("external")).await.is_err());
+        }
+    }
+}
diff --git a/src-tauri/src/api/mobile_bridge/fanout.rs b/src-tauri/src/api/mobile_bridge/fanout.rs
index 688d6fd6d6..4bf235eb15 100644
--- a/src-tauri/src/api/mobile_bridge/fanout.rs
+++ b/src-tauri/src/api/mobile_bridge/fanout.rs
@@ -12,10 +12,16 @@ static NEXT_CONN_ID: AtomicU64 = AtomicU64::new(1);
 struct MobileConnection {
     sender: mpsc::Sender<String>,
     subscribed_sessions: HashSet<String>,
+    opened_session: Option<(String, String)>,
 }
 
 static CONNECTIONS: OnceLock<RwLock<HashMap<u64, MobileConnection>>> = OnceLock::new();
 
+// Registry tests and transport tests share the real fanout registry. Serialize
+// only those tests so clear/broadcast assertions cannot disturb live fixtures.
+#[cfg(test)]
+pub(super) static TEST_REGISTRY_LOCK: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(());
+
 fn connections() -> &'static RwLock<HashMap<u64, MobileConnection>> {
     CONNECTIONS.get_or_init(|| RwLock::new(HashMap::new()))
 }
@@ -29,6 +35,7 @@ pub fn register_connection(sender: mpsc::Sender<String>) -> u64 {
             MobileConnection {
                 sender,
                 subscribed_sessions: HashSet::new(),
+                opened_session: None,
             },
         );
     }
@@ -65,12 +72,45 @@ pub fn unsubscribe_session(conn_id: u64, session_id: &str) {
     }
 }
 
+/// The foreground chat owns one replaceable subscription lease. A late close
+/// from an older opening must not unsubscribe a newer opening of the same ID.
+pub fn open_session(conn_id: u64, token: &str, session_id: &str, limit: usize) -> bool {
+    if let Ok(mut map) = connections().write() {
+        if let Some(conn) = map.get_mut(&conn_id) {
+            if conn.subscribed_sessions.len() >= limit {
+                return false;
+            }
+            conn.opened_session = Some((token.to_owned(), session_id.to_owned()));
+            return true;
+        }
+    }
+    false
+}
+
+pub fn close_open_session(conn_id: u64, token: &str) {
+    if let Ok(mut map) = connections().write() {
+        if let Some(conn) = map.get_mut(&conn_id) {
+            if conn
+                .opened_session
+                .as_ref()
+                .is_some_and(|(current, _)| current == token)
+            {
+                conn.opened_session = None;
+            }
+        }
+    }
+}
+
 /// Number of sessions a connection is subscribed to.
 pub fn subscription_count(conn_id: u64) -> usize {
     connections()
         .read()
         .ok()
-        .and_then(|map| map.get(&conn_id).map(|conn| conn.subscribed_sessions.len()))
+        .and_then(|map| {
+            map.get(&conn_id).map(|conn| {
+                conn.subscribed_sessions.len() + usize::from(conn.opened_session.is_some())
+            })
+        })
         .unwrap_or(0)
 }
 
@@ -80,8 +120,13 @@ pub fn is_subscribed(conn_id: u64, session_id: &str) -> bool {
         .read()
         .ok()
         .and_then(|map| {
-            map.get(&conn_id)
-                .map(|conn| conn.subscribed_sessions.contains(session_id))
+            map.get(&conn_id).map(|conn| {
+                conn.subscribed_sessions.contains(session_id)
+                    || conn
+                        .opened_session
+                        .as_ref()
+                        .is_some_and(|(_, id)| id == session_id)
+            })
         })
         .unwrap_or(false)
 }
@@ -93,7 +138,13 @@ pub fn fanout_to_session(session_id: &str, message: &str) {
         .ok()
         .map(|map| {
             map.values()
-                .filter(|conn| conn.subscribed_sessions.contains(session_id))
+                .filter(|conn| {
+                    conn.subscribed_sessions.contains(session_id)
+                        || conn
+                            .opened_session
+                            .as_ref()
+                            .is_some_and(|(_, id)| id == session_id)
+                })
                 .map(|conn| conn.sender.clone())
                 .collect()
         })
@@ -138,6 +189,12 @@ pub fn on_bus_message(message: &str) {
         }
     });
     fanout_to_session(&session_id, &notification.to_string());
+    if matches!(
+        envelope.get("type").and_then(Value::as_str),
+        Some("permission:request" | "permission:pending_changed")
+    ) {
+        fanout_all(&serde_json::json!({"jsonrpc":"2.0", "method":"interaction/pending_changed", "params":{"sessionId":session_id}}).to_string());
+    }
 }
 
 /// Hook point: forward EventStore snapshot envelopes to mobile `orgii/snapshot` notifications.
@@ -163,13 +220,10 @@ pub fn on_snapshot_envelope(envelope: &Value) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::sync::{Mutex, MutexGuard};
     use tokio::sync::mpsc::error::TryRecvError;
 
-    static TEST_REGISTRY_LOCK: Mutex<()> = Mutex::new(());
-
-    fn isolated_registry() -> MutexGuard<'static, ()> {
-        let guard = TEST_REGISTRY_LOCK.lock().expect("test registry lock");
+    fn isolated_registry() -> tokio::sync::MutexGuard<'static, ()> {
+        let guard = TEST_REGISTRY_LOCK.blocking_lock();
         connections().write().expect("connections lock").clear();
         guard
     }
@@ -180,6 +234,30 @@ mod tests {
         (conn_id, rx)
     }
 
+    #[test]
+    fn opening_lease_replaces_previous_and_ignores_late_or_foreign_close() {
+        let _guard = isolated_registry();
+        let (conn, _rx) = fresh_conn();
+        let (other, _other_rx) = fresh_conn();
+        assert!(open_session(conn, "a", "same", 4));
+        assert!(open_session(conn, "b", "same", 4));
+        close_open_session(conn, "a");
+        close_open_session(other, "b");
+        assert!(is_subscribed(conn, "same"));
+        assert_eq!(subscription_count(conn), 1);
+        assert!(open_session(conn, "c", "next", 4));
+        assert!(!is_subscribed(conn, "same"));
+        assert!(is_subscribed(conn, "next"));
+        close_open_session(conn, "c");
+        assert_eq!(subscription_count(conn), 0);
+        for id in ["1", "2", "3", "4"] {
+            subscribe_session(conn, id);
+        }
+        assert!(!open_session(conn, "overflow", "extra", 4));
+        unregister_connection(conn);
+        unregister_connection(other);
+    }
+
     #[test]
     fn fanout_routes_only_to_subscribed_session() {
         let _registry = isolated_registry();
@@ -250,6 +328,23 @@ mod tests {
         unregister_connection(conn_id);
     }
 
+    #[test]
+    fn approval_invalidation_reaches_unopened_sessions_but_other_bus_events_do_not() {
+        let _registry = isolated_registry();
+        let (_conn, mut rx) = fresh_conn();
+        for event_type in ["permission:request", "permission:pending_changed"] {
+            on_bus_message(
+                &serde_json::json!({"type":event_type,"payload":{"sessionId":"unopened"}})
+                    .to_string(),
+            );
+            let notification: Value = serde_json::from_str(&rx.try_recv().unwrap()).unwrap();
+            assert_eq!(notification["method"], "interaction/pending_changed");
+            assert_eq!(notification["params"]["sessionId"], "unopened");
+        }
+        on_bus_message(r#"{"type":"text:delta","payload":{"sessionId":"unopened"}}"#);
+        assert_eq!(rx.try_recv(), Err(TryRecvError::Empty));
+    }
+
     #[test]
     fn on_snapshot_envelope_fanouts_orgii_snapshot_method() {
         let _registry = isolated_registry();
diff --git a/src-tauri/src/api/mobile_bridge/mod.rs b/src-tauri/src/api/mobile_bridge/mod.rs
index 0dac51dc0f..58ae8b5def 100644
--- a/src-tauri/src/api/mobile_bridge/mod.rs
+++ b/src-tauri/src/api/mobile_bridge/mod.rs
@@ -7,7 +7,9 @@ mod desktop_identity;
 pub mod fanout;
 pub mod org2_cloud_auth;
 pub mod relay;
+mod request_scheduler;
 pub mod rpc;
+pub mod read_state;
 pub mod ws_handler;
 
 use axum::routing::get;
diff --git a/src-tauri/src/api/mobile_bridge/read_state.rs b/src-tauri/src/api/mobile_bridge/read_state.rs
new file mode 100644
index 0000000000..e70591bb52
--- /dev/null
+++ b/src-tauri/src/api/mobile_bridge/read_state.rs
@@ -0,0 +1,198 @@
+//! Request/ack bridge to Desktop's existing visited-session owner. No second
+//! persistent store, roster scan, or polling task lives in the transport.
+use serde::Serialize;
+use serde_json::{json, Value};
+use std::{
+    collections::HashMap,
+    sync::{Mutex, OnceLock},
+    time::Duration,
+};
+use tauri::{Emitter, Manager};
+use tokio::sync::oneshot;
+
+use super::rpc::{RpcError, RpcErrorCode};
+
+const MAX_IDS: usize = 200;
+const MAX_PENDING: usize = 32;
+const TIMEOUT: Duration = Duration::from_secs(5);
+
+struct Pending {
+    ids: Vec<String>,
+    sender: oneshot::Sender<Vec<String>>,
+}
+fn pending() -> &'static Mutex<HashMap<String, Pending>> {
+    static PENDING: OnceLock<Mutex<HashMap<String, Pending>>> = OnceLock::new();
+    PENDING.get_or_init(Mutex::default)
+}
+struct RequestGuard(String);
+impl Drop for RequestGuard {
+    fn drop(&mut self) {
+        pending().lock().unwrap().remove(&self.0);
+    }
+}
+
+#[derive(Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ReadRequest {
+    request_id: String,
+    session_ids: Vec<String>,
+    mark_visited: bool,
+    expires_at_ms: i64,
+}
+
+fn parse_ids(params: &Value) -> Result<Vec<String>, RpcError> {
+    let ids: Vec<String> =
+        serde_json::from_value(params.get("sessionIds").cloned().unwrap_or(Value::Null))
+            .map_err(|_| RpcError::invalid_params("sessionIds must be an array"))?;
+    if ids.is_empty()
+        || ids.len() > MAX_IDS
+        || ids.iter().any(|id| id.trim().is_empty() || id.len() > 1024)
+    {
+        return Err(RpcError::invalid_params(
+            "sessionIds must contain 1–200 nonempty IDs, at most 1024 bytes each",
+        ));
+    }
+    let mut unique = Vec::with_capacity(ids.len());
+    for id in ids {
+        if !unique.contains(&id) {
+            unique.push(id);
+        }
+    }
+    Ok(unique)
+}
+
+pub async fn request(params: &Value, mark_visited: bool) -> Result<Value, RpcError> {
+    let ids = parse_ids(params)?;
+    let handle = crate::api::get_app_handle().ok_or_else(unavailable)?;
+    let window = handle.get_webview_window("main").ok_or_else(unavailable)?;
+    let request_id = uuid::Uuid::new_v4().to_string();
+    let (sender, receiver) = oneshot::channel();
+    {
+        let mut requests = pending().lock().unwrap();
+        if requests.len() >= MAX_PENDING {
+            return Err(unavailable());
+        }
+        requests.insert(
+            request_id.clone(),
+            Pending {
+                ids: ids.clone(),
+                sender,
+            },
+        );
+    }
+    // Drop removes the waiter on timeout, emission failure AND task cancellation.
+    let _guard = RequestGuard(request_id.clone());
+    window
+        .emit(
+            "mobile-session-read-request",
+            ReadRequest {
+                request_id,
+                session_ids: ids,
+                mark_visited,
+                expires_at_ms: chrono::Utc::now().timestamp_millis() + TIMEOUT.as_millis() as i64,
+            },
+        )
+        .map_err(|_| unavailable())?;
+    let visited_ids = tokio::time::timeout(TIMEOUT, receiver)
+        .await
+        .map_err(|_| unavailable())?
+        .map_err(|_| unavailable())?;
+    Ok(json!({ "visitedIds": visited_ids }))
+}
+
+fn unavailable() -> RpcError {
+    RpcError::new(
+        RpcErrorCode::InvalidRequest,
+        "desktop read-state owner is unavailable; retry after reconnecting",
+    )
+}
+
+fn complete(request_id: &str, visited_ids: Vec<String>) -> Result<(), String> {
+    let mut requests = pending().lock().unwrap();
+    let request = requests
+        .get(request_id)
+        .ok_or("read-state request expired")?;
+    if visited_ids.len() > request.ids.len()
+        || visited_ids.iter().any(|id| !request.ids.contains(id))
+    {
+        return Err("read-state reply contains unrequested IDs".into());
+    }
+    let request = requests
+        .remove(request_id)
+        .ok_or("read-state request expired")?;
+    let _ = request.sender.send(visited_ids);
+    Ok(())
+}
+
+#[tauri::command]
+pub fn mobile_remote_reply_read_state(
+    window: tauri::WebviewWindow,
+    request_id: String,
+    visited_ids: Vec<String>,
+) -> Result<(), String> {
+    if window.label() != "main" {
+        return Err("only the desktop owner can reply".into());
+    }
+    complete(&request_id, visited_ids)
+}
+
+#[tauri::command]
+pub fn mobile_remote_read_state_changed(window: tauri::WebviewWindow) -> Result<(), String> {
+    if window.label() != "main" {
+        return Err("only the desktop owner can publish".into());
+    }
+    super::fanout::fanout_all(
+        &json!({
+            "jsonrpc": "2.0", "method": "session/read_state_changed", "params": {}
+        })
+        .to_string(),
+    );
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn bounds_and_deduplicates_at_rpc_ingestion() {
+        assert_eq!(
+            parse_ids(&json!({"sessionIds":["a","a","b"]})).unwrap(),
+            vec!["a", "b"]
+        );
+        for ids in [
+            json!([]),
+            json!([""]),
+            json!([1]),
+            json!(["x".repeat(1025)]),
+            json!(vec!["a"; 201]),
+        ] {
+            assert!(parse_ids(&json!({"sessionIds":ids})).is_err());
+        }
+    }
+    #[tokio::test]
+    async fn ack_is_scoped_and_waiter_is_released() {
+        let key = uuid::Uuid::new_v4().to_string();
+        let (sender, receiver) = oneshot::channel();
+        pending().lock().unwrap().insert(
+            key.clone(),
+            Pending {
+                ids: vec!["a".into()],
+                sender,
+            },
+        );
+        assert!(complete(&key, vec!["other".into()]).is_err());
+        complete(&key, vec!["a".into()]).unwrap();
+        assert_eq!(receiver.await.unwrap(), vec!["a"]);
+        assert!(complete(&key, vec![]).is_err());
+        let (sender, _receiver) = oneshot::channel();
+        pending().lock().unwrap().insert(
+            key.clone(),
+            Pending {
+                ids: vec![],
+                sender,
+            },
+        );
+        drop(RequestGuard(key.clone()));
+        assert!(!pending().lock().unwrap().contains_key(&key));
+    }
+}
diff --git a/src-tauri/src/api/mobile_bridge/relay.rs b/src-tauri/src/api/mobile_bridge/relay.rs
index 0596f80a8d..1d326fa236 100644
--- a/src-tauri/src/api/mobile_bridge/relay.rs
+++ b/src-tauri/src/api/mobile_bridge/relay.rs
@@ -25,9 +25,10 @@ use tokio_util::sync::CancellationToken;
 use super::auth::{self, MobileRemoteSettings};
 use super::fanout;
 use super::org2_cloud_auth::{self, SESSION_EXPIRED_MESSAGE};
-use super::rpc::{self, MobileTier, RpcContext};
+use super::rpc::{MobileTier, RpcContext};
+use super::request_scheduler;
 
-const ACTOR_QUEUE_CAPACITY: usize = 32;
+const ACTOR_QUEUE_CAPACITY: usize = request_scheduler::REQUEST_QUEUE_CAPACITY;
 const RELAY_OUTBOUND_CAPACITY: usize = 256;
 const MAX_RELAY_FRAME_BYTES: usize = 1024 * 1024;
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(30);
@@ -432,21 +433,48 @@ async fn handle_relay_frame(
 async fn run_mobile_actor(
     connection_id: String,
     tier: PermissionTier,
-    mut requests: mpsc::Receiver<Value>,
+    requests: mpsc::Receiver<Value>,
     outbound: mpsc::Sender<Message>,
 ) {
+    run_mobile_actor_with_scheduler(
+        connection_id,
+        tier,
+        requests,
+        outbound,
+        request_scheduler::run,
+    )
+    .await;
+}
+
+async fn run_mobile_actor_with_scheduler<Run, RunFuture>(
+    connection_id: String,
+    tier: PermissionTier,
+    requests: mpsc::Receiver<Value>,
+    outbound: mpsc::Sender<Message>,
+    run_scheduler: Run,
+) where
+    Run: FnOnce(RpcContext, mpsc::Receiver<Value>, mpsc::Sender<Value>) -> RunFuture,
+    RunFuture: std::future::Future<Output = ()> + Send + 'static,
+{
     let (fanout_tx, mut fanout_rx) = mpsc::channel::<String>(64);
     let registration = FanoutRegistration(fanout::register_connection(fanout_tx));
-    let mut context = relay_rpc_context(registration.0, tier);
+    let context = relay_rpc_context(registration.0, tier);
+    let (responses_tx, mut responses_rx) = mpsc::channel(ACTOR_QUEUE_CAPACITY);
+    // This task belongs to the phone actor, including when the relay drops or
+    // replaces it. Dropping a plain JoinHandle would leave its RPC work alive.
+    let _scheduler = ActorScheduler(tokio::spawn(run_scheduler(
+        context,
+        requests,
+        responses_tx,
+    )));
 
     loop {
         tokio::select! {
-            request = requests.recv() => {
-                let Some(request) = request else { break; };
-                if let Some(response) = rpc::dispatch(&mut context, &request).await {
-                    if send_desktop_frame(&outbound, &connection_id, response).await.is_err() {
-                        break;
-                    }
+            _ = outbound.closed() => break,
+            response = responses_rx.recv() => {
+                let Some(response) = response else { break; };
+                if send_desktop_frame(&outbound, &connection_id, response).await.is_err() {
+                    break;
                 }
             }
             notification = fanout_rx.recv() => {
@@ -460,6 +488,14 @@ async fn run_mobile_actor(
     }
 }
 
+struct ActorScheduler(JoinHandle<()>);
+
+impl Drop for ActorScheduler {
+    fn drop(&mut self) {
+        self.0.abort();
+    }
+}
+
 struct FanoutRegistration(u64);
 
 impl Drop for FanoutRegistration {
@@ -801,4 +837,184 @@ mod tests {
         assert!(read_only.initialized);
         assert_eq!(read_only.tier, MobileTier::ReadOnly);
     }
+
+    struct NotifyTaskStopped(mpsc::Sender<()>);
+
+    impl Drop for NotifyTaskStopped {
+        fn drop(&mut self) {
+            let _ = self.0.try_send(());
+        }
+    }
+
+    struct StalledActor {
+        task: JoinHandle<()>,
+        requests: mpsc::Sender<Value>,
+        outbound: mpsc::Receiver<Message>,
+        conn_id: u64,
+        release: Arc<tokio::sync::Semaphore>,
+        stopped: mpsc::Receiver<()>,
+    }
+
+    async fn stalled_actor() -> StalledActor {
+        let (requests, request_rx) = mpsc::channel(ACTOR_QUEUE_CAPACITY);
+        let (outbound_tx, outbound) = mpsc::channel(8);
+        let (started_tx, mut started_rx) = mpsc::channel(1);
+        let (stopped_tx, stopped) = mpsc::channel(1);
+        let release = Arc::new(tokio::sync::Semaphore::new(0));
+        let gate = release.clone();
+        let task = tokio::spawn(run_mobile_actor_with_scheduler(
+            "phone-test".to_string(),
+            PermissionTier::Full,
+            request_rx,
+            outbound_tx,
+            move |ctx, requests, responses| {
+                request_scheduler::run_with_executor(
+                    ctx,
+                    requests,
+                    responses,
+                    move |ctx, request| {
+                        let started = started_tx.clone();
+                        let stopped = stopped_tx.clone();
+                        let gate = gate.clone();
+                        async move {
+                            let _stopped = NotifyTaskStopped(stopped);
+                            started.send(ctx.conn_id).await.expect("test receiver alive");
+                            let _permit = gate.acquire().await.expect("test gate open");
+                            let response = serde_json::json!({
+                                "jsonrpc": "2.0", "id": request["id"], "result": "done"
+                            });
+                            (ctx, Some(response))
+                        }
+                    },
+                )
+            },
+        ));
+        requests
+            .send(serde_json::json!({ "jsonrpc": "2.0", "id": 7, "method": "session/list" }))
+            .await
+            .expect("actor accepts request");
+        let conn_id = tokio::time::timeout(Duration::from_secs(1), started_rx.recv())
+            .await
+            .expect("RPC starts")
+            .expect("start signal");
+        assert!(fanout::subscribe_session(
+            conn_id,
+            &format!("session-{conn_id}")
+        ));
+        StalledActor {
+            task,
+            requests,
+            outbound,
+            conn_id,
+            release,
+            stopped,
+        }
+    }
+
+    async fn assert_actor_cleaned_up(conn_id: u64, stopped: &mut mpsc::Receiver<()>) {
+        tokio::time::timeout(Duration::from_secs(1), stopped.recv())
+            .await
+            .expect("in-flight RPC is dropped")
+            .expect("RPC drop signal");
+        assert_eq!(fanout::subscription_count(conn_id), 0);
+        assert!(!fanout::subscribe_session(conn_id, "must-not-survive"));
+    }
+
+    #[tokio::test]
+    async fn relay_actor_forwards_notifications_while_rpc_is_stalled() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        let mut actor = stalled_actor().await;
+        let notification = serde_json::json!({
+            "jsonrpc": "2.0", "method": "interaction/pending_changed",
+            "params": { "sessionId": format!("session-{}", actor.conn_id) }
+        });
+        fanout::fanout_to_session(
+            &format!("session-{}", actor.conn_id),
+            &notification.to_string(),
+        );
+        let message = tokio::time::timeout(Duration::from_secs(1), actor.outbound.recv())
+            .await
+            .expect("notification must arrive before RPC finishes")
+            .expect("actor frame");
+        let RelayWireFrame::DesktopFrame {
+            connection_id,
+            payload,
+        } = serde_json::from_str(&message.into_text().expect("text frame")).expect("relay frame")
+        else {
+            panic!("expected desktop frame")
+        };
+        assert_eq!(connection_id, "phone-test");
+        assert_eq!(payload, notification);
+
+        actor.release.add_permits(1);
+        let response = tokio::time::timeout(Duration::from_secs(1), actor.outbound.recv())
+            .await
+            .expect("RPC response after release")
+            .expect("response frame");
+        let RelayWireFrame::DesktopFrame { payload, .. } =
+            serde_json::from_str(&response.into_text().expect("text response")).expect("relay frame")
+        else {
+            panic!("expected desktop response")
+        };
+        assert_eq!(payload["id"], 7);
+        assert_eq!(payload["result"], "done");
+        drop(actor.requests);
+        tokio::time::timeout(Duration::from_secs(1), actor.task)
+            .await
+            .expect("actor exits")
+            .expect("actor completed");
+        assert_actor_cleaned_up(actor.conn_id, &mut actor.stopped).await;
+    }
+
+    #[tokio::test]
+    async fn relay_disconnect_cancels_rpc_and_unregisters_actor() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        for _ in 0..3 {
+            let mut actor = stalled_actor().await;
+            let mut actors = HashMap::from([(
+                "phone-test".to_string(),
+                MobileActor {
+                    requests: actor.requests,
+                    task: actor.task,
+                },
+            )]);
+            let (outbound, _outbound_rx) = mpsc::channel(1);
+            handle_relay_frame(
+                RelayWireFrame::MobileDisconnected {
+                    connection_id: "phone-test".to_string(),
+                },
+                "desktop-test",
+                &outbound,
+                &mut actors,
+            )
+            .await;
+            assert!(actors.is_empty());
+            assert_actor_cleaned_up(actor.conn_id, &mut actor.stopped).await;
+        }
+    }
+
+    #[tokio::test]
+    async fn relay_outbound_close_cancels_rpc_and_unregisters_actor() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        let mut actor = stalled_actor().await;
+        drop(actor.outbound);
+        tokio::time::timeout(Duration::from_secs(1), actor.task)
+            .await
+            .expect("closed relay stops actor")
+            .expect("actor completed");
+        assert_actor_cleaned_up(actor.conn_id, &mut actor.stopped).await;
+        assert!(actor.requests.is_closed());
+    }
+
+    #[tokio::test]
+    async fn relay_request_close_cancels_rpc_and_unregisters_actor() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        let mut actor = stalled_actor().await;
+        drop(actor.requests);
+        tokio::time::timeout(Duration::from_secs(1), actor.task)
+            .await
+            .expect("closed requests stop actor")
+            .expect("actor completed");
+        assert_actor_cleaned_up(actor.conn_id, &mut actor.stopped).await;
+    }
 }
diff --git a/src-tauri/src/api/mobile_bridge/request_scheduler.rs b/src-tauri/src/api/mobile_bridge/request_scheduler.rs
new file mode 100644
index 0000000000..4d10e0e215
--- /dev/null
+++ b/src-tauri/src/api/mobile_bridge/request_scheduler.rs
@@ -0,0 +1,578 @@
+//! Bounded work owned by one authenticated mobile connection.
+//!
+//! Safe reads may overlap ordered mutations. Initialization is a barrier, and
+//! every handler still passes through the dispatcher's permission checks. A
+//! scheduler retains at most 32 pending requests (in addition to the bounded
+//! transport input channel) and four reads plus one mutation in flight.
+//! Search uses one of those read slots and retains only
+//! its latest pending query. Transport notification forwarding is independent.
+use std::{collections::VecDeque, future::Future};
+
+use serde_json::{json, Value};
+use tokio::{sync::mpsc, task::JoinSet};
+
+use super::rpc::{self, RpcContext};
+
+pub const REQUEST_QUEUE_CAPACITY: usize = 32;
+const MAX_CONCURRENT_READS: usize = 4;
+const SERVER_BUSY: i32 = -32007;
+const SEARCH_SUPERSEDED: i32 = -32008;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum Lane {
+    Read,
+    Search,
+    Mutation,
+    Barrier,
+}
+
+fn lane(request: &Value) -> Lane {
+    match request.get("method").and_then(Value::as_str) {
+        Some("initialize") => Lane::Barrier,
+        Some("session/list")
+            if request
+                .pointer("/params/query")
+                .and_then(Value::as_str)
+                .is_some_and(|query| !query.trim().is_empty()) =>
+        {
+            Lane::Search
+        }
+        Some(
+            "session/list" | "session/resolve" | "session/round" | "session/changes"
+            | "session/image" | "session/config" | "models/list" | "session/read_state"
+            | "session/history",
+        ) => Lane::Read,
+        // Includes subscribe/unsubscribe, read-receipt writes, interactions,
+        // and unknown methods: additions must explicitly opt in to concurrency.
+        _ => Lane::Mutation,
+    }
+}
+
+fn error(request: &Value, code: i32, message: &str) -> Value {
+    json!({
+        "jsonrpc": "2.0",
+        "id": request.get("id").cloned().unwrap_or(Value::Null),
+        "error": { "code": code, "message": message }
+    })
+}
+
+pub async fn run(ctx: RpcContext, requests: mpsc::Receiver<Value>, responses: mpsc::Sender<Value>) {
+    run_with_executor(ctx, requests, responses, |mut ctx, request| async move {
+        let response = rpc::dispatch(&mut ctx, &request).await;
+        (ctx, response)
+    })
+    .await;
+}
+
+/// The injectable seam exercises production scheduling without real adapters.
+pub(super) async fn run_with_executor<F, Fut>(
+    mut ctx: RpcContext,
+    mut requests: mpsc::Receiver<Value>,
+    responses: mpsc::Sender<Value>,
+    execute: F,
+) where
+    F: Fn(RpcContext, Value) -> Fut,
+    Fut: Future<Output = (RpcContext, Option<Value>)> + Send + 'static,
+{
+    let mut pending = VecDeque::<Value>::new();
+    let mut running = JoinSet::new();
+    let mut active_reads = 0;
+    let mut active_search = false;
+    let mut active_mutation = false;
+    let mut active_barrier = false;
+
+    loop {
+        // Closed input means disconnected, including buffered input. Never
+        // drain buffered mutations after their connection has disappeared.
+        if requests.is_closed() || responses.is_closed() {
+            break;
+        }
+        while !active_barrier {
+            let next = pending.iter().enumerate().find_map(|(index, request)| {
+                let kind = if ctx.initialized {
+                    lane(request)
+                } else {
+                    Lane::Barrier
+                };
+                // No request may overtake an initialization barrier.
+                if kind == Lane::Barrier {
+                    return Some((index, kind));
+                }
+                let available = match kind {
+                    Lane::Read => active_reads < MAX_CONCURRENT_READS,
+                    Lane::Search => !active_search && active_reads < MAX_CONCURRENT_READS,
+                    Lane::Mutation => !active_mutation,
+                    Lane::Barrier => unreachable!(),
+                };
+                available.then_some((index, kind))
+            });
+            let Some((index, kind)) = next else { break };
+            if kind == Lane::Barrier && (index != 0 || !running.is_empty()) {
+                break;
+            }
+            // Recheck before admitting work after the receiver's last await.
+            if requests.is_closed() || responses.is_closed() {
+                break;
+            }
+            let request = pending.remove(index).expect("selected pending request");
+            match kind {
+                Lane::Read => active_reads += 1,
+                Lane::Search => {
+                    active_reads += 1;
+                    active_search = true;
+                }
+                Lane::Mutation => active_mutation = true,
+                Lane::Barrier => active_barrier = true,
+            }
+            let future = execute(ctx.clone(), request);
+            running.spawn(async move {
+                let (context, response) = future.await;
+                (kind, context, response)
+            });
+        }
+
+        tokio::select! {
+            biased;
+            _ = responses.closed() => break,
+            result = running.join_next(), if !running.is_empty() => {
+                let Some(Ok((kind, context, response))) = result else {
+                    // A panicked handler cannot leave a lane permanently busy
+                    // or allow queued writes to execute with uncertain state.
+                    break;
+                };
+                match kind {
+                    Lane::Read => active_reads -= 1,
+                    Lane::Search => {
+                        active_reads -= 1;
+                        active_search = false;
+                    }
+                    Lane::Mutation => active_mutation = false,
+                    Lane::Barrier => {
+                        ctx = context;
+                        active_barrier = false;
+                    }
+                }
+                if let Some(response) = response {
+                    // A stalled socket is terminal, not an unbounded secondary
+                    // queue or a task that prevents disconnect detection.
+                    if responses.try_send(response).is_err() {
+                        break;
+                    }
+                }
+            }
+            request = requests.recv() => {
+                let Some(request) = request else { break };
+                if requests.is_closed() {
+                    break;
+                }
+                if lane(&request) == Lane::Search {
+                    if let Some(index) = pending.iter().position(|old| lane(old) == Lane::Search) {
+                        let old = pending.remove(index).expect("pending search");
+                        if responses.try_send(error(&old, SEARCH_SUPERSEDED, "search superseded by a newer query")).is_err() {
+                            break;
+                        }
+                    }
+                }
+                if pending.len() >= REQUEST_QUEUE_CAPACITY {
+                    if responses.try_send(error(&request, SERVER_BUSY, "server busy; request queue is full")).is_err() {
+                        break;
+                    }
+                } else {
+                    pending.push_back(request);
+                }
+            }
+        }
+    }
+    // JoinSet drop also aborts on cancellation of this owning scheduler. Abort
+    // only cancels async handlers: started spawn_blocking work may still finish,
+    // and already committed writes are not rolled back.
+    running.abort_all();
+    while running.join_next().await.is_some() {}
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{
+        sync::{
+            atomic::{AtomicUsize, Ordering},
+            Arc,
+        },
+        time::Duration,
+    };
+
+    use tokio::{sync::oneshot, task::JoinHandle};
+
+    use super::*;
+    use crate::api::mobile_bridge::{auth::MobileRemoteSettings, rpc::MobileTier};
+
+    fn context(initialized: bool) -> RpcContext {
+        RpcContext {
+            conn_id: 17,
+            initialized,
+            tier: MobileTier::Full,
+            settings: MobileRemoteSettings {
+                enabled: true,
+                lan_token: "test".into(),
+                allow_lan_exposure: false,
+            },
+        }
+    }
+
+    fn request(id: u64, method: &str) -> Value {
+        json!({"jsonrpc":"2.0", "id":id, "method":method})
+    }
+
+    #[derive(Debug)]
+    enum Finish {
+        Success,
+        Error,
+        Panic,
+    }
+
+    struct Call {
+        id: u64,
+        initialized: bool,
+        finish: oneshot::Sender<Finish>,
+    }
+
+    struct DropCount(Arc<AtomicUsize>);
+    impl Drop for DropCount {
+        fn drop(&mut self) {
+            self.0.fetch_add(1, Ordering::SeqCst);
+        }
+    }
+
+    struct Harness {
+        input: mpsc::Sender<Value>,
+        output: mpsc::Receiver<Value>,
+        calls: mpsc::Receiver<Call>,
+        dropped: Arc<AtomicUsize>,
+        task: JoinHandle<()>,
+    }
+
+    impl Harness {
+        fn start(initialized: bool, response_capacity: usize) -> Self {
+            let (input, requests) = mpsc::channel(REQUEST_QUEUE_CAPACITY);
+            let (responses, output) = mpsc::channel(response_capacity);
+            let (started, calls) = mpsc::channel(REQUEST_QUEUE_CAPACITY);
+            let dropped = Arc::new(AtomicUsize::new(0));
+            let counter = dropped.clone();
+            let task = tokio::spawn(run_with_executor(
+                context(initialized),
+                requests,
+                responses,
+                move |mut ctx, request| {
+                    let started = started.clone();
+                    let dropped = counter.clone();
+                    async move {
+                        let _guard = DropCount(dropped);
+                        let id = request["id"].as_u64().unwrap();
+                        let (finish, done) = oneshot::channel();
+                        started
+                            .send(Call {
+                                id,
+                                initialized: ctx.initialized,
+                                finish,
+                            })
+                            .await
+                            .unwrap();
+                        let response = match done.await.expect("test releases call") {
+                            Finish::Success => {
+                                if request["method"] == "initialize" {
+                                    ctx.initialized = true;
+                                }
+                                json!({"jsonrpc":"2.0", "id":id, "result":{}})
+                            }
+                            Finish::Error => error(&request, -32602, "test failure"),
+                            Finish::Panic => panic!("injected handler panic"),
+                        };
+                        (ctx, Some(response))
+                    }
+                },
+            ));
+            Self {
+                input,
+                output,
+                calls,
+                dropped,
+                task,
+            }
+        }
+
+        async fn send(&self, id: u64, method: &str) {
+            self.input.send(request(id, method)).await.unwrap();
+        }
+
+        async fn call(&mut self) -> Call {
+            tokio::time::timeout(Duration::from_secs(1), self.calls.recv())
+                .await
+                .expect("call starts")
+                .expect("scheduler alive")
+        }
+
+        async fn no_call(&mut self) {
+            assert!(
+                tokio::time::timeout(Duration::from_millis(10), self.calls.recv())
+                    .await
+                    .is_err()
+            );
+        }
+
+        async fn response(&mut self) -> Value {
+            tokio::time::timeout(Duration::from_secs(1), self.output.recv())
+                .await
+                .expect("response available")
+                .expect("scheduler alive")
+        }
+
+        async fn stop(self) {
+            drop(self.input);
+            tokio::time::timeout(Duration::from_secs(1), self.task)
+                .await
+                .unwrap()
+                .unwrap();
+        }
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn reads_are_bounded_and_mutations_run_fifo_independently() {
+        let mut h = Harness::start(true, 32);
+        let mut reads = Vec::new();
+        for id in 1..=MAX_CONCURRENT_READS as u64 {
+            h.send(id, "session/round").await;
+            reads.push(h.call().await);
+        }
+        h.send(10, "session/list").await;
+        h.send(11, "session/subscribe").await;
+        h.send(12, "session/unsubscribe").await;
+        let first_write = h.call().await;
+        assert_eq!(first_write.id, 11);
+        h.no_call().await;
+        first_write.finish.send(Finish::Success).unwrap();
+        assert_eq!(h.response().await["id"], 11);
+        let second_write = h.call().await;
+        assert_eq!(second_write.id, 12);
+        second_write.finish.send(Finish::Error).unwrap();
+        assert!(h.response().await.get("error").is_some());
+        h.send(13, "session/send").await;
+        let third_write = h.call().await;
+        assert_eq!(third_write.id, 13);
+        third_write.finish.send(Finish::Success).unwrap();
+        h.response().await;
+        reads.pop().unwrap().finish.send(Finish::Success).unwrap();
+        h.response().await;
+        assert_eq!(h.call().await.id, 10);
+        h.stop().await;
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn latest_pending_search_replaces_old_query_and_preserves_ids() {
+        let mut h = Harness::start(true, 32);
+        h.input
+            .send(json!({"id":1,"method":"session/list","params":{"query":"first"}}))
+            .await
+            .unwrap();
+        let first = h.call().await;
+        for id in 2..=3 {
+            h.input.send(json!({"id":id,"method":"session/list","params":{"query":format!("query-{id}")}})).await.unwrap();
+        }
+        let superseded = h.response().await;
+        assert_eq!(superseded["id"], 2);
+        assert!(superseded["error"]["message"]
+            .as_str()
+            .unwrap()
+            .contains("superseded"));
+        h.no_call().await;
+        first.finish.send(Finish::Success).unwrap();
+        assert_eq!(h.response().await["id"], 1);
+        let latest = h.call().await;
+        assert_eq!(latest.id, 3);
+        latest.finish.send(Finish::Success).unwrap();
+        assert_eq!(h.response().await["id"], 3);
+        h.stop().await;
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn initialize_is_a_barrier_and_failed_initialization_does_not_unlock_reads() {
+        let mut h = Harness::start(false, 32);
+        h.send(1, "initialize").await;
+        let failed = h.call().await;
+        h.send(2, "session/list").await;
+        h.send(3, "initialize").await;
+        h.send(4, "session/round").await;
+        h.no_call().await;
+        failed.finish.send(Finish::Error).unwrap();
+        h.response().await;
+        let rejected = h.call().await;
+        assert_eq!(rejected.id, 2);
+        assert!(!rejected.initialized);
+        rejected.finish.send(Finish::Error).unwrap();
+        h.response().await;
+        let retry = h.call().await;
+        assert_eq!(retry.id, 3);
+        retry.finish.send(Finish::Success).unwrap();
+        h.response().await;
+        let read = h.call().await;
+        assert_eq!(read.id, 4);
+        assert!(read.initialized);
+        h.stop().await;
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn repeated_initialize_waits_for_active_work_and_blocks_later_reads() {
+        let mut h = Harness::start(true, 32);
+        h.send(1, "session/round").await;
+        let read = h.call().await;
+        h.send(2, "session/send").await;
+        let write = h.call().await;
+        h.send(3, "initialize").await;
+        h.send(4, "models/list").await;
+        h.no_call().await;
+        read.finish.send(Finish::Success).unwrap();
+        h.response().await;
+        h.no_call().await;
+        write.finish.send(Finish::Success).unwrap();
+        h.response().await;
+        let initialize = h.call().await;
+        assert_eq!(initialize.id, 3);
+        h.no_call().await;
+        initialize.finish.send(Finish::Success).unwrap();
+        h.response().await;
+        let later_read = h.call().await;
+        assert_eq!(later_read.id, 4);
+        h.stop().await;
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn real_dispatch_preserves_preinitialize_and_readonly_gates() {
+        for (initialized, method, expected) in [
+            (false, "session/list", -32600),
+            (false, "session/send", -32600),
+            (true, "session/send", -32002),
+            (true, "session/cancel", -32002),
+            (true, "session/patch", -32002),
+            (true, "interaction/respond_permission", -32002),
+        ] {
+            let (input, requests) = mpsc::channel(1);
+            let (responses, mut output) = mpsc::channel(1);
+            let mut ctx = context(initialized);
+            ctx.tier = MobileTier::ReadOnly;
+            let task = tokio::spawn(run(ctx, requests, responses));
+            input.send(request(1, method)).await.unwrap();
+            let response = output.recv().await.unwrap();
+            assert_eq!(response["error"]["code"], expected, "{method}");
+            drop(input);
+            task.await.unwrap();
+        }
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn pending_queue_is_bounded_and_overload_is_explicit() {
+        let mut h = Harness::start(true, 32);
+        h.send(1, "session/send").await;
+        let _active = h.call().await;
+        for id in 2..=(REQUEST_QUEUE_CAPACITY as u64 + 2) {
+            h.send(id, "session/send").await;
+        }
+        let rejected = h.response().await;
+        assert_eq!(rejected["id"], REQUEST_QUEUE_CAPACITY as u64 + 2);
+        assert!(rejected["error"]["message"]
+            .as_str()
+            .unwrap()
+            .contains("queue is full"));
+        h.no_call().await;
+        h.stop().await;
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn disconnect_drops_active_handlers_and_never_starts_queued_writes() {
+        let mut h = Harness::start(true, 32);
+        h.send(1, "session/send").await;
+        let _active = h.call().await;
+        h.send(2, "session/cancel").await;
+        h.no_call().await;
+        // Do not yield between buffering another write and disconnecting:
+        // both the internal queue and unread transport buffer must be dropped.
+        h.input.try_send(request(3, "session/patch")).unwrap();
+        drop(h.input);
+        h.task.await.unwrap();
+        assert_eq!(h.dropped.load(Ordering::SeqCst), 1);
+        assert!(h.calls.recv().await.is_none());
+        assert!(h.output.recv().await.is_none());
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn handler_panic_cancels_peers_and_queued_work() {
+        let mut h = Harness::start(true, 32);
+        h.send(1, "session/list").await;
+        let panics = h.call().await;
+        h.send(2, "session/send").await;
+        let _write = h.call().await;
+        h.send(3, "session/cancel").await;
+        panics.finish.send(Finish::Panic).unwrap();
+        h.task.await.unwrap();
+        assert_eq!(h.dropped.load(Ordering::SeqCst), 2);
+        assert!(h.calls.recv().await.is_none());
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn closed_response_consumer_cancels_work_and_pending_mutations() {
+        let mut h = Harness::start(true, 32);
+        h.send(1, "session/send").await;
+        let _active = h.call().await;
+        h.send(2, "session/cancel").await;
+        h.no_call().await;
+        drop(h.output);
+        h.task.await.unwrap();
+        assert!(h.calls.recv().await.is_none());
+        assert_eq!(h.dropped.load(Ordering::SeqCst), 1);
+        assert!(h.input.is_closed());
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn aborting_scheduler_owner_drops_its_handlers() {
+        let mut h = Harness::start(true, 32);
+        h.send(1, "session/send").await;
+        let _active = h.call().await;
+        h.send(2, "session/cancel").await;
+        h.no_call().await;
+        h.task.abort();
+        assert!(h.task.await.unwrap_err().is_cancelled());
+        assert!(h.calls.recv().await.is_none());
+        assert_eq!(h.dropped.load(Ordering::SeqCst), 1);
+        assert!(h.input.is_closed());
+    }
+
+    #[tokio::test(start_paused = true)]
+    async fn response_saturation_is_terminal_and_cleans_up() {
+        let mut h = Harness::start(true, 1);
+        h.send(1, "session/list").await;
+        let first = h.call().await;
+        h.send(2, "session/round").await;
+        let second = h.call().await;
+        first.finish.send(Finish::Success).unwrap();
+        second.finish.send(Finish::Success).unwrap();
+        h.task.await.unwrap();
+        assert_eq!(h.dropped.load(Ordering::SeqCst), 2);
+        assert!(h.input.is_closed());
+    }
+
+    #[test]
+    fn new_methods_and_mark_visited_are_serialized_by_default() {
+        for method in [
+            "session/mark_visited",
+            "session/subscribe",
+            "session/unsubscribe",
+            "future/method",
+        ] {
+            assert_eq!(lane(&request(1, method)), Lane::Mutation);
+        }
+        assert_eq!(lane(&request(1, "session/read_state")), Lane::Read);
+        for query in [Value::Null, json!(42), json!("  ")] {
+            assert_eq!(
+                lane(&json!({"method":"session/list","params":{"query":query}})),
+                Lane::Read
+            );
+        }
+    }
+}
diff --git a/src-tauri/src/api/mobile_bridge/rpc.rs b/src-tauri/src/api/mobile_bridge/rpc.rs
index 0d6d617d9f..3db45a0e83 100644
--- a/src-tauri/src/api/mobile_bridge/rpc.rs
+++ b/src-tauri/src/api/mobile_bridge/rpc.rs
@@ -2,7 +2,7 @@
 
 use serde_json::{json, Value};
 
-use super::adapters::{file_navigation, interaction, model, session};
+use super::adapters::{file_navigation, images, interaction, model, session};
 use super::auth::MobileRemoteSettings;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -69,6 +69,7 @@ pub enum MobileTier {
     ReadOnly,
 }
 
+#[derive(Clone)]
 pub struct RpcContext {
     pub conn_id: u64,
     pub initialized: bool,
@@ -104,6 +105,10 @@ async fn dispatch_method(
 ) -> Result<Value, RpcError> {
     match method {
         "initialize" => handle_initialize(ctx, params).await,
+        "session/open" => {
+            require_initialized(ctx)?;
+            session::session_open(ctx.conn_id, params).await
+        }
         "session/resolve" => {
             require_initialized(ctx)?;
             super::adapters::session_identity::resolve(params).await
@@ -112,6 +117,15 @@ async fn dispatch_method(
             require_initialized(ctx)?;
             session::session_list(params).await
         }
+        "session/changes" => {
+            require_initialized(ctx)?;
+            super::adapters::change_review::historical_changes(params).await
+        }
+        "session/read_state" | "session/mark_visited" => {
+            require_initialized(ctx)?;
+            // A personal read receipt does not execute an agent operation.
+            super::read_state::request(params, method == "session/mark_visited").await
+        }
         "session/subscribe" => {
             require_initialized(ctx)?;
             session::session_subscribe(ctx.conn_id, params).await
@@ -120,6 +134,10 @@ async fn dispatch_method(
             require_initialized(ctx)?;
             session::session_round(params).await
         }
+        "session/history" => {
+            require_initialized(ctx)?;
+            session::session_history(params).await
+        }
         "session/unsubscribe" => {
             require_initialized(ctx)?;
             session::session_unsubscribe(ctx.conn_id, params)
@@ -134,6 +152,10 @@ async fn dispatch_method(
             require_full_tier(ctx)?;
             session::session_cancel(params).await
         }
+        "session/image" => {
+            require_initialized(ctx)?;
+            images::session_image(params).await
+        }
         "session/open_file" => {
             require_initialized(ctx)?;
             require_full_tier(ctx)?;
@@ -171,6 +193,10 @@ async fn dispatch_method(
             require_initialized(ctx)?;
             interaction::pending(params).await
         }
+        "interaction/pending_all" => {
+            require_initialized(ctx)?;
+            interaction::pending_all(params).await
+        }
         "" => Err(RpcError::new(
             RpcErrorCode::InvalidRequest,
             "missing method",
@@ -235,9 +261,14 @@ async fn handle_initialize(ctx: &mut RpcContext, params: &Value) -> Result<Value
             "maxConcurrentSubscriptions": 4,
             "roundHistory": true,
             "openSessionFile": true,
+            "sessionImages": true,
             "modelSelection": true,
             "sessionIdentity": true,
+            "sessionOpen": true,
+            "changeReview": true,
+            "pendingInteractions": true,
             "sessionSearch": true,
+            "sessionReadState": true,
         }
     }))
 }
@@ -245,6 +276,46 @@ async fn handle_initialize(ctx: &mut RpcContext, params: &Value) -> Result<Value
 #[cfg(test)]
 mod tests {
     use super::*;
+
+    #[tokio::test]
+    async fn opening_requires_initialize_and_validates_lease_before_history() {
+        let mut ctx = RpcContext {
+            conn_id: 0,
+            tier: MobileTier::ReadOnly,
+            initialized: false,
+            settings: MobileRemoteSettings::default(),
+        };
+        let request = json!({"jsonrpc":"2.0", "id":1, "method":"session/open", "params":{}});
+        let response = dispatch(&mut ctx, &request).await.unwrap();
+        assert!(response.get("error").is_some());
+        ctx.initialized = true;
+        let response = dispatch(&mut ctx, &request).await.unwrap();
+        assert_eq!(response["error"]["message"], "subscriptionId is required");
+    }
+
+    #[tokio::test]
+    async fn history_hydration_requires_initialize_and_is_readonly() {
+        let mut ctx = RpcContext {
+            conn_id: 0,
+            initialized: false,
+            tier: MobileTier::ReadOnly,
+            settings: MobileRemoteSettings {
+                enabled: true,
+                lan_token: "test".into(),
+                allow_lan_exposure: false,
+            },
+        };
+        let request = json!({"jsonrpc":"2.0","id":7,"method":"session/history","params":{}});
+        let before = dispatch(&mut ctx, &request).await.unwrap();
+        assert_eq!(
+            before["error"]["code"],
+            RpcErrorCode::InvalidRequest.as_i32()
+        );
+        ctx.initialized = true;
+        let after = dispatch(&mut ctx, &request).await.unwrap();
+        assert_eq!(after["id"], 7);
+        assert_eq!(after["error"]["code"], RpcErrorCode::InvalidParams.as_i32());
+    }
     use crate::api::mobile_bridge::auth::MobileRemoteSettings;
 
     fn test_context(enabled: bool) -> RpcContext {
@@ -287,16 +358,13 @@ mod tests {
         });
         let response = dispatch(&mut ctx, &request).await.expect("response");
         assert!(response.get("result").is_some());
-        assert_eq!(response["result"]["capabilities"]["sessionIdentity"], true);
-        assert_eq!(response["result"]["capabilities"]["sessionSearch"], true);
-        let expected_identity = super::super::desktop_identity::collect();
-        assert_eq!(
-            response["result"]["desktopIdentity"],
-            serde_json::to_value(&expected_identity).unwrap()
-        );
+        let identity = response["result"]["desktopIdentity"].as_object().unwrap();
+        assert!(identity
+            .keys()
+            .all(|key| matches!(key.as_str(), "name" | "model" | "username")));
         assert_eq!(
             response["result"]["desktopName"],
-            serde_json::to_value(&expected_identity.name).unwrap()
+            response["result"]["desktopIdentity"]["name"]
         );
         assert_eq!(
             response
@@ -312,6 +380,55 @@ mod tests {
         );
         assert_eq!(response["result"]["capabilities"]["sessionSearch"], true);
         assert!(ctx.initialized);
+        assert_eq!(
+            response["result"]["capabilities"]["pendingInteractions"],
+            true
+        );
+        assert_eq!(response["result"]["capabilities"]["sessionSearch"], true);
+        assert_eq!(response["result"]["capabilities"]["sessionReadState"], true);
+    }
+
+    #[tokio::test]
+    async fn read_receipts_require_initialization_and_validate_read_only_requests() {
+        let mut ctx = test_context(true);
+        for method in ["session/read_state", "session/mark_visited"] {
+            let response = dispatch(&mut ctx, &json!({"id":1, "method":method, "params":{}}))
+                .await
+                .unwrap();
+            assert_eq!(response["error"]["message"], "connection not initialized");
+        }
+        ctx.initialized = true;
+        ctx.tier = MobileTier::ReadOnly;
+        for method in ["session/read_state", "session/mark_visited"] {
+            let response = dispatch(
+                &mut ctx,
+                &json!({"id":2, "method":method, "params":{"sessionIds":[]}}),
+            )
+            .await
+            .unwrap();
+            assert_eq!(
+                response["error"]["code"],
+                RpcErrorCode::InvalidParams.as_i32()
+            );
+        }
+    }
+
+    #[tokio::test]
+    async fn pending_snapshots_require_initialization_and_read_only_cannot_answer() {
+        let mut ctx = test_context(true);
+        for method in ["interaction/pending", "interaction/pending_all"] {
+            let response = dispatch(
+                &mut ctx,
+                &json!({"jsonrpc":"2.0", "id":22, "method":method, "params":{}}),
+            )
+            .await
+            .unwrap();
+            assert_eq!(response["error"]["message"], "connection not initialized");
+        }
+        ctx.initialized = true;
+        ctx.tier = MobileTier::ReadOnly;
+        let response = dispatch(&mut ctx, &json!({"jsonrpc":"2.0", "id":23, "method":"interaction/respond_permission", "params":{}})).await.unwrap();
+        assert_eq!(response["error"]["code"], RpcErrorCode::TierDenied.as_i32());
     }
 
     #[tokio::test]
@@ -362,6 +479,22 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn images_require_initialize_but_allow_read_only_access() {
+        let mut ctx = test_context(true);
+        let request = json!({"jsonrpc":"2.0", "id":21, "method":"session/image", "params":{}});
+        let response = dispatch(&mut ctx, &request).await.unwrap();
+        assert_eq!(response["error"]["message"], "connection not initialized");
+        ctx.initialized = true;
+        ctx.tier = MobileTier::ReadOnly;
+        let response = dispatch(&mut ctx, &request).await.unwrap();
+        // Invalid params are rejected by the adapter, not by a write-tier gate.
+        assert_eq!(
+            response["error"]["code"],
+            RpcErrorCode::InvalidParams.as_i32()
+        );
+    }
+
     #[tokio::test]
     async fn initialize_preserves_relay_read_only_tier() {
         let mut ctx = test_context(true);
diff --git a/src-tauri/src/api/mobile_bridge/ws_handler.rs b/src-tauri/src/api/mobile_bridge/ws_handler.rs
index 46e107fda9..dd58e0f69e 100644
--- a/src-tauri/src/api/mobile_bridge/ws_handler.rs
+++ b/src-tauri/src/api/mobile_bridge/ws_handler.rs
@@ -5,14 +5,16 @@ use axum::extract::{Query, WebSocketUpgrade};
 use axum::http::HeaderMap;
 use axum::response::{IntoResponse, Response};
 use axum::Json;
-use futures_util::{SinkExt, StreamExt};
+use futures_util::{Sink, SinkExt, Stream, StreamExt};
 use serde::Deserialize;
 use serde_json::{json, Value};
 use tokio::sync::mpsc;
+use tokio::task::JoinSet;
 
 use super::auth::{self, AuthFailure, MobileRemoteSettings};
 use super::fanout;
-use super::rpc::{self, MobileTier, RpcContext};
+use super::request_scheduler::{self, REQUEST_QUEUE_CAPACITY};
+use super::rpc::{MobileTier, RpcContext};
 
 const MAX_WS_TEXT_BYTES: usize = 1024 * 1024;
 
@@ -86,18 +88,47 @@ fn failure_response(failure: AuthFailure) -> Response {
 }
 
 async fn handle_mobile_socket(socket: WebSocket, settings: MobileRemoteSettings) {
-    let (mut sender, mut receiver) = socket.split();
+    let (sender, receiver) = socket.split();
+    handle_mobile_transport(sender, receiver, settings, request_scheduler::run).await;
+}
+
+/// The socket owns both its fanout registration and every child task, including
+/// when the server cancels the upgrade future instead of receiving a Close frame.
+struct ConnectionRegistration(u64);
+
+impl Drop for ConnectionRegistration {
+    fn drop(&mut self) {
+        fanout::unregister_connection(self.0);
+        tracing::debug!(conn_id = self.0, "[MobileBridge] client disconnected");
+    }
+}
+
+async fn handle_mobile_transport<S, R, E, F, Fut>(
+    mut sender: S,
+    mut receiver: R,
+    settings: MobileRemoteSettings,
+    run_scheduler: F,
+) where
+    S: Sink<Message> + Unpin + Send + 'static,
+    R: Stream<Item = Result<Message, E>> + Unpin,
+    F: FnOnce(RpcContext, mpsc::Receiver<Value>, mpsc::Sender<Value>) -> Fut,
+    Fut: std::future::Future<Output = ()> + Send + 'static,
+{
     let (outbound_tx, mut outbound_rx) = mpsc::channel::<String>(64);
     let conn_id = fanout::register_connection(outbound_tx.clone());
+    let _registration = ConnectionRegistration(conn_id);
 
-    let mut ctx = RpcContext {
+    let ctx = RpcContext {
         conn_id,
         initialized: false,
         tier: MobileTier::Full,
         settings,
     };
 
-    let send_task = tokio::spawn(async move {
+    // JoinSet aborts all children on drop. Any child exiting (including a socket
+    // write failure) closes this connection and cancels its outstanding RPCs.
+    let mut tasks = JoinSet::new();
+    tasks.spawn(async move {
         while let Some(message) = outbound_rx.recv().await {
             if sender.send(Message::Text(message.into())).await.is_err() {
                 break;
@@ -105,7 +136,29 @@ async fn handle_mobile_socket(socket: WebSocket, settings: MobileRemoteSettings)
         }
     });
 
-    while let Some(result) = receiver.next().await {
+    let (request_tx, request_rx) = mpsc::channel(REQUEST_QUEUE_CAPACITY);
+    let (response_tx, mut response_rx) = mpsc::channel::<Value>(REQUEST_QUEUE_CAPACITY);
+    tasks.spawn(run_scheduler(ctx, request_rx, response_tx));
+    let response_outbound_tx = outbound_tx.clone();
+    tasks.spawn(async move {
+        while let Some(response) = response_rx.recv().await {
+            if response_outbound_tx
+                .send(response.to_string())
+                .await
+                .is_err()
+            {
+                break;
+            }
+        }
+    });
+
+    loop {
+        let result = tokio::select! {
+            biased;
+            _ = tasks.join_next() => break,
+            result = receiver.next() => result,
+        };
+        let Some(result) = result else { break };
         let Ok(message) = result else {
             break;
         };
@@ -113,71 +166,75 @@ async fn handle_mobile_socket(socket: WebSocket, settings: MobileRemoteSettings)
         match message {
             Message::Text(text) => {
                 if text.len() > MAX_WS_TEXT_BYTES {
-                    let _ = outbound_tx
-                        .send(
-                            json!({
-                                "jsonrpc": "2.0",
-                                "id": null,
-                                "error": {
-                                    "code": -32600,
-                                    "message": "message too large",
-                                }
-                            })
-                            .to_string(),
-                        )
-                        .await;
+                    let _ = send_transport_error(
+                        &outbound_tx,
+                        Value::Null,
+                        -32600,
+                        "message too large",
+                    );
                     break;
                 }
 
                 let parsed = match serde_json::from_str::<Value>(&text) {
                     Ok(value) => value,
                     Err(err) => {
-                        let _ = outbound_tx
-                            .send(
-                                json!({
-                                    "jsonrpc": "2.0",
-                                    "id": null,
-                                    "error": {
-                                        "code": -32600,
-                                        "message": format!("invalid json: {err}"),
-                                    }
-                                })
-                                .to_string(),
-                            )
-                            .await;
+                        if !send_transport_error(
+                            &outbound_tx,
+                            Value::Null,
+                            -32600,
+                            &format!("invalid json: {err}"),
+                        ) {
+                            break;
+                        }
                         continue;
                     }
                 };
 
-                if let Some(response) = rpc::dispatch(&mut ctx, &parsed).await {
-                    if outbound_tx.send(response.to_string()).await.is_err() {
-                        break;
+                // A saturated peer gets a bounded overload response rather than
+                // blocking receipt of control frames or retaining more requests.
+                match request_tx.try_send(parsed) {
+                    Ok(()) => {}
+                    Err(mpsc::error::TrySendError::Closed(_)) => break,
+                    Err(mpsc::error::TrySendError::Full(request)) => {
+                        let id = request.get("id").cloned().unwrap_or(Value::Null);
+                        if !send_transport_error(&outbound_tx, id, -32007, "server busy") {
+                            break;
+                        }
                     }
                 }
             }
             Message::Close(_) => break,
             Message::Ping(_) | Message::Pong(_) => {}
             Message::Binary(_) => {
-                let _ = outbound_tx
-                    .send(
-                        json!({
-                            "jsonrpc": "2.0",
-                            "id": null,
-                            "error": {
-                                "code": -32600,
-                                "message": "binary frames not supported",
-                            }
-                        })
-                        .to_string(),
-                    )
-                    .await;
+                if !send_transport_error(
+                    &outbound_tx,
+                    Value::Null,
+                    -32600,
+                    "binary frames not supported",
+                ) {
+                    break;
+                }
             }
         }
     }
+}
 
-    send_task.abort();
-    fanout::unregister_connection(conn_id);
-    tracing::debug!(conn_id, "[MobileBridge] client disconnected");
+fn send_transport_error(
+    outbound: &mpsc::Sender<String>,
+    id: Value,
+    code: i64,
+    message: &str,
+) -> bool {
+    outbound
+        .try_send(
+            json!({
+                "jsonrpc": "2.0",
+                "id": id,
+                "error": { "code": code, "message": message },
+            })
+            .to_string(),
+        )
+        .is_ok()
 }
 
 #[cfg(test)]
@@ -185,6 +242,258 @@ mod tests {
     use super::auth::{token_matches, AuthFailure, MobileRemoteSettings};
     use super::*;
     use axum::http::StatusCode;
+    use std::sync::Arc;
+    use tokio::sync::Semaphore;
+    use tokio::time::{timeout, Duration};
+
+    struct TestTransport {
+        input: mpsc::Sender<Message>,
+        output: mpsc::Receiver<Message>,
+        task: tokio::task::JoinHandle<()>,
+    }
+
+    impl Drop for TestTransport {
+        fn drop(&mut self) {
+            self.task.abort();
+        }
+    }
+
+    impl TestTransport {
+        async fn request(&self, id: u64, method: &str) {
+            self.input
+                .send(Message::Text(
+                    json!({
+                        "jsonrpc": "2.0", "id": id, "method": method,
+                    })
+                    .to_string()
+                    .into(),
+                ))
+                .await
+                .unwrap();
+        }
+
+        async fn response(&mut self) -> Value {
+            let message = timeout(Duration::from_secs(2), self.output.recv())
+                .await
+                .expect("transport must remain responsive")
+                .unwrap();
+            let Message::Text(text) = message else {
+                panic!("expected JSON text")
+            };
+            serde_json::from_str(&text).unwrap()
+        }
+    }
+
+    fn test_transport<F, Fut>(run: F) -> TestTransport
+    where
+        F: FnOnce(RpcContext, mpsc::Receiver<Value>, mpsc::Sender<Value>) -> Fut + Send + 'static,
+        Fut: std::future::Future<Output = ()> + Send + 'static,
+    {
+        let (input, incoming) = mpsc::channel::<Message>(128);
+        let (outgoing, output) = mpsc::channel::<Message>(128);
+        let receiver = Box::pin(futures_util::stream::unfold(
+            incoming,
+            |mut incoming| async {
+                incoming
+                    .recv()
+                    .await
+                    .map(|message| (Ok::<_, std::io::Error>(message), incoming))
+            },
+        ));
+        let sender = Box::pin(futures_util::sink::unfold(
+            outgoing,
+            |outgoing, message| async {
+                outgoing
+                    .send(message)
+                    .await
+                    .map_err(|_| std::io::Error::from(std::io::ErrorKind::BrokenPipe))?;
+                Ok::<_, std::io::Error>(outgoing)
+            },
+        ));
+        let task = tokio::spawn(handle_mobile_transport(
+            sender,
+            receiver,
+            MobileRemoteSettings {
+                enabled: true,
+                lan_token: "test-token".into(),
+                allow_lan_exposure: true,
+            },
+            run,
+        ));
+        TestTransport {
+            input,
+            output,
+            task,
+        }
+    }
+
+    struct OnDrop(mpsc::UnboundedSender<()>);
+
+    impl Drop for OnDrop {
+        fn drop(&mut self) {
+            let _ = self.0.send(());
+        }
+    }
+
+    async fn transport_with_pending_read() -> (
+        TestTransport,
+        u64,
+        Arc<Semaphore>,
+        mpsc::UnboundedReceiver<()>,
+    ) {
+        let (started_tx, mut started_rx) = mpsc::unbounded_channel();
+        let (dropped_tx, dropped_rx) = mpsc::unbounded_channel();
+        let release = Arc::new(Semaphore::new(0));
+        let executor_release = release.clone();
+        let mut transport = test_transport(move |ctx, requests, responses| {
+            request_scheduler::run_with_executor(
+                ctx,
+                requests,
+                responses,
+                move |mut ctx, request| {
+                    let started_tx = started_tx.clone();
+                    let dropped_tx = dropped_tx.clone();
+                    let release = executor_release.clone();
+                    async move {
+                        if request["method"] == "initialize" {
+                            ctx.initialized = true;
+                        } else if request["method"] == "session/list" {
+                            let _drop = OnDrop(dropped_tx);
+                            started_tx.send(ctx.conn_id).unwrap();
+                            let _permit = release.acquire().await.unwrap();
+                        }
+                        let response =
+                            json!({ "jsonrpc": "2.0", "id": request["id"], "result": {} });
+                        (ctx, Some(response))
+                    }
+                },
+            )
+        });
+        transport.request(1, "initialize").await;
+        assert_eq!(transport.response().await["id"], 1);
+        transport.request(2, "session/list").await;
+        let conn_id = timeout(Duration::from_secs(2), started_rx.recv())
+            .await
+            .unwrap()
+            .unwrap();
+        (transport, conn_id, release, dropped_rx)
+    }
+
+    #[tokio::test]
+    async fn pending_read_keeps_later_requests_validation_and_fanout_responsive() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        let (mut transport, conn_id, release, _dropped) = transport_with_pending_read().await;
+        transport.request(3, "models/list").await;
+        assert_eq!(transport.response().await["id"], 3);
+
+        transport
+            .input
+            .send(Message::Text("{".into()))
+            .await
+            .unwrap();
+        assert_eq!(transport.response().await["error"]["code"], -32600);
+        transport
+            .input
+            .send(Message::Binary(vec![1].into()))
+            .await
+            .unwrap();
+        assert_eq!(
+            transport.response().await["error"]["message"],
+            "binary frames not supported"
+        );
+
+        let session_id = format!("lan-pending-read-{conn_id}");
+        assert!(fanout::subscribe_session(conn_id, &session_id));
+        fanout::fanout_to_session(
+            &session_id,
+            r#"{"jsonrpc":"2.0","method":"test/notification"}"#,
+        );
+        assert_eq!(transport.response().await["method"], "test/notification");
+
+        release.add_permits(1);
+        assert_eq!(transport.response().await["id"], 2);
+        transport.input.send(Message::Close(None)).await.unwrap();
+        timeout(Duration::from_secs(2), &mut transport.task)
+            .await
+            .unwrap()
+            .unwrap();
+        assert!(!fanout::subscribe_session(conn_id, &session_id));
+    }
+
+    #[tokio::test]
+    async fn close_abort_and_write_failure_cancel_pending_reads_and_unregister() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        for terminal in ["close", "abort", "write_failure"] {
+            let (mut transport, conn_id, _release, mut dropped) =
+                transport_with_pending_read().await;
+            match terminal {
+                "close" => transport.input.send(Message::Close(None)).await.unwrap(),
+                "abort" => transport.task.abort(),
+                _ => {
+                    transport.output.close();
+                    // A validation response exercises the real writer failure path.
+                    transport
+                        .input
+                        .send(Message::Text("{".into()))
+                        .await
+                        .unwrap();
+                }
+            }
+            let completed = timeout(Duration::from_secs(2), &mut transport.task)
+                .await
+                .unwrap();
+            if terminal == "abort" {
+                assert!(completed.unwrap_err().is_cancelled());
+            } else {
+                completed.unwrap();
+            }
+            assert_eq!(
+                timeout(Duration::from_secs(2), dropped.recv())
+                    .await
+                    .unwrap(),
+                Some(())
+            );
+            assert!(!fanout::subscribe_session(conn_id, "disconnected"));
+        }
+    }
+
+    #[tokio::test]
+    async fn full_request_queue_replies_busy_and_still_accepts_close() {
+        let _registry = fanout::TEST_REGISTRY_LOCK.lock().await;
+        let (started_tx, mut started_rx) = mpsc::unbounded_channel();
+        let (dropped_tx, mut dropped_rx) = mpsc::unbounded_channel();
+        let mut transport = test_transport(move |ctx, requests, responses| async move {
+            let _requests = requests;
+            // Keep both scheduler channels alive while intentionally refusing
+            // input; a closed response channel correctly terminates transport.
+            let _responses = responses;
+            let _drop = OnDrop(dropped_tx);
+            started_tx.send(ctx.conn_id).unwrap();
+            std::future::pending::<()>().await;
+        });
+        let conn_id = timeout(Duration::from_secs(2), started_rx.recv())
+            .await
+            .unwrap()
+            .unwrap();
+        for id in 0..=REQUEST_QUEUE_CAPACITY {
+            transport.request(id as u64, "session/list").await;
+        }
+        let response = transport.response().await;
+        assert_eq!(response["id"], REQUEST_QUEUE_CAPACITY);
+        assert_eq!(response["error"]["code"], -32007);
+        transport.input.send(Message::Close(None)).await.unwrap();
+        timeout(Duration::from_secs(2), &mut transport.task)
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(
+            timeout(Duration::from_secs(2), dropped_rx.recv())
+                .await
+                .unwrap(),
+            Some(())
+        );
+        assert!(!fanout::subscribe_session(conn_id, "overloaded"));
+    }
 
     #[test]
     fn validate_token_fails_when_feature_disabled() {
diff --git a/src-tauri/src/commands/handler_list.inc b/src-tauri/src/commands/handler_list.inc
index 3e32645164..58c71c38b8 100644
--- a/src-tauri/src/commands/handler_list.inc
+++ b/src-tauri/src/commands/handler_list.inc
@@ -410,6 +410,8 @@ api::mobile_bridge::commands::mobile_remote_get_relay_url,
 api::mobile_bridge::commands::mobile_remote_relay_status,
 api::mobile_bridge::commands::mobile_remote_notify_cloud_auth_changed,
 api::mobile_bridge::commands::mobile_remote_sync_sidebar_sessions,
+api::mobile_bridge::read_state::mobile_remote_reply_read_state,
+api::mobile_bridge::read_state::mobile_remote_read_state_changed,
 // Code session commands (spawn CLI agents, manage sessions)
 agent_sessions::cli::commands::cli_agent_create,
 agent_sessions::cli::native_materializer::materialize_native_conversation,
diff --git a/src-tauri/src/orgtrack/diff_commands.rs b/src-tauri/src/orgtrack/diff_commands.rs
index 59a46011d4..b9259d0ab7 100644
--- a/src-tauri/src/orgtrack/diff_commands.rs
+++ b/src-tauri/src/orgtrack/diff_commands.rs
@@ -50,6 +50,13 @@ pub async fn orgtrack_get_session_edit_artifacts(
     record_orgtrack_command_call("orgtrack_get_session_edit_artifacts");
     tokio::task::spawn_blocking(move || {
         let conn = get_connection().map_err(|err| err.to_string())?;
+        if source.as_deref().is_none_or(|s| s == "codex_app") {
+            if let Some(id) = session_id.as_deref() {
+                if let Some(imported) = super::imported_changes::read(&conn, id)? {
+                    return Ok(imported.edits);
+                }
+            }
+        }
         let store = SqliteRecordStore::new(&conn);
         store.list_edit_artifacts(source.as_deref(), session_id.as_deref())
     })
@@ -65,6 +72,13 @@ pub async fn orgtrack_get_session_diff_chunks(
     record_orgtrack_command_call("orgtrack_get_session_diff_chunks");
     tokio::task::spawn_blocking(move || {
         let conn = get_connection().map_err(|err| err.to_string())?;
+        if source.as_deref().is_none_or(|s| s == "codex_app") {
+            if let Some(id) = session_id.as_deref() {
+                if let Some(imported) = super::imported_changes::read(&conn, id)? {
+                    return Ok(imported.chunks);
+                }
+            }
+        }
         let store = SqliteRecordStore::new(&conn);
         store.list_diff_chunks(source.as_deref(), session_id.as_deref())
     })
@@ -80,6 +94,23 @@ pub async fn orgtrack_get_session_final_diffs(
     record_orgtrack_command_call("orgtrack_get_session_final_diffs");
     tokio::task::spawn_blocking(move || {
         let conn = get_connection().map_err(|err| err.to_string())?;
+        if source.as_deref().is_none_or(|s| s == "codex_app") {
+            if let Some(id) = session_id.as_deref() {
+                if let Some(imported) = super::imported_changes::read(&conn, id)? {
+                    let paths: std::collections::BTreeSet<_> = imported
+                        .chunks
+                        .iter()
+                        .map(|chunk| chunk.file_path.as_str())
+                        .collect();
+                    return Ok(paths
+                        .into_iter()
+                        .filter_map(|path| {
+                            final_diff_from_chunks("codex_app", id, path, &imported.chunks)
+                        })
+                        .collect());
+                }
+            }
+        }
         let store = SqliteRecordStore::new(&conn);
         let final_diffs = store.list_final_diffs(source.as_deref(), session_id.as_deref())?;
         let final_diffs = if let Some(session_id) = session_id.as_deref() {
diff --git a/src-tauri/src/orgtrack/imported_changes.rs b/src-tauri/src/orgtrack/imported_changes.rs
new file mode 100644
index 0000000000..49285f4e6c
--- /dev/null
+++ b/src-tauri/src/orgtrack/imported_changes.rs
@@ -0,0 +1,487 @@
+//! Read-only projection of imported Codex edits. The rollout, not the native
+//! runtime artifact table or today's worktree, is authoritative for this owner.
+use std::{
+    path::PathBuf,
+    sync::{Arc, Mutex},
+    time::SystemTime,
+};
+
+use crate::agent_sessions::event_pipeline::{
+    extractors::extract_event_data,
+    ingestion::{ingest_raw_chunks, types::RawActivityChunk},
+};
+use orgtrack_core::{
+    edit_extraction::{
+        artifacts_from_extracted_edit, EditArtifactContext, NormalizedEditArtifacts,
+    },
+    sources::codex::app,
+};
+
+pub(crate) mod reconstruction;
+use reconstruction::{FileVersion, RecordedEdit};
+
+#[derive(Debug, Clone, Default)]
+struct Review {
+    artifacts: NormalizedEditArtifacts,
+    history: Vec<RecordedEdit>,
+}
+
+type Key = (String, PathBuf, SystemTime, u64);
+// One bounded entry; serializing reads also single-flights Desktop/mobile.
+static REVIEW: Mutex<Option<(Key, Arc<Review>)>> = Mutex::new(None);
+type ContextKey = (Key, String, String, String);
+static CONTEXT_REVIEW: Mutex<Option<(ContextKey, Arc<Review>)>> = Mutex::new(None);
+
+pub(crate) fn read(
+    conn: &rusqlite::Connection,
+    session_id: &str,
+) -> Result<Option<NormalizedEditArtifacts>, String> {
+    Ok(read_review(conn, session_id)?.map(|review| review.artifacts.clone()))
+}
+
+pub(crate) fn read_file_version(
+    conn: &rusqlite::Connection,
+    session_id: &str,
+    path: &str,
+    range: Option<(&str, &str, &str)>,
+) -> Result<FileVersion, String> {
+    if let Some((round, first, last)) = range {
+        let canonical = crate::agent_sessions::cli::native_transcript::imported_transcript_id_for_managed_session(session_id);
+        let session_id = canonical.as_deref().unwrap_or(session_id);
+        if !session_id.starts_with(orgtrack_core::sources::codex::SESSION_PREFIX) {
+            return Ok(FileVersion::default());
+        }
+        let source = app::codex_app_review_path(conn, session_id)?;
+        let signature = || -> Result<ContextKey, String> {
+            let meta = std::fs::metadata(&source).map_err(|e| e.to_string())?;
+            Ok((
+                (
+                    session_id.into(),
+                    source.clone(),
+                    meta.modified().map_err(|e| e.to_string())?,
+                    meta.len(),
+                ),
+                round.into(),
+                path.into(),
+                last.into(),
+            ))
+        };
+        let key = signature()?;
+        let mut cache = CONTEXT_REVIEW
+            .lock()
+            .map_err(|_| "file review lock poisoned")?;
+        let review = match cache.as_ref() {
+            Some((previous, review)) if previous == &key => review.clone(),
+            _ => {
+                *cache = None;
+                let chunks =
+                    app::load_codex_app_review_context_from_path(session_id, &source, round, last)?;
+                let review = Arc::new(project_selected_review(session_id, chunks, Some(path))?);
+                if signature()? != key {
+                    return Err("History changed during review; retry".into());
+                }
+                *cache = Some((key, review.clone()));
+                review
+            }
+        };
+        return Ok(reconstruction::replay(
+            &review.history,
+            path,
+            Some((first, last)),
+            None,
+        ));
+    }
+    Ok(
+        read_review(conn, session_id)?.map_or_else(FileVersion::default, |review| {
+            reconstruction::replay(&review.history, path, None, None)
+        }),
+    )
+}
+
+fn read_review(
+    conn: &rusqlite::Connection,
+    session_id: &str,
+) -> Result<Option<Arc<Review>>, String> {
+    let canonical =
+        crate::agent_sessions::cli::native_transcript::imported_transcript_id_for_managed_session(
+            session_id,
+        );
+    let session_id = canonical.as_deref().unwrap_or(session_id);
+    if !session_id.starts_with(orgtrack_core::sources::codex::SESSION_PREFIX) {
+        return Ok(None);
+    }
+    let path = app::codex_app_review_path(conn, session_id)?;
+    let signature = || -> Result<Key, String> {
+        let meta = std::fs::metadata(&path).map_err(|e| e.to_string())?;
+        Ok((
+            session_id.into(),
+            path.clone(),
+            meta.modified().map_err(|e| e.to_string())?,
+            meta.len(),
+        ))
+    };
+    let mut cache = REVIEW.lock().map_err(|_| "imported review lock poisoned")?;
+    let key = signature()?;
+    if let Some((previous, value)) = cache.as_ref() {
+        if previous == &key {
+            return Ok(Some(value.clone()));
+        }
+    }
+    // Drop stale data before parsing; a failed read cannot serve the old owner.
+    *cache = None;
+    let chunks = app::load_codex_app_review_from_path(session_id, &path)?;
+    let value = Arc::new(project_review(session_id, chunks)?);
+    if signature()? != key {
+        return Err("History changed during review; retry".into());
+    }
+    *cache = Some((key, value.clone()));
+    Ok(Some(value))
+}
+
+fn project_review(
+    session_id: &str,
+    chunks: Vec<core_types::activity::ActivityChunk>,
+) -> Result<Review, String> {
+    project_selected_review(session_id, chunks, None)
+}
+
+fn project_selected_review(
+    session_id: &str,
+    chunks: Vec<core_types::activity::ActivityChunk>,
+    selected_file: Option<&str>,
+) -> Result<Review, String> {
+    let raw: Vec<RawActivityChunk> = chunks
+        .into_iter()
+        .map(|chunk| RawActivityChunk {
+            chunk_id: Some(chunk.chunk_id),
+            session_id: Some(session_id.into()),
+            action_type: Some(chunk.action_type),
+            function: Some(chunk.function),
+            args: Some(chunk.args),
+            result: Some(chunk.result),
+            created_at: Some(chunk.created_at),
+            ..Default::default()
+        })
+        .collect();
+    let mut output = NormalizedEditArtifacts::default();
+    let mut history = Vec::new();
+    let mut history_bytes = 0;
+    let mut bytes = 0;
+    let mut turn = None;
+    for (index, event) in ingest_raw_chunks(&raw, session_id)
+        .events
+        .into_iter()
+        .enumerate()
+    {
+        if event.action_type == "user_message" {
+            turn = Some(event.id.clone());
+        }
+        if event.display_status != core_types::session_event::EventDisplayStatus::Completed {
+            continue;
+        }
+        let Some(core_types::extracted::ExtractedData::Edit(edit)) = extract_event_data(&event)
+        else {
+            continue;
+        };
+        let context = EditArtifactContext {
+            source: "codex_app".into(),
+            source_session_id: None,
+            session_id: session_id.into(),
+            source_event_id: Some(event.id.clone()),
+            turn_id: turn.clone(),
+            sequence_index: index as i64,
+            timestamp: Some(event.created_at.clone()),
+            workspace_path: None,
+            metadata: Default::default(),
+        };
+        let mut artifacts = artifacts_from_extracted_edit(&context, &edit);
+        if let Some(path) = selected_file {
+            artifacts.chunks.retain(|chunk| chunk.file_path == path);
+            artifacts.edits.retain(|edit| edit.file_path == path);
+            if artifacts.chunks.is_empty() {
+                continue;
+            }
+        }
+        let mut recorded = RecordedEdit::from_event(
+            &event,
+            artifacts
+                .chunks
+                .iter()
+                .map(|c| c.file_path.clone())
+                .collect(),
+        );
+        history_bytes += recorded.patch.as_ref().map_or(0, String::len);
+        if history_bytes > 2 * 1024 * 1024 {
+            // Keep the invalidating event, not its body. Exhausting the replay
+            // budget must not make the existing Desktop diff list fail.
+            recorded.patch = None;
+        }
+        for chunk in &artifacts.chunks {
+            bytes += chunk.diff.as_ref().map_or(0, String::len)
+                + chunk.old_content.as_ref().map_or(0, String::len)
+                + chunk.new_content.as_ref().map_or(0, String::len);
+        }
+        if bytes > 2 * 1024 * 1024 || output.chunks.len() + artifacts.chunks.len() > 500 {
+            return Err("Imported changes exceed review budget".into());
+        }
+        output.edits.extend(artifacts.edits);
+        output.chunks.extend(artifacts.chunks);
+        history.push(recorded);
+    }
+    Ok(Review {
+        artifacts: output,
+        history,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    fn project(
+        session_id: &str,
+        chunks: Vec<core_types::activity::ActivityChunk>,
+    ) -> Result<NormalizedEditArtifacts, String> {
+        Ok(project_review(session_id, chunks)?.artifacts)
+    }
+    #[test]
+    #[ignore = "explicit read-only verification against a user-selected rollout"]
+    fn verify_selected_rollout() {
+        let path = std::env::var("ORGII_REVIEW_VERIFY_PATH").expect("select a rollout");
+        let start = std::time::Instant::now();
+        let result = project(
+            "codexapp-verification",
+            app::load_codex_app_review_from_path(
+                "codexapp-verification",
+                std::path::Path::new(&path),
+            )
+            .unwrap(),
+        )
+        .unwrap();
+        let files: std::collections::BTreeSet<_> =
+            result.chunks.iter().map(|c| c.file_path.as_str()).collect();
+        eprintln!(
+            "review: {} edits, {} files, {:?}",
+            result.chunks.len(),
+            files.len(),
+            start.elapsed()
+        );
+        assert!(!files.is_empty());
+    }
+    #[test]
+    fn exec_rollout_projects_successful_edits_without_native_artifact_rows() {
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("rollout.jsonl");
+        let patch = "*** Begin Patch\n*** Add File: src/example.ts\n+hello\n*** End Patch";
+        let input = format!(
+            "text(await tools.apply_patch({}));",
+            serde_json::to_string(patch).unwrap()
+        );
+        let records = [
+            serde_json::json!({"type":"response_item","payload":{"type":"custom_tool_call","call_id":"edit-1","name":"exec","input":input}}),
+            serde_json::json!({"type":"response_item","payload":{"type":"custom_tool_call_output","call_id":"edit-1","output":[{"type":"input_text","text":"Script completed\nWall time 0.0 seconds\nOutput:\n"},{"type":"input_text","text":"{}"}]}}),
+        ];
+        std::fs::write(
+            &path,
+            records
+                .iter()
+                .map(ToString::to_string)
+                .collect::<Vec<_>>()
+                .join("\n"),
+        )
+        .unwrap();
+        let result = project(
+            "codexapp-test",
+            app::load_codex_app_review_from_path("codexapp-test", &path).unwrap(),
+        )
+        .unwrap();
+        assert_eq!(result.edits.len(), 1);
+        assert_eq!(result.chunks[0].file_path, "src/example.ts");
+        assert_eq!(result.chunks[0].session_id, "codexapp-test");
+        assert!(result.chunks[0].diff.as_deref().unwrap().contains("+hello"));
+        std::fs::write(&path, records[0].to_string()).unwrap();
+        assert!(
+            project(
+                "codexapp-test",
+                app::load_codex_app_review_from_path("codexapp-test", &path).unwrap()
+            )
+            .unwrap()
+            .chunks
+            .is_empty(),
+            "pending intent must not count as a completed edit"
+        );
+        let failed = records[1]
+            .to_string()
+            .replace("Script completed", "Script failed");
+        std::fs::write(&path, format!("{}\n{}", records[0], failed)).unwrap();
+        assert!(project(
+            "codexapp-test",
+            app::load_codex_app_review_from_path("codexapp-test", &path).unwrap()
+        )
+        .unwrap()
+        .chunks
+        .is_empty());
+    }
+
+    #[test]
+    fn raw_rollout_replays_full_file_with_unmodified_lines_and_stable_event_boundaries() {
+        let dir = tempfile::tempdir().unwrap();
+        let path = dir.path().join("rollout.jsonl");
+        let patches = [
+            "*** Begin Patch\n*** Add File: a\n+head\n+one\n+gap\n+two\n+tail\n*** End Patch",
+            "*** Begin Patch\n*** Update File: a\n@@\n-one\n+ONE\n@@\n-two\n+TWO\n*** End Patch",
+            "*** Begin Patch\n*** Update File: a\n@@\n-tail\n+later\n*** End Patch",
+        ];
+        let mut records = Vec::new();
+        for (i, patch) in patches.iter().enumerate() {
+            records.push(serde_json::json!({"type":"event_msg","payload":{"type":"user_message","message":format!("turn {i}")}}));
+            records.push(serde_json::json!({"type":"response_item","payload":{"type":"custom_tool_call","call_id":format!("edit-{i}"),"name":"exec","input":format!("text(await tools.apply_patch({})); text(await tools.exec_command({{cmd:\"check\"}}));", serde_json::to_string(patch).unwrap())}}));
+            records.push(serde_json::json!({"type":"response_item","payload":{"type":"custom_tool_call_output","call_id":format!("edit-{i}"),"output":[{"type":"input_text","text":"Script completed\nOutput:\n"},{"type":"input_text","text":"{}"},{"type":"input_text","text":if i == 0 {r#"{"session_id":71,"output":"building"}"#} else {r#"{"exit_code":1,"output":"check failed"}"#}}]}}));
+        }
+        std::fs::write(
+            &path,
+            records
+                .iter()
+                .map(ToString::to_string)
+                .collect::<Vec<_>>()
+                .join("\n"),
+        )
+        .unwrap();
+        let review = project_review(
+            "codexapp-test",
+            app::load_codex_app_review_from_path("codexapp-test", &path).unwrap(),
+        )
+        .unwrap();
+        assert_eq!(review.history.len(), 3);
+        let target = &review.history[1].event_id;
+        let version = reconstruction::replay(&review.history, "a", Some((target, target)), None);
+        assert_eq!(
+            version.before.as_deref(),
+            Some("head\none\ngap\ntwo\ntail\n")
+        );
+        assert_eq!(
+            version.after.as_deref(),
+            Some("head\nONE\ngap\nTWO\ntail\n")
+        );
+        // The display conversion flattens @@ sections. Replay retains the raw
+        // sections and must not rely on the synthetic contiguous line range.
+        assert!(review.history[1]
+            .patch
+            .as_deref()
+            .unwrap()
+            .contains("+ONE\n@@"));
+        let version = reconstruction::replay(&review.history, "a", None, None);
+        assert_eq!(
+            version.after.as_deref(),
+            Some("head\nONE\ngap\nTWO\nlater\n")
+        );
+        let target_offset: usize = records[..3].iter().map(|r| r.to_string().len() + 1).sum();
+        let context = project_selected_review(
+            "codexapp-test",
+            app::load_codex_app_review_context_from_path(
+                "codexapp-test",
+                &path,
+                &format!("codex-user-{target_offset}"),
+                "edit-1:part-0",
+            )
+            .unwrap(),
+            Some("a"),
+        )
+        .unwrap();
+        assert_eq!(context.history.len(), 2, "stop before later turns");
+        let scoped = reconstruction::replay(&context.history, "a", Some((target, target)), None);
+        assert_eq!(scoped.after.as_deref(), Some("head\nONE\ngap\nTWO\ntail\n"));
+        // A sparse old prefix puts the same fixture beyond the whole-rollout
+        // budget. Review must seek to nearby turns, not read that prefix.
+        use std::io::{Seek, SeekFrom, Write};
+        let prefix = 70 * 1024 * 1024;
+        let mut large = std::fs::OpenOptions::new()
+            .write(true)
+            .truncate(true)
+            .open(&path)
+            .unwrap();
+        large.set_len(prefix).unwrap();
+        large.seek(SeekFrom::End(0)).unwrap();
+        writeln!(large).unwrap();
+        large
+            .write_all(
+                records
+                    .iter()
+                    .map(ToString::to_string)
+                    .collect::<Vec<_>>()
+                    .join("\n")
+                    .as_bytes(),
+            )
+            .unwrap();
+        drop(large);
+        let chunks = app::load_codex_app_review_context_from_path(
+            "codexapp-test",
+            &path,
+            &format!("codex-user-{}", prefix + 1 + target_offset as u64),
+            "edit-1:part-0",
+        )
+        .unwrap();
+        let context = project_selected_review("codexapp-test", chunks, Some("a")).unwrap();
+        assert_eq!(context.history.len(), 2);
+        assert_eq!(
+            reconstruction::replay(&context.history, "a", Some((target, target)), None).after,
+            scoped.after
+        );
+    }
+
+    #[test]
+    #[ignore = "read-only verification of explicitly selected user history"]
+    fn verify_selected_file_version() {
+        let path = std::env::var("ORGII_REVIEW_VERIFY_PATH").unwrap();
+        let file = std::env::var("ORGII_REVIEW_VERIFY_FILE").unwrap();
+        let marker = std::env::var("ORGII_REVIEW_VERIFY_MARKER").unwrap();
+        let round = std::env::var("ORGII_REVIEW_VERIFY_ROUND").unwrap();
+        let call = std::env::var("ORGII_REVIEW_VERIFY_CALL").unwrap();
+        let start = std::time::Instant::now();
+        let review = project_selected_review(
+            "codexapp-verification",
+            app::load_codex_app_review_context_from_path(
+                "codexapp-verification",
+                std::path::Path::new(&path),
+                &round,
+                &call,
+            )
+            .unwrap(),
+            Some(&file),
+        )
+        .unwrap();
+        let edits: Vec<_> = review
+            .history
+            .iter()
+            .filter(|e| e.paths.contains(&file))
+            .collect();
+        for edit in &edits {
+            eprintln!(
+                "file edit {}, patch bytes {}",
+                edit.event_id,
+                edit.patch.as_ref().map_or(0, String::len)
+            );
+        }
+        let target = edits
+            .iter()
+            .find(|e| e.patch.as_deref().is_some_and(|p| p.contains(&marker)))
+            .expect("selected event exists");
+        let version = reconstruction::replay(
+            &review.history,
+            &file,
+            Some((&target.event_id, &target.event_id)),
+            None,
+        );
+        eprintln!(
+            "version: before {:?} bytes, after {:?} bytes, elapsed {:?}",
+            version.before.as_ref().map(String::len),
+            version.after.as_ref().map(String::len),
+            start.elapsed()
+        );
+        assert!(version.before.as_ref().is_some_and(|s| s.starts_with('#')));
+        assert!(version.after.as_ref().is_some_and(|s| s.starts_with('#')));
+        assert!(version
+            .after
+            .as_ref()
+            .is_some_and(|s| s.contains("VERIFIED")));
+    }
+}
diff --git a/src-tauri/src/orgtrack/imported_changes/reconstruction.rs b/src-tauri/src/orgtrack/imported_changes/reconstruction.rs
new file mode 100644
index 0000000000..048c8af5a8
--- /dev/null
+++ b/src-tauri/src/orgtrack/imported_changes/reconstruction.rs
@@ -0,0 +1,302 @@
+//! Replay recorded file edits, never the current filesystem. A full creation is
+//! an anchor; a fragment alone is not. Unknown edits or ambiguous context break
+//! the chain until another full creation. All limits are per selected file.
+use core_types::session_event::SessionEvent;
+
+const MAX_FILE_BYTES: usize = 512 * 1024;
+
+#[derive(Debug, Clone)]
+pub(crate) struct RecordedEdit {
+    pub event_id: String,
+    pub paths: Vec<String>,
+    pub patch: Option<String>,
+}
+
+impl RecordedEdit {
+    pub fn from_event(event: &SessionEvent, paths: Vec<String>) -> Self {
+        Self {
+            // Display IDs include reader-relative sequence numbers. The
+            // provider call ID remains stable across paginated/full reads.
+            event_id: event.call_id.clone().unwrap_or_else(|| event.id.clone()),
+            paths,
+            patch: event
+                .args
+                .get("patch_text")
+                .or_else(|| event.args.get("patch"))
+                .and_then(serde_json::Value::as_str)
+                .map(str::to_owned),
+        }
+    }
+}
+
+#[derive(Debug, Default)]
+pub(crate) struct FileVersion {
+    pub before: Option<String>,
+    pub after: Option<String>,
+}
+
+/// `range` uses exact authoritative event identities, not timestamps/titles or
+/// indices from a separately paginated transcript. Later edits are never read
+/// into the selected version. A missing boundary yields no version.
+pub(crate) fn replay(
+    history: &[RecordedEdit],
+    path: &str,
+    range: Option<(&str, &str)>,
+    initial: Option<String>,
+) -> FileVersion {
+    let edits: Vec<_> = history
+        .iter()
+        .filter(|e| e.paths.iter().any(|p| p == path))
+        .collect();
+    let (first, last) = match range {
+        Some((first, last)) => match (
+            edits.iter().position(|e| e.event_id == first),
+            edits.iter().position(|e| e.event_id == last),
+        ) {
+            (Some(first), Some(last)) if first <= last => (first, last),
+            _ => return FileVersion::default(),
+        },
+        None if !edits.is_empty() => (0, edits.len() - 1),
+        None => return FileVersion::default(),
+    };
+    let mut content = initial.filter(|s| valid_text(s));
+    let mut before = None;
+    for (index, edit) in edits.iter().enumerate().take(last + 1) {
+        if index == first {
+            before = content.clone();
+        }
+        let next = edit
+            .patch
+            .as_deref()
+            .and_then(|patch| apply(patch, path, content.as_deref()));
+        // Add File proves the resulting contents, not historical absence:
+        // some providers allow Add to overwrite an existing file.
+        content = next;
+    }
+    FileVersion {
+        before,
+        after: content,
+    }
+}
+
+fn valid_text(text: &str) -> bool {
+    text.len() <= MAX_FILE_BYTES && !text.contains('\0')
+}
+
+/// Interpret the *original* patch: display conversion may synthesize line 1
+/// and flatten unnumbered @@ boundaries, so its diff is not a replay source.
+fn apply(patch: &str, path: &str, base: Option<&str>) -> Option<String> {
+    if patch.len() > 2 * 1024 * 1024
+        || !patch.starts_with("*** Begin Patch\n")
+        || !patch.trim_end().ends_with("*** End Patch")
+    {
+        return None;
+    }
+    let lines: Vec<_> = patch.lines().collect();
+    let headers: Vec<_> = lines
+        .iter()
+        .enumerate()
+        .filter_map(|(i, line)| {
+            ["*** Add File: ", "*** Update File: ", "*** Delete File: "]
+                .iter()
+                .enumerate()
+                .find_map(|(kind, prefix)| {
+                    line.strip_prefix(prefix)
+                        .filter(|p| *p == path)
+                        .map(|_| (i, kind))
+                })
+        })
+        .collect();
+    // Repeated sections for one file have uncertain intra-call semantics.
+    if headers.len() != 1 {
+        return None;
+    }
+    let (start, kind) = headers[0];
+    let end = (start + 1..lines.len()).find(|&i| {
+        lines[i].starts_with("*** Add File: ")
+            || lines[i].starts_with("*** Update File: ")
+            || lines[i].starts_with("*** Delete File: ")
+            || lines[i] == "*** End Patch"
+    })?;
+    let body = &lines[start + 1..end];
+    let text = match kind {
+        0 => {
+            let mut text = String::new();
+            for line in body {
+                text.push_str(line.strip_prefix('+')?);
+                text.push('\n');
+                if !valid_text(&text) {
+                    return None;
+                }
+            }
+            text
+        }
+        1 => update(base?, body)?,
+        2 if body.is_empty() => String::new(),
+        _ => return None,
+    };
+    valid_text(&text).then_some(text)
+}
+
+fn update(base: &str, body: &[&str]) -> Option<String> {
+    let mut text = base.to_owned();
+    let mut cursor = 0;
+    let mut start = 0;
+    let mut saw_hunk = false;
+    // Preserve each @@ boundary. No fuzzy/whitespace matching and no guessed
+    // insertion point: exactly one occurrence of the old hunk is required.
+    for end in 0..=body.len() {
+        if end < body.len() && !body[end].starts_with("@@") {
+            continue;
+        }
+        if end > start {
+            let mut old = String::new();
+            let mut new = String::new();
+            for line in &body[start..end] {
+                let rest = line.get(1..)?;
+                match line.as_bytes().first()? {
+                    b' ' => {
+                        old.push_str(rest);
+                        old.push('\n');
+                        new.push_str(rest);
+                        new.push('\n');
+                    }
+                    b'-' => {
+                        old.push_str(rest);
+                        old.push('\n');
+                    }
+                    b'+' => {
+                        new.push_str(rest);
+                        new.push('\n');
+                    }
+                    _ => return None, // includes rename, EOF markers, malformed input
+                }
+            }
+            if old.is_empty() {
+                return None;
+            }
+            let mut found = None;
+            let mut search = cursor;
+            while let Some(offset) = text[search..].find(&old) {
+                let at = search + offset;
+                if (at == 0 || text.as_bytes()[at - 1] == b'\n')
+                    && found.replace(at).is_some()
+                {
+                    return None;
+                }
+                // Advance one UTF-8 character, not the whole match, so
+                // overlapping repeated hunks are ambiguous too.
+                search = at + text[at..].chars().next()?.len_utf8();
+            }
+            let at = found?;
+            if text.len() - old.len() + new.len() > MAX_FILE_BYTES {
+                return None;
+            }
+            text.replace_range(at..at + old.len(), &new);
+            cursor = at + new.len();
+            saw_hunk = true;
+        }
+        start = end + 1;
+    }
+    saw_hunk.then_some(text)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    fn edit(id: &str, body: &str) -> RecordedEdit {
+        RecordedEdit {
+            event_id: id.into(),
+            paths: vec!["a".into()],
+            patch: Some(format!("*** Begin Patch\n{body}\n*** End Patch")),
+        }
+    }
+    #[test]
+    fn anchors_and_replays_only_through_selected_event() {
+        let edits = [
+            edit("create", "*** Add File: a\n+head\n+one\n+gap\n+two\n+tail"),
+            edit(
+                "update",
+                "*** Update File: a\n@@\n-one\n+ONE\n@@\n-two\n+TWO",
+            ),
+            edit("later", "*** Update File: a\n@@\n-tail\n+TODAY"),
+        ];
+        let version = replay(&edits, "a", Some(("update", "update")), None);
+        assert_eq!(
+            version.before.as_deref(),
+            Some("head\none\ngap\ntwo\ntail\n")
+        );
+        assert_eq!(
+            version.after.as_deref(),
+            Some("head\nONE\ngap\nTWO\ntail\n")
+        );
+        assert!(replay(&edits, "other", None, None).after.is_none());
+        assert!(replay(&edits, "a", Some(("missing", "update")), None)
+            .after
+            .is_none());
+        assert!(replay(&edits, "a", None, None).before.is_none());
+    }
+    #[test]
+    fn rejects_fragment_anchor_mismatch_ambiguity_and_unknown_edit() {
+        let patch = edit("update", "*** Update File: a\n@@\n-one\n+ONE");
+        assert!(replay(std::slice::from_ref(&patch), "a", None, None).after.is_none());
+        for base in ["wrong\n", "one\none\n", "someone\n"] {
+            assert!(replay(std::slice::from_ref(&patch), "a", None, Some(base.into()))
+                .after
+                .is_none());
+        }
+        let edits = [
+            edit("create", "*** Add File: a\n+one"),
+            RecordedEdit {
+                event_id: "unknown".into(),
+                paths: vec!["a".into()],
+                patch: None,
+            },
+            patch,
+        ];
+        assert!(replay(&edits, "a", None, None).after.is_none());
+        assert!(replay(
+            &[edit("overlap", "*** Update File: a\n@@\n-a\n-a\n+b")],
+            "a",
+            None,
+            Some("a\na\na\n".into())
+        )
+        .after
+        .is_none());
+    }
+    #[test]
+    fn preserves_header_like_code_unicode_and_empty_deletion() {
+        let edits = [
+            edit("create", "*** Add File: a\n+---old\n+你好"),
+            edit("update", "*** Update File: a\n@@\n----old\n++++new"),
+            edit("delete", "*** Delete File: a"),
+        ];
+        assert_eq!(
+            replay(&edits, "a", Some(("update", "update")), None)
+                .after
+                .as_deref(),
+            Some("+++new\n你好\n")
+        );
+        assert_eq!(
+            replay(&edits, "a", Some(("delete", "delete")), None)
+                .after
+                .as_deref(),
+            Some("")
+        );
+    }
+    #[test]
+    fn rejects_oversize_binary_malformed_and_unsupported_rename() {
+        for body in [
+            format!("*** Add File: a\n+{}", "a".repeat(MAX_FILE_BYTES)),
+            "*** Add File: a\n+binary\0".into(),
+            "*** Update File: a\n*** Move to: b\n@@\n-one\n+two".into(),
+        ] {
+            assert!(
+                replay(&[edit("edit", &body)], "a", None, Some("one\n".into()))
+                    .after
+                    .is_none()
+            );
+        }
+        assert!(apply("*** Begin Patch\n*** Add File: a\n+truncated", "a", None).is_none());
+    }
+}
diff --git a/src-tauri/src/orgtrack/mod.rs b/src-tauri/src/orgtrack/mod.rs
index bd01485cfb..374b9d9266 100644
--- a/src-tauri/src/orgtrack/mod.rs
+++ b/src-tauri/src/orgtrack/mod.rs
@@ -13,6 +13,7 @@ pub mod usage_dashboard_commands;
 
 mod command_stats;
 mod diff_commands;
+pub(crate) mod imported_changes;
 mod file_session_history;
 
 use command_stats::record_orgtrack_command_call;
diff --git a/src/app/root/AppBootstrap.tsx b/src/app/root/AppBootstrap.tsx
index 71c93b338e..6db00febeb 100644
--- a/src/app/root/AppBootstrap.tsx
+++ b/src/app/root/AppBootstrap.tsx
@@ -44,6 +44,7 @@ import { useAppShellEffects } from "./useAppShellEffects";
 import { useFirstPaintSignal } from "./useFirstPaintSignal";
 import { useMobileRelayCloudAuthSync } from "./useMobileRelayCloudAuthSync";
 import { useMobileRemoteDesktopActions } from "./useMobileRemoteDesktopActions";
+import { useMobileSessionReadStateSync } from "./useMobileSessionReadStateSync";
 import { usePostPaintGitProbe } from "./usePostPaintGitProbe";
 
 // The E2E bridge (`window.__e2e`) is dev-only and loads as its own chunk: its
@@ -88,6 +89,7 @@ export const AppBootstrap: FC = () => {
   useModelAliasRegistry();
   useDiagnosticsBootstrap();
   useMobileRemoteDesktopActions();
+  useMobileSessionReadStateSync();
   useMobileRelayCloudAuthSync();
   useDataSourceAutoScan(); // Keep external-history sources fresh on their cadence
   useAgentLiveStatusSync(); // Hook-driven live agent status → sidebar dots
diff --git a/src/app/root/useMobileSessionReadStateSync.ts b/src/app/root/useMobileSessionReadStateSync.ts
new file mode 100644
index 0000000000..8542542e3c
--- /dev/null
+++ b/src/app/root/useMobileSessionReadStateSync.ts
@@ -0,0 +1,39 @@
+import { invoke, isTauri } from "@tauri-apps/api/core";
+import { listen } from "@tauri-apps/api/event";
+import { getCurrentWindow } from "@tauri-apps/api/window";
+import { useEffect } from "react";
+
+import { createLogger } from "@src/hooks/logger";
+import { useSetting } from "@src/hooks/settings/useSettings";
+import { startDesktopReadStateBridge } from "@src/store/session/desktopReadStateBridge";
+import {
+  markAllSessionsVisitedPersisted,
+  visitedSessionsAtom,
+} from "@src/store/session/visitedSessionsAtom";
+import { getInstrumentedStore } from "@src/util/core/state/instrumentedStore";
+
+const logger = createLogger("MobileSessionReadState");
+
+export function useMobileSessionReadStateSync(): void {
+  const [enabled] = useSetting("mobileRemote.enabled");
+  useEffect(() => {
+    if (!enabled || !isTauri() || getCurrentWindow().label !== "main") return;
+    const store = getInstrumentedStore();
+    return startDesktopReadStateBridge({
+      listen: (handler) =>
+        listen("mobile-session-read-request", (event) =>
+          handler(event.payload)
+        ),
+      reply: (requestId, visitedIds) =>
+        invoke("mobile_remote_reply_read_state", { requestId, visitedIds }),
+      notifyChanged: () => invoke("mobile_remote_read_state_changed"),
+      read: () => store.get(visitedSessionsAtom),
+      mark: markAllSessionsVisitedPersisted,
+      subscribe: (handler) => store.sub(visitedSessionsAtom, handler),
+      onError: () =>
+        logger.warn(
+          "Read-state synchronization failed; will reconcile on the next request"
+        ),
+    });
+  }, [enabled]);
+}
diff --git a/src/components/MarkDown/CodeBlockToolbar.test.ts b/src/components/MarkDown/CodeBlockToolbar.test.ts
new file mode 100644
index 0000000000..c8a72a8b1c
--- /dev/null
+++ b/src/components/MarkDown/CodeBlockToolbar.test.ts
@@ -0,0 +1,64 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { describe, expect, it, vi } from "vitest";
+
+import { CodeBlockToolbar } from "./CodeBlockToolbar";
+
+(
+  globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+describe("shared code block toolbar", () => {
+  it("preserves Desktop copy/open actions while touch mode gates pending copy", async () => {
+    const host = document.createElement("div");
+    document.body.append(host);
+    const root = createRoot(host);
+    const onCopy = vi.fn();
+    const onOpen = vi.fn();
+    try {
+      await act(async () =>
+        root.render(
+          React.createElement(CodeBlockToolbar, {
+            copyLabel: "Copy",
+            copied: false,
+            onCopy,
+            openLabel: "Open",
+            onOpen,
+          })
+        )
+      );
+      await act(async () => {
+        (
+          host.querySelector('[aria-label="Open"]') as HTMLButtonElement
+        ).click();
+        (
+          host.querySelector('[aria-label="Copy"]') as HTMLButtonElement
+        ).click();
+      });
+      expect(onCopy).toHaveBeenCalledTimes(1);
+      expect(onOpen).toHaveBeenCalledTimes(1);
+      expect(host.querySelector("[data-touch]")).toBeNull();
+      await act(async () =>
+        root.render(
+          React.createElement(CodeBlockToolbar, {
+            touch: true,
+            pending: true,
+            copyLabel: "Copying",
+            copied: false,
+            onCopy,
+          })
+        )
+      );
+      expect(host.querySelector("[data-touch]")).not.toBeNull();
+      expect(host.querySelector('[aria-label="Open"]')).toBeNull();
+      await act(async () =>
+        (host.querySelector("button") as HTMLButtonElement).click()
+      );
+      expect(onCopy).toHaveBeenCalledTimes(1);
+    } finally {
+      await act(async () => root.unmount());
+      host.remove();
+    }
+  });
+});
diff --git a/src/components/MarkDown/CodeBlockToolbar.tsx b/src/components/MarkDown/CodeBlockToolbar.tsx
new file mode 100644
index 0000000000..f00897fe69
--- /dev/null
+++ b/src/components/MarkDown/CodeBlockToolbar.tsx
@@ -0,0 +1,78 @@
+import React from "react";
+
+import Button from "@src/components/Button";
+import {
+  Copy01Icon,
+  HugeiconsIcon,
+  SquareArrowUpRight02Icon,
+  Tick01Icon,
+} from "@src/icons";
+
+export interface CodeBlockToolbarProps {
+  copyLabel: string;
+  copied: boolean;
+  onCopy: () => void;
+  pending?: boolean;
+  touch?: boolean;
+  openLabel?: string;
+  onOpen?: () => void;
+}
+
+/** Browser-safe chrome; each shell owns clipboard and file-opening actions. */
+export function CodeBlockToolbar({
+  copyLabel,
+  copied,
+  onCopy,
+  pending,
+  touch,
+  openLabel,
+  onOpen,
+}: CodeBlockToolbarProps) {
+  const buttonClass = `hover:bg-fill-3 hover:text-text-1 focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none ${touch ? "h-11 w-11" : ""}`;
+  return (
+    <div className="code-block-toolbar" data-touch={touch || undefined}>
+      {onOpen && (
+        <Button
+          variant="tertiary"
+          appearance="soft"
+          size="mini"
+          iconOnly
+          icon={
+            <HugeiconsIcon
+              icon={SquareArrowUpRight02Icon}
+              data-icon="square-arrow-out-up-right"
+              size={touch ? 18 : 14}
+              strokeWidth={1.75}
+            />
+          }
+          htmlType="button"
+          title={openLabel}
+          aria-label={openLabel}
+          className={`code-block-open-button ${buttonClass}`}
+          onClick={onOpen}
+        />
+      )}
+      <Button
+        variant="tertiary"
+        appearance="soft"
+        size="mini"
+        iconOnly
+        icon={
+          <HugeiconsIcon
+            icon={copied ? Tick01Icon : Copy01Icon}
+            data-icon={copied ? "check" : "copy"}
+            size={touch ? 18 : 14}
+            strokeWidth={1.75}
+          />
+        }
+        htmlType="button"
+        title={copyLabel}
+        aria-label={copyLabel}
+        aria-busy={pending || undefined}
+        disabled={pending}
+        className={`code-block-copy-button ${buttonClass}`}
+        onClick={onCopy}
+      />
+    </div>
+  );
+}
diff --git a/src/components/MarkDown/MarkdownCodeBlock.tsx b/src/components/MarkDown/MarkdownCodeBlock.tsx
index d91bed8b0c..f14d4a560d 100644
--- a/src/components/MarkDown/MarkdownCodeBlock.tsx
+++ b/src/components/MarkDown/MarkdownCodeBlock.tsx
@@ -13,17 +13,11 @@
 import React, { Suspense, lazy, memo, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 
-import Button from "@src/components/Button";
 import { useCopyCheck } from "@src/hooks/ui/useCopyCheck";
-import {
-  Copy01Icon,
-  HugeiconsIcon,
-  SquareArrowUpRight02Icon,
-  Tick01Icon,
-} from "@src/icons";
 import { copyText } from "@src/util/data/clipboard";
 import { openFileInWorkStation } from "@src/util/ui/openFileInWorkStation";
 
+import { CodeBlockToolbar } from "./CodeBlockToolbar";
 import { MarkdownFallbackBoundary } from "./MarkdownFallbackBoundary";
 
 const MarkdownCodeHighlighter = lazy(
@@ -91,57 +85,13 @@ const CodeBlock = memo<CodeBlockProps>(
 
     return (
       <div className="code-block-wrapper" style={CODE_WRAPPER_STYLE}>
-        <div className="code-block-toolbar">
-          {openFilePath && (
-            <Button
-              variant="tertiary"
-              appearance="soft"
-              size="mini"
-              iconOnly
-              icon={
-                <HugeiconsIcon
-                  icon={SquareArrowUpRight02Icon}
-                  data-icon="square-arrow-out-up-right"
-                  size={14}
-                  strokeWidth={1.75}
-                />
-              }
-              htmlType="button"
-              title={openLabel}
-              aria-label={openLabel}
-              className="code-block-open-button hover:bg-fill-3 hover:text-text-1 focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
-              onClick={handleOpenFile}
-            />
-          )}
-          <Button
-            variant="tertiary"
-            appearance="soft"
-            size="mini"
-            iconOnly
-            icon={
-              copied ? (
-                <HugeiconsIcon
-                  icon={Tick01Icon}
-                  data-icon="check"
-                  size={14}
-                  strokeWidth={1.75}
-                />
-              ) : (
-                <HugeiconsIcon
-                  icon={Copy01Icon}
-                  data-icon="copy"
-                  size={14}
-                  strokeWidth={1.75}
-                />
-              )
-            }
-            htmlType="button"
-            title={copyLabel}
-            aria-label={copyLabel}
-            className="code-block-copy-button hover:bg-fill-3 hover:text-text-1 focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
-            onClick={handleCopy}
-          />
-        </div>
+        <CodeBlockToolbar
+          copyLabel={copyLabel}
+          copied={copied}
+          onCopy={handleCopy}
+          openLabel={openLabel}
+          onOpen={openFilePath ? handleOpenFile : undefined}
+        />
         <MarkdownFallbackBoundary
           label="Markdown code highlighter"
           resetKey={children}
diff --git a/src/components/MarkDown/_code-blocks.scss b/src/components/MarkDown/_code-blocks.scss
index 10fd139949..3844272701 100644
--- a/src/components/MarkDown/_code-blocks.scss
+++ b/src/components/MarkDown/_code-blocks.scss
@@ -100,6 +100,15 @@
     background: var(--color-fill-2);
   }
 
+  .code-block-toolbar[data-touch] {
+    position: sticky;
+    top: 0;
+    right: 0;
+    justify-content: flex-end;
+    opacity: 1;
+    transform: none;
+  }
+
   &:hover .code-block-toolbar,
   .code-block-toolbar:focus-within {
     opacity: 1;
diff --git a/src/components/ModelSelectorPill/ModelSettingsMenu.tsx b/src/components/ModelSelectorPill/ModelSettingsMenu.tsx
index 6a5fb6b374..98d7baaf0b 100644
--- a/src/components/ModelSelectorPill/ModelSettingsMenu.tsx
+++ b/src/components/ModelSelectorPill/ModelSettingsMenu.tsx
@@ -56,6 +56,7 @@ export interface ModelSettingsMenuProps {
   onChange: (modelId: string) => void;
   /** Open the detailed Effort/Speed rows instead of the compact slider. */
   defaultAdvanced?: boolean;
+  className?: string;
   renderTrigger: (props: {
     open: boolean;
     onClick: React.MouseEventHandler<HTMLButtonElement>;
@@ -74,6 +75,7 @@ export default function ModelSettingsMenu({
   onModelClick,
   onChange,
   defaultAdvanced = false,
+  className = "",
   renderTrigger,
 }: ModelSettingsMenuProps) {
   const { t } = useTranslation();
@@ -178,7 +180,7 @@ export default function ModelSettingsMenu({
             role="dialog"
             tabIndex={-1}
             aria-label={text("settings")}
-            className={DROPDOWN_WIDTHS.fixedStatusPanelClass}
+            className={`${DROPDOWN_WIDTHS.fixedStatusPanelClass} ${className}`}
             style={{
               position: "fixed",
               top: panelPosition.top,
diff --git a/src/components/ModelSelectorPill/index.tsx b/src/components/ModelSelectorPill/index.tsx
index 652b2d1a36..b68589f483 100644
--- a/src/components/ModelSelectorPill/index.tsx
+++ b/src/components/ModelSelectorPill/index.tsx
@@ -62,6 +62,8 @@ interface ModelSelectorPillProps {
   effortSegmentOverride?: ModelEffortSegmentState;
   /** Mobile opens the detailed Effort/Speed menu instead of the slider. */
   settingsMenuDefaultAdvanced?: boolean;
+  /** Portal surface styling for constrained hosts such as Mobile Remote. */
+  settingsMenuClassName?: string;
   /** Mobile uses the combined settings menu whenever variant rows exist. */
   preferCombinedSettingsMenu?: boolean;
   /** Prevent opening a picker while its execution inventory is unresolved. */
@@ -88,6 +90,7 @@ const ModelSelectorPill = forwardRef<HTMLButtonElement, ModelSelectorPillProps>(
       isActiveSession = false,
       effortSegmentOverride,
       settingsMenuDefaultAdvanced = false,
+      settingsMenuClassName,
       preferCombinedSettingsMenu = false,
       disabled = false,
       disabledTooltip,
@@ -310,6 +313,7 @@ const ModelSelectorPill = forwardRef<HTMLButtonElement, ModelSelectorPillProps>(
           onModelClick={onClick}
           onChange={handleEffortApply}
           defaultAdvanced={settingsMenuDefaultAdvanced}
+          className={settingsMenuClassName}
           renderTrigger={({ open, onClick: openMenu, previewLevel }) => {
             // While the effort slider is dragged the pill reports the level
             // under the thumb, so the panel is not the only place showing
diff --git a/src/components/PermissionPrompt/PermissionSheet.test.ts b/src/components/PermissionPrompt/PermissionSheet.test.ts
new file mode 100644
index 0000000000..a806c2789b
--- /dev/null
+++ b/src/components/PermissionPrompt/PermissionSheet.test.ts
@@ -0,0 +1,73 @@
+// @vitest-environment jsdom
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+
+import { PermissionSheet } from "./PermissionSheet";
+
+vi.mock("@src/components/BottomSheet", () => ({
+  default: ({
+    children,
+    footer,
+  }: {
+    children: React.ReactNode;
+    footer: React.ReactNode;
+  }) => React.createElement("section", null, children, footer),
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+describe("PermissionSheet request fidelity", () => {
+  it("shows a failed decision inside the sheet without disabling retry", () => {
+    const host = document.createElement("div");
+    host.innerHTML = renderToStaticMarkup(
+      React.createElement(PermissionSheet, {
+        open: true,
+        request: {
+          sessionId: "s",
+          requestId: "p",
+          toolName: "shell",
+          toolArgs: {},
+        },
+        error: "Could not submit. Try again.",
+        onAllow: vi.fn(),
+        onDeny: vi.fn(),
+        onAlwaysAllow: vi.fn(),
+      })
+    );
+    expect(host.querySelector('[role="alert"]')?.textContent).toBe(
+      "Could not submit. Try again."
+    );
+    expect(host.querySelectorAll("button:disabled")).toHaveLength(0);
+  });
+  it.each([false, true])(
+    "disables decisions only when request detail is incomplete (%s)",
+    (truncated) => {
+      const host = document.createElement("div");
+      host.innerHTML = renderToStaticMarkup(
+        React.createElement(PermissionSheet, {
+          open: true,
+          request: {
+            sessionId: "s",
+            requestId: "p",
+            toolName: "run_shell",
+            toolArgs: { command: "pwd" },
+            toolArgsTruncated: truncated,
+          },
+          notice: truncated
+            ? "Check the complete request on Desktop"
+            : undefined,
+          onAllow: vi.fn(),
+          onDeny: vi.fn(),
+          onAlwaysAllow: vi.fn(),
+        })
+      );
+      expect(host.querySelectorAll("button")).toHaveLength(3);
+      expect(host.querySelectorAll("button:disabled")).toHaveLength(
+        truncated ? 3 : 0
+      );
+      expect(host.querySelector('[role="status"]') != null).toBe(truncated);
+    }
+  );
+});
diff --git a/src/components/PermissionPrompt/PermissionSheet.tsx b/src/components/PermissionPrompt/PermissionSheet.tsx
index a7919ce312..2d1f136a86 100644
--- a/src/components/PermissionPrompt/PermissionSheet.tsx
+++ b/src/components/PermissionPrompt/PermissionSheet.tsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 
 import BottomSheet from "@src/components/BottomSheet";
 import Button from "@src/components/Button";
+import InlineAlert from "@src/components/PageNotice";
 import { HugeiconsIcon, NotificationBubbleIcon } from "@src/icons";
 
 import { PermissionPromptActions } from "./PermissionPromptActions";
@@ -21,6 +22,7 @@ export interface PermissionSheetRequest {
   toolName: string;
   toolCallId?: string;
   toolArgs: Record<string, unknown>;
+  toolArgsTruncated?: boolean;
   origin?: "rust_agent" | "cli_hook" | "acp";
 }
 
@@ -30,6 +32,8 @@ export interface PermissionSheetProps {
   desktopName?: string;
   queueDepth?: number;
   submitting?: boolean;
+  notice?: string;
+  error?: string;
   onDeny: () => void;
   onAllow: () => void;
   onAlwaysAllow: () => void;
@@ -48,6 +52,8 @@ export function PermissionSheet({
   desktopName,
   queueDepth = 0,
   submitting = false,
+  notice,
+  error,
   onDeny,
   onAllow,
   onAlwaysAllow,
@@ -104,7 +110,7 @@ export function PermissionSheet({
       footer={
         <PermissionPromptActions
           layout="mobile"
-          disabled={submitting}
+          disabled={submitting || request.toolArgsTruncated === true}
           onDeny={onDeny}
           onAllow={onAllow}
           onAlwaysAllow={onAlwaysAllow}
@@ -117,6 +123,16 @@ export function PermissionSheet({
         argsPreview={viewModel.argsPreview as PermissionArgPreview[]}
         footerNote={footerNote || undefined}
       />
+      {notice ? (
+        <p role="status" className="mt-3 text-sm text-text-2">
+          {notice}
+        </p>
+      ) : null}
+      {error ? (
+        <InlineAlert type="danger" role="alert" className="mt-3">
+          {error}
+        </InlineAlert>
+      ) : null}
       {onDismiss ? (
         <Button
           variant="tertiary"
diff --git a/src/components/TurnNavigationToolbar/TurnNavigationRoundList.tsx b/src/components/TurnNavigationToolbar/TurnNavigationRoundList.tsx
index f1882aa584..04efd68a3b 100644
--- a/src/components/TurnNavigationToolbar/TurnNavigationRoundList.tsx
+++ b/src/components/TurnNavigationToolbar/TurnNavigationRoundList.tsx
@@ -15,13 +15,15 @@ export interface TurnNavigationRoundListProps {
   currentPageIndex: number;
   onSelect: (pageIndex: number) => void;
   className?: string;
+  mobile?: boolean;
 }
 
 const TurnNavigationRoundList: React.FC<TurnNavigationRoundListProps> = memo(
-  ({ items, currentPageIndex, onSelect, className = "" }) => {
+  ({ items, currentPageIndex, onSelect, className = "", mobile = false }) => {
     return (
       <div
         data-testid="turn-navigation-round-list"
+        data-mobile-round-list={mobile || undefined}
         className={`scrollbar-hide max-h-[min(60vh,24rem)] overflow-y-auto ${className}`.trim()}
       >
         {items.map((item) => {
@@ -34,6 +36,7 @@ const TurnNavigationRoundList: React.FC<TurnNavigationRoundListProps> = memo(
               htmlType="button"
               data-testid="turn-page-list-item"
               data-page-index={item.pageIndex}
+              aria-current={isCurrent ? "true" : undefined}
               className={`${DROPDOWN_CLASSES.item} ${DROPDOWN_CLASSES.itemHover} w-full text-left ${
                 isCurrent ? DROPDOWN_CLASSES.itemSelected : "text-text-2"
               }`}
diff --git a/src/components/TurnNavigationToolbar/TurnNavigationToolbar.layout.test.ts b/src/components/TurnNavigationToolbar/TurnNavigationToolbar.layout.test.ts
new file mode 100644
index 0000000000..f83b10e4e7
--- /dev/null
+++ b/src/components/TurnNavigationToolbar/TurnNavigationToolbar.layout.test.ts
@@ -0,0 +1,91 @@
+// @vitest-environment jsdom
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+
+import TurnNavigationToolbar, {
+  type TurnNavigationToolbarProps,
+} from "./TurnNavigationToolbar";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+function renderToolbar(overrides: Partial<TurnNavigationToolbarProps> = {}) {
+  const container = document.createElement("div");
+  container.innerHTML = renderToStaticMarkup(
+    React.createElement(TurnNavigationToolbar, {
+      ready: true,
+      listOpen: false,
+      sortAscending: false,
+      onToggleList: vi.fn(),
+      onToggleSort: vi.fn(),
+      onCloseList: vi.fn(),
+      currentLabel: "Round 100",
+      currentTimeLabel: "17:17 ~ 20:18",
+      currentIndex: 99,
+      pageCount: 102,
+      onPrevious: vi.fn(),
+      onNext: vi.fn(),
+      onLatest: vi.fn(),
+      statusAnnotation: "Recent rounds only · Content truncated",
+      ...overrides,
+    })
+  );
+  return container;
+}
+
+describe("TurnNavigationToolbar layout", () => {
+  it("keeps mobile metadata out of the nonshrinking controls group", () => {
+    const container = renderToolbar({ variant: "mobile" });
+    const nav = container.querySelector("nav")!;
+    const info = nav.querySelector("[data-turn-navigation-info]")!;
+    const controls = nav.querySelector("[data-turn-navigation-controls]")!;
+    expect(info.querySelector("[data-turn-navigation-time]")?.textContent).toBe(
+      "17:17 ~ 20:18"
+    );
+    expect(controls.querySelector("[data-turn-navigation-time]")).toBeNull();
+    expect(controls.querySelectorAll("button")).toHaveLength(3);
+    expect(
+      nav.querySelector("[data-turn-navigation-status]")?.parentElement
+    ).toBe(nav);
+    expect(info.querySelector("[data-turn-navigation-status]")).toBeNull();
+    expect(nav.classList.contains("turn-navigation-toolbar-mobile")).toBe(true);
+  });
+
+  it("preserves Desktop's inline timestamp and status layout by default", () => {
+    const container = renderToolbar();
+    const nav = container.querySelector("nav")!;
+    const info = nav.querySelector("[data-turn-navigation-info]")!;
+    const controls = nav.querySelector("[data-turn-navigation-controls]")!;
+    expect(info.querySelector("[data-turn-navigation-status]")).not.toBeNull();
+    expect(
+      controls.querySelector("[data-turn-navigation-time]")?.textContent
+    ).toBe("17:17 ~ 20:18");
+    expect(nav.classList.contains("turn-navigation-toolbar-mobile")).toBe(
+      false
+    );
+  });
+
+  it("does not leave an empty mobile warning row after complete data arrives", () => {
+    const container = renderToolbar({
+      variant: "mobile",
+      statusAnnotation: undefined,
+    });
+    expect(container.querySelector("[data-turn-navigation-status]")).toBeNull();
+    expect(
+      container.querySelector("[data-turn-navigation-time]")
+    ).not.toBeNull();
+  });
+
+  it("preserves the loading gate without dropping the full round label", () => {
+    const container = renderToolbar({ variant: "mobile", ready: false });
+    const selector = container.querySelector<HTMLButtonElement>(
+      '[data-testid="turn-pagination-current-round"]'
+    )!;
+    expect(selector.disabled).toBe(true);
+    expect(selector.title).toBe("Round 100");
+    expect(selector.textContent).toBe("Round 100");
+    expect(container.querySelectorAll("button:disabled")).toHaveLength(4);
+  });
+});
diff --git a/src/components/TurnNavigationToolbar/TurnNavigationToolbar.scss b/src/components/TurnNavigationToolbar/TurnNavigationToolbar.scss
new file mode 100644
index 0000000000..dd4798d9c8
--- /dev/null
+++ b/src/components/TurnNavigationToolbar/TurnNavigationToolbar.scss
@@ -0,0 +1,31 @@
+// Mobile keeps the shared selector and navigation controls, but reserves a
+// separate metadata line so long timestamps and partial-history notices cannot
+// squeeze the round label. Desktop keeps its original single-row layout.
+.turn-navigation-toolbar-mobile {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  align-items: start;
+  column-gap: 8px;
+
+  [data-turn-navigation-info] {
+    flex-direction: column;
+    align-items: stretch;
+    gap: 0;
+  }
+
+  [data-turn-navigation-time] {
+    padding: 0 8px 8px;
+    overflow-wrap: anywhere;
+  }
+
+  [data-turn-navigation-status] {
+    grid-column: 1 / -1;
+    padding: 0 8px 8px;
+    overflow-wrap: anywhere;
+  }
+
+  button {
+    min-width: 44px;
+    min-height: 44px;
+  }
+}
diff --git a/src/components/TurnNavigationToolbar/TurnNavigationToolbar.tsx b/src/components/TurnNavigationToolbar/TurnNavigationToolbar.tsx
index b63a1ee04a..43ea133284 100644
--- a/src/components/TurnNavigationToolbar/TurnNavigationToolbar.tsx
+++ b/src/components/TurnNavigationToolbar/TurnNavigationToolbar.tsx
@@ -25,6 +25,7 @@ import {
   Loading03Icon,
 } from "@src/icons";
 
+import "./TurnNavigationToolbar.scss";
 import { shouldShowTurnPaginationSpinner } from "./shouldShowTurnPaginationSpinner";
 
 const SELECT_TRIGGER_BASE =
@@ -84,7 +85,7 @@ const TurnNavigationToolbar: React.FC<TurnNavigationToolbarProps> = memo(
     });
     const isMobile = variant === "mobile";
     const rootClassName = isMobile
-      ? `flex shrink-0 flex-wrap items-center justify-between gap-2 border-b border-border-2 bg-bg-1 px-3 py-2 ${className}`.trim()
+      ? `turn-navigation-toolbar-mobile shrink-0 border-b border-border-2 bg-bg-1 px-3 py-2 ${className}`.trim()
       : `flex h-10 min-h-10 shrink-0 items-center justify-between gap-2 px-2 text-xs text-text-3 ${className}`.trim();
 
     if (!enabled) return null;
@@ -95,7 +96,10 @@ const TurnNavigationToolbar: React.FC<TurnNavigationToolbarProps> = memo(
         aria-label={ariaLabel ?? t("common:pagination.latestRound")}
         data-turn-navigation-toolbar={variant}
       >
-        <div className="flex min-w-0 flex-1 items-center gap-1.5">
+        <div
+          data-turn-navigation-info
+          className="flex min-w-0 flex-1 items-center gap-1.5"
+        >
           {leading}
           <div className="relative min-w-0">
             <Button
@@ -107,6 +111,7 @@ const TurnNavigationToolbar: React.FC<TurnNavigationToolbarProps> = memo(
                 listOpen ? SURFACE_TOKENS.selected : ""
               }`}
               disabled={!ready}
+              title={currentLabel}
               onClick={() => {
                 if (!ready) return;
                 onToggleList();
@@ -138,15 +143,32 @@ const TurnNavigationToolbar: React.FC<TurnNavigationToolbarProps> = memo(
               {trailingAfterSelector}
             </>
           ) : null}
-          {statusAnnotation ? (
-            <span className="min-w-0 text-xs text-text-3">
+          {isMobile && !listOpen && currentTimeLabel ? (
+            <span
+              data-turn-navigation-time
+              className="text-xs text-text-3 tabular-nums"
+            >
+              {currentTimeLabel}
+            </span>
+          ) : null}
+          {!isMobile && statusAnnotation ? (
+            <span
+              data-turn-navigation-status
+              className="min-w-0 text-xs text-text-3"
+            >
               {statusAnnotation}
             </span>
           ) : null}
         </div>
-        <div className="flex shrink-0 items-center gap-1.5">
-          {!listOpen && currentTimeLabel ? (
-            <span className="px-1 text-[13px] whitespace-nowrap text-text-3 tabular-nums">
+        <div
+          data-turn-navigation-controls
+          className="flex shrink-0 items-center gap-1.5"
+        >
+          {!isMobile && !listOpen && currentTimeLabel ? (
+            <span
+              data-turn-navigation-time
+              className="px-1 text-[13px] whitespace-nowrap text-text-3 tabular-nums"
+            >
               {currentTimeLabel}
             </span>
           ) : null}
@@ -324,6 +346,14 @@ const TurnNavigationToolbar: React.FC<TurnNavigationToolbarProps> = memo(
             )}
           </div>
         </div>
+        {isMobile && statusAnnotation ? (
+          <span
+            data-turn-navigation-status
+            className="min-w-0 text-xs text-text-3"
+          >
+            {statusAnnotation}
+          </span>
+        ) : null}
       </nav>
     );
   }
diff --git a/src/features/CodeMirror/shared/mergeTheme.ts b/src/features/CodeMirror/shared/mergeTheme.ts
new file mode 100644
index 0000000000..eb076e0b49
--- /dev/null
+++ b/src/features/CodeMirror/shared/mergeTheme.ts
@@ -0,0 +1,61 @@
+import { EditorView } from "@codemirror/view";
+
+// ============================================
+// Shared merge theme override (stable reference — defined outside component)
+// ============================================
+
+export const MERGE_THEME_OVERRIDE = EditorView.baseTheme({
+  "& .cm-changedLine, & .cm-insertedLine": {
+    backgroundColor: "var(--diff-added-bg) !important",
+  },
+  "&.cm-merge-a .cm-changedLine, & .cm-deletedLine": {
+    backgroundColor: "var(--diff-deleted-bg) !important",
+  },
+  "& .cm-insertedChunk, & .cm-insertedText": {
+    backgroundColor: "var(--diff-added-bg) !important",
+  },
+  "& .cm-deletedChunk, & .cm-deletedText": {
+    backgroundColor: "var(--diff-deleted-bg) !important",
+  },
+  ".cm-collapsedLines": {
+    display: "flex",
+    alignItems: "center",
+    gap: "var(--cm-gutter-padding, 4px)",
+    width: "100%",
+    background: "var(--color-fill-1)",
+    border: "none",
+    borderRadius: "0",
+    outline: "none",
+    boxShadow: "none",
+    color: "var(--color-text-3)",
+    padding: "var(--cm-gutter-padding, 4px) var(--cm-line-padding-left, 12px)",
+    margin: "0",
+    cursor: "var(--interactive-cursor, default)",
+    fontSize: "var(--cm-font-size-small, 12px)",
+    "&::before": {
+      content: '""',
+      display: "inline-block",
+      width: "var(--cm-icon-size, 14px)",
+      height: "var(--cm-icon-size, 14px)",
+      marginInlineEnd: "0",
+      backgroundColor: "currentColor",
+      maskImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m7 15 5 5 5-5'/%3E%3Cpath d='m7 9 5-5 5 5'/%3E%3C/svg%3E")`,
+      maskSize: "contain",
+      maskRepeat: "no-repeat",
+      maskPosition: "center",
+      WebkitMaskImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='m7 15 5 5 5-5'/%3E%3Cpath d='m7 9 5-5 5 5'/%3E%3C/svg%3E")`,
+      WebkitMaskSize: "contain",
+      WebkitMaskRepeat: "no-repeat",
+      WebkitMaskPosition: "center",
+      flexShrink: 0,
+    },
+    "&::after": {
+      content: '""',
+      display: "none",
+    },
+    "&:hover": {
+      background: "var(--color-fill-3)",
+      color: "var(--color-text-2)",
+    },
+  },
+});
diff --git a/src/features/CodeMirror/themes/github.test.ts b/src/features/CodeMirror/themes/github.test.ts
new file mode 100644
index 0000000000..7da1eb8da5
--- /dev/null
+++ b/src/features/CodeMirror/themes/github.test.ts
@@ -0,0 +1,19 @@
+import { highlightingFor } from "@codemirror/language";
+import { EditorState } from "@codemirror/state";
+import { tags } from "@lezer/highlight";
+import { describe, expect, it } from "vitest";
+
+import { createGithubTheme } from "./github";
+
+describe("shared CodeMirror diff theme", () => {
+  it("maps inserted, deleted and hunk tokens to distinct highlight classes", () => {
+    const state = EditorState.create({ extensions: [createGithubTheme()] });
+    const inserted = highlightingFor(state, [tags.inserted]);
+    const deleted = highlightingFor(state, [tags.deleted]);
+    const hunk = highlightingFor(state, [tags.meta]);
+    expect(inserted).toBeTruthy();
+    expect(deleted).toBeTruthy();
+    expect(hunk).toBeTruthy();
+    expect(new Set([inserted, deleted, hunk]).size).toBe(3);
+  });
+});
diff --git a/src/features/CodeMirror/themes/github.ts b/src/features/CodeMirror/themes/github.ts
index 48bd404f2b..f20f41073d 100644
--- a/src/features/CodeMirror/themes/github.ts
+++ b/src/features/CodeMirror/themes/github.ts
@@ -39,6 +39,7 @@ export function createGithubTheme(): ReturnType<typeof createTheme> {
   const invalid = cssVar("--cm-syntax-invalid", "#cb2431");
   const deleted = cssVar("--cm-syntax-deleted", "#b31d28");
   const deletedBg = cssVar("--cm-syntax-deleted-bg", "#ffeef0");
+  const insertedBg = cssVar("--diff-added-bg", "#e6ffed");
 
   const styles = [
     { tag: [t.standard(t.tagName), t.tagName], color: tag },
@@ -54,6 +55,7 @@ export function createGithubTheme(): ReturnType<typeof createTheme> {
     { tag: [t.heading, t.strong], color: func, fontWeight: "bold" },
     { tag: [t.emphasis], color: func, fontStyle: "italic" },
     { tag: [t.deleted], color: deleted, backgroundColor: deletedBg },
+    { tag: [t.inserted], color: tag, backgroundColor: insertedBg },
     { tag: [t.atom, t.bool, t.special(t.variableName)], color: constant },
     { tag: [t.url, t.escape, t.regexp, t.link], color: link },
     { tag: t.link, textDecoration: "underline" },
diff --git a/src/hooks/voice/nativeSpeech.test.ts b/src/hooks/voice/nativeSpeech.test.ts
new file mode 100644
index 0000000000..b7118f7488
--- /dev/null
+++ b/src/hooks/voice/nativeSpeech.test.ts
@@ -0,0 +1,33 @@
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { isNativeIosSpeechRuntime } from "./nativeSpeech";
+
+vi.mock("@src/util/platform/isIOS", () => ({
+  isIOS: () => false,
+}));
+
+describe("isNativeIosSpeechRuntime", () => {
+  const originalBuildFlag = process.env.ORGII_MOBILE_REMOTE_NATIVE;
+
+  afterEach(() => {
+    if (originalBuildFlag === undefined) {
+      delete process.env.ORGII_MOBILE_REMOTE_NATIVE;
+    } else {
+      process.env.ORGII_MOBILE_REMOTE_NATIVE = originalBuildFlag;
+    }
+    delete (window as unknown as { __TAURI_INTERNALS__?: unknown })
+      .__TAURI_INTERNALS__;
+  });
+
+  it("uses the native speech path for the dedicated iOS bundle even when the webview user agent is desktop-like", () => {
+    process.env.ORGII_MOBILE_REMOTE_NATIVE = "true";
+    (
+      window as unknown as {
+        __TAURI_INTERNALS__?: Record<string, never>;
+      }
+    ).__TAURI_INTERNALS__ = {};
+
+    expect(isNativeIosSpeechRuntime()).toBe(true);
+  });
+});
diff --git a/src/hooks/voice/nativeSpeech.ts b/src/hooks/voice/nativeSpeech.ts
new file mode 100644
index 0000000000..105a35a972
--- /dev/null
+++ b/src/hooks/voice/nativeSpeech.ts
@@ -0,0 +1,60 @@
+import {
+  type PluginListener,
+  addPluginListener,
+  invoke,
+} from "@tauri-apps/api/core";
+
+import { isIOS } from "@src/util/platform/isIOS";
+
+export type NativeSpeechEventKind =
+  | "started"
+  | "partial"
+  | "final"
+  | "ended"
+  | "cancelled"
+  | "error";
+
+export interface NativeSpeechEvent {
+  sessionId: string;
+  kind: NativeSpeechEventKind;
+  transcript?: string;
+  code?: string;
+  message?: string;
+}
+
+interface NativeSpeechSupport {
+  supported: boolean;
+}
+
+export function isNativeIosSpeechRuntime(): boolean {
+  return (
+    typeof window !== "undefined" &&
+    (process.env.ORGII_MOBILE_REMOTE_NATIVE === "true" || isIOS()) &&
+    ("__TAURI_INTERNALS__" in window || "__TAURI__" in window)
+  );
+}
+
+export async function queryNativeSpeechSupport(): Promise<boolean> {
+  const response = await invoke<NativeSpeechSupport>(
+    "plugin:speech|is_supported"
+  );
+  return response.supported;
+}
+
+export function listenToNativeSpeech(
+  callback: (event: NativeSpeechEvent) => void
+): Promise<PluginListener> {
+  return addPluginListener("speech", "speech", callback);
+}
+
+export function startNativeSpeech(lang: string, sessionId: string) {
+  return invoke<void>("plugin:speech|start", { lang, sessionId });
+}
+
+export function stopNativeSpeech(sessionId: string) {
+  return invoke<void>("plugin:speech|stop", { sessionId });
+}
+
+export function cancelNativeSpeech(sessionId: string) {
+  return invoke<void>("plugin:speech|cancel", { sessionId });
+}
diff --git a/src/hooks/voice/useVoiceInput.native.test.ts b/src/hooks/voice/useVoiceInput.native.test.ts
new file mode 100644
index 0000000000..75e6571fa1
--- /dev/null
+++ b/src/hooks/voice/useVoiceInput.native.test.ts
@@ -0,0 +1,159 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { createSmokeRoot } from "@src/test/reactSmokeHarness";
+
+import { type UseVoiceInputResult, useVoiceInput } from "./useVoiceInput";
+
+const native = vi.hoisted(() => ({
+  callback: undefined as
+    | ((event: {
+        sessionId: string;
+        kind: string;
+        transcript?: string;
+      }) => void)
+    | undefined,
+  cancel: vi.fn().mockResolvedValue(undefined),
+  querySupport: vi.fn().mockResolvedValue(true),
+  start: vi.fn().mockResolvedValue(undefined),
+  stop: vi.fn().mockResolvedValue(undefined),
+  unregister: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock("./nativeSpeech", () => ({
+  isNativeIosSpeechRuntime: () => true,
+  queryNativeSpeechSupport: native.querySupport,
+  listenToNativeSpeech: vi.fn((callback: typeof native.callback) => {
+    native.callback = callback;
+    return Promise.resolve({ unregister: native.unregister });
+  }),
+  startNativeSpeech: native.start,
+  stopNativeSpeech: native.stop,
+  cancelNativeSpeech: native.cancel,
+}));
+
+async function flushAsync(): Promise<void> {
+  await act(async () => {
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+}
+
+describe("useVoiceInput native iOS speech", () => {
+  beforeEach(() => {
+    native.callback = undefined;
+    native.cancel.mockClear();
+    native.querySupport.mockClear();
+    native.querySupport.mockResolvedValue(true);
+    native.start.mockClear();
+    native.start.mockResolvedValue(undefined);
+    native.stop.mockClear();
+    native.stop.mockResolvedValue(undefined);
+    native.cancel.mockResolvedValue(undefined);
+    native.unregister.mockClear();
+    native.unregister.mockResolvedValue(undefined);
+  });
+
+  it("streams native partial text and commits the stopped session", async () => {
+    let voice: UseVoiceInputResult | undefined;
+    const onCommit = vi.fn();
+    const root = createSmokeRoot();
+
+    function Probe() {
+      const value = useVoiceInput({ lang: "zh-CN", onCommit });
+      React.useEffect(() => {
+        voice = value;
+      }, [value]);
+      return null;
+    }
+
+    await root.render(React.createElement(Probe));
+    act(() => voice?.start());
+    await flushAsync();
+
+    expect(native.start).toHaveBeenCalledOnce();
+    const sessionId = native.start.mock.calls[0]?.[1] as string;
+    act(() => native.callback?.({ sessionId, kind: "started" }));
+    act(() =>
+      native.callback?.({
+        sessionId,
+        kind: "partial",
+        transcript: "手机语音正常",
+      })
+    );
+
+    expect(voice?.isRecording).toBe(true);
+    expect(voice?.liveTranscript).toBe("手机语音正常");
+    act(() => voice?.stop());
+    expect(native.stop).toHaveBeenCalledWith(sessionId);
+    act(() =>
+      native.callback?.({
+        sessionId,
+        kind: "ended",
+        transcript: "手机语音正常",
+      })
+    );
+
+    expect(onCommit).toHaveBeenCalledWith("手机语音正常");
+    expect(voice?.isRecording).toBe(false);
+    await root.unmount();
+    expect(native.unregister).toHaveBeenCalledOnce();
+  });
+
+  it("discards callbacks from a cancelled native session", async () => {
+    let voice: UseVoiceInputResult | undefined;
+    const onCommit = vi.fn();
+    const onCancel = vi.fn();
+    const root = createSmokeRoot();
+
+    function Probe() {
+      const value = useVoiceInput({ onCommit, onCancel });
+      React.useEffect(() => {
+        voice = value;
+      }, [value]);
+      return null;
+    }
+
+    await root.render(React.createElement(Probe));
+    act(() => voice?.start());
+    await flushAsync();
+    const sessionId = native.start.mock.calls[0]?.[1] as string;
+    act(() => native.callback?.({ sessionId, kind: "started" }));
+    act(() => voice?.cancel());
+    act(() =>
+      native.callback?.({ sessionId, kind: "ended", transcript: "stale" })
+    );
+
+    expect(native.cancel).toHaveBeenCalledWith(sessionId);
+    expect(onCancel).toHaveBeenCalledOnce();
+    expect(onCommit).not.toHaveBeenCalled();
+    await root.unmount();
+  });
+  it("handles native cleanup rejection and ignores late transcripts after unmount", async () => {
+    let voice: UseVoiceInputResult | undefined;
+    const onCommit = vi.fn();
+    const root = createSmokeRoot();
+    function Probe() {
+      const value = useVoiceInput({ onCommit });
+      React.useEffect(() => {
+        voice = value;
+      }, [value]);
+      return null;
+    }
+    await root.render(React.createElement(Probe));
+    act(() => voice?.start());
+    await flushAsync();
+    const sessionId = native.start.mock.calls[0]?.[1] as string;
+    native.cancel.mockRejectedValueOnce(new Error("Native cancel unavailable"));
+    native.unregister.mockRejectedValueOnce(
+      new Error("Listener already closed")
+    );
+    await root.unmount();
+    await flushAsync();
+    native.callback?.({ sessionId, kind: "ended", transcript: "late" });
+    expect(native.cancel).toHaveBeenCalledWith(sessionId);
+    expect(native.unregister).toHaveBeenCalledOnce();
+    expect(onCommit).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/hooks/voice/useVoiceInput.ts b/src/hooks/voice/useVoiceInput.ts
index 10ded8ce23..b80bc1477e 100644
--- a/src/hooks/voice/useVoiceInput.ts
+++ b/src/hooks/voice/useVoiceInput.ts
@@ -1,5 +1,5 @@
 /**
- * useVoiceInput — push-to-talk dictation hook backed by the Web Speech API.
+ * useVoiceInput — push-to-talk dictation for browser/desktop and native iOS.
  *
  * Voice input: user clicks the mic (or hits ⌃M) to start, sees a
  * waveform UI while speaking, then stops to accept (transcription is committed
@@ -7,14 +7,22 @@
  * yields plain transcript strings; wiring into a contenteditable / ComposerInput host
  * lives in the consumer.
  *
- * Transcription runs entirely in the Chromium webview via `webkitSpeechRecognition`
- * (no Tauri / backend dependency). Network access is still required because
- * Chromium streams audio to Google's recognition endpoint.
+ * Chromium uses `webkitSpeechRecognition`. ORG2 Remote uses the iOS Speech
+ * framework through a Tauri plugin because WKWebView does not expose that API.
  */
 import { useCallback, useEffect, useRef, useState } from "react";
 
 import { createLogger } from "@src/hooks/logger";
 
+import {
+  type NativeSpeechEvent,
+  cancelNativeSpeech,
+  isNativeIosSpeechRuntime,
+  listenToNativeSpeech,
+  queryNativeSpeechSupport,
+  startNativeSpeech,
+  stopNativeSpeech,
+} from "./nativeSpeech";
 import {
   mapGetUserMediaError,
   queryMicrophonePermission,
@@ -128,7 +136,7 @@ export interface UseVoiceInputOptions {
 export interface UseVoiceInputResult {
   /** True while microphone is capturing audio. */
   isRecording: boolean;
-  /** True if the Web Speech API is available in this browser. */
+  /** True if the current runtime provides a speech recognizer. */
   isSupported: boolean;
   /** Live partial transcript while speaking (resets when recording stops). */
   liveTranscript: string;
@@ -148,7 +156,10 @@ function mapErrorCode(raw: string): VoiceInputErrorCode {
   switch (raw) {
     case "not-allowed":
     case "service-not-allowed":
+    case "permission-denied":
       return "permission-denied";
+    case "unsupported":
+      return "unsupported";
     case "no-speech":
       return "no-speech";
     case "audio-capture":
@@ -156,18 +167,41 @@ function mapErrorCode(raw: string): VoiceInputErrorCode {
     case "network":
       return "network";
     case "aborted":
+    case "cancelled":
       return "aborted";
     default:
       return "unknown";
   }
 }
 
+function mapNativeFailure(error: unknown): VoiceInputError {
+  const value =
+    error && typeof error === "object"
+      ? (error as { code?: unknown; message?: unknown })
+      : undefined;
+  const rawCode = typeof value?.code === "string" ? value.code : "unknown";
+  const message =
+    typeof value?.message === "string" ? value.message : String(error);
+  return { code: mapErrorCode(rawCode), message };
+}
+
 export function useVoiceInput(
   options: UseVoiceInputOptions
 ): UseVoiceInputResult {
   const { lang, onCommit, onCancel, onError } = options;
+  const nativeRuntime = isNativeIosSpeechRuntime();
 
   const recognitionRef = useRef<SpeechRecognitionLike | null>(null);
+  const nativeSessionRef = useRef<string | null>(null);
+  const nativeListenerRef = useRef<Awaited<
+    ReturnType<typeof listenToNativeSpeech>
+  > | null>(null);
+  const nativeListenerPromiseRef = useRef<ReturnType<
+    typeof listenToNativeSpeech
+  > | null>(null);
+  const nativeEventHandlerRef = useRef<(event: NativeSpeechEvent) => void>(
+    () => undefined
+  );
   const transcriptRef = useRef<string>("");
   // When cancel() is called we still receive an `onend` event from the
   // recognizer; this flag tells the end handler whether to commit or discard.
@@ -175,13 +209,17 @@ export function useVoiceInput(
   const startTimeRef = useRef<number>(0);
   const tickIntervalRef = useRef<number | null>(null);
   const startSessionRef = useRef(0);
+  const startPendingRef = useRef(false);
+  const callbacksRef = useRef({ onCommit, onCancel, onError });
+  callbacksRef.current = { onCommit, onCancel, onError };
 
   const [isRecording, setIsRecording] = useState(false);
   const [liveTranscript, setLiveTranscript] = useState("");
   const [elapsedSeconds, setElapsedSeconds] = useState(0);
 
-  const [isSupported] = useState<boolean>(() => {
+  const [isSupported, setIsSupported] = useState<boolean>(() => {
     probeSpeechRecognitionOnce();
+    if (nativeRuntime) return true;
     // Tauri dev shows a preview UI even without a native recognizer.
     if (isTauriRuntime() && !isTauriProduction()) {
       return true;
@@ -196,8 +234,20 @@ export function useVoiceInput(
     }
   }, []);
 
+  const startTimer = useCallback(() => {
+    clearTimer();
+    startTimeRef.current = Date.now();
+    setIsRecording(true);
+    setElapsedSeconds(0);
+    tickIntervalRef.current = window.setInterval(() => {
+      const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
+      setElapsedSeconds(elapsed);
+    }, 250);
+  }, [clearTimer]);
+
   const teardown = useCallback(() => {
     clearTimer();
+    startPendingRef.current = false;
     setIsRecording(false);
     setElapsedSeconds(0);
     setLiveTranscript("");
@@ -211,6 +261,57 @@ export function useVoiceInput(
     }
   }, [clearTimer]);
 
+  nativeEventHandlerRef.current = (event) => {
+    if (event.sessionId !== nativeSessionRef.current) return;
+
+    if (event.kind === "started") {
+      startPendingRef.current = false;
+      startTimer();
+      return;
+    }
+    if (event.kind === "partial" || event.kind === "final") {
+      const transcript = event.transcript?.trim() ?? "";
+      transcriptRef.current = transcript;
+      setLiveTranscript(transcript);
+      return;
+    }
+
+    const transcript = (event.transcript ?? transcriptRef.current).trim();
+    const commit = shouldCommitRef.current;
+    nativeSessionRef.current = null;
+    teardown();
+
+    if (event.kind === "error") {
+      callbacksRef.current.onError?.({
+        code: mapErrorCode(event.code ?? "unknown"),
+        message: event.message ?? "Speech recognition failed.",
+      });
+      callbacksRef.current.onCancel?.();
+    } else if (event.kind === "cancelled" || !commit) {
+      callbacksRef.current.onCancel?.();
+    } else if (event.kind === "ended" && transcript.length > 0) {
+      callbacksRef.current.onCommit(transcript);
+    }
+  };
+
+  const ensureNativeListener = useCallback(async () => {
+    if (nativeListenerRef.current) return nativeListenerRef.current;
+    if (nativeListenerPromiseRef.current) {
+      return nativeListenerPromiseRef.current;
+    }
+    const pending = listenToNativeSpeech((event) => {
+      nativeEventHandlerRef.current(event);
+    });
+    nativeListenerPromiseRef.current = pending;
+    try {
+      const listener = await pending;
+      nativeListenerRef.current = listener;
+      return listener;
+    } finally {
+      nativeListenerPromiseRef.current = null;
+    }
+  }, []);
+
   const beginRecognition = useCallback(
     (Ctor: NonNullable<ReturnType<typeof getSpeechRecognitionCtor>>) => {
       const recognition = new Ctor();
@@ -226,15 +327,7 @@ export function useVoiceInput(
       setLiveTranscript("");
 
       recognition.onstart = () => {
-        startTimeRef.current = Date.now();
-        setIsRecording(true);
-        setElapsedSeconds(0);
-        tickIntervalRef.current = window.setInterval(() => {
-          const elapsed = Math.floor(
-            (Date.now() - startTimeRef.current) / 1000
-          );
-          setElapsedSeconds(elapsed);
-        }, 250);
+        startTimer();
         logger.debug("recognition started", { lang: recognition.lang });
       };
 
@@ -259,7 +352,10 @@ export function useVoiceInput(
         const code = mapErrorCode(event.error);
         logger.warn("recognition error", event.error, event.message);
         shouldCommitRef.current = false;
-        onError?.({ code, message: event.message || event.error });
+        callbacksRef.current.onError?.({
+          code,
+          message: event.message || event.error,
+        });
       };
 
       recognition.onend = () => {
@@ -268,9 +364,9 @@ export function useVoiceInput(
         logger.debug("recognition ended", { commit, length: final.length });
         teardown();
         if (commit && final.length > 0) {
-          onCommit(final);
+          callbacksRef.current.onCommit(final);
         } else if (!commit) {
-          onCancel?.();
+          callbacksRef.current.onCancel?.();
         }
       };
 
@@ -296,27 +392,53 @@ export function useVoiceInput(
             : "";
         const message = err instanceof Error ? err.message : String(err);
         logger.error("failed to start recognition", { name, message, err });
-        onError?.({
+        callbacksRef.current.onError?.({
           code: "unknown",
           message,
         });
         teardown();
       }
     },
-    [lang, onCancel, onCommit, onError, teardown]
+    [lang, startTimer, teardown]
   );
 
   const start = useCallback(() => {
-    if (isRecording) return;
+    if (isRecording || startPendingRef.current) return;
+
+    if (nativeRuntime) {
+      const sessionId = `speech-${Date.now()}-${startSessionRef.current + 1}`;
+      startSessionRef.current += 1;
+      nativeSessionRef.current = sessionId;
+      startPendingRef.current = true;
+      shouldCommitRef.current = true;
+      transcriptRef.current = "";
+      setLiveTranscript("");
+
+      void (async () => {
+        try {
+          await ensureNativeListener();
+          if (nativeSessionRef.current !== sessionId) return;
+          const detectedLang =
+            lang ??
+            (typeof navigator !== "undefined"
+              ? navigator.language
+              : undefined) ??
+            "en-US";
+          await startNativeSpeech(detectedLang, sessionId);
+        } catch (error) {
+          if (nativeSessionRef.current !== sessionId) return;
+          nativeSessionRef.current = null;
+          const failure = mapNativeFailure(error);
+          logger.warn("native speech start failed", failure);
+          teardown();
+          callbacksRef.current.onError?.(failure);
+        }
+      })().catch((error) => logger.warn("Background operation failed", error));
+      return;
+    }
 
     if (isTauriRuntime() && !isTauriProduction()) {
-      startTimeRef.current = Date.now();
-      setIsRecording(true);
-      setElapsedSeconds(0);
-      tickIntervalRef.current = window.setInterval(() => {
-        const elapsed = Math.floor((Date.now() - startTimeRef.current) / 1000);
-        setElapsedSeconds(elapsed);
-      }, 250);
+      startTimer();
       void showVoiceInputDevModeDialog();
       return;
     }
@@ -328,7 +450,7 @@ export function useVoiceInput(
         message: "Speech recognition is not available in this environment.",
       };
       logger.warn(err.message);
-      onError?.(err);
+      callbacksRef.current.onError?.(err);
       return;
     }
 
@@ -347,7 +469,7 @@ export function useVoiceInput(
       const permissionState = await queryMicrophonePermission();
       if (startSessionRef.current !== sessionId) return;
       if (permissionState === "denied") {
-        onError?.({
+        callbacksRef.current.onError?.({
           code: "permission-denied",
           message: "Microphone permission denied.",
         });
@@ -362,14 +484,14 @@ export function useVoiceInput(
           if (startSessionRef.current !== sessionId) return;
           const access = mapGetUserMediaError(err);
           if (access === "denied") {
-            onError?.({
+            callbacksRef.current.onError?.({
               code: "permission-denied",
               message: "Microphone permission denied.",
             });
             return;
           }
           if (access === "unsupported") {
-            onError?.({
+            callbacksRef.current.onError?.({
               code: "audio-capture",
               message: "No microphone detected.",
             });
@@ -380,10 +502,34 @@ export function useVoiceInput(
 
       if (startSessionRef.current !== sessionId) return;
       beginRecognition(Ctor);
-    })();
-  }, [beginRecognition, isRecording, onError]);
+    })().catch((error) => {
+      if (startSessionRef.current !== sessionId) return;
+      teardown();
+      callbacksRef.current.onError?.(mapNativeFailure(error));
+    });
+  }, [
+    beginRecognition,
+    ensureNativeListener,
+    isRecording,
+    lang,
+    nativeRuntime,
+    startTimer,
+    teardown,
+  ]);
 
   const stop = useCallback(() => {
+    const nativeSessionId = nativeSessionRef.current;
+    if (nativeSessionId) {
+      shouldCommitRef.current = true;
+      void stopNativeSpeech(nativeSessionId).catch((error) => {
+        if (nativeSessionRef.current !== nativeSessionId) return;
+        nativeSessionRef.current = null;
+        const failure = mapNativeFailure(error);
+        teardown();
+        callbacksRef.current.onError?.(failure);
+      });
+      return;
+    }
     if (!recognitionRef.current) {
       if (!isRecording) {
         startSessionRef.current += 1;
@@ -402,6 +548,17 @@ export function useVoiceInput(
   }, [isRecording, teardown]);
 
   const cancel = useCallback(() => {
+    const nativeSessionId = nativeSessionRef.current;
+    if (nativeSessionId) {
+      nativeSessionRef.current = null;
+      shouldCommitRef.current = false;
+      teardown();
+      callbacksRef.current.onCancel?.();
+      void cancelNativeSpeech(nativeSessionId).catch((error) => {
+        logger.warn("native speech cancel failed", error);
+      });
+      return;
+    }
     if (!recognitionRef.current) {
       if (!isRecording) {
         startSessionRef.current += 1;
@@ -430,7 +587,29 @@ export function useVoiceInput(
   }, [isRecording, start, stop]);
 
   useEffect(() => {
+    if (!nativeRuntime) return;
+    let disposed = false;
+    void queryNativeSpeechSupport()
+      .then((supported) => {
+        if (!disposed) setIsSupported(supported);
+      })
+      .catch((error) => {
+        logger.warn("native speech support probe failed", error);
+        if (!disposed) setIsSupported(false);
+      });
     return () => {
+      disposed = true;
+    };
+  }, [nativeRuntime]);
+
+  useEffect(() => {
+    return () => {
+      const nativeSessionId = nativeSessionRef.current;
+      nativeSessionRef.current = null;
+      if (nativeSessionId)
+        void cancelNativeSpeech(nativeSessionId).catch((error) =>
+          logger.warn("Background operation failed", error)
+        );
       if (recognitionRef.current) {
         shouldCommitRef.current = false;
         try {
@@ -440,6 +619,20 @@ export function useVoiceInput(
         }
       }
       clearTimer();
+      const listener = nativeListenerRef.current;
+      nativeListenerRef.current = null;
+      if (listener)
+        void listener
+          .unregister()
+          .catch((error) => logger.warn("Background operation failed", error));
+      const pendingListener = nativeListenerPromiseRef.current;
+      if (pendingListener) {
+        void pendingListener
+          .then((value) => value.unregister())
+          .catch((error) =>
+            logger.warn("native listener cleanup failed", error)
+          );
+      }
     };
   }, [clearTimer]);
 
diff --git a/src/i18n/locales/de/sessions.json b/src/i18n/locales/de/sessions.json
index 9563a6eedb..3a8dd0fb1f 100644
--- a/src/i18n/locales/de/sessions.json
+++ b/src/i18n/locales/de/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Mikrofonzugriff erforderlich"
   },
   "chat": {
+    "draftTooLong": "Der Entwurf ist zu lang (maximal {{max}} Zeichen)",
     "cliPermissions": {
       "ask": "Genehmigung anfordern",
       "workspace": "Zugriff auf den Arbeitsbereich",
diff --git a/src/i18n/locales/en/mobileRemote.json b/src/i18n/locales/en/mobileRemote.json
index 20b46d8fb8..27553eaa58 100644
--- a/src/i18n/locales/en/mobileRemote.json
+++ b/src/i18n/locales/en/mobileRemote.json
@@ -1,12 +1,164 @@
 {
+  "changeReview": {
+    "scope": "Scope",
+    "moreActions": "More file actions",
+    "lines": "Lines {{start}}–{{end}}",
+    "edit": "Edit {{count}}",
+    "noNewline": "No newline at end of file",
+    "rawPatch": "Patch preview unavailable · Original patch",
+    "showMoreLines": "Show {{count}} more lines",
+    "filesCount": "{{count}} files changed",
+    "emptyTurn": "No changes in this turn. Open to review the session",
+    "copy": "Copy",
+    "copied": "Copied",
+    "copyFailed": "Copy failed, retry",
+    "title": "File changes",
+    "turn": "This turn",
+    "session": "Session",
+    "workspace": "Workspace",
+    "diff": "Diff",
+    "full": "Full file",
+    "file": "File",
+    "before": "Before",
+    "after": "After",
+    "reconstructed": "Reconstructed from recorded edits, not the current workspace file",
+    "expand": "Expand",
+    "expandAll": "Expand all files",
+    "collapseAll": "Collapse all files",
+    "collapse": "Collapse",
+    "wrap": "Wrap lines",
+    "retry": "Retry",
+    "loadFailed": "Couldn't load changes",
+    "selected": "Selected",
+    "loading": "Loading…",
+    "offline": "Desktop is offline",
+    "empty": "No change records available",
+    "partial": "Some records are missing full file contents, so changes cannot be fully summarized",
+    "unavailable": "Full file contents are unavailable for this version"
+  },
+  "fileViewer": {
+    "files": "Files",
+    "fileLocation": "File location",
+    "diff": "Changes",
+    "patch": "Patch",
+    "partial": "Partial content",
+    "copyModified": "Copy new",
+    "original": "Before",
+    "modified": "After",
+    "copyPatch": "Copy patch",
+    "patchFallback": "Before and after file contents are incomplete or too large. Showing the original patch",
+    "snapshot": "Read-only",
+    "wrap": "Wrap lines",
+    "unavailable": "No file content in this conversation",
+    "empty": "Empty file",
+    "openDesktop": "Open on desktop",
+    "plainTextFallback": "Editor unavailable. Showing plain text"
+  },
+  "search": {
+    "title": "Search sessions",
+    "placeholder": "Session name",
+    "cancel": "Cancel",
+    "clear": "Clear search",
+    "unsupported": "Update ORG2 on your computer to search the complete conversation history",
+    "offline": "Reconnect to this computer to search",
+    "loading": "Searching…",
+    "error": "Could not load these results",
+    "retry": "Retry search",
+    "resultsFor": "Results for “{{query}}”",
+    "empty": "No matching sessions",
+    "continue": "No visible results on this page. Continue searching",
+    "next": "Next results"
+  },
+  "inbox": {
+    "backToSessions": "Back to sessions",
+    "title": "Needs attention",
+    "syncing": "Syncing",
+    "unavailable": "Unavailable",
+    "error": "Could not update pending requests",
+    "offline": "Showing last known requests. Reconnect to open and handle them",
+    "incomplete": "Only some requests are shown. View all requests on your computer",
+    "empty": "No pending permission requests",
+    "truncated": "Request details are shortened. View and handle the full request on your computer",
+    "open": "Open request"
+  },
+  "profile": {
+    "title": "Profile",
+    "open": "Open profile",
+    "close": "Close profile",
+    "back": "Back to profile",
+    "fallbackName": "ORG2 user",
+    "development": "Local development mode",
+    "helpAndAbout": "Help & about",
+    "help": "Help",
+    "terms": "Terms of service",
+    "danger": "Danger zone",
+    "deleteHint": "Continue to your ORG2 account page to confirm and complete deletion",
+    "opening": "Opening browser…",
+    "pairingTitle": "Connect your computer",
+    "pairingStep1": "Sign in to ORG2 on your computer, then enable Mobile Remote in Settings",
+    "pairingStep2": "Sign in to the same account on your phone, then scan or paste the desktop pairing code",
+    "pairingStep3": "Compare the security phrase on both devices and confirm to open your sessions",
+    "connectionTitle": "Having trouble connecting?",
+    "connectionHelp": "Keep ORG2 running on your computer and connected to the internet, then check the remote connection status in Settings. Generate a new pairing code if it has expired, or paste the code if scanning is unavailable"
+  },
+  "connection": {
+    "resolvingSession": "Confirming this session…",
+    "restoring": "Restoring your device",
+    "reconnecting": "Reconnecting to your desktop…"
+  },
+  "images": {
+    "label": "Image {{number}}",
+    "load": "View image {{number}}",
+    "loading": "Loading image…",
+    "retry": "Image unavailable · Retry",
+    "unavailable": "Connect an updated desktop to view images"
+  },
+  "sessions": {
+    "all": "All sessions",
+    "state": {
+      "unknown": "Status awaiting sync",
+      "unread": "Completed, unread",
+      "running": "Running",
+      "idle": "Idle",
+      "offline": "Offline",
+      "awaiting_approval": "Awaiting approval",
+      "waiting_for_user": "Waiting for your reply",
+      "pending": "Pending",
+      "installing": "Installing",
+      "queued": "Queued",
+      "in_progress": "In progress",
+      "waiting_for_funds": "Waiting for funds",
+      "paused": "Paused",
+      "completed": "Completed",
+      "failed": "Failed",
+      "error": "Error",
+      "cancelled": "Cancelled",
+      "abandoned": "Abandoned",
+      "timeout": "Timed out",
+      "killed": "Terminated",
+      "archived": "Archived"
+    },
+    "limit": "Showing up to 1,000 recent sessions",
+    "viewOptions": "Session view options",
+    "groupBy": "Group by",
+    "groupNone": "No grouping",
+    "groupTime": "Time",
+    "groupWorkspace": "By workspace",
+    "groupNoWorkspace": "No workspace",
+    "groupToday": "Today",
+    "groupEarlier": "Earlier",
+    "groupUnknown": "Date unavailable",
+    "loadMore": "Load more",
+    "retry": "Retry loading"
+  },
   "auth": {
-    "title": "Sign in to use Mobile Remote",
-    "subtitle": "Your ORG2 Cloud identity protects pairing, sessions, and desktop controls",
+    "title": "Sign in to ORG2",
+    "subtitle": "Connect your computer and pick up your conversations wherever you are",
     "checking": "Checking your account",
     "redirecting": "Opening secure sign-in",
     "exchanging": "Finishing sign-in",
     "wait": "This should only take a moment",
-    "signIn": "Sign in to ORG2 Cloud",
+    "signIn": "Sign in",
     "cancel": "Cancel and return to sign-in",
     "browserWait": "Complete sign-in in your browser, or cancel to try again",
     "errorTitle": "Sign-in could not be completed",
@@ -23,12 +175,12 @@
     "scanning": "Point the camera at the pairing QR code on your desktop",
     "cancelScan": "Cancel scan",
     "cameraDenied": "Camera access was denied. Allow camera access for ORG2 Remote in Settings, or paste the pairing code",
-    "cameraUnavailable": "Camera unavailable. In the simulator, paste the pairing code instead",
+    "cameraUnavailable": "Camera unavailable. Paste the pairing code from your computer",
     "scanTimeout": "Scan timed out and the camera was closed. Scan again or paste the pairing code",
     "scanFailed": "Scan failed. Try again or paste the pairing code",
-    "scanTitle": "Pair with desktop",
-    "scanHint": "Scan the QR code in desktop Settings or paste its payload. The public relay works over 4G and 5G",
-    "urlPlaceholder": "Paste the desktop pairing payload, or a ws:// / wss:// URL",
+    "scanTitle": "Connect your computer",
+    "scanHint": "Scan the QR code in ORG2 Settings on your computer, or paste the pairing code",
+    "urlPlaceholder": "Paste a pairing code or connection address",
     "connect": "Connect",
     "sasTitle": "Confirm pairing",
     "sasHint": "Verify the phrase on your desktop screen:",
@@ -36,9 +188,9 @@
     "connectingTitle": "Connecting",
     "connectingSubtitle": "Waiting for desktop phrase confirmation and a secure channel…",
     "errors": {
-      "empty": "Enter a WebSocket URL or QR payload",
-      "invalid": "Invalid QR or URL — scan the code from desktop Settings",
-      "unsupportedVersion": "Unsupported pairing payload version"
+      "empty": "Enter a pairing code or connection address",
+      "invalid": "Invalid pairing code or connection address. Get a new one from ORG2 Settings on your computer",
+      "unsupportedVersion": "This pairing code requires a newer version of ORG2. Update the app and try again"
     }
   },
   "tabs": {
@@ -52,10 +204,11 @@
     "thisDeviceLabel": "ORG2 Mobile",
     "thisDeviceSubtitle": "Full remote · Active now",
     "pairedDesktops": "Paired desktops",
-    "primary": "Primary",
     "online": "Online",
     "offline": "Offline",
     "unknown": "Connecting",
+    "currentDesktop": "Current computer",
+    "presenceUnknown": "Status unknown",
     "switchTo": "Switch to {{name}}",
     "switchFailed": "Could not switch desktops",
     "emptyDesktops": "No paired desktops"
@@ -63,45 +216,49 @@
   "settings": {
     "title": "Settings",
     "account": "Account",
-    "signedInAs": "Signed in as",
     "signOutConfirmTitle": "Sign out?",
     "signOutConfirmBody": "You will need to sign in again to access your remote computers. Sessions running on your computer will not be stopped",
     "cancel": "Cancel",
-    "manageAccount": "Manage Cloud account",
-    "deleteAccount": "Delete account on Cloud…",
+    "manageAccount": "Manage account",
+    "deleteAccount": "Delete account on the web…",
     "privacyPolicy": "Privacy policy",
-    "accountWebHint": "Opens the shared Cloud account page, which may require sign-in — check that the email matches the account above before confirming deletion",
     "openFailed": "Could not open the page — please try again",
     "signOut": "Sign out",
     "connection": "Connection",
+    "authorization": "Device authorization",
     "desktop": "Desktop",
-    "relay": "Relay",
     "permissionTier": "Permission tier",
     "permissionFull": "Full access",
     "permissionReadOnly": "Read only",
-    "mode": "Mode",
-    "modeDemo": "Demo",
-    "modeLive": "Live",
-    "demoBanner": "Demo mode — using local fixtures, not a live desktop",
+    "demoBanner": "Demo mode — showing sample content, not connected to a computer",
     "help": "Help",
     "pairingGuide": "Pairing guide",
     "revokePairing": "Revoke pairing",
     "online": "Online",
     "offline": "Offline",
-    "unknownRelay": "Not connected",
     "notAvailable": "—"
   },
   "stopConfirm": {
-    "failed": "Could not stop the turn. It may still be running. Try again or check the desktop.",
-    "title": "Stop current Agent turn?",
-    "body": "Sends a cancel command to the desktop. Whether running shell processes terminate depends on Agent policy",
+    "title": "Stop the current task?",
+    "body": "Your computer will be asked to stop the current task. Programs already started may keep running; check your computer to confirm",
     "cancel": "Cancel",
-    "confirm": "Stop"
+    "confirm": "Stop",
+    "failed": "Could not confirm that the task stopped. Check the connection and try again."
+  },
+  "permission": {
+    "submitFailed": "Could not confirm your response. Check the connection and try again."
+  },
+  "connectionRecovery": {
+    "retry": "Reconnect",
+    "repair": "Pair again",
+    "retryFailed": "Could not reconnect. Try again.",
+    "repairFailed": "Could not reset the connection. Try again."
   },
   "offlineBanner": "Desktop is offline — messages cannot be sent",
   "offlineBannerNamed": "{{desktopName}} is offline — messages cannot be sent",
-  "composerOffline": "Desktop offline — composer disabled",
-  "composerReadOnly": "This imported conversation is read-only on mobile",
+  "composerOffline": "Your computer is offline. Reconnect to send messages",
+  "composerReadOnly": "This conversation is currently view-only. Messages cannot be sent from your phone",
+  "composerDeviceReadOnly": "This device has read-only access",
   "composerSending": "Sending…",
   "composerAccepted": "Sent — waiting for the Agent…",
   "composerUncertain": "Connection changed — checking delivery…",
@@ -152,14 +309,8 @@
       },
       "openDetails": "View {{tool}} details",
       "closeDetails": "Close tool details",
-      "files": "Files",
-      "openFile": "Open",
       "fileOpenRequested": "Sent",
-      "openFileNamed": "Open {{file}} in Desktop",
-      "openFileUnavailable": "Connect with full access to open this file in Desktop",
       "openFileFailed": "Could not open the file ({{message}})",
-      "changes": "Changes",
-      "preview": "Preview",
       "loadingPreview": "Loading highlighted preview",
       "details": "Details",
       "output": "Output",
@@ -167,14 +318,11 @@
     }
   },
   "connectionFailed": "Connection failed",
-  "sessions": {
-    "limit": "Showing up to 1,000 recent sessions",
-    "loadMore": "Load more",
-    "retry": "Retry loading"
-  },
   "rounds": {
+    "oldestFirst": "Oldest first ↑",
+    "newestFirst": "Newest first ↓",
     "incomplete": "Earlier rounds are not loaded",
-    "truncated": "Transcript is truncated",
+    "truncated": "Only part of the conversation history is shown",
     "navigationLabel": "Round navigation"
   }
 }
diff --git a/src/i18n/locales/en/sessions.json b/src/i18n/locales/en/sessions.json
index 85d8286821..dee7f857d4 100644
--- a/src/i18n/locales/en/sessions.json
+++ b/src/i18n/locales/en/sessions.json
@@ -586,6 +586,7 @@
       "full": "Full access",
       "nextTurn": "Permissions apply to the next turn"
     },
+    "draftTooLong": "Draft is too long (maximum {{max}} characters)",
     "planApprovedLabel": "Implementing approved plan",
     "planApprovedEditedLabel": "Implementing approved plan (edited)",
     "restoreCheckpoint": "Restore checkpoint",
diff --git a/src/i18n/locales/es/sessions.json b/src/i18n/locales/es/sessions.json
index dfda278855..8d900b1fc5 100644
--- a/src/i18n/locales/es/sessions.json
+++ b/src/i18n/locales/es/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Se necesita acceso al micrófono"
   },
   "chat": {
+    "draftTooLong": "El borrador es demasiado largo (máximo {{max}} caracteres)",
     "cliPermissions": {
       "ask": "Solicitar aprobación",
       "workspace": "Acceso al espacio de trabajo",
diff --git a/src/i18n/locales/fr/sessions.json b/src/i18n/locales/fr/sessions.json
index 0388fae02f..b19f1d3a4e 100644
--- a/src/i18n/locales/fr/sessions.json
+++ b/src/i18n/locales/fr/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Accès au microphone requis"
   },
   "chat": {
+    "draftTooLong": "Le brouillon est trop long ({{max}} caractères maximum)",
     "cliPermissions": {
       "ask": "Demander une approbation",
       "workspace": "Accès à l’espace de travail",
diff --git a/src/i18n/locales/ja/sessions.json b/src/i18n/locales/ja/sessions.json
index 810c75e311..d534da1b49 100644
--- a/src/i18n/locales/ja/sessions.json
+++ b/src/i18n/locales/ja/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "マイクへのアクセスが必要です"
   },
   "chat": {
+    "draftTooLong": "下書きが長すぎます（最大 {{max}} 文字）",
     "cliPermissions": {
       "ask": "承認を求める",
       "workspace": "ワークスペースへのアクセス",
diff --git a/src/i18n/locales/ko/sessions.json b/src/i18n/locales/ko/sessions.json
index 424ef6a52c..df3df3c668 100644
--- a/src/i18n/locales/ko/sessions.json
+++ b/src/i18n/locales/ko/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "마이크 접근 권한 필요"
   },
   "chat": {
+    "draftTooLong": "초안이 너무 깁니다(최대 {{max}}자)",
     "cliPermissions": {
       "ask": "승인 요청",
       "workspace": "작업 공간 접근",
diff --git a/src/i18n/locales/pl/sessions.json b/src/i18n/locales/pl/sessions.json
index b4ff705bfa..55218c5c4b 100644
--- a/src/i18n/locales/pl/sessions.json
+++ b/src/i18n/locales/pl/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Wymagany dostęp do mikrofonu"
   },
   "chat": {
+    "draftTooLong": "Szkic jest zbyt długi (maksymalnie {{max}} znaków)",
     "cliPermissions": {
       "ask": "Proś o zatwierdzenie",
       "workspace": "Dostęp do obszaru roboczego",
diff --git a/src/i18n/locales/pt/sessions.json b/src/i18n/locales/pt/sessions.json
index b40f3890d4..cb13912d3a 100644
--- a/src/i18n/locales/pt/sessions.json
+++ b/src/i18n/locales/pt/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Acesso ao microfone necessário"
   },
   "chat": {
+    "draftTooLong": "O rascunho é muito longo (máximo de {{max}} caracteres)",
     "cliPermissions": {
       "ask": "Solicitar aprovação",
       "workspace": "Acesso ao espaço de trabalho",
diff --git a/src/i18n/locales/ru/sessions.json b/src/i18n/locales/ru/sessions.json
index 009e6977f9..6644986740 100644
--- a/src/i18n/locales/ru/sessions.json
+++ b/src/i18n/locales/ru/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Требуется доступ к микрофону"
   },
   "chat": {
+    "draftTooLong": "Черновик слишком длинный (максимум {{max}} символов)",
     "cliPermissions": {
       "ask": "Запрашивать разрешение",
       "workspace": "Доступ к рабочей области",
diff --git a/src/i18n/locales/tr/sessions.json b/src/i18n/locales/tr/sessions.json
index 3563384d47..7734d2dc7f 100644
--- a/src/i18n/locales/tr/sessions.json
+++ b/src/i18n/locales/tr/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Mikrofon erişimi gerekli"
   },
   "chat": {
+    "draftTooLong": "Taslak çok uzun (en fazla {{max}} karakter)",
     "cliPermissions": {
       "ask": "Onay iste",
       "workspace": "Çalışma alanı erişimi",
diff --git a/src/i18n/locales/vi/sessions.json b/src/i18n/locales/vi/sessions.json
index edccfd2d4c..0de61b5114 100644
--- a/src/i18n/locales/vi/sessions.json
+++ b/src/i18n/locales/vi/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "Cần quyền truy cập micrô"
   },
   "chat": {
+    "draftTooLong": "Bản nháp quá dài (tối đa {{max}} ký tự)",
     "cliPermissions": {
       "ask": "Yêu cầu phê duyệt",
       "workspace": "Truy cập không gian làm việc",
diff --git a/src/i18n/locales/zh-Hant/sessions.json b/src/i18n/locales/zh-Hant/sessions.json
index 7f52044f91..c8914d9f00 100644
--- a/src/i18n/locales/zh-Hant/sessions.json
+++ b/src/i18n/locales/zh-Hant/sessions.json
@@ -579,6 +579,7 @@
     "voicePermissionSheetTitle": "需要麥克風存取權限"
   },
   "chat": {
+    "draftTooLong": "草稿過長（最多 {{max}} 個字元）",
     "cliPermissions": {
       "ask": "操作前審批",
       "workspace": "工作區權限",
diff --git a/src/i18n/locales/zh/mobileRemote.json b/src/i18n/locales/zh/mobileRemote.json
index eb0d15ec23..510467923c 100644
--- a/src/i18n/locales/zh/mobileRemote.json
+++ b/src/i18n/locales/zh/mobileRemote.json
@@ -1,12 +1,164 @@
 {
+  "changeReview": {
+    "scope": "范围",
+    "moreActions": "更多文件操作",
+    "lines": "第 {{start}}–{{end}} 行",
+    "edit": "编辑 {{count}}",
+    "noNewline": "文件末尾无换行",
+    "rawPatch": "暂不支持此补丁预览 · 原始补丁",
+    "showMoreLines": "再显示 {{count}} 行",
+    "filesCount": "{{count}} 个文件变更",
+    "emptyTurn": "本轮没有文件变更，可查看会话累计",
+    "copy": "复制",
+    "copied": "已复制",
+    "copyFailed": "复制失败，重试",
+    "title": "文件变更",
+    "turn": "本轮",
+    "session": "会话累计",
+    "workspace": "工作区",
+    "diff": "差异",
+    "full": "完整文件",
+    "file": "文件",
+    "before": "修改前",
+    "after": "修改后",
+    "reconstructed": "依据会话编辑记录还原，非当前工作区文件",
+    "expand": "展开",
+    "expandAll": "全部展开",
+    "collapseAll": "全部收起",
+    "collapse": "收起",
+    "wrap": "自动换行",
+    "retry": "重试",
+    "loadFailed": "暂时无法加载变更",
+    "selected": "已选择",
+    "loading": "正在加载…",
+    "offline": "电脑已离线",
+    "empty": "没有可用的变更记录",
+    "partial": "部分记录缺少完整文件内容，暂时无法准确汇总变更",
+    "unavailable": "无法查看此版本的完整文件"
+  },
+  "fileViewer": {
+    "files": "文件",
+    "fileLocation": "文件位置",
+    "diff": "变更",
+    "patch": "补丁",
+    "partial": "部分内容",
+    "copyModified": "复制新版",
+    "original": "修改前",
+    "modified": "修改后",
+    "copyPatch": "复制补丁",
+    "patchFallback": "修改前后的文件内容不完整或过大，暂时显示原始补丁",
+    "snapshot": "只读",
+    "wrap": "自动换行",
+    "unavailable": "此会话未包含文件内容",
+    "empty": "空文件",
+    "openDesktop": "在电脑上打开",
+    "plainTextFallback": "编辑器未能加载，已显示纯文本"
+  },
+  "search": {
+    "title": "搜索会话",
+    "placeholder": "会话名称",
+    "cancel": "取消",
+    "clear": "清空搜索",
+    "unsupported": "请更新电脑上的 ORG2，以搜索完整会话历史",
+    "offline": "重新连接这台电脑后可搜索",
+    "loading": "正在搜索…",
+    "error": "未能加载这些搜索结果",
+    "retry": "重试搜索",
+    "resultsFor": "“{{query}}”的搜索结果",
+    "empty": "没有匹配的会话",
+    "continue": "本页没有可显示的结果，可以继续搜索",
+    "next": "下一页结果"
+  },
+  "inbox": {
+    "backToSessions": "返回会话",
+    "title": "待处理",
+    "syncing": "同步中",
+    "unavailable": "暂不可用",
+    "error": "待处理请求更新失败",
+    "offline": "保留上次已知请求，重新连接后才能打开和处理",
+    "incomplete": "当前仅显示部分请求，请在电脑上查看全部请求",
+    "empty": "暂无待批准的权限请求",
+    "truncated": "请求详情已缩略，请在电脑上查看完整内容并处理",
+    "open": "打开请求"
+  },
+  "profile": {
+    "title": "个人资料",
+    "open": "打开个人资料",
+    "close": "关闭个人资料",
+    "back": "返回个人资料",
+    "fallbackName": "ORG2 用户",
+    "development": "本地开发模式",
+    "helpAndAbout": "帮助与关于",
+    "help": "使用帮助",
+    "terms": "服务条款",
+    "danger": "危险操作",
+    "deleteHint": "前往 ORG2 账号页面确认并完成删除",
+    "opening": "正在打开浏览器…",
+    "pairingTitle": "连接你的电脑",
+    "pairingStep1": "在电脑上登录 ORG2，并在设置中启用移动遥控",
+    "pairingStep2": "在手机登录相同账号，扫描或粘贴桌面生成的配对码",
+    "pairingStep3": "核对两端显示的安全短语，确认后进入会话",
+    "connectionTitle": "连接不上怎么办？",
+    "connectionHelp": "请保持电脑上的 ORG2 运行并连接网络，再检查设置中的远程连接状态。配对码过期时，请在电脑上重新生成；无法扫码时可以粘贴配对码"
+  },
+  "connection": {
+    "resolvingSession": "正在确认会话…",
+    "restoring": "正在恢复设备",
+    "reconnecting": "正在重新连接桌面…"
+  },
+  "images": {
+    "label": "图片 {{number}}",
+    "load": "查看图片 {{number}}",
+    "loading": "正在加载图片…",
+    "retry": "图片加载失败 · 重试",
+    "unavailable": "连接新版桌面端以查看图片"
+  },
+  "sessions": {
+    "all": "全部会话",
+    "state": {
+      "unknown": "状态待同步",
+      "unread": "已完成，未读",
+      "running": "运行中",
+      "idle": "空闲",
+      "offline": "离线",
+      "awaiting_approval": "待批准",
+      "waiting_for_user": "等待回复",
+      "pending": "待启动",
+      "installing": "安装中",
+      "queued": "排队中",
+      "in_progress": "运行中",
+      "waiting_for_funds": "等待额度",
+      "paused": "已暂停",
+      "completed": "已完成",
+      "failed": "失败",
+      "error": "出错",
+      "cancelled": "已取消",
+      "abandoned": "已中止",
+      "timeout": "已超时",
+      "killed": "已终止",
+      "archived": "已归档"
+    },
+    "limit": "最多显示最近 1,000 条会话",
+    "viewOptions": "会话显示选项",
+    "groupBy": "分组方式",
+    "groupNone": "不分组",
+    "groupTime": "按时间",
+    "groupWorkspace": "按工作区",
+    "groupNoWorkspace": "未关联工作区",
+    "groupToday": "今天",
+    "groupEarlier": "更早",
+    "groupUnknown": "日期未知",
+    "loadMore": "加载更多",
+    "retry": "重试加载"
+  },
   "auth": {
-    "title": "登录后使用移动遥控",
-    "subtitle": "使用 ORG2 Cloud 身份保护配对、会话和桌面控制",
+    "title": "登录 ORG2",
+    "subtitle": "登录后，连接电脑，随时继续会话",
     "checking": "正在检查账号",
     "redirecting": "正在打开安全登录",
     "exchanging": "正在完成登录",
     "wait": "这通常只需要一点时间",
-    "signIn": "登录 ORG2 Cloud",
+    "signIn": "登录",
     "cancel": "取消并返回登录",
     "browserWait": "请在浏览器完成登录，或取消后重新登录",
     "errorTitle": "无法完成登录",
@@ -23,12 +175,12 @@
     "scanning": "将电脑上的配对二维码放入画面中",
     "cancelScan": "取消扫描",
     "cameraDenied": "未获得相机权限，请在系统设置中允许 ORG2 Remote 使用相机，或粘贴配对码",
-    "cameraUnavailable": "无法使用相机，模拟器请使用粘贴配对码",
+    "cameraUnavailable": "无法使用相机，请粘贴电脑上的配对码",
     "scanTimeout": "扫描已超时，相机已关闭，请重新扫描或粘贴配对码",
     "scanFailed": "扫描失败，请重试或粘贴配对码",
-    "scanTitle": "与桌面对齐",
-    "scanHint": "扫描桌面设置中的二维码，或粘贴二维码载荷文本。公网 Relay 支持手机使用 4G/5G",
-    "urlPlaceholder": "粘贴桌面生成的配对载荷，或 ws:// / wss:// URL",
+    "scanTitle": "连接你的电脑",
+    "scanHint": "扫描电脑上 ORG2 设置中的二维码，或粘贴配对码",
+    "urlPlaceholder": "粘贴配对码或连接地址",
     "connect": "连接",
     "sasTitle": "确认配对",
     "sasHint": "核对电脑屏幕短语：",
@@ -36,9 +188,9 @@
     "connectingTitle": "正在连接",
     "connectingSubtitle": "等待桌面核对安全短语并建立安全通道…",
     "errors": {
-      "empty": "请输入 WebSocket URL 或 QR 载荷",
-      "invalid": "无效二维码或 URL — 请扫描桌面 Settings 中的码",
-      "unsupportedVersion": "不支持的配对载荷版本"
+      "empty": "请输入配对码或连接地址",
+      "invalid": "配对码或连接地址无效，请从电脑上的 ORG2 设置中重新获取",
+      "unsupportedVersion": "此配对码需要更新版本的 ORG2，请更新后重试"
     }
   },
   "tabs": {
@@ -52,10 +204,11 @@
     "thisDeviceLabel": "ORG2 Mobile",
     "thisDeviceSubtitle": "完整遥控 · 刚刚活跃",
     "pairedDesktops": "配对的桌面",
-    "primary": "主桌面",
     "online": "在线",
     "offline": "离线",
     "unknown": "连接中",
+    "currentDesktop": "当前电脑",
+    "presenceUnknown": "状态未知",
     "switchTo": "切换到 {{name}}",
     "switchFailed": "无法切换桌面",
     "emptyDesktops": "暂无配对桌面"
@@ -63,45 +216,49 @@
   "settings": {
     "title": "设置",
     "account": "账号",
-    "signedInAs": "当前账号",
     "signOutConfirmTitle": "退出登录？",
     "signOutConfirmBody": "退出后需要重新登录才能访问远程电脑，不会停止电脑上正在运行的会话",
     "cancel": "取消",
-    "manageAccount": "管理 Cloud 账号",
-    "deleteAccount": "前往 Cloud 删除账号…",
+    "manageAccount": "管理账号",
+    "deleteAccount": "前往网页删除账号…",
     "privacyPolicy": "隐私政策",
-    "accountWebHint": "打开共用的 Cloud 账号页面，可能需要重新登录；确认删除前，请核对网页邮箱与上方账号一致",
     "openFailed": "无法打开页面，请重试",
     "signOut": "退出登录",
     "connection": "连接",
+    "authorization": "设备授权",
     "desktop": "桌面",
-    "relay": "Relay",
     "permissionTier": "权限级别",
     "permissionFull": "完整访问",
     "permissionReadOnly": "只读",
-    "mode": "模式",
-    "modeDemo": "演示",
-    "modeLive": "在线",
-    "demoBanner": "演示模式 — 使用本地 fixtures，未连接真实桌面",
+    "demoBanner": "演示模式 — 当前为示例内容，未连接电脑",
     "help": "帮助",
     "pairingGuide": "配对指南",
     "revokePairing": "解除配对",
     "online": "在线",
     "offline": "离线",
-    "unknownRelay": "未连接",
     "notAvailable": "—"
   },
   "stopConfirm": {
-    "failed": "未能停止当前轮次，它可能仍在运行。请重试或检查桌面端。",
-    "title": "停止当前 Agent turn？",
-    "body": "会向桌面发送 cancel 指令。已运行的 shell 进程是否终止取决于 Agent 策略",
+    "title": "停止当前任务？",
+    "body": "将请求电脑停止当前任务。已经启动的程序可能仍会继续运行，请在电脑上确认",
     "cancel": "取消",
-    "confirm": "停止"
+    "confirm": "停止",
+    "failed": "未能确认任务已停止，请检查连接后重试"
+  },
+  "permission": {
+    "submitFailed": "未能确认审批结果，请检查连接后重试"
+  },
+  "connectionRecovery": {
+    "retry": "重新连接",
+    "repair": "重新配对",
+    "retryFailed": "未能重新连接，请重试",
+    "repairFailed": "未能重置当前连接，请重试"
   },
   "offlineBanner": "桌面离线 — 无法发送消息",
   "offlineBannerNamed": "{{desktopName}} 离线 — 无法发送消息",
-  "composerOffline": "桌面离线 — 输入框已禁用",
-  "composerReadOnly": "这个导入会话暂时只能在手机上查看",
+  "composerOffline": "电脑已离线，连接后即可发送消息",
+  "composerReadOnly": "此会话目前只能查看，无法从手机发送消息",
+  "composerDeviceReadOnly": "这台设备只有查看权限，无法发送消息",
   "composerSending": "正在发送…",
   "composerAccepted": "已发送，正在等待 Agent 回复…",
   "composerUncertain": "连接已变化，正在确认是否送达…",
@@ -152,14 +309,8 @@
       },
       "openDetails": "查看{{tool}}详情",
       "closeDetails": "关闭工具详情",
-      "files": "文件",
-      "openFile": "打开",
       "fileOpenRequested": "已发送",
-      "openFileNamed": "在桌面端打开 {{file}}",
-      "openFileUnavailable": "请使用完整权限连接桌面端后打开文件",
       "openFileFailed": "无法打开文件（{{message}}）",
-      "changes": "更改",
-      "preview": "预览",
       "loadingPreview": "正在加载高亮预览",
       "details": "详情",
       "output": "输出",
@@ -167,14 +318,11 @@
     }
   },
   "connectionFailed": "连接失败",
-  "sessions": {
-    "limit": "最多显示最近 1,000 条会话",
-    "loadMore": "加载更多",
-    "retry": "重试加载"
-  },
   "rounds": {
+    "oldestFirst": "时间正序 ↑",
+    "newestFirst": "最新优先 ↓",
     "incomplete": "未加载更早的轮次",
-    "truncated": "对话记录已截断",
+    "truncated": "仅显示部分对话记录",
     "navigationLabel": "轮次导航"
   }
 }
diff --git a/src/i18n/locales/zh/sessions.json b/src/i18n/locales/zh/sessions.json
index ff98fba553..80dfc22bf7 100644
--- a/src/i18n/locales/zh/sessions.json
+++ b/src/i18n/locales/zh/sessions.json
@@ -586,6 +586,7 @@
       "full": "完全访问",
       "nextTurn": "权限设置从下一轮开始生效"
     },
+    "draftTooLong": "草稿过长（最多 {{max}} 个字符）",
     "planApprovedLabel": "执行已批准的计划",
     "planApprovedEditedLabel": "执行已批准的计划（已编辑）",
     "restoreCheckpoint": "恢复到此检查点",
diff --git a/src/icons.ts b/src/icons.ts
index 9cbb138451..1c4d78e845 100644
--- a/src/icons.ts
+++ b/src/icons.ts
@@ -411,6 +411,7 @@ export { default as TextBoldIcon } from "@hugeicons/core-free-icons/TextBoldIcon
 export { default as TextItalicIcon } from "@hugeicons/core-free-icons/TextItalicIcon";
 export { default as TextQuoteIcon } from "@hugeicons/core-free-icons/TextQuoteIcon";
 export { default as TextStrikethroughIcon } from "@hugeicons/core-free-icons/TextStrikethroughIcon";
+export { default as TextWrapIcon } from "@hugeicons/core-free-icons/TextWrapIcon";
 export { default as ThirdBracketIcon } from "@hugeicons/core-free-icons/ThirdBracketIcon";
 export { default as Tick01Icon } from "@hugeicons/core-free-icons/Tick01Icon";
 export { default as TickDouble01Icon } from "@hugeicons/core-free-icons/TickDouble01Icon";
diff --git a/src/modules/MobileRemote/MobileRemoteApp.drafts.test.ts b/src/modules/MobileRemote/MobileRemoteApp.drafts.test.ts
new file mode 100644
index 0000000000..abad9239e3
--- /dev/null
+++ b/src/modules/MobileRemote/MobileRemoteApp.drafts.test.ts
@@ -0,0 +1,286 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import { MobileRemoteApp } from "./MobileRemoteApp";
+import { MobileComposerDraftContext } from "./components/composer/MobileComposerDraftContext";
+import { createMobileComposerDraftStore } from "./components/composer/mobileComposerDraftStore";
+
+const state = vi.hoisted(() => ({
+  desktopId: "one",
+  send: vi.fn(),
+  optimize: vi.fn(),
+}));
+vi.mock("./app", () => ({
+  MobileRemoteProviders: ({ children }: React.PropsWithChildren) => {
+    const store = React.useMemo(createMobileComposerDraftStore, []);
+    React.useEffect(() => () => store.clear(), [store]);
+    return React.createElement(
+      MobileComposerDraftContext.Provider,
+      { value: store },
+      children
+    );
+  },
+  useMobileRemote: () => ({
+    connection: {
+      status: "connected",
+      presence: "online",
+      desktopId: state.desktopId,
+      tier: "full",
+      demoMode: false,
+    },
+    connectionConfig: { desktopId: state.desktopId },
+    transcriptItems: [],
+    transcriptPhase: "ready",
+    transcriptRounds: [],
+    transcriptRoundsComplete: true,
+    sessionModel: { options: [], loading: false, patching: false },
+    subscribeSession: () => Promise.resolve(),
+    unsubscribeSession: () => Promise.resolve(),
+    sendMessage: state.send,
+  }),
+}));
+vi.mock("./navigation/useMobileRemoteCoordinator", async () => {
+  const { reduceMobileRemoteNav, createInitialMobileRemoteNavState } =
+    await import("./navigation/mobileRemoteNavigation");
+  return {
+    useMobileRemoteCoordinator: () => {
+      const [nav, dispatch] = React.useReducer(
+        reduceMobileRemoteNav,
+        createInitialMobileRemoteNavState({ screen: "sessions" })
+      );
+      return {
+        connection: { status: "connected" },
+        nav,
+        dispatch,
+        showTabBar: !nav.selectedSessionId,
+      };
+    },
+  };
+});
+vi.mock("./screens/SessionsScreen", () => ({
+  SessionsScreen: ({
+    active,
+    onSelectSession,
+  }: {
+    active: boolean;
+    onSelectSession: (id: string) => void;
+  }) =>
+    active
+      ? React.createElement(
+          "button",
+          { onClick: () => onSelectSession("a") },
+          "Open session"
+        )
+      : null,
+}));
+vi.mock("./components/profile/MobileProfileEntry", () => ({
+  MobileProfileEntry: () => null,
+}));
+vi.mock("./components/modals/StopConfirmModal", () => ({
+  StopConfirmModal: () => null,
+}));
+vi.mock("./components/transcript/ChatTranscript", () => ({
+  ChatTranscript: () => null,
+}));
+vi.mock("./components/transcript/RoundNavigator", () => ({
+  RoundNavigator: () => null,
+}));
+vi.mock("./components/composer/MobileModelPicker", () => ({
+  MobileModelPicker: () => null,
+}));
+vi.mock("./components/MobileTopBar", () => ({
+  MobileTopBar: ({ onBack }: { onBack: () => void }) =>
+    React.createElement("button", { onClick: onBack }, "Back"),
+}));
+vi.mock("@src/components/PermissionPrompt", () => ({
+  PermissionSheet: () => null,
+}));
+vi.mock("@src/util/optimization/imageOptimizer", () => ({
+  optimizeImage: (...args: unknown[]) => state.optimize(...args),
+}));
+vi.mock("@src/hooks/voice", () => ({
+  useVoiceInput: () => ({
+    isRecording: false,
+    isSupported: false,
+    start: vi.fn(),
+    stop: vi.fn(),
+    cancel: vi.fn(),
+  }),
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, fallback?: unknown) =>
+      typeof fallback === "string" ? fallback : key,
+    i18n: { language: "en" },
+  }),
+}));
+
+let host: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+const environment = globalThis as typeof globalThis & {
+  IS_REACT_ACT_ENVIRONMENT?: boolean;
+};
+let previous: boolean | undefined;
+beforeEach(() => {
+  previous = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  state.desktopId = "one";
+  state.send.mockReset().mockResolvedValue(undefined);
+  state.optimize.mockReset().mockImplementation(async (file: File) => ({
+    dataUrl: `data:image/png;base64,${file.name}`,
+  }));
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  environment.IS_REACT_ACT_ENVIRONMENT = previous;
+});
+const render = (account = "user-a") =>
+  act(async () =>
+    root.render(React.createElement(MobileRemoteApp, { authUserId: account }))
+  );
+const click = (text: string) =>
+  act(async () => {
+    const button = Array.from(host.querySelectorAll("button")).find(
+      (el) => el.textContent === text
+    );
+    if (!button) throw new Error(`Missing ${text}`);
+    button.click();
+  });
+const enter = (text: string) =>
+  act(async () => {
+    const input = host.querySelector("textarea")!;
+    Object.getOwnPropertyDescriptor(
+      HTMLTextAreaElement.prototype,
+      "value"
+    )!.set!.call(input, text);
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+  });
+const attach = (name: string) =>
+  act(async () => {
+    const input = host.querySelector<HTMLInputElement>('input[type="file"]')!;
+    Object.defineProperty(input, "files", {
+      configurable: true,
+      value: [new File(["image"], name, { type: "image/png" })],
+    });
+    input.dispatchEvent(new Event("change", { bubbles: true }));
+  });
+
+it("restores text and photos through the actual chat/list route unmount and keeps desktop/account scopes separate", async () => {
+  await render();
+  await click("Open session");
+  await enter("unfinished");
+  await attach("one.png");
+  await click("Back");
+  expect(host.querySelector("textarea")).toBeNull();
+  await click("Open session");
+  expect(host.querySelector("textarea")?.value).toBe("unfinished");
+  expect(host.querySelector('img[src*="one.png"]')).not.toBeNull();
+  state.desktopId = "two";
+  await render();
+  expect(host.querySelector("textarea")?.value).toBe("");
+  await enter("other computer");
+  state.desktopId = "one";
+  await render();
+  expect(host.querySelector("textarea")?.value).toBe("unfinished");
+  await render("user-b");
+  await click("Open session");
+  expect(host.querySelector("textarea")?.value).toBe("");
+  expect(host.querySelector('img[src*="one.png"]')).toBeNull();
+  await render("user-a");
+  await click("Open session");
+  expect(host.querySelector("textarea")?.value).toBe("");
+});
+
+it("keeps failed submissions, preserves newer text/photos after success, and locks duplicate sends across navigation", async () => {
+  await render();
+  await click("Open session");
+  await enter("first");
+  await attach("one.png");
+  state.send.mockRejectedValueOnce(new Error("offline"));
+  await act(async () =>
+    host
+      .querySelector<HTMLButtonElement>('[data-testid="mobile-composer-send"]')!
+      .click()
+  );
+  expect(host.querySelector("textarea")?.value).toBe("first");
+  expect(host.textContent).toContain("offline");
+  let finish!: () => void;
+  state.send.mockImplementationOnce(
+    () =>
+      new Promise<void>((resolve) => {
+        finish = resolve;
+      })
+  );
+  await act(async () =>
+    host
+      .querySelector<HTMLButtonElement>('[data-testid="mobile-composer-send"]')!
+      .click()
+  );
+  await click("Back");
+  await click("Open session");
+  expect(
+    host.querySelector<HTMLButtonElement>(
+      '[data-testid="mobile-composer-send"]'
+    )?.disabled
+  ).toBe(true);
+  await enter("new edit");
+  // Editing back to the same contents is still newer intent, not the sent snapshot.
+  await enter("first");
+  await attach("two.png");
+  await act(async () => finish());
+  expect(host.querySelector("textarea")?.value).toBe("first");
+  expect(host.querySelector('img[src*="one.png"]')).toBeNull();
+  expect(host.querySelector('img[src*="two.png"]')).not.toBeNull();
+  expect(state.send).toHaveBeenCalledTimes(2);
+});
+
+it("finishes one image preparation while chat is unmounted and restores it on return", async () => {
+  let finish!: (result: { dataUrl: string }) => void;
+  state.optimize.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        finish = resolve;
+      })
+  );
+  await render();
+  await click("Open session");
+  await attach("preparing.png");
+  await attach("duplicate.png");
+  expect(state.optimize).toHaveBeenCalledTimes(1);
+  await click("Back");
+  await act(async () =>
+    finish({ dataUrl: "data:image/png;base64,preparing.png" })
+  );
+  await click("Open session");
+  expect(host.querySelector('img[src*="preparing.png"]')).not.toBeNull();
+  expect(
+    host.querySelector<HTMLButtonElement>(
+      '[data-testid="mobile-composer-send"]'
+    )?.disabled
+  ).toBe(false);
+});
+
+it("does not apply a late image preparation result to another account", async () => {
+  let finish!: (result: { dataUrl: string }) => void;
+  state.optimize.mockImplementationOnce(
+    () =>
+      new Promise((resolve) => {
+        finish = resolve;
+      })
+  );
+  await render();
+  await click("Open session");
+  await attach("late.png");
+  await render("user-b");
+  await click("Open session");
+  await enter("private new draft");
+  await act(async () => finish({ dataUrl: "data:image/png;base64,late.png" }));
+  expect(host.querySelector("textarea")?.value).toBe("private new draft");
+  expect(host.querySelector('img[src*="late.png"]')).toBeNull();
+});
diff --git a/src/modules/MobileRemote/MobileRemoteApp.identity.test.ts b/src/modules/MobileRemote/MobileRemoteApp.identity.test.ts
new file mode 100644
index 0000000000..4190f2af98
--- /dev/null
+++ b/src/modules/MobileRemote/MobileRemoteApp.identity.test.ts
@@ -0,0 +1,81 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { expect, it, vi } from "vitest";
+
+import { MobileRemoteApp } from "./MobileRemoteApp";
+import {
+  MobileAuthContext,
+  type MobileAuthContextValue,
+} from "./auth/MobileAuthContext";
+
+const lifecycle = vi.hoisted(() => ({ mount: vi.fn(), dispose: vi.fn() }));
+vi.mock("./app", async () => {
+  const React = await import("react");
+  return {
+    MobileRemoteProviders: () => {
+      React.useEffect(() => {
+        lifecycle.mount();
+        return lifecycle.dispose;
+      }, []);
+      return null;
+    },
+    useMobileRemote: vi.fn(),
+  };
+});
+
+it("disposes connection, inbox and search owners on account/endpoint changes, not token refresh", async () => {
+  const environment = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  };
+  const before = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  const root = createRoot(document.createElement("div"));
+  let value: MobileAuthContextValue = {
+    isDevelopmentBypass: false,
+    signOut: vi.fn(),
+    session: {
+      kind: "org2_cloud",
+      userId: "one",
+      supabaseUrl: "https://one.example",
+      supabaseAnonKey: "public",
+      accessToken: "first",
+      refreshToken: "refresh",
+      expiresAt: 1000,
+    },
+  };
+  const render = () =>
+    act(async () =>
+      root.render(
+        React.createElement(
+          MobileAuthContext.Provider,
+          { value },
+          React.createElement(MobileRemoteApp, {
+            authUserId: value.session.userId,
+          })
+        )
+      )
+    );
+  try {
+    await render();
+    value = {
+      ...value,
+      session: { ...value.session, accessToken: "refreshed" },
+    };
+    await render();
+    expect(lifecycle.mount).toHaveBeenCalledTimes(1);
+    value = { ...value, session: { ...value.session, userId: "two" } };
+    await render();
+    expect(lifecycle.dispose).toHaveBeenCalledTimes(1);
+    value = {
+      ...value,
+      session: { ...value.session, supabaseUrl: "https://two.example" },
+    };
+    await render();
+    expect(lifecycle.mount).toHaveBeenCalledTimes(3);
+    expect(lifecycle.dispose).toHaveBeenCalledTimes(2);
+  } finally {
+    await act(async () => root.unmount());
+    environment.IS_REACT_ACT_ENVIRONMENT = before;
+  }
+});
diff --git a/src/modules/MobileRemote/MobileRemoteApp.reconnect.test.ts b/src/modules/MobileRemote/MobileRemoteApp.reconnect.test.ts
new file mode 100644
index 0000000000..9293d69417
--- /dev/null
+++ b/src/modules/MobileRemote/MobileRemoteApp.reconnect.test.ts
@@ -0,0 +1,197 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { I18nextProvider } from "react-i18next";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import i18n, { i18nReady } from "@src/i18n";
+import enMobileRemote from "@src/i18n/locales/en/mobileRemote.json";
+
+import { MobileRemoteApp } from "./MobileRemoteApp";
+import { MobileAuthContext } from "./auth/MobileAuthContext";
+import { MobileRemotePlatformProvider } from "./platform";
+import { createBrowserMobileRemotePlatform } from "./platform/browser";
+
+// Only the transport is simulated: the root render gate, navigation, provider,
+// RPC framing, storage and session/offline UI run their production code.
+class RelaySocket extends EventTarget {
+  readyState = 0;
+  static online = false;
+  static instances: RelaySocket[] = [];
+
+  constructor(readonly url: string) {
+    super();
+    RelaySocket.instances.push(this);
+    queueMicrotask(() => {
+      this.readyState = 1;
+      this.dispatchEvent(new Event("open"));
+      // Relay recognizes this fixture's durable credential even if an older
+      // app retained its expired one-time code; Desktop need not be online.
+      queueMicrotask(() =>
+        this.receive({ jsonrpc: "2.0", method: "pairing/approved", params: {} })
+      );
+    });
+  }
+  receive(message: unknown) {
+    this.dispatchEvent(
+      new MessageEvent("message", { data: JSON.stringify(message) })
+    );
+  }
+  send(raw: string) {
+    const request = JSON.parse(raw);
+    if (request.id == null) return;
+    queueMicrotask(() =>
+      this.receive({
+        jsonrpc: "2.0",
+        id: request.id,
+        ...(!RelaySocket.online
+          ? { error: { code: -32006, message: "desktop is offline" } }
+          : {
+              result:
+                request.method === "initialize"
+                  ? {
+                      protocolVersion: 1,
+                      tier: "full",
+                      desktopId: "fixture-desktop",
+                    }
+                  : { sessions: [] },
+            }),
+      })
+    );
+  }
+  close(code = 1000) {
+    if (this.readyState === 3) return;
+    this.readyState = 3;
+    this.dispatchEvent(new CloseEvent("close", { code }));
+  }
+}
+
+const PlatformProvider = MobileRemotePlatformProvider as React.ComponentType<
+  React.PropsWithChildren<
+    Omit<React.ComponentProps<typeof MobileRemotePlatformProvider>, "children">
+  >
+>;
+
+describe("MobileRemoteApp paired-device recovery", () => {
+  let root: Root;
+  let container: HTMLDivElement;
+  const environment = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  };
+  let previousActEnvironment: boolean | undefined;
+  let platform: ReturnType<typeof createBrowserMobileRemotePlatform>;
+  beforeEach(async () => {
+    previousActEnvironment = environment.IS_REACT_ACT_ENVIRONMENT;
+    environment.IS_REACT_ACT_ENVIRONMENT = true;
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    RelaySocket.online = false;
+    RelaySocket.instances = [];
+    platform = createBrowserMobileRemotePlatform();
+    platform.connection.createSocket = (url) =>
+      new RelaySocket(url) as unknown as WebSocket;
+    platform.runtime.random = () => 0;
+    await i18nReady;
+    i18n.addResourceBundle("en", "mobileRemote", enMobileRemote, true, true);
+    await i18n.changeLanguage("en");
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    container.remove();
+    vi.useRealTimers();
+    environment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
+  });
+  async function render() {
+    await act(async () =>
+      root.render(
+        React.createElement(
+          I18nextProvider,
+          { i18n },
+          React.createElement(
+            PlatformProvider,
+            { platform },
+            React.createElement(
+              MobileAuthContext.Provider,
+              {
+                value: {
+                  isDevelopmentBypass: false,
+                  signOut: vi.fn(),
+                  session: {
+                    kind: "org2_cloud",
+                    userId: "reconnect-fixture",
+                    supabaseUrl: "https://auth.example.test",
+                    supabaseAnonKey: "fixture-public",
+                    accessToken: "fixture-access",
+                    refreshToken: "fixture-refresh",
+                    expiresAt: 9999999999,
+                  },
+                },
+              },
+              React.createElement(MobileRemoteApp, {
+                authUserId: "reconnect-fixture",
+              })
+            )
+          )
+        )
+      )
+    );
+  }
+
+  it("keeps the session page across offline launch and transport loss, but honors revocation", async () => {
+    const config = {
+      wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      desktopId: "fixture-desktop",
+      deviceToken: "fixture-credential",
+    };
+    await platform.connection.save("reconnect-fixture", config);
+    await render();
+    expect(container.querySelector(".mobile-discovery")).not.toBeNull();
+    expect(container.textContent).not.toContain(enMobileRemote.welcome.scanQr);
+    expect(RelaySocket.instances).toHaveLength(1);
+    RelaySocket.online = true;
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1_000);
+    });
+    expect(RelaySocket.instances).toHaveLength(2);
+    expect(container.querySelector(".mobile-discovery")).not.toBeNull();
+    await act(async () => RelaySocket.instances.at(-1)!.close(1006));
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1_000);
+    });
+    expect(RelaySocket.instances).toHaveLength(3);
+    expect(await platform.connection.load("reconnect-fixture")).toEqual(config);
+    expect(container.querySelector(".mobile-discovery")).not.toBeNull();
+    await act(async () => RelaySocket.instances.at(-1)!.close(1008));
+    expect(container.querySelector(".mobile-discovery")).toBeNull();
+    expect(container.textContent).toContain("Device access was revoked");
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(60_000);
+    });
+    expect(RelaySocket.instances).toHaveLength(3);
+  });
+
+  it("repairs an old paired record only after Relay approval and restores sessions while Desktop is offline", async () => {
+    await platform.connection.save("reconnect-fixture", {
+      wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      desktopId: "fixture-desktop",
+      deviceToken: "fixture-credential",
+      pairingCode: "old-one-time-code",
+    });
+    await render();
+    expect(container.querySelector(".mobile-discovery")).not.toBeNull();
+    expect(
+      (await platform.connection.load("reconnect-fixture"))?.pairingCode
+    ).toBeUndefined();
+    RelaySocket.online = true;
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1_000);
+    });
+    expect(RelaySocket.instances).toHaveLength(2);
+    expect(
+      new URL(RelaySocket.instances[1].url).searchParams.has("pairingCode")
+    ).toBe(false);
+    expect(container.querySelector(".mobile-discovery")).not.toBeNull();
+  });
+});
diff --git a/src/modules/MobileRemote/MobileRemoteApp.recovery.test.ts b/src/modules/MobileRemote/MobileRemoteApp.recovery.test.ts
new file mode 100644
index 0000000000..89a0855b39
--- /dev/null
+++ b/src/modules/MobileRemote/MobileRemoteApp.recovery.test.ts
@@ -0,0 +1,158 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import { MobileRemoteApp } from "./MobileRemoteApp";
+
+const mocks = vi.hoisted(() => ({ context: {} as Record<string, unknown> }));
+vi.mock("./app", () => ({
+  MobileRemoteProviders: ({ children }: React.PropsWithChildren) => children,
+  useMobileRemote: () => mocks.context,
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+vi.mock("./components/MobileShell", () => ({
+  MobileShell: ({ children }: React.PropsWithChildren) =>
+    React.createElement("main", null, children),
+}));
+vi.mock("./components/MobileTabBar", () => ({ MobileTabBar: () => null }));
+vi.mock("./components/profile/MobileProfileEntry", () => ({
+  MobileProfileEntry: () => null,
+}));
+vi.mock("./screens/WelcomeScreen", () => ({
+  WelcomeScreen: () => React.createElement("div", null, "pairing-home"),
+}));
+vi.mock("./screens/SessionChatScreen", () => ({
+  SessionChatScreen: () => null,
+}));
+vi.mock("./screens/SessionsScreen", () => ({ SessionsScreen: () => null }));
+vi.mock("./screens/devices/DevicesTab", () => ({ DevicesTab: () => null }));
+vi.mock("./screens/settings/SettingsTab", () => ({ SettingsTab: () => null }));
+vi.mock("./components/MobileActionButton", () => ({
+  MobileActionButton: ({
+    children,
+    variant: _variant,
+    ...props
+  }: React.ButtonHTMLAttributes<HTMLButtonElement> & { variant?: string }) =>
+    React.createElement("button", props, children),
+}));
+vi.mock("@src/components/Placeholder", () => ({
+  Placeholder: ({ title }: { title: string }) =>
+    React.createElement("p", null, title),
+}));
+
+let container: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+const environment = globalThis as typeof globalThis & {
+  IS_REACT_ACT_ENVIRONMENT?: boolean;
+};
+let previousAct: boolean | undefined;
+const render = () =>
+  act(async () =>
+    root.render(
+      React.createElement(MobileRemoteApp, { authUserId: "test-user" })
+    )
+  );
+const button = (label: string) =>
+  Array.from(container.querySelectorAll("button")).find(
+    (element) => element.textContent === label
+  )!;
+
+beforeEach(() => {
+  previousAct = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  container = document.createElement("div");
+  document.body.append(container);
+  root = createRoot(container);
+  mocks.context = {
+    connection: {
+      status: "error",
+      presence: "offline",
+      demoMode: false,
+      error: { message: "Unavailable" },
+    },
+    connectionConfig: {
+      desktopId: "desktop-a",
+      wsUrl: "wss://relay.example/v1/mobile/ws",
+    },
+    sessions: [],
+    bootstrapPending: false,
+    retryConnection: vi.fn().mockRejectedValue(new Error("network failure")),
+    disconnect: vi.fn().mockResolvedValue(undefined),
+    stopSession: vi.fn(),
+  };
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  container.remove();
+  environment.IS_REACT_ACT_ENVIRONMENT = previousAct;
+});
+
+it("the error-page Reconnect action retries the selected connection and exposes failure without unpairing", async () => {
+  await render();
+  await act(async () => button("connectionRecovery.retry").click());
+  expect(mocks.context.retryConnection).toHaveBeenCalledTimes(1);
+  expect(mocks.context.disconnect).not.toHaveBeenCalled();
+  expect(container.textContent).toContain("connectionRecovery.retryFailed");
+  expect(button("connectionRecovery.retry").disabled).toBe(false);
+  expect(container.textContent).not.toContain("pairing-home");
+});
+
+it("Pair again is separate and enters welcome only after successful reset", async () => {
+  mocks.context.disconnect = vi.fn().mockImplementation(async () => {
+    // The real provider clears runtime selection synchronously before its
+    // persistence promise settles; mirror that ordering at this boundary.
+    mocks.context = {
+      ...mocks.context,
+      connectionConfig: null,
+      connection: {
+        status: "disconnected",
+        presence: "unknown",
+        demoMode: false,
+      },
+    };
+  });
+  await render();
+  await act(async () => button("connectionRecovery.repair").click());
+  expect(mocks.context.disconnect).toHaveBeenCalledTimes(1);
+  expect(mocks.context.retryConnection).not.toHaveBeenCalled();
+  mocks.context = {
+    ...mocks.context,
+    connectionConfig: null,
+    connection: {
+      status: "disconnected",
+      presence: "unknown",
+      demoMode: false,
+    },
+  };
+  await render();
+  expect(container.textContent).toContain("pairing-home");
+});
+
+it("a failed reset remains on the error page with a recoverable message", async () => {
+  mocks.context.disconnect = vi.fn().mockRejectedValue(new Error("storage"));
+  await render();
+  await act(async () => button("connectionRecovery.repair").click());
+  expect(container.textContent).toContain("connectionRecovery.repairFailed");
+  expect(container.textContent).not.toContain("pairing-home");
+});
+
+it("keeps recovery on a loading surface until the single handshake settles", async () => {
+  let reject!: (error: Error) => void;
+  mocks.context.retryConnection = vi.fn().mockImplementation(
+    () =>
+      new Promise((_resolve, fail) => {
+        reject = fail;
+      })
+  );
+  await render();
+  await act(async () => button("connectionRecovery.retry").click());
+  expect(container.textContent).toContain("connection.restoring");
+  expect(container.textContent).not.toContain("pairing-home");
+  expect(container.querySelectorAll("button")).toHaveLength(0);
+  await act(async () => reject(new Error("timeout")));
+  expect(container.textContent).toContain("connectionRecovery.retryFailed");
+  expect(mocks.context.retryConnection).toHaveBeenCalledTimes(1);
+});
diff --git a/src/modules/MobileRemote/MobileRemoteApp.search.test.ts b/src/modules/MobileRemote/MobileRemoteApp.search.test.ts
new file mode 100644
index 0000000000..1aca41ea70
--- /dev/null
+++ b/src/modules/MobileRemote/MobileRemoteApp.search.test.ts
@@ -0,0 +1,146 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import { MobileRemoteApp } from "./MobileRemoteApp";
+import type { MobileRpcClient } from "./connection/mobileRpcClient";
+
+const state = vi.hoisted(() => ({
+  connection: {
+    status: "connected",
+    presence: "online",
+    desktopId: "one",
+    capabilities: { sessionSearch: true },
+  },
+  connectionConfig: { desktopId: "one", host: "localhost", port: 8787 },
+  sessions: [{ id: "recent", name: "Recent", status: "idle" }],
+  rpc: null as MobileRpcClient | null,
+}));
+vi.mock("./app", () => ({
+  MobileRemoteProviders: ({ children }: React.PropsWithChildren) => children,
+  useMobileRemote: () => state,
+}));
+vi.mock("./platform", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./platform")>();
+  const { createBrowserMobileRemotePlatform } =
+    await import("./platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { ...actual, useMobileRemotePlatform: () => platform };
+});
+vi.mock("./navigation/useMobileRemoteCoordinator", async () => {
+  const React = await import("react");
+  const { reduceMobileRemoteNav, createInitialMobileRemoteNavState } =
+    await import("./navigation/mobileRemoteNavigation");
+  return {
+    useMobileRemoteCoordinator: () => {
+      const [nav, dispatch] = React.useReducer(
+        reduceMobileRemoteNav,
+        createInitialMobileRemoteNavState({ screen: "sessions" })
+      );
+      return {
+        connection: state.connection,
+        nav,
+        dispatch,
+        showTabBar: !nav.selectedSessionId,
+      };
+    },
+  };
+});
+vi.mock("./components/profile/MobileProfileEntry", () => ({
+  MobileProfileEntry: () => null,
+}));
+vi.mock("./components/modals/StopConfirmModal", () => ({
+  StopConfirmModal: () => null,
+}));
+vi.mock("./screens/SessionChatScreen", () => ({
+  SessionChatScreen: ({ onBack }: { onBack: () => void }) =>
+    React.createElement("button", { onClick: onBack }, "Back from chat"),
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key, i18n: { language: "en" } }),
+}));
+
+let host: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+let call: ReturnType<typeof vi.fn>;
+let previousActEnvironment: boolean | undefined;
+const environment = globalThis as typeof globalThis & {
+  IS_REACT_ACT_ENVIRONMENT?: boolean;
+};
+beforeEach(() => {
+  previousActEnvironment = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  vi.useFakeTimers();
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+  call = vi.fn().mockResolvedValue({
+    sessions: [{ id: "historic", name: "Historic result", status: "idle" }],
+    nextOffset: 50,
+    hasMore: false,
+  });
+  state.rpc = { call } as unknown as MobileRpcClient;
+  state.connectionConfig.desktopId = "one";
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.useRealTimers();
+  environment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
+});
+const render = () =>
+  act(async () =>
+    root.render(
+      React.createElement(MobileRemoteApp, { authUserId: "test-account" })
+    )
+  );
+const search = async () => {
+  await act(async () =>
+    host
+      .querySelector<HTMLButtonElement>('[aria-label="search.title"]')!
+      .click()
+  );
+  await act(async () => {
+    const input = host.querySelector("input")!;
+    Object.getOwnPropertyDescriptor(
+      HTMLInputElement.prototype,
+      "value"
+    )!.set!.call(input, "history");
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+  });
+  await act(async () => vi.advanceTimersByTime(200));
+};
+
+it("preserves inline search through the actual App route switch and back action", async () => {
+  await render();
+  await search();
+  const results = host.querySelector(".mobile-discovery-scroll")!;
+  results.scrollTop = 180;
+  const row = Array.from(
+    host.querySelectorAll<HTMLButtonElement>(
+      '[data-testid="mobile-remote-session-row"]'
+    )
+  ).find((item) => item.textContent?.includes("Historic result"))!;
+  await act(async () => row.click());
+  expect(host.textContent).toBe("Back from chat");
+  expect(host.querySelector("input")).toBeNull();
+  await act(async () => vi.advanceTimersByTime(1000));
+  expect(call).toHaveBeenCalledTimes(1);
+  await act(async () => host.querySelector("button")!.click());
+  expect(host.querySelector("input")?.value).toBe("history");
+  expect(host.textContent).toContain("Historic result");
+  expect(host.querySelector(".mobile-discovery-scroll")?.scrollTop).toBe(180);
+  expect(call).toHaveBeenCalledTimes(1);
+});
+
+it("clears the retained search owner when the paired desktop changes", async () => {
+  await render();
+  await search();
+  state.connectionConfig.desktopId = "two";
+  await render();
+  expect(host.querySelector("input")).toBeNull();
+  expect(host.textContent).not.toContain("Historic result");
+  await act(async () => vi.advanceTimersByTime(1000));
+  expect(call).toHaveBeenCalledTimes(1);
+});
diff --git a/src/modules/MobileRemote/MobileRemoteApp.test.ts b/src/modules/MobileRemote/MobileRemoteApp.test.ts
index ec91b4eb48..eada99c4fb 100644
--- a/src/modules/MobileRemote/MobileRemoteApp.test.ts
+++ b/src/modules/MobileRemote/MobileRemoteApp.test.ts
@@ -21,7 +21,7 @@ const TestMobileRemotePlatformProvider =
   >;
 
 describe("MobileRemoteApp", () => {
-  it("renders welcome markup within providers", async () => {
+  it("does not flash pairing before persisted device hydration", async () => {
     await i18nReady;
     i18n.addResourceBundle("en", "mobileRemote", enMobileRemote, true, true);
     await i18n.changeLanguage("en");
@@ -36,8 +36,8 @@ describe("MobileRemoteApp", () => {
         )
       )
     );
-    expect(markup).toContain("Mobile Remote");
     expect(markup).not.toContain("Try demo");
-    expect(markup).toContain(enMobileRemote.welcome.scanQr);
+    expect(markup).not.toContain(enMobileRemote.welcome.scanQr);
+    expect(markup).toContain('aria-busy="true"');
   });
 });
diff --git a/src/modules/MobileRemote/MobileRemoteApp.tsx b/src/modules/MobileRemote/MobileRemoteApp.tsx
index 096994ca7d..c8e4393102 100644
--- a/src/modules/MobileRemote/MobileRemoteApp.tsx
+++ b/src/modules/MobileRemote/MobileRemoteApp.tsx
@@ -1,11 +1,15 @@
-import React from "react";
+import React, { useContext } from "react";
 
-import { MobileRemoteProviders } from "./app";
+import { createLogger } from "@src/hooks/logger";
+
+import { MobileRemoteProviders, useMobileRemote } from "./app";
+import { MobileAuthContext } from "./auth/MobileAuthContext";
 import { MobileShell } from "./components/MobileShell";
 import { MobileTabBar } from "./components/MobileTabBar";
-import { StopConfirmModal } from "./components/modals/StopConfirmModal";
+import { MobileProfileEntry } from "./components/profile/MobileProfileEntry";
 import { useMobileRemoteCoordinator } from "./navigation/useMobileRemoteCoordinator";
 import { ConnectingLiveBridge } from "./screens/ConnectingLiveBridge";
+import { ConnectingScreen } from "./screens/ConnectingScreen";
 import { ConnectionErrorScreen } from "./screens/ConnectionErrorScreen";
 import { QRScanScreen } from "./screens/QRScanScreen";
 import { SASConfirmScreen } from "./screens/SASConfirmScreen";
@@ -34,23 +38,45 @@ function MobileRemoteRoutes({
     connection,
     nav,
     dispatch,
-    stopConfirming,
-    stopFailed,
+    connectionRecovering,
+    connectionRecoveryError,
     showTabBar,
     selectedSessionName,
     selectedSessionSendCapability,
     handleConnectingComplete,
     handleAcceptPairing,
-    handleConfirmStop,
     handleConnectionRetry,
+    handleConnectionRepair,
   } = useMobileRemoteCoordinator(recoveredPairingIntent);
+  const { bootstrapPending, connectionConfig } = useMobileRemote();
+
+  // Manual recovery owns the handshake; do not remount ConnectingLiveBridge
+  // with an old pending config and start a second connection in parallel.
+  if (bootstrapPending || connectionRecovering) {
+    return (
+      <MobileShell>
+        <ConnectingScreen restoring />
+      </MobileShell>
+    );
+  }
 
   if (connection.status === "error") {
     return (
       <MobileShell>
         <ConnectionErrorScreen
           message={connection.error?.message}
-          onRetry={handleConnectionRetry}
+          onRetry={() => {
+            void handleConnectionRetry().catch((error) =>
+              logger.warn("Connection retry failed", error)
+            );
+          }}
+          onRepair={() => {
+            void handleConnectionRepair().catch((error) =>
+              logger.warn("Connection repair failed", error)
+            );
+          }}
+          busy={connectionRecovering}
+          actionError={connectionRecoveryError}
         />
       </MobileShell>
     );
@@ -61,6 +87,7 @@ function MobileRemoteRoutes({
     case "welcome":
       body = (
         <WelcomeScreen
+          profileAction={<MobileProfileEntry />}
           onOpenPairing={() => dispatch({ type: "open_qr_scan" })}
         />
       );
@@ -97,18 +124,13 @@ function MobileRemoteRoutes({
         body = (
           <>
             <SessionChatScreen
+              onCanonicalSession={(sessionId) =>
+                dispatch({ type: "select_session", sessionId })
+              }
               sessionId={nav.selectedSessionId}
               sessionName={selectedSessionName}
               sendCapability={selectedSessionSendCapability}
               onBack={() => dispatch({ type: "back_from_chat" })}
-              onOpenStopModal={() => dispatch({ type: "open_stop_modal" })}
-            />
-            <StopConfirmModal
-              visible={nav.stopModalOpen}
-              confirming={stopConfirming}
-              failed={stopFailed}
-              onCancel={() => dispatch({ type: "close_stop_modal" })}
-              onConfirm={() => void handleConfirmStop().catch(() => undefined)}
             />
           </>
         );
@@ -117,13 +139,7 @@ function MobileRemoteRoutes({
       } else if (nav.activeTab === "settings") {
         body = <SettingsTab />;
       } else {
-        body = (
-          <SessionsScreen
-            onSelectSession={(sessionId) =>
-              dispatch({ type: "select_session", sessionId })
-            }
-          />
-        );
+        body = null;
       }
       break;
     default:
@@ -141,6 +157,20 @@ function MobileRemoteRoutes({
         ) : null
       }
     >
+      {nav.screen === "sessions" || nav.screen === "chat" ? (
+        <SessionsScreen
+          key={JSON.stringify([
+            connectionConfig?.desktopId ?? connection.desktopId,
+            connectionConfig?.host,
+            connectionConfig?.port,
+          ])}
+          active={!nav.selectedSessionId && nav.activeTab === "sessions"}
+          profileAction={<MobileProfileEntry />}
+          onSelectSession={(sessionId) =>
+            dispatch({ type: "select_session", sessionId })
+          }
+        />
+      ) : null}
       {body}
     </MobileShell>
   );
@@ -152,8 +182,10 @@ export function MobileRemoteApp({
   recoveredPairingIntent = null,
   relayUrl,
 }: MobileRemoteAppProps) {
+  const auth = useContext(MobileAuthContext);
   return (
     <MobileRemoteProviders
+      key={JSON.stringify([authUserId, auth?.session.supabaseUrl, relayUrl])}
       authUserId={authUserId}
       relayUrl={relayUrl}
       demoByDefault={false}
@@ -165,3 +197,5 @@ export function MobileRemoteApp({
 }
 
 MobileRemoteApp.displayName = "MobileRemoteApp";
+
+const logger = createLogger("MobileRemoteApp");
diff --git a/src/modules/MobileRemote/_mobileTypography.scss b/src/modules/MobileRemote/_mobileTypography.scss
new file mode 100644
index 0000000000..8df24f32e8
--- /dev/null
+++ b/src/modules/MobileRemote/_mobileTypography.scss
@@ -0,0 +1,47 @@
+// Mobile-only semantic scale. rem values follow the root text size; do not
+// override desktop --text-* tokens or shrink text at narrow breakpoints.
+@mixin tokens {
+  --mobile-type-large-title-size: 2.125rem;
+  --mobile-type-title-size: 1.25rem;
+  --mobile-type-heading-size: 1.0625rem;
+  --mobile-type-body-size: 1rem;
+  --mobile-type-control-size: 1rem;
+  --mobile-type-secondary-size: 0.875rem;
+  --mobile-type-caption-size: 0.8125rem;
+  --mobile-type-micro-size: 0.6875rem;
+  --mobile-type-code-size: 0.8125rem;
+  --mobile-type-regular-weight: 400;
+  --mobile-type-medium-weight: 500;
+  --mobile-type-emphasis-weight: 600;
+  --mobile-type-strong-weight: 700;
+  --mobile-type-title-leading: 1.2;
+  --mobile-type-heading-leading: 1.3;
+  --mobile-type-control-leading: 1.4;
+  --mobile-type-caption-leading: 1.4;
+  --mobile-type-body-leading: 1.5;
+  --mobile-type-reading-leading: 1.6;
+  --mobile-type-code-leading: 1.6;
+}
+
+// These names describe content roles, unlike shared desktop density utilities.
+@mixin utilities {
+  @each $role,
+    $leading
+      in (
+        large-title: title,
+        title: title,
+        heading: heading,
+        body: body,
+        control: control,
+        secondary: body,
+        caption: caption,
+        micro: caption,
+        code: code
+      )
+  {
+    .mobile-type-#{$role} {
+      font-size: var(--mobile-type-#{$role}-size);
+      line-height: var(--mobile-type-#{$leading}-leading);
+    }
+  }
+}
diff --git a/src/modules/MobileRemote/_mobileUiTokens.scss b/src/modules/MobileRemote/_mobileUiTokens.scss
new file mode 100644
index 0000000000..b55647e259
--- /dev/null
+++ b/src/modules/MobileRemote/_mobileUiTokens.scss
@@ -0,0 +1,61 @@
+// Mobile sizing scale. Theme colors and elevation remain owned by shared UI.
+$space-1: 4px;
+$space-2: 8px;
+$space-3: 12px;
+$space-4: 16px;
+$touch-target: 44px;
+
+// Intrinsic sizing, shared by mobile portal menus. Override the desktop
+// min-w-fit utility explicitly: a long option must not defeat the viewport cap.
+@mixin adaptive-menu($minimum: 10rem, $maximum: 24rem) {
+  --mobile-menu-available-width: calc(
+    100vw - #{2 *
+      $space-4} - env(safe-area-inset-left, 0px) - env(
+        safe-area-inset-right,
+        0px
+      )
+  );
+  width: max-content;
+  min-width: min(#{$minimum}, var(--mobile-menu-available-width));
+  max-width: min(#{$maximum}, var(--mobile-menu-available-width));
+  [role="option"] {
+    min-width: 0;
+    min-height: $touch-target;
+    > .truncate {
+      min-width: 0;
+      white-space: normal;
+      overflow-wrap: anywhere;
+    }
+  }
+}
+
+@mixin search-field {
+  --mobile-search-height: 48px;
+  --mobile-search-radius: 999px;
+  --mobile-search-padding-x: #{$space-4};
+  --mobile-search-icon-size: 20px;
+  --mobile-search-font-size: var(--mobile-type-body-size);
+  --mobile-search-gap: #{$space-2};
+  --mobile-search-surface: var(--color-bg-2);
+  --mobile-search-border: var(--color-border-1);
+  --mobile-search-shadow: var(--shadow-dropdown-soft);
+}
+
+// Apply on the surface, not only .mobile-shell: menus portal to document.body.
+@mixin compact-menu {
+  --mobile-menu-width: 224px;
+  --mobile-menu-viewport-inset: #{$space-4};
+  --mobile-menu-radius: #{$space-4};
+  --mobile-menu-padding: #{$space-2};
+  --mobile-menu-row-height: #{$touch-target};
+  --mobile-menu-row-padding-y: #{$space-2};
+  --mobile-menu-row-padding-x: #{$space-3};
+  --mobile-menu-row-gap: #{$space-2};
+  --mobile-menu-row-radius: #{$space-2};
+  --mobile-menu-font-size: var(--mobile-type-control-size);
+  --mobile-menu-line-height: var(--mobile-type-control-leading);
+  --mobile-menu-caption-size: var(--mobile-type-caption-size);
+  --mobile-menu-caption-line-height: var(--mobile-type-caption-leading);
+  --mobile-menu-caption-padding-y: #{$space-1};
+  --mobile-menu-icon-size: 18px;
+}
diff --git a/src/modules/MobileRemote/app/MobileRemoteContext.ts b/src/modules/MobileRemote/app/MobileRemoteContext.ts
index f18314b98b..0dbb3829ee 100644
--- a/src/modules/MobileRemote/app/MobileRemoteContext.ts
+++ b/src/modules/MobileRemote/app/MobileRemoteContext.ts
@@ -1,8 +1,8 @@
-import { createContext, useContext } from "react";
+import React, { createContext, useContext } from "react";
 
 import type { PermissionSheetRequest } from "@src/components/PermissionPrompt";
 
-import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { type MobileRpcClient } from "../connection/mobileRpcClient";
 import type {
   MobileConnectionConfig,
   MobileConnectionState,
@@ -17,13 +17,26 @@ import type {
   TranscriptRoundSummary,
 } from "../lib/transcriptLoadState";
 import type { TranscriptItem } from "../lib/transcriptReducer";
-import type { MobileSendStatus } from "./useMobileSend";
+import type { MobileReadStateSync } from "./mobileReadStateSync";
+import { type MobilePendingInbox } from "./useMobilePendingInbox";
+import { type MobileSendStatus } from "./useMobileSend";
 
 export interface MobileRemoteContextValue {
+  readStateSync: MobileReadStateSync;
+  pendingInbox: MobilePendingInbox;
+  focusPermission: (requestId: string) => void;
+  bootstrapPending: boolean;
   connection: MobileConnectionState;
   sessions: MobileSessionRow[];
   transcriptItems: TranscriptItem[];
   transcriptPhase: TranscriptLoadPhase;
+  transcriptSessionId: string | null;
+  openingReady: boolean;
+  openedSession: {
+    requested: string;
+    sessionId: string;
+    managed: boolean;
+  } | null;
   transcriptError?: string;
   transcriptTruncated: boolean;
   transcriptRounds: TranscriptRoundSummary[];
@@ -36,10 +49,13 @@ export interface MobileRemoteContextValue {
   permissionQueueDepth: number;
   /** True while an answer is on the wire; the sheet must stay disabled. */
   permissionSubmitting: boolean;
+  /** Failure belongs to the currently presented permission request only. */
+  permissionFailed: boolean;
   rpc: MobileRpcClient | null;
   connectionConfig: MobileConnectionConfig | null;
   pairedDesktops: MobilePairedDesktopSummary[];
   connectLive: (config: MobileConnectionConfig) => Promise<void>;
+  retryConnection: () => Promise<boolean>;
   switchPairedDesktop: (desktopId: string) => Promise<void>;
   enterDemoMode: () => void;
   disconnect: () => Promise<void>;
@@ -68,6 +84,7 @@ export interface MobileRemoteContextValue {
   stopSession: (sessionId: string) => Promise<void>;
   sessionModel: MobileSessionModelState;
   refreshSessionModel: (sessionId: string) => Promise<void>;
+  loadSessionModels: (sessionId: string) => Promise<void>;
   setSessionModel: (
     sessionId: string,
     option: MobileModelOption
@@ -77,6 +94,16 @@ export interface MobileRemoteContextValue {
 export const MobileRemoteContext =
   createContext<MobileRemoteContextValue | null>(null);
 
+export interface MobileRemoteProvidersProps {
+  children: React.ReactNode;
+  /** Authenticated ORG2 Cloud subject; scopes all retained pairing state. */
+  authUserId: string;
+  relayUrl?: string;
+  demoByDefault?: boolean;
+  /** A freshly scanned QR must take precedence over a stored old desktop. */
+  suppressInitialBootstrap?: boolean;
+}
+
 export function useMobileRemote(): MobileRemoteContextValue {
   const value = useContext(MobileRemoteContext);
   if (!value) {
diff --git a/src/modules/MobileRemote/app/MobileRemoteProviders.test.ts b/src/modules/MobileRemote/app/MobileRemoteProviders.test.ts
index a3670a2bbe..d885dd1520 100644
--- a/src/modules/MobileRemote/app/MobileRemoteProviders.test.ts
+++ b/src/modules/MobileRemote/app/MobileRemoteProviders.test.ts
@@ -12,6 +12,12 @@ import {
   vi,
 } from "vitest";
 
+import { MobileComposerDraftContext } from "../components/composer/MobileComposerDraftContext";
+import { mobileComposerDesktopScope } from "../components/composer/mobileComposerDraftStore";
+import type { MobileComposerDraftStore } from "../components/composer/mobileComposerDraftStore";
+import { loadScopedMobileConnectionConfig } from "../connection/mobileConnectionStorage";
+import type { MobileConnectionConfig } from "../connection/types";
+import { MobileConnectionAuthorizationError } from "../connection/types";
 import { MobileRemotePlatformProvider } from "../platform";
 import { createBrowserMobileRemotePlatform } from "../platform/browser";
 import {
@@ -49,25 +55,35 @@ vi.mock("../connection/mobileRpcClient", async (importOriginal) => {
     await importOriginal<typeof import("../connection/mobileRpcClient")>();
   return {
     ...original,
-    createMobileRpcClient: (socket: WebSocket) => ({
-      call: mocks.call,
-      notify: vi.fn(),
-      onNotification: (
-        handler: (method: string, params?: Record<string, unknown>) => void
-      ) => {
-        mocks.notificationHandler = handler;
-        return () => {
-          if (mocks.notificationHandler === handler) {
+    createMobileRpcClient: (socket: WebSocket) => {
+      const subscribers = new Set<
+        (method: string, params?: Record<string, unknown>) => void
+      >();
+      const notify = (method: string, params?: Record<string, unknown>) => {
+        for (const handler of subscribers) handler(method, params);
+      };
+      mocks.notificationHandler = notify;
+      return {
+        call: mocks.call,
+        notify: vi.fn(),
+        onNotification: (
+          handler: (method: string, params?: Record<string, unknown>) => void
+        ) => {
+          subscribers.add(handler);
+          return () => {
+            subscribers.delete(handler);
+          };
+        },
+        close: () => {
+          mocks.close();
+          subscribers.clear();
+          if (mocks.notificationHandler === notify)
             mocks.notificationHandler = null;
-          }
-        };
-      },
-      close: () => {
-        mocks.close();
-        socket.close();
-      },
-      readyState: 1,
-    }),
+          socket.close();
+        },
+        readyState: 1,
+      };
+    },
   };
 });
 
@@ -114,117 +130,1386 @@ function deferred<T>() {
     resolve = resolvePromise;
     reject = rejectPromise;
   });
-  return { promise, resolve, reject };
-}
-
-describe("MobileRemoteProviders send lifecycle", () => {
-  let container: HTMLDivElement;
-  let root: Root;
-  let latestContext: MobileRemoteContextValue | null;
-  let sendResult: ReturnType<typeof deferred<{ execution: string }>>;
-  const actEnvironment = globalThis as typeof globalThis & {
-    IS_REACT_ACT_ENVIRONMENT?: boolean;
-  };
-
-  function Probe(): null {
-    const context = useMobileRemote();
-    React.useEffect(() => {
-      latestContext = context;
-    }, [context]);
-    return null;
-  }
+  return { promise, resolve, reject };
+}
+
+describe("MobileRemoteProviders send lifecycle", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+  let latestContext: MobileRemoteContextValue | null;
+  let latestDraftStore: MobileComposerDraftStore | null;
+  let sendResult: ReturnType<typeof deferred<{ execution: string }>>;
+  const actEnvironment = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  };
+
+  function Probe(): null {
+    const context = useMobileRemote();
+    const drafts = React.useContext(MobileComposerDraftContext);
+    React.useEffect(() => {
+      latestContext = context;
+      latestDraftStore = drafts;
+    }, [context, drafts]);
+    return null;
+  }
+
+  beforeAll(() => {
+    actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
+    vi.stubGlobal("WebSocket", FakeWebSocket);
+  });
+
+  beforeEach(async () => {
+    latestContext = null;
+    latestDraftStore = null;
+    sendResult = deferred<{ execution: string }>();
+    mocks.sendParams = null;
+    mocks.externalRoundId = null;
+    mocks.notificationHandler = null;
+    mocks.close.mockReset();
+    FakeWebSocket.instances = [];
+    FakeWebSocket.deferCloseEvents = false;
+    FakeWebSocket.pendingCloseEvents = [];
+    mocks.call
+      .mockReset()
+      .mockImplementation(
+        (method: string, params?: Record<string, unknown>) => {
+          if (method === "initialize") {
+            return Promise.resolve({ protocolVersion: 1, tier: "full" });
+          }
+          if (method === "session/list") {
+            return Promise.resolve({ sessions: [] });
+          }
+          if (method === "session/subscribe") {
+            const externalRound = mocks.externalRoundId
+              ? [
+                  {
+                    id: mocks.externalRoundId,
+                    userPreview: "external turn",
+                  },
+                ]
+              : [];
+            return Promise.resolve({
+              sessionId: params?.sessionId,
+              rounds: {
+                items: [
+                  { id: "round-1", userPreview: "First" },
+                  { id: "round-2", userPreview: "Second" },
+                  { id: "round-3", userPreview: "Latest" },
+                  ...externalRound,
+                ],
+                complete: true,
+              },
+              snapshot: {
+                sessionId: params?.sessionId,
+                roundId: mocks.externalRoundId ?? "round-3",
+                version: 1,
+                snapshotDelta: false,
+                upserts: [],
+              },
+            });
+          }
+          if (method === "session/round") {
+            const roundId = String(params?.roundId);
+            return Promise.resolve({
+              sessionId: params?.sessionId,
+              roundId,
+              snapshot: {
+                sessionId: params?.sessionId,
+                roundId,
+                version: 1,
+                snapshotDelta: false,
+                upserts: [
+                  {
+                    id: `agent-${roundId}`,
+                    source: "assistant",
+                    displayVariant: "message",
+                    displayText: `History ${roundId}`,
+                  },
+                ],
+              },
+            });
+          }
+          if (method === "session/send") {
+            mocks.sendParams = params ?? null;
+            return sendResult.promise;
+          }
+          return Promise.resolve({});
+        }
+      );
+
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+    await act(async () => {
+      root.render(
+        React.createElement(
+          TestMobileRemotePlatformProvider,
+          { platform: createBrowserMobileRemotePlatform() },
+          React.createElement(
+            TestMobileRemoteProviders,
+            {
+              authUserId: "user-a",
+              demoByDefault: false,
+              suppressInitialBootstrap: true,
+            },
+            React.createElement(Probe)
+          )
+        )
+      );
+    });
+    await act(async () => {
+      await latestContext?.connectLive({
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      });
+    });
+    await act(async () => {
+      await latestContext?.subscribeSession("session-a");
+    });
+  });
+
+  it("ignores a late opening and closes only its lease after switching chats", async () => {
+    const old = deferred<unknown>();
+    const base = mocks.call.getMockImplementation()!;
+    const reply = (params?: Record<string, unknown>) => ({
+      sessionId: params?.sessionId,
+      managed: false,
+      subscriptionId: params?.subscriptionId,
+      rounds: { items: [], complete: true },
+      snapshot: {
+        sessionId: params?.sessionId,
+        upserts: [],
+        snapshotDelta: false,
+        version: 1,
+      },
+    });
+    let oldParams: Record<string, unknown> | undefined;
+    mocks.call.mockImplementation(
+      (method: string, params?: Record<string, unknown>) => {
+        if (method === "initialize")
+          return Promise.resolve({
+            protocolVersion: 1,
+            tier: "full",
+            capabilities: { sessionOpen: true },
+          });
+        if (method === "session/open") {
+          if (params?.sessionId === "old") {
+            oldParams = params;
+            return old.promise;
+          }
+          return Promise.resolve(reply(params));
+        }
+        return base(method, params);
+      }
+    );
+    await act(async () => {
+      await latestContext!.connectLive({
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      });
+    });
+    mocks.call.mockClear();
+    let first!: Promise<void>;
+    await act(async () => {
+      first = latestContext!.subscribeSession("old");
+    });
+    await act(async () => {
+      for (let i = 0; i < 10; i++)
+        mocks.notificationHandler!("session/list_changed", {});
+    });
+    expect(
+      mocks.call.mock.calls.filter(([method]) => method === "session/open")
+    ).toHaveLength(1);
+    await act(async () => {
+      await latestContext!.subscribeSession("new");
+    });
+    await act(async () => {
+      old.resolve(reply(oldParams));
+      await first;
+    });
+    expect(latestContext!.openedSession?.sessionId).toBe("new");
+    expect(latestContext!.transcriptSessionId).toBe("new");
+    expect(mocks.call).toHaveBeenCalledWith("session/unsubscribe", {
+      subscriptionId: oldParams!.subscriptionId,
+    });
+    // Replacing this connection with a legacy Desktop must not let its old
+    // lease suppress the new connection's session-id unsubscribe.
+    mocks.call.mockImplementation(
+      (method: string, params?: Record<string, unknown>) => {
+        if (method === "initialize")
+          return Promise.resolve({ protocolVersion: 1, tier: "full" });
+        return base(method, params);
+      }
+    );
+    await act(async () => {
+      await latestContext!.connectLive({
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      });
+    });
+    await act(async () => {
+      await latestContext!.unsubscribeSession();
+    });
+    expect(mocks.call).toHaveBeenCalledWith("session/unsubscribe", {
+      sessionId: "new",
+    });
+  });
+
+  it("combined opening owns canonical history, independent models, and a lease close", async () => {
+    const permission = deferred<unknown>();
+    const base = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation(
+      (method: string, params?: Record<string, unknown>) => {
+        if (method === "initialize")
+          return Promise.resolve({
+            protocolVersion: 1,
+            tier: "full",
+            capabilities: { sessionOpen: true, pendingInteractions: true },
+          });
+        if (method === "session/open")
+          return Promise.resolve({
+            sessionId:
+              params?.sessionId === "mirror" ? "owner" : params?.sessionId,
+            managed: params?.sessionId === "mirror",
+            subscriptionId: params?.subscriptionId,
+            rounds: { items: [], complete: true },
+            snapshot: {
+              sessionId:
+                params?.sessionId === "mirror" ? "owner" : params?.sessionId,
+              upserts: [],
+              snapshotDelta: false,
+              version: 1,
+            },
+          });
+        if (method === "interaction/pending" && params?.sessionId === "owner")
+          return permission.promise;
+        if (method === "session/config")
+          return Promise.resolve({
+            sessionId: params?.sessionId,
+            model: "current",
+            modelEditable: true,
+          });
+        return base(method, params);
+      }
+    );
+    await act(async () => {
+      await latestContext!.connectLive({
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      });
+    });
+    mocks.call.mockClear();
+    let opening!: Promise<void>;
+    await act(async () => {
+      opening = latestContext!.subscribeSession("mirror");
+    });
+    expect(latestContext!.openedSession).toEqual({
+      requested: "mirror",
+      sessionId: "owner",
+      managed: true,
+    });
+    expect(latestContext!.transcriptSessionId).toBe("owner");
+    expect(latestContext!.sessionModel.config?.model).toBe("current");
+    expect(mocks.call).toHaveBeenCalledWith("session/config", {
+      sessionId: "owner",
+    });
+    expect(
+      mocks.call.mock.calls.some(
+        ([method]) => method === "models/list" || method === "session/resolve"
+      )
+    ).toBe(false);
+    const lease = mocks.call.mock.calls.find(
+      ([method]) => method === "session/open"
+    )![1].subscriptionId;
+    await act(async () => {
+      permission.reject(new Error("permission timeout"));
+      await opening;
+    });
+    await act(async () => {
+      await latestContext!.unsubscribeSession();
+    });
+    expect(mocks.call).toHaveBeenCalledWith("session/unsubscribe", {
+      subscriptionId: lease,
+    });
+  });
+
+  it("restores the active transcript before a slow reconnect roster finishes", async () => {
+    const roster = deferred<unknown>();
+    const base = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation(
+      (method: string, params?: Record<string, unknown>) => {
+        if (method === "session/list") return roster.promise;
+        if (method === "session/subscribe") {
+          return Promise.resolve({
+            sessionId: params?.sessionId,
+            rounds: { items: [{ id: "recovered-round" }], complete: true },
+            snapshot: {
+              sessionId: params?.sessionId,
+              roundId: "recovered-round",
+              version: 2,
+              snapshotDelta: false,
+              upserts: [
+                {
+                  id: "recovered-reply",
+                  source: "assistant",
+                  displayVariant: "message",
+                  displayText: "Recovered before roster",
+                },
+              ],
+            },
+          });
+        }
+        return base(method, params);
+      }
+    );
+    let recovery!: Promise<boolean>;
+    await act(async () => {
+      recovery = latestContext!.retryConnection();
+      await Promise.resolve();
+    });
+    expect(latestContext!.transcriptPhase).toBe("ready");
+    expect(latestContext!.transcriptItems.at(-1)).toMatchObject({
+      text: "Recovered before roster",
+    });
+    await act(async () => {
+      roster.resolve({ sessions: [] });
+      await recovery;
+    });
+    expect(latestContext!.connection.presence).toBe("online");
+  });
+
+  it("renders a ready latest body while the full directory is still pending", async () => {
+    const directory = deferred<unknown>();
+    const base = mocks.call.getMockImplementation()!;
+    const preview = {
+      sessionId: "slow-history",
+      historyDeferred: true,
+      rounds: { items: [{ id: "recent" }], complete: false },
+      snapshot: {
+        sessionId: "slow-history",
+        roundId: "recent",
+        version: 1,
+        snapshotDelta: false,
+        upserts: [
+          {
+            id: "reply",
+            source: "assistant",
+            displayVariant: "message",
+            displayText: "Ready before directory",
+          },
+        ],
+      },
+    };
+    mocks.call.mockImplementation(
+      (method: string, params?: Record<string, unknown>) => {
+        if (
+          method === "session/subscribe" &&
+          params?.sessionId === "slow-history"
+        )
+          return Promise.resolve(preview);
+        if (method === "session/history") return directory.promise;
+        return base(method, params);
+      }
+    );
+    await act(async () => {
+      await latestContext!.subscribeSession("slow-history");
+    });
+    expect(latestContext!.transcriptPhase).toBe("ready");
+    expect(latestContext!.transcriptItems).toHaveLength(1);
+    expect(latestContext!.transcriptRoundsComplete).toBe(false);
+    await act(async () => {
+      directory.resolve({
+        ...preview,
+        historyDeferred: false,
+        rounds: { items: [{ id: "older" }, { id: "recent" }], complete: true },
+      });
+      await directory.promise;
+    });
+    expect(latestContext!.transcriptRoundsComplete).toBe(true);
+    expect(latestContext!.transcriptItems).toHaveLength(1);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.clearAllMocks();
+  });
+
+  afterAll(() => {
+    vi.unstubAllGlobals();
+    Reflect.deleteProperty(actEnvironment, "IS_REACT_ACT_ENVIRONMENT");
+  });
+
+  it("keeps the browser platform identity in the initialize wire shape", () => {
+    expect(mocks.call).toHaveBeenCalledWith("initialize", {
+      protocolVersion: 1,
+      clientInfo: { name: "orgii-mobile-pwa", version: "0.1.0" },
+      capabilities: { interactions: ["permission"], streaming: true },
+      deviceLabel: "ORG2 Mobile",
+    });
+  });
+  it("negotiates read-state sync and detaches it when the paired desktop goes offline", async () => {
+    const original = mocks.call.getMockImplementation()!;
+    let visited = false;
+    mocks.call.mockImplementation((method, params) => {
+      if (method === "initialize")
+        return Promise.resolve({
+          protocolVersion: 1,
+          tier: "read_only",
+          capabilities: { sessionReadState: true },
+        });
+      if (method === "session/read_state")
+        return Promise.resolve({ visitedIds: visited ? ["session-a"] : [] });
+      return original(method, params);
+    });
+    await act(async () =>
+      latestContext!.connectLive({
+        desktopId: "read-desktop",
+        wsUrl: "wss://read.example/ws",
+      })
+    );
+    await act(async () => latestContext!.readStateSync.watch(["session-a"]));
+    expect(latestContext!.readStateSync.getSnapshot().get("session-a")).toBe(
+      false
+    );
+    const providerValue = latestContext;
+    await act(async () => {
+      visited = true;
+      mocks.notificationHandler!("session/read_state_changed", {});
+    });
+    expect(latestContext!.readStateSync.getSnapshot().get("session-a")).toBe(
+      true
+    );
+    // Read updates are a list-only external-store subscription, not provider churn.
+    expect(latestContext).toBe(providerValue);
+    await act(async () =>
+      mocks.notificationHandler!("relay/presence", { online: false })
+    );
+    expect(latestContext!.readStateSync.getSnapshot().size).toBe(0);
+    const calls = mocks.call.mock.calls.length;
+    await act(async () =>
+      mocks.notificationHandler!("session/read_state_changed", {})
+    );
+    expect(mocks.call).toHaveBeenCalledTimes(calls);
+  });
+
+  it("clears navigation drafts on revoked close without discarding another desktop", async () => {
+    if (!latestContext || !latestDraftStore)
+      throw new Error("Provider did not supply draft owner");
+    const scope = mobileComposerDesktopScope(
+      latestContext.connectionConfig,
+      latestContext.connection
+    );
+    const draft = latestDraftStore.scope(JSON.stringify([scope, "session-a"]));
+    const other = latestDraftStore.scope(
+      JSON.stringify(["another desktop", "session-a"])
+    );
+    draft.update((value) => ({ ...value, text: "private draft" }));
+    other.update((value) => ({ ...value, text: "unrelated" }));
+    const token = draft.capture();
+    await act(async () =>
+      FakeWebSocket.instances
+        .at(-1)!
+        .dispatchEvent(new CloseEvent("close", { code: 1008 }))
+    );
+    expect(draft.getSnapshot().text).toBe("");
+    expect(other.getSnapshot().text).toBe("unrelated");
+    draft.updateIfCurrent(token, (value) => ({ ...value, text: "late reply" }));
+    expect(draft.getSnapshot().text).toBe("");
+  });
+
+  it("clears the owning draft store on teardown and rejects pending completions", async () => {
+    if (!latestDraftStore)
+      throw new Error("Provider did not supply draft owner");
+    const draft = latestDraftStore.scope("session-a");
+    draft.update((value) => ({ ...value, text: "private draft" }));
+    const token = draft.capture();
+    await act(async () => root.render(null));
+    expect(draft.getSnapshot().text).toBe("");
+    draft.updateIfCurrent(token, (value) => ({ ...value, text: "stale" }));
+    expect(draft.getSnapshot().text).toBe("");
+  });
+
+  it("replaces and clears draft owners when identity or endpoint changes without a parent key", async () => {
+    const platform = createBrowserMobileRemotePlatform();
+    const renderIdentity = (authUserId: string, relayUrl: string) =>
+      act(async () =>
+        root.render(
+          React.createElement(
+            TestMobileRemotePlatformProvider,
+            { platform },
+            React.createElement(
+              TestMobileRemoteProviders,
+              {
+                authUserId,
+                relayUrl,
+                demoByDefault: false,
+                suppressInitialBootstrap: true,
+              },
+              React.createElement(Probe)
+            )
+          )
+        )
+      );
+    await renderIdentity("user-a", "wss://one.example/ws");
+    if (!latestDraftStore) throw new Error("Missing draft owner");
+    const oldDraft = latestDraftStore.scope("session-a");
+    oldDraft.update((value) => ({ ...value, text: "first account" }));
+    await renderIdentity("user-b", "wss://one.example/ws");
+    expect(oldDraft.getSnapshot().text).toBe("");
+    const nextDraft = latestDraftStore.scope("session-a");
+    expect(nextDraft.getSnapshot().text).toBe("");
+    nextDraft.update((value) => ({ ...value, text: "second account" }));
+    await renderIdentity("user-b", "wss://two.example/ws");
+    expect(nextDraft.getSnapshot().text).toBe("");
+    expect(latestDraftStore.scope("session-a").getSnapshot().text).toBe("");
+  });
+
+  async function mountBootstrappingProvider(
+    load: ReturnType<
+      typeof createBrowserMobileRemotePlatform
+    >["connection"]["load"],
+    listPairedDesktops = vi.fn().mockResolvedValue([]),
+    save?: ReturnType<
+      typeof createBrowserMobileRemotePlatform
+    >["connection"]["save"]
+  ) {
+    act(() => root.unmount());
+    root = createRoot(container);
+    const browser = createBrowserMobileRemotePlatform();
+    await act(async () =>
+      root.render(
+        React.createElement(
+          TestMobileRemotePlatformProvider,
+          {
+            platform: {
+              ...browser,
+              connection: {
+                ...browser.connection,
+                load,
+                listPairedDesktops,
+                ...(save ? { save } : {}),
+              },
+            },
+          },
+          React.createElement(
+            TestMobileRemoteProviders,
+            { authUserId: "user-a", demoByDefault: false },
+            React.createElement(Probe)
+          )
+        )
+      )
+    );
+  }
+
+  it("retries the selected pairing once without clearing its stored credentials", async () => {
+    const config = {
+      wsUrl: "wss://retry.example/ws",
+      deviceToken: "paired-credential",
+    };
+    const save = vi.fn().mockResolvedValue(undefined);
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue(config),
+      undefined,
+      save
+    );
+    const previousCount = FakeWebSocket.instances.length;
+    let first!: Promise<boolean>;
+    await act(async () => {
+      first = latestContext!.retryConnection();
+      expect(latestContext!.retryConnection()).toBe(first);
+      await first;
+    });
+    expect(FakeWebSocket.instances).toHaveLength(previousCount + 1);
+    expect(latestContext!.connectionConfig).toMatchObject(config);
+    expect(save.mock.calls.every(([, value]) => value !== null)).toBe(true);
+    expect(latestContext!.connection.status).toBe("connected");
+  });
+
+  it("re-reads scoped storage after a bootstrap read failure", async () => {
+    const load = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("locked"))
+      .mockResolvedValue({ wsUrl: "wss://recovered.example/ws" });
+    await mountBootstrappingProvider(load);
+    expect(latestContext!.connection.status).toBe("error");
+    await act(async () => {
+      expect(await latestContext!.retryConnection()).toBe(true);
+    });
+    expect(load).toHaveBeenCalledTimes(2);
+    expect(load).toHaveBeenLastCalledWith("user-a");
+    expect(latestContext!.connection.status).toBe("connected");
+  });
+
+  it("ignores a recovered stored pairing after an explicit disconnect", async () => {
+    const restored = deferred<MobileConnectionConfig | null>();
+    const load = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("locked"))
+      .mockImplementationOnce(() => restored.promise);
+    await mountBootstrappingProvider(load);
+    let retry!: Promise<boolean>;
+    const socketCount = FakeWebSocket.instances.length;
+    await act(async () => {
+      retry = latestContext!.retryConnection();
+    });
+    await act(async () => latestContext!.disconnect());
+    await act(async () => {
+      restored.resolve({ wsUrl: "wss://stale.example/ws" });
+      await retry;
+    });
+    expect(latestContext!.connection.status).toBe("disconnected");
+    expect(latestContext!.connectionConfig).toBeNull();
+    expect(FakeWebSocket.instances).toHaveLength(socketCount);
+  });
+
+  it("retains rows and retries a failed presence recovery through the bounded reconnect owner", async () => {
+    vi.useFakeTimers();
+    try {
+      const original = mocks.call.getMockImplementation()!;
+      const row = { id: "retained", name: "Retained", status: "idle" };
+      const list = vi
+        .fn()
+        .mockResolvedValue({ sessions: [row], hasMore: false });
+      mocks.call.mockImplementation((method, params) =>
+        method === "session/list" ? list() : original(method, params)
+      );
+      await act(async () => latestContext!.refreshSessions());
+      list.mockRejectedValueOnce(new Error("Desktop warming up"));
+      const socketCount = FakeWebSocket.instances.length;
+      await act(async () =>
+        mocks.notificationHandler!("relay/presence", { online: false })
+      );
+      await act(async () =>
+        mocks.notificationHandler!("relay/presence", { online: true })
+      );
+      expect(latestContext!.sessions).toEqual([row]);
+      expect(latestContext!.connection.presence).toBe("offline");
+      expect(FakeWebSocket.instances).toHaveLength(socketCount);
+      await act(async () => vi.advanceTimersByTimeAsync(1500));
+      expect(FakeWebSocket.instances).toHaveLength(socketCount + 1);
+      expect(latestContext!.connection.presence).toBe("online");
+      expect(latestContext!.sessions).toEqual([row]);
+      const calls = list.mock.calls.length;
+      await act(async () => vi.advanceTimersByTimeAsync(60000));
+      expect(list).toHaveBeenCalledTimes(calls);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("ignores an old presence-recovery failure after switching desktops", async () => {
+    const original = mocks.call.getMockImplementation()!;
+    const oldRead = deferred<unknown>();
+    const list = vi
+      .fn()
+      .mockReturnValueOnce(oldRead.promise)
+      .mockResolvedValue({
+        sessions: [{ id: "new-desktop", name: "New", status: "idle" }],
+        hasMore: false,
+      });
+    mocks.call.mockImplementation((method, params) =>
+      method === "session/list" ? list() : original(method, params)
+    );
+    await act(async () =>
+      mocks.notificationHandler!("relay/presence", { online: false })
+    );
+    await act(async () =>
+      mocks.notificationHandler!("relay/presence", { online: true })
+    );
+    await act(async () =>
+      latestContext!.connectLive({ wsUrl: "wss://new.example/ws" })
+    );
+    const closes = mocks.close.mock.calls.length;
+    await act(async () => oldRead.reject(new Error("Old actor closed")));
+    expect(mocks.close).toHaveBeenCalledTimes(closes);
+    expect(latestContext!.connection.presence).toBe("online");
+    expect(latestContext!.sessions.map((row) => row.id)).toEqual([
+      "new-desktop",
+    ]);
+  });
+
+  it("reports a failed explicit connection reset instead of silently returning to welcome", async () => {
+    const save = vi
+      .fn()
+      .mockImplementation((_user, config) =>
+        config
+          ? Promise.resolve()
+          : Promise.reject(new Error("storage unavailable"))
+      );
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue({ wsUrl: "wss://retry.example/ws" }),
+      undefined,
+      save
+    );
+    await act(async () => {
+      await expect(latestContext!.disconnect()).rejects.toThrow(
+        "storage unavailable"
+      );
+    });
+    expect(latestContext!.connection.status).toBe("error");
+    expect(latestContext!.connection.error?.message).toBe(
+      "storage unavailable"
+    );
+  });
+
+  it("publishes initialized desktop metadata and persists it for reload without changing credentials", async () => {
+    const original = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation((method, params) =>
+      method === "initialize"
+        ? Promise.resolve({
+            protocolVersion: 1,
+            tier: "full",
+            desktopId: "different-process-id",
+            desktopIdentity: {
+              name: "Work Mac",
+              model: "Mac14,7",
+              username: "alex",
+            },
+          })
+        : original(method, params)
+    );
+    const config = {
+      desktopId: "stable-desktop",
+      wsUrl: "wss://metadata.example/ws",
+      deviceLabel: "My iPhone",
+      deviceToken: "secret",
+    };
+    await act(async () => latestContext!.connectLive(config));
+    expect(latestContext!.connection.desktopName).toBe("Work Mac");
+    expect(
+      latestContext!.pairedDesktops.find(
+        (desktop) => desktop.id === config.desktopId
+      )
+    ).toMatchObject({
+      name: "Work Mac",
+      desktopIdentity: { model: "Mac14,7", username: "alex" },
+    });
+    expect(loadScopedMobileConnectionConfig("user-a", localStorage)).toEqual({
+      ...config,
+      desktopIdentity: { name: "Work Mac", model: "Mac14,7", username: "alex" },
+    });
+  });
+
+  it("does not fail the connection when metadata persistence fails", async () => {
+    const original = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation((method, params) =>
+      method === "initialize"
+        ? Promise.resolve({
+            protocolVersion: 1,
+            desktopIdentity: { name: "Available Mac", username: "alex" },
+          })
+        : original(method, params)
+    );
+    const save = vi
+      .fn()
+      .mockResolvedValueOnce(undefined)
+      .mockRejectedValue(new Error("keychain unavailable"));
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue({ wsUrl: "wss://metadata-fail.example/ws" }),
+      vi.fn().mockResolvedValue([]),
+      save
+    );
+    expect(save).toHaveBeenCalledTimes(2);
+    expect(latestContext!.connection.status).toBe("connected");
+    expect(latestContext!.connection.desktopName).toBe("Available Mac");
+    expect(latestContext!.connectionConfig?.desktopIdentity?.username).toBe(
+      "alex"
+    );
+    expect(latestContext!.pairedDesktops[0]).toMatchObject({
+      name: "Available Mac",
+      desktopIdentity: { username: "alex" },
+    });
+  });
+
+  it("does not let a slow pre-initialize inventory erase the confirmed name", async () => {
+    const oldInventory = deferred<never[]>();
+    const original = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation((method, params) =>
+      method === "initialize"
+        ? Promise.resolve({
+            protocolVersion: 1,
+            desktopIdentity: { name: "Confirmed Mac" },
+          })
+        : original(method, params)
+    );
+    const inventory = vi
+      .fn()
+      .mockResolvedValueOnce([])
+      .mockImplementationOnce(() => oldInventory.promise)
+      .mockResolvedValue([
+        {
+          id: "confirmed",
+          name: "Confirmed Mac",
+          active: true,
+          updatedAtMs: 1,
+          desktopIdentity: { name: "Confirmed Mac" },
+        },
+      ]);
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue({
+        desktopId: "confirmed",
+        wsUrl: "wss://confirmed.example/ws",
+      }),
+      inventory
+    );
+    await act(async () => {
+      oldInventory.resolve([]);
+    });
+    expect(latestContext!.pairedDesktops[0].name).toBe("Confirmed Mac");
+  });
+
+  it("retries unchanged desktop metadata after a failed save on reconnect", async () => {
+    const original = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation((method, params) =>
+      method === "initialize"
+        ? Promise.resolve({
+            protocolVersion: 1,
+            desktopIdentity: { name: "Retry Mac" },
+          })
+        : original(method, params)
+    );
+    const save = vi
+      .fn()
+      .mockResolvedValueOnce(undefined)
+      .mockRejectedValueOnce(new Error("locked"))
+      .mockResolvedValue(undefined);
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue({ wsUrl: "wss://retry-metadata.example/ws" }),
+      vi.fn().mockResolvedValue([]),
+      save
+    );
+    expect(save).toHaveBeenCalledTimes(2);
+    const cached = latestContext!.connectionConfig!;
+    await act(async () => latestContext!.connectLive(cached));
+    expect(save).toHaveBeenCalledTimes(4);
+    expect(save.mock.calls[3][1]).toMatchObject({
+      desktopIdentity: { name: "Retry Mac" },
+    });
+    expect(latestContext!.connection.status).toBe("connected");
+  });
+
+  it("ignores an old desktop identity arriving after another computer was selected", async () => {
+    const old = deferred<unknown>();
+    const original = mocks.call.getMockImplementation()!;
+    let initializes = 0;
+    mocks.call.mockImplementation((method, params) =>
+      method === "initialize"
+        ? ++initializes === 1
+          ? old.promise
+          : Promise.resolve({
+              protocolVersion: 1,
+              desktopIdentity: { name: "New Mac" },
+            })
+        : original(method, params)
+    );
+    let first!: Promise<void>;
+    await act(async () => {
+      first = latestContext!
+        .connectLive({ desktopId: "old", wsUrl: "wss://old.example/ws" })
+        .catch(() => undefined);
+    });
+    await act(async () =>
+      latestContext!.connectLive({
+        desktopId: "new",
+        wsUrl: "wss://new.example/ws",
+      })
+    );
+    await act(async () => {
+      old.resolve({ protocolVersion: 1, desktopIdentity: { name: "Old Mac" } });
+      await first;
+    });
+    expect(latestContext!.connection.desktopName).toBe("New Mac");
+    expect(
+      loadScopedMobileConnectionConfig("user-a", localStorage)?.desktopIdentity
+        ?.name
+    ).toBe("New Mac");
+  });
+
+  it("finishes local bootstrap before a slow handshake or device inventory", async () => {
+    const handshake = deferred<{ protocolVersion: number; tier: string }>();
+    const inventory = deferred<never[]>();
+    const original = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation((method, params) =>
+      method === "initialize" ? handshake.promise : original(method, params)
+    );
+    const config = { wsUrl: "wss://restored.example.test/v1/mobile/ws" };
+    mocks.call.mockClear();
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue(config),
+      vi.fn(() => inventory.promise)
+    );
+    expect(latestContext?.bootstrapPending).toBe(false);
+    expect(latestContext?.connectionConfig).toEqual(config);
+    expect(latestContext?.connection.status).not.toBe("connected");
+    expect(mocks.call).toHaveBeenCalledWith("initialize", expect.any(Object));
+    await act(async () => {
+      handshake.resolve({ protocolVersion: 1, tier: "full" });
+    });
+    // Neither initial inventory nor the post-save inventory ever resolves.
+    expect(latestContext?.connection.status).toBe("connected");
+  });
+
+  it("keeps bootstrap pending only while stored configuration is loading", async () => {
+    const stored = deferred<null>();
+    await mountBootstrappingProvider(vi.fn(() => stored.promise));
+    expect(latestContext?.bootstrapPending).toBe(true);
+    expect(latestContext?.connectionConfig).toBeNull();
+    const socketCount = FakeWebSocket.instances.length;
+    await act(async () => stored.resolve(null));
+    expect(latestContext?.bootstrapPending).toBe(false);
+    expect(latestContext?.connectionConfig).toBeNull();
+    expect(FakeWebSocket.instances).toHaveLength(socketCount);
+  });
+
+  it("durably completes pairing at Relay approval even when Desktop is offline, then reloads without SAS", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      const original = mocks.call.getMockImplementation()!;
+      let online = false;
+      mocks.call.mockImplementation((method, params) =>
+        method === "initialize" && !online
+          ? Promise.reject(new Error("desktop is offline"))
+          : original(method, params)
+      );
+      const config: MobileConnectionConfig = {
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+        desktopId: "paired-restart-test",
+        deviceToken: "durable-device-credential",
+        deviceLabel: "My phone",
+        pairingCode: "ONE-TIME",
+      };
+      let result: Promise<unknown> | undefined;
+      await act(async () => {
+        result = latestContext?.connectLive(config).catch((error) => error);
+      });
+      expect(latestContext?.connectionConfig?.pairingCode).toBe("ONE-TIME");
+      await act(async () => {
+        mocks.notificationHandler?.("pairing/approved", {});
+        await result;
+      });
+      const restored = loadScopedMobileConnectionConfig("user-a", localStorage);
+      expect(restored).toEqual({
+        wsUrl: config.wsUrl,
+        desktopId: config.desktopId,
+        deviceToken: config.deviceToken,
+        deviceLabel: config.deviceLabel,
+      });
+      expect(latestContext?.connection.status).toBe("connecting");
+      expect(latestContext?.connection.presence).toBe("offline");
+
+      // A new app process uses the real stored credential, not the QR payload.
+      await mountBootstrappingProvider(() => Promise.resolve(restored));
+      expect(latestContext?.connection.status).toBe("connecting");
+      online = true;
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(1_500);
+      });
+      expect(latestContext?.connection.status).toBe("connected");
+      expect(latestContext?.connectionConfig?.pairingCode).toBeUndefined();
+      expect(latestContext?.connectionConfig?.deviceToken).toBe(
+        config.deviceToken
+      );
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("recovers a saved device when Desktop returns, with no repeated attempts while hidden", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    let hidden = false;
+    Object.defineProperty(document, "hidden", {
+      configurable: true,
+      get: () => hidden,
+    });
+    try {
+      const original = mocks.call.getMockImplementation()!;
+      let online = false;
+      mocks.call.mockImplementation((method, params) =>
+        method === "initialize" && !online
+          ? Promise.reject(new Error("desktop is offline"))
+          : original(method, params)
+      );
+      const config = {
+        wsUrl: "wss://restored.example.test/v1/mobile/ws",
+        deviceToken: "saved",
+      };
+      await mountBootstrappingProvider(vi.fn().mockResolvedValue(config));
+      expect(latestContext?.connection.status).toBe("connecting");
+      expect(latestContext?.connectionConfig).toEqual(config);
+      const initialCount = FakeWebSocket.instances.length;
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(1_500);
+      });
+      expect(FakeWebSocket.instances).toHaveLength(initialCount + 1);
+      hidden = true;
+      act(() => document.dispatchEvent(new Event("visibilitychange")));
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(60_000);
+      });
+      expect(FakeWebSocket.instances).toHaveLength(initialCount + 1);
+      online = true;
+      hidden = false;
+      await act(async () => {
+        document.dispatchEvent(new Event("visibilitychange"));
+        document.dispatchEvent(new Event("visibilitychange"));
+      });
+      expect(FakeWebSocket.instances).toHaveLength(initialCount + 2);
+      expect(latestContext?.connection.status).toBe("connected");
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(60_000);
+      });
+      expect(FakeWebSocket.instances).toHaveLength(initialCount + 2);
+    } finally {
+      Reflect.deleteProperty(document, "hidden");
+      vi.useRealTimers();
+    }
+  });
+
+  it("cancels an offline device retry without deleting the paired inventory", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      const config = {
+        wsUrl: "wss://retry.example.test/v1/mobile/ws",
+        desktopId: "cancel-retry",
+        deviceToken: "saved",
+      };
+      mocks.call.mockRejectedValue(new Error("desktop is offline"));
+      await mountBootstrappingProvider(vi.fn().mockResolvedValue(config));
+      const count = FakeWebSocket.instances.length;
+      await act(async () => {
+        await latestContext?.disconnect();
+      });
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(60_000);
+      });
+      expect(FakeWebSocket.instances).toHaveLength(count);
+      expect(latestContext?.connection.status).toBe("disconnected");
+      expect(
+        await createBrowserMobileRemotePlatform().connection.listPairedDesktops(
+          "user-a"
+        )
+      ).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: "cancel-retry", active: false }),
+        ])
+      );
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("does not confirm or automatically retry an expired first pairing", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      const config = {
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+        pairingCode: "EXPIRED",
+        deviceToken: "pending",
+      };
+      let result: Promise<unknown> | undefined;
+      await act(async () => {
+        result = latestContext?.connectLive(config).catch((error) => error);
+      });
+      const count = FakeWebSocket.instances.length;
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(130_001);
+      });
+      expect(await result).toBeInstanceOf(Error);
+      expect(latestContext?.connection.status).toBe("error");
+      expect(
+        loadScopedMobileConnectionConfig("user-a", localStorage)?.pairingCode
+      ).toBe("EXPIRED");
+      await act(async () => {
+        document.dispatchEvent(new Event("visibilitychange"));
+        await vi.advanceTimersByTimeAsync(60_000);
+      });
+      expect(FakeWebSocket.instances).toHaveLength(count);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("does not retry authorization denied before initialize completes", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      if (!latestContext || !latestDraftStore)
+        throw new Error("Missing draft owner");
+      const config = { wsUrl: "wss://relay.example.test/v1/mobile/ws" };
+      const draft = latestDraftStore.scope(
+        JSON.stringify([mobileComposerDesktopScope(config, {}), "session-a"])
+      );
+      draft.update((value) => ({ ...value, text: "draft before reconnect" }));
+      const handshake = deferred<never>();
+      mocks.call.mockImplementation(() => handshake.promise);
+      let result: Promise<unknown> | undefined;
+      await act(async () => {
+        result = latestContext
+          ?.connectLive({ wsUrl: "wss://relay.example.test/v1/mobile/ws" })
+          .catch((error) => error);
+      });
+      const socket = FakeWebSocket.instances.at(-1)!;
+      const count = FakeWebSocket.instances.length;
+      await act(async () => {
+        socket.readyState = FakeWebSocket.CLOSED;
+        socket.dispatchEvent(new CloseEvent("close", { code: 1008 }));
+        handshake.reject(new Error("WebSocket closed"));
+        await result;
+      });
+      expect(latestContext?.connection.status).toBe("error");
+      expect(draft.getSnapshot().text).toBe("");
+      await act(async () => {
+        document.dispatchEvent(new Event("visibilitychange"));
+        await vi.advanceTimersByTimeAsync(60_000);
+      });
+      expect(FakeWebSocket.instances).toHaveLength(count);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it.each(["ticket-denied", "initialize-denied", "network-error"])(
+    "handles %s at the draft authority boundary",
+    async (failure) => {
+      const browser = createBrowserMobileRemotePlatform();
+      const config = {
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+        desktopId: "desktop-one",
+      };
+      const error =
+        failure === "network-error"
+          ? new Error("network unavailable")
+          : new MobileConnectionAuthorizationError("Pairing revoked");
+      const originalCall = mocks.call.getMockImplementation()!;
+      mocks.call.mockImplementation((method, params) =>
+        failure === "initialize-denied" && method === "initialize"
+          ? Promise.reject(error)
+          : originalCall(method, params)
+      );
+      const platform = {
+        ...browser,
+        connection: {
+          ...browser.connection,
+          prepareSocketUrl: async () => {
+            if (failure !== "initialize-denied") throw error;
+            return config.wsUrl;
+          },
+        },
+      };
+      await act(async () =>
+        root.render(
+          React.createElement(
+            TestMobileRemotePlatformProvider,
+            { platform },
+            React.createElement(
+              TestMobileRemoteProviders,
+              {
+                authUserId: "user-a",
+                demoByDefault: false,
+                suppressInitialBootstrap: true,
+              },
+              React.createElement(Probe)
+            )
+          )
+        )
+      );
+      if (!latestDraftStore || !latestContext)
+        throw new Error("Missing draft owner");
+      const draft = latestDraftStore.scope(
+        JSON.stringify([mobileComposerDesktopScope(config, {}), "session-a"])
+      );
+      draft.update((value) => ({ ...value, text: "keep only if transient" }));
+      await act(async () => {
+        await latestContext!.connectLive(config).catch(() => undefined);
+      });
+      expect(draft.getSnapshot().text).toBe(
+        failure === "network-error" ? "keep only if transient" : ""
+      );
+    }
+  );
+
+  it("releases bootstrap and reports a failed configuration read", async () => {
+    const stored = deferred<null>();
+    await mountBootstrappingProvider(vi.fn(() => stored.promise));
+    expect(latestContext?.bootstrapPending).toBe(true);
+    await act(async () =>
+      stored.reject(new Error("secure storage unavailable"))
+    );
+    expect(latestContext?.bootstrapPending).toBe(false);
+    expect(latestContext?.connectionConfig).toBeNull();
+    expect(latestContext?.connection.status).toBe("error");
+  });
+
+  it("retries a failed approval save after Desktop recovers without requiring metadata", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      const browser = createBrowserMobileRemotePlatform();
+      const save = vi.fn(browser.connection.save);
+      save
+        .mockImplementationOnce(browser.connection.save)
+        .mockRejectedValueOnce(
+          new Error("secure storage temporarily unavailable")
+        );
+      const original = mocks.call.getMockImplementation()!;
+      let online = false;
+      mocks.call.mockImplementation((method, params) =>
+        method === "initialize" && !online
+          ? Promise.reject(new Error("desktop is offline"))
+          : original(method, params)
+      );
+      const config = {
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+        desktopId: "approval-save-retry",
+        deviceToken: "saved",
+        pairingCode: "once",
+      };
+      await mountBootstrappingProvider(
+        vi.fn().mockResolvedValue(config),
+        undefined,
+        save
+      );
+      await act(async () => {
+        mocks.notificationHandler?.("pairing/approved", {});
+      });
+      expect(save).toHaveBeenCalledTimes(2);
+      expect(
+        loadScopedMobileConnectionConfig("user-a", localStorage)?.pairingCode
+      ).toBe("once");
+      online = true;
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(1_500);
+      });
+      expect(latestContext?.connection.status).toBe("connected");
+      expect(save).toHaveBeenCalledTimes(3);
+      expect(
+        loadScopedMobileConnectionConfig("user-a", localStorage)?.pairingCode
+      ).toBeUndefined();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("does not persist a late approval after the user disconnects", async () => {
+    let connecting: Promise<unknown> | undefined;
+    await act(async () => {
+      connecting = latestContext
+        ?.connectLive({
+          wsUrl: "wss://relay.example.test/v1/mobile/ws",
+          pairingCode: "once",
+          deviceToken: "pending",
+        })
+        .catch((error) => error);
+    });
+    await act(async () => {
+      mocks.notificationHandler?.("pairing/approved", {});
+      await latestContext?.disconnect();
+      await connecting;
+    });
+    expect(latestContext?.connection.status).toBe("disconnected");
+    expect(latestContext?.connectionConfig).toBeNull();
+    expect(loadScopedMobileConnectionConfig("user-a", localStorage)).toBeNull();
+  });
+
+  it("ignores a hidden attempt's late initialize after a visible recovery succeeds", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    let hidden = false;
+    Object.defineProperty(document, "hidden", {
+      configurable: true,
+      get: () => hidden,
+    });
+    try {
+      const handshake = deferred<{ protocolVersion: number }>();
+      mocks.call.mockImplementationOnce(() => handshake.promise);
+      let connecting: Promise<unknown> | undefined;
+      await act(async () => {
+        connecting = latestContext
+          ?.connectLive({ wsUrl: "wss://relay.example.test/v1/mobile/ws" })
+          .catch((error) => error);
+      });
+      hidden = true;
+      act(() => document.dispatchEvent(new Event("visibilitychange")));
+      hidden = false;
+      await act(async () => {
+        document.dispatchEvent(new Event("visibilitychange"));
+      });
+      expect(latestContext?.connection.status).toBe("connected");
+      const count = FakeWebSocket.instances.length;
+      await act(async () => {
+        handshake.resolve({ protocolVersion: 1 });
+        await connecting;
+        await vi.advanceTimersByTimeAsync(60_000);
+      });
+      expect(latestContext?.connection.status).toBe("connected");
+      expect(latestContext?.connection.presence).toBe("online");
+      expect(FakeWebSocket.instances).toHaveLength(count);
+    } finally {
+      Reflect.deleteProperty(document, "hidden");
+      vi.useRealTimers();
+    }
+  });
 
-  beforeAll(() => {
-    actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
-    vi.stubGlobal("WebSocket", FakeWebSocket);
+  it("reports a saved-device persistence failure instead of staying connecting", async () => {
+    const config = { wsUrl: "wss://restored.example.test/v1/mobile/ws" };
+    const save = vi
+      .fn()
+      .mockRejectedValue(new Error("secure storage write failed"));
+    mocks.call.mockClear();
+    await mountBootstrappingProvider(
+      vi.fn().mockResolvedValue(config),
+      undefined,
+      save
+    );
+    expect(save).toHaveBeenCalled();
+    expect(latestContext?.bootstrapPending).toBe(false);
+    expect(latestContext?.connection.status).toBe("error");
+    expect(mocks.call).not.toHaveBeenCalledWith(
+      "initialize",
+      expect.any(Object)
+    );
   });
 
-  beforeEach(async () => {
-    latestContext = null;
-    sendResult = deferred<{ execution: string }>();
-    mocks.sendParams = null;
-    mocks.externalRoundId = null;
-    mocks.notificationHandler = null;
-    mocks.close.mockReset();
-    FakeWebSocket.instances = [];
-    FakeWebSocket.deferCloseEvents = false;
-    FakeWebSocket.pendingCloseEvents = [];
-    mocks.call
-      .mockReset()
-      .mockImplementation(
-        (method: string, params?: Record<string, unknown>) => {
-          if (method === "initialize") {
-            return Promise.resolve({ protocolVersion: 1, tier: "full" });
-          }
-          if (method === "session/list") {
-            return Promise.resolve({ sessions: [] });
-          }
-          if (method === "session/subscribe") {
-            const externalRound = mocks.externalRoundId
-              ? [
-                  {
-                    id: mocks.externalRoundId,
-                    userPreview: "external turn",
-                  },
-                ]
-              : [];
-            return Promise.resolve({
-              sessionId: params?.sessionId,
-              rounds: {
-                items: [
-                  { id: "round-1", userPreview: "First" },
-                  { id: "round-2", userPreview: "Second" },
-                  { id: "round-3", userPreview: "Latest" },
-                  ...externalRound,
-                ],
-                complete: true,
-              },
-              snapshot: {
-                sessionId: params?.sessionId,
-                roundId: mocks.externalRoundId ?? "round-3",
-                version: 1,
-                snapshotDelta: false,
-                upserts: [],
-              },
-            });
-          }
-          if (method === "session/round") {
-            const roundId = String(params?.roundId);
-            return Promise.resolve({
-              sessionId: params?.sessionId,
-              roundId,
-              snapshot: {
-                sessionId: params?.sessionId,
-                roundId,
-                version: 1,
-                snapshotDelta: false,
-                upserts: [
-                  {
-                    id: `agent-${roundId}`,
-                    source: "assistant",
-                    displayVariant: "message",
-                    displayText: `History ${roundId}`,
-                  },
-                ],
-              },
-            });
-          }
-          if (method === "session/send") {
-            mocks.sendParams = params ?? null;
-            return sendResult.promise;
-          }
-          return Promise.resolve({});
-        }
-      );
+  it("observes revocation while the initial roster is still loading", async () => {
+    const roster = deferred<{ sessions: never[] }>();
+    const original = mocks.call.getMockImplementation()!;
+    mocks.call.mockImplementation((method, params) =>
+      method === "session/list" ? roster.promise : original(method, params)
+    );
+    let connecting: Promise<void> | undefined;
+    await act(async () => {
+      connecting = latestContext?.connectLive({
+        wsUrl: "wss://relay.example.test/v1/mobile/ws",
+      });
+    });
+    const socket = FakeWebSocket.instances.at(-1)!;
+    await act(async () => {
+      socket.readyState = FakeWebSocket.CLOSED;
+      socket.dispatchEvent(new CloseEvent("close", { code: 1008 }));
+    });
+    expect(latestContext?.connection.status).toBe("error");
+    await act(async () => {
+      roster.resolve({ sessions: [] });
+      await connecting;
+    });
+    expect(latestContext?.connection.status).toBe("error");
+  });
 
-    container = document.createElement("div");
-    document.body.appendChild(container);
+  it("keeps the newest desktop choice when configuration reads finish out of order", async () => {
+    act(() => root.unmount());
     root = createRoot(container);
-    await act(async () => {
+    const first = deferred<{ wsUrl: string }>();
+    const browser = createBrowserMobileRemotePlatform();
+    const platform = {
+      ...browser,
+      connection: {
+        ...browser.connection,
+        selectPairedDesktop: vi.fn((_user: string, desktop: string) =>
+          desktop === "a"
+            ? first.promise
+            : Promise.resolve({ wsUrl: "wss://b.example/v1/mobile/ws" })
+        ),
+      },
+    };
+    await act(async () =>
       root.render(
         React.createElement(
           TestMobileRemotePlatformProvider,
-          { platform: createBrowserMobileRemotePlatform() },
+          { platform },
           React.createElement(
             TestMobileRemoteProviders,
             {
@@ -235,36 +1520,108 @@ describe("MobileRemoteProviders send lifecycle", () => {
             React.createElement(Probe)
           )
         )
-      );
-    });
+      )
+    );
+    let a!: Promise<void>;
     await act(async () => {
-      await latestContext?.connectLive({
-        wsUrl: "wss://relay.example.test/v1/mobile/ws",
-      });
+      a = latestContext!.switchPairedDesktop("a");
     });
+    await act(async () => latestContext!.switchPairedDesktop("b"));
+    const socketCount = FakeWebSocket.instances.length;
     await act(async () => {
-      await latestContext?.subscribeSession("session-a");
+      first.resolve({ wsUrl: "wss://a.example/v1/mobile/ws" });
+      await a;
     });
+    expect(latestContext!.connectionConfig?.wsUrl).toBe(
+      "wss://b.example/v1/mobile/ws"
+    );
+    expect(FakeWebSocket.instances).toHaveLength(socketCount);
   });
 
-  afterEach(() => {
-    act(() => root.unmount());
-    container.remove();
-    vi.clearAllMocks();
-  });
-
-  afterAll(() => {
-    vi.unstubAllGlobals();
-    Reflect.deleteProperty(actEnvironment, "IS_REACT_ACT_ENVIRONMENT");
+  it("loads additional workspace rows, preserves the loaded window on refresh and retains it on failure", async () => {
+    mocks.call.mockImplementation((method, params) => {
+      if (method !== "session/list") return Promise.resolve({});
+      const offset = Number(params?.offset ?? 0);
+      return Promise.resolve({
+        sessions: [
+          {
+            id: `row-${offset}`,
+            name: "Row",
+            status: "idle",
+            repoPath: `/workspace/${offset}`,
+            updatedAtMs: offset,
+          },
+        ],
+        nextOffset: offset + 50,
+        hasMore: offset === 0,
+      });
+    });
+    await act(async () => {
+      await latestContext!.refreshSessions();
+    });
+    expect(latestContext!.sessionsHasMore).toBe(true);
+    await act(async () => {
+      await latestContext!.loadMoreSessions();
+    });
+    expect(latestContext!.sessions.map((row) => row.repoPath)).toEqual([
+      "/workspace/0",
+      "/workspace/50",
+    ]);
+    await act(async () => {
+      await latestContext!.refreshSessions();
+    });
+    expect(latestContext!.sessions).toHaveLength(2);
+    mocks.call.mockRejectedValueOnce(new Error("offline"));
+    await act(async () => {
+      await expect(latestContext!.refreshSessions()).rejects.toThrow("offline");
+    });
+    expect(latestContext!.sessions).toHaveLength(2);
   });
 
-  it("keeps the browser platform identity in the initialize wire shape", () => {
-    expect(mocks.call).toHaveBeenCalledWith("initialize", {
-      protocolVersion: 1,
-      clientInfo: { name: "orgii-mobile-pwa", version: "0.1.0" },
-      capabilities: { interactions: ["permission"], streaming: true },
-      deviceLabel: "ORG2 Mobile",
+  it("replaces fallback rows with canonical desktop snapshots and coalesces list-change bursts", async () => {
+    const canonical = {
+      id: "desktop-current",
+      name: "Canonical desktop title",
+      status: "running",
+      repoName: "Project",
+      repoPath: "/project",
+      updatedAtMs: 123,
+      display: { cliAgentType: "codex" },
+    };
+    const stale = deferred<{ sessions: (typeof canonical)[] }>();
+    const fresh = deferred<{ sessions: (typeof canonical)[] }>();
+    const original = mocks.call.getMockImplementation()!;
+    const list = vi
+      .fn()
+      .mockReturnValueOnce(stale.promise)
+      .mockReturnValueOnce(fresh.promise)
+      .mockResolvedValue({ sessions: [], hasMore: false });
+    mocks.call.mockImplementation((method, params) =>
+      method === "session/list" ? list() : original(method, params)
+    );
+    const previous = latestContext!.sessions;
+    await act(async () => {
+      for (let i = 0; i < 20; i++) {
+        mocks.notificationHandler!("session/list_changed", {});
+      }
+    });
+    expect(list).toHaveBeenCalledTimes(1);
+    expect(latestContext!.sessions).toEqual(previous);
+    await act(async () => {
+      stale.resolve({ sessions: [{ ...canonical, name: "Stale title" }] });
+    });
+    expect(list).toHaveBeenCalledTimes(2);
+    expect(latestContext!.sessions).toEqual(previous);
+    await act(async () => {
+      fresh.resolve({ sessions: [canonical] });
+    });
+    expect(latestContext!.sessions).toEqual([canonical]);
+    expect(latestContext!.sessionsHasMore).toBe(false);
+    await act(async () => {
+      mocks.notificationHandler!("session/list_changed", {});
     });
+    expect(latestContext!.sessions).toEqual([]);
+    expect(list).toHaveBeenCalledTimes(3);
   });
 
   it("observes revocation while the initial roster is still loading", async () => {
@@ -714,14 +2071,47 @@ describe("MobileRemoteProviders send lifecycle", () => {
     });
   });
 
-  it("keeps session lifecycle callbacks stable across presence changes", () => {
+  it("reloads the roster once when Desktop returns on the surviving relay socket", async () => {
+    const original = mocks.call.getMockImplementation()!;
+    const list = vi.fn().mockResolvedValue({
+      sessions: [
+        { id: "after-desktop-restart", name: "Recovered", status: "idle" },
+      ],
+      hasMore: false,
+    });
+    mocks.call.mockImplementation((method, params) =>
+      method === "session/list" ? list() : original(method, params)
+    );
+    const socketCount = FakeWebSocket.instances.length;
+    const notify = mocks.notificationHandler!;
+    const subscriptions = mocks.call.mock.calls.filter(
+      ([method]) => method === "session/subscribe"
+    ).length;
+    await act(async () => notify("relay/presence", { online: false }));
+    expect(list).not.toHaveBeenCalled();
+    await act(async () => {
+      notify("relay/presence", { online: true });
+      notify("relay/presence", { online: true });
+    });
+    expect(list).toHaveBeenCalledTimes(1);
+    expect(latestContext!.sessions.map((row) => row.id)).toEqual([
+      "after-desktop-restart",
+    ]);
+    expect(FakeWebSocket.instances).toHaveLength(socketCount);
+    expect(
+      mocks.call.mock.calls.filter(([method]) => method === "session/subscribe")
+    ).toHaveLength(subscriptions + 1);
+    expect(mocks.sendParams).toBeNull();
+  });
+
+  it("keeps session lifecycle callbacks stable across presence changes", async () => {
     const initialSubscribe = latestContext?.subscribeSession;
     const initialUnsubscribe = latestContext?.unsubscribeSession;
 
-    act(() => {
+    await act(async () => {
       mocks.notificationHandler?.("relay/presence", { online: false });
     });
-    act(() => {
+    await act(async () => {
       mocks.notificationHandler?.("relay/presence", { online: true });
     });
 
@@ -904,8 +2294,9 @@ describe("MobileRemoteProviders send lifecycle", () => {
       (latestContext as MobileRemoteContextValue | null)?.connectionConfig
     ).toEqual(explicitConfig);
     expect(FakeWebSocket.instances).toHaveLength(1);
-    expect(save).toHaveBeenCalledTimes(1);
-    expect(save).toHaveBeenCalledWith("user-a", explicitConfig);
+    expect(save).toHaveBeenCalledTimes(2);
+    expect(save).toHaveBeenNthCalledWith(1, "user-a", explicitConfig);
+    expect(save).toHaveBeenNthCalledWith(2, "user-a", explicitConfig);
   });
 
   it("serializes connection persistence so the latest disconnect wins", async () => {
@@ -1500,11 +2891,12 @@ describe("MobileRemoteProviders send lifecycle", () => {
       });
       await act(async () => {
         respondResult.reject(new Error("Relay rejected the answer"));
-        await expect(pending).rejects.toThrow("Relay rejected the answer");
+        await expect(pending).resolves.toBeUndefined();
       });
 
       expect(latestContext?.permissionSubmitting).toBe(false);
       expect(latestContext?.activePermission?.requestId).toBe("hookperm-retry");
+      expect(latestContext?.permissionFailed).toBe(true);
     });
 
     it("hides a prompt raised for another session and dismisses a stale head", () => {
diff --git a/src/modules/MobileRemote/app/MobileRemoteProviders.tsx b/src/modules/MobileRemote/app/MobileRemoteProviders.tsx
index 3013e8e14a..96e5b3c585 100644
--- a/src/modules/MobileRemote/app/MobileRemoteProviders.tsx
+++ b/src/modules/MobileRemote/app/MobileRemoteProviders.tsx
@@ -1,51 +1,33 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 
-import { MobileAuthContext } from "../auth/MobileAuthContext";
-import type { MobileRpcClient } from "../connection/mobileRpcClient";
-import { createRemoteReconnectController } from "../connection/remoteReconnectController";
-import type {
-  MobileConnectionConfig,
-  MobileConnectionState,
-  MobilePairedDesktopSummary,
-} from "../connection/types";
-import { DEMO_PERMISSION_REQUEST } from "../demo/demoFixtures";
-import { useMobileRemotePlatform } from "../platform";
+import { createLogger } from "@src/hooks/logger";
+
+import { MobileComposerDraftContext } from "../components/composer/MobileComposerDraftContext";
+import { mobileComposerDesktopScope } from "../components/composer/mobileComposerDraftStore";
+import { toMobileRpcError } from "../connection/mobileRpcClient";
+import { MobileConnectionAuthorizationError } from "../connection/types";
+import type { MobileConnectionConfig } from "../connection/types";
+import { DEMO_DESKTOP_NAME, DEMO_SESSIONS } from "../demo/demoFixtures";
 import {
   MobileRemoteContext,
   type MobileRemoteContextValue,
+  type MobileRemoteProvidersProps,
 } from "./MobileRemoteContext";
-import { useMobileConnectionActions } from "./useMobileConnectionActions";
-import { useMobileConnectionEstablish } from "./useMobileConnectionEstablish";
-import { useMobileConnectionRefs } from "./useMobileConnectionRefs";
-import { useMobileConnectionTransport } from "./useMobileConnectionTransport";
-import { useMobilePermissions } from "./useMobilePermissions";
+import {
+  SupersededConnectionError,
+  useMobileConnectionEstablish,
+} from "./useMobileConnectionEstablish";
+import { useMobileRemoteState } from "./useMobileRemoteState";
 import { useMobileRpcNotifications } from "./useMobileRpcNotifications";
-import { useMobileSend } from "./useMobileSend";
 import { useMobileSessionActions } from "./useMobileSessionActions";
-import { useMobileSessionList } from "./useMobileSessionList";
-import { useMobileSessionModel } from "./useMobileSessionModel";
-import { useMobileTranscript } from "./useMobileTranscript";
 
-export type { MobileRemoteContextValue } from "./MobileRemoteContext";
 export { useMobileRemote } from "./MobileRemoteContext";
-export type { MobileSendStatus } from "./useMobileSend";
+export type {
+  MobileRemoteContextValue,
+  MobileRemoteProvidersProps,
+} from "./MobileRemoteContext";
 
-export interface MobileRemoteProvidersProps {
-  children: React.ReactNode;
-  /** Authenticated ORG2 Cloud subject; scopes all retained pairing state. */
-  authUserId: string;
-  relayUrl?: string;
-  demoByDefault?: boolean;
-  /** A freshly scanned QR must take precedence over a stored old desktop. */
-  suppressInitialBootstrap?: boolean;
-}
+export type { MobileSendStatus } from "./useMobileSend";
 
 export function MobileRemoteProviders({
   children,
@@ -54,189 +36,419 @@ export function MobileRemoteProviders({
   demoByDefault = true,
   suppressInitialBootstrap = false,
 }: MobileRemoteProvidersProps) {
-  const platform = useMobileRemotePlatform();
-  const auth = useContext(MobileAuthContext);
-  const authRef = useRef(auth);
-  authRef.current = auth;
-  const refs = useMobileConnectionRefs();
+  const state = useMobileRemoteState({
+    authUserId,
+    relayUrl,
+    demoByDefault,
+    suppressInitialBootstrap,
+  });
   const {
+    platform,
+    draftStore,
+    preparationRef,
     clientRef,
+    rpc,
+    setRpc,
+    socketRef,
     activeSessionRef,
+    unsubscribeRpcRef,
+    activeConfigRef,
     generationRef,
     selectionIntentRef,
+    retryFlightRef,
     recoverRef,
+    reconnect,
+    connectionWriteChainRef,
+    inventoryRevisionRef,
     scheduleReconnectRef,
-  } = refs;
-  const reconnect = useMemo(
-    () =>
-      createRemoteReconnectController(
-        platform.runtime,
-        (generation) => generation === generationRef.current,
-        (config, generation) => recoverRef.current(config, generation)
-      ),
-    [platform.runtime, generationRef, recoverRef]
-  );
-
-  const [connection, setConnection] = useState<MobileConnectionState>({
-    status: "disconnected",
-    presence: "unknown",
-    demoMode: demoByDefault && !suppressInitialBootstrap,
-  });
-  const [connectionConfig, setConnectionConfig] =
-    useState<MobileConnectionConfig | null>(null);
-  const [pairedDesktops, setPairedDesktops] = useState<
-    MobilePairedDesktopSummary[]
-  >([]);
-  const connectionRef = useRef(connection);
-  connectionRef.current = connection;
-  const { sessions, sessionsHasMore, requestSessionList, resetSessions } =
-    useMobileSessionList(clientRef);
-  const {
+    connection,
+    setConnection,
+    connectionConfig,
+    setConnectionConfig,
+    bootstrapPending,
+    setBootstrapPending,
+    pairedDesktops,
+    setPairedDesktops,
+    readStateSync,
+    sessions,
+    sessionsHasMore,
+    resetSessions,
+    openingClient,
+    openedSession,
     transcript,
-    setTranscript,
     transcriptView,
-    beginLoad,
     resetTranscript,
     showDemoTranscript,
-    failLoad,
     invalidateTranscriptRequests,
-    requestSessionSnapshot,
-    refreshSubscribedSession,
-    receiveSnapshot,
     selectRound,
     retrySelectedRound,
-  } = useMobileTranscript({
-    clientRef,
-    connectionRef,
-    activeSessionRef,
-    connection,
-  });
-  const requireWritableClient = useCallback((): MobileRpcClient => {
-    const client = clientRef.current;
-    if (
-      !client ||
-      connection.status !== "connected" ||
-      connection.presence !== "online"
-    ) {
-      throw new Error("Desktop is offline");
-    }
-    if (connection.tier === "read_only") {
-      throw new Error("This device has read-only access");
-    }
-    return client;
-  }, [connection.presence, connection.status, connection.tier, clientRef]);
-
-  const {
     activePermission,
+    focusPermission,
     permissionQueueDepth,
     permissionSubmitting,
+    permissionFailed,
     respondPermission,
     dismissPermissionHead,
     resetPermissions,
-    receivePermissionEvent,
-  } = useMobilePermissions({
-    sessionId: transcript.sessionId,
-    demoMode: connection.demoMode,
-    requireWritableClient,
-  });
-
-  const {
+    pendingInbox,
     sessionModel,
     refreshSessionModel,
+    loadSessionModels,
     setSessionModel,
-    resetSessionModel,
-  } = useMobileSessionModel({
-    clientRef,
-    connectionRef,
-    activeSessionRef,
-    requireWritableClient,
-  });
-
-  const onDemoSend = useCallback(
-    (sessionId: string) =>
-      resetPermissions([{ ...DEMO_PERMISSION_REQUEST, sessionId }]),
-    [resetPermissions]
-  );
-  const {
     sendStatus,
     resetSend,
-    receiveTerminal,
-    receiveSendStatus,
     sendMessage,
-  } = useMobileSend({
-    demoMode: connection.demoMode,
-    runtime: platform.runtime,
-    model: sessionModel.config?.model,
-    requireWritableClient,
-    setTranscript,
-    onDemoSend,
-  });
+  } = state;
+  const persistConnection = useCallback(
+    (config: MobileConnectionConfig | null) => {
+      const generation = generationRef.current;
+      const inventoryRevision = ++inventoryRevisionRef.current;
+      const operation = connectionWriteChainRef.current.then(async () => {
+        if (generation !== generationRef.current) return;
+        await platform.connection.save(authUserId, config);
+        void platform.connection
+          .listPairedDesktops(authUserId)
+          .then((inventory) => {
+            if (
+              generation === generationRef.current &&
+              inventoryRevision === inventoryRevisionRef.current
+            )
+              setPairedDesktops(inventory);
+          })
+          .catch(() => undefined);
+      });
+      connectionWriteChainRef.current = operation.catch(() => undefined);
+      return operation;
+    },
+    [
+      authUserId,
+      connectionWriteChainRef,
+      generationRef,
+      inventoryRevisionRef,
+      platform.connection,
+      setPairedDesktops,
+    ]
+  );
 
-  const handleRpcNotification = useMobileRpcNotifications({
-    refs,
-    setConnection,
-    requestSessionList,
-    receivePermissionEvent,
-    receiveTerminal,
-    receiveSendStatus,
-    receiveSnapshot,
-    refreshSubscribedSession,
-  });
+  const clearReconnectTimer = useCallback(() => reconnect.clear(), [reconnect]);
 
-  const {
-    persistConnection,
+  const releaseTransport = useCallback(
+    (close: boolean) => {
+      reconnect.invalidate();
+      preparationRef.current?.abort();
+      preparationRef.current = null;
+      // Invalidate every in-flight subscribe/refresh from the old socket before
+      // it can reject or resolve into the retained logical session state.
+      invalidateTranscriptRequests();
+      unsubscribeRpcRef.current?.();
+      unsubscribeRpcRef.current = null;
+      const client = clientRef.current;
+      clientRef.current = null;
+      setRpc(null);
+      const socket = socketRef.current;
+      socketRef.current = null;
+      if (close) {
+        if (client) client.close();
+        else socket?.close();
+      }
+    },
+    [
+      reconnect,
+      preparationRef,
+      invalidateTranscriptRequests,
+      unsubscribeRpcRef,
+      clientRef,
+      setRpc,
+      socketRef,
+    ]
+  );
+
+  const enterDemoMode = useCallback(() => {
+    selectionIntentRef.current += 1;
+    generationRef.current += 1;
+    clearReconnectTimer();
+    activeConfigRef.current = null;
+    setConnectionConfig(null);
+    releaseTransport(true);
+    setConnection({
+      status: "connected",
+      presence: "online",
+      desktopName: DEMO_DESKTOP_NAME,
+      tier: "full",
+      capabilities: { roundHistory: true, openSessionFile: false },
+      demoMode: true,
+    });
+    resetSessions(DEMO_SESSIONS);
+    showDemoTranscript(activeSessionRef.current ?? "demo");
+    resetSend();
+    resetPermissions();
+  }, [
+    selectionIntentRef,
+    generationRef,
     clearReconnectTimer,
+    activeConfigRef,
+    setConnectionConfig,
     releaseTransport,
-    enterDemoMode,
-  } = useMobileConnectionTransport({
-    platform,
-    authUserId,
-    refs,
-    reconnect,
     setConnection,
-    setConnectionConfig,
-    setPairedDesktops,
-    invalidateTranscriptRequests,
-    showDemoTranscript,
     resetSessions,
+    showDemoTranscript,
+    activeSessionRef,
     resetSend,
     resetPermissions,
-  });
+  ]);
 
-  const { establishConnection, runReconnect } = useMobileConnectionEstablish({
-    platform,
+  const handleRpcNotification = useMobileRpcNotifications(
+    state,
+    releaseTransport
+  );
+  const establishConnection = useMobileConnectionEstablish(
+    state,
     authUserId,
-    authRef,
-    refs,
-    reconnect,
-    setConnection,
+    persistConnection,
     releaseTransport,
-    handleRpcNotification,
-    requestSessionList,
-    requestSessionSnapshot,
-    beginLoad,
-  });
+    handleRpcNotification
+  );
+  const runReconnect = useCallback(
+    async (config: MobileConnectionConfig, generation: number) => {
+      if (generation !== generationRef.current || platform.runtime.isHidden()) {
+        return;
+      }
+      setConnection((prev) => ({
+        ...prev,
+        status: "connecting",
+        presence: "offline",
+        error: undefined,
+      }));
+      try {
+        await establishConnection(config, generation);
+      } catch (error) {
+        if (
+          generation !== generationRef.current ||
+          error instanceof SupersededConnectionError
+        )
+          return;
+        const retryConfig = activeConfigRef.current;
+        const denied = error instanceof MobileConnectionAuthorizationError;
+        const retryable = !denied && retryConfig && !retryConfig.pairingCode;
+        if (!retryable) activeConfigRef.current = null;
+        setConnection((prev) => ({
+          ...prev,
+          status: retryable ? "connecting" : "error",
+          presence: "offline",
+          error: toMobileRpcError(error),
+        }));
+        if (retryable) scheduleReconnectRef.current(retryConfig, generation);
+      }
+    },
+    [
+      activeConfigRef,
+      establishConnection,
+      generationRef,
+      platform.runtime,
+      scheduleReconnectRef,
+      setConnection,
+    ]
+  );
 
   recoverRef.current = runReconnect;
   scheduleReconnectRef.current = reconnect.schedule;
 
-  const { connectLive, disconnect, switchPairedDesktop } =
-    useMobileConnectionActions({
-      platform,
-      authUserId,
-      refs,
-      reconnect,
-      setConnection,
-      setConnectionConfig,
+  const connectLive = useCallback(
+    async (config: MobileConnectionConfig) => {
+      setBootstrapPending(false);
+      selectionIntentRef.current += 1;
+      generationRef.current += 1;
+      const generation = generationRef.current;
+      clearReconnectTimer();
+      releaseTransport(true);
+      reconnect.reset();
+      resetSessions();
+      resetPermissions();
+      resetSend();
+      activeConfigRef.current = config;
+      setConnectionConfig(config);
+      setConnection((prev) => ({
+        ...prev,
+        status: "connecting",
+        presence: "unknown",
+        demoMode: false,
+        error: undefined,
+      }));
+      let configurationSaved = false;
+      try {
+        await persistConnection(config);
+        configurationSaved = true;
+        if (generation !== generationRef.current) {
+          throw new Error("Connection was superseded");
+        }
+        await establishConnection(config, generation);
+      } catch (error) {
+        if (
+          generation === generationRef.current &&
+          !(error instanceof SupersededConnectionError)
+        ) {
+          const retryConfig = activeConfigRef.current;
+          const retryable =
+            configurationSaved &&
+            !(error instanceof MobileConnectionAuthorizationError) &&
+            retryConfig &&
+            !retryConfig.pairingCode;
+          if (!retryable) activeConfigRef.current = null;
+          setConnection({
+            status: retryable ? "connecting" : "error",
+            presence: "offline",
+            demoMode: false,
+            error: toMobileRpcError(error),
+          });
+          if (retryable) scheduleReconnectRef.current(retryConfig, generation);
+        }
+        throw error;
+      }
+    },
+    [
+      setBootstrapPending,
+      selectionIntentRef,
+      generationRef,
       clearReconnectTimer,
       releaseTransport,
-      persistConnection,
-      establishConnection,
+      reconnect,
       resetSessions,
       resetPermissions,
       resetSend,
-      resetTranscript,
+      activeConfigRef,
+      setConnectionConfig,
+      setConnection,
+      persistConnection,
+      establishConnection,
+      scheduleReconnectRef,
+    ]
+  );
+
+  // User-directed recovery preserves the selected pairing. It deliberately uses
+  // the same authenticated handshake as first connect; policy errors never loop.
+  const retryConnection = useCallback((): Promise<boolean> => {
+    if (retryFlightRef.current) return retryFlightRef.current;
+    const intent = ++selectionIntentRef.current;
+    const operation = Promise.resolve().then(async () => {
+      if (intent !== selectionIntentRef.current) return false;
+      let config = connectionConfig;
+      if (!config) {
+        setBootstrapPending(true);
+        try {
+          config = relayUrl?.trim()
+            ? { wsUrl: relayUrl.trim() }
+            : await platform.connection.load(authUserId);
+        } catch (error) {
+          if (intent === selectionIntentRef.current) {
+            setBootstrapPending(false);
+            setConnection({
+              status: "error",
+              presence: "offline",
+              demoMode: false,
+              error: toMobileRpcError(error),
+            });
+          }
+          throw error;
+        }
+        if (intent !== selectionIntentRef.current) return false;
+        setBootstrapPending(false);
+      }
+      if (!config) {
+        setConnection({
+          status: "disconnected",
+          presence: "unknown",
+          demoMode: false,
+        });
+        return false;
+      }
+      await connectLive(config);
+      return true;
     });
+    retryFlightRef.current = operation;
+    const settled = () => {
+      if (retryFlightRef.current === operation) retryFlightRef.current = null;
+    };
+    void operation.then(settled, settled);
+    return operation;
+  }, [
+    authUserId,
+    connectLive,
+    connectionConfig,
+    platform.connection,
+    relayUrl,
+    retryFlightRef,
+    selectionIntentRef,
+    setBootstrapPending,
+    setConnection,
+  ]);
+
+  const disconnect = useCallback(async () => {
+    draftStore.clearDesktop(
+      mobileComposerDesktopScope(activeConfigRef.current, connection)
+    );
+    setBootstrapPending(false);
+    selectionIntentRef.current += 1;
+    generationRef.current += 1;
+    clearReconnectTimer();
+    activeConfigRef.current = null;
+    setConnectionConfig(null);
+    releaseTransport(true);
+    activeSessionRef.current = null;
+    setConnection({
+      status: "disconnected",
+      presence: "unknown",
+      demoMode: false,
+    });
+    resetSessions();
+    resetTranscript();
+    resetSend();
+    resetPermissions();
+    const generation = generationRef.current;
+    try {
+      await persistConnection(null);
+    } catch (error) {
+      if (generation === generationRef.current) {
+        setConnection({
+          status: "error",
+          presence: "offline",
+          demoMode: false,
+          error: toMobileRpcError(error),
+        });
+      }
+      throw error;
+    }
+  }, [
+    draftStore,
+    activeConfigRef,
+    connection,
+    setBootstrapPending,
+    selectionIntentRef,
+    generationRef,
+    clearReconnectTimer,
+    setConnectionConfig,
+    releaseTransport,
+    activeSessionRef,
+    setConnection,
+    resetSessions,
+    resetTranscript,
+    resetSend,
+    resetPermissions,
+    persistConnection,
+  ]);
+
+  const switchPairedDesktop = useCallback(
+    async (desktopId: string) => {
+      const selectionIntent = ++selectionIntentRef.current;
+      const config = await platform.connection.selectPairedDesktop(
+        authUserId,
+        desktopId
+      );
+      if (selectionIntent !== selectionIntentRef.current) return;
+      if (!config) throw new Error("Paired desktop is unavailable");
+      await connectLive(config);
+    },
+    [authUserId, connectLive, platform.connection, selectionIntentRef]
+  );
 
   const {
     refreshSessions,
@@ -245,23 +457,43 @@ export function MobileRemoteProviders({
     unsubscribeSession,
     openSessionFileInDesktop,
     stopSession,
-  } = useMobileSessionActions({
-    connection,
-    connectionRef,
-    refs,
-    sessionsHasMore,
-    requireWritableClient,
-    requestSessionList,
-    resetSessions,
-    resetSend,
-    beginLoad,
-    failLoad,
-    showDemoTranscript,
-    requestSessionSnapshot,
-    resetTranscript,
-    refreshSessionModel,
-    resetSessionModel,
-  });
+  } = useMobileSessionActions(state);
+  useEffect(() => {
+    const handleVisible = () => {
+      const config = activeConfigRef.current;
+      clearReconnectTimer();
+      if (platform.runtime.isHidden()) {
+        preparationRef.current?.abort();
+        if (clientRef.current || socketRef.current) {
+          releaseTransport(true);
+          setConnection((previous) => ({
+            ...previous,
+            status: "connecting",
+            presence: "offline",
+            error: undefined,
+          }));
+        }
+        return;
+      }
+      if (config && !clientRef.current) {
+        void reconnect
+          .run(config, generationRef.current)
+          .catch((error) => logger.warn("Background operation failed", error));
+      }
+    };
+    return platform.runtime.subscribeVisibility(handleVisible);
+  }, [
+    clearReconnectTimer,
+    platform.runtime,
+    releaseTransport,
+    reconnect,
+    activeConfigRef,
+    clientRef,
+    preparationRef,
+    socketRef,
+    setConnection,
+    generationRef,
+  ]);
 
   useEffect(() => {
     if (suppressInitialBootstrap) {
@@ -275,23 +507,37 @@ export function MobileRemoteProviders({
     let disposed = false;
     const bootstrapGeneration = generationRef.current;
     void (async () => {
-      const inventoryPromise =
-        platform.connection.listPairedDesktops(authUserId);
+      // Inventory is ancillary; it must not delay restoration of the selected device.
+      void platform.connection
+        .listPairedDesktops(authUserId)
+        .then((inventory) => {
+          if (!disposed && bootstrapGeneration === generationRef.current)
+            setPairedDesktops(inventory);
+        })
+        .catch(() => undefined);
       const config = relayUrl?.trim()
         ? { wsUrl: relayUrl.trim() }
         : await platform.connection.load(authUserId);
-      const inventory = await inventoryPromise;
       if (disposed || bootstrapGeneration !== generationRef.current) {
         return;
       }
-      setPairedDesktops(inventory);
       setConnectionConfig(config);
+      setBootstrapPending(false);
       if (config?.wsUrl || config?.host) {
         await connectLive(config).catch(() => undefined);
       } else if (demoByDefault) {
         enterDemoMode();
       }
-    })();
+    })().catch((error) => {
+      if (disposed || bootstrapGeneration !== generationRef.current) return;
+      setBootstrapPending(false);
+      setConnection({
+        status: "error",
+        presence: "offline",
+        demoMode: false,
+        error: toMobileRpcError(error),
+      });
+    });
     return () => {
       disposed = true;
       selectionIntentRef.current += 1;
@@ -305,10 +551,19 @@ export function MobileRemoteProviders({
 
   const value = useMemo<MobileRemoteContextValue>(
     () => ({
+      pendingInbox,
+      focusPermission,
+      bootstrapPending,
       connection,
       sessions,
       transcriptItems: transcriptView.items,
       transcriptPhase: transcriptView.phase,
+      transcriptSessionId: transcript.sessionId,
+      openedSession,
+      openingReady:
+        openingClient === clientRef.current &&
+        (transcript.indexPhase === "ready" ||
+          transcript.indexPhase === "empty"),
       transcriptError: transcriptView.error,
       transcriptTruncated: transcriptView.truncated,
       transcriptRounds: transcript.rounds,
@@ -319,10 +574,13 @@ export function MobileRemoteProviders({
       activePermission,
       permissionQueueDepth,
       permissionSubmitting,
-      rpc: clientRef.current,
+      permissionFailed,
+      rpc,
+      readStateSync,
       connectionConfig,
       pairedDesktops,
       connectLive,
+      retryConnection,
       switchPairedDesktop,
       enterDemoMode,
       disconnect,
@@ -340,53 +598,70 @@ export function MobileRemoteProviders({
       stopSession,
       sessionModel,
       refreshSessionModel,
+      loadSessionModels,
       setSessionModel,
     }),
     [
-      activePermission,
-      connectLive,
-      connectionConfig,
+      pendingInbox,
+      focusPermission,
+      bootstrapPending,
       connection,
-      dismissPermissionHead,
-      disconnect,
-      enterDemoMode,
+      sessions,
+      transcriptView.items,
+      transcriptView.phase,
+      transcriptView.error,
+      transcriptView.truncated,
+      transcriptView.roundId,
+      transcript.sessionId,
+      transcript.indexPhase,
+      transcript.rounds,
+      transcript.roundsComplete,
+      transcript.selectedRoundId,
+      openedSession,
+      openingClient,
+      clientRef,
+      sendStatus,
+      activePermission,
       permissionQueueDepth,
       permissionSubmitting,
-      refreshSessionModel,
+      permissionFailed,
+      rpc,
+      readStateSync,
+      connectionConfig,
+      pairedDesktops,
+      connectLive,
+      retryConnection,
+      switchPairedDesktop,
+      enterDemoMode,
+      disconnect,
       refreshSessions,
       loadMoreSessions,
       sessionsHasMore,
-      openSessionFileInDesktop,
-      pairedDesktops,
-      respondPermission,
-      retrySelectedRound,
+      subscribeSession,
+      unsubscribeSession,
       selectRound,
+      retrySelectedRound,
       sendMessage,
-      sendStatus,
+      openSessionFileInDesktop,
+      respondPermission,
+      dismissPermissionHead,
+      stopSession,
       sessionModel,
-      sessions,
+      refreshSessionModel,
+      loadSessionModels,
       setSessionModel,
-      stopSession,
-      subscribeSession,
-      switchPairedDesktop,
-      transcript.rounds,
-      transcript.roundsComplete,
-      transcript.selectedRoundId,
-      transcriptView.error,
-      transcriptView.items,
-      transcriptView.phase,
-      transcriptView.roundId,
-      transcriptView.truncated,
-      unsubscribeSession,
-      clientRef,
     ]
   );
 
   return (
     <MobileRemoteContext.Provider value={value}>
-      {children}
+      <MobileComposerDraftContext.Provider value={draftStore}>
+        {children}
+      </MobileComposerDraftContext.Provider>
     </MobileRemoteContext.Provider>
   );
 }
 
 MobileRemoteProviders.displayName = "MobileRemoteProviders";
+
+const logger = createLogger("MobileRemoteProviders");
diff --git a/src/modules/MobileRemote/app/mobileReadStateSync.test.ts b/src/modules/MobileRemote/app/mobileReadStateSync.test.ts
new file mode 100644
index 0000000000..291c3b4e93
--- /dev/null
+++ b/src/modules/MobileRemote/app/mobileReadStateSync.test.ts
@@ -0,0 +1,184 @@
+import { describe, expect, it, vi } from "vitest";
+
+import type {
+  MobileRpcClient,
+  RpcNotificationHandler,
+} from "../connection/mobileRpcClient";
+import { createMobileReadStateSync } from "./mobileReadStateSync";
+
+async function flush() {
+  for (let i = 0; i < 50; i++) await Promise.resolve();
+}
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise<T>((yes, no) => {
+    resolve = yes;
+    reject = no;
+  });
+  return { promise, resolve, reject };
+}
+function transport() {
+  const visited = new Set<string>();
+  const handlers = new Set<RpcNotificationHandler>();
+  const call = vi.fn(
+    async (method: string, params?: Record<string, unknown>) => {
+      const ids = params?.sessionIds as string[];
+      if (method === "session/mark_visited")
+        ids.forEach((id) => visited.add(id));
+      return { visitedIds: ids.filter((id) => visited.has(id)) };
+    }
+  );
+  const client = {
+    call,
+    onNotification: (fn: RpcNotificationHandler) => {
+      handlers.add(fn);
+      return () => {
+        handlers.delete(fn);
+      };
+    },
+    notify: vi.fn(),
+    close: vi.fn(),
+    readyState: 1,
+  } as MobileRpcClient;
+  return {
+    client,
+    call,
+    visited,
+    handlers,
+    changed: () =>
+      handlers.forEach((fn) => fn("session/read_state_changed", {})),
+  };
+}
+
+describe("mobile read-state lifecycle", () => {
+  it("queries only watched IDs and reacts to Desktop push without fetching transcripts or the roster", async () => {
+    const rpc = transport();
+    const sync = createMobileReadStateSync();
+    sync.watch(["a", "b"]);
+    sync.connect(rpc.client, "account/desktop");
+    await flush();
+    expect([...sync.getSnapshot()]).toEqual([
+      ["a", false],
+      ["b", false],
+    ]);
+    rpc.visited.add("a");
+    rpc.changed();
+    await flush();
+    expect(sync.getSnapshot().get("a")).toBe(true);
+    expect(
+      rpc.call.mock.calls.every(([method]) => method === "session/read_state")
+    ).toBe(true);
+    const count = rpc.call.mock.calls.length;
+    await flush();
+    await flush();
+    expect(rpc.call).toHaveBeenCalledTimes(count);
+    sync.dispose();
+    expect(rpc.handlers.size).toBe(0);
+  });
+  it("coalesces a burst into at most one trailing query and rejects stale projections", async () => {
+    const rpc = transport();
+    const first = deferred<{ visitedIds: string[] }>();
+    rpc.call.mockImplementationOnce(() => first.promise);
+    const sync = createMobileReadStateSync();
+    sync.watch(["a"]);
+    sync.connect(rpc.client, "desktop");
+    await flush();
+    rpc.visited.add("a");
+    for (let i = 0; i < 100; i++) rpc.changed();
+    expect(rpc.call).toHaveBeenCalledTimes(1);
+    first.resolve({ visitedIds: [] });
+    await flush();
+    expect(rpc.call).toHaveBeenCalledTimes(2);
+    expect(sync.getSnapshot().get("a")).toBe(true);
+    sync.dispose();
+  });
+  it("retains uncertain receipts on the same desktop but drops them when switching accounts/desktops", async () => {
+    const a = transport(),
+      b = transport();
+    const lost = deferred<{ visitedIds: string[] }>();
+    a.call.mockImplementationOnce(() => lost.promise);
+    const sync = createMobileReadStateSync();
+    sync.connect(a.client, "a");
+    sync.markVisited("s");
+    await flush();
+    sync.connect(null, "a");
+    sync.connect(b.client, "a");
+    await flush();
+    expect(b.visited.has("s")).toBe(true);
+    lost.resolve({ visitedIds: ["s"] });
+    await flush();
+    sync.connect(null, "a");
+    sync.markVisited("never-send-to-b");
+    sync.connect(a.client, "b");
+    await flush();
+    expect(a.visited.has("never-send-to-b")).toBe(false);
+    sync.dispose();
+  });
+  it("never treats a missing mark acknowledgment as success and retries only on an external trigger", async () => {
+    const rpc = transport();
+    rpc.call.mockResolvedValueOnce({ visitedIds: [] });
+    const sync = createMobileReadStateSync();
+    sync.connect(rpc.client, "a");
+    sync.markVisited("s");
+    await flush();
+    expect(rpc.call).toHaveBeenCalledTimes(1);
+    expect(sync.getSnapshot().size).toBe(0);
+    await flush();
+    expect(rpc.call).toHaveBeenCalledTimes(1);
+    sync.refresh();
+    await flush();
+    expect(rpc.visited.has("s")).toBe(true);
+    sync.dispose();
+  });
+  it("discards old replies after scope switches, hidden transport, and disposal", async () => {
+    const rpc = transport();
+    const first = deferred<{ visitedIds: string[] }>();
+    rpc.call.mockImplementationOnce(() => first.promise);
+    const sync = createMobileReadStateSync();
+    sync.watch(["a"]);
+    sync.connect(rpc.client, "old");
+    await flush();
+    sync.connect(null, "old");
+    first.resolve({ visitedIds: ["a"] });
+    await flush();
+    expect(sync.getSnapshot().size).toBe(0);
+    expect(rpc.handlers.size).toBe(0);
+    sync.dispose();
+  });
+  it("bounds both watched IDs and each wire batch; same watch is a no-op", async () => {
+    const rpc = transport();
+    const sync = createMobileReadStateSync();
+    const ids = Array.from({ length: 1300 }, (_, i) => `s-${i}`);
+    sync.watch(ids);
+    sync.connect(rpc.client, "a");
+    await flush();
+    expect(sync.getSnapshot().size).toBe(1200);
+    expect(rpc.call).toHaveBeenCalledTimes(6);
+    expect(
+      rpc.call.mock.calls.every(
+        ([, params]) => (params?.sessionIds as string[]).length <= 200
+      )
+    ).toBe(true);
+    sync.watch(ids);
+    await flush();
+    expect(rpc.call).toHaveBeenCalledTimes(6);
+    sync.watch([]);
+    await flush();
+    expect(sync.getSnapshot().size).toBe(0);
+    rpc.changed();
+    await flush();
+    expect(rpc.call).toHaveBeenCalledTimes(6);
+    sync.dispose();
+  });
+  it("rejects foreign IDs in a reply instead of accepting them into the projection", async () => {
+    const rpc = transport();
+    rpc.call.mockResolvedValueOnce({ visitedIds: ["foreign"] });
+    const sync = createMobileReadStateSync();
+    sync.watch(["a"]);
+    sync.connect(rpc.client, "a");
+    await flush();
+    expect(sync.getSnapshot().size).toBe(0);
+    sync.dispose();
+  });
+});
diff --git a/src/modules/MobileRemote/app/mobileReadStateSync.ts b/src/modules/MobileRemote/app/mobileReadStateSync.ts
new file mode 100644
index 0000000000..f846141c76
--- /dev/null
+++ b/src/modules/MobileRemote/app/mobileReadStateSync.ts
@@ -0,0 +1,173 @@
+import { createLogger } from "@src/hooks/logger";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+
+const BATCH = 200;
+const MAX_WATCHED = 1200;
+const EMPTY: ReadonlyMap<string, boolean> = new Map();
+
+function visitedReply(
+  value: unknown,
+  requested: readonly string[]
+): Set<string> {
+  const ids = (value as { visitedIds?: unknown } | null)?.visitedIds;
+  if (
+    !Array.isArray(ids) ||
+    ids.length > requested.length ||
+    ids.some((id) => typeof id !== "string" || !requested.includes(id))
+  ) {
+    throw new Error("Invalid read-state response");
+  }
+  return new Set(ids);
+}
+
+/** Provider-lifetime, connection-scoped projection. No polling, persistent
+ * phone truth, or transcript fetches. One RPC in flight; bursts coalesce. */
+export function createMobileReadStateSync() {
+  let client: MobileRpcClient | null = null;
+  let scope: string | null = null;
+  let generation = 0;
+  let revision = 0;
+  let watched: string[] = [];
+  const pending = new Set<string>();
+  let snapshot = EMPTY;
+  let dirty = false;
+  let running: number | null = null;
+  let unlisten: (() => void) | undefined;
+  const listeners = new Set<() => void>();
+  const emit = (next: ReadonlyMap<string, boolean>) => {
+    if (
+      next.size === snapshot.size &&
+      [...next].every(([id, value]) => snapshot.get(id) === value)
+    )
+      return;
+    snapshot = next;
+    listeners.forEach((fn) => fn());
+  };
+  const pump = () => {
+    if (!client || running === generation || (!dirty && pending.size === 0))
+      return;
+    const transport = client;
+    const token = generation;
+    const current = () => token === generation && client === transport;
+    running = token;
+    void Promise.resolve()
+      .then(async () => {
+        try {
+          while (current() && (dirty || pending.size > 0)) {
+            dirty = false;
+            const marks = [...pending].slice(0, BATCH);
+            if (marks.length) {
+              const reply = visitedReply(
+                await transport.call("session/mark_visited", {
+                  sessionIds: marks,
+                }),
+                marks
+              );
+              if (!current()) return;
+              if (marks.some((id) => !reply.has(id)))
+                throw new Error("Desktop did not acknowledge the read receipt");
+              marks.forEach((id) => pending.delete(id));
+            }
+            const requestRevision = revision;
+            const ids = watched;
+            const next = new Map<string, boolean>();
+            for (let offset = 0; offset < ids.length; offset += BATCH) {
+              const batch = ids.slice(offset, offset + BATCH);
+              const reply = visitedReply(
+                await transport.call("session/read_state", {
+                  sessionIds: batch,
+                }),
+                batch
+              );
+              if (!current()) return;
+              if (requestRevision !== revision) break;
+              batch.forEach((id) => next.set(id, reply.has(id)));
+            }
+            if (!current()) return;
+            if (requestRevision === revision) emit(next);
+          }
+        } catch {
+          // Unknown is not unread. Retain pending receipts for the next explicit
+          // activation, invalidation, or reconnect; never spin on failure.
+          if (current()) emit(EMPTY);
+        } finally {
+          if (running === token) running = null;
+        }
+      })
+      .catch((error) => logger.warn("Background operation failed", error));
+  };
+  const refresh = () => {
+    revision++;
+    dirty = true;
+    pump();
+  };
+  return {
+    getSnapshot: () => snapshot,
+    subscribe: (listener: () => void) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    connect(next: MobileRpcClient | null, nextScope: string) {
+      if (next === client && scope === nextScope) return;
+      unlisten?.();
+      unlisten = undefined;
+      generation++;
+      if (scope !== nextScope) {
+        pending.clear();
+        // Never send the previous account/desktop's visible IDs to its successor.
+        if (scope !== null) watched = [];
+      }
+      scope = nextScope;
+      client = next;
+      emit(EMPTY);
+      unlisten = next?.onNotification((method) => {
+        if (method === "session/read_state_changed") refresh();
+      });
+      refresh();
+    },
+    watch(ids: readonly string[]) {
+      const next = [...new Set(ids)]
+        .filter((id) => id.length > 0 && id.length <= 1024)
+        .slice(0, MAX_WATCHED);
+      if (
+        next.length === watched.length &&
+        next.every((id, index) => watched[index] === id)
+      )
+        return;
+      watched = next;
+      // Do not show state for the previously visible list while querying.
+      emit(EMPTY);
+      refresh();
+    },
+    markVisited(id: string) {
+      if (
+        !id ||
+        id.length > 1024 ||
+        pending.has(id) ||
+        snapshot.get(id) === true
+      )
+        return;
+      // Bounded navigation intent queue, retained only within this Desktop scope.
+      if (pending.size >= BATCH) return;
+      pending.add(id);
+      refresh();
+    },
+    refresh,
+    dispose() {
+      generation++;
+      client = null;
+      unlisten?.();
+      unlisten = undefined;
+      pending.clear();
+      watched = [];
+      emit(EMPTY);
+    },
+  };
+}
+
+export type MobileReadStateSync = ReturnType<typeof createMobileReadStateSync>;
+
+const logger = createLogger("mobileReadStateSync");
diff --git a/src/modules/MobileRemote/app/useMobileConnectionActions.ts b/src/modules/MobileRemote/app/useMobileConnectionActions.ts
deleted file mode 100644
index f80f24f34b..0000000000
--- a/src/modules/MobileRemote/app/useMobileConnectionActions.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { type Dispatch, type SetStateAction, useCallback } from "react";
-
-import { toMobileRpcError } from "../connection/mobileRpcClient";
-import { MobileConnectionAuthorizationError } from "../connection/types";
-import type {
-  MobileConnectionConfig,
-  MobileConnectionState,
-} from "../connection/types";
-import type { MobileRemotePlatform } from "../platform/types";
-import type { useMobileConnectionEstablish } from "./useMobileConnectionEstablish";
-import type { MobileConnectionRefs } from "./useMobileConnectionRefs";
-import type {
-  RemoteReconnectController,
-  useMobileConnectionTransport,
-} from "./useMobileConnectionTransport";
-import type { useMobilePermissions } from "./useMobilePermissions";
-import type { useMobileSend } from "./useMobileSend";
-import type { useMobileSessionList } from "./useMobileSessionList";
-import type { useMobileTranscript } from "./useMobileTranscript";
-
-type TransportApi = ReturnType<typeof useMobileConnectionTransport>;
-
-interface UseMobileConnectionActionsParams {
-  platform: MobileRemotePlatform;
-  authUserId: string;
-  refs: Pick<
-    MobileConnectionRefs,
-    | "selectionIntentRef"
-    | "generationRef"
-    | "activeConfigRef"
-    | "activeSessionRef"
-  >;
-  reconnect: RemoteReconnectController;
-  setConnection: Dispatch<SetStateAction<MobileConnectionState>>;
-  setConnectionConfig: Dispatch<SetStateAction<MobileConnectionConfig | null>>;
-  clearReconnectTimer: TransportApi["clearReconnectTimer"];
-  releaseTransport: TransportApi["releaseTransport"];
-  persistConnection: TransportApi["persistConnection"];
-  establishConnection: ReturnType<
-    typeof useMobileConnectionEstablish
-  >["establishConnection"];
-  resetSessions: ReturnType<typeof useMobileSessionList>["resetSessions"];
-  resetPermissions: ReturnType<typeof useMobilePermissions>["resetPermissions"];
-  resetSend: ReturnType<typeof useMobileSend>["resetSend"];
-  resetTranscript: ReturnType<typeof useMobileTranscript>["resetTranscript"];
-}
-
-/** User-initiated connection transitions: connect, disconnect, switch desktop. */
-export function useMobileConnectionActions({
-  platform,
-  authUserId,
-  refs,
-  reconnect,
-  setConnection,
-  setConnectionConfig,
-  clearReconnectTimer,
-  releaseTransport,
-  persistConnection,
-  establishConnection,
-  resetSessions,
-  resetPermissions,
-  resetSend,
-  resetTranscript,
-}: UseMobileConnectionActionsParams) {
-  const {
-    selectionIntentRef,
-    generationRef,
-    activeConfigRef,
-    activeSessionRef,
-  } = refs;
-
-  const connectLive = useCallback(
-    async (config: MobileConnectionConfig) => {
-      selectionIntentRef.current += 1;
-      generationRef.current += 1;
-      const generation = generationRef.current;
-      clearReconnectTimer();
-      releaseTransport(true);
-      reconnect.reset();
-      resetSessions();
-      resetPermissions();
-      resetSend();
-      activeConfigRef.current = config;
-      setConnectionConfig(config);
-      await persistConnection(config);
-      if (generation !== generationRef.current) {
-        throw new Error("Connection was superseded");
-      }
-      setConnection((prev) => ({
-        ...prev,
-        status: "connecting",
-        presence: "unknown",
-        demoMode: false,
-        error: undefined,
-      }));
-      try {
-        await establishConnection(config, generation);
-      } catch (error) {
-        if (generation === generationRef.current) {
-          if (error instanceof MobileConnectionAuthorizationError)
-            activeConfigRef.current = null;
-          setConnection({
-            status: "error",
-            presence: "offline",
-            demoMode: false,
-            error: toMobileRpcError(error),
-          });
-        }
-        throw error;
-      }
-    },
-    [
-      clearReconnectTimer,
-      reconnect,
-      establishConnection,
-      persistConnection,
-      releaseTransport,
-      resetSessions,
-      resetPermissions,
-      resetSend,
-      activeConfigRef,
-      generationRef,
-      selectionIntentRef,
-      setConnection,
-      setConnectionConfig,
-    ]
-  );
-
-  const disconnect = useCallback(async () => {
-    selectionIntentRef.current += 1;
-    generationRef.current += 1;
-    clearReconnectTimer();
-    activeConfigRef.current = null;
-    setConnectionConfig(null);
-    releaseTransport(true);
-    activeSessionRef.current = null;
-    setConnection({
-      status: "disconnected",
-      presence: "unknown",
-      demoMode: false,
-    });
-    resetSessions();
-    resetTranscript();
-    resetSend();
-    resetPermissions();
-    await persistConnection(null);
-  }, [
-    resetTranscript,
-    clearReconnectTimer,
-    persistConnection,
-    releaseTransport,
-    resetSessions,
-    resetPermissions,
-    resetSend,
-    activeConfigRef,
-    activeSessionRef,
-    generationRef,
-    selectionIntentRef,
-    setConnection,
-    setConnectionConfig,
-  ]);
-
-  const switchPairedDesktop = useCallback(
-    async (desktopId: string) => {
-      const selectionIntent = ++selectionIntentRef.current;
-      const config = await platform.connection.selectPairedDesktop(
-        authUserId,
-        desktopId
-      );
-      if (selectionIntent !== selectionIntentRef.current) return;
-      if (!config) throw new Error("Paired desktop is unavailable");
-      await connectLive(config);
-    },
-    [authUserId, connectLive, platform.connection, selectionIntentRef]
-  );
-
-  return { connectLive, disconnect, switchPairedDesktop };
-}
diff --git a/src/modules/MobileRemote/app/useMobileConnectionEstablish.ts b/src/modules/MobileRemote/app/useMobileConnectionEstablish.ts
index 7e012c203e..6235d9c08c 100644
--- a/src/modules/MobileRemote/app/useMobileConnectionEstablish.ts
+++ b/src/modules/MobileRemote/app/useMobileConnectionEstablish.ts
@@ -1,11 +1,11 @@
-import {
-  type Dispatch,
-  type RefObject,
-  type SetStateAction,
-  useCallback,
-} from "react";
+import { useCallback } from "react";
 
-import type { MobileAuthContextValue } from "../auth/MobileAuthContext";
+import { mobileComposerDesktopScope } from "../components/composer/mobileComposerDraftStore";
+import {
+  desktopIdentityName,
+  pairedDesktopId,
+  withInitializedDesktop,
+} from "../connection/mobileDesktopIdentity";
 import {
   createMobileRpcClient,
   toMobileRpcError,
@@ -17,66 +17,50 @@ import type {
   MobileConnectionConfig,
   MobileConnectionState,
 } from "../connection/types";
-import { DEMO_DESKTOP_NAME } from "../demo/demoFixtures";
-import type { MobileRemotePlatform } from "../platform/types";
 import {
   waitForPairingApproval,
   waitForSocketOpen,
 } from "./mobileSocketHandshake";
-import type { MobileConnectionRefs } from "./useMobileConnectionRefs";
-import type {
-  RemoteReconnectController,
-  useMobileConnectionTransport,
-} from "./useMobileConnectionTransport";
-import type { useMobileRpcNotifications } from "./useMobileRpcNotifications";
-import type { useMobileSessionList } from "./useMobileSessionList";
-import type { useMobileTranscript } from "./useMobileTranscript";
-
-type TranscriptApi = ReturnType<typeof useMobileTranscript>;
+import type { MobileRemoteState } from "./useMobileRemoteState";
 
-interface UseMobileConnectionEstablishParams {
-  platform: MobileRemotePlatform;
-  authUserId: string;
-  authRef: RefObject<MobileAuthContextValue | null>;
-  refs: MobileConnectionRefs;
-  reconnect: RemoteReconnectController;
-  setConnection: Dispatch<SetStateAction<MobileConnectionState>>;
-  releaseTransport: ReturnType<
-    typeof useMobileConnectionTransport
-  >["releaseTransport"];
-  handleRpcNotification: ReturnType<typeof useMobileRpcNotifications>;
-  requestSessionList: ReturnType<
-    typeof useMobileSessionList
-  >["requestSessionList"];
-  requestSessionSnapshot: TranscriptApi["requestSessionSnapshot"];
-  beginLoad: TranscriptApi["beginLoad"];
+export class SupersededConnectionError extends Error {
+  constructor() {
+    super("Connection was superseded");
+  }
 }
 
-/** Opens, authenticates, and re-opens the desktop socket for one generation. */
-export function useMobileConnectionEstablish({
-  platform,
-  authUserId,
-  authRef,
-  refs,
-  reconnect,
-  setConnection,
-  releaseTransport,
-  handleRpcNotification,
-  requestSessionList,
-  requestSessionSnapshot,
-  beginLoad,
-}: UseMobileConnectionEstablishParams) {
+export function useMobileConnectionEstablish(
+  state: MobileRemoteState,
+  authUserId: string,
+  persistConnection: (config: MobileConnectionConfig | null) => Promise<void>,
+  releaseTransport: (close: boolean) => void,
+  handleRpcNotification: (
+    method: string,
+    params: Record<string, unknown> | undefined
+  ) => void
+) {
   const {
+    platform,
+    draftStore,
+    authRef,
     preparationRef,
     clientRef,
+    setRpc,
     socketRef,
     activeSessionRef,
     unsubscribeRpcRef,
     activeConfigRef,
     generationRef,
+    reconnect,
     scheduleReconnectRef,
-  } = refs;
-
+    setConnection,
+    setConnectionConfig,
+    setPairedDesktops,
+    connectionRef,
+    requestSessionList,
+    beginLoad,
+    requestSessionSnapshot,
+  } = state;
   const establishConnection = useCallback(
     async (config: MobileConnectionConfig, generation: number) => {
       const deviceLabel =
@@ -103,7 +87,13 @@ export function useMobileConnectionEstablish({
         );
         preparation.signal.throwIfAborted();
         if (generation !== generationRef.current || platform.runtime.isHidden())
-          throw new Error("Connection was superseded");
+          throw new SupersededConnectionError();
+      } catch (error) {
+        if (preparation.signal.aborted) throw new SupersededConnectionError();
+        if (error instanceof MobileConnectionAuthorizationError) {
+          draftStore.clearDesktop(mobileComposerDesktopScope(config, {}));
+        }
+        throw error;
       } finally {
         if (preparationRef.current === preparation)
           preparationRef.current = null;
@@ -111,6 +101,17 @@ export function useMobileConnectionEstablish({
       const socket = platform.connection.createSocket(preparedUrl);
       let authenticated = false;
       let intentionalClose = false;
+      let authorizationDenied = false;
+      let pairedConfig = config;
+      // Policy closes during initialize are just as terminal as post-handshake
+      // revocation. The RPC client's generic close error must not trigger retries.
+      socket.addEventListener(
+        "close",
+        (event) => {
+          authorizationDenied = event.code === 1008;
+        },
+        { once: true }
+      );
       socketRef.current = socket;
 
       try {
@@ -118,16 +119,29 @@ export function useMobileConnectionEstablish({
         if (generation !== generationRef.current) {
           intentionalClose = true;
           socket.close();
-          throw new Error("Connection was superseded");
+          throw new SupersededConnectionError();
         }
 
         const client = createMobileRpcClient(socket, platform.runtime);
         clientRef.current = client;
+        setRpc(client);
         unsubscribeRpcRef.current = client.onNotification(
           handleRpcNotification
         );
         if (config.pairingCode) {
           await waitForPairingApproval(socket, client, platform.runtime);
+          if (
+            generation !== generationRef.current ||
+            socketRef.current !== socket
+          )
+            throw new SupersededConnectionError();
+          // Relay approval, not Desktop availability, finalizes pairing. Keep
+          // the durable device credential, but never replay the one-time code.
+          const { pairingCode: _approvedCode, ...confirmed } = config;
+          pairedConfig = confirmed;
+          activeConfigRef.current = confirmed;
+          setConnectionConfig(confirmed);
+          void persistConnection(confirmed).catch(() => undefined);
         }
 
         const init = await client.call<InitializeResult>("initialize", {
@@ -139,25 +153,60 @@ export function useMobileConnectionEstablish({
           capabilities: { interactions: ["permission"], streaming: true },
           deviceLabel,
         });
-        if (generation !== generationRef.current) {
+        if (
+          generation !== generationRef.current ||
+          socketRef.current !== socket
+        ) {
           intentionalClose = true;
           client.close();
-          throw new Error("Connection was superseded");
+          throw new SupersededConnectionError();
         }
 
         authenticated = true;
         reconnect.reset();
-        setConnection({
+        const identifiedConfig = withInitializedDesktop(pairedConfig, init);
+        const desktopName = desktopIdentityName(
+          identifiedConfig.desktopIdentity
+        );
+        if (identifiedConfig !== config) {
+          activeConfigRef.current = identifiedConfig;
+          setConnectionConfig(identifiedConfig);
+          // Publish verified metadata immediately; secure-storage latency must not
+          // delay sessions or display an opaque ID after initialize succeeds.
+          setPairedDesktops((desktops) => {
+            const id = pairedDesktopId(config);
+            const existing = desktops.find((desktop) => desktop.id === id);
+            return [
+              {
+                id,
+                name: desktopName ?? existing?.name ?? id,
+                active: true,
+                updatedAtMs: existing?.updatedAtMs ?? platform.runtime.now(),
+                desktopIdentity: identifiedConfig.desktopIdentity,
+              },
+              ...desktops
+                .filter((desktop) => desktop.id !== id)
+                .map((desktop) => ({ ...desktop, active: false })),
+            ].slice(0, 20);
+          });
+        }
+        // Retry the confirmed credential write even without desktop metadata:
+        // an earlier approval save may have failed before Desktop came online.
+        void persistConnection(identifiedConfig).catch(() => undefined);
+        const connected: MobileConnectionState = {
           status: "connected",
           presence: "online",
           desktopId: init.desktopId ?? config.desktopId,
-          desktopName: init.desktopName ?? DEMO_DESKTOP_NAME,
+          desktopName: desktopName ?? config.desktopId ?? config.host,
           // Authorization is server-owned. An older/incomplete initialize
           // response must never silently upgrade the phone to write access.
           tier: init.tier ?? "read_only",
           capabilities: init.capabilities,
           demoMode: false,
-        });
+        };
+        // Restoration runs before React commits; use this handshake's capabilities.
+        connectionRef.current = connected;
+        setConnection(connected);
         socket.addEventListener(
           "close",
           (event) => {
@@ -171,6 +220,11 @@ export function useMobileConnectionEstablish({
             }
             releaseTransport(false);
             if (event.code === 1008) {
+              draftStore.clearDesktop(
+                mobileComposerDesktopScope(identifiedConfig, {
+                  desktopId: identifiedConfig.desktopId,
+                })
+              );
               activeConfigRef.current = null;
               setConnection((prev) => ({
                 ...prev,
@@ -190,90 +244,76 @@ export function useMobileConnectionEstablish({
               presence: "offline",
               error: undefined,
             }));
-            scheduleReconnectRef.current(config, generation);
+            scheduleReconnectRef.current(identifiedConfig, generation);
           },
           { once: true }
         );
-        await requestSessionList(client);
-        if (
-          socketRef.current !== socket ||
-          generation !== generationRef.current
-        )
-          return;
-        if (activeSessionRef.current) {
+        // The roster is independent of the selected conversation. A slow list
+        // must not serialize reconnect → latest body behind unrelated sessions.
+        const restoreActiveSession = async () => {
+          if (
+            socketRef.current !== socket ||
+            generation !== generationRef.current
+          )
+            return;
           const sessionId = activeSessionRef.current;
+          if (!sessionId) return;
           const subscriptionGeneration = beginLoad(sessionId);
           await requestSessionSnapshot(
             client,
             sessionId,
             subscriptionGeneration
           ).catch(() => undefined);
-        }
+        };
+        await Promise.all([restoreActiveSession(), requestSessionList(client)]);
       } catch (error) {
         intentionalClose = true;
-        if (socketRef.current === socket) releaseTransport(true);
+        if (socketRef.current !== socket) throw new SupersededConnectionError();
+        releaseTransport(true);
+        if (
+          authorizationDenied ||
+          error instanceof MobileConnectionAuthorizationError
+        ) {
+          draftStore.clearDesktop(mobileComposerDesktopScope(config, {}));
+        }
+        if (authorizationDenied)
+          throw new MobileConnectionAuthorizationError(
+            "Device access was revoked or pairing expired"
+          );
         throw error;
       }
     },
     [
-      authUserId,
-      reconnect,
-      handleRpcNotification,
-      platform.clientInfo,
+      platform.clientInfo.defaultDeviceLabel,
+      platform.clientInfo.name,
+      platform.clientInfo.version,
       platform.connection,
       platform.runtime,
-      releaseTransport,
-      requestSessionList,
-      requestSessionSnapshot,
-      beginLoad,
-      activeConfigRef,
-      activeSessionRef,
-      authRef,
-      clientRef,
-      generationRef,
       preparationRef,
-      scheduleReconnectRef,
-      setConnection,
       socketRef,
+      authUserId,
+      generationRef,
+      authRef,
+      draftStore,
+      clientRef,
+      setRpc,
       unsubscribeRpcRef,
-    ]
-  );
-
-  const runReconnect = useCallback(
-    async (config: MobileConnectionConfig, generation: number) => {
-      if (generation !== generationRef.current || platform.runtime.isHidden()) {
-        return;
-      }
-      setConnection((prev) => ({
-        ...prev,
-        status: "connecting",
-        presence: "offline",
-        error: undefined,
-      }));
-      try {
-        await establishConnection(config, generation);
-      } catch (error) {
-        if (generation !== generationRef.current) return;
-        const denied = error instanceof MobileConnectionAuthorizationError;
-        if (denied) activeConfigRef.current = null;
-        setConnection((prev) => ({
-          ...prev,
-          status: denied ? "error" : "connecting",
-          presence: "offline",
-          error: toMobileRpcError(error),
-        }));
-        if (!denied) scheduleReconnectRef.current(config, generation);
-      }
-    },
-    [
-      establishConnection,
-      platform.runtime,
+      handleRpcNotification,
+      reconnect,
+      persistConnection,
+      connectionRef,
+      setConnection,
+      requestSessionList,
       activeConfigRef,
-      generationRef,
+      setConnectionConfig,
+      setPairedDesktops,
+      releaseTransport,
       scheduleReconnectRef,
-      setConnection,
+      activeSessionRef,
+      beginLoad,
+      requestSessionSnapshot,
     ]
   );
 
-  return { establishConnection, runReconnect };
+  return establishConnection;
 }
diff --git a/src/modules/MobileRemote/app/useMobileConnectionRefs.ts b/src/modules/MobileRemote/app/useMobileConnectionRefs.ts
deleted file mode 100644
index c67b15cc9f..0000000000
--- a/src/modules/MobileRemote/app/useMobileConnectionRefs.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useRef } from "react";
-
-import type { MobileRpcClient } from "../connection/mobileRpcClient";
-import type { MobileConnectionConfig } from "../connection/types";
-
-export type MobileConnectionRefs = ReturnType<typeof useMobileConnectionRefs>;
-
-/** Mutable transport identity shared by the provider's connection hooks. */
-export function useMobileConnectionRefs() {
-  const preparationRef = useRef<AbortController | null>(null);
-  const clientRef = useRef<MobileRpcClient | null>(null);
-  const socketRef = useRef<WebSocket | null>(null);
-  const activeSessionRef = useRef<string | null>(null);
-  const unsubscribeRpcRef = useRef<(() => void) | null>(null);
-  const activeConfigRef = useRef<MobileConnectionConfig | null>(null);
-  const generationRef = useRef(0);
-  const selectionIntentRef = useRef(0);
-  const recoverRef = useRef<
-    (config: MobileConnectionConfig, generation: number) => Promise<void>
-  >(async () => undefined);
-  const connectionWriteChainRef = useRef<Promise<void>>(Promise.resolve());
-  const scheduleReconnectRef = useRef<
-    (config: MobileConnectionConfig, generation: number) => void
-  >(() => undefined);
-
-  return {
-    preparationRef,
-    clientRef,
-    socketRef,
-    activeSessionRef,
-    unsubscribeRpcRef,
-    activeConfigRef,
-    generationRef,
-    selectionIntentRef,
-    recoverRef,
-    connectionWriteChainRef,
-    scheduleReconnectRef,
-  };
-}
diff --git a/src/modules/MobileRemote/app/useMobileConnectionTransport.ts b/src/modules/MobileRemote/app/useMobileConnectionTransport.ts
deleted file mode 100644
index 201c8e1d48..0000000000
--- a/src/modules/MobileRemote/app/useMobileConnectionTransport.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import {
-  type Dispatch,
-  type SetStateAction,
-  useCallback,
-  useEffect,
-} from "react";
-
-import type { createRemoteReconnectController } from "../connection/remoteReconnectController";
-import type {
-  MobileConnectionConfig,
-  MobileConnectionState,
-  MobilePairedDesktopSummary,
-} from "../connection/types";
-import { DEMO_DESKTOP_NAME, DEMO_SESSIONS } from "../demo/demoFixtures";
-import type { MobileRemotePlatform } from "../platform/types";
-import type { MobileConnectionRefs } from "./useMobileConnectionRefs";
-import type { useMobilePermissions } from "./useMobilePermissions";
-import type { useMobileSend } from "./useMobileSend";
-import type { useMobileSessionList } from "./useMobileSessionList";
-import type { useMobileTranscript } from "./useMobileTranscript";
-
-type TranscriptApi = ReturnType<typeof useMobileTranscript>;
-type SessionListApi = ReturnType<typeof useMobileSessionList>;
-export type RemoteReconnectController = ReturnType<
-  typeof createRemoteReconnectController
->;
-
-interface UseMobileConnectionTransportParams {
-  platform: MobileRemotePlatform;
-  authUserId: string;
-  refs: MobileConnectionRefs;
-  reconnect: RemoteReconnectController;
-  setConnection: Dispatch<SetStateAction<MobileConnectionState>>;
-  setConnectionConfig: Dispatch<SetStateAction<MobileConnectionConfig | null>>;
-  setPairedDesktops: Dispatch<SetStateAction<MobilePairedDesktopSummary[]>>;
-  invalidateTranscriptRequests: TranscriptApi["invalidateTranscriptRequests"];
-  showDemoTranscript: TranscriptApi["showDemoTranscript"];
-  resetSessions: SessionListApi["resetSessions"];
-  resetSend: ReturnType<typeof useMobileSend>["resetSend"];
-  resetPermissions: ReturnType<typeof useMobilePermissions>["resetPermissions"];
-}
-
-/** Socket lifecycle: persist config, release transport, demo mode, visibility. */
-export function useMobileConnectionTransport({
-  platform,
-  authUserId,
-  refs,
-  reconnect,
-  setConnection,
-  setConnectionConfig,
-  setPairedDesktops,
-  invalidateTranscriptRequests,
-  showDemoTranscript,
-  resetSessions,
-  resetSend,
-  resetPermissions,
-}: UseMobileConnectionTransportParams) {
-  const {
-    preparationRef,
-    clientRef,
-    socketRef,
-    activeSessionRef,
-    unsubscribeRpcRef,
-    activeConfigRef,
-    generationRef,
-    selectionIntentRef,
-    connectionWriteChainRef,
-  } = refs;
-
-  const persistConnection = useCallback(
-    (config: MobileConnectionConfig | null) => {
-      const operation = connectionWriteChainRef.current.then(async () => {
-        await platform.connection.save(authUserId, config);
-        setPairedDesktops(
-          await platform.connection.listPairedDesktops(authUserId)
-        );
-      });
-      connectionWriteChainRef.current = operation.catch(() => undefined);
-      return operation;
-    },
-    [
-      authUserId,
-      connectionWriteChainRef,
-      platform.connection,
-      setPairedDesktops,
-    ]
-  );
-
-  const clearReconnectTimer = useCallback(() => reconnect.clear(), [reconnect]);
-
-  const releaseTransport = useCallback(
-    (close: boolean) => {
-      reconnect.invalidate();
-      preparationRef.current?.abort();
-      preparationRef.current = null;
-      // Invalidate every in-flight subscribe/refresh from the old socket before
-      // it can reject or resolve into the retained logical session state.
-      invalidateTranscriptRequests();
-      unsubscribeRpcRef.current?.();
-      unsubscribeRpcRef.current = null;
-      const client = clientRef.current;
-      clientRef.current = null;
-      const socket = socketRef.current;
-      socketRef.current = null;
-      if (close) {
-        if (client) client.close();
-        else socket?.close();
-      }
-    },
-    [
-      reconnect,
-      invalidateTranscriptRequests,
-      clientRef,
-      preparationRef,
-      socketRef,
-      unsubscribeRpcRef,
-    ]
-  );
-
-  const enterDemoMode = useCallback(() => {
-    selectionIntentRef.current += 1;
-    generationRef.current += 1;
-    clearReconnectTimer();
-    activeConfigRef.current = null;
-    setConnectionConfig(null);
-    releaseTransport(true);
-    setConnection({
-      status: "connected",
-      presence: "online",
-      desktopName: DEMO_DESKTOP_NAME,
-      tier: "full",
-      capabilities: { roundHistory: true, openSessionFile: false },
-      demoMode: true,
-    });
-    resetSessions(DEMO_SESSIONS);
-    showDemoTranscript(activeSessionRef.current ?? "demo");
-    resetSend();
-    resetPermissions();
-  }, [
-    showDemoTranscript,
-    clearReconnectTimer,
-    releaseTransport,
-    resetSessions,
-    resetPermissions,
-    resetSend,
-    activeConfigRef,
-    activeSessionRef,
-    generationRef,
-    selectionIntentRef,
-    setConnection,
-    setConnectionConfig,
-  ]);
-
-  useEffect(() => {
-    const handleVisible = () => {
-      const config = activeConfigRef.current;
-      clearReconnectTimer();
-      if (platform.runtime.isHidden()) {
-        preparationRef.current?.abort();
-        if (clientRef.current || socketRef.current) {
-          releaseTransport(true);
-          setConnection((previous) => ({
-            ...previous,
-            status: "connecting",
-            presence: "offline",
-            error: undefined,
-          }));
-        }
-        return;
-      }
-      if (config && !clientRef.current) {
-        void reconnect
-          .run(config, generationRef.current)
-          .catch(() => undefined);
-      }
-    };
-    return platform.runtime.subscribeVisibility(handleVisible);
-  }, [
-    clearReconnectTimer,
-    platform.runtime,
-    releaseTransport,
-    reconnect,
-    activeConfigRef,
-    clientRef,
-    generationRef,
-    preparationRef,
-    setConnection,
-    socketRef,
-  ]);
-
-  return {
-    persistConnection,
-    clearReconnectTimer,
-    releaseTransport,
-    enterDemoMode,
-  };
-}
diff --git a/src/modules/MobileRemote/app/useMobilePendingInbox.test.ts b/src/modules/MobileRemote/app/useMobilePendingInbox.test.ts
new file mode 100644
index 0000000000..df214fbec9
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobilePendingInbox.test.ts
@@ -0,0 +1,287 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import {
+  type Mock,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from "vitest";
+
+import type {
+  MobileRpcClient,
+  RpcNotificationHandler,
+} from "../connection/mobileRpcClient";
+import type { MobilePendingPermission } from "../connection/types";
+import type { MobileRemoteRuntimePort } from "../platform/types";
+import { useMobilePendingInbox } from "./useMobilePendingInbox";
+
+function deferred() {
+  let resolve!: (value: unknown) => void;
+  const promise = new Promise((yes) => {
+    resolve = yes;
+  });
+  return { promise, resolve };
+}
+const item = (requestId: string): MobilePendingPermission => ({
+  kind: "permission",
+  origin: "rust_agent",
+  sessionId: `session-${requestId}`,
+  requestId,
+  toolName: "shell",
+  toolArgs: { command: "pwd" },
+  createdAtMs: 1000,
+});
+const snapshot = (id: string, complete = true) => ({
+  interactions: [item(id)],
+  complete,
+});
+
+describe("useMobilePendingInbox", () => {
+  let root: ReturnType<typeof createRoot>;
+  let current: ReturnType<typeof useMobilePendingInbox>;
+  let hidden: boolean;
+  let visibility: Set<() => void>;
+  let notifications: Set<RpcNotificationHandler>;
+  let runtime: MobileRemoteRuntimePort;
+  let onSnapshot: Mock<(items: MobilePendingPermission[]) => void>;
+  let props: Parameters<typeof useMobilePendingInbox>[0];
+  function Harness() {
+    const value = useMobilePendingInbox(props);
+    React.useLayoutEffect(() => {
+      current = value;
+    });
+    return null;
+  }
+  async function render() {
+    await act(async () => root.render(React.createElement(Harness)));
+  }
+  function client(call: ReturnType<typeof vi.fn>) {
+    return {
+      call,
+      onNotification: (handler: RpcNotificationHandler) => {
+        notifications.add(handler);
+        return () => notifications.delete(handler);
+      },
+    } as unknown as MobileRpcClient;
+  }
+  async function push() {
+    await act(async () => {
+      for (const notify of notifications)
+        notify("interaction/pending_changed", {});
+    });
+  }
+  async function show(isHidden: boolean) {
+    await act(async () => {
+      hidden = isHidden;
+      for (const listener of visibility) listener();
+    });
+  }
+  beforeEach(() => {
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+    root = createRoot(document.createElement("div"));
+    hidden = false;
+    visibility = new Set();
+    notifications = new Set();
+    onSnapshot = vi.fn<(items: MobilePendingPermission[]) => void>();
+    runtime = {
+      now: () => Date.now(),
+      random: () => Math.random(),
+      randomUUID: () => crypto.randomUUID(),
+      setTimeout: (callback, delayMs) => window.setTimeout(callback, delayMs),
+      clearTimeout: (timeoutId) => window.clearTimeout(timeoutId),
+      portalContainer: () => document.body,
+      isHidden: () => hidden,
+      subscribeVisibility: (listener: () => void) => {
+        visibility.add(listener);
+        return () => visibility.delete(listener);
+      },
+    };
+    props = {
+      client: null,
+      scope: "desktop-a",
+      online: true,
+      supported: true,
+      runtime,
+      onSnapshot,
+    };
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    expect(visibility.size).toBe(0);
+    expect(notifications.size).toBe(0);
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  it("hydrates the global snapshot, then removes desktop-resolved requests on push", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(snapshot("pending"))
+      .mockResolvedValueOnce({ interactions: [], complete: true });
+    props.client = client(call);
+    await render();
+    expect(current.items).toEqual([item("pending")]);
+    expect(call).toHaveBeenCalledWith("interaction/pending_all", {});
+    await push();
+    expect(current).toMatchObject({
+      phase: "ready",
+      complete: true,
+      items: [],
+    });
+    expect(onSnapshot).toHaveBeenLastCalledWith([]);
+  });
+
+  it("coalesces notification bursts during an in-flight read and rejects its stale snapshot", async () => {
+    const old = deferred();
+    const latest = deferred();
+    const call = vi
+      .fn()
+      .mockReturnValueOnce(old.promise)
+      .mockReturnValueOnce(latest.promise);
+    props.client = client(call);
+    await render();
+    await push();
+    await push();
+    await push();
+    expect(call).toHaveBeenCalledTimes(1);
+    await act(async () => old.resolve(snapshot("old")));
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(onSnapshot).not.toHaveBeenCalled();
+    await act(async () => latest.resolve(snapshot("new")));
+    expect(current.items).toEqual([item("new")]);
+    expect(onSnapshot).toHaveBeenCalledTimes(1);
+  });
+
+  it("does no reads while hidden and revalidates once on visibility return", async () => {
+    hidden = true;
+    const call = vi.fn().mockResolvedValue(snapshot("visible"));
+    props.client = client(call);
+    await render();
+    await push();
+    await push();
+    expect(call).not.toHaveBeenCalled();
+    await show(false);
+    expect(call).toHaveBeenCalledTimes(1);
+    await show(true);
+    await push();
+    expect(call).toHaveBeenCalledTimes(1);
+    await show(false);
+    expect(call).toHaveBeenCalledTimes(2);
+  });
+
+  it("retains the known same-desktop snapshot offline without new calls", async () => {
+    const call = vi.fn().mockResolvedValue(snapshot("known"));
+    props.client = client(call);
+    await render();
+    props = { ...props, online: false };
+    await render();
+    await push();
+    expect(current.items).toEqual([item("known")]);
+    expect(call).toHaveBeenCalledTimes(1);
+  });
+
+  it("clears data across scope switch and rejects the old client's completion", async () => {
+    const old = deferred();
+    const next = deferred();
+    props.client = client(vi.fn().mockReturnValue(old.promise));
+    await render();
+    props = {
+      ...props,
+      scope: "desktop-b",
+      client: client(vi.fn().mockReturnValue(next.promise)),
+    };
+    await render();
+    expect(current.items).toEqual([]);
+    await act(async () => old.resolve(snapshot("old")));
+    expect(current.items).toEqual([]);
+    expect(onSnapshot).not.toHaveBeenCalled();
+    await act(async () => next.resolve(snapshot("new")));
+    expect(current.items).toEqual([item("new")]);
+    expect(notifications.size).toBe(1);
+    expect(visibility.size).toBe(1);
+  });
+
+  it("marks partial snapshots incomplete without authoritatively reconciling missing prompts", async () => {
+    props.client = client(
+      vi.fn().mockResolvedValue(snapshot("partial", false))
+    );
+    await render();
+    expect(current).toMatchObject({
+      phase: "ready",
+      complete: false,
+      items: [item("partial")],
+    });
+    expect(onSnapshot).not.toHaveBeenCalled();
+  });
+
+  it("retains known rows on failure and permits explicit retry", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(snapshot("known"))
+      .mockRejectedValueOnce(new Error("network"))
+      .mockResolvedValueOnce(snapshot("retried"));
+    props.client = client(call);
+    await render();
+    await push();
+    expect(current).toMatchObject({ phase: "error", items: [item("known")] });
+    await act(async () => current.refresh());
+    expect(current).toMatchObject({ phase: "ready", items: [item("retried")] });
+  });
+
+  it("does not request the RPC on unsupported Desktop versions", async () => {
+    const call = vi.fn();
+    props = { ...props, supported: false, client: client(call) };
+    await render();
+    await push();
+    await act(async () => current.refresh());
+    expect(call).not.toHaveBeenCalled();
+    expect(current.phase).toBe("unsupported");
+  });
+
+  it("unmount disposes listeners and prevents a late snapshot from reconciling", async () => {
+    const late = deferred();
+    props.client = client(vi.fn().mockReturnValue(late.promise));
+    await render();
+    await act(async () => root.unmount());
+    root = createRoot(document.createElement("div"));
+    await act(async () => late.resolve(snapshot("late")));
+    expect(onSnapshot).not.toHaveBeenCalled();
+    expect(notifications.size).toBe(0);
+    expect(visibility.size).toBe(0);
+  });
+
+  it.each([
+    null,
+    { interactions: [null], complete: true },
+    { interactions: [{ ...item("bad"), toolArgs: null }], complete: true },
+    {
+      interactions: [{ ...item("bad"), origin: ["rust_agent"] }],
+      complete: true,
+    },
+    { interactions: [{ ...item("bad"), createdAtMs: 1e20 }], complete: true },
+    { interactions: [item("bad")], complete: "true" },
+    {
+      interactions: Array.from({ length: 2001 }, (_, id) => item(String(id))),
+      complete: true,
+    },
+  ])(
+    "rejects malformed pending payload before global reconciliation (%#)",
+    async (payload) => {
+      props.client = client(vi.fn().mockResolvedValue(payload));
+      await render();
+      expect(current).toMatchObject({
+        phase: "error",
+        items: [],
+        complete: false,
+      });
+      expect(onSnapshot).not.toHaveBeenCalled();
+    }
+  );
+});
diff --git a/src/modules/MobileRemote/app/useMobilePendingInbox.ts b/src/modules/MobileRemote/app/useMobilePendingInbox.ts
new file mode 100644
index 0000000000..02621fcf0b
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobilePendingInbox.ts
@@ -0,0 +1,138 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+
+import { createLogger } from "@src/hooks/logger";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { isPendingPermissions } from "../connection/sessionDiscoveryContract";
+import type { MobilePendingPermission } from "../connection/types";
+import type { MobileRemoteRuntimePort } from "../platform/types";
+
+export interface MobilePendingInbox {
+  items: MobilePendingPermission[];
+  phase: "syncing" | "ready" | "error" | "unsupported";
+  complete: boolean;
+  refresh: () => void;
+}
+
+/** One connection-scoped snapshot owner, coalescing pushes; never polls. */
+export function useMobilePendingInbox({
+  client,
+  scope,
+  online,
+  supported,
+  runtime,
+  onSnapshot,
+}: {
+  client: MobileRpcClient | null;
+  scope: string;
+  online: boolean;
+  supported: boolean;
+  runtime: MobileRemoteRuntimePort;
+  onSnapshot: (items: MobilePendingPermission[]) => void;
+}): MobilePendingInbox {
+  const [state, setState] = useState<{
+    scope: string;
+    items: MobilePendingPermission[];
+    phase: MobilePendingInbox["phase"];
+    complete: boolean;
+  }>({ scope, items: [], phase: "syncing", complete: false });
+  const refreshRef = useRef(() => {});
+  const refresh = useCallback(() => refreshRef.current(), []);
+  useEffect(() => {
+    if (!supported) return;
+    let disposed = false;
+    let inFlight = false;
+    let dirty = true;
+    let version = 0;
+    const read = async () => {
+      if (
+        disposed ||
+        inFlight ||
+        !dirty ||
+        !online ||
+        !supported ||
+        !client ||
+        runtime.isHidden()
+      )
+        return;
+      dirty = false;
+      inFlight = true;
+      const started = version;
+      setState((prev) => ({
+        scope,
+        items: prev.scope === scope ? prev.items : [],
+        phase: "syncing",
+        complete: prev.scope === scope && prev.complete,
+      }));
+      try {
+        const reply = await client.call<{
+          interactions: MobilePendingPermission[];
+          complete: boolean;
+        }>("interaction/pending_all", {});
+        if (disposed || started !== version) return;
+        if (
+          !reply ||
+          !isPendingPermissions(reply.interactions) ||
+          typeof reply.complete !== "boolean"
+        )
+          throw new Error("Invalid pending snapshot");
+        setState({
+          scope,
+          items: reply.interactions,
+          phase: "ready",
+          complete: reply.complete,
+        });
+        // An incomplete snapshot cannot authoritatively delete missing prompts.
+        if (reply.complete) onSnapshot(reply.interactions);
+      } catch {
+        if (!disposed && started === version)
+          setState((prev) => ({
+            ...prev,
+            scope,
+            items: prev.scope === scope ? prev.items : [],
+            phase: "error",
+          }));
+      } finally {
+        inFlight = false;
+        if (!disposed && dirty)
+          void read().catch((error) =>
+            logger.warn("Background operation failed", error)
+          );
+      }
+    };
+    const invalidate = () => {
+      version++;
+      dirty = true;
+      void read().catch((error) =>
+        logger.warn("Background operation failed", error)
+      );
+    };
+    refreshRef.current = invalidate;
+    const unsubscribe = client?.onNotification((method) => {
+      if (method === "interaction/pending_changed") invalidate();
+    });
+    const unwatch = runtime.subscribeVisibility(() => {
+      if (!runtime.isHidden()) invalidate();
+    });
+    void read().catch((error) =>
+      logger.warn("Background operation failed", error)
+    );
+    return () => {
+      disposed = true;
+      refreshRef.current = () => {};
+      unsubscribe?.();
+      unwatch();
+    };
+  }, [client, scope, online, supported, runtime, onSnapshot]);
+  const scoped =
+    state.scope === scope
+      ? state
+      : { items: [], phase: "syncing" as const, complete: false };
+  return {
+    ...scoped,
+    phase: supported ? scoped.phase : "unsupported",
+    refresh,
+  };
+}
+
+const logger = createLogger("useMobilePendingInbox");
diff --git a/src/modules/MobileRemote/app/useMobilePermissions.discovery.test.ts b/src/modules/MobileRemote/app/useMobilePermissions.discovery.test.ts
new file mode 100644
index 0000000000..be1671bc1b
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobilePermissions.discovery.test.ts
@@ -0,0 +1,209 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { PermissionSheetRequest } from "@src/components/PermissionPrompt";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { useMobilePermissions } from "./useMobilePermissions";
+
+const request = (
+  requestId: string,
+  sessionId = "session-a"
+): PermissionSheetRequest => ({
+  requestId,
+  sessionId,
+  origin: "rust_agent",
+  toolName: "shell",
+  toolArgs: { command: "pwd" },
+});
+
+describe("useMobilePermissions inbox navigation", () => {
+  let root: ReturnType<typeof createRoot>;
+  let current: ReturnType<typeof useMobilePermissions>;
+  let sessionId: string | null;
+  let call: ReturnType<typeof vi.fn>;
+  let requireWritableClient: () => MobileRpcClient;
+  let renderedErrors: { requestId: string | undefined; failed: boolean }[];
+  function Harness() {
+    const value = useMobilePermissions({
+      sessionId,
+      demoMode: false,
+      requireWritableClient,
+    });
+    renderedErrors.push({
+      requestId: value.activePermission?.requestId,
+      failed: value.permissionFailed,
+    });
+    React.useLayoutEffect(() => {
+      current = value;
+    });
+    return null;
+  }
+  const render = () =>
+    act(async () => root.render(React.createElement(Harness)));
+  beforeEach(() => {
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+    root = createRoot(document.createElement("div"));
+    sessionId = null;
+    renderedErrors = [];
+    call = vi.fn().mockResolvedValue({});
+    const client = { call } as unknown as MobileRpcClient;
+    requireWritableClient = () => client;
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  it("selects the clicked pending request instead of the first request in that session", async () => {
+    await render();
+    await act(async () => {
+      current.reconcilePermissions([request("first"), request("clicked")]);
+      current.focusPermission("clicked");
+    });
+    sessionId = "session-a";
+    await render();
+    expect(current.activePermission?.requestId).toBe("clicked");
+    await act(async () => current.respondPermission("allow"));
+    expect(call).toHaveBeenCalledWith("interaction/respond_permission", {
+      sessionId: "session-a",
+      requestId: "clicked",
+      response: "allow",
+      origin: "rust_agent",
+    });
+    expect(current.activePermission?.requestId).toBe("first");
+  });
+
+  it("never selects a preferred request from another session", async () => {
+    sessionId = "session-b";
+    await render();
+    await act(async () => {
+      current.reconcilePermissions([
+        request("clicked"),
+        request("other", "session-b"),
+      ]);
+      current.focusPermission("clicked");
+    });
+    expect(current.activePermission?.requestId).toBe("other");
+    await act(async () => current.reconcilePermissions([]));
+    expect(current.activePermission).toBeNull();
+    await act(async () => current.respondPermission("allow"));
+    expect(call).not.toHaveBeenCalled();
+  });
+
+  it("session refresh does not delete unrelated pending requests", async () => {
+    sessionId = "session-b";
+    await render();
+    await act(async () =>
+      current.reconcilePermissions([
+        request("one"),
+        request("two", "session-b"),
+      ])
+    );
+    await act(async () => current.reconcileSessionPermissions("session-a", []));
+    expect(current.activePermission?.requestId).toBe("two");
+    expect(current.permissionQueueDepth).toBe(1);
+  });
+  it("keeps failed requests with safe feedback and clears feedback when retry succeeds", async () => {
+    sessionId = "session-a";
+    await render();
+    await act(async () =>
+      current.reconcilePermissions([request("one"), request("two")])
+    );
+    call.mockRejectedValueOnce(new Error("private-token"));
+    await act(async () => current.respondPermission("allow"));
+    expect(current.activePermission?.requestId).toBe("one");
+    expect(current.permissionFailed).toBe(true);
+    expect(current.permissionSubmitting).toBe(false);
+    await act(async () => current.respondPermission("deny"));
+    expect(current.activePermission?.requestId).toBe("two");
+    expect(current.permissionFailed).toBe(false);
+  });
+  it("clears failures when the request is resolved, dismissed, or reset", async () => {
+    sessionId = "session-a";
+    await render();
+    for (const clear of [
+      () => current.reconcileSessionPermissions("session-a", []),
+      () => current.dismissPermissionHead(),
+      () => current.resetPermissions(),
+    ]) {
+      await act(async () => current.reconcilePermissions([request("one")]));
+      call.mockRejectedValueOnce(new Error("offline"));
+      await act(async () => current.respondPermission("allow"));
+      expect(current.permissionFailed).toBe(true);
+      await act(async () => clear());
+      expect(current.permissionFailed).toBe(false);
+      expect(current.activePermission).toBeNull();
+    }
+  });
+  it("ignores a late failure after switching request and preserves the next submission lock", async () => {
+    sessionId = "session-a";
+    await render();
+    await act(async () =>
+      current.reconcilePermissions([request("one"), request("two")])
+    );
+    let rejectFirst!: (error: Error) => void;
+    let resolveNext!: (value: unknown) => void;
+    call.mockImplementationOnce(
+      () =>
+        new Promise((_, reject) => {
+          rejectFirst = reject;
+        })
+    );
+    let first!: Promise<void>;
+    await act(async () => {
+      first = current.respondPermission("allow");
+    });
+    await act(async () => current.focusPermission("two"));
+    call.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          resolveNext = resolve;
+        })
+    );
+    let next!: Promise<void>;
+    await act(async () => {
+      next = current.respondPermission("deny");
+    });
+    await act(async () => {
+      rejectFirst(new Error("old failure"));
+      await first;
+    });
+    expect(current.permissionFailed).toBe(false);
+    expect(current.permissionSubmitting).toBe(true);
+    expect(current.activePermission?.requestId).toBe("two");
+    await act(async () => {
+      resolveNext({});
+      await next;
+    });
+    expect(current.activePermission?.requestId).toBe("one");
+  });
+  it("does not carry failure feedback across session changes", async () => {
+    sessionId = "session-a";
+    await render();
+    await act(async () =>
+      current.reconcilePermissions([
+        request("one"),
+        request("two", "session-b"),
+      ])
+    );
+    call.mockRejectedValueOnce(new Error("offline"));
+    await act(async () => current.respondPermission("allow"));
+    sessionId = "session-b";
+    renderedErrors = [];
+    await render();
+    expect(current.permissionFailed).toBe(false);
+    expect(current.activePermission?.requestId).toBe("two");
+    expect(
+      renderedErrors
+        .filter((value) => value.requestId === "two")
+        .every((value) => !value.failed)
+    ).toBe(true);
+  });
+});
diff --git a/src/modules/MobileRemote/app/useMobilePermissions.ts b/src/modules/MobileRemote/app/useMobilePermissions.ts
index a5b157ead0..e54e4441ac 100644
--- a/src/modules/MobileRemote/app/useMobilePermissions.ts
+++ b/src/modules/MobileRemote/app/useMobilePermissions.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
 import type { PermissionSheetRequest } from "@src/components/PermissionPrompt";
 
@@ -24,11 +24,34 @@ export function useMobilePermissions({
 }) {
   const [queue, setQueue] = useState<InteractionQueueState>({ queue: [] });
   const [permissionSubmitting, setSubmitting] = useState(false);
+  const [failedRequestKey, setFailed] = useState<string | null>(null);
+  const [preferredRequestId, focusPermission] = useState<string | null>(null);
+  const head =
+    queue.queue.find(
+      (row) =>
+        row.requestId === preferredRequestId && row.sessionId === sessionId
+    ) ?? peekPermissionRequest(queue, sessionId);
+  const requestKey = head
+    ? JSON.stringify([head.sessionId, head.requestId])
+    : null;
+  const permissionFailed =
+    requestKey !== null && failedRequestKey === requestKey;
   const inFlight = useRef<symbol | null>(null);
+  // A result belongs to the visible request, never the next prompt or session.
+  useEffect(() => {
+    inFlight.current = null;
+    setSubmitting(false);
+    setFailed(null);
+    return () => {
+      inFlight.current = null;
+    };
+  }, [head?.sessionId, head?.requestId]);
   const resetPermissions = useCallback(
     (requests: PermissionSheetRequest[] = []) => {
       inFlight.current = null;
       setSubmitting(false);
+      setFailed(null);
+      focusPermission(null);
       setQueue({ queue: requests });
     },
     []
@@ -36,13 +59,30 @@ export function useMobilePermissions({
   const receivePermissionEvent = useCallback((event: PermissionBusEnvelope) => {
     setQueue((previous) => reduceInteractionQueueFromBusEvent(previous, event));
   }, []);
+  const reconcilePermissions = useCallback(
+    (requests: PermissionSheetRequest[]) => {
+      setQueue({ queue: requests });
+    },
+    []
+  );
+  const reconcileSessionPermissions = useCallback(
+    (sessionId: string, requests: PermissionSheetRequest[]) => {
+      setQueue((previous) => ({
+        queue: [
+          ...previous.queue.filter((row) => row.sessionId !== sessionId),
+          ...requests.filter((row) => row.sessionId === sessionId),
+        ],
+      }));
+    },
+    []
+  );
   const respondPermission = useCallback(
     async (response: "allow" | "deny" | "always_allow") => {
-      const head = peekPermissionRequest(queue, sessionId);
       if (!head || inFlight.current) return;
       const token = Symbol("permission-response");
       inFlight.current = token;
       setSubmitting(true);
+      setFailed(null);
       try {
         if (!demoMode) {
           await requireWritableClient().call("interaction/respond_permission", {
@@ -56,6 +96,9 @@ export function useMobilePermissions({
         setQueue((previous) =>
           dequeuePermissionRequest(previous, head.requestId)
         );
+      } catch {
+        // Keep the request available for retry; transport details can contain secrets.
+        if (inFlight.current === token) setFailed(requestKey);
       } finally {
         if (inFlight.current === token) {
           inFlight.current = null;
@@ -63,23 +106,26 @@ export function useMobilePermissions({
         }
       }
     },
-    [queue, sessionId, demoMode, requireWritableClient]
+    [head, requestKey, demoMode, requireWritableClient]
   );
   const dismissPermissionHead = useCallback(() => {
     if (inFlight.current) return;
-    const head = peekPermissionRequest(queue, sessionId);
     if (head)
       setQueue((previous) =>
         dequeuePermissionRequest(previous, head.requestId)
       );
-  }, [queue, sessionId]);
+  }, [head]);
   return {
-    activePermission: peekPermissionRequest(queue, sessionId),
+    activePermission: head,
+    focusPermission,
     permissionQueueDepth: countPermissionRequests(queue, sessionId),
     permissionSubmitting,
+    permissionFailed,
     respondPermission,
     dismissPermissionHead,
     resetPermissions,
     receivePermissionEvent,
+    reconcilePermissions,
+    reconcileSessionPermissions,
   };
 }
diff --git a/src/modules/MobileRemote/app/useMobileReadStateSync.ts b/src/modules/MobileRemote/app/useMobileReadStateSync.ts
new file mode 100644
index 0000000000..d3f56a401f
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobileReadStateSync.ts
@@ -0,0 +1,40 @@
+import {
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useSyncExternalStore,
+} from "react";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import {
+  type MobileReadStateSync,
+  createMobileReadStateSync,
+} from "./mobileReadStateSync";
+
+export function useMobileReadStateSync(
+  client: MobileRpcClient | null,
+  scope: string
+) {
+  const sync = useMemo(() => createMobileReadStateSync(), []);
+  useLayoutEffect(() => {
+    sync.connect(client, scope);
+    return () => sync.connect(null, scope);
+  }, [client, scope, sync]);
+  useEffect(() => () => sync.dispose(), [sync]);
+  return sync;
+}
+
+const emptyVisited: ReadonlyMap<string, boolean> = new Map();
+const emptySnapshot = () => emptyVisited;
+const emptySubscribe = () => () => undefined;
+
+/** Only the visible session list subscribes, not the entire connection/chat provider. */
+export function useMobileVisitedSessions(
+  sync: MobileReadStateSync | undefined
+) {
+  return useSyncExternalStore(
+    sync?.subscribe ?? emptySubscribe,
+    sync?.getSnapshot ?? emptySnapshot,
+    sync?.getSnapshot ?? emptySnapshot
+  );
+}
diff --git a/src/modules/MobileRemote/app/useMobileRemoteState.ts b/src/modules/MobileRemote/app/useMobileRemoteState.ts
new file mode 100644
index 0000000000..94d202354b
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobileRemoteState.ts
@@ -0,0 +1,313 @@
+import {
+  useCallback,
+  useContext,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+
+import { MobileAuthContext } from "../auth/MobileAuthContext";
+import {
+  createMobileComposerDraftStore,
+  mobileComposerDesktopScope,
+} from "../components/composer/mobileComposerDraftStore";
+import { type MobileRpcClient } from "../connection/mobileRpcClient";
+import { createRemoteReconnectController } from "../connection/remoteReconnectController";
+import type {
+  MobileConnectionConfig,
+  MobileConnectionState,
+  MobilePairedDesktopSummary,
+} from "../connection/types";
+import { DEMO_PERMISSION_REQUEST } from "../demo/demoFixtures";
+import { useMobileRemotePlatform } from "../platform";
+import type { MobileRemoteProvidersProps } from "./MobileRemoteContext";
+import { useMobilePendingInbox } from "./useMobilePendingInbox";
+import { useMobilePermissions } from "./useMobilePermissions";
+import { useMobileReadStateSync } from "./useMobileReadStateSync";
+import { useMobileSend } from "./useMobileSend";
+import { useMobileSessionList } from "./useMobileSessionList";
+import { useMobileSessionModel } from "./useMobileSessionModel";
+import { useMobileTranscript } from "./useMobileTranscript";
+
+export function useMobileRemoteState({
+  authUserId,
+  relayUrl,
+  demoByDefault = true,
+  suppressInitialBootstrap = false,
+}: Omit<MobileRemoteProvidersProps, "children">) {
+  const platform = useMobileRemotePlatform();
+  const auth = useContext(MobileAuthContext);
+  const draftScope = JSON.stringify([
+    authUserId,
+    auth?.session.supabaseUrl,
+    relayUrl,
+  ]);
+  const draftStore = useMemo(() => {
+    // A new authenticated desktop scope owns a fresh draft store.
+    void draftScope;
+    return createMobileComposerDraftStore();
+  }, [draftScope]);
+  useEffect(() => () => draftStore.clear(), [draftStore]);
+  const authRef = useRef(auth);
+  useLayoutEffect(() => {
+    authRef.current = auth;
+  }, [auth]);
+  const preparationRef = useRef<AbortController | null>(null);
+  const clientRef = useRef<MobileRpcClient | null>(null);
+  const [rpc, setRpc] = useState<MobileRpcClient | null>(null);
+  const permissionRevisionRef = useRef(0);
+  const socketRef = useRef<WebSocket | null>(null);
+  const activeSessionRef = useRef<string | null>(null);
+  const unsubscribeRpcRef = useRef<(() => void) | null>(null);
+  const activeConfigRef = useRef<MobileConnectionConfig | null>(null);
+  const generationRef = useRef(0);
+  const selectionIntentRef = useRef(0);
+  const retryFlightRef = useRef<Promise<boolean> | null>(null);
+  const recoverRef = useRef<
+    (config: MobileConnectionConfig, generation: number) => Promise<void>
+  >(async () => undefined);
+  const isCurrentGeneration = useCallback(
+    (generation: number) => generation === generationRef.current,
+    []
+  );
+  const recoverConnection = useCallback(
+    (config: MobileConnectionConfig, generation: number) =>
+      recoverRef.current(config, generation),
+    []
+  );
+  const reconnect = useMemo(
+    () =>
+      createRemoteReconnectController(
+        platform.runtime,
+        // Factory stores this predicate; it only reads refs when a recovery runs.
+        // eslint-disable-next-line react-hooks/refs
+        isCurrentGeneration,
+        // Factory stores this callback without invoking it during render.
+        // eslint-disable-next-line react-hooks/refs
+        recoverConnection
+      ),
+    [platform.runtime, isCurrentGeneration, recoverConnection]
+  );
+  const connectionWriteChainRef = useRef<Promise<void>>(Promise.resolve());
+  const inventoryRevisionRef = useRef(0);
+  const scheduleReconnectRef = useRef<
+    (config: MobileConnectionConfig, generation: number) => void
+  >(() => undefined);
+
+  const [connection, setConnection] = useState<MobileConnectionState>({
+    status: "disconnected",
+    presence: "unknown",
+    demoMode: demoByDefault && !suppressInitialBootstrap,
+  });
+  const [connectionConfig, setConnectionConfig] =
+    useState<MobileConnectionConfig | null>(null);
+  const [bootstrapPending, setBootstrapPending] = useState(
+    !suppressInitialBootstrap
+  );
+  const [pairedDesktops, setPairedDesktops] = useState<
+    MobilePairedDesktopSummary[]
+  >([]);
+  const connectionRef = useRef(connection);
+  useLayoutEffect(() => {
+    connectionRef.current = connection;
+  }, [connection]);
+  const readStateSync = useMobileReadStateSync(
+    connection.status === "connected" &&
+      connection.presence === "online" &&
+      connection.capabilities?.sessionReadState === true
+      ? rpc
+      : null,
+    JSON.stringify([
+      authUserId,
+      auth?.session.supabaseUrl,
+      mobileComposerDesktopScope(connectionConfig, connection),
+    ])
+  );
+  const { sessions, sessionsHasMore, requestSessionList, resetSessions } =
+    useMobileSessionList(clientRef);
+  const {
+    openingClient,
+    openedSession,
+    releaseOpening,
+    transcript,
+    setTranscript,
+    transcriptView,
+    beginLoad,
+    resetTranscript,
+    showDemoTranscript,
+    failLoad,
+    invalidateTranscriptRequests,
+    requestSessionSnapshot,
+    refreshSubscribedSession,
+    receiveSnapshot,
+    selectRound,
+    retrySelectedRound,
+  } = useMobileTranscript({
+    clientRef,
+    connectionRef,
+    activeSessionRef,
+    connection,
+  });
+  const requireWritableClient = useCallback((): MobileRpcClient => {
+    const client = clientRef.current;
+    if (
+      !client ||
+      connection.status !== "connected" ||
+      connection.presence !== "online"
+    ) {
+      throw new Error("Desktop is offline");
+    }
+    if (connection.tier === "read_only") {
+      throw new Error("This device has read-only access");
+    }
+    return client;
+  }, [connection.presence, connection.status, connection.tier]);
+
+  const {
+    activePermission,
+    focusPermission,
+    permissionQueueDepth,
+    permissionSubmitting,
+    permissionFailed,
+    respondPermission,
+    dismissPermissionHead,
+    resetPermissions,
+    receivePermissionEvent,
+    reconcilePermissions,
+    reconcileSessionPermissions,
+  } = useMobilePermissions({
+    sessionId: transcript.sessionId,
+    demoMode: connection.demoMode,
+    requireWritableClient,
+  });
+
+  const pendingInbox = useMobilePendingInbox({
+    client: rpc,
+    scope: JSON.stringify([
+      authUserId,
+      relayUrl,
+      connectionConfig?.desktopId ?? connection.desktopId,
+      connectionConfig?.host,
+      connectionConfig?.port,
+    ]),
+    online:
+      connection.status === "connected" && connection.presence === "online",
+    supported: connection.capabilities?.pendingInteractions === true,
+    runtime: platform.runtime,
+    onSnapshot: reconcilePermissions,
+  });
+
+  const {
+    sessionModel,
+    refreshSessionModel,
+    loadSessionModels,
+    setSessionModel,
+    resetSessionModel,
+  } = useMobileSessionModel({
+    clientRef,
+    connectionRef,
+    activeSessionRef,
+    requireWritableClient,
+  });
+
+  const onDemoSend = useCallback(
+    (sessionId: string) =>
+      resetPermissions([{ ...DEMO_PERMISSION_REQUEST, sessionId }]),
+    [resetPermissions]
+  );
+  const {
+    sendStatus,
+    resetSend,
+    receiveTerminal,
+    receiveSendStatus,
+    sendMessage,
+  } = useMobileSend({
+    demoMode: connection.demoMode,
+    runtime: platform.runtime,
+    model: sessionModel.config?.model,
+    requireWritableClient,
+    setTranscript,
+    onDemoSend,
+  });
+
+  return {
+    platform,
+    auth,
+    draftStore,
+    authRef,
+    preparationRef,
+    clientRef,
+    rpc,
+    setRpc,
+    permissionRevisionRef,
+    socketRef,
+    activeSessionRef,
+    unsubscribeRpcRef,
+    activeConfigRef,
+    generationRef,
+    selectionIntentRef,
+    retryFlightRef,
+    recoverRef,
+    reconnect,
+    connectionWriteChainRef,
+    inventoryRevisionRef,
+    scheduleReconnectRef,
+    connection,
+    setConnection,
+    connectionConfig,
+    setConnectionConfig,
+    bootstrapPending,
+    setBootstrapPending,
+    pairedDesktops,
+    setPairedDesktops,
+    connectionRef,
+    readStateSync,
+    sessions,
+    sessionsHasMore,
+    requestSessionList,
+    resetSessions,
+    openingClient,
+    openedSession,
+    releaseOpening,
+    transcript,
+    setTranscript,
+    transcriptView,
+    beginLoad,
+    resetTranscript,
+    showDemoTranscript,
+    failLoad,
+    invalidateTranscriptRequests,
+    requestSessionSnapshot,
+    refreshSubscribedSession,
+    receiveSnapshot,
+    selectRound,
+    retrySelectedRound,
+    requireWritableClient,
+    activePermission,
+    focusPermission,
+    permissionQueueDepth,
+    permissionSubmitting,
+    permissionFailed,
+    respondPermission,
+    dismissPermissionHead,
+    resetPermissions,
+    receivePermissionEvent,
+    reconcilePermissions,
+    reconcileSessionPermissions,
+    pendingInbox,
+    sessionModel,
+    refreshSessionModel,
+    loadSessionModels,
+    setSessionModel,
+    resetSessionModel,
+    onDemoSend,
+    sendStatus,
+    resetSend,
+    receiveTerminal,
+    receiveSendStatus,
+    sendMessage,
+  };
+}
+export type MobileRemoteState = ReturnType<typeof useMobileRemoteState>;
diff --git a/src/modules/MobileRemote/app/useMobileRpcNotifications.ts b/src/modules/MobileRemote/app/useMobileRpcNotifications.ts
index 2b8c770275..685efc9e90 100644
--- a/src/modules/MobileRemote/app/useMobileRpcNotifications.ts
+++ b/src/modules/MobileRemote/app/useMobileRpcNotifications.ts
@@ -1,54 +1,79 @@
-import { type Dispatch, type SetStateAction, useCallback } from "react";
+import { useCallback } from "react";
 
 import type { MobileConnectionState } from "../connection/types";
 import type { PermissionBusEnvelope } from "../lib/interactionQueue";
 import type { TranscriptSnapshotEnvelope } from "../lib/transcriptLoadState";
-import type { MobileConnectionRefs } from "./useMobileConnectionRefs";
-import type { useMobilePermissions } from "./useMobilePermissions";
-import {
-  terminalSignalFromBusEvent,
-  type useMobileSend,
-} from "./useMobileSend";
-import type { useMobileSessionList } from "./useMobileSessionList";
-import type { useMobileTranscript } from "./useMobileTranscript";
+import type { MobileRemoteState } from "./useMobileRemoteState";
+import { terminalSignalFromBusEvent } from "./useMobileSend";
 
-type TranscriptApi = ReturnType<typeof useMobileTranscript>;
-type SendApi = ReturnType<typeof useMobileSend>;
-
-interface UseMobileRpcNotificationsParams {
-  refs: Pick<MobileConnectionRefs, "clientRef" | "activeSessionRef">;
-  setConnection: Dispatch<SetStateAction<MobileConnectionState>>;
-  requestSessionList: ReturnType<
-    typeof useMobileSessionList
-  >["requestSessionList"];
-  receivePermissionEvent: ReturnType<
-    typeof useMobilePermissions
-  >["receivePermissionEvent"];
-  receiveTerminal: SendApi["receiveTerminal"];
-  receiveSendStatus: SendApi["receiveSendStatus"];
-  receiveSnapshot: TranscriptApi["receiveSnapshot"];
-  refreshSubscribedSession: TranscriptApi["refreshSubscribedSession"];
-}
-
-/** Routes desktop-originated RPC notifications to their owning hook. */
-export function useMobileRpcNotifications({
-  refs,
-  setConnection,
-  requestSessionList,
-  receivePermissionEvent,
-  receiveTerminal,
-  receiveSendStatus,
-  receiveSnapshot,
-  refreshSubscribedSession,
-}: UseMobileRpcNotificationsParams) {
-  const { clientRef, activeSessionRef } = refs;
+export function useMobileRpcNotifications(
+  state: MobileRemoteState,
+  releaseTransport: (close: boolean) => void
+) {
+  const {
+    clientRef,
+    permissionRevisionRef,
+    activeSessionRef,
+    activeConfigRef,
+    generationRef,
+    scheduleReconnectRef,
+    setConnection,
+    connectionRef,
+    requestSessionList,
+    refreshSubscribedSession,
+    receiveSnapshot,
+    receivePermissionEvent,
+    receiveTerminal,
+    receiveSendStatus,
+  } = state;
   const handleRpcNotification = useCallback(
     (method: string, params: Record<string, unknown> | undefined) => {
+      if (method === "interaction/pending_changed") {
+        permissionRevisionRef.current++;
+        return;
+      }
       if (method === "relay/presence") {
-        setConnection((prev) => ({
-          ...prev,
+        const previous = connectionRef.current;
+        const next: MobileConnectionState = {
+          ...previous,
           presence: params?.online === true ? "online" : "offline",
-        }));
+        };
+        // Relay can retain the phone socket while replacing the Desktop actor.
+        // Presence is an invalidation edge, not just a status-dot update. Write
+        // the edge synchronously so duplicate notifications cannot refresh twice.
+        connectionRef.current = next;
+        setConnection(next);
+        const client = clientRef.current;
+        if (
+          client &&
+          previous.status === "connected" &&
+          previous.presence !== "online" &&
+          next.presence === "online"
+        ) {
+          const generation = generationRef.current;
+          void requestSessionList(client).catch(() => {
+            if (
+              clientRef.current !== client ||
+              generationRef.current !== generation ||
+              connectionRef.current.presence !== "online"
+            )
+              return;
+            const config = activeConfigRef.current;
+            if (!config || config.pairingCode) return;
+            // A failed recovery must not leave an empty, apparently online UI.
+            // Reuse the bounded, visibility-aware reconnect owner.
+            releaseTransport(true);
+            setConnection((prev) => ({
+              ...prev,
+              status: "connecting",
+              presence: "offline",
+            }));
+            scheduleReconnectRef.current(config, generation);
+          });
+          // Desktop's recreated actor also lost its active transcript subscription.
+          if (activeSessionRef.current)
+            refreshSubscribedSession(activeSessionRef.current);
+        }
         return;
       }
       if (method === "orgii/event") {
@@ -85,15 +110,21 @@ export function useMobileRpcNotifications({
       }
     },
     [
+      permissionRevisionRef,
+      connectionRef,
+      setConnection,
+      clientRef,
+      generationRef,
       requestSessionList,
+      activeSessionRef,
+      refreshSubscribedSession,
+      activeConfigRef,
+      releaseTransport,
+      scheduleReconnectRef,
       receivePermissionEvent,
       receiveTerminal,
-      receiveSendStatus,
       receiveSnapshot,
-      refreshSubscribedSession,
-      activeSessionRef,
-      clientRef,
-      setConnection,
+      receiveSendStatus,
     ]
   );
 
diff --git a/src/modules/MobileRemote/app/useMobileSessionActions.ts b/src/modules/MobileRemote/app/useMobileSessionActions.ts
index 0c53147987..4b5b42b272 100644
--- a/src/modules/MobileRemote/app/useMobileSessionActions.ts
+++ b/src/modules/MobileRemote/app/useMobileSessionActions.ts
@@ -1,56 +1,34 @@
-import { type RefObject, useCallback } from "react";
+import { useCallback } from "react";
 
-import type { MobileRpcClient } from "../connection/mobileRpcClient";
-import type { MobileConnectionState } from "../connection/types";
-import { DEMO_SESSIONS } from "../demo/demoFixtures";
-import type { MobileConnectionRefs } from "./useMobileConnectionRefs";
-import type { useMobileSend } from "./useMobileSend";
-import type { useMobileSessionList } from "./useMobileSessionList";
-import type { useMobileSessionModel } from "./useMobileSessionModel";
-import type { useMobileTranscript } from "./useMobileTranscript";
-
-type TranscriptApi = ReturnType<typeof useMobileTranscript>;
-type SessionListApi = ReturnType<typeof useMobileSessionList>;
-type SessionModelApi = ReturnType<typeof useMobileSessionModel>;
+import type { PermissionSheetRequest } from "@src/components/PermissionPrompt";
 
-interface UseMobileSessionActionsParams {
-  connection: MobileConnectionState;
-  connectionRef: RefObject<MobileConnectionState>;
-  refs: Pick<MobileConnectionRefs, "clientRef" | "activeSessionRef">;
-  sessionsHasMore: boolean;
-  requireWritableClient: () => MobileRpcClient;
-  requestSessionList: SessionListApi["requestSessionList"];
-  resetSessions: SessionListApi["resetSessions"];
-  resetSend: ReturnType<typeof useMobileSend>["resetSend"];
-  beginLoad: TranscriptApi["beginLoad"];
-  failLoad: TranscriptApi["failLoad"];
-  showDemoTranscript: TranscriptApi["showDemoTranscript"];
-  requestSessionSnapshot: TranscriptApi["requestSessionSnapshot"];
-  resetTranscript: TranscriptApi["resetTranscript"];
-  refreshSessionModel: SessionModelApi["refreshSessionModel"];
-  resetSessionModel: SessionModelApi["resetSessionModel"];
-}
-
-/** Session-scoped RPC actions exposed through the provider context. */
-export function useMobileSessionActions({
-  connection,
-  connectionRef,
-  refs,
-  sessionsHasMore,
-  requireWritableClient,
-  requestSessionList,
-  resetSessions,
-  resetSend,
-  beginLoad,
-  failLoad,
-  showDemoTranscript,
-  requestSessionSnapshot,
-  resetTranscript,
-  refreshSessionModel,
-  resetSessionModel,
-}: UseMobileSessionActionsParams) {
-  const { clientRef, activeSessionRef } = refs;
+import { isPendingPermissions } from "../connection/sessionDiscoveryContract";
+import { DEMO_SESSIONS } from "../demo/demoFixtures";
+import type { MobileRemoteState } from "./useMobileRemoteState";
 
+export function useMobileSessionActions(state: MobileRemoteState) {
+  const {
+    clientRef,
+    permissionRevisionRef,
+    activeSessionRef,
+    connection,
+    connectionRef,
+    readStateSync,
+    sessionsHasMore,
+    requestSessionList,
+    resetSessions,
+    releaseOpening,
+    beginLoad,
+    resetTranscript,
+    showDemoTranscript,
+    failLoad,
+    requestSessionSnapshot,
+    requireWritableClient,
+    reconcileSessionPermissions,
+    refreshSessionModel,
+    resetSessionModel,
+    resetSend,
+  } = state;
   const refreshSessions = useCallback(async () => {
     if (connection.demoMode) {
       resetSessions(DEMO_SESSIONS);
@@ -58,20 +36,22 @@ export function useMobileSessionActions({
     }
     const client = clientRef.current;
     if (!client || connection.presence !== "online") return;
+    readStateSync.refresh();
     await requestSessionList(client);
   }, [
     connection.demoMode,
     connection.presence,
+    clientRef,
+    readStateSync,
     requestSessionList,
     resetSessions,
-    clientRef,
   ]);
 
   const loadMoreSessions = useCallback(async () => {
     const client = clientRef.current;
     if (!client || connection.presence !== "online" || !sessionsHasMore) return;
     await requestSessionList(client, true);
-  }, [connection.presence, sessionsHasMore, requestSessionList, clientRef]);
+  }, [clientRef, connection.presence, sessionsHasMore, requestSessionList]);
 
   const subscribeSession = useCallback(
     async (sessionId: string) => {
@@ -96,39 +76,65 @@ export function useMobileSessionActions({
         subscriptionGeneration
       );
       if (!applied) return;
-      await refreshSessionModel(sessionId);
+      const canonicalId = activeSessionRef.current;
+      if (!canonicalId || clientRef.current !== client) return;
+      // Model hydration must progress even when permission recovery stalls/fails.
+      const modelReady = refreshSessionModel(canonicalId);
+      if (currentConnection.capabilities?.pendingInteractions) {
+        const revision = permissionRevisionRef.current;
+        const pending = await client
+          .call<{
+            interactions: PermissionSheetRequest[];
+            complete: boolean;
+          }>("interaction/pending", { sessionId: canonicalId })
+          .catch(() => null);
+        if (
+          clientRef.current === client &&
+          activeSessionRef.current === canonicalId &&
+          revision === permissionRevisionRef.current &&
+          pending?.complete &&
+          isPendingPermissions(pending.interactions)
+        ) {
+          reconcileSessionPermissions(canonicalId, pending.interactions);
+        }
+      }
+      await modelReady;
     },
     [
-      refreshSessionModel,
-      requestSessionSnapshot,
+      activeSessionRef,
       resetSend,
       beginLoad,
-      failLoad,
-      showDemoTranscript,
-      activeSessionRef,
-      clientRef,
       connectionRef,
+      clientRef,
+      requestSessionSnapshot,
+      refreshSessionModel,
+      showDemoTranscript,
+      failLoad,
+      permissionRevisionRef,
+      reconcileSessionPermissions,
     ]
   );
 
   const unsubscribeSession = useCallback(async () => {
     const sessionId = activeSessionRef.current;
+    const releasedOpening = releaseOpening();
     activeSessionRef.current = null;
     resetTranscript();
     resetSend();
     resetSessionModel();
     const currentConnection = connectionRef.current;
-    if (currentConnection.demoMode || !sessionId) return;
+    if (currentConnection.demoMode || !sessionId || releasedOpening) return;
     if (clientRef.current && currentConnection.presence === "online") {
       await clientRef.current.call("session/unsubscribe", { sessionId });
     }
   }, [
-    resetSessionModel,
-    resetSend,
-    resetTranscript,
     activeSessionRef,
-    clientRef,
+    releaseOpening,
+    resetTranscript,
+    resetSend,
+    resetSessionModel,
     connectionRef,
+    clientRef,
   ]);
 
   const openSessionFileInDesktop = useCallback(
diff --git a/src/modules/MobileRemote/app/useMobileSessionIdentity.ts b/src/modules/MobileRemote/app/useMobileSessionIdentity.ts
new file mode 100644
index 0000000000..72f8419886
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobileSessionIdentity.ts
@@ -0,0 +1,96 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import {
+  MobileSessionIdentityInvalidated,
+  cachedMobileSessionIdentity,
+  invalidateMobileSessionIdentities,
+  resolveMobileSessionIdentity,
+} from "../connection/mobileSessionIdentityCache";
+
+type Resolution = {
+  client: MobileRpcClient;
+  requested: string;
+  sessionId?: string;
+  managed?: boolean;
+  error?: string;
+};
+
+/** Resolve before mounting chat so config, send, stop and subscription share an owner. */
+export function useMobileSessionIdentity(
+  client: MobileRpcClient | null,
+  requested: string,
+  supported: boolean,
+  online: boolean
+) {
+  const [resolution, setResolution] = useState<Resolution | null>(null);
+  const [previousOnline, setPreviousOnline] = useState(online);
+  const [attempt, setAttempt] = useState(0);
+  // A relay can restore Desktop on the same phone socket. An error belongs
+  // to the old presence interval, not the recovered actor. Adjust it before
+  // committing children; keep successful history readable while offline.
+  if (previousOnline !== online) {
+    setPreviousOnline(online);
+    if (online || resolution?.error) setResolution(null);
+  }
+  const retry = useCallback(() => {
+    setResolution(null);
+    setAttempt((value) => value + 1);
+  }, []);
+  const cached =
+    client && online
+      ? cachedMobileSessionIdentity(client, requested)
+      : undefined;
+  const cachedResolution = useMemo(
+    () => (cached && client ? { client, requested, ...cached } : null),
+    [cached, client, requested]
+  );
+  // Retain a cache hit in this mounted view as well, so taking the connection
+  // offline does not erase already displayed read-only content.
+  if (cachedResolution && resolution !== cachedResolution) {
+    setResolution(cachedResolution);
+  }
+  const current: Resolution | null =
+    resolution?.client === client &&
+    (resolution?.requested === requested || resolution?.sessionId === requested)
+      ? resolution
+      : cachedResolution;
+  useEffect(() => {
+    if (client && !online) invalidateMobileSessionIdentities(client);
+    if (!supported || !online || !client || current) return;
+    let active = true;
+    void resolveMobileSessionIdentity(client, requested)
+      .then((result) => {
+        if (active) {
+          setResolution({
+            client,
+            requested,
+            sessionId: result.sessionId,
+            managed: result.managed,
+          });
+        }
+      })
+      .catch((error: unknown) => {
+        if (active) {
+          if (error instanceof MobileSessionIdentityInvalidated) {
+            setAttempt((value) => value + 1);
+            return;
+          }
+          setResolution({
+            client,
+            requested,
+            error: error instanceof Error ? error.message : String(error),
+          });
+        }
+      });
+    return () => {
+      active = false;
+    };
+  }, [client, requested, supported, online, attempt, current]);
+  return {
+    sessionId: supported ? current?.sessionId : requested,
+    managed: supported && current?.managed === true,
+    error: current?.error,
+    retry,
+  };
+}
diff --git a/src/modules/MobileRemote/app/useMobileSessionList.test.ts b/src/modules/MobileRemote/app/useMobileSessionList.test.ts
index acfd5f1b33..e296c48aa1 100644
--- a/src/modules/MobileRemote/app/useMobileSessionList.test.ts
+++ b/src/modules/MobileRemote/app/useMobileSessionList.test.ts
@@ -48,7 +48,10 @@ describe("useMobileSessionList", () => {
       await act(async () => roster.resetSessions());
       expect(roster.sessionsHasMore).toBe(false);
       await act(async () => roster.requestSessionList(client));
-      expect(call).toHaveBeenLastCalledWith("session/list", { offset: 0 });
+      expect(call).toHaveBeenLastCalledWith("session/list", {
+        offset: 0,
+        limit: 200,
+      });
     } finally {
       await act(async () => root.unmount());
       env.IS_REACT_ACT_ENVIRONMENT = false;
diff --git a/src/modules/MobileRemote/app/useMobileSessionList.ts b/src/modules/MobileRemote/app/useMobileSessionList.ts
index f42c937c88..214a740164 100644
--- a/src/modules/MobileRemote/app/useMobileSessionList.ts
+++ b/src/modules/MobileRemote/app/useMobileSessionList.ts
@@ -7,6 +7,7 @@ import {
 } from "react";
 
 import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { hasValidSessionPresentation } from "../connection/sessionDiscoveryContract";
 import type { MobileSessionRow } from "../connection/types";
 
 /** Owns roster pagination and invalidation, not the transport lifetime. */
@@ -17,6 +18,7 @@ export function useMobileSessionList(
   const [sessionsHasMore, setSessionsHasMore] = useState(false);
   const sessionNextOffsetRef = useRef(0);
   const sessionListGenerationRef = useRef(0);
+  const snapshotRevisionRef = useRef(0);
   const flightRef = useRef<{
     client: MobileRpcClient;
     generation: number;
@@ -30,6 +32,7 @@ export function useMobileSessionList(
       append: boolean,
       requestGeneration: number
     ) => {
+      const snapshotRevision = snapshotRevisionRef.current;
       const targetOffset = append
         ? sessionNextOffsetRef.current + 50
         : Math.max(50, sessionNextOffsetRef.current);
@@ -41,12 +44,23 @@ export function useMobileSessionList(
       } = {};
       const rows: MobileSessionRow[] = [];
       do {
-        list = await client.call<typeof list>("session/list", { offset });
+        list = await client.call<typeof list>("session/list", {
+          offset,
+          limit: 200,
+        });
         if (
           requestGeneration !== sessionListGenerationRef.current ||
+          snapshotRevision !== snapshotRevisionRef.current ||
           clientRef.current !== client
         )
           return;
+        if (
+          list.sessions &&
+          (!Array.isArray(list.sessions) ||
+            !list.sessions.every(hasValidSessionPresentation))
+        ) {
+          throw new Error("Invalid session presentation metadata");
+        }
         rows.push(...(list.sessions ?? []));
         const next = list.nextOffset;
         if (!Number.isSafeInteger(next) || next! <= offset) {
@@ -57,6 +71,7 @@ export function useMobileSessionList(
       } while (list.hasMore && offset < targetOffset);
       if (
         requestGeneration !== sessionListGenerationRef.current ||
+        snapshotRevision !== snapshotRevisionRef.current ||
         clientRef.current !== client
       ) {
         return;
@@ -88,7 +103,10 @@ export function useMobileSessionList(
         current.generation === sessionListGenerationRef.current
       ) {
         if (append) current.append = true;
-        else current.refresh = true;
+        else {
+          current.refresh = true;
+          snapshotRevisionRef.current += 1;
+        }
         return current.promise;
       }
       const flight = {
@@ -99,7 +117,7 @@ export function useMobileSessionList(
         append,
       };
       flightRef.current = flight;
-      flight.promise = Promise.resolve().then(async () => {
+      flight.promise = (async () => {
         try {
           while (
             flightRef.current === flight &&
@@ -121,7 +139,7 @@ export function useMobileSessionList(
         } finally {
           if (flightRef.current === flight) flightRef.current = null;
         }
-      });
+      })();
       return flight.promise;
     },
     [clientRef, readPage]
diff --git a/src/modules/MobileRemote/app/useMobileSessionModel.test.ts b/src/modules/MobileRemote/app/useMobileSessionModel.test.ts
index df9a100de1..3d744ef0dc 100644
--- a/src/modules/MobileRemote/app/useMobileSessionModel.test.ts
+++ b/src/modules/MobileRemote/app/useMobileSessionModel.test.ts
@@ -8,6 +8,112 @@ import type { MobileConnectionState } from "../connection/types";
 import { useMobileSessionModel } from "./useMobileSessionModel";
 
 describe("useMobileSessionModel", () => {
+  it("loads options only on demand, shares flights, retains config on error and rejects stale results", async () => {
+    const env = globalThis as typeof globalThis & {
+      IS_REACT_ACT_ENVIRONMENT?: boolean;
+    };
+    env.IS_REACT_ACT_ENVIRONMENT = true;
+    let finish!: (value: unknown) => void;
+    let fail!: (error: Error) => void;
+    const call = vi.fn((method: string, params: Record<string, unknown>) => {
+      if (method === "session/config")
+        return Promise.resolve({
+          sessionId: params.sessionId,
+          model: "current",
+          modelEditable: true,
+        });
+      return new Promise((resolve, reject) => {
+        finish = resolve;
+        fail = reject;
+      });
+    });
+    const client = { call } as unknown as MobileRpcClient;
+    const clientRef = { current: client as MobileRpcClient | null };
+    const activeSessionRef = { current: "a" as string | null };
+    const connectionRef = {
+      current: {
+        status: "connected",
+        presence: "online",
+        demoMode: false,
+      } as MobileConnectionState,
+    };
+    let model!: ReturnType<typeof useMobileSessionModel>;
+    function Harness() {
+      const value = useMobileSessionModel({
+        clientRef,
+        activeSessionRef,
+        connectionRef,
+        requireWritableClient: () => client,
+      });
+      React.useLayoutEffect(() => {
+        model = value;
+      });
+      return null;
+    }
+    const root = createRoot(document.createElement("div"));
+    try {
+      await act(async () => root.render(React.createElement(Harness)));
+      await act(async () => model.refreshSessionModel("a"));
+      expect(call.mock.calls.map(([method]) => method)).toEqual([
+        "session/config",
+      ]);
+      let first!: Promise<void>;
+      await act(async () => {
+        first = model.loadSessionModels("a");
+        expect(model.loadSessionModels("a")).toBe(first);
+      });
+      expect(model.sessionModel.optionsLoading).toBe(true);
+      await act(async () => {
+        fail(new Error("catalog unavailable"));
+        await first;
+      });
+      expect(model.sessionModel.config?.model).toBe("current");
+      expect(model.sessionModel.optionsError).toBe("catalog unavailable");
+      await act(async () => {
+        first = model.loadSessionModels("a");
+      });
+      await act(async () => {
+        finish({ models: [] });
+        await first;
+      });
+      expect(model.sessionModel.optionsError).toBeUndefined();
+      expect(model.sessionModel.optionsLoading).toBe(false);
+      const count = call.mock.calls.length;
+      await act(async () => model.loadSessionModels("a"));
+      expect(call).toHaveBeenCalledTimes(count);
+      await act(async () => model.resetSessionModel());
+      await act(async () => model.refreshSessionModel("a"));
+      await act(async () => {
+        first = model.loadSessionModels("a");
+      });
+      activeSessionRef.current = "b";
+      await act(async () => {
+        model.resetSessionModel();
+        await model.refreshSessionModel("b");
+      });
+      await act(async () => {
+        finish({
+          models: [{ id: "stale", accountId: "a", accountLabel: "a" }],
+        });
+        await first;
+      });
+      expect(model.sessionModel.config?.sessionId).toBe("b");
+      expect(model.sessionModel.options).toEqual([]);
+      call.mockResolvedValueOnce({
+        sessionId: "b",
+        model: "readonly",
+        modelEditable: false,
+      });
+      await act(async () => model.refreshSessionModel("b"));
+      const readonlyCount = call.mock.calls.length;
+      await act(async () => model.loadSessionModels("b"));
+      expect(call).toHaveBeenCalledTimes(readonlyCount);
+    } finally {
+      await act(async () => root.unmount());
+      env.IS_REACT_ACT_ENVIRONMENT = false;
+    }
+  });
+
   it("does not apply a late model patch to a newly selected session", async () => {
     const env = globalThis as typeof globalThis & {
       IS_REACT_ACT_ENVIRONMENT?: boolean;
diff --git a/src/modules/MobileRemote/app/useMobileSessionModel.ts b/src/modules/MobileRemote/app/useMobileSessionModel.ts
index ce77a1d4fe..78ee0f46e0 100644
--- a/src/modules/MobileRemote/app/useMobileSessionModel.ts
+++ b/src/modules/MobileRemote/app/useMobileSessionModel.ts
@@ -51,12 +51,31 @@ export function useMobileSessionModel({
 }) {
   const [sessionModel, setSessionModelState] =
     useState<MobileSessionModelState>(INITIAL_SESSION_MODEL_STATE);
+  const sessionModelRef = useRef(sessionModel);
+  sessionModelRef.current = sessionModel;
   const sessionModelRequestRef = useRef(0);
+  const optionsGenerationRef = useRef(0);
+  const optionsFlightRef = useRef<{
+    client: MobileRpcClient | null;
+    sessionId: string;
+    promise: Promise<void>;
+  } | null>(null);
+  const optionsReadyRef = useRef<{
+    client: MobileRpcClient | null;
+    sessionId: string;
+  } | null>(null);
   const refreshSessionModel = useCallback(
     async (sessionId: string) => {
       const requestGeneration = ++sessionModelRequestRef.current;
+      optionsReadyRef.current = null;
+      if (sessionModelRef.current.config?.sessionId !== sessionId) {
+        optionsGenerationRef.current += 1;
+        optionsFlightRef.current = null;
+      }
       setSessionModelState((prev) => ({
-        ...prev,
+        ...(prev.config?.sessionId === sessionId
+          ? prev
+          : INITIAL_SESSION_MODEL_STATE),
         loading: true,
         error: undefined,
       }));
@@ -81,14 +100,10 @@ export function useMobileSessionModel({
         return;
       }
       try {
-        const [config, list] = await Promise.all([
-          client.call<MobileSessionModelConfig>("session/config", {
-            sessionId,
-          }),
-          client.call<{ models?: MobileModelOption[] }>("models/list", {
-            sessionId,
-          }),
-        ]);
+        const config = await client.call<MobileSessionModelConfig>(
+          "session/config",
+          { sessionId }
+        );
         if (
           requestGeneration !== sessionModelRequestRef.current ||
           activeSessionRef.current !== sessionId ||
@@ -96,12 +111,13 @@ export function useMobileSessionModel({
         ) {
           return;
         }
-        setSessionModelState({
+        setSessionModelState((prev) => ({
+          ...prev,
           config,
-          options: list.models ?? [],
           loading: false,
           patching: false,
-        });
+          options: prev.config?.sessionId === sessionId ? prev.options : [],
+        }));
       } catch (error) {
         if (
           requestGeneration !== sessionModelRequestRef.current ||
@@ -119,6 +135,85 @@ export function useMobileSessionModel({
     [clientRef, connectionRef, activeSessionRef]
   );
 
+  const loadSessionModels = useCallback(
+    (sessionId: string): Promise<void> => {
+      const client = clientRef.current;
+      if (
+        optionsFlightRef.current?.client === client &&
+        optionsFlightRef.current.sessionId === sessionId
+      )
+        return optionsFlightRef.current.promise;
+      if (
+        optionsReadyRef.current?.client === client &&
+        optionsReadyRef.current.sessionId === sessionId
+      )
+        return Promise.resolve();
+      if (activeSessionRef.current !== sessionId) return Promise.resolve();
+      const config = sessionModelRef.current.config;
+      if (config?.sessionId !== sessionId || config.modelEditable !== true)
+        return Promise.resolve();
+      if (connectionRef.current.demoMode) {
+        setSessionModelState((prev) => ({
+          ...prev,
+          options: DEMO_MODEL_OPTIONS,
+        }));
+        return Promise.resolve();
+      }
+      if (!client || connectionRef.current.presence !== "online")
+        return Promise.resolve();
+      const generation = ++optionsGenerationRef.current;
+      const current = () =>
+        generation === optionsGenerationRef.current &&
+        clientRef.current === client &&
+        activeSessionRef.current === sessionId;
+      setSessionModelState((prev) => ({
+        ...prev,
+        optionsLoading: true,
+        optionsError: undefined,
+      }));
+      const promise = Promise.resolve().then(async () => {
+        try {
+          const list = await client.call<{ models: MobileModelOption[] }>(
+            "models/list",
+            { sessionId }
+          );
+          if (
+            !Array.isArray(list?.models) ||
+            list.models.length > 256 ||
+            list.models.some(
+              (option) =>
+                !option ||
+                typeof option.id !== "string" ||
+                typeof option.accountId !== "string" ||
+                typeof option.accountLabel !== "string"
+            )
+          )
+            throw new Error("Invalid model catalog");
+          if (!current()) return;
+          optionsReadyRef.current = { client, sessionId };
+          setSessionModelState((prev) => ({
+            ...prev,
+            options: list.models,
+            optionsLoading: false,
+          }));
+        } catch (error) {
+          if (current())
+            setSessionModelState((prev) => ({
+              ...prev,
+              optionsLoading: false,
+              optionsError: toMobileRpcError(error).message,
+            }));
+        } finally {
+          if (optionsFlightRef.current?.promise === promise)
+            optionsFlightRef.current = null;
+        }
+      });
+      optionsFlightRef.current = { client, sessionId, promise };
+      return promise;
+    },
+    [activeSessionRef, clientRef, connectionRef]
+  );
+
   const setSessionModel = useCallback(
     async (sessionId: string, option: MobileModelOption) => {
       const requestGeneration = ++sessionModelRequestRef.current;
@@ -194,11 +289,15 @@ export function useMobileSessionModel({
 
   const resetSessionModel = useCallback(() => {
     sessionModelRequestRef.current += 1;
+    optionsGenerationRef.current += 1;
+    optionsFlightRef.current = null;
+    optionsReadyRef.current = null;
     setSessionModelState(INITIAL_SESSION_MODEL_STATE);
   }, []);
   return {
     sessionModel,
     refreshSessionModel,
+    loadSessionModels,
     setSessionModel,
     resetSessionModel,
   };
diff --git a/src/modules/MobileRemote/app/useMobileSessionSearch.test.ts b/src/modules/MobileRemote/app/useMobileSessionSearch.test.ts
new file mode 100644
index 0000000000..d33b8dc3ea
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobileSessionSearch.test.ts
@@ -0,0 +1,417 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { createMobileRpcClient } from "../connection/mobileRpcClient";
+import { useMobileSessionSearch } from "./useMobileSessionSearch";
+
+function deferred() {
+  let resolve!: (value: unknown) => void;
+  let reject!: (error: Error) => void;
+  const promise = new Promise((yes, no) => {
+    resolve = yes;
+    reject = no;
+  });
+  return { promise, resolve, reject };
+}
+const row = (id: string) => ({ id, name: id, status: "idle" as const });
+const page = (id: string, nextOffset = 1, hasMore = false) => ({
+  sessions: [row(id)],
+  nextOffset,
+  hasMore,
+});
+
+describe("useMobileSessionSearch", () => {
+  let root: ReturnType<typeof createRoot>;
+  let current: ReturnType<typeof useMobileSessionSearch>;
+  function Harness({
+    client,
+    online = true,
+  }: {
+    client: MobileRpcClient | null;
+    online?: boolean;
+  }) {
+    const value = useMobileSessionSearch(client, online);
+    React.useLayoutEffect(() => {
+      current = value;
+    });
+    return null;
+  }
+  const mount = async (call: ReturnType<typeof vi.fn>, online = true) => {
+    const client = { call } as unknown as MobileRpcClient;
+    await act(async () =>
+      root.render(React.createElement(Harness, { client, online }))
+    );
+    return client;
+  };
+  beforeEach(() => {
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+    root = createRoot(document.createElement("div"));
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  it("releases the real RPC wait on supersession, cancel, offline and unmount", async () => {
+    const listeners = new Map<string, (event: { data: string }) => void>();
+    const send = vi.fn();
+    const socket = {
+      readyState: 1,
+      send,
+      close: vi.fn(),
+      addEventListener: (
+        name: string,
+        listener: (event: { data: string }) => void
+      ) => listeners.set(name, listener),
+    };
+    const client = createMobileRpcClient(socket as unknown as WebSocket, {
+      setTimeout: (fn, ms) => window.setTimeout(fn, ms),
+      clearTimeout: (id) => window.clearTimeout(id),
+    });
+    const render = (online = true) =>
+      act(async () =>
+        root.render(React.createElement(Harness, { client, online }))
+      );
+    const reply = (id: number, value: string) =>
+      listeners.get("message")!({
+        data: JSON.stringify({ jsonrpc: "2.0", id, result: page(value) }),
+      });
+    await render();
+    await act(async () => {
+      void current.search("old");
+    });
+    await act(async () => {
+      void current.search("new");
+    });
+    expect(send).toHaveBeenCalledTimes(2); // Old RPC has never replied.
+    await act(async () => reply(2, "new"));
+    await act(async () => reply(1, "old"));
+    expect(current.sessions[0].id).toBe("new");
+    await act(async () => {
+      void current.search("cancelled");
+    });
+    await act(async () => current.cancel());
+    await act(async () => {
+      void current.search("after cancel");
+    });
+    expect(send).toHaveBeenCalledTimes(4);
+    await render(false);
+    await render(true);
+    await act(async () => {
+      void current.search("after reconnect");
+    });
+    expect(send).toHaveBeenCalledTimes(5);
+    await act(async () => root.render(null));
+    await act(async () => {
+      reply(3, "cancelled");
+      reply(4, "offline");
+      reply(5, "unmounted");
+    });
+    expect(socket.close).not.toHaveBeenCalled();
+    client.close();
+  });
+
+  it("loads bounded server pages past the first 50 using the authoritative cursor", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(page("first", 125, true))
+      .mockResolvedValueOnce(page("historic", 200));
+    await mount(call);
+    expect(call).not.toHaveBeenCalled();
+    await act(async () => current.search("  project  "));
+    expect(call).toHaveBeenNthCalledWith(
+      1,
+      "session/list",
+      {
+        query: "project",
+        offset: 0,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+    await act(async () => current.loadNext());
+    expect(call).toHaveBeenNthCalledWith(
+      2,
+      "session/list",
+      {
+        query: "project",
+        offset: 125,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+    expect(current.sessions.map((item) => item.id)).toEqual(["historic"]);
+    expect(current.phase).toBe("ready");
+  });
+
+  it("single-flights repeated submit and exposes the loading transition", async () => {
+    const request = deferred();
+    const call = vi.fn().mockReturnValue(request.promise);
+    await mount(call);
+    await act(async () => {
+      void current.search("first");
+      void current.search("first");
+    });
+    expect(call).toHaveBeenCalledTimes(1);
+    expect(current.phase).toBe("loading");
+    await act(async () => request.resolve(page("first")));
+    expect(current.phase).toBe("ready");
+  });
+
+  it("cancel rejects late responses and queues a fresh query without overlapping RPCs", async () => {
+    const old = deferred();
+    const call = vi
+      .fn()
+      .mockReturnValueOnce(old.promise)
+      .mockResolvedValueOnce(page("new"));
+    await mount(call);
+    await act(async () => {
+      void current.search("old");
+    });
+    await act(async () => current.cancel());
+    expect(current).toMatchObject({ phase: "idle", query: "", sessions: [] });
+    await act(async () => {
+      void current.search("new");
+    });
+    expect(call).toHaveBeenCalledTimes(1);
+    await act(async () => old.resolve(page("old")));
+    expect(current.sessions.map((item) => item.id)).toEqual(["new"]);
+    expect(current.query).toBe("new");
+  });
+
+  it("switching client clears prior rows and prevents stale desktop results", async () => {
+    const old = deferred();
+    await mount(vi.fn().mockReturnValue(old.promise));
+    await act(async () => {
+      void current.search("old");
+    });
+    const newer = vi.fn().mockResolvedValue(page("desktop-b"));
+    await mount(newer);
+    expect(current).toMatchObject({ query: "", sessions: [], phase: "idle" });
+    await act(async () => current.search("new"));
+    await act(async () => old.resolve(page("desktop-a")));
+    expect(current.sessions.map((item) => item.id)).toEqual(["desktop-b"]);
+  });
+
+  it("failed query can be retried and an empty successful response is ready", async () => {
+    const call = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("offline"))
+      .mockResolvedValueOnce({ sessions: [], nextOffset: 0, hasMore: false });
+    await mount(call);
+    await act(async () => current.search("none"));
+    expect(current.phase).toBe("error");
+    await act(async () => current.search("none"));
+    expect(current).toMatchObject({
+      phase: "ready",
+      sessions: [],
+      hasMore: false,
+    });
+  });
+
+  it("blocks offline and empty queries without issuing a request", async () => {
+    const call = vi.fn();
+    const client = await mount(call, false);
+    await act(async () => current.search("query"));
+    await act(async () =>
+      root.render(React.createElement(Harness, { client }))
+    );
+    await act(async () => current.search("   "));
+    expect(call).not.toHaveBeenCalled();
+  });
+
+  it("retries the failed history cursor while preserving the last successful page", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(page("first", 125, true))
+      .mockRejectedValueOnce(new Error("timeout"))
+      .mockResolvedValueOnce(page("historic", 200));
+    await mount(call);
+    await act(async () => current.search("project"));
+    await act(async () => current.loadNext());
+    expect(current.phase).toBe("error");
+    expect(current.sessions.map((item) => item.id)).toEqual(["first"]);
+    await act(async () => current.retry());
+    expect(call).toHaveBeenNthCalledWith(
+      3,
+      "session/list",
+      {
+        query: "project",
+        offset: 125,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+    expect(current.sessions.map((item) => item.id)).toEqual(["historic"]);
+    expect(current.phase).toBe("ready");
+  });
+
+  it("disconnect ends loading immediately and reconnect retries without accepting the old response", async () => {
+    const old = deferred();
+    const fresh = deferred();
+    const call = vi
+      .fn()
+      .mockReturnValueOnce(old.promise)
+      .mockReturnValueOnce(fresh.promise);
+    const client = await mount(call);
+    await act(async () => {
+      void current.search("project");
+    });
+    await act(async () =>
+      root.render(React.createElement(Harness, { client, online: false }))
+    );
+    expect(current.phase).toBe("error");
+    await act(async () => current.retry());
+    expect(call).toHaveBeenCalledTimes(1);
+    await act(async () =>
+      root.render(React.createElement(Harness, { client, online: true }))
+    );
+    expect(call).toHaveBeenCalledTimes(1); // No automatic scan on reconnect.
+    await act(async () => {
+      void current.retry();
+    });
+    await act(async () => old.resolve(page("stale")));
+    expect(current.phase).toBe("loading");
+    expect(current.sessions).toEqual([]);
+    await act(async () => fresh.resolve(page("fresh")));
+    expect(current.sessions.map((item) => item.id)).toEqual(["fresh"]);
+  });
+
+  it("cancel discards the retry cursor and unrelated new queries start at zero", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(page("first", 125, true))
+      .mockRejectedValueOnce(new Error("timeout"))
+      .mockResolvedValueOnce(page("new"));
+    await mount(call);
+    await act(async () => current.search("old"));
+    await act(async () => current.loadNext());
+    await act(async () => current.cancel());
+    await act(async () => current.retry());
+    expect(call).toHaveBeenCalledTimes(2);
+    await act(async () => current.search("new"));
+    expect(call).toHaveBeenLastCalledWith(
+      "session/list",
+      {
+        query: "new",
+        offset: 0,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+  });
+
+  it("keeps the previous page readable offline without starting background work", async () => {
+    const call = vi.fn().mockResolvedValue(page("known", 50, true));
+    const client = await mount(call);
+    await act(async () => current.search("project"));
+    await act(async () =>
+      root.render(React.createElement(Harness, { client, online: false }))
+    );
+    await act(async () => current.loadNext());
+    expect(current.sessions.map((item) => item.id)).toEqual(["known"]);
+    expect(current.phase).toBe("ready");
+    expect(call).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not request another page after the cursor is exhausted or exceed the query bound", async () => {
+    const call = vi.fn().mockResolvedValue(page("only"));
+    await mount(call);
+    await act(async () => current.search("x".repeat(201)));
+    await act(async () => current.loadNext());
+    await act(async () => current.retry());
+    expect(call).not.toHaveBeenCalled();
+    await act(async () => current.search("literal_100%"));
+    await act(async () => current.loadNext());
+    expect(call).toHaveBeenCalledTimes(1);
+    expect(call).toHaveBeenCalledWith(
+      "session/list",
+      {
+        query: "literal_100%",
+        offset: 0,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+  });
+
+  it("retains one bounded result page across repeated next-page requests", async () => {
+    const call = vi.fn().mockImplementation((_method, { offset }) =>
+      Promise.resolve({
+        sessions: Array.from({ length: 50 }, (_, index) =>
+          row(`s-${offset + index}`)
+        ),
+        nextOffset: offset + 50,
+        hasMore: offset < 2500,
+      })
+    );
+    await mount(call);
+    await act(async () => current.search("project"));
+    for (let index = 0; index < 50; index++) {
+      await act(async () => current.loadNext());
+      expect(current.sessions).toHaveLength(50);
+    }
+    expect(current.sessions[0].id).toBe("s-2500");
+    expect(current.hasMore).toBe(false);
+    expect(call).toHaveBeenCalledTimes(51);
+  });
+
+  it("unmount invalidates the outstanding request without starting any follow-up work", async () => {
+    const request = deferred();
+    const call = vi.fn().mockReturnValue(request.promise);
+    await mount(call);
+    await act(async () => {
+      void current.search("project");
+    });
+    await act(async () => root.render(null));
+    await act(async () => request.reject(new Error("late timeout")));
+    expect(call).toHaveBeenCalledTimes(1);
+  });
+
+  it("rejects a non-advancing cursor instead of repeating the same history page", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValue({ sessions: [], nextOffset: 0, hasMore: true });
+    await mount(call);
+    await act(async () => current.search("test"));
+    expect(current.phase).toBe("error");
+  });
+
+  it.each([
+    null,
+    {
+      sessions: Array.from({ length: 51 }, (_, index) => row(String(index))),
+      nextOffset: 51,
+      hasMore: false,
+    },
+    { sessions: [null], nextOffset: 1, hasMore: false },
+    {
+      sessions: [{ ...row("bad"), updatedAtMs: 1e20 }],
+      nextOffset: 1,
+      hasMore: false,
+    },
+    {
+      sessions: [{ ...row("bad"), status: ["idle"] }],
+      nextOffset: 1,
+      hasMore: false,
+    },
+    { sessions: [row("bad")], nextOffset: 1, hasMore: "false" },
+    {
+      sessions: Array.from({ length: 51 }, (_, id) => row(String(id))),
+      nextOffset: 51,
+      hasMore: true,
+    },
+  ])("rejects malformed search payload at ingestion (%j)", async (payload) => {
+    const call = vi.fn().mockResolvedValue(payload);
+    await mount(call);
+    await act(async () => current.search("query"));
+    expect(current).toMatchObject({ phase: "error", sessions: [] });
+  });
+});
diff --git a/src/modules/MobileRemote/app/useMobileSessionSearch.ts b/src/modules/MobileRemote/app/useMobileSessionSearch.ts
new file mode 100644
index 0000000000..819753e09b
--- /dev/null
+++ b/src/modules/MobileRemote/app/useMobileSessionSearch.ts
@@ -0,0 +1,187 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+
+import { createLatestOnlySearchRunner } from "@src/util/latestOnlySearchRunner";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { isSessionSearchRows } from "../connection/sessionDiscoveryContract";
+import type { MobileSessionRow } from "../connection/types";
+
+export interface MobileSearchPage {
+  sessions: MobileSessionRow[];
+  nextOffset: number;
+  hasMore: boolean;
+}
+
+interface SearchRequest {
+  query: string;
+  offset: number;
+}
+
+interface SearchState extends MobileSearchPage {
+  client: MobileRpcClient | null;
+  phase: "idle" | "loading" | "ready" | "error";
+  query: string;
+  request: SearchRequest | null;
+}
+
+const emptySearch = (client: MobileRpcClient | null): SearchState => ({
+  client,
+  sessions: [],
+  nextOffset: 0,
+  hasMore: false,
+  phase: "idle",
+  query: "",
+  request: null,
+});
+
+/** One active RPC plus the latest queued request, sharing Desktop's scheduler. */
+export function useMobileSessionSearch(
+  client: MobileRpcClient | null,
+  online: boolean
+) {
+  const [result, setResult] = useState(() => emptySearch(client));
+  const generation = useRef(0);
+  const activeRequest = useRef<AbortController | null>(null);
+  const runner = useRef<ReturnType<
+    typeof createLatestOnlySearchRunner<SearchRequest & { token: number }>
+  > | null>(null);
+  const pendingRequest = useRef<(SearchRequest & { token: number }) | null>(
+    null
+  );
+  const connection = useRef({ client, online });
+  connection.current = { client, online };
+  const invalidate = useCallback(() => {
+    generation.current++;
+    pendingRequest.current = null;
+    runner.current?.clearPending();
+    activeRequest.current?.abort();
+    activeRequest.current = null;
+  }, []);
+  const cancel = useCallback(() => {
+    invalidate();
+    setResult(emptySearch(client));
+  }, [client, invalidate]);
+  useEffect(() => {
+    if (online) return;
+    // A relay socket can stay open while its desktop goes offline. Do not
+    // keep waiting for its RPC timeout or accept its late result on reconnect.
+    invalidate();
+    setResult((previous) =>
+      previous.phase === "loading" ? { ...previous, phase: "error" } : previous
+    );
+  }, [online, invalidate]);
+
+  useEffect(() => {
+    cancel();
+    const scheduler = createLatestOnlySearchRunner<
+      SearchRequest & { token: number }
+    >(async (request) => {
+      if (!client) return;
+      const { query, offset, token } = request;
+      const isCurrent = () =>
+        generation.current === token &&
+        connection.current.client === client &&
+        connection.current.online;
+      if (!isCurrent()) return;
+      const controller = new AbortController();
+      activeRequest.current = controller;
+      try {
+        const reply = await client.call<MobileSearchPage>(
+          "session/list",
+          {
+            query,
+            offset,
+            limit: 50,
+          },
+          controller.signal
+        );
+        if (!isCurrent()) return;
+        if (
+          !reply ||
+          !isSessionSearchRows(reply.sessions) ||
+          reply.sessions.length > 50 ||
+          typeof reply.hasMore !== "boolean" ||
+          !Number.isSafeInteger(reply.nextOffset) ||
+          reply.nextOffset < offset ||
+          (reply.hasMore && reply.nextOffset <= offset)
+        )
+          throw new Error("Invalid search cursor");
+        setResult({
+          sessions: reply.sessions,
+          nextOffset: reply.nextOffset,
+          hasMore: reply.hasMore,
+          client,
+          query,
+          request,
+          phase: "ready",
+        });
+      } catch {
+        if (isCurrent()) setResult((prev) => ({ ...prev, phase: "error" }));
+      } finally {
+        if (activeRequest.current === controller) activeRequest.current = null;
+        if (generation.current === token) pendingRequest.current = null;
+      }
+    });
+    runner.current = scheduler;
+    return () => {
+      invalidate();
+      scheduler.dispose();
+      runner.current = null;
+    };
+  }, [client, cancel, invalidate]);
+  const requestPage = useCallback(
+    (request: SearchRequest) => {
+      if (!client || !online) return Promise.resolve();
+      const previous = pendingRequest.current;
+      if (
+        previous?.query === request.query &&
+        previous.offset === request.offset
+      )
+        return Promise.resolve();
+      const token = ++generation.current;
+      activeRequest.current?.abort();
+      pendingRequest.current = { ...request, token };
+      setResult((prev) => ({
+        ...(request.offset > 0 &&
+        prev.client === client &&
+        prev.query === request.query
+          ? prev
+          : emptySearch(client)),
+        query: request.query,
+        request,
+        phase: "loading",
+      }));
+      return runner.current?.submit({ ...request, token }) ?? Promise.resolve();
+    },
+    [client, online]
+  );
+  // Never expose a previous client's rows in the render before effect cleanup.
+  const scoped = result.client === client ? result : emptySearch(client);
+  const search = useCallback(
+    (query: string) => {
+      query = query.trim();
+      if (!query || Array.from(query).length > 200) return Promise.resolve();
+      return requestPage({ query, offset: 0 });
+    },
+    [requestPage]
+  );
+  const loadNext = () =>
+    scoped.phase === "ready" && scoped.hasMore
+      ? requestPage({ query: scoped.query, offset: scoped.nextOffset })
+      : Promise.resolve();
+  const retry = () =>
+    scoped.phase === "error" && scoped.request
+      ? requestPage(scoped.request)
+      : Promise.resolve();
+  return {
+    sessions: scoped.sessions,
+    query: scoped.query,
+    phase: scoped.phase,
+    nextOffset: scoped.nextOffset,
+    hasMore: scoped.hasMore,
+    search,
+    loadNext,
+    retry,
+    cancel,
+  };
+}
diff --git a/src/modules/MobileRemote/app/useMobileTranscript.ts b/src/modules/MobileRemote/app/useMobileTranscript.ts
index e9954fb0fb..2568a57a70 100644
--- a/src/modules/MobileRemote/app/useMobileTranscript.ts
+++ b/src/modules/MobileRemote/app/useMobileTranscript.ts
@@ -11,10 +11,10 @@ import {
   toMobileRpcError,
 } from "../connection/mobileRpcClient";
 import type { MobileConnectionState } from "../connection/types";
+import { loadSubscriptionHistory } from "../lib/loadSubscriptionHistory";
 import {
   type TranscriptRoundResult,
   type TranscriptSnapshotEnvelope,
-  type TranscriptSubscribeResult,
   applyLiveTranscriptSnapshot,
   applyTranscriptRoundResult,
   applyTranscriptSubscribeResult,
@@ -42,6 +42,26 @@ export function useMobileTranscript({
   activeSessionRef: MutableRefObject<string | null>;
   connection: MobileConnectionState;
 }) {
+  const [openedSession, setOpenedSession] = useState<{
+    requested: string;
+    sessionId: string;
+    managed: boolean;
+  } | null>(null);
+  const openingLeaseRef = useRef<{
+    client: MobileRpcClient;
+    subscriptionId: string;
+  } | null>(null);
+  const releaseOpening = useCallback(() => {
+    const lease = openingLeaseRef.current;
+    openingLeaseRef.current = null;
+    if (!lease || lease.client !== clientRef.current) return false;
+    void lease.client
+      .call("session/unsubscribe", {
+        subscriptionId: lease.subscriptionId,
+      })
+      .catch(() => undefined);
+    return true;
+  }, [clientRef]);
   const subscriptionGenerationRef = useRef(0);
   const roundRequestGenerationRef = useRef(0);
   const refreshInFlightRef = useRef<{
@@ -58,6 +78,7 @@ export function useMobileTranscript({
     createInitialTranscriptLoadState
   );
   const invalidateTranscriptRequests = useCallback(() => {
+    openingLeaseRef.current = null;
     subscriptionGenerationRef.current += 1;
     roundRequestGenerationRef.current += 1;
     refreshInFlightRef.current = null;
@@ -70,6 +91,7 @@ export function useMobileTranscript({
   }, []);
   const resetTranscript = useCallback(() => {
     invalidateTranscriptRequests();
+    setOpenedSession(null);
     setTranscript(createInitialTranscriptLoadState());
   }, [invalidateTranscriptRequests]);
   const showDemoTranscript = useCallback(
@@ -97,40 +119,74 @@ export function useMobileTranscript({
     async (
       client: MobileRpcClient,
       sessionId: string,
-      subscriptionGeneration: number
+      subscriptionGeneration: number,
+      latestOnly = true
     ) => {
+      let resolvedId = sessionId;
+      const opening = connectionRef.current.capabilities?.sessionOpen === true;
+      const lease = opening
+        ? { client, subscriptionId: `open-${subscriptionGeneration}` }
+        : null;
+      if (lease) openingLeaseRef.current = lease;
+      const isCurrent = () =>
+        clientRef.current === client &&
+        activeSessionRef.current === resolvedId &&
+        subscriptionGenerationRef.current === subscriptionGeneration;
       try {
-        const result = await client.call<TranscriptSubscribeResult>(
-          "session/subscribe",
-          { sessionId }
-        );
-        if (
-          clientRef.current !== client ||
-          activeSessionRef.current !== sessionId ||
-          subscriptionGenerationRef.current !== subscriptionGeneration
-        ) {
-          return;
-        }
-        setTranscript((prev) =>
-          applyTranscriptSubscribeResult(
-            prev,
-            result,
-            sessionId,
-            subscriptionGeneration
-          )
+        const applied = await loadSubscriptionHistory(
+          client,
+          sessionId,
+          isCurrent,
+          (result) =>
+            setTranscript((prev) =>
+              applyTranscriptSubscribeResult(
+                prev,
+                result,
+                resolvedId,
+                subscriptionGeneration
+              )
+            ),
+          latestOnly,
+          lease
+            ? {
+                subscriptionId: lease.subscriptionId,
+                onIdentity: (canonical, managed) => {
+                  resolvedId = canonical;
+                  activeSessionRef.current = canonical;
+                  setOpenedSession((previous) => ({
+                    requested:
+                      previous?.sessionId === sessionId
+                        ? previous.requested
+                        : sessionId,
+                    sessionId: canonical,
+                    managed,
+                  }));
+                  setTranscript((prev) => ({ ...prev, sessionId: canonical }));
+                },
+              }
+            : undefined
         );
-        return true;
+        if (!applied && lease)
+          void client
+            .call("session/unsubscribe", {
+              subscriptionId: lease.subscriptionId,
+            })
+            .catch(() => undefined);
+        return applied;
       } catch (error) {
-        if (
-          clientRef.current !== client ||
-          activeSessionRef.current !== sessionId ||
-          subscriptionGenerationRef.current !== subscriptionGeneration
-        )
-          return;
+        // This close queues behind an opening that timed out on the phone.
+        // Its lease prevents a late close from removing a newer subscription.
+        if (lease)
+          void client
+            .call("session/unsubscribe", {
+              subscriptionId: lease.subscriptionId,
+            })
+            .catch(() => undefined);
+        if (!isCurrent()) return;
         setTranscript((prev) =>
           failTranscriptLoad(
             prev,
-            sessionId,
+            resolvedId,
             subscriptionGeneration,
             toMobileRpcError(error).message
           )
@@ -138,7 +194,7 @@ export function useMobileTranscript({
         throw error;
       }
     },
-    [activeSessionRef, clientRef]
+    [activeSessionRef, clientRef, connectionRef]
   );
 
   refreshSubscribedSessionRef.current = (sessionId: string) => {
@@ -160,7 +216,12 @@ export function useMobileTranscript({
     setTranscript((current) =>
       beginTranscriptLoad(current, sessionId, subscriptionGeneration)
     );
-    void requestSessionSnapshot(client, sessionId, subscriptionGeneration)
+    void requestSessionSnapshot(
+      client,
+      sessionId,
+      subscriptionGeneration,
+      false
+    )
       .catch(() => undefined)
       .finally(() => {
         if (refreshInFlightRef.current?.token !== token) return;
@@ -284,6 +345,9 @@ export function useMobileTranscript({
   ]);
 
   return {
+    openingClient: openingLeaseRef.current?.client,
+    openedSession,
+    releaseOpening,
     transcript,
     setTranscript,
     transcriptView: getSelectedTranscriptView(transcript),
diff --git a/src/modules/MobileRemote/auth/MobileAuthScreen.tsx b/src/modules/MobileRemote/auth/MobileAuthScreen.tsx
index 226c1a7a66..73e91917fa 100644
--- a/src/modules/MobileRemote/auth/MobileAuthScreen.tsx
+++ b/src/modules/MobileRemote/auth/MobileAuthScreen.tsx
@@ -36,14 +36,14 @@ export function MobileAuthScreen({
 
   return (
     <MobileShell>
-      <main className="flex min-h-0 flex-1 flex-col px-5 py-6">
-        <div className="flex items-center gap-2 text-lg font-semibold text-text-1">
+      <main className="mobile-flow-screen flex flex-1 flex-col px-5 py-6">
+        <div className="mobile-type-heading flex items-center gap-2 font-semibold text-text-1">
           <span aria-hidden="true" className="mobile-brand-mark">
             ●
           </span>
           ORG2
         </div>
-        <div className="flex min-h-0 flex-1 flex-col justify-center gap-5">
+        <div className="mobile-auth-content flex flex-col justify-center gap-5">
           {loading ? (
             <div aria-live="polite" data-testid="mobile-auth-loading">
               <Placeholder
@@ -71,10 +71,10 @@ export function MobileAuthScreen({
           ) : (
             <>
               <div className="space-y-2 text-center">
-                <h1 className="text-xl font-semibold text-text-1">
+                <h1 className="mobile-type-title font-semibold text-text-1">
                   {t("auth.title")}
                 </h1>
-                <p className="text-sm leading-5 text-text-2">
+                <p className="mobile-type-secondary text-text-2">
                   {t("auth.subtitle")}
                 </p>
               </div>
diff --git a/src/modules/MobileRemote/auth/useMobileAccountActions.ts b/src/modules/MobileRemote/auth/useMobileAccountActions.ts
new file mode 100644
index 0000000000..b2b8952383
--- /dev/null
+++ b/src/modules/MobileRemote/auth/useMobileAccountActions.ts
@@ -0,0 +1,42 @@
+import { useEffect, useRef, useState } from "react";
+
+import { ORG2_CLOUD_OFFICIAL_WEB_ORIGIN } from "@src/features/Org2Cloud/config";
+
+import { useMobileRemotePlatform } from "../platform";
+
+type AccountPage = "/account" | "/legal/privacy" | "/legal/terms";
+
+/** Shared by Settings and Profile; external navigation never carries auth tokens. */
+export function useMobileAccountActions() {
+  const platform = useMobileRemotePlatform();
+  const [state, setState] = useState<"idle" | "opening" | "failed">("idle");
+  const attemptRef = useRef<symbol | null>(null);
+  useEffect(
+    () => () => {
+      attemptRef.current = null;
+    },
+    []
+  );
+
+  const openCloudPage = async (path: AccountPage) => {
+    if (attemptRef.current) return;
+    const attempt = Symbol("open-account-page");
+    attemptRef.current = attempt;
+    setState("opening");
+    try {
+      await platform.openExternal(
+        new URL(path, ORG2_CLOUD_OFFICIAL_WEB_ORIGIN).href
+      );
+      if (attemptRef.current === attempt) setState("idle");
+    } catch {
+      if (attemptRef.current === attempt) setState("failed");
+    } finally {
+      if (attemptRef.current === attempt) attemptRef.current = null;
+    }
+  };
+  return {
+    opening: state === "opening",
+    openFailed: state === "failed",
+    openCloudPage,
+  };
+}
diff --git a/src/modules/MobileRemote/components/MobileShell.test.ts b/src/modules/MobileRemote/components/MobileShell.test.ts
index 013cb305b8..67064acb1e 100644
--- a/src/modules/MobileRemote/components/MobileShell.test.ts
+++ b/src/modules/MobileRemote/components/MobileShell.test.ts
@@ -1,3 +1,4 @@
+import { readFileSync } from "node:fs";
 import React from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vitest";
@@ -16,6 +17,23 @@ describe("MobileShell", () => {
 
     expect(markup).toContain("h-full justify-center overflow-hidden");
     expect(markup).toContain("pt-[env(safe-area-inset-top)]");
+    expect(markup).toContain("pr-[env(safe-area-inset-right)]");
+    expect(markup).toContain("pl-[env(safe-area-inset-left)]");
     expect(markup).toContain("h-full min-h-0");
   });
+
+  it("keeps the fluid shell width with a reading cap, not a phone-model width", () => {
+    const markup = renderToStaticMarkup(React.createElement(MobileShell));
+    expect(markup).toContain("w-full");
+    const styles = readFileSync(
+      new URL("../mobileChrome.scss", import.meta.url),
+      "utf8"
+    );
+    const viewport = styles.match(
+      /\.mobile-shell__viewport\s*\{([^}]+)\}/
+    )?.[1];
+    expect(viewport).toContain("min-width: 0");
+    expect(viewport).toContain("max-width: 48rem");
+    expect(viewport).not.toContain("393px");
+  });
 });
diff --git a/src/modules/MobileRemote/components/MobileShell.tsx b/src/modules/MobileRemote/components/MobileShell.tsx
index f4cb33fa26..c288dce55d 100644
--- a/src/modules/MobileRemote/components/MobileShell.tsx
+++ b/src/modules/MobileRemote/components/MobileShell.tsx
@@ -12,9 +12,9 @@ export interface MobileShellProps {
  */
 export function MobileShell({ children, footer }: MobileShellProps) {
   return (
-    <div className="mobile-shell flex h-full justify-center overflow-hidden pt-[env(safe-area-inset-top)]">
+    <div className="mobile-shell flex h-full justify-center overflow-hidden pt-[env(safe-area-inset-top)] pr-[env(safe-area-inset-right)] pl-[env(safe-area-inset-left)]">
       <div className="mobile-shell__viewport flex h-full min-h-0 w-full flex-col overflow-hidden">
-        <div className="flex min-h-0 flex-1 flex-col">{children}</div>
+        <div className="flex min-h-0 min-w-0 flex-1 flex-col">{children}</div>
         {footer}
       </div>
     </div>
diff --git a/src/modules/MobileRemote/components/MobileTopBar.test.ts b/src/modules/MobileRemote/components/MobileTopBar.test.ts
new file mode 100644
index 0000000000..85b2dd3da1
--- /dev/null
+++ b/src/modules/MobileRemote/components/MobileTopBar.test.ts
@@ -0,0 +1,69 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { MobileTopBar } from "./MobileTopBar";
+
+describe("MobileTopBar", () => {
+  let host: HTMLDivElement;
+  let root: ReturnType<typeof createRoot>;
+  const env = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  };
+  let previousAct: boolean | undefined;
+
+  beforeEach(() => {
+    previousAct = env.IS_REACT_ACT_ENVIRONMENT;
+    env.IS_REACT_ACT_ENVIRONMENT = true;
+    host = document.createElement("div");
+    document.body.append(host);
+    root = createRoot(host);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    host.remove();
+    env.IS_REACT_ACT_ENVIRONMENT = previousAct;
+  });
+
+  it("keeps the circular back control and title in their separate detail-header slots", () => {
+    const onBack = vi.fn();
+    act(() =>
+      root.render(
+        React.createElement(MobileTopBar, {
+          title: "A session title that is longer than the narrow phone header",
+          onBack,
+          backAriaLabel: "Return to sessions",
+          trailing: React.createElement("span", null, "Actions"),
+        })
+      )
+    );
+    const header = host.querySelector("header")!;
+    const back = host.querySelector("button")!;
+    const title = host.querySelector("h1")!;
+    expect(header.classList.contains("mobile-top-bar--detail")).toBe(true);
+    expect(Array.from(header.children)).toEqual([
+      back,
+      title,
+      header.querySelector(".mobile-top-bar__trailing"),
+    ]);
+    expect(title.classList.contains("mobile-top-bar__title")).toBe(true);
+    expect(title.textContent).toBe(
+      "A session title that is longer than the narrow phone header"
+    );
+    // This asserts the DOM/style contract with the real shared Button;
+    // pixel alignment and actual clipping still require a browser check.
+    expect(back.classList.contains("button")).toBe(true);
+    expect(back.type).toBe("button");
+    expect(back.getAttribute("aria-label")).toBe("Return to sessions");
+    expect(back.style.width).toBe("var(--mobile-touch-size)");
+    expect(back.style.height).toBe("var(--mobile-touch-size)");
+    expect(back.style.borderRadius).toBe("50%");
+    expect(back.style.padding).toBe("0px");
+    expect(back.querySelector(".truncate")).toBeNull();
+    expect(back.querySelector("svg")).not.toBeNull();
+    act(() => back.click());
+    expect(onBack).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/modules/MobileRemote/components/MobileTopBar.tsx b/src/modules/MobileRemote/components/MobileTopBar.tsx
index 141d0fe164..7c6c72444b 100644
--- a/src/modules/MobileRemote/components/MobileTopBar.tsx
+++ b/src/modules/MobileRemote/components/MobileTopBar.tsx
@@ -27,6 +27,7 @@ export function MobileTopBar({
           htmlType="button"
           size="mini"
           variant="tertiary"
+          shape="circle"
           className="mobile-chrome-icon-button"
           aria-label={backAriaLabel}
           onClick={onBack}
diff --git a/src/modules/MobileRemote/components/PendingInboxList.tsx b/src/modules/MobileRemote/components/PendingInboxList.tsx
new file mode 100644
index 0000000000..1341d16afc
--- /dev/null
+++ b/src/modules/MobileRemote/components/PendingInboxList.tsx
@@ -0,0 +1,99 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import { Placeholder } from "@src/components/Placeholder";
+import { HugeiconsIcon, Notification01Icon } from "@src/icons";
+
+import type { MobilePendingInbox } from "../app/useMobilePendingInbox";
+import type { MobileSessionRow } from "../connection/types";
+
+export function PendingInboxList({
+  inbox,
+  sessions,
+  desktopName,
+  online,
+  onSelectSession,
+  onFocusPermission,
+}: {
+  inbox: MobilePendingInbox;
+  sessions: MobileSessionRow[];
+  desktopName: string;
+  online: boolean;
+  onSelectSession?: (id: string) => void;
+  onFocusPermission?: (requestId: string) => void;
+}) {
+  const { t, i18n } = useTranslation("mobileRemote");
+  return (
+    <section className="mobile-pending-list" aria-label={t("inbox.title")}>
+      {!online ? <p className="text-text-2">{t("inbox.offline")}</p> : null}
+      {inbox.phase === "syncing" ? (
+        <p role="status">{t("inbox.syncing")}</p>
+      ) : null}
+      {inbox.phase === "error" ? (
+        <div role="alert">
+          <p>{t("inbox.error")}</p>
+          <Button onClick={inbox.refresh} disabled={!online}>
+            {t("sessions.retry")}
+          </Button>
+        </div>
+      ) : null}
+      {inbox.phase === "ready" && !inbox.complete ? (
+        <p>{t("inbox.incomplete")}</p>
+      ) : null}
+      {inbox.phase === "ready" && inbox.complete && inbox.items.length === 0 ? (
+        <Placeholder
+          variant="empty"
+          placement="detail-panel"
+          title={t("inbox.empty")}
+          icon={<HugeiconsIcon icon={Notification01Icon} size={24} />}
+        />
+      ) : null}
+      {inbox.items.map((request) => {
+        const row = sessions.find(
+          (session) => session.id === request.sessionId
+        );
+        const detail = ["command", "path", "description"]
+          .map((key) => request.toolArgs[key])
+          .find((value) => typeof value === "string") as string | undefined;
+        const date = new Date(request.createdAtMs);
+        return (
+          <Button
+            layout="custom"
+            appearance="custom"
+            htmlType="button"
+            key={`${request.origin}:${request.sessionId}:${request.requestId}`}
+            className="mobile-pending-card"
+            disabled={!online}
+            onClick={() => {
+              onFocusPermission?.(request.requestId);
+              onSelectSession?.(request.sessionId);
+            }}
+          >
+            <span className="mobile-pending-card__title">
+              {request.sessionName ?? row?.name ?? request.sessionId}
+            </span>
+            <span className="mobile-type-secondary truncate text-text-2">
+              {desktopName}
+              {!Number.isNaN(date.getTime())
+                ? ` · ${date.toLocaleString(i18n?.language)}`
+                : ""}
+            </span>
+            <span className="mobile-pending-card__request">
+              {request.toolName}
+              {detail ? ` · ${detail}` : ""}
+            </span>
+            {request.toolArgsTruncated ? (
+              <span className="mobile-type-secondary text-text-2">
+                {t("inbox.truncated")}
+              </span>
+            ) : null}
+            <span className="mobile-type-secondary text-primary-6">
+              {t("inbox.open")}
+            </span>
+          </Button>
+        );
+      })}
+    </section>
+  );
+}
diff --git a/src/modules/MobileRemote/components/SessionDeviceTabs.test.ts b/src/modules/MobileRemote/components/SessionDeviceTabs.test.ts
new file mode 100644
index 0000000000..53ba3b3a94
--- /dev/null
+++ b/src/modules/MobileRemote/components/SessionDeviceTabs.test.ts
@@ -0,0 +1,147 @@
+// @vitest-environment jsdom
+import { act, createElement } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import {
+  SessionDeviceTabs,
+  type SessionDeviceTabsProps,
+} from "./SessionDeviceTabs";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+vi.mock("@src/icons", () => ({
+  HugeiconsIcon: () => null,
+  LaptopIcon: {},
+}));
+
+describe("SessionDeviceTabs", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+  const onSelect = vi.fn();
+  const props: SessionDeviceTabsProps = {
+    items: [
+      { id: "macbook", name: "MacBook Pro · Alice", presence: "online" },
+      { id: "studio", name: "Mac Studio · Bob", presence: "unknown" },
+    ],
+    currentId: "macbook",
+    onSelect,
+  };
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    onSelect.mockClear();
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.unstubAllGlobals();
+  });
+
+  function render(overrides: Partial<SessionDeviceTabsProps> = {}) {
+    act(() =>
+      root.render(createElement(SessionDeviceTabs, { ...props, ...overrides }))
+    );
+    return Array.from(container.querySelectorAll<HTMLButtonElement>("button"));
+  }
+
+  it("reuses controlled device tabs without adding an unsupported aggregate", () => {
+    const tabs = render();
+    expect(tabs).toHaveLength(2);
+    expect(tabs[0].dataset.active).toBe("true");
+    expect(tabs[0].textContent).toContain("devices.currentDesktop");
+    expect(tabs[0].textContent).toContain("devices.online");
+    expect(tabs[1].textContent).toContain("devices.presenceUnknown");
+    expect(tabs[1].querySelector(".bg-success-6")).toBeNull();
+    expect(
+      container.querySelector('[role="group"]')?.getAttribute("aria-label")
+    ).toBe("devices.pairedDesktops");
+  });
+
+  it("requests another device once and waits for the authoritative selection", () => {
+    const tabs = render();
+    act(() => tabs[0].click());
+    expect(onSelect).not.toHaveBeenCalled();
+    act(() => tabs[1].click());
+    expect(onSelect).toHaveBeenCalledOnce();
+    expect(onSelect).toHaveBeenCalledWith("studio");
+    expect(tabs[0].dataset.active).toBe("true");
+    const selectedTabs = render({ currentId: "studio" });
+    expect(selectedTabs[0].dataset.active).toBe("false");
+    expect(selectedTabs[1].dataset.active).toBe("true");
+  });
+
+  it("blocks duplicate switches while pending and permits retry after failure", () => {
+    const pendingTabs = render({ disabled: true });
+    expect(pendingTabs.every((tab) => tab.disabled)).toBe(true);
+    act(() => pendingTabs[1].click());
+    expect(onSelect).not.toHaveBeenCalled();
+    const restoredTabs = render();
+    act(() => restoredTabs[1].click());
+    expect(onSelect).toHaveBeenCalledOnce();
+    expect(onSelect).toHaveBeenCalledWith("studio");
+  });
+
+  it("respects item availability without treating unknown presence as unavailable", () => {
+    const tabs = render({
+      items: [
+        ...props.items,
+        {
+          id: "removed",
+          name: "Unavailable",
+          presence: "offline",
+          disabled: true,
+        },
+      ],
+    });
+    expect(tabs[1].disabled).toBe(false);
+    expect(tabs[2].disabled).toBe(true);
+    act(() => tabs[2].click());
+    expect(onSelect).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    "MacBook Pro · A very long workstation owner name",
+    "研发工作站 · 团队共享设备 · " + "长名称".repeat(32),
+  ])(
+    "keeps a full single-line device name in the scrolling strip: %s",
+    (name) => {
+      const tabs = render({
+        items: [{ id: "mac", name, presence: "offline" }],
+        currentId: null,
+      });
+      expect(tabs[0].textContent).toContain(name);
+      expect(tabs[0].dataset.active).toBe("false");
+      // Exercise the real TabPill. A capped button or clipped label cannot be
+      // recovered by scrolling the outer strip, even with the full DOM text.
+      const list = container.querySelector(
+        ".mobile-session-device-tabs__list"
+      )!;
+      expect(list.className).not.toMatch(
+        /max-w-|\[&_button[^\]]*\]:overflow-hidden/
+      );
+      expect(tabs[0].classList.contains("shrink-0")).toBe(true);
+      expect(tabs[0].classList.contains("whitespace-nowrap")).toBe(true);
+      const label = tabs[0].querySelector(".grid")!;
+      expect(label.classList.contains("min-w-0")).toBe(false);
+      expect(label.classList.contains("overflow-hidden")).toBe(false);
+      expect(label.querySelector('[aria-hidden="true"]')?.textContent).toBe(
+        name
+      );
+      expect(tabs[0].textContent).toContain("devices.offline");
+      expect(container.querySelector(".overflow-x-auto")).not.toBeNull();
+    }
+  );
+
+  it("does not invent a device when inventory is empty", () => {
+    render({ items: [] });
+    expect(container.innerHTML).toBe("");
+    expect(onSelect).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/modules/MobileRemote/components/SessionDeviceTabs.tsx b/src/modules/MobileRemote/components/SessionDeviceTabs.tsx
new file mode 100644
index 0000000000..03b0e4ce1a
--- /dev/null
+++ b/src/modules/MobileRemote/components/SessionDeviceTabs.tsx
@@ -0,0 +1,92 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import StatusDot from "@src/components/StatusDot";
+import TabPill from "@src/components/TabPill";
+import { HugeiconsIcon, LaptopIcon } from "@src/icons";
+
+import type { DesktopPresence } from "../connection/types";
+
+export interface SessionDeviceTabItem {
+  id: string;
+  name: string;
+  presence: DesktopPresence;
+  disabled?: boolean;
+}
+
+export interface SessionDeviceTabsProps {
+  items: readonly SessionDeviceTabItem[];
+  currentId: string | null;
+  onSelect: (id: string) => void;
+  disabled?: boolean;
+}
+
+/** Selection and connection work belong to the provider, never to this strip. */
+export function SessionDeviceTabs({
+  items,
+  currentId,
+  onSelect,
+  disabled = false,
+}: SessionDeviceTabsProps) {
+  const { t } = useTranslation("mobileRemote");
+
+  if (items.length === 0) return null;
+
+  return (
+    <div
+      className="mobile-session-device-tabs min-w-0 overflow-x-auto overscroll-x-contain py-1"
+      role="group"
+      aria-label={t("devices.pairedDesktops")}
+    >
+      {/* Keep each name intrinsic-width; the outer strip owns horizontal overflow. */}
+      <TabPill
+        className="mobile-session-device-tabs__list gap-2! [&_button]:min-h-11"
+        variant="pill"
+        appearance="muted"
+        size="large"
+        activeTone="neutral"
+        fillWidth={false}
+        activeTab={currentId ?? ""}
+        tabs={items.map((item) => ({
+          key: item.id,
+          label: item.name,
+          disabled: disabled || item.disabled,
+          dataTestId: "mobile-session-device-tab",
+          icon: (
+            <span className="inline-flex shrink-0 items-center gap-1.5">
+              <StatusDot
+                color={
+                  item.presence === "online" ? "bg-success-6" : "bg-text-4"
+                }
+                size="sm"
+                label={
+                  <span className="sr-only">
+                    {t(
+                      item.presence === "online"
+                        ? "devices.online"
+                        : item.presence === "offline"
+                          ? "devices.offline"
+                          : "devices.presenceUnknown"
+                    )}
+                  </span>
+                }
+              />
+              <HugeiconsIcon icon={LaptopIcon} size={18} aria-hidden="true" />
+              {item.id === currentId ? (
+                <span className="sr-only">{t("devices.currentDesktop")}</span>
+              ) : null}
+            </span>
+          ),
+        }))}
+        onChange={(id) => {
+          const item = items.find((candidate) => candidate.id === id);
+          if (!disabled && item && !item.disabled && id !== currentId) {
+            onSelect(id);
+          }
+        }}
+      />
+    </div>
+  );
+}
+
+SessionDeviceTabs.displayName = "SessionDeviceTabs";
diff --git a/src/modules/MobileRemote/components/SessionListItem.test.ts b/src/modules/MobileRemote/components/SessionListItem.test.ts
index ea3e7f2425..13dafda75a 100644
--- a/src/modules/MobileRemote/components/SessionListItem.test.ts
+++ b/src/modules/MobileRemote/components/SessionListItem.test.ts
@@ -3,15 +3,29 @@ import { createElement } from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vitest";
 
-import { SessionListItem } from "./SessionListItem";
+import { SESSION_STATUS_DOT_COLOR } from "@src/util/session/sessionStatusDot";
 
-function renderRow(status: "running" | "idle" = "idle"): HTMLButtonElement {
+import { SessionListItem, type SessionListItemProps } from "./SessionListItem";
+
+function renderRow(
+  status: SessionListItemProps["status"] = "idle",
+  metadata: Pick<
+    SessionListItemProps,
+    | "workspaceName"
+    | "updatedAtMs"
+    | "display"
+    | "visited"
+    | "mergeStatus"
+    | "compact"
+  > = {}
+): HTMLButtonElement {
   const host = document.createElement("div");
   host.innerHTML = renderToStaticMarkup(
     createElement(SessionListItem, {
       sessionId: "sdeagent-thread-1",
       name: "A very long session title that must remain inside its own row",
       status,
+      ...metadata,
     })
   );
   const row = host.querySelector<HTMLButtonElement>(
@@ -22,28 +36,133 @@ function renderRow(status: "running" | "idle" = "idle"): HTMLButtonElement {
 }
 
 describe("SessionListItem layout", () => {
-  it("reuses the compact Desktop sidebar row geometry and typography", () => {
+  it("uses a single aligned heading without a reserved metadata row in compact mode", () => {
+    const row = renderRow("idle", {
+      compact: true,
+      workspaceName: "Project",
+      updatedAtMs: 1000,
+    });
+    expect(row.classList.contains("mobile-session-row--compact")).toBe(true);
+    expect(row.classList.contains("min-h-16")).toBe(false);
+    expect(row.querySelector(".mobile-session-row__meta")).toBeNull();
+    expect(row.querySelector(".mobile-session-row__workspace")).toBeNull();
+    const heading = row.querySelector(".mobile-session-row__heading")!;
+    expect(row.querySelector("time")).toBeNull();
+    expect(heading.lastElementChild?.hasAttribute("data-session-status")).toBe(
+      true
+    );
+    expect(
+      renderRow("unknown", { compact: true, updatedAtMs: NaN }).querySelector(
+        "time"
+      )
+    ).toBeNull();
+  });
+  it("shares Desktop's terminal unread rule without inventing unread before synchronization", () => {
+    const green = (row: HTMLElement) =>
+      row.innerHTML.includes(SESSION_STATUS_DOT_COLOR.unread);
+    expect(green(renderRow("completed", { visited: false }))).toBe(true);
+    expect(green(renderRow("completed", { visited: true }))).toBe(false);
+    expect(green(renderRow("completed"))).toBe(false);
+    expect(
+      green(renderRow("completed", { visited: false, mergeStatus: "pending" }))
+    ).toBe(false);
+    expect(green(renderRow("running", { visited: false }))).toBe(false);
+    expect(green(renderRow("waiting_for_user", { visited: false }))).toBe(
+      false
+    );
+    expect(green(renderRow("offline", { visited: false }))).toBe(false);
+  });
+  it("renders the wire agent metadata instead of guessing solely from the session ID", () => {
+    const original = renderRow().querySelector(
+      "[data-icon=session-sdeagent-thread-1]"
+    )!.innerHTML;
+    const managed = renderRow("idle", {
+      display: { cliAgentType: "claude_code" },
+    });
+    expect(
+      managed.querySelector("[data-icon=session-sdeagent-thread-1]")!.innerHTML
+    ).not.toBe(original);
+  });
+  it("keeps the full title accessible while placing the dot in the title line", () => {
     const row = renderRow();
 
     expect(row.tagName).toBe("BUTTON");
     expect(row.className).toContain("flex");
-    expect(row.className).toContain("h-8");
+    expect(row.className).toContain("mobile-session-row");
+    expect(row.className).toContain("min-h-16");
     expect(row.className).toContain("w-full");
     expect(row.children).toHaveLength(1);
     expect(row.querySelector("[data-icon=session-sdeagent-thread-1]")).not.toBe(
       null
     );
-    expect(row.querySelector(".text-\\[13px\\]")?.textContent).toContain(
-      "A very long session title"
-    );
-    expect(row.textContent).not.toContain("idle");
+    expect(
+      row.querySelector(".mobile-session-row__title")?.textContent
+    ).toContain("A very long session title");
+    expect(
+      row.querySelector(".mobile-session-row__title")?.getAttribute("title")
+    ).toBe("A very long session title that must remain inside its own row");
+    expect(row.textContent).not.toContain("sessions.state.idle");
     expect(row.textContent).not.toContain("LIVE");
   });
 
+  it("keeps workspace and date on the metadata line, separate from title and status", () => {
+    const row = renderRow("idle", {
+      workspaceName: "Long workspace",
+      updatedAtMs: 1_700_000_000_000,
+    });
+    const meta = row.querySelector(".mobile-session-row__meta")!;
+    expect(
+      meta.querySelector(".mobile-session-row__workspace")?.textContent
+    ).toBe("Long workspace");
+    expect(meta.querySelector("time")?.dateTime).toBe(
+      new Date(1_700_000_000_000).toISOString()
+    );
+    expect(meta.querySelector("[data-session-status]")).toBeNull();
+    expect(row.querySelector(".mobile-session-row__heading time")).toBeNull();
+  });
+
+  it("does not invent workspace or date for missing or invalid metadata", () => {
+    const row = renderRow("unknown", { updatedAtMs: Number.NaN });
+    expect(row.querySelector("time")).toBeNull();
+    expect(row.querySelector(".mobile-session-row__workspace")).toBeNull();
+    expect(row.querySelector('[data-session-status="unknown"]')).not.toBeNull();
+  });
+
   it("shows the same compact working status dot used by Desktop rows", () => {
     const row = renderRow("running");
 
-    expect(row.querySelector('[aria-label="Working"]')).not.toBe(null);
-    expect(row.textContent).not.toContain("running");
+    expect(row.querySelector('[aria-label="sessions.state.running"]')).not.toBe(
+      null
+    );
+    expect(row.textContent).not.toContain("sessions.state.running");
   });
+
+  it.each([
+    ["running", "working"],
+    ["awaiting_approval", "asking"],
+    ["waiting_for_user", "asking"],
+    ["waiting_for_funds", "working"],
+    ["paused", "default"],
+    ["completed", "default"],
+    ["idle", "default"],
+    ["offline", "default"],
+    ["unknown", "default"],
+  ] as const)(
+    "uses Desktop's %s tone on one trailing dot, without status text",
+    (status, tone) => {
+      const row = renderRow(status);
+      const marker = row.querySelector(`[data-session-status="${status}"]`)!;
+      expect(
+        row.querySelector(".mobile-session-row__heading")?.lastElementChild
+      ).toBe(marker);
+      expect(marker.querySelector("span")?.getAttribute("style")).toContain(
+        SESSION_STATUS_DOT_COLOR[tone]
+      );
+      expect(
+        row.querySelectorAll(`[aria-label="sessions.state.${status}"]`)
+      ).toHaveLength(1);
+      expect(row.textContent).not.toContain(`sessions.state.${status}`);
+      expect(row.querySelector(".mobile-session-row__status")).toBeNull();
+    }
+  );
 });
diff --git a/src/modules/MobileRemote/components/SessionListItem.tsx b/src/modules/MobileRemote/components/SessionListItem.tsx
index e47d9a1486..5299e7a650 100644
--- a/src/modules/MobileRemote/components/SessionListItem.tsx
+++ b/src/modules/MobileRemote/components/SessionListItem.tsx
@@ -1,16 +1,34 @@
 import React from "react";
+import { useTranslation } from "react-i18next";
 
 import Button from "@src/components/Button";
 import {
   SESSION_ROW_PRESENTATION,
   SessionRowLeadingIcon,
+  SessionRowStatusDot,
 } from "@src/components/SessionRowPresentation";
+import { isSessionInProgress } from "@src/util/session/sessionInProgress";
 import { resolveSessionRowIcon } from "@src/util/session/sessionSidebarRow";
+import { isSessionCompletedUnread } from "@src/util/session/sessionStatusDot";
+
+import type { MobileSessionDisplay } from "../connection/types";
+import {
+  type MobileRowStatus,
+  mobileSessionIconInput,
+} from "./sessionRowPresentation";
 
 export interface SessionListItemProps {
   sessionId: string;
   name: string;
-  status: "running" | "idle";
+  status: MobileRowStatus;
+  display?: MobileSessionDisplay;
+  /** Undefined means unsynchronized/unsupported, never assume unread. */
+  visited?: boolean;
+  mergeStatus?: string | null;
+  workspaceName?: string | null;
+  /** Workspace is already conveyed by the section heading. */
+  compact?: boolean;
+  updatedAtMs?: number;
   onSelect?: () => void;
 }
 
@@ -18,9 +36,44 @@ export function SessionListItem({
   sessionId,
   name,
   status,
+  display,
+  visited,
+  mergeStatus,
+  workspaceName,
+  compact = false,
+  updatedAtMs,
   onSelect,
 }: SessionListItemProps) {
-  const statusTone = status === "running" ? "working" : "default";
+  const { t, i18n } = useTranslation("mobileRemote");
+  const statusTone =
+    status === "awaiting_approval" || status === "waiting_for_user"
+      ? "asking"
+      : isSessionInProgress(status)
+        ? "working"
+        : visited === false &&
+            isSessionCompletedUnread(
+              { session_id: sessionId, status, mergeStatus },
+              new Set()
+            )
+          ? "unread"
+          : "default";
+  const statusLabel =
+    statusTone === "unread"
+      ? t("sessions.state.unread")
+      : t(`sessions.state.${status}`);
+  const updated = updatedAtMs == null ? null : new Date(updatedAtMs);
+  const timestamp =
+    updated && !Number.isNaN(updated.getTime()) ? (
+      <time
+        className="mobile-session-row__time mobile-type-caption text-text-3"
+        dateTime={updated.toISOString()}
+      >
+        {updated.toLocaleString(i18n?.language, {
+          month: "short",
+          day: "numeric",
+        })}
+      </time>
+    ) : null;
 
   return (
     <Button
@@ -28,22 +81,41 @@ export function SessionListItem({
       appearance="custom"
       htmlType="button"
       data-testid="mobile-remote-session-row"
-      className={`${SESSION_ROW_PRESENTATION.row} w-full cursor-pointer border-0 bg-transparent px-2 text-left text-text-1 outline-none select-none hover:bg-sidebar-selected focus-visible:bg-sidebar-selected focus-visible:ring-2 focus-visible:ring-primary-6/30 active:bg-sidebar-selected`}
+      className={`mobile-session-row flex w-full text-left ${compact ? "mobile-session-row--compact" : "min-h-16"}`}
       onClick={onSelect}
     >
-      <span className={SESSION_ROW_PRESENTATION.content}>
+      <span
+        className={`${SESSION_ROW_PRESENTATION.content} mobile-session-row__content`}
+      >
         <SessionRowLeadingIcon
-          icon={resolveSessionRowIcon(sessionId)}
+          icon={resolveSessionRowIcon(
+            mobileSessionIconInput(sessionId, display)
+          )}
           iconLabel={`session-${sessionId}`}
-          statusTone={statusTone}
-          statusLabel={status === "running" ? "Working" : undefined}
         />
         <span className={SESSION_ROW_PRESENTATION.text}>
-          <span
-            className={`${SESSION_ROW_PRESENTATION.title} block text-text-1`}
-          >
-            {name}
+          <span className="mobile-session-row__heading">
+            <span className="mobile-session-row__title" title={name}>
+              {name}
+            </span>
+            <span
+              className="inline-flex shrink-0"
+              data-session-status={status}
+              title={statusLabel}
+            >
+              <SessionRowStatusDot tone={statusTone} label={statusLabel} />
+            </span>
           </span>
+          {!compact ? (
+            <span className="mobile-session-row__meta">
+              {workspaceName ? (
+                <span className="mobile-session-row__workspace">
+                  {workspaceName}
+                </span>
+              ) : null}
+              {timestamp}
+            </span>
+          ) : null}
         </span>
       </span>
     </Button>
diff --git a/src/modules/MobileRemote/components/SessionViewMenu.test.ts b/src/modules/MobileRemote/components/SessionViewMenu.test.ts
new file mode 100644
index 0000000000..9df2f0439f
--- /dev/null
+++ b/src/modules/MobileRemote/components/SessionViewMenu.test.ts
@@ -0,0 +1,189 @@
+// @vitest-environment jsdom
+import React, { act, useState } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import {
+  DROPDOWN_CLASSES,
+  DROPDOWN_ITEM,
+  DROPDOWN_PANEL,
+} from "@src/components/Dropdown/tokens";
+
+import { SessionViewMenu } from "./SessionViewMenu";
+import type { SessionGroupBy } from "./sessionGrouping";
+
+vi.mock("../platform", async () => {
+  const { createBrowserMobileRemotePlatform } =
+    await import("../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { useMobileRemotePlatform: () => platform };
+});
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+describe("SessionViewMenu", () => {
+  let host: HTMLDivElement;
+  let root: Root;
+  const change = vi.fn();
+
+  beforeEach(() => {
+    Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
+    change.mockClear();
+    host = document.createElement("div");
+    document.body.appendChild(host);
+    root = createRoot(host);
+    function Harness() {
+      const [groupBy, setGroupBy] = useState<SessionGroupBy>("none");
+      return React.createElement(SessionViewMenu, {
+        value: groupBy,
+        onChange: (value) => {
+          change(value);
+          setGroupBy(value);
+        },
+      });
+    }
+    act(() => root.render(React.createElement(Harness)));
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    host.remove();
+    Reflect.deleteProperty(globalThis, "IS_REACT_ACT_ENVIRONMENT");
+  });
+
+  const trigger = () => host.querySelector<HTMLButtonElement>("button")!;
+  const option = (id: string) =>
+    document.querySelector<HTMLElement>(`[data-testid=mobile-group-${id}]`)!;
+  const click = async (element: HTMLElement) =>
+    act(async () => {
+      element.click();
+      await Promise.resolve();
+    });
+
+  it("keeps the ellipsis in a circular touch-sized shared Button without a label wrapper", async () => {
+    const control = trigger();
+    // Real Button inline styles win over mobile CSS. Do not replace this
+    // component with a mock that omits its desktop sizing or label wrapper.
+    expect(control.classList.contains("button")).toBe(true);
+    expect(control.type).toBe("button");
+    expect(control.style.width).toBe("var(--mobile-touch-size)");
+    expect(control.style.height).toBe("var(--mobile-touch-size)");
+    expect(control.style.padding).toBe("0px");
+    expect(control.style.borderRadius).toBe("50%");
+    expect(control.querySelector(".truncate")).toBeNull();
+    expect(control.querySelector('svg[aria-hidden="true"]')).not.toBeNull();
+    expect(control.textContent).toBe("");
+    expect(control.getAttribute("aria-label")).toBe("sessions.viewOptions");
+    expect(control.getAttribute("aria-haspopup")).toBe("listbox");
+    expect(control.getAttribute("aria-expanded")).toBe("false");
+    await click(control);
+    expect(control.getAttribute("aria-expanded")).toBe("true");
+    await click(option("time"));
+    expect(change).toHaveBeenCalledWith("time");
+    expect(control.getAttribute("aria-expanded")).toBe("false");
+  });
+
+  it("opens Group by, changes the controlled selection, closes, and can return to none", async () => {
+    expect(trigger().getAttribute("aria-label")).toBe("sessions.viewOptions");
+    expect(trigger().getAttribute("aria-expanded")).toBe("false");
+    await click(trigger());
+    const content = document.querySelector(
+      '[data-testid="mobile-session-view-menu-panel"]'
+    )!;
+    const panel = content.parentElement!;
+    expect(content).not.toBeNull();
+    expect(panel).not.toBeNull();
+    expect(panel.classList.contains("mobile-session-view-menu")).toBe(true);
+    expect(host.contains(panel)).toBe(false);
+    expect(panel.classList.contains(DROPDOWN_PANEL.bgClass)).toBe(true);
+    expect(panel.classList.contains(DROPDOWN_PANEL.menuMinWidthClass)).toBe(
+      true
+    );
+    expect(panel.classList.contains(DROPDOWN_PANEL.borderRadiusClass)).toBe(
+      true
+    );
+    expect(panel.classList.contains(DROPDOWN_PANEL.shadowClass)).toBe(true);
+    expect(content.querySelector(".shadow-dropdown")).toBeNull();
+    expect(document.body.textContent).toContain("sessions.groupBy");
+    const heading = Array.from(panel.querySelectorAll("span")).find(
+      (element) => element.textContent === "sessions.groupBy"
+    );
+    expect(heading?.classList.contains("whitespace-nowrap")).toBe(true);
+    expect(heading?.parentElement?.className).toBe(
+      DROPDOWN_CLASSES.sectionLabel
+    );
+    expect(option("none").getAttribute("aria-selected")).toBe("true");
+    expect(
+      option("none").querySelector('svg[aria-hidden="true"]')
+    ).not.toBeNull();
+    expect(
+      option("time").querySelector('svg[aria-hidden="true"]')
+    ).not.toBeNull();
+    expect(
+      option("time")
+        .querySelector('svg[aria-hidden="true"]')
+        ?.getAttribute("width")
+    ).toBe(String(DROPDOWN_ITEM.iconSize));
+    expect(
+      option("time")
+        .querySelector('svg[aria-hidden="true"]')
+        ?.getAttribute("height")
+    ).toBe(String(DROPDOWN_ITEM.iconSize));
+    const noneChildren = Array.from(option("none").children);
+    expect(
+      noneChildren[0]?.querySelector('svg[aria-hidden="true"]')
+    ).not.toBeNull();
+    expect(noneChildren[1]?.textContent).toContain("sessions.groupNone");
+    await click(option("time"));
+    expect(change).toHaveBeenCalledTimes(1);
+    expect(change).toHaveBeenCalledWith("time");
+    expect(trigger().getAttribute("aria-expanded")).toBe("false");
+    await click(trigger());
+    expect(option("time").getAttribute("aria-selected")).toBe("true");
+    expect(
+      option("workspace").querySelector('svg[aria-hidden="true"]')
+    ).not.toBeNull();
+    await click(option("workspace"));
+    expect(change).toHaveBeenLastCalledWith("workspace");
+    expect(trigger().getAttribute("aria-expanded")).toBe("false");
+    await click(trigger());
+    expect(option("workspace").getAttribute("aria-selected")).toBe("true");
+    await click(option("none"));
+    expect(change).toHaveBeenLastCalledWith("none");
+  });
+
+  it("supports keyboard open and Escape without changing grouping", async () => {
+    trigger().focus();
+    await act(async () => {
+      trigger().dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Enter", bubbles: true })
+      );
+    });
+    expect(trigger().getAttribute("aria-expanded")).toBe("true");
+    await act(async () => {
+      trigger().dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
+      );
+    });
+    expect(trigger().getAttribute("aria-expanded")).toBe("false");
+    expect(document.activeElement).toBe(trigger());
+    expect(change).not.toHaveBeenCalled();
+  });
+
+  it("closes the surfaced menu on outside click without changing selection", async () => {
+    await click(trigger());
+    await act(async () => {
+      document.body.dispatchEvent(
+        new MouseEvent("mousedown", { bubbles: true })
+      );
+      document.body.click();
+    });
+    expect(trigger().getAttribute("aria-expanded")).toBe("false");
+    expect(
+      document.querySelector('[data-testid="mobile-session-view-menu-panel"]')
+    ).toBeNull();
+    expect(change).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/modules/MobileRemote/components/SessionViewMenu.tsx b/src/modules/MobileRemote/components/SessionViewMenu.tsx
new file mode 100644
index 0000000000..7d94773762
--- /dev/null
+++ b/src/modules/MobileRemote/components/SessionViewMenu.tsx
@@ -0,0 +1,124 @@
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import Dropdown from "@src/components/Dropdown";
+import {
+  DROPDOWN_CLASSES,
+  DROPDOWN_ITEM,
+  DROPDOWN_PANEL,
+} from "@src/components/Dropdown/tokens";
+import {
+  Clock01Icon,
+  FolderClosedIcon,
+  HugeiconsIcon,
+  ListIcon,
+  MoreHorizontalIcon,
+} from "@src/icons";
+
+import { useMobileRemotePlatform } from "../platform";
+import type { SessionGroupBy } from "./sessionGrouping";
+import "./sessionViewMenu.scss";
+
+export interface SessionViewMenuProps {
+  value: SessionGroupBy;
+  onChange: (value: SessionGroupBy) => void;
+}
+
+export function SessionViewMenu({ value, onChange }: SessionViewMenuProps) {
+  const { t } = useTranslation("mobileRemote");
+  const [open, setOpen] = useState(false);
+  const { runtime } = useMobileRemotePlatform();
+  const popupContainer = runtime.portalContainer?.();
+
+  return (
+    <Dropdown
+      trigger="click"
+      position="bottom-end"
+      getPopupContainer={
+        popupContainer ? () => popupContainer as HTMLElement : undefined
+      }
+      avoidViewportOverflow
+      popupVisible={open}
+      onVisibleChange={setOpen}
+      value={value}
+      className={`mobile-session-view-menu ${DROPDOWN_PANEL.menuMinWidthClass}`}
+      dropdownRender={(menu) => (
+        <div
+          className="mobile-session-view-menu__content"
+          data-testid="mobile-session-view-menu-panel"
+        >
+          <div className={DROPDOWN_CLASSES.sectionLabel}>
+            <span className="whitespace-nowrap">{t("sessions.groupBy")}</span>
+          </div>
+          {menu}
+        </div>
+      )}
+      options={[
+        {
+          label: t("sessions.groupNone"),
+          value: "none",
+          icon: (
+            <HugeiconsIcon
+              icon={ListIcon}
+              size={DROPDOWN_ITEM.iconSize}
+              aria-hidden="true"
+            />
+          ),
+          dataTestId: "mobile-group-none",
+        },
+        {
+          label: t("sessions.groupTime"),
+          value: "time",
+          icon: (
+            <HugeiconsIcon
+              icon={Clock01Icon}
+              size={DROPDOWN_ITEM.iconSize}
+              aria-hidden="true"
+            />
+          ),
+          dataTestId: "mobile-group-time",
+        },
+        {
+          label: t("sessions.groupWorkspace"),
+          value: "workspace",
+          icon: (
+            <HugeiconsIcon
+              icon={FolderClosedIcon}
+              size={DROPDOWN_ITEM.iconSize}
+              aria-hidden="true"
+            />
+          ),
+          dataTestId: "mobile-group-workspace",
+        },
+      ]}
+      onSelect={(next) => {
+        if (next === "none" || next === "time" || next === "workspace")
+          onChange(next);
+      }}
+    >
+      <Button
+        appearance="soft"
+        variant="tertiary"
+        shape="circle"
+        iconOnly
+        htmlType="button"
+        className="mobile-chrome-icon-button"
+        style={{
+          width: "var(--mobile-touch-size)",
+          height: "var(--mobile-touch-size)",
+        }}
+        aria-label={t("sessions.viewOptions")}
+        aria-haspopup="listbox"
+        aria-expanded={open}
+        icon={
+          <HugeiconsIcon
+            icon={MoreHorizontalIcon}
+            size={22}
+            aria-hidden="true"
+          />
+        }
+      />
+    </Dropdown>
+  );
+}
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeFileHeader.tsx b/src/modules/MobileRemote/components/changes/MobileChangeFileHeader.tsx
new file mode 100644
index 0000000000..27affe5867
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeFileHeader.tsx
@@ -0,0 +1,81 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import DiffStatsBadge from "@src/components/DiffStatsBadge";
+import { ArrowUpRight01Icon, HugeiconsIcon } from "@src/icons";
+
+import type { ChangeFile } from "./useChangeReview";
+
+export function MobileChangeFileHeader({
+  file,
+  expanded,
+  full,
+  onToggle,
+  onOpenFull,
+}: {
+  file: ChangeFile;
+  expanded: boolean;
+  full: boolean;
+  onToggle: () => void;
+  onOpenFull: () => void;
+}) {
+  const { t } = useTranslation("mobileRemote");
+  const path = file.path.replace(/\\/g, "/");
+  const separator = path.lastIndexOf("/");
+  return (
+    <div className="mobile-change-review__file-heading">
+      <Button
+        layout="custom"
+        appearance="custom"
+        htmlType="button"
+        className="mobile-change-review__file-toggle"
+        disabled={full}
+        aria-expanded={full ? undefined : expanded}
+        aria-label={`${t(expanded ? "changeReview.collapse" : "changeReview.expand")} ${file.path}`}
+        onClick={onToggle}
+        title={file.path}
+      >
+        <span className="mobile-change-review__filename">
+          {path.slice(separator + 1)}
+        </span>
+        {separator >= 0 && (
+          <span className="mobile-change-review__directory">
+            {path.slice(0, separator)}
+          </span>
+        )}
+      </Button>
+      {file.additions !== null && file.deletions !== null && (
+        <DiffStatsBadge
+          additions={file.additions}
+          deletions={file.deletions}
+          variant="plain"
+          reserveValueWidth={false}
+          gapClassName="gap-2"
+        />
+      )}
+      {!full && (
+        <Button
+          iconOnly
+          variant="tertiary"
+          appearance="ghost"
+          className="mobile-change-review__open-file"
+          style={{
+            width: "var(--mobile-change-touch-size)",
+            height: "var(--mobile-change-touch-size)",
+            padding: 0,
+          }}
+          aria-label={`${t("changeReview.full")}: ${file.path}`}
+          onClick={onOpenFull}
+          icon={
+            <HugeiconsIcon
+              icon={ArrowUpRight01Icon}
+              size={18}
+              aria-hidden="true"
+            />
+          }
+        />
+      )}
+    </div>
+  );
+}
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeReview.panel.test.ts b/src/modules/MobileRemote/components/changes/MobileChangeReview.panel.test.ts
new file mode 100644
index 0000000000..9b8923ff7e
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeReview.panel.test.ts
@@ -0,0 +1,714 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import type { MobileRpcClient } from "../../connection/mobileRpcClient";
+import { MobileChangeReview } from "./MobileChangeReview";
+import type { ChangeFile } from "./useChangeReview";
+
+const copy = vi.hoisted(() => vi.fn());
+vi.mock("../../platform", async () => {
+  const { createBrowserMobileRemotePlatform } =
+    await import("../../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { useMobileRemotePlatform: () => platform };
+});
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, options?: { count?: number }) =>
+      options?.count === undefined ? key : `${key} (${options.count})`,
+  }),
+}));
+vi.mock("@src/scaffold/ModalSystem", () => ({
+  default: ({
+    children,
+    title,
+    headerActions,
+    onClose,
+    closable,
+    className,
+  }: React.PropsWithChildren<{
+    title: React.ReactNode;
+    headerActions?: React.ReactNode;
+    onClose: () => void;
+    closable?: boolean;
+    className?: string;
+  }>) =>
+    React.createElement(
+      "div",
+      { role: "dialog", className },
+      title,
+      headerActions,
+      children,
+      closable !== false &&
+        React.createElement("button", { onClick: onClose }, "close")
+    ),
+}));
+vi.mock("../transcript/useMobileCopyText", () => ({
+  useMobileCopyText: () => ({ state: "idle", copy }),
+}));
+vi.mock("../transcript/MobileReadonlyEditor", () => ({
+  default: ({
+    content,
+    wrap,
+    height,
+  }: {
+    content: string;
+    wrap: boolean;
+    height?: string;
+  }) =>
+    React.createElement(
+      "pre",
+      { "data-wrap": String(wrap), "data-height": height },
+      content
+    ),
+}));
+
+let root: ReturnType<typeof createRoot>;
+let host: HTMLDivElement;
+let intersectImmediately: boolean;
+let observers: { callback: (entries: unknown[]) => void; active: boolean }[];
+const originalScrollIntoView = Object.getOwnPropertyDescriptor(
+  HTMLElement.prototype,
+  "scrollIntoView"
+);
+const firstFile: ChangeFile = {
+  path: "src/a.ts",
+  additions: 3,
+  deletions: 1,
+  patches: [],
+  before: "before a",
+  after: "after a",
+  availability: "snapshots",
+};
+const secondFile = { ...firstFile, path: "src/b.ts", after: "after b" };
+const review = (files: ChangeFile[] = [firstFile]) => ({
+  complete: true,
+  files,
+});
+
+it("projects lazy patch responses into real numbered rows and expands long patches without another request", async () => {
+  const patch = `--- /dev/null\n+++ b/src/a.ts\n@@ -0,0 +1,100 @@\n${Array.from({ length: 100 }, (_, i) => `+const value${i + 1} = ${i + 1};`).join("\n")}\n`;
+  const changed: ChangeFile = {
+    ...firstFile,
+    before: null,
+    after: null,
+    patches: [patch],
+    availability: "patch_only",
+  };
+  const call = vi.fn(async (_method, params) =>
+    review([{ ...changed, patches: params.filePath ? [patch] : [] }])
+  );
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await tick();
+  expect(panel().querySelectorAll(".mobile-patch-diff__line")).toHaveLength(80);
+  expect(panel().querySelector(".mobile-patch-diff__number")?.textContent).toBe(
+    "1"
+  );
+  expect(panel().textContent).not.toContain("/dev/null");
+  expect(panel().textContent).not.toContain("@@");
+  const requests = call.mock.calls.length;
+  await act(async () =>
+    panel()
+      .querySelector<HTMLButtonElement>(".mobile-patch-diff__more")!
+      .click()
+  );
+  expect(panel().querySelectorAll(".mobile-patch-diff__line")).toHaveLength(
+    100
+  );
+  expect(call).toHaveBeenCalledTimes(requests);
+  await act(async () => panelButton("changeReview.full: src/a.ts").click());
+  await tick();
+  expect(panel().textContent).toContain("changeReview.unavailable");
+});
+const deferred = () => {
+  let resolve!: (value: unknown) => void;
+  const promise = new Promise((finish) => {
+    resolve = finish;
+  });
+  return { promise, resolve };
+};
+beforeEach(() => {
+  vi.useFakeTimers();
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+  Object.defineProperty(HTMLElement.prototype, "scrollIntoView", {
+    configurable: true,
+    value: vi.fn(),
+  });
+  copy.mockClear();
+  intersectImmediately = true;
+  observers = [];
+  vi.stubGlobal(
+    "IntersectionObserver",
+    class {
+      private record;
+      constructor(callback: (entries: unknown[]) => void) {
+        this.record = { callback, active: false };
+        observers.push(this.record);
+      }
+      observe() {
+        this.record.active = true;
+        if (intersectImmediately)
+          this.record.callback([{ isIntersecting: true }]);
+      }
+      disconnect() {
+        this.record.active = false;
+      }
+    }
+  );
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.useRealTimers();
+  vi.unstubAllGlobals();
+  if (originalScrollIntoView)
+    Object.defineProperty(
+      HTMLElement.prototype,
+      "scrollIntoView",
+      originalScrollIntoView
+    );
+  else Reflect.deleteProperty(HTMLElement.prototype, "scrollIntoView");
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = false;
+});
+const panel = () => host.querySelector<HTMLElement>('[role="dialog"]')!;
+const panelButton = (label: string) =>
+  Array.from(panel().querySelectorAll("button")).find(
+    (button) =>
+      button.getAttribute("aria-label") === label ||
+      button.textContent === label
+  )!;
+const tick = async () => {
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+};
+const propsFor = (call: ReturnType<typeof vi.fn>) => ({
+  client: { call } as unknown as MobileRpcClient,
+  sessionId: "panel",
+  roundId: "one",
+  online: true,
+  revision: "1",
+});
+const render = async (props: ReturnType<typeof propsFor>) => {
+  await act(async () =>
+    root.render(React.createElement(MobileChangeReview, props))
+  );
+};
+const open = async () => {
+  await act(async () =>
+    host
+      .querySelector<HTMLButtonElement>(".mobile-change-review__heading")!
+      .click()
+  );
+  await tick();
+};
+const scope = async (value: "turn" | "session" | "workspace") => {
+  await act(async () => {
+    panel()
+      .querySelector<HTMLButtonElement>(".mobile-change-review__scope button")!
+      .click();
+  });
+  await act(async () => {
+    Array.from(document.querySelectorAll<HTMLElement>('[role="option"]'))
+      .find((option) => option.textContent?.includes(`changeReview.${value}`))!
+      .click();
+  });
+};
+const mode = async (value: "diff" | "full") => {
+  await act(async () =>
+    panel()
+      .querySelector<HTMLButtonElement>(
+        `.mobile-change-review__mode [data-tab-key="${value}"]`
+      )!
+      .click()
+  );
+};
+const inViewport = async (visible: boolean) => {
+  await act(async () =>
+    observers
+      .filter((observer) => observer.active)
+      .forEach((observer) => observer.callback([{ isIntersecting: visible }]))
+  );
+};
+const fileToggle = () =>
+  panel().querySelector<HTMLButtonElement>(
+    ".mobile-change-review__file-toggle"
+  )!;
+
+it("retries a failed panel manifest with a pending state and no duplicate turn request", async () => {
+  const retry = deferred();
+  let sessionAttempts = 0;
+  const call = vi.fn().mockImplementation((_method, params) => {
+    if (params.scope === "session" && !params.filePath) {
+      sessionAttempts++;
+      return sessionAttempts === 1
+        ? Promise.reject(new Error("private failure"))
+        : retry.promise;
+    }
+    return Promise.resolve(review());
+  });
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await scope("session");
+  await tick();
+  expect(panel().querySelector('[data-state="error"]')?.textContent).toContain(
+    "changeReview.loadFailed"
+  );
+  expect(panel().textContent).not.toContain("private failure");
+  expect(
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )?.disabled
+  ).toBe(true);
+  await act(async () => panelButton("changeReview.retry").click());
+  expect(panel().querySelector('[data-state="error"]')).toBeNull();
+  expect(panel().querySelector('[data-state="loading"]')).not.toBeNull();
+  expect(
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )?.disabled
+  ).toBe(true);
+  await tick();
+  expect(sessionAttempts).toBe(2);
+  await act(async () => retry.resolve(review()));
+  await tick();
+  expect(panel().querySelector('[data-state="error"]')).toBeNull();
+  expect(panel().querySelector("pre")?.textContent).toBe("after a");
+  expect(
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )?.disabled
+  ).toBe(false);
+  expect(
+    call.mock.calls.filter(
+      ([, params]) => params.scope === "turn" && !params.filePath
+    )
+  ).toHaveLength(1);
+});
+
+it("keeps the newer scope visible when an aborted old-scope response arrives", async () => {
+  const old = deferred();
+  let oldSignal!: AbortSignal;
+  const call = vi.fn().mockImplementation((_method, params, signal) => {
+    if (params.scope === "session") {
+      oldSignal = signal;
+      return old.promise;
+    }
+    return Promise.resolve(
+      review(
+        params.scope === "workspace"
+          ? [{ ...firstFile, path: "workspace.ts" }]
+          : [firstFile]
+      )
+    );
+  });
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await scope("session");
+  await tick();
+  await scope("workspace");
+  await tick();
+  expect(oldSignal.aborted).toBe(true);
+  expect(panel().textContent).toContain("workspace.ts");
+  await act(async () =>
+    old.resolve(review([{ ...firstFile, path: "stale-session.ts" }]))
+  );
+  expect(panel().textContent).toContain("workspace.ts");
+  expect(panel().textContent).not.toContain("stale-session.ts");
+});
+
+it("shows the first available full file after a refreshed manifest removes the selected path", async () => {
+  let files = [firstFile, secondFile];
+  const call = vi.fn().mockImplementation(() => Promise.resolve(review(files)));
+  const props = propsFor(call);
+  await render(props);
+  await tick();
+  const row = host.querySelector<HTMLButtonElement>(
+    '[data-mobile-change-path="src/b.ts"]'
+  )!;
+  await act(async () => row.click());
+  await mode("full");
+  await tick();
+  expect(panel().querySelector("pre")?.textContent).toBe("after b");
+  files = [
+    { ...firstFile, path: "src/c.ts", after: "new file c" },
+    { ...firstFile, path: "src/d.ts", after: "new file d" },
+  ];
+  await render({ ...props, revision: "2" });
+  await tick();
+  await tick();
+  expect(
+    panel().querySelector(".mobile-change-review__file-heading")?.textContent
+  ).toContain("c.ts");
+  expect(panel().querySelector("pre")?.textContent).toBe("new file c");
+  expect(
+    panel().querySelector(".mobile-change-review__file-picker button")
+      ?.textContent
+  ).toBe("src/c.ts");
+  expect(panel().textContent).not.toContain("b.ts");
+});
+
+it("distinguishes unavailable snapshots, empty scope, and disconnected desktop", async () => {
+  const call = vi
+    .fn()
+    .mockImplementation((_method, params) =>
+      Promise.resolve(
+        params.scope === "session"
+          ? review([])
+          : review([{ ...firstFile, before: null, after: null }])
+      )
+    );
+  const props = propsFor(call);
+  await render(props);
+  await tick();
+  await open();
+  await mode("full");
+  await tick();
+  expect(panel().querySelector('[data-state="unavailable"]')).not.toBeNull();
+  expect(panel().querySelector('[data-state="empty"]')).toBeNull();
+  await mode("diff");
+  await scope("session");
+  await tick();
+  expect(panel().querySelector('[data-state="empty"]')).not.toBeNull();
+  expect(panel().querySelector('[data-state="unavailable"]')).toBeNull();
+  expect(
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )?.disabled
+  ).toBe(true);
+  await render({ ...props, online: false });
+  const count = call.mock.calls.length;
+  await tick();
+  expect(panel().querySelector('[data-state="offline"]')).not.toBeNull();
+  expect(panel().querySelector('[data-state="empty"]')).toBeNull();
+  expect(
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )?.disabled
+  ).toBe(true);
+  expect(call).toHaveBeenCalledTimes(count);
+});
+
+it("aborts panel-owned pending requests on close without destroying the inline turn manifest", async () => {
+  const pending = deferred();
+  let scopedSignal!: AbortSignal;
+  const call = vi.fn().mockImplementation((_method, params, signal) => {
+    if (params.scope === "session") {
+      scopedSignal = signal;
+      return pending.promise;
+    }
+    return Promise.resolve(review());
+  });
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await scope("session");
+  await tick();
+  await act(async () => panelButton("common:actions.close").click());
+  expect(scopedSignal.aborted).toBe(true);
+  expect(panel()).toBeNull();
+  await act(async () =>
+    pending.resolve(review([{ ...firstFile, path: "late.ts" }]))
+  );
+  expect(host.textContent).toContain("a.ts");
+  expect(
+    host.querySelector('[data-mobile-change-path="src/a.ts"]')
+  ).not.toBeNull();
+  expect(host.textContent).not.toContain("late.ts");
+  await open();
+  expect(panel().textContent).toContain("a.ts");
+  expect(
+    call.mock.calls.filter(
+      ([, params]) => params.scope === "turn" && !params.filePath
+    )
+  ).toHaveLength(1);
+});
+
+it("uses segmented modes and real icon-only controls with mobile geometry", async () => {
+  const call = vi.fn().mockResolvedValue(review());
+  await render(propsFor(call));
+  await tick();
+  await open();
+  const modes = panel().querySelector(".mobile-change-review__mode")!;
+  expect(modes.tagName).not.toBe("SELECT");
+  expect(modes.querySelectorAll("button")).toHaveLength(2);
+  expect(panel().querySelector("pre")?.dataset.height).toBe("auto");
+  expect(
+    modes.querySelector('[data-tab-key="diff"]')?.getAttribute("data-active")
+  ).toBe("true");
+  expect(
+    modes.querySelector('[data-tab-key="diff"] .sr-only')?.textContent
+  ).toBe("changeReview.selected");
+  expect(modes.querySelector('[data-tab-key="full"] .sr-only')).toBeNull();
+  const scopes = panel().querySelector<HTMLButtonElement>(
+    ".mobile-change-review__scope button"
+  )!;
+  expect(scopes.textContent).toBe("changeReview.turn");
+  expect(panel().querySelector("select")).toBeNull();
+  await act(async () => scopes.click());
+  expect(document.querySelectorAll('[role="option"]')).toHaveLength(3);
+  expect(
+    document
+      .querySelector(".mobile-change-review-menu")
+      ?.classList.contains("mobile-change-review-menu--scope")
+  ).toBe(true);
+  expect(
+    document.querySelector(".mobile-change-review-menu--files")
+  ).toBeNull();
+  await act(async () => scopes.click());
+  expect(
+    panel().querySelector<HTMLDetailsElement>(
+      ".mobile-change-review__file-actions"
+    )?.open
+  ).toBe(false);
+  const icons = [
+    panelButton("common:actions.close"),
+    panelButton("changeReview.wrap"),
+    panelButton("changeReview.copy"),
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )!,
+  ];
+  for (const icon of icons) {
+    expect(icon.classList.contains("button")).toBe(true);
+    expect(icon.querySelector("svg")).not.toBeNull();
+    expect(icon.querySelector(".truncate")).toBeNull();
+    expect(icon.style.width).toBe("var(--mobile-change-touch-size)");
+    expect(icon.style.height).toBe("var(--mobile-change-touch-size)");
+    expect(icon.style.padding).toBe("0px");
+  }
+  expect(icons[0].style.borderRadius).toBe("50%");
+  await act(async () => panelButton("changeReview.copy").click());
+  expect(copy).toHaveBeenCalledTimes(1);
+  await mode("full");
+  await tick();
+  expect(panel().querySelector("pre")?.dataset.height).toBe("100%");
+  expect(
+    modes.querySelector('[data-tab-key="full"]')?.getAttribute("data-active")
+  ).toBe("true");
+  expect(
+    modes.querySelector('[data-tab-key="full"] .sr-only')?.textContent
+  ).toBe("changeReview.selected");
+  expect(modes.querySelector('[data-tab-key="diff"] .sr-only')).toBeNull();
+  expect(panel().querySelector(".mobile-change-review__expand-all")).toBeNull();
+  await scope("session");
+  expect(scopes.textContent).toBe("changeReview.session");
+});
+
+it("uses the shared searchable file dropdown and disposes its portal when review closes", async () => {
+  const call = vi
+    .fn()
+    .mockImplementation((_method, params) =>
+      Promise.resolve(
+        review(
+          [firstFile, secondFile].filter(
+            (file) => !params.filePath || params.filePath === file.path
+          )
+        )
+      )
+    );
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await mode("full");
+  await tick();
+  const trigger = panel().querySelector<HTMLButtonElement>(
+    ".mobile-change-review__file-picker button"
+  )!;
+  expect(panel().querySelector("select")).toBeNull();
+  const requests = call.mock.calls.length;
+  await act(async () => trigger.click());
+  expect(trigger.getAttribute("aria-expanded")).toBe("true");
+  const input = document.querySelector<HTMLInputElement>(
+    ".mobile-change-review-menu input"
+  )!;
+  expect(input).not.toBeNull();
+  expect(
+    document.querySelector(".mobile-change-review-menu--files")
+  ).not.toBeNull();
+  await act(async () => {
+    Object.getOwnPropertyDescriptor(
+      HTMLInputElement.prototype,
+      "value"
+    )!.set!.call(input, "b.ts");
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+  });
+  expect(document.querySelectorAll('[role="option"]')).toHaveLength(1);
+  expect(call).toHaveBeenCalledTimes(requests);
+  await act(async () =>
+    document.querySelector<HTMLElement>('[role="option"]')!.click()
+  );
+  await tick();
+  expect(panel().querySelector("pre")?.textContent).toBe("after b");
+  expect(trigger.textContent).toBe("src/b.ts");
+  expect(document.querySelector(".mobile-change-review-menu")).toBeNull();
+  await act(async () => trigger.click());
+  expect(document.querySelectorAll('[role="option"]')).toHaveLength(2);
+  const modalEscape = vi.fn();
+  document.addEventListener("keydown", modalEscape);
+  await act(async () =>
+    document
+      .querySelector<HTMLInputElement>(".mobile-change-review-menu input")!
+      .dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
+      )
+  );
+  document.removeEventListener("keydown", modalEscape);
+  expect(modalEscape).not.toHaveBeenCalled();
+  expect(document.activeElement).toBe(trigger);
+  expect(document.querySelector(".mobile-change-review-menu")).toBeNull();
+  expect(panel()).not.toBeNull();
+  await act(async () => trigger.click());
+  await act(async () => panelButton("common:actions.close").click());
+  expect(document.querySelector(".mobile-change-review-menu")).toBeNull();
+});
+
+it("opens full content even after every diff file was collapsed", async () => {
+  const call = vi.fn().mockResolvedValue(review([firstFile, secondFile]));
+  await render(propsFor(call));
+  await tick();
+  await open();
+  const expandAll = () =>
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )!;
+  await act(async () => expandAll().click());
+  await act(async () => expandAll().click());
+  expect(fileToggle().getAttribute("aria-expanded")).toBe("false");
+  await mode("full");
+  await tick();
+  expect(panel().querySelector("pre")?.textContent).toBe("after a");
+  expect(fileToggle().disabled).toBe(true);
+});
+
+it("a repeated expand-all command supersedes an older manual file collapse", async () => {
+  const call = vi.fn().mockResolvedValue(review([firstFile, secondFile]));
+  await render(propsFor(call));
+  await tick();
+  await open();
+  const expandAll = () =>
+    panel().querySelector<HTMLButtonElement>(
+      ".mobile-change-review__expand-all"
+    )!;
+  expect(expandAll().getAttribute("aria-label")).toBe("changeReview.expandAll");
+  expect(
+    expandAll().querySelector('[data-icon="chevrons-up-down"]')
+  ).not.toBeNull();
+  await act(async () => expandAll().click());
+  expect(expandAll().getAttribute("aria-label")).toBe(
+    "changeReview.collapseAll"
+  );
+  expect(
+    expandAll().querySelector('[data-icon="chevrons-down-up"]')
+  ).not.toBeNull();
+  await act(async () => fileToggle().click());
+  expect(fileToggle().getAttribute("aria-expanded")).toBe("false");
+  await act(async () => expandAll().click());
+  expect(expandAll().getAttribute("title")).toBe("changeReview.expandAll");
+  expect(
+    expandAll().querySelector('[data-icon="chevrons-up-down"]')
+  ).not.toBeNull();
+  await act(async () => expandAll().click());
+  expect(fileToggle().getAttribute("aria-expanded")).toBe("true");
+  expect(
+    Array.from(
+      panel().querySelectorAll(".mobile-change-review__file-toggle")
+    ).every((entry) => entry.getAttribute("aria-expanded") === "true")
+  ).toBe(true);
+});
+
+it("keeps detail work viewport-gated and aborts it when the file collapses", async () => {
+  intersectImmediately = false;
+  const pending = deferred();
+  let detailSignal!: AbortSignal;
+  const call = vi.fn().mockImplementation((_method, params, signal) => {
+    if (params.filePath) {
+      detailSignal = signal;
+      return pending.promise;
+    }
+    return Promise.resolve(review());
+  });
+  await render(propsFor(call));
+  await tick();
+  await open();
+  expect(call.mock.calls.filter(([, params]) => params.filePath)).toHaveLength(
+    0
+  );
+  await inViewport(true);
+  await tick();
+  expect(call.mock.calls.filter(([, params]) => params.filePath)).toHaveLength(
+    1
+  );
+  await act(async () => fileToggle().click());
+  expect(detailSignal.aborted).toBe(true);
+  await act(async () => pending.resolve(review()));
+  expect(panel().querySelector("pre")).toBeNull();
+});
+
+it("falls back to an available after snapshot when a reloaded file no longer has its selected before side", async () => {
+  let currentFile = firstFile;
+  const call = vi
+    .fn()
+    .mockImplementation(() => Promise.resolve(review([currentFile])));
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await mode("full");
+  await tick();
+  await act(async () => panelButton("changeReview.after").click());
+  expect(panel().querySelector("pre")?.textContent).toBe("before a");
+  await inViewport(false);
+  currentFile = { ...firstFile, before: null, after: "reloaded after" };
+  await inViewport(true);
+  await tick();
+  expect(panel().querySelector("pre")?.textContent).toBe("reloaded after");
+  expect(panelButton("changeReview.after").disabled).toBe(true);
+  expect(panel().querySelector('[data-state="unavailable"]')).toBeNull();
+});
+
+it("renders an empty-string full snapshot as valid content instead of an unavailable file", async () => {
+  const call = vi.fn().mockResolvedValue(review([{ ...firstFile, after: "" }]));
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await mode("full");
+  await tick();
+  expect(panel().querySelector("pre")).not.toBeNull();
+  expect(panel().querySelector("pre")?.textContent).toBe("");
+  expect(panel().querySelector('[data-state="unavailable"]')).toBeNull();
+  expect(panelButton("changeReview.copy").disabled).toBe(false);
+  await act(async () => panelButton("changeReview.after").click());
+  expect(panel().querySelector("pre")?.textContent).toBe("before a");
+  await act(async () => panelButton("changeReview.before").click());
+  expect(panel().querySelector("pre")?.textContent).toBe("");
+});
+
+it("renders reconstructed history with provenance and allows both complete versions", async () => {
+  const call = vi
+    .fn()
+    .mockResolvedValue(
+      review([{ ...firstFile, availability: "reconstructed_from_history" }])
+    );
+  await render(propsFor(call));
+  await tick();
+  await open();
+  await mode("full");
+  await tick();
+  expect(panel().textContent).toContain("changeReview.reconstructed");
+  expect(panel().querySelector("pre")?.textContent).toBe(firstFile.after);
+  expect(panel().querySelector('[data-state="unavailable"]')).toBeNull();
+  await act(async () => panelButton("changeReview.after").click());
+  expect(panel().querySelector("pre")?.textContent).toBe(firstFile.before);
+  expect(panelButton("changeReview.copy").disabled).toBe(false);
+});
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeReview.test.ts b/src/modules/MobileRemote/components/changes/MobileChangeReview.test.ts
new file mode 100644
index 0000000000..f170020419
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeReview.test.ts
@@ -0,0 +1,694 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import type { MobileRpcClient } from "../../connection/mobileRpcClient";
+import { MobileChangeReview } from "./MobileChangeReview";
+import { validateReview } from "./useChangeReview";
+
+vi.mock("../../platform", async () => {
+  const { createBrowserMobileRemotePlatform } =
+    await import("../../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { useMobileRemotePlatform: () => platform };
+});
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, options?: { count?: number }) =>
+      options?.count === undefined ? key : `${key} (${options.count})`,
+  }),
+}));
+vi.mock("@src/scaffold/ModalSystem", () => ({
+  default: ({
+    children,
+    title,
+    onClose,
+    headerActions,
+    closable,
+  }: React.PropsWithChildren<{
+    title: React.ReactNode;
+    onClose: () => void;
+    headerActions?: React.ReactNode;
+    closable?: boolean;
+  }>) =>
+    React.createElement(
+      "div",
+      { role: "dialog" },
+      title,
+      headerActions,
+      children,
+      closable !== false &&
+        React.createElement("button", { onClick: onClose }, "close")
+    ),
+}));
+vi.mock("../transcript/useMobileCopyText", () => ({
+  useMobileCopyText: () => ({ state: "idle", copy: vi.fn() }),
+}));
+vi.mock("../transcript/MobileReadonlyEditor", () => ({
+  default: ({
+    content,
+    wrap,
+    height,
+  }: {
+    content: string;
+    wrap: boolean;
+    height?: string;
+  }) =>
+    React.createElement(
+      "pre",
+      { "data-wrap": String(wrap), "data-height": height },
+      content
+    ),
+}));
+let root: ReturnType<typeof createRoot>;
+let host: HTMLDivElement;
+const originalScrollIntoView = Object.getOwnPropertyDescriptor(
+  HTMLElement.prototype,
+  "scrollIntoView"
+);
+const file = {
+  path: "a.ts",
+  additions: 1,
+  deletions: 1,
+  patches: [],
+  before: null,
+  after: null,
+  availability: "patch_only",
+};
+beforeEach(() => {
+  vi.useFakeTimers();
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+  Object.defineProperty(HTMLElement.prototype, "scrollIntoView", {
+    configurable: true,
+    value: vi.fn(),
+  });
+  vi.stubGlobal(
+    "IntersectionObserver",
+    class {
+      constructor(private cb: (v: unknown[]) => void) {}
+      observe() {
+        this.cb([{ isIntersecting: true }]);
+      }
+      disconnect() {}
+    }
+  );
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.useRealTimers();
+  vi.unstubAllGlobals();
+  if (originalScrollIntoView) {
+    Object.defineProperty(
+      HTMLElement.prototype,
+      "scrollIntoView",
+      originalScrollIntoView
+    );
+  } else {
+    Reflect.deleteProperty(HTMLElement.prototype, "scrollIntoView");
+  }
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = false;
+});
+const button = (text: string) =>
+  Array.from(host.querySelectorAll("button")).find(
+    (b) =>
+      b.textContent?.startsWith(text) ||
+      (text === "close" &&
+        b.getAttribute("aria-label") === "common:actions.close")
+  )!;
+const summaryHeading = () =>
+  host.querySelector<HTMLElement>(".mobile-change-review__heading")!;
+const selectScope = async (value: string) => {
+  await act(async () => {
+    host
+      .querySelector<HTMLButtonElement>(".mobile-change-review__scope button")!
+      .click();
+  });
+  await act(async () => {
+    Array.from(document.querySelectorAll<HTMLElement>('[role="option"]'))
+      .find((option) => option.textContent?.includes(`changeReview.${value}`))!
+      .click();
+  });
+};
+const selectMode = async (value: "diff" | "full") => {
+  await act(async () => {
+    const mode = host.querySelector<HTMLElement>(
+      ".mobile-change-review__mode"
+    )!;
+    mode.querySelector<HTMLButtonElement>(`[data-tab-key="${value}"]`)!.click();
+  });
+};
+
+it("distinguishes pending, error/retry and empty turn without fake statistics", async () => {
+  const call = vi
+    .fn()
+    .mockRejectedValueOnce(new Error("offline"))
+    .mockResolvedValue({ files: [], complete: false });
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "a",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  expect(host.textContent).toContain("changeReview.loading");
+  expect(host.textContent).not.toContain("+—");
+  expect(
+    host.querySelector(".mobile-change-review")?.getAttribute("aria-busy")
+  ).toBe("true");
+  expect(
+    host.querySelectorAll(
+      '.mobile-change-review__loading-row[aria-hidden="true"]'
+    )
+  ).toHaveLength(2);
+  expect(summaryHeading()).toBeInstanceOf(HTMLButtonElement);
+  expect(host.querySelector('[role="dialog"]')).toBeNull();
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.textContent).toContain("changeReview.retry");
+  expect(host.textContent).toContain("changeReview.loadFailed");
+  expect(host.textContent).not.toContain("changeReview.emptyTurn");
+  expect(summaryHeading()).toBeInstanceOf(HTMLButtonElement);
+  await act(async () => button("changeReview.retry").click());
+  expect(host.textContent).toContain("changeReview.loading");
+  expect(host.textContent).not.toContain("changeReview.loadFailed");
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.innerHTML).toBe("");
+  call.mockResolvedValue({ files: [file], complete: false });
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "a",
+        roundId: "two",
+        online: true,
+        revision: "2",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.textContent).toContain("changeReview.filesCount");
+  expect(summaryHeading()).toBeInstanceOf(HTMLButtonElement);
+  expect(summaryHeading().hasAttribute("disabled")).toBe(false);
+});
+
+it("loads only the summary until opened, and never presents a patch as full file", async () => {
+  const call = vi.fn().mockImplementation((_method, params) =>
+    Promise.resolve({
+      complete: false,
+      files: [
+        {
+          ...file,
+          patches: params.filePath ? ["@@ -1 +1 @@\n-old\n+new"] : [],
+        },
+      ],
+    })
+  );
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "a",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(call).toHaveBeenCalledTimes(1);
+  expect(host.querySelector("pre")).toBeNull();
+  await act(async () => button("changeReview.filesCount").click());
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.textContent).toContain("+new");
+  expect(
+    host.querySelector(".mobile-patch-diff__line.is-added code")?.textContent
+  ).toBe("new");
+  expect(call.mock.calls.filter(([, params]) => !params.filePath)).toHaveLength(
+    1
+  );
+  await act(async () => button("close").click());
+  await act(async () => button("changeReview.filesCount").click());
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(call.mock.calls.filter(([, params]) => !params.filePath)).toHaveLength(
+    1
+  );
+  await selectMode("full");
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.textContent).toContain("changeReview.unavailable");
+  await selectScope("workspace");
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(
+    call.mock.calls.some(([, params]) => params.scope === "workspace")
+  ).toBe(true);
+});
+
+it("shows file rows by default and toggles them with an accessible icon without opening review", async () => {
+  const call = vi.fn().mockResolvedValue({
+    complete: false,
+    files: [file, { ...file, path: "src/second.ts" }],
+  });
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "a",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.querySelectorAll(".mobile-change-review__row")).toHaveLength(2);
+  expect(summaryHeading().textContent).toContain("changeReview.filesCount (2)");
+  expect(summaryHeading().textContent).toContain("+2");
+  expect(summaryHeading().textContent).toContain("-2");
+  expect(summaryHeading().style.width).toBe("100%");
+  expect(summaryHeading().style.height).toBe("auto");
+  expect(summaryHeading().style.minHeight).toBe(
+    "var(--mobile-change-row-height)"
+  );
+  const collapse = host.querySelector<HTMLButtonElement>(
+    '[aria-label="changeReview.collapse"]'
+  )!;
+  expect(collapse.getAttribute("aria-expanded")).toBe("true");
+  expect(collapse.classList.contains("button")).toBe(true);
+  expect(collapse.querySelector("svg")).not.toBeNull();
+  expect(collapse.querySelector(".truncate")).toBeNull();
+  expect(collapse.textContent).toBe("");
+  expect(collapse.style.padding).toBe("0px");
+  expect(collapse.style.width).toBe("var(--mobile-change-touch-size)");
+  const rows = document.getElementById(
+    collapse.getAttribute("aria-controls")!
+  )!;
+  expect(rows.hidden).toBe(false);
+  await act(async () => collapse.click());
+  expect(rows.hidden).toBe(true);
+  expect(host.querySelectorAll(".mobile-change-review__row")).toHaveLength(0);
+  expect(host.querySelector('[role="dialog"]')).toBeNull();
+  await act(async () =>
+    host
+      .querySelector<HTMLButtonElement>('[aria-label="changeReview.expand"]')!
+      .click()
+  );
+  expect(host.querySelectorAll(".mobile-change-review__row")).toHaveLength(2);
+  expect(call).toHaveBeenCalledTimes(1);
+});
+
+it("does not fetch when offline and clears pending debounce on unmount", async () => {
+  const call = vi.fn();
+  const props = {
+    client: { call } as unknown as MobileRpcClient,
+    sessionId: "a",
+    roundId: "one",
+    online: false,
+    revision: "1",
+  };
+  await act(async () =>
+    root.render(React.createElement(MobileChangeReview, props))
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(1000));
+  expect(call).not.toHaveBeenCalled();
+  expect(host.querySelector('[role="status"]')?.textContent).toContain(
+    "changeReview.offline"
+  );
+  expect(summaryHeading()).toBeInstanceOf(HTMLButtonElement);
+  expect(host.textContent).not.toContain("changeReview.retry");
+  expect(host.querySelector('[role="dialog"]')).toBeNull();
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, { ...props, online: true })
+    )
+  );
+  await act(async () => root.render(null));
+  await act(async () => vi.advanceTimersByTimeAsync(1000));
+  expect(call).not.toHaveBeenCalled();
+});
+
+it("explains a failed load and turns repeated retry clicks into one pending request", async () => {
+  let finishRetry!: (value: unknown) => void;
+  const call = vi
+    .fn()
+    .mockRejectedValueOnce(new Error("private server failure"))
+    .mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finishRetry = resolve;
+        })
+    );
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "retry",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.textContent).toContain("changeReview.loadFailed");
+  expect(host.querySelector('[role="status"]')?.textContent).toContain(
+    "changeReview.loadFailed"
+  );
+  expect(host.textContent).not.toContain("private server failure");
+  const retry = button("changeReview.retry");
+  expect(retry.classList.contains("button")).toBe(true);
+  expect(retry.classList.contains("mobile-change-review__retry")).toBe(true);
+  expect(retry.style.height).toBe("var(--mobile-change-touch-size)");
+  expect(retry.style.padding).toBe("0 var(--mobile-change-action-padding)");
+  expect(retry.querySelector("svg")).not.toBeNull();
+  await act(async () => {
+    retry.click();
+    retry.click();
+  });
+  expect(host.textContent).toContain("changeReview.loading");
+  expect(host.textContent).not.toContain("changeReview.loadFailed");
+  expect(summaryHeading()).toBeInstanceOf(HTMLButtonElement);
+  expect(host.querySelectorAll(".mobile-change-review__row")).toHaveLength(0);
+  await act(async () => vi.advanceTimersByTimeAsync(1000));
+  expect(call).toHaveBeenCalledTimes(2);
+  expect(host.textContent).toContain("changeReview.loading");
+  await act(async () =>
+    finishRetry({ complete: false, files: [{ ...file, path: "recovered.ts" }] })
+  );
+  expect(summaryHeading()).toBeInstanceOf(HTMLButtonElement);
+  expect(summaryHeading().hasAttribute("disabled")).toBe(false);
+  expect(host.textContent).toContain("recovered.ts");
+  expect(host.textContent).not.toContain("changeReview.retry");
+});
+
+it.each(["pending", "error", "offline"] as const)(
+  "preserves explicit review opening and scope selection while the turn is %s",
+  async (state) => {
+    const call = vi.fn().mockImplementation((_method, params) => {
+      if (params.scope === "turn") {
+        return state === "error"
+          ? Promise.reject(new Error("turn load failed"))
+          : new Promise(() => {});
+      }
+      return Promise.resolve({ complete: false, files: [file] });
+    });
+    await act(async () =>
+      root.render(
+        React.createElement(MobileChangeReview, {
+          client: { call } as unknown as MobileRpcClient,
+          sessionId: "alternate-scope",
+          roundId: "one",
+          online: state !== "offline",
+          revision: "1",
+        })
+      )
+    );
+    await act(async () => vi.advanceTimersByTimeAsync(300));
+    expect(host.querySelector('[role="dialog"]')).toBeNull();
+    const heading = summaryHeading();
+    expect(heading).toBeInstanceOf(HTMLButtonElement);
+    expect(heading.hasAttribute("disabled")).toBe(false);
+    expect(heading.getAttribute("aria-haspopup")).toBe("dialog");
+    expect(heading.style.height).toBe("auto");
+    expect(heading.style.minHeight).toBe("var(--mobile-change-row-height)");
+    await act(async () => heading.click());
+    expect(host.querySelector('[role="dialog"]')).not.toBeNull();
+    await selectScope("session");
+    await act(async () => vi.advanceTimersByTimeAsync(300));
+    if (state === "offline") {
+      expect(call).not.toHaveBeenCalled();
+      expect(host.querySelector('[role="dialog"]')?.textContent).toContain(
+        "changeReview.offline"
+      );
+    } else {
+      expect(
+        call.mock.calls.filter(([, params]) => params.scope === "turn")
+      ).toHaveLength(1);
+      expect(
+        call.mock.calls.some(([, params]) => params.scope === "session")
+      ).toBe(true);
+      expect(host.querySelector('[role="dialog"]')?.textContent).toContain(
+        "a.ts"
+      );
+    }
+  }
+);
+
+it("preserves zero-stat files without making up unknown totals", async () => {
+  const call = vi.fn().mockResolvedValue({
+    complete: false,
+    files: [
+      { ...file, path: "unknown.ts", additions: null, deletions: null },
+      { ...file, path: "unchanged-count.ts", additions: 0, deletions: 0 },
+    ],
+  });
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "counts",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(summaryHeading().textContent).toContain("changeReview.filesCount (2)");
+  expect(summaryHeading().textContent).not.toContain("+0");
+  expect(summaryHeading().textContent).not.toContain("-0");
+  const [unknown, known] = host.querySelectorAll(".mobile-change-review__row");
+  expect(unknown.textContent).toContain("unknown.ts");
+  expect(unknown.textContent).not.toContain("+0");
+  expect(unknown.textContent).not.toContain("-0");
+  expect(known.textContent).toContain("unchanged-count.ts");
+  expect(host.querySelectorAll(".mobile-change-review__row")).toHaveLength(2);
+});
+
+it("shows the filename before a compact directory and opens the exact long path", async () => {
+  const path =
+    "/Users/example/projects/remote-client/src/modules/MobileRemote/components/StatusBadge.test.tsx";
+  const call = vi.fn().mockImplementation((_method, params) =>
+    Promise.resolve({
+      complete: false,
+      files: [
+        {
+          ...file,
+          path,
+          patches: params.filePath ? ["@@ -1 +1 @@\n-old\n+new"] : [],
+        },
+      ],
+    })
+  );
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "long-file",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  const row = host.querySelector<HTMLButtonElement>(
+    ".mobile-change-review__row"
+  )!;
+  const pathLabel = row.querySelector<HTMLElement>(
+    ".mobile-change-review__path"
+  )!;
+  expect(
+    pathLabel.querySelector(".mobile-change-review__path-filename")?.textContent
+  ).toBe("StatusBadge.test.tsx");
+  expect(
+    pathLabel.querySelector(".mobile-change-review__path-directory")
+      ?.textContent
+  ).toBe("…/MobileRemote/components");
+  expect(pathLabel.textContent).not.toContain("/Users/example");
+  expect(pathLabel.title).toBe(path);
+  expect(row.dataset.mobileChangePath).toBe(path);
+  expect(row.classList.contains("button")).toBe(true);
+  expect(row.style.width).toBe("100%");
+  expect(row.style.minWidth).toBe("0px");
+  expect(row.style.height).toBe("auto");
+  expect(row.style.minHeight).toBe("var(--mobile-change-row-height)");
+  expect(row.style.padding).toBe("var(--mobile-change-row-padding)");
+  expect(row.textContent).toContain("+1");
+  expect(row.textContent).toContain("-1");
+  await act(async () => row.click());
+  expect(host.querySelector('[role="dialog"]')).not.toBeNull();
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(call.mock.calls.filter(([, params]) => !params.filePath)).toHaveLength(
+    1
+  );
+  expect(call.mock.calls.some(([, params]) => params.filePath === path)).toBe(
+    true
+  );
+});
+
+it("rejects malformed remote data instead of interpreting missing counts as zero", () => {
+  expect(() =>
+    validateReview({ complete: true, files: [{ ...file, additions: -1 }] })
+  ).toThrow();
+  expect(() =>
+    validateReview({ complete: true, files: [{ ...file, after: {} }] })
+  ).toThrow();
+  expect(
+    validateReview({ complete: false, files: [{ ...file, additions: null }] })
+      .files[0].additions
+  ).toBeNull();
+});
+
+it("ignores a late manifest from the previously selected session", async () => {
+  let finishOld!: (value: unknown) => void;
+  const call = vi.fn().mockImplementation((_method, params) =>
+    params.sessionId === "old"
+      ? new Promise((resolve) => {
+          finishOld = resolve;
+        })
+      : Promise.resolve({
+          complete: false,
+          files: [{ ...file, path: "new.ts" }],
+        })
+  );
+  const props = {
+    client: { call } as unknown as MobileRpcClient,
+    sessionId: "old",
+    roundId: "one",
+    online: true,
+    revision: "1",
+  };
+  await act(async () =>
+    root.render(React.createElement(MobileChangeReview, props))
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, { ...props, sessionId: "new" })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.textContent).toContain("new.ts");
+  await act(async () =>
+    finishOld({ complete: false, files: [{ ...file, path: "old.ts" }] })
+  );
+  expect(host.textContent).toContain("new.ts");
+  expect(host.textContent).not.toContain("old.ts");
+});
+
+it("labels a before-only historical snapshot instead of implying it is the current file", async () => {
+  const call = vi.fn().mockImplementation((_method, params) =>
+    Promise.resolve({
+      complete: false,
+      files: [
+        {
+          ...file,
+          before: params.filePath ? "captured before edit" : null,
+          availability: "before_snapshot_only",
+        },
+      ],
+    })
+  );
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "a",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  await act(async () => button("changeReview.filesCount").click());
+  await selectMode("full");
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  expect(host.querySelector("pre")?.textContent).toBe("captured before edit");
+  expect(button("changeReview.before").disabled).toBe(true);
+  expect(host.textContent).not.toContain("changeReview.after");
+});
+
+it("keeps identity compact, details opt-in and icon actions available across detail loading", async () => {
+  const namedFile = { ...file, path: "src/features/review/example.ts" };
+  let resolveDetail!: (value: unknown) => void;
+  const call = vi.fn().mockImplementation((_method, params) =>
+    params.filePath
+      ? new Promise((resolve) => {
+          resolveDetail = resolve;
+        })
+      : Promise.resolve({ complete: false, files: [namedFile] })
+  );
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReview, {
+        client: { call } as unknown as MobileRpcClient,
+        sessionId: "compact",
+        roundId: "one",
+        online: true,
+        revision: "1",
+      })
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  await act(async () => button("changeReview.filesCount").click());
+  await act(async () => vi.advanceTimersByTimeAsync(300));
+  const heading = host.querySelector(".mobile-change-review__file-heading")!;
+  expect(heading.textContent).toContain("example.ts");
+  expect(heading.textContent).toContain("+1");
+  expect(heading.textContent).toContain("-1");
+  expect(
+    heading.querySelector(".mobile-change-review__file-toggle")
+  ).not.toBeNull();
+  expect(heading.textContent).toContain("src/features");
+  const disclosures = [...host.querySelectorAll("details")];
+  expect(disclosures).toHaveLength(3);
+  expect(disclosures.every((detail) => !detail.open)).toBe(true);
+  expect(
+    host.querySelector(
+      '.mobile-change-review__file [data-state="loading"][role="status"]'
+    )
+  ).not.toBeNull();
+  const copy = host.querySelector<HTMLButtonElement>(
+    '[aria-label="changeReview.copy"]'
+  )!;
+  expect(copy.disabled).toBe(true);
+  expect(copy.textContent).toBe("");
+  await act(async () =>
+    resolveDetail({
+      complete: false,
+      files: [{ ...namedFile, after: "loaded file" }],
+    })
+  );
+  expect(copy.disabled).toBe(false);
+  expect(host.querySelector("pre")?.dataset.wrap).toBe("true");
+  await act(async () =>
+    host
+      .querySelector<HTMLButtonElement>('[aria-label="changeReview.wrap"]')!
+      .click()
+  );
+  expect(host.querySelector("pre")?.dataset.wrap).toBe("false");
+  const requestCount = call.mock.calls.length;
+  await act(async () => {
+    host.querySelector<HTMLDetailsElement>(
+      ".mobile-change-review__file-path"
+    )!.open = true;
+  });
+  expect(
+    host.querySelector(".mobile-change-review__file-path")!.textContent
+  ).toContain(namedFile.path);
+  expect(call).toHaveBeenCalledTimes(requestCount);
+});
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeReview.tsx b/src/modules/MobileRemote/components/changes/MobileChangeReview.tsx
new file mode 100644
index 0000000000..80842a1e25
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeReview.tsx
@@ -0,0 +1,625 @@
+import React, { Suspense, lazy, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import DiffStatsBadge from "@src/components/DiffStatsBadge";
+import Dropdown from "@src/components/Dropdown";
+import type { DropdownOption } from "@src/components/Dropdown/types";
+import TabPill from "@src/components/TabPill";
+import {
+  ArrowDown01Icon,
+  Cancel01Icon,
+  ChevronsDownUpIcon,
+  Copy01Icon,
+  HugeiconsIcon,
+  MoreHorizontalIcon,
+  TextWrapIcon,
+  Tick01Icon,
+  UnfoldMoreIcon,
+} from "@src/icons";
+import Modal from "@src/scaffold/ModalSystem";
+
+import type { MobileRpcClient } from "../../connection/mobileRpcClient";
+import { useMobileRemotePlatform } from "../../platform";
+import "../transcript/mobileToolPreview.scss";
+import { useMobileCopyText } from "../transcript/useMobileCopyText";
+import { MobileChangeFileHeader } from "./MobileChangeFileHeader";
+import { MobileChangeReviewState } from "./MobileChangeReviewState";
+import { MobileChangeSummary } from "./MobileChangeSummary";
+import { MobilePatchDiff } from "./MobilePatchDiff";
+import "./mobileChangeReview.scss";
+import {
+  type ChangeFile,
+  type ChangeScope,
+  useChangeReview,
+} from "./useChangeReview";
+
+const Editor = lazy(() => import("../transcript/MobileReadonlyEditor"));
+const iconStyle: React.CSSProperties = {
+  width: "var(--mobile-change-touch-size)",
+  height: "var(--mobile-change-touch-size)",
+  padding: 0,
+  borderRadius: "var(--mobile-change-action-radius)",
+};
+type ExpansionCommand = { expanded: boolean };
+interface Props {
+  client: MobileRpcClient | null;
+  sessionId: string;
+  roundId: string | null;
+  online: boolean;
+  revision: string;
+}
+
+function ReviewDropdown({
+  label,
+  value,
+  options,
+  onSelect,
+  searchable = false,
+}: {
+  label: string;
+  value: string;
+  options: DropdownOption[];
+  onSelect: (value: string) => void;
+  searchable?: boolean;
+}) {
+  const { runtime } = useMobileRemotePlatform();
+  const [open, setOpen] = useState(false);
+  const container = runtime.portalContainer?.();
+  return (
+    <div
+      className="mobile-change-review__dropdown"
+      onKeyDownCapture={(event) => {
+        // Portaled menu events retain React ancestry. Keep Escape at the open
+        // dropdown boundary instead of reaching the parent Modal's document handler.
+        if (open && event.key === "Escape") {
+          event.preventDefault();
+          event.stopPropagation();
+          setOpen(false);
+          event.currentTarget.querySelector("button")?.focus();
+        }
+      }}
+    >
+      <Dropdown
+        trigger="click"
+        position="bottom-end"
+        getPopupContainer={
+          container ? () => container as HTMLElement : undefined
+        }
+        avoidViewportOverflow
+        className={`mobile-change-review-menu ${searchable ? "mobile-change-review-menu--files" : "mobile-change-review-menu--scope"}`}
+        popupVisible={open}
+        onVisibleChange={setOpen}
+        options={options}
+        value={value}
+        showSearch={searchable}
+        onSelect={(next) => {
+          if (typeof next === "string") onSelect(next);
+        }}
+      >
+        <Button
+          variant="tertiary"
+          appearance="ghost"
+          className="mobile-change-review__dropdown-trigger"
+          aria-label={label}
+          aria-haspopup="listbox"
+          aria-expanded={open}
+          title={value}
+        >
+          <span className="mobile-change-review__dropdown-label">
+            {options.find((option) => option.value === value)?.label ?? value}
+          </span>
+          <HugeiconsIcon icon={ArrowDown01Icon} size={16} aria-hidden="true" />
+        </Button>
+      </Dropdown>
+    </div>
+  );
+}
+
+export function MobileChangeReview(props: Props) {
+  const { runtime } = useMobileRemotePlatform();
+  const [visible, setVisible] = useState(() => !runtime.isHidden());
+  useEffect(() => {
+    const update = () => setVisible(!runtime.isHidden());
+    update();
+    return runtime.subscribeVisibility(update);
+  }, [runtime]);
+  const [open, setOpen] = useState(false);
+  const [expanded, setExpanded] = useState(true);
+  const [selected, setSelected] = useState<string>();
+  const enabled = props.online && visible;
+  const review = useChangeReview(
+    props.client,
+    props.sessionId,
+    props.roundId,
+    "turn",
+    enabled,
+    props.revision
+  );
+  const files = review.value?.files;
+  const panel = open ? (
+    <ReviewPanel
+      {...props}
+      turnReview={review}
+      online={enabled}
+      selected={selected}
+      onClose={() => setOpen(false)}
+    />
+  ) : null;
+  // Product policy: a successful empty turn has no footer. Keep an already
+  // opened review mounted so refresh cannot dismiss another selected scope.
+  if (files?.length === 0) return panel;
+  return (
+    <>
+      <MobileChangeSummary
+        files={files}
+        online={props.online}
+        error={!!review.error}
+        expanded={expanded}
+        onToggle={() => setExpanded((value) => !value)}
+        onOpen={(path) => {
+          setSelected(path);
+          setOpen(true);
+        }}
+        onRetry={review.retry}
+      />
+      {panel}
+    </>
+  );
+}
+
+function ReviewPanel(
+  props: Props & {
+    selected?: string;
+    onClose: () => void;
+    turnReview: ReturnType<typeof useChangeReview>;
+  }
+) {
+  const { t } = useTranslation("mobileRemote");
+  const initialFocusRef = useRef<HTMLDivElement>(null);
+  const [scope, setScope] = useState<ChangeScope>("turn");
+  const [full, setFull] = useState(false);
+  const [selected, setSelected] = useState(props.selected);
+  const [expandAll, setExpandAll] = useState<ExpansionCommand | null>(null);
+  const scopedReview = useChangeReview(
+    props.client,
+    props.sessionId,
+    props.roundId,
+    scope,
+    props.online && scope !== "turn",
+    props.revision
+  );
+  // The footer owns the turn manifest. Opening its panel must not issue the
+  // same request a second time (or maintain an independent stale result).
+  const review = scope === "turn" ? props.turnReview : scopedReview;
+  const files = review.value?.files;
+  const selectedPath =
+    files?.find((file) => file.path === selected)?.path ?? files?.[0]?.path;
+  const total = (key: "additions" | "deletions") =>
+    files?.every((file) => file[key] !== null)
+      ? files.reduce((sum, file) => sum + file[key]!, 0)
+      : null;
+  const additions = total("additions");
+  const deletions = total("deletions");
+  return (
+    <Modal
+      visible
+      size="fullscreen"
+      className="mobile-tool-preview mobile-change-review-sheet"
+      aria-label={t("changeReview.title")}
+      title={
+        <div
+          ref={initialFocusRef}
+          tabIndex={-1}
+          className="mobile-change-review__title"
+        >
+          <span>
+            {files
+              ? t("changeReview.filesCount", { count: files.length })
+              : t("changeReview.title")}
+          </span>
+          {files && (
+            <div className="mobile-change-review__totals">
+              {additions !== null && deletions !== null && (
+                <DiffStatsBadge
+                  additions={additions}
+                  deletions={deletions}
+                  variant="plain"
+                  reserveValueWidth={false}
+                  gapClassName="gap-2"
+                />
+              )}
+            </div>
+          )}
+        </div>
+      }
+      initialFocusRef={initialFocusRef}
+      closable={false}
+      headerActions={
+        <div className="mobile-change-review__header-actions">
+          <Button
+            iconOnly
+            shape="circle"
+            variant="tertiary"
+            appearance="soft"
+            className="mobile-change-review__close"
+            style={{
+              width: "var(--mobile-change-touch-size)",
+              height: "var(--mobile-change-touch-size)",
+            }}
+            aria-label={t("common:actions.close")}
+            onClick={props.onClose}
+            icon={
+              <HugeiconsIcon icon={Cancel01Icon} size={20} aria-hidden="true" />
+            }
+          />
+          {!full && (
+            <Button
+              iconOnly
+              appearance="ghost"
+              variant="tertiary"
+              className="mobile-change-review__icon mobile-change-review__expand-all"
+              style={iconStyle}
+              disabled={!files?.length}
+              aria-label={t(
+                expandAll?.expanded
+                  ? "changeReview.collapseAll"
+                  : "changeReview.expandAll"
+              )}
+              title={t(
+                expandAll?.expanded
+                  ? "changeReview.collapseAll"
+                  : "changeReview.expandAll"
+              )}
+              aria-pressed={expandAll?.expanded === true}
+              onClick={() =>
+                setExpandAll((command) => ({ expanded: !command?.expanded }))
+              }
+              icon={
+                <HugeiconsIcon
+                  icon={
+                    expandAll?.expanded ? ChevronsDownUpIcon : UnfoldMoreIcon
+                  }
+                  size={18}
+                  aria-hidden="true"
+                  data-icon={
+                    expandAll?.expanded
+                      ? "chevrons-down-up"
+                      : "chevrons-up-down"
+                  }
+                />
+              }
+            />
+          )}
+        </div>
+      }
+      onClose={props.onClose}
+      bodyClassName="mobile-change-review__body"
+    >
+      <div className="mobile-change-review__controls">
+        <div className="mobile-change-review__scope">
+          <span>{t("changeReview.scope")}</span>
+          <ReviewDropdown
+            label={t("changeReview.scope")}
+            value={scope}
+            options={(["turn", "session", "workspace"] as const).map(
+              (value) => ({ value, label: t(`changeReview.${value}`) })
+            )}
+            onSelect={(value) => {
+              if (
+                value === "turn" ||
+                value === "session" ||
+                value === "workspace"
+              ) {
+                setScope(value);
+                setSelected(undefined);
+              }
+            }}
+          />
+        </div>
+        <div className="mobile-change-review__toolbar">
+          <TabPill
+            variant="pill"
+            appearance="layout"
+            activeTone="neutral"
+            buttonStyle
+            fillWidth
+            className="mobile-change-review__mode"
+            activeTab={full ? "full" : "diff"}
+            tabs={[
+              {
+                key: "diff",
+                label: t("changeReview.diff"),
+                badge: !full ? (
+                  <span className="sr-only">{t("changeReview.selected")}</span>
+                ) : undefined,
+              },
+              {
+                key: "full",
+                label: t("changeReview.full"),
+                badge: full ? (
+                  <span className="sr-only">{t("changeReview.selected")}</span>
+                ) : undefined,
+              },
+            ]}
+            onChange={(value) => setFull(value === "full")}
+          />
+        </div>
+      </div>
+      {!props.online ? (
+        <MobileChangeReviewState state="offline" />
+      ) : review.error ? (
+        <MobileChangeReviewState state="error" onRetry={review.retry} />
+      ) : !review.value ? (
+        <MobileChangeReviewState state="loading" />
+      ) : (
+        <>
+          {!review.value.complete && (
+            <details className="mobile-change-review__disclosure">
+              <summary>{t("fileViewer.partial")}</summary>
+              <p>{t("changeReview.partial")}</p>
+            </details>
+          )}
+          {review.value.files.length === 0 && (
+            <MobileChangeReviewState state="empty" />
+          )}
+          {full && review.value.files.length > 1 && (
+            <div className="mobile-change-review__file-picker">
+              <ReviewDropdown
+                label={t("changeReview.file")}
+                value={selectedPath ?? ""}
+                options={review.value.files.map((file) => ({
+                  value: file.path,
+                  label: file.path,
+                }))}
+                onSelect={setSelected}
+                searchable
+              />
+            </div>
+          )}
+          {(full
+            ? review.value.files.filter((f) => f.path === selectedPath)
+            : review.value.files
+          ).map((file, index) => (
+            <FileReview
+              key={`${scope}:${full}:${file.path}`}
+              {...props}
+              scope={scope}
+              file={file}
+              full={full}
+              onOpenFull={() => {
+                setSelected(file.path);
+                setFull(true);
+              }}
+              expandAll={expandAll}
+              selected={selected !== undefined && file.path === selectedPath}
+              initialOpen={
+                full || file.path === selectedPath || (!selected && index === 0)
+              }
+            />
+          ))}
+        </>
+      )}
+    </Modal>
+  );
+}
+
+function FileReview(
+  props: Props & {
+    scope: ChangeScope;
+    file: ChangeFile;
+    full: boolean;
+    initialOpen: boolean;
+    expandAll: ExpansionCommand | null;
+    selected: boolean;
+    onOpenFull: () => void;
+  }
+) {
+  const { t } = useTranslation("mobileRemote");
+  const [expansion, setExpansion] = useState<{
+    base: ExpansionCommand | null;
+    value: boolean;
+  } | null>(null);
+  const expanded =
+    props.full ||
+    (expansion?.base === props.expandAll
+      ? expansion.value
+      : (props.expandAll?.expanded ?? props.initialOpen));
+  const [element, setElement] = useState<HTMLElement | null>(null);
+  const [onScreen, setOnScreen] = useState(false);
+  useEffect(() => {
+    if (props.selected) element?.scrollIntoView({ block: "nearest" });
+  }, [element, props.selected]);
+  useEffect(() => {
+    if (!element) return;
+    const observer = new IntersectionObserver((entries) =>
+      setOnScreen(entries.some((entry) => entry.isIntersecting))
+    );
+    observer.observe(element);
+    return () => observer.disconnect();
+  }, [element]);
+  const [before, setBefore] = useState(false);
+  const [wrap, setWrap] = useState(true);
+  const detail = useChangeReview(
+    props.client,
+    props.sessionId,
+    props.roundId,
+    props.scope,
+    props.online && expanded && onScreen,
+    props.revision,
+    props.file.path
+  );
+  const file = detail.value?.files.find((f) => f.path === props.file.path);
+  const showBefore = file?.before != null && (before || file.after == null);
+  const content = props.full
+    ? showBefore
+      ? file?.before
+      : (file?.after ?? file?.before)
+    : file?.patches.length
+      ? file.patches.join("\n")
+      : file?.after;
+  const parts = props.file.path.split(/[\\/]/);
+  parts.pop();
+  const directory = parts.join("/");
+  const copy = useMobileCopyText(content ?? "");
+  return (
+    <section ref={setElement} className="mobile-change-review__file">
+      <MobileChangeFileHeader
+        file={file ?? props.file}
+        expanded={expanded}
+        full={props.full}
+        onOpenFull={props.onOpenFull}
+        onToggle={() =>
+          setExpansion({ base: props.expandAll, value: !expanded })
+        }
+      />
+      {expanded && onScreen ? (
+        <details className="mobile-change-review__file-actions">
+          <summary>
+            <HugeiconsIcon
+              icon={MoreHorizontalIcon}
+              size={18}
+              aria-hidden="true"
+            />
+            <span className="sr-only">{t("changeReview.moreActions")}</span>
+          </summary>
+          <div className="mobile-change-review__toolbar">
+            {directory && (
+              <details className="mobile-change-review__disclosure mobile-change-review__file-path">
+                <summary aria-label={t("fileViewer.fileLocation")}>
+                  <span>{directory}</span>
+                  <HugeiconsIcon
+                    icon={ArrowDown01Icon}
+                    size={14}
+                    aria-hidden="true"
+                  />
+                </summary>
+                <p>{props.file.path}</p>
+              </details>
+            )}
+            {props.full && (
+              <Button
+                variant="tertiary"
+                appearance="soft"
+                className="mobile-change-review__version"
+                style={{
+                  height: "var(--mobile-change-touch-size)",
+                  padding: "0 var(--mobile-change-action-padding)",
+                  borderRadius: "var(--mobile-change-action-radius)",
+                  fontSize: "inherit",
+                }}
+                disabled={file?.before == null || file?.after == null}
+                onClick={() => setBefore((v) => !v)}
+              >
+                {t(showBefore ? "changeReview.before" : "changeReview.after")}
+              </Button>
+            )}
+            <Button
+              iconOnly
+              appearance="soft"
+              className="mobile-change-review__icon mobile-change-review__wrap"
+              style={iconStyle}
+              variant={wrap ? "primary" : "tertiary"}
+              aria-label={t("changeReview.wrap")}
+              title={t("changeReview.wrap")}
+              aria-pressed={wrap}
+              onClick={() => setWrap((v) => !v)}
+              icon={
+                <HugeiconsIcon
+                  icon={TextWrapIcon}
+                  size={18}
+                  aria-hidden="true"
+                />
+              }
+            />
+            <Button
+              iconOnly
+              appearance="soft"
+              variant="tertiary"
+              className="mobile-change-review__icon"
+              style={iconStyle}
+              aria-label={t(
+                copy.state === "copied"
+                  ? "changeReview.copied"
+                  : "changeReview.copy"
+              )}
+              title={t("changeReview.copy")}
+              disabled={content == null || copy.state === "pending"}
+              aria-busy={copy.state === "pending"}
+              onClick={copy.copy}
+              icon={
+                <HugeiconsIcon
+                  icon={copy.state === "copied" ? Tick01Icon : Copy01Icon}
+                  size={18}
+                  aria-hidden="true"
+                />
+              }
+            />
+          </div>
+        </details>
+      ) : undefined}
+      {expanded && onScreen && (
+        <>
+          <span role="status" className="sr-only">
+            {copy.state === "copied" ? t("changeReview.copied") : ""}
+          </span>
+          {copy.state === "failed" && (
+            <p className="mobile-change-review__copy-error" role="alert">
+              {t("changeReview.copyFailed")}
+            </p>
+          )}
+          {!props.online ? (
+            <MobileChangeReviewState state="offline" compact />
+          ) : detail.error ? (
+            <MobileChangeReviewState
+              state="error"
+              onRetry={detail.retry}
+              compact
+            />
+          ) : !detail.value ? (
+            <MobileChangeReviewState state="loading" compact />
+          ) : !file || content == null ? (
+            <MobileChangeReviewState state="unavailable" compact />
+          ) : (
+            <div
+              className={`mobile-change-review__editor ${props.full ? "mobile-change-review__editor--full" : "mobile-change-review__editor--diff"}`}
+            >
+              {props.full &&
+                file.availability === "reconstructed_from_history" && (
+                  <p className="mobile-change-review__notice">
+                    {t("changeReview.reconstructed")}
+                  </p>
+                )}
+              {!props.full && file.patches.length > 0 ? (
+                <MobilePatchDiff
+                  patches={file.patches}
+                  filePath={file.path}
+                  wrap={wrap}
+                />
+              ) : (
+                <Suspense
+                  fallback={<MobileChangeReviewState state="loading" compact />}
+                >
+                  <Editor
+                    content={content}
+                    original={
+                      !props.full && !file.patches.length && file.before != null
+                        ? file.before
+                        : undefined
+                    }
+                    filePath={file.path}
+                    language={
+                      !props.full && file.patches.length ? "diff" : undefined
+                    }
+                    wrap={wrap}
+                    height={props.full ? "100%" : "auto"}
+                  />
+                </Suspense>
+              )}
+            </div>
+          )}
+        </>
+      )}
+    </section>
+  );
+}
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeReviewState.test.ts b/src/modules/MobileRemote/components/changes/MobileChangeReviewState.test.ts
new file mode 100644
index 0000000000..affe1c6a7b
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeReviewState.test.ts
@@ -0,0 +1,98 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import { MobileChangeReviewState } from "./MobileChangeReviewState";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+let host: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+beforeEach(() => {
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = false;
+});
+
+it("replaces retry with a named static loading state without starting its own work", async () => {
+  const onRetry = vi.fn();
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReviewState, { state: "error", onRetry })
+    )
+  );
+  const button = host.querySelector("button")!;
+  expect(host.textContent).toContain("changeReview.loadFailed");
+  expect(button.style.height).toBe("var(--mobile-change-state-touch)");
+  expect(button.querySelector("svg")).not.toBeNull();
+  await act(async () => button.click());
+  expect(onRetry).toHaveBeenCalledTimes(1);
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReviewState, {
+        state: "loading",
+        onRetry,
+      })
+    )
+  );
+  expect(host.querySelector("button")).toBeNull();
+  expect(host.querySelector('[role="status"]')?.getAttribute("aria-busy")).toBe(
+    "true"
+  );
+  expect(host.textContent).toContain("changeReview.loading");
+  expect(
+    host.querySelector('.mobile-change-state__skeleton[aria-hidden="true"]')
+      ?.children
+  ).toHaveLength(3);
+  expect(onRetry).toHaveBeenCalledTimes(1);
+});
+
+it.each([
+  ["offline", "changeReview.offline"],
+  ["empty", "changeReview.empty"],
+  ["unavailable", "changeReview.unavailable"],
+] as const)(
+  "keeps %s distinct and does not offer an invalid retry",
+  async (state, message) => {
+    const onRetry = vi.fn();
+    await act(async () =>
+      root.render(
+        React.createElement(MobileChangeReviewState, {
+          state,
+          onRetry,
+          compact: true,
+        })
+      )
+    );
+    expect(
+      host.querySelector('[role="status"]')?.getAttribute("aria-busy")
+    ).toBe("false");
+    expect(host.textContent).toBe(message);
+    expect(host.querySelector("button")).toBeNull();
+    expect(host.querySelector(".mobile-change-state--compact")).not.toBeNull();
+    expect(onRetry).not.toHaveBeenCalled();
+  }
+);
+
+it("does not render a dead retry button without a request owner", async () => {
+  await act(async () =>
+    root.render(
+      React.createElement(MobileChangeReviewState, { state: "error" })
+    )
+  );
+  expect(host.textContent).toBe("changeReview.loadFailed");
+  expect(host.querySelector("button")).toBeNull();
+});
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeReviewState.tsx b/src/modules/MobileRemote/components/changes/MobileChangeReviewState.tsx
new file mode 100644
index 0000000000..b7c478c684
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeReviewState.tsx
@@ -0,0 +1,96 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import SkeletonBar from "@src/components/Skeleton";
+import {
+  AlertCircleIcon,
+  FileSearchIcon,
+  HugeiconsIcon,
+  Plug01Icon,
+  Refresh04Icon,
+} from "@src/icons";
+import { classNames } from "@src/util/ui/classNames";
+
+import "./mobileChangeReviewState.scss";
+
+interface Props {
+  state: "loading" | "error" | "offline" | "empty" | "unavailable";
+  onRetry?: () => void;
+  compact?: boolean;
+}
+
+const messages = {
+  loading: "changeReview.loading",
+  error: "changeReview.loadFailed",
+  offline: "changeReview.offline",
+  empty: "changeReview.empty",
+  unavailable: "changeReview.unavailable",
+} as const;
+
+/** Presentation only: request identity, cancellation and retry stay in the hook. */
+export function MobileChangeReviewState({
+  state,
+  onRetry,
+  compact = false,
+}: Props) {
+  const { t } = useTranslation("mobileRemote");
+  const loading = state === "loading";
+  return (
+    <div
+      className={classNames(
+        "mobile-change-state",
+        compact && "mobile-change-state--compact"
+      )}
+      data-state={state}
+      role="status"
+      aria-busy={loading}
+    >
+      {loading ? (
+        <>
+          <span className="sr-only">{t(messages.loading)}</span>
+          <div className="mobile-change-state__skeleton" aria-hidden="true">
+            <SkeletonBar className="h-3 w-2/5" />
+            <SkeletonBar className="h-3 w-4/5" />
+            <SkeletonBar className="h-3 w-3/5" />
+          </div>
+        </>
+      ) : (
+        <>
+          <span className="mobile-change-state__symbol" aria-hidden="true">
+            <HugeiconsIcon
+              icon={
+                state === "error"
+                  ? AlertCircleIcon
+                  : state === "offline"
+                    ? Plug01Icon
+                    : FileSearchIcon
+              }
+              size={20}
+            />
+          </span>
+          <p className="mobile-change-state__message">{t(messages[state])}</p>
+          {state === "error" && onRetry && (
+            <Button
+              variant="tertiary"
+              appearance="soft"
+              className="mobile-change-state__retry"
+              style={{
+                height: "var(--mobile-change-state-touch)",
+                padding: "0 var(--mobile-change-state-space)",
+                borderRadius: "var(--mobile-change-state-radius)",
+                fontSize: "inherit",
+              }}
+              icon={
+                <HugeiconsIcon icon={Refresh04Icon} size={16} aria-hidden />
+              }
+              onClick={onRetry}
+            >
+              {t("changeReview.retry")}
+            </Button>
+          )}
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/src/modules/MobileRemote/components/changes/MobileChangeSummary.tsx b/src/modules/MobileRemote/components/changes/MobileChangeSummary.tsx
new file mode 100644
index 0000000000..3973bc3d75
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobileChangeSummary.tsx
@@ -0,0 +1,226 @@
+import React, { useId } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import DiffStatsBadge from "@src/components/DiffStatsBadge";
+import SkeletonBar from "@src/components/Skeleton";
+import { ArrowDown01Icon, HugeiconsIcon, Refresh04Icon } from "@src/icons";
+import {
+  getCompactPathLabel,
+  getDirectory,
+  getFileName,
+  getPathSegments,
+} from "@src/util/file/pathUtils";
+
+import type { ChangeFile } from "./useChangeReview";
+
+interface Props {
+  files: readonly ChangeFile[] | undefined;
+  online: boolean;
+  error: boolean;
+  expanded: boolean;
+  onToggle: () => void;
+  onOpen: (path?: string) => void;
+  onRetry: () => void;
+}
+
+// Button owns inline geometry. Keep the mobile card's dimensions at that
+// boundary too, with values owned by the scoped stylesheet.
+const rowStyle: React.CSSProperties = {
+  height: "auto",
+  minHeight: "var(--mobile-change-row-height)",
+  padding: "var(--mobile-change-row-padding)",
+  borderRadius: 0,
+  fontSize: "inherit",
+};
+
+function Stats({
+  additions,
+  deletions,
+}: Pick<ChangeFile, "additions" | "deletions">) {
+  return (
+    <span className="mobile-change-review__stats">
+      {additions !== null && deletions !== null ? (
+        <DiffStatsBadge
+          additions={additions}
+          deletions={deletions}
+          variant="plain"
+          reserveValueWidth={false}
+          gapClassName="gap-2"
+        />
+      ) : (
+        <span className="mobile-change-review__unknown">—</span>
+      )}
+    </span>
+  );
+}
+
+function FilePath({ path }: { path: string }) {
+  const directory = getDirectory(path);
+  const compactDirectory = getCompactPathLabel(directory, 2);
+  const directoryLabel =
+    getPathSegments(directory).length > 2
+      ? `…/${compactDirectory}`
+      : compactDirectory;
+
+  return (
+    <span className="mobile-change-review__path" title={path}>
+      <span className="mobile-change-review__path-filename">
+        {getFileName(path)}
+      </span>
+      {directoryLabel && (
+        <span className="mobile-change-review__path-directory">
+          {directoryLabel}
+        </span>
+      )}
+    </span>
+  );
+}
+
+/** A presentation-only card; the parent owns the manifest, retry and viewer. */
+export function MobileChangeSummary({
+  files,
+  online,
+  error,
+  expanded,
+  onToggle,
+  onOpen,
+  onRetry,
+}: Props) {
+  const { t } = useTranslation("mobileRemote");
+  const rowsId = useId();
+  const ready = !!files?.length;
+  const loading = online && !error && !files;
+  const total = (key: "additions" | "deletions") =>
+    files?.every((file) => file[key] !== null)
+      ? files.reduce((sum, file) => sum + file[key]!, 0)
+      : null;
+  const heading = (
+    <span className="mobile-change-review__heading-content">
+      <span className="mobile-change-review__label">
+        {ready
+          ? t("changeReview.filesCount", { count: files.length })
+          : t("changeReview.title")}
+      </span>
+      {ready && (
+        <Stats additions={total("additions")} deletions={total("deletions")} />
+      )}
+    </span>
+  );
+
+  return (
+    <section
+      className="mobile-change-review"
+      aria-label={t("changeReview.title")}
+      aria-busy={loading}
+    >
+      <div className="mobile-change-review__summary">
+        <Button
+          long
+          variant="tertiary"
+          appearance="ghost"
+          className="mobile-change-review__heading"
+          style={rowStyle}
+          aria-haspopup="dialog"
+          onClick={() => onOpen()}
+        >
+          {heading}
+        </Button>
+        {ready && (
+          <Button
+            iconOnly
+            variant="tertiary"
+            appearance="ghost"
+            className="mobile-change-review__toggle"
+            style={{
+              width: "var(--mobile-change-touch-size)",
+              height: "var(--mobile-change-row-height)",
+              padding: 0,
+              borderRadius: 0,
+            }}
+            aria-label={t(
+              expanded ? "changeReview.collapse" : "changeReview.expand"
+            )}
+            aria-expanded={expanded}
+            aria-controls={rowsId}
+            onClick={onToggle}
+            icon={
+              <HugeiconsIcon
+                icon={ArrowDown01Icon}
+                size={18}
+                aria-hidden="true"
+                className={
+                  expanded
+                    ? "mobile-change-review__chevron is-expanded"
+                    : "mobile-change-review__chevron"
+                }
+              />
+            }
+          />
+        )}
+      </div>
+      {!online || error ? (
+        <div className="mobile-change-review__status">
+          <p role="status" className="mobile-change-review__status-copy">
+            {t(!online ? "changeReview.offline" : "changeReview.loadFailed")}
+          </p>
+          {online && error && (
+            <Button
+              variant="tertiary"
+              appearance="ghost"
+              className="mobile-change-review__retry"
+              style={{
+                height: "var(--mobile-change-touch-size)",
+                padding: "0 var(--mobile-change-action-padding)",
+                borderRadius: "var(--mobile-change-action-radius)",
+                fontSize: "inherit",
+              }}
+              icon={
+                <HugeiconsIcon
+                  icon={Refresh04Icon}
+                  size={16}
+                  aria-hidden="true"
+                />
+              }
+              onClick={onRetry}
+            >
+              {t("changeReview.retry")}
+            </Button>
+          )}
+        </div>
+      ) : loading ? (
+        <div className="mobile-change-review__loading" role="status">
+          <span className="sr-only">{t("changeReview.loading")}</span>
+          <div className="mobile-change-review__loading-row" aria-hidden="true">
+            <SkeletonBar className="h-3 w-3/5" />
+            <SkeletonBar className="h-3 w-12" />
+          </div>
+          <div className="mobile-change-review__loading-row" aria-hidden="true">
+            <SkeletonBar className="h-3 w-2/5" />
+            <SkeletonBar className="h-3 w-12" />
+          </div>
+        </div>
+      ) : null}
+      <div id={rowsId} hidden={!expanded}>
+        {expanded &&
+          files?.map((file) => (
+            <Button
+              key={file.path}
+              long
+              variant="tertiary"
+              appearance="ghost"
+              className="mobile-change-review__row"
+              style={rowStyle}
+              data-mobile-change-path={file.path}
+              onClick={() => onOpen(file.path)}
+            >
+              <span className="mobile-change-review__row-content">
+                <FilePath path={file.path} />
+                <Stats additions={file.additions} deletions={file.deletions} />
+              </span>
+            </Button>
+          ))}
+      </div>
+    </section>
+  );
+}
diff --git a/src/modules/MobileRemote/components/changes/MobilePatchDiff.tsx b/src/modules/MobileRemote/components/changes/MobilePatchDiff.tsx
new file mode 100644
index 0000000000..6732b1f6d4
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/MobilePatchDiff.tsx
@@ -0,0 +1,142 @@
+import React, { Suspense, lazy, memo, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import DiffStatsBadge from "@src/components/DiffStatsBadge";
+import { ArrowDown01Icon, HugeiconsIcon } from "@src/icons";
+
+import { MobileChangeReviewState } from "./MobileChangeReviewState";
+import { parseReviewPatch } from "./parseReviewPatch";
+
+const Editor = lazy(() => import("../transcript/MobileReadonlyEditor"));
+const PAGE_LINES = 80;
+
+export const MobilePatchDiff = memo(function MobilePatchDiff({
+  patches,
+  filePath,
+  wrap,
+}: {
+  patches: string[];
+  filePath: string;
+  wrap: boolean;
+}) {
+  const { t } = useTranslation("mobileRemote");
+  const parsed = useMemo(() => patches.map(parseReviewPatch), [patches]);
+  const [limit, setLimit] = useState(PAGE_LINES);
+  // Unknown formats are readable, never silently discarded as an empty diff.
+  if (parsed.some((hunks) => hunks === null))
+    return (
+      <>
+        <p className="mobile-patch-diff__notice">
+          {t("changeReview.rawPatch")}
+        </p>
+        <Suspense
+          fallback={<MobileChangeReviewState state="loading" compact />}
+        >
+          <Editor
+            content={patches.join("\n")}
+            filePath={filePath}
+            language="diff"
+            wrap={wrap}
+            height="auto"
+          />
+        </Suspense>
+      </>
+    );
+  const visible = [];
+  let offset = 0;
+  for (const [patchIndex, hunks] of parsed.entries()) {
+    for (const [hunkIndex, hunk] of hunks!.entries()) {
+      const lines = hunk.lines.slice(0, Math.max(0, limit - offset));
+      offset += hunk.lines.length;
+      if (lines.length) visible.push({ patchIndex, hunkIndex, hunk, lines });
+    }
+  }
+  const total = parsed.reduce(
+    (count, hunks) =>
+      count + hunks!.reduce((sum, hunk) => sum + hunk.lines.length, 0),
+    0
+  );
+  return (
+    <div className={`mobile-patch-diff ${wrap ? "is-wrapped" : ""}`}>
+      {visible.map(({ patchIndex, hunkIndex, hunk, lines }) => {
+        const start = hunk.newCount ? hunk.newStart : hunk.oldStart;
+        const count = hunk.newCount || hunk.oldCount;
+        return (
+          <details
+            key={`${patchIndex}:${hunkIndex}`}
+            open
+            className="mobile-patch-diff__hunk"
+          >
+            <summary>
+              <HugeiconsIcon
+                icon={ArrowDown01Icon}
+                size={16}
+                aria-hidden="true"
+              />
+              <span>
+                {patches.length > 1 &&
+                  `${t("changeReview.edit", { count: patchIndex + 1 })} · `}
+                {t("changeReview.lines", { start, end: start + count - 1 })}
+              </span>
+              <DiffStatsBadge
+                additions={hunk.additions}
+                deletions={hunk.deletions}
+                variant="plain"
+                reserveValueWidth={false}
+                gapClassName="gap-2"
+              />
+            </summary>
+            <div
+              className="mobile-patch-diff__code"
+              role="region"
+              aria-label={`${filePath}: ${start}`}
+              tabIndex={0}
+            >
+              {lines.map((line, index) => (
+                <div
+                  key={index}
+                  className={`mobile-patch-diff__line is-${line.kind}`}
+                >
+                  <span
+                    className="mobile-patch-diff__number"
+                    aria-hidden="true"
+                  >
+                    {line.newLine ?? line.oldLine}
+                  </span>
+                  <span className="mobile-patch-diff__sign">
+                    {line.kind === "added"
+                      ? "+"
+                      : line.kind === "deleted"
+                        ? "−"
+                        : " "}
+                  </span>
+                  <code>
+                    {line.text || " "}
+                    {line.noNewline && (
+                      <span className="mobile-patch-diff__newline">
+                        {" "}
+                        {t("changeReview.noNewline")}
+                      </span>
+                    )}
+                  </code>
+                </div>
+              ))}
+            </div>
+          </details>
+        );
+      })}
+      {total > limit && (
+        <Button
+          variant="tertiary"
+          className="mobile-patch-diff__more"
+          onClick={() => setLimit((value) => value + PAGE_LINES)}
+        >
+          {t("changeReview.showMoreLines", {
+            count: Math.min(PAGE_LINES, total - limit),
+          })}
+        </Button>
+      )}
+    </div>
+  );
+});
diff --git a/src/modules/MobileRemote/components/changes/mobileChangeReview.scss b/src/modules/MobileRemote/components/changes/mobileChangeReview.scss
new file mode 100644
index 0000000000..de368d8758
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/mobileChangeReview.scss
@@ -0,0 +1,649 @@
+@use "../../mobileUiTokens" as tokens;
+
+.mobile-change-review {
+  --mobile-change-touch-size: #{tokens.$touch-target};
+  --mobile-change-row-height: #{tokens.$touch-target + tokens.$space-1};
+  --mobile-change-row-padding: #{tokens.$space-3} #{tokens.$space-4};
+  --mobile-change-action-padding: #{tokens.$space-2};
+  --mobile-change-action-radius: #{tokens.$space-2};
+
+  margin-block: tokens.$space-4;
+  min-width: 0;
+  width: 100%;
+  border: 1px solid var(--color-border-2);
+  border-radius: tokens.$space-4;
+  overflow: hidden;
+  background: var(--color-bg-2);
+  color: var(--color-text-1);
+  font-size: var(--mobile-type-secondary-size);
+  line-height: var(--mobile-type-body-leading);
+  &__summary {
+    display: flex;
+    align-items: center;
+    min-width: 0;
+    padding-inline-end: tokens.$space-1;
+    background: var(--color-fill-1);
+  }
+  &__heading-content,
+  &__row-content {
+    display: flex;
+    width: 100%;
+    min-width: 0;
+    align-items: center;
+    gap: tokens.$space-3;
+  }
+  &__path {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: tokens.$space-1;
+    text-align: start;
+  }
+  &__path-filename,
+  &__path-directory {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  &__path-filename {
+    color: var(--color-text-1);
+    font-weight: var(--mobile-type-medium-weight);
+  }
+  &__path-directory {
+    color: var(--color-text-3);
+    font-size: var(--mobile-type-caption-size);
+    line-height: var(--mobile-type-control-leading);
+  }
+  &__label {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  &__stats {
+    display: inline-flex;
+    flex-shrink: 0;
+    gap: tokens.$space-2;
+    font-size: var(--mobile-type-caption-size);
+    font-variant-numeric: tabular-nums;
+    white-space: nowrap;
+  }
+  &__chevron {
+    color: var(--color-text-3);
+  }
+  &__chevron.is-expanded {
+    transform: rotate(180deg);
+  }
+  &__unknown {
+    color: var(--color-text-3);
+  }
+  &__status {
+    display: flex;
+    align-items: center;
+    gap: tokens.$space-2;
+    padding: tokens.$space-2 tokens.$space-4;
+    min-height: var(--mobile-change-row-height);
+    border-top: 1px solid var(--color-border-2);
+  }
+  &__status-copy {
+    flex: 1;
+    min-width: 0;
+    margin: 0;
+    color: var(--color-text-3);
+    overflow-wrap: anywhere;
+  }
+  &__retry {
+    flex-shrink: 0;
+    color: var(--color-primary-6);
+  }
+  &__loading-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    min-height: var(--mobile-change-row-height);
+    padding: var(--mobile-change-row-padding);
+    gap: tokens.$space-4;
+    border-top: 1px solid var(--color-border-2);
+  }
+  &__toolbar {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: tokens.$space-2;
+    padding: tokens.$space-2;
+  }
+  &__file {
+    margin-block: tokens.$space-4;
+    border: 1px solid var(--color-border-2);
+    border-radius: tokens.$space-3;
+    overflow: hidden;
+  }
+  &__editor {
+    height: 50dvh;
+    min-height: 12rem;
+  }
+}
+
+.mobile-change-review .mobile-change-review__heading,
+.mobile-change-review .mobile-change-review__row,
+.mobile-change-review .mobile-change-review__toggle {
+  border: 0;
+  border-radius: 0;
+  box-shadow: none;
+  font-weight: var(--mobile-type-regular-weight);
+  color: var(--color-text-1);
+  font-size: inherit;
+}
+.mobile-change-review .mobile-change-review__heading {
+  flex: 1;
+  min-width: 0;
+  justify-content: flex-start;
+  text-align: start;
+}
+.mobile-change-review__heading-content {
+  font-weight: var(--mobile-type-medium-weight);
+}
+.mobile-change-review .mobile-change-review__toggle {
+  flex-shrink: 0;
+}
+.mobile-change-review .mobile-change-review__row {
+  display: flex;
+  width: 100%;
+  border-top: 1px solid var(--color-border-2);
+  text-align: start;
+}
+.mobile-change-review__heading > span,
+.mobile-change-review__row > span {
+  width: 100%;
+}
+.mobile-change-review button:focus-visible {
+  outline: 2px solid var(--color-primary-6);
+  outline-offset: -2px;
+}
+.mobile-change-review button,
+.mobile-change-review-sheet button {
+  min-height: tokens.$touch-target;
+}
+
+.mobile-change-review-sheet {
+  --mobile-change-touch-size: #{tokens.$touch-target};
+  --mobile-change-action-padding: #{tokens.$space-2};
+  --mobile-change-action-radius: #{tokens.$space-2};
+
+  background: var(--color-bg-2);
+  color: var(--color-text-1);
+
+  .mobile-change-review__title {
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    align-items: center;
+    gap: tokens.$space-1;
+    font-size: var(--mobile-type-title-size);
+    font-weight: var(--mobile-type-emphasis-weight);
+    line-height: var(--mobile-type-title-leading);
+    text-align: center;
+    outline: none;
+  }
+  .mobile-change-review__totals {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: tokens.$space-1 tokens.$space-2;
+    color: var(--color-text-3);
+    font-size: var(--mobile-type-caption-size);
+    font-weight: var(--mobile-type-regular-weight);
+    line-height: var(--mobile-type-control-leading);
+  }
+  .mobile-change-review__close {
+    flex-shrink: 0;
+    color: var(--color-text-2);
+    background: var(--color-fill-2);
+  }
+  .mobile-change-review__body {
+    padding: 0 tokens.$space-4
+      calc(#{tokens.$space-4} + env(safe-area-inset-bottom, 0px));
+    min-height: 0;
+    overscroll-behavior: contain;
+  }
+  .mobile-change-review__controls {
+    position: sticky;
+    top: 0;
+    z-index: 2;
+    display: flex;
+    flex-direction: column;
+    gap: tokens.$space-2;
+    padding-block: 0 tokens.$space-4;
+    background: var(--color-bg-2);
+  }
+  .mobile-change-review__toolbar {
+    padding: 0;
+    flex-wrap: nowrap;
+    gap: tokens.$space-1;
+  }
+  .mobile-change-review__mode {
+    min-width: 0;
+    padding: tokens.$space-1;
+    border: 0;
+    border-radius: tokens.$space-3;
+    background: var(--color-fill-2);
+
+    button {
+      min-width: 0;
+      font-size: var(--mobile-type-secondary-size);
+      padding-inline: tokens.$space-2;
+      background: transparent;
+      color: var(--color-text-2);
+      border-radius: tokens.$space-2;
+
+      &[data-active="true"] {
+        color: var(--color-text-1);
+        background: var(--color-bg-2);
+        box-shadow: var(--shadow-sm);
+
+        // The selected badge is screen-reader-only and needs no visual gap.
+        > div {
+          gap: 0;
+        }
+      }
+    }
+  }
+  .mobile-change-review__scope {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    gap: tokens.$space-2;
+    color: var(--color-text-3);
+    font-size: var(--mobile-type-caption-size);
+    > :last-child {
+      flex: 1;
+      min-width: 0;
+    }
+    .mobile-change-review__dropdown-trigger {
+      justify-content: flex-end;
+      border-color: transparent;
+      > span {
+        justify-content: flex-end;
+      }
+    }
+    .mobile-change-review__dropdown-label {
+      flex: initial;
+    }
+  }
+  .mobile-change-review__mode {
+    width: 100%;
+    max-width: 100%;
+  }
+  .mobile-change-review__file-picker {
+    display: block;
+    margin-block-end: tokens.$space-3;
+  }
+  .mobile-change-review__dropdown-trigger {
+    min-width: 0;
+    width: 100%;
+    color: var(--color-text-2);
+    background: var(--color-bg-2);
+    font-size: var(--mobile-type-secondary-size);
+    border: 1px solid var(--color-border-2);
+    border-radius: tokens.$space-2;
+    padding-inline: tokens.$space-2;
+    display: flex;
+    gap: tokens.$space-2;
+    > span {
+      width: 100%;
+      min-width: 0;
+      gap: tokens.$space-2;
+      display: flex;
+      align-items: center;
+      > svg {
+        flex-shrink: 0;
+      }
+    }
+  }
+  .mobile-change-review__dropdown > .dropdown-trigger-wrapper {
+    width: 100%;
+  }
+  .mobile-change-review__dropdown-label {
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: start;
+  }
+  .mobile-change-review__icon {
+    flex-shrink: 0;
+    color: var(--color-text-2);
+
+    &[aria-pressed="true"] {
+      color: var(--color-text-1);
+      background: var(--color-fill-2);
+    }
+  }
+  .mobile-change-review__expand-all,
+  .mobile-change-review__wrap {
+    margin-inline-start: auto;
+  }
+  .mobile-change-review__file {
+    display: flex;
+    flex-direction: column;
+    isolation: isolate;
+    margin-block: 0 tokens.$space-3;
+    border-color: var(--color-border-1);
+    border-radius: tokens.$space-4;
+    background: var(--color-bg-2);
+
+    .mobile-change-review__file-heading {
+      background: var(--color-fill-1);
+    }
+    > .mobile-change-review__toolbar {
+      padding: tokens.$space-1 tokens.$space-2;
+      border-top: 1px solid var(--color-border-1);
+      flex-wrap: wrap;
+    }
+  }
+  .mobile-change-review__version {
+    flex-shrink: 0;
+    color: var(--color-text-2);
+    font-size: var(--mobile-type-caption-size);
+  }
+  .mobile-change-review__editor--diff {
+    height: auto;
+    min-height: 0;
+    max-height: 50dvh;
+
+    .mobile-readonly-editor,
+    .cm-editor {
+      height: auto;
+      min-height: 0;
+    }
+
+    .cm-scroller {
+      max-height: 50dvh;
+      overflow: auto;
+      overscroll-behavior: contain;
+    }
+  }
+  .mobile-change-review__disclosure {
+    color: var(--color-text-3);
+    font-size: var(--mobile-type-caption-size);
+    summary {
+      display: flex;
+      align-items: center;
+      min-height: tokens.$touch-target;
+      cursor: pointer;
+      list-style: none;
+      &::-webkit-details-marker {
+        display: none;
+      }
+    }
+    p {
+      margin: 0 0 tokens.$space-3;
+      overflow-wrap: anywhere;
+    }
+  }
+  .mobile-change-review__file-path {
+    flex: 1;
+    min-width: 0;
+
+    summary {
+      gap: tokens.$space-1;
+
+      > span {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      > svg {
+        flex-shrink: 0;
+      }
+    }
+    &[open] {
+      flex-basis: 100%;
+
+      summary > svg {
+        transform: rotate(180deg);
+      }
+    }
+  }
+  .mobile-change-review__copy-error {
+    margin: 0;
+    padding: tokens.$space-2 tokens.$space-3;
+    color: var(--color-danger-6);
+    font-size: var(--mobile-type-caption-size);
+  }
+  button:focus-visible,
+  summary:focus-visible {
+    outline: 2px solid var(--color-primary-6);
+    outline-offset: -2px;
+  }
+}
+
+.mobile-change-review-menu.mobile-change-review-menu {
+  @include tokens.adaptive-menu;
+  &--files {
+    min-width: min(16rem, var(--mobile-menu-available-width));
+  }
+}
+
+// Keep the shared Modal's header, focus and dismissal behavior. Equal side
+// columns center the title independently of the single trailing close action.
+.liquid-modal-content.modal-fullscreen.mobile-change-review-sheet
+  > :first-child {
+  display: grid;
+  grid-template-columns: var(--mobile-change-touch-size) minmax(0, 1fr) var(
+      --mobile-change-touch-size
+    );
+  gap: tokens.$space-2;
+  padding: tokens.$space-2 tokens.$space-4 tokens.$space-3;
+  background: var(--color-bg-2);
+
+  > :first-child {
+    grid-column: 2;
+    grid-row: 1;
+    justify-content: center;
+
+    > div {
+      width: 100%;
+      min-width: 0;
+    }
+  }
+  > :last-child {
+    display: contents;
+    > div {
+      display: contents;
+    }
+    .mobile-change-review__header-actions {
+      display: contents;
+    }
+    .mobile-change-review__close {
+      grid-column: 1;
+      grid-row: 1;
+    }
+    .mobile-change-review__expand-all {
+      grid-column: 3;
+      grid-row: 1;
+    }
+  }
+}
+
+// Scope and view mode have different hierarchy; only the view is segmented.
+.liquid-modal-content.modal-fullscreen.mobile-change-review-sheet {
+  height: calc(100% - env(safe-area-inset-top, 0px) - #{tokens.$space-3});
+  align-self: flex-end;
+  border-radius: (tokens.$space-4 + tokens.$space-2)
+    (tokens.$space-4 + tokens.$space-2) 0 0 !important; // Override the shared fullscreen modal's square-corner rule locally.
+  padding-top: tokens.$space-4;
+  position: relative;
+  &::before {
+    content: "";
+    position: absolute;
+    top: tokens.$space-2;
+    left: 50%;
+    transform: translateX(-50%);
+    width: tokens.$space-4 * 2;
+    height: tokens.$space-1;
+    border-radius: tokens.$space-1;
+    background: var(--color-fill-3);
+  }
+}
+.mobile-change-review-sheet {
+  .mobile-change-review__file-heading {
+    display: flex;
+    align-items: center;
+    gap: tokens.$space-2;
+    padding: tokens.$space-2 tokens.$space-3;
+    min-width: 0;
+  }
+  .mobile-change-review__file-toggle {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    gap: tokens.$space-1;
+    border: 0;
+    padding: tokens.$space-1 0;
+    text-align: start;
+    background: transparent;
+    color: var(--color-text-1);
+    cursor: pointer;
+    &:disabled {
+      cursor: default;
+    }
+  }
+  .mobile-change-review__filename,
+  .mobile-change-review__directory {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .mobile-change-review__filename {
+    font-size: var(--mobile-type-secondary-size);
+    font-weight: var(--mobile-type-emphasis-weight);
+  }
+  .mobile-change-review__directory {
+    font-size: var(--mobile-type-caption-size);
+    color: var(--color-text-3);
+  }
+  .mobile-change-review__file-actions {
+    order: 2;
+    border-top: 1px solid var(--color-border-1);
+    > summary {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      min-height: tokens.$touch-target;
+      padding-inline: tokens.$space-3;
+      list-style: none;
+      cursor: pointer;
+      color: var(--color-text-3);
+      &::-webkit-details-marker {
+        display: none;
+      }
+    }
+    > .mobile-change-review__toolbar {
+      padding: 0 tokens.$space-3 tokens.$space-2;
+    }
+  }
+  .mobile-change-review__editor--diff:has(.mobile-patch-diff) {
+    max-height: none;
+  }
+}
+.mobile-patch-diff {
+  min-width: 0;
+  font-size: var(--mobile-type-caption-size);
+  &__hunk {
+    border-top: 1px solid var(--color-border-1);
+  }
+  &__hunk > summary {
+    display: flex;
+    align-items: center;
+    gap: tokens.$space-2;
+    min-height: tokens.$touch-target;
+    padding: tokens.$space-2 tokens.$space-3;
+    list-style: none;
+    color: var(--color-text-3);
+    cursor: pointer;
+    &::-webkit-details-marker {
+      display: none;
+    }
+    > span:first-of-type {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+  &__hunk:not([open]) > summary > svg {
+    transform: rotate(-90deg);
+  }
+  &__code {
+    border-top: 1px solid var(--color-border-1);
+    overflow-x: auto;
+    font-family: var(--font-mono);
+    font-size: var(--mobile-type-code-size);
+    line-height: var(--mobile-type-code-leading);
+    padding-block: tokens.$space-1;
+    overscroll-behavior-x: contain;
+  }
+  &__line {
+    display: grid;
+    grid-template-columns: 5ch 2ch minmax(0, 1fr);
+    width: max-content;
+    min-width: 100%;
+    &.is-added {
+      background: var(--diff-added-bg);
+    }
+    &.is-deleted {
+      background: var(--diff-deleted-bg);
+    }
+    > code {
+      white-space: pre;
+      padding-inline-end: tokens.$space-3;
+      font: inherit;
+      color: var(--color-text-1);
+      background: none;
+    }
+  }
+  &.is-wrapped &__line {
+    width: 100%;
+  }
+  &.is-wrapped &__line > code {
+    white-space: pre-wrap;
+    overflow-wrap: anywhere;
+  }
+  &__number {
+    color: var(--color-text-3);
+    text-align: right;
+    padding-inline: tokens.$space-2 tokens.$space-1;
+    font-variant-numeric: tabular-nums;
+    user-select: none;
+    background: var(--color-fill-1);
+  }
+  &__sign {
+    text-align: center;
+    color: var(--color-text-3);
+    user-select: none;
+  }
+  &__newline {
+    color: var(--color-text-3);
+    font-family: inherit;
+    font-size: var(--mobile-type-caption-size);
+  }
+  &__notice {
+    padding: tokens.$space-2 tokens.$space-3;
+    color: var(--color-text-3);
+    font-size: var(--mobile-type-caption-size);
+  }
+  &__more {
+    width: 100%;
+    border-radius: 0;
+  }
+  summary:focus-visible,
+  &__code:focus-visible {
+    outline: 2px solid var(--color-primary-6);
+    outline-offset: -2px;
+  }
+}
diff --git a/src/modules/MobileRemote/components/changes/mobileChangeReviewState.scss b/src/modules/MobileRemote/components/changes/mobileChangeReviewState.scss
new file mode 100644
index 0000000000..179ff6e260
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/mobileChangeReviewState.scss
@@ -0,0 +1,75 @@
+@use "../../mobileUiTokens" as tokens;
+
+.mobile-change-state {
+  --mobile-change-state-touch: #{tokens.$touch-target};
+  --mobile-change-state-space: #{tokens.$space-4};
+  --mobile-change-state-radius: #{tokens.$space-3};
+
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: tokens.$space-3;
+  width: 100%;
+  min-width: 0;
+  min-height: tokens.$touch-target * 4;
+  padding: tokens.$space-4 * 2 tokens.$space-4;
+  border: 1px solid var(--color-border-2);
+  border-radius: tokens.$space-4;
+  background: var(--color-bg-2);
+  color: var(--color-text-3);
+  font-size: var(--mobile-type-secondary-size);
+  line-height: var(--mobile-type-body-leading);
+  text-align: center;
+
+  &__symbol {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: tokens.$touch-target;
+    height: tokens.$touch-target;
+    flex-shrink: 0;
+    border-radius: 50%;
+    background: var(--color-fill-1);
+  }
+
+  &__message {
+    margin: 0;
+    min-width: 0;
+    overflow-wrap: anywhere;
+  }
+
+  &__retry {
+    flex-shrink: 0;
+    color: var(--color-text-1);
+  }
+
+  &__skeleton {
+    display: flex;
+    flex-direction: column;
+    gap: tokens.$space-4;
+    width: 100%;
+  }
+
+  &--compact {
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: tokens.$space-2;
+    min-height: tokens.$touch-target * 2;
+    padding: tokens.$space-3;
+    border: 0;
+    border-top: 1px solid var(--color-border-2);
+    border-radius: 0;
+    text-align: start;
+
+    .mobile-change-state__symbol {
+      width: tokens.$space-4 + tokens.$space-2;
+      height: tokens.$space-4 + tokens.$space-2;
+      background: transparent;
+    }
+
+    .mobile-change-state__message {
+      flex: 1;
+    }
+  }
+}
diff --git a/src/modules/MobileRemote/components/changes/parseReviewPatch.test.ts b/src/modules/MobileRemote/components/changes/parseReviewPatch.test.ts
new file mode 100644
index 0000000000..0245e53354
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/parseReviewPatch.test.ts
@@ -0,0 +1,74 @@
+import { describe, expect, it } from "vitest";
+
+import { parseReviewPatch } from "./parseReviewPatch";
+
+describe("review patch presentation boundary", () => {
+  it("separates file envelopes and hunks from code with real old/new coordinates", () => {
+    const hunks = parseReviewPatch(
+      "--- a/src/a.ts\n+++ b/src/a.ts\n@@ -12,3 +12,4 @@ function\n context\n-old\n+new\n+added\n tail\n"
+    )!;
+    expect(hunks).toHaveLength(1);
+    expect(hunks[0]).toMatchObject({
+      additions: 2,
+      deletions: 1,
+      oldStart: 12,
+      newStart: 12,
+    });
+    expect(
+      hunks[0].lines.map(({ kind, text, oldLine, newLine }) => [
+        kind,
+        text,
+        oldLine,
+        newLine,
+      ])
+    ).toEqual([
+      ["context", "context", 12, 12],
+      ["deleted", "old", 13, null],
+      ["added", "new", null, 13],
+      ["added", "added", null, 14],
+      ["context", "tail", 14, 15],
+    ]);
+  });
+  it("does not hide real code that resembles file headers", () => {
+    const hunk = parseReviewPatch(
+      "--- a\n+++ b\n@@ -1 +1 @@\n---old\n+++new\n"
+    )![0];
+    expect(hunk.lines.map((line) => line.text)).toEqual(["--old", "++new"]);
+  });
+  it("handles added/deleted files, CRLF, and missing final newlines", () => {
+    const added = parseReviewPatch(
+      "--- /dev/null\r\n+++ a\r\n@@ -0,0 +1,2 @@\r\n+one\r\n+two\r\n\\ No newline at end of file\r\n"
+    )![0];
+    expect(added.lines.map((line) => line.newLine)).toEqual([1, 2]);
+    expect(added.lines[1].noNewline).toBe(true);
+    expect(
+      parseReviewPatch("--- a\n+++ /dev/null\n@@ -7,1 +0,0 @@\n-old")![0]
+        .lines[0].oldLine
+    ).toBe(7);
+  });
+  it("keeps distant hunks separate without materializing missing lines", () => {
+    const hunks = parseReviewPatch(
+      "@@ -1 +1 @@\n-a\n+b\n@@ -900000 +900000 @@\n-x\n+y\n"
+    )!;
+    expect(hunks.map((hunk) => hunk.lines.length)).toEqual([2, 2]);
+    expect(hunks[1].lines[1].newLine).toBe(900000);
+  });
+  it.each([
+    "Binary files a and b differ\n",
+    "rename from a\nrename to b\n",
+    "@@ -1,2 +1,2 @@\n-one\n+two\n",
+    "@@ -1 +1 @@\n-one\n+two\n+extra\n",
+    "@@ -0 +0 @@\n-x\n+y\n",
+    "@@ -9007199254740992 +1 @@\n-x\n+y\n",
+    "*** Begin Patch\n*** Add File: a\n+x\n*** End Patch",
+  ])(
+    "preserves unsupported or incomplete input via explicit raw fallback: %s",
+    (patch) => {
+      expect(parseReviewPatch(patch)).toBeNull();
+    }
+  );
+  it("bounds parsing work before allocating a massive line model", () => {
+    expect(parseReviewPatch("x".repeat(524289))).toBeNull();
+    expect(parseReviewPatch("\n".repeat(10001))).toBeNull();
+  });
+});
diff --git a/src/modules/MobileRemote/components/changes/parseReviewPatch.ts b/src/modules/MobileRemote/components/changes/parseReviewPatch.ts
new file mode 100644
index 0000000000..8e2e135f39
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/parseReviewPatch.ts
@@ -0,0 +1,97 @@
+export interface ReviewPatchLine {
+  kind: "context" | "added" | "deleted";
+  text: string;
+  oldLine: number | null;
+  newLine: number | null;
+  noNewline?: boolean;
+}
+export interface ReviewPatchHunk {
+  oldStart: number;
+  oldCount: number;
+  newStart: number;
+  newCount: number;
+  lines: ReviewPatchLine[];
+  additions: number;
+  deletions: number;
+}
+
+/** Presentation projection only: preserve patch order and coordinates, never
+ * reconstruct missing whole-file snapshots or sum overlapping edits as net. */
+export function parseReviewPatch(patch: string): ReviewPatchHunk[] | null {
+  if (patch.length > 524288) return null;
+  const input = patch.replace(/\r\n/g, "\n").split("\n");
+  if (input.length > 10000) return null;
+  const hunks: ReviewPatchHunk[] = [];
+  let hunk: ReviewPatchHunk | undefined;
+  let oldUsed = 0;
+  let newUsed = 0;
+  for (let index = 0; index < input.length; index++) {
+    const line = input[index];
+    if (index === input.length - 1 && line === "") break;
+    const header = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(?:.*)$/.exec(
+      line
+    );
+    if (header) {
+      // A truncated hunk must not be silently joined with a later edit.
+      if (hunk && (oldUsed !== hunk.oldCount || newUsed !== hunk.newCount))
+        return null;
+      const [oldStart, oldCount, newStart, newCount] = [
+        Number(header[1]),
+        Number(header[2] ?? 1),
+        Number(header[3]),
+        Number(header[4] ?? 1),
+      ];
+      if (
+        ![oldStart, oldCount, newStart, newCount].every(Number.isSafeInteger) ||
+        !Number.isSafeInteger(oldStart + oldCount) ||
+        !Number.isSafeInteger(newStart + newCount) ||
+        (oldCount > 0 && oldStart === 0) ||
+        (newCount > 0 && newStart === 0)
+      )
+        return null;
+      hunk = {
+        oldStart,
+        oldCount,
+        newStart,
+        newCount,
+        lines: [],
+        additions: 0,
+        deletions: 0,
+      };
+      hunks.push(hunk);
+      oldUsed = 0;
+      newUsed = 0;
+      continue;
+    }
+    if (line === "\\ No newline at end of file" && hunk?.lines.length) {
+      hunk.lines[hunk.lines.length - 1].noNewline = true;
+      continue;
+    }
+    if (hunk && (oldUsed < hunk.oldCount || newUsed < hunk.newCount)) {
+      const marker = line[0];
+      if (marker !== "+" && marker !== "-" && marker !== " ") return null;
+      const added = marker === "+";
+      const deleted = marker === "-";
+      hunk.lines.push({
+        kind: added ? "added" : deleted ? "deleted" : "context",
+        text: line.slice(1),
+        oldLine: added ? null : hunk.oldStart + oldUsed++,
+        newLine: deleted ? null : hunk.newStart + newUsed++,
+      });
+      if (added) hunk.additions++;
+      if (deleted) hunk.deletions++;
+      if (oldUsed > hunk.oldCount || newUsed > hunk.newCount) return null;
+      continue;
+    }
+    if (
+      /^(diff --git |index |--- |\+\+\+ |new file mode |deleted file mode |old mode |new mode |similarity index |rename from |rename to )/.test(
+        line
+      )
+    )
+      continue;
+    return null;
+  }
+  if (!hunk || oldUsed !== hunk.oldCount || newUsed !== hunk.newCount)
+    return null;
+  return hunks;
+}
diff --git a/src/modules/MobileRemote/components/changes/useChangeReview.test.ts b/src/modules/MobileRemote/components/changes/useChangeReview.test.ts
new file mode 100644
index 0000000000..ba16782b3c
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/useChangeReview.test.ts
@@ -0,0 +1,322 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { MobileRpcClient } from "../../connection/mobileRpcClient";
+import {
+  type ChangeScope,
+  type Review,
+  useChangeReview,
+} from "./useChangeReview";
+
+vi.mock("../../platform", async () => {
+  const { createBrowserMobileRemotePlatform } =
+    await import("../../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { useMobileRemotePlatform: () => platform };
+});
+
+interface Props {
+  client: MobileRpcClient | null;
+  sessionId: string;
+  roundId: string | null;
+  scope: ChangeScope;
+  enabled: boolean;
+  revision: string;
+  filePath?: string;
+}
+
+const review = (path?: string): Review => ({
+  complete: true,
+  files: path
+    ? [
+        {
+          path,
+          additions: 1,
+          deletions: 0,
+          patches: [],
+          before: null,
+          after: null,
+          availability: "patch_only",
+        },
+      ]
+    : [],
+});
+const deferred = () => {
+  let resolve!: (value: Review) => void;
+  let reject!: (reason: Error) => void;
+  const promise = new Promise<Review>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, resolve, reject };
+};
+
+let root: ReturnType<typeof createRoot>;
+let host: HTMLDivElement;
+let current: ReturnType<typeof useChangeReview>;
+let props: Props;
+const call = vi.fn();
+
+function Probe(value: Props) {
+  const result = useChangeReview(
+    value.client,
+    value.sessionId,
+    value.roundId,
+    value.scope,
+    value.enabled,
+    value.revision,
+    value.filePath
+  );
+  React.useLayoutEffect(() => {
+    current = result;
+  }, [result]);
+  return React.createElement(
+    "output",
+    null,
+    result.error ? "error" : result.value ? "success" : "pending"
+  );
+}
+
+async function render(next: Partial<Props> = {}) {
+  props = { ...props, ...next };
+  await act(async () => root.render(React.createElement(Probe, props)));
+}
+async function advance(ms = 250) {
+  await act(async () => vi.advanceTimersByTimeAsync(ms));
+}
+
+beforeEach(() => {
+  vi.useFakeTimers();
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+  call.mockReset();
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+  props = {
+    client: { call } as unknown as MobileRpcClient,
+    sessionId: "session-a",
+    roundId: "round-one",
+    scope: "turn",
+    enabled: true,
+    revision: "revision-one",
+  };
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.useRealTimers();
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = false;
+});
+
+describe("useChangeReview", () => {
+  it.each(["file.ts", undefined])(
+    "moves failed retry immediately to pending and resolves %s without duplicate calls",
+    async (path) => {
+      const retry = deferred();
+      call
+        .mockRejectedValueOnce(new Error("offline"))
+        .mockReturnValueOnce(retry.promise);
+      await render();
+      expect(host.textContent).toBe("pending");
+      await advance(249);
+      expect(call).not.toHaveBeenCalled();
+      await advance(1);
+      expect(host.textContent).toBe("error");
+
+      await act(async () => {
+        for (let index = 0; index < 5; index++) current.retry();
+      });
+      expect(host.textContent).toBe("pending");
+      expect(current.error).toBeUndefined();
+      expect(current.value).toBeUndefined();
+      expect(vi.getTimerCount()).toBe(1);
+      expect(call).toHaveBeenCalledTimes(1);
+
+      await advance();
+      expect(call).toHaveBeenCalledTimes(2);
+      const signal = call.mock.calls[1][2] as AbortSignal;
+      await act(async () => {
+        current.retry();
+        current.retry();
+      });
+      await advance(1000);
+      expect(call).toHaveBeenCalledTimes(2);
+      expect(signal.aborted).toBe(false);
+      expect(vi.getTimerCount()).toBe(0);
+
+      await act(async () => retry.resolve(review(path)));
+      expect(host.textContent).toBe("success");
+      expect(current.value).toEqual(review(path));
+      expect(current.error).toBeUndefined();
+      await act(async () => current.retry());
+      await advance(1000);
+      expect(call).toHaveBeenCalledTimes(2);
+    }
+  );
+
+  it.each<Partial<Props>>([
+    { sessionId: "session-b" },
+    { roundId: "round-two" },
+    { scope: "workspace" },
+    { revision: "revision-two" },
+    { filePath: "other.ts" },
+  ])(
+    "aborts and isolates a pending response on scope change %j",
+    async (next) => {
+      const previous = deferred();
+      const fresh = deferred();
+      call
+        .mockReturnValueOnce(previous.promise)
+        .mockReturnValueOnce(fresh.promise);
+      await render();
+      await advance();
+      const previousSignal = call.mock.calls[0][2] as AbortSignal;
+      await render(next);
+      expect(previousSignal.aborted).toBe(true);
+      expect(current.value).toBeUndefined();
+      await advance();
+      await act(async () => fresh.resolve(review("fresh.ts")));
+      await act(async () => previous.resolve(review("stale.ts")));
+      expect(current.value).toEqual(review("fresh.ts"));
+      expect(current.error).toBeUndefined();
+      expect(call).toHaveBeenCalledTimes(2);
+    }
+  );
+
+  it("does not expose the previous client's result or late failure", async () => {
+    const previous = deferred();
+    const freshCall = vi.fn().mockResolvedValue(review("fresh.ts"));
+    call.mockReturnValue(previous.promise);
+    await render();
+    await advance();
+    await render({ client: { call: freshCall } as unknown as MobileRpcClient });
+    expect((call.mock.calls[0][2] as AbortSignal).aborted).toBe(true);
+    expect(current.value).toBeUndefined();
+    await advance();
+    await act(async () => previous.reject(new Error("old connection failed")));
+    expect(current.value).toEqual(review("fresh.ts"));
+    expect(current.error).toBeUndefined();
+    expect(freshCall).toHaveBeenCalledTimes(1);
+  });
+
+  it("coalesces revision bursts and clears previous successful data during refresh", async () => {
+    call.mockResolvedValue(review("before.ts"));
+    await render();
+    await advance();
+    expect(current.value).toEqual(review("before.ts"));
+    await render({ revision: "two" });
+    expect(current.value).toBeUndefined();
+    await advance(100);
+    await render({ revision: "three" });
+    await advance(100);
+    await render({ revision: "four" });
+    expect(call).toHaveBeenCalledTimes(1);
+    expect(vi.getTimerCount()).toBe(1);
+    call.mockResolvedValue(review("after.ts"));
+    await advance();
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(current.value).toEqual(review("after.ts"));
+    await advance(60_000);
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(vi.getTimerCount()).toBe(0);
+  });
+
+  it("allows a subsequent retry only after the current attempt has failed", async () => {
+    call
+      .mockRejectedValueOnce(new Error("offline"))
+      .mockRejectedValueOnce(new Error("still offline"))
+      .mockResolvedValueOnce(review("recovered.ts"));
+    await render();
+    await advance();
+    expect(current.error).toBe(true);
+    await act(async () => current.retry());
+    expect(current.error).toBeUndefined();
+    await advance();
+    expect(current.error).toBe(true);
+    await act(async () => current.retry());
+    expect(current.error).toBeUndefined();
+    await advance();
+    expect(current.value).toEqual(review("recovered.ts"));
+    expect(call).toHaveBeenCalledTimes(3);
+  });
+
+  it("releases successful snapshots when a viewer is disabled", async () => {
+    call.mockResolvedValue(review("large-file.ts"));
+    await render();
+    await advance();
+    expect(current.value).toEqual(review("large-file.ts"));
+    await render({ enabled: false });
+    expect(current.value).toBeUndefined();
+    expect(current.error).toBeUndefined();
+    expect(vi.getTimerCount()).toBe(0);
+    await render({ enabled: true });
+    expect(current.value).toBeUndefined();
+    await advance();
+    expect(call).toHaveBeenCalledTimes(2);
+  });
+
+  it.each([0, 250])(
+    "cancels disabled work after %i ms and reloads once when enabled returns",
+    async (elapsed) => {
+      const previous = deferred();
+      call.mockReturnValue(previous.promise);
+      await render();
+      await advance(elapsed);
+      const signal = call.mock.calls[0]?.[2] as AbortSignal | undefined;
+      await render({ enabled: false });
+      expect(vi.getTimerCount()).toBe(0);
+      if (signal) expect(signal.aborted).toBe(true);
+      const callsBefore = call.mock.calls.length;
+      await act(async () => {
+        current.retry();
+        previous.resolve(review("stale.ts"));
+      });
+      await advance(60_000);
+      expect(call).toHaveBeenCalledTimes(callsBefore);
+      expect(current.value).toBeUndefined();
+      call.mockResolvedValue(review("visible.ts"));
+      await render({ enabled: true });
+      await advance();
+      expect(call).toHaveBeenCalledTimes(callsBefore + 1);
+      expect(current.value).toEqual(review("visible.ts"));
+    }
+  );
+
+  it.each([0, 250])(
+    "cleans timers and aborts on unmount after %i ms",
+    async (elapsed) => {
+      const pending = deferred();
+      call.mockReturnValue(pending.promise);
+      await render();
+      await advance(elapsed);
+      const signal = call.mock.calls[0]?.[2] as AbortSignal | undefined;
+      await act(async () => root.render(null));
+      expect(vi.getTimerCount()).toBe(0);
+      if (signal) expect(signal.aborted).toBe(true);
+      const count = call.mock.calls.length;
+      await act(async () => pending.resolve(review("stale.ts")));
+      await advance(60_000);
+      expect(call).toHaveBeenCalledTimes(count);
+      expect(host.textContent).toBe("");
+    }
+  );
+
+  it("does not request without a client, and rejects malformed success as error", async () => {
+    await render({ client: null });
+    await act(async () => current.retry());
+    await advance(1000);
+    expect(call).not.toHaveBeenCalled();
+    expect(vi.getTimerCount()).toBe(0);
+    call.mockResolvedValue({ files: [] });
+    await render({ client: { call } as unknown as MobileRpcClient });
+    await advance();
+    expect(current.error).toBe(true);
+    expect(current.value).toBeUndefined();
+  });
+});
diff --git a/src/modules/MobileRemote/components/changes/useChangeReview.ts b/src/modules/MobileRemote/components/changes/useChangeReview.ts
new file mode 100644
index 0000000000..ab64e1c9ec
--- /dev/null
+++ b/src/modules/MobileRemote/components/changes/useChangeReview.ts
@@ -0,0 +1,121 @@
+import { useEffect, useState } from "react";
+
+import type { MobileRpcClient } from "../../connection/mobileRpcClient";
+import { useMobileRemotePlatform } from "../../platform";
+
+export type ChangeScope = "turn" | "session" | "workspace";
+export interface ChangeFile {
+  path: string;
+  additions: number | null;
+  deletions: number | null;
+  patches: string[];
+  before: string | null;
+  after: string | null;
+  availability: string;
+}
+export interface Review {
+  files: ChangeFile[];
+  complete: boolean;
+}
+export function validateReview(value: unknown): Review {
+  const result = value as Review;
+  if (
+    !result ||
+    typeof result.complete !== "boolean" ||
+    !Array.isArray(result.files) ||
+    result.files.length > 500 ||
+    !result.files.every(
+      (f) =>
+        f &&
+        typeof f.path === "string" &&
+        f.path.length > 0 &&
+        [f.additions, f.deletions].every(
+          (n) => n === null || (Number.isSafeInteger(n) && n >= 0)
+        ) &&
+        [f.before, f.after].every(
+          (s) => s === null || (typeof s === "string" && s.length <= 524288)
+        ) &&
+        Array.isArray(f.patches) &&
+        f.patches.every((p) => typeof p === "string") &&
+        typeof f.availability === "string"
+    ) ||
+    JSON.stringify(value).length > 3 * 1024 * 1024
+  )
+    throw new Error("Invalid change review");
+  return result;
+}
+
+export function useChangeReview(
+  client: MobileRpcClient | null,
+  sessionId: string,
+  roundId: string | null,
+  scope: ChangeScope,
+  enabled: boolean,
+  revision: string,
+  filePath?: string
+) {
+  const key = JSON.stringify([sessionId, roundId, scope, revision, filePath]);
+  const { runtime } = useMobileRemotePlatform();
+  const [attempt, setAttempt] = useState(0);
+  const [state, setState] = useState<{
+    client: MobileRpcClient;
+    key: string;
+    attempt: number;
+    value?: Review;
+    error?: boolean;
+  } | null>(null);
+  // File viewers leave the viewport or collapse; do not retain their large
+  // snapshots for the lifetime of the entire review panel.
+  if (!enabled && state !== null) setState(null);
+  useEffect(() => {
+    if (!client || !enabled) return;
+    const controller = new AbortController();
+    const timer = runtime.setTimeout(() => {
+      void client
+        .call(
+          "session/changes",
+          { sessionId, roundId, scope, filePath },
+          controller.signal
+        )
+        .then(validateReview)
+        .then((value) => {
+          if (!controller.signal.aborted)
+            setState({ client, key, attempt, value });
+        })
+        .catch(() => {
+          if (!controller.signal.aborted)
+            setState({ client, key, attempt, error: true });
+        });
+    }, 250);
+    return () => {
+      runtime.clearTimeout(timer);
+      controller.abort();
+    };
+  }, [
+    client,
+    enabled,
+    key,
+    sessionId,
+    roundId,
+    scope,
+    filePath,
+    attempt,
+    runtime,
+  ]);
+  const current =
+    state?.client === client && state.key === key && state.attempt === attempt
+      ? state
+      : null;
+  return {
+    value: current?.value,
+    error: current?.error,
+    retry: () => {
+      if (!client || !enabled || !current?.error) return;
+      // Invalidate the failed result immediately. Repeated taps from the same
+      // render may enqueue updates together; only the first starts a retry.
+      setAttempt((pendingAttempt) =>
+        pendingAttempt === attempt ? attempt + 1 : pendingAttempt
+      );
+    },
+  };
+}
diff --git a/src/modules/MobileRemote/components/composer/MobileComposer.test.ts b/src/modules/MobileRemote/components/composer/MobileComposer.test.ts
index afcf6f8afc..35fda8fc7a 100644
--- a/src/modules/MobileRemote/components/composer/MobileComposer.test.ts
+++ b/src/modules/MobileRemote/components/composer/MobileComposer.test.ts
@@ -23,17 +23,26 @@ vi.mock("react-i18next", () => ({
   }),
 }));
 
+const voiceTest = vi.hoisted(() => ({
+  start: vi.fn(),
+  onError: undefined as
+    | undefined
+    | ((error: { code: string; message: string }) => void),
+}));
 vi.mock("@src/hooks/voice", () => ({
-  useVoiceInput: () => ({
-    isRecording: false,
-    isSupported: true,
-    liveTranscript: "",
-    elapsedSeconds: 0,
-    start: vi.fn(),
-    stop: vi.fn(),
-    cancel: vi.fn(),
-    toggle: vi.fn(),
-  }),
+  useVoiceInput: (options: { onError?: typeof voiceTest.onError }) => {
+    voiceTest.onError = options.onError;
+    return {
+      isRecording: false,
+      isSupported: true,
+      liveTranscript: "",
+      elapsedSeconds: 0,
+      start: voiceTest.start,
+      stop: vi.fn(),
+      cancel: vi.fn(),
+      toggle: vi.fn(),
+    };
+  },
 }));
 
 (
@@ -50,6 +59,27 @@ afterEach(() => {
   host?.remove();
   root = null;
   host = null;
+  voiceTest.start.mockClear();
+  voiceTest.onError = undefined;
+});
+
+it("retries microphone permission from the shared primary Button without sending a message", async () => {
+  const onSend = vi.fn();
+  await renderComposer(onSend);
+  await act(async () =>
+    voiceTest.onError?.({
+      code: "permission-denied",
+      message: "Permission denied",
+    })
+  );
+  const retry = Array.from(document.querySelectorAll("button")).find(
+    (button) => button.textContent === "Try again"
+  )!;
+  expect(retry).not.toBeUndefined();
+  expect(retry.classList.contains("button")).toBe(true);
+  await act(async () => retry.click());
+  expect(voiceTest.start).toHaveBeenCalledOnce();
+  expect(onSend).not.toHaveBeenCalled();
 });
 
 async function renderComposer(
diff --git a/src/modules/MobileRemote/components/composer/MobileComposer.tsx b/src/modules/MobileRemote/components/composer/MobileComposer.tsx
index c713cda1c8..ae94beae3b 100644
--- a/src/modules/MobileRemote/components/composer/MobileComposer.tsx
+++ b/src/modules/MobileRemote/components/composer/MobileComposer.tsx
@@ -23,14 +23,18 @@ import { resolveVoicePermissionErrorMessage } from "@src/hooks/voice/voicePermis
 import type { MobileSendAttachment } from "@src/modules/MobileRemote/connection/types";
 
 import { MobileComposerAttachmentButton } from "./MobileComposerAttachmentButton";
+import { useMobileComposerDraft } from "./MobileComposerDraftContext";
 import { MobileComposerImagePreview } from "./MobileComposerImagePreview";
 import { MobileModelPicker } from "./MobileModelPicker";
 import type { MobileModelPickerProps } from "./MobileModelPicker";
+import { MOBILE_DRAFT_TEXT_LIMIT } from "./mobileComposerDraftStore";
 import { useMobileComposerImages } from "./useMobileComposerImages";
 
 const MOBILE_COMPOSER_EDITOR_MIN_HEIGHT = 36;
 
 export interface MobileComposerProps {
+  /** Account/endpoint are owned by the provider; this identifies desktop + session. */
+  draftScope?: string;
   disabled?: boolean;
   disabledReason?: string;
   statusMessage?: string;
@@ -52,27 +56,47 @@ export function MobileComposer({
   statusTone = "neutral",
   onSend,
   modelPicker,
+  draftScope,
 }: MobileComposerProps) {
   const { t } = useTranslation("sessions");
   const { t: tCommon } = useTranslation("common");
   const { t: tVoice } = useTranslation("sessions", { keyPrefix: "input" });
-  const [draft, setDraft] = useState("");
-  const [submitting, setSubmitting] = useState(false);
-  const [submitError, setSubmitError] = useState<string>();
+  const { handle: draftHandle, snapshot } = useMobileComposerDraft(draftScope);
+  const { text: draft, submitting, submitError } = snapshot;
+  const setDraft = useCallback(
+    (value: string | ((text: string) => string)) => {
+      draftHandle.update((current) => {
+        const text = typeof value === "function" ? value(current.text) : value;
+        return text.length <= MOBILE_DRAFT_TEXT_LIMIT
+          ? { ...current, text }
+          : {
+              ...current,
+              submitError: t("chat.draftTooLong", {
+                defaultValue: "Draft is too long (maximum {{max}} characters)",
+                max: MOBILE_DRAFT_TEXT_LIMIT,
+              }),
+            };
+      });
+    },
+    [draftHandle, t]
+  );
   const [voiceError, setVoiceError] = useState<string>();
   const [voicePermissionSheetOpen, setVoicePermissionSheetOpen] =
     useState(false);
 
-  const handleVoiceCommit = useCallback((transcript: string) => {
-    const trimmed = transcript.trim();
-    if (!trimmed) return;
-    setVoiceError(undefined);
-    setDraft((existing) => {
-      const separator =
-        existing.length === 0 || /\s$/.test(existing) ? "" : " ";
-      return `${existing}${separator}${trimmed}`;
-    });
-  }, []);
+  const handleVoiceCommit = useCallback(
+    (transcript: string) => {
+      const trimmed = transcript.trim();
+      if (!trimmed) return;
+      setVoiceError(undefined);
+      setDraft((existing) => {
+        const separator =
+          existing.length === 0 || /\s$/.test(existing) ? "" : " ";
+        return `${existing}${separator}${trimmed}`;
+      });
+    },
+    [setDraft]
+  );
 
   const handleVoiceError = useCallback(
     (err: VoiceInputError) => {
@@ -107,29 +131,46 @@ export function MobileComposer({
     voice.start();
   }, [voice]);
 
-  const attachments = useMobileComposerImages();
+  const attachments = useMobileComposerImages(draftHandle);
+  const { toSendAttachments } = attachments;
 
   const handleSend = useCallback(async () => {
-    if (disabled || submitting || attachments.processing) return;
-    const trimmed = draft.trim();
-    const pendingAttachments = attachments.toSendAttachments();
+    const submitted = draftHandle.getSnapshot();
+    if (disabled || submitted.submitting || submitted.processing || !onSend)
+      return;
+    const trimmed = submitted.text.trim();
+    const pendingAttachments = toSendAttachments();
     if (!trimmed && pendingAttachments.length === 0) return;
-    setSubmitting(true);
-    setSubmitError(undefined);
+    const entry = draftHandle.capture();
+    draftHandle.updateIfCurrent(entry, (current) => ({
+      ...current,
+      submitting: true,
+      submitError: undefined,
+    }));
     try {
-      await onSend?.(trimmed, pendingAttachments);
-      setDraft((current) => (current === draft ? "" : current));
-      attachments.clearImages();
+      await onSend(trimmed, pendingAttachments);
+      const sentImages = new Set(submitted.images.map((image) => image.id));
+      draftHandle.updateIfCurrent(entry, (current) => ({
+        ...current,
+        text:
+          current.textRevision === submitted.textRevision ? "" : current.text,
+        images: current.images.filter((image) => !sentImages.has(image.id)),
+      }));
     } catch (error) {
-      setSubmitError(
-        error instanceof Error
-          ? error.message
-          : t("chat.sendFailed", "Message could not be sent")
-      );
+      draftHandle.updateIfCurrent(entry, (current) => ({
+        ...current,
+        submitError:
+          error instanceof Error
+            ? error.message
+            : t("chat.sendFailed", "Message could not be sent"),
+      }));
     } finally {
-      setSubmitting(false);
+      draftHandle.updateIfCurrent(entry, (current) => ({
+        ...current,
+        submitting: false,
+      }));
     }
-  }, [attachments, disabled, draft, onSend, submitting, t]);
+  }, [toSendAttachments, disabled, draftHandle, onSend, t]);
 
   const visibleStatus =
     attachments.error ??
@@ -194,6 +235,7 @@ export function MobileComposer({
               editorSlot={
                 <Textarea
                   value={draft}
+                  maxLength={MOBILE_DRAFT_TEXT_LIMIT}
                   onChange={(value) => setDraft(value)}
                   placeholder={t("chat.typeMessage", "Type a message…")}
                   autoSize={{ minRows: 1, maxRows: 4 }}
@@ -259,11 +301,9 @@ export function MobileComposer({
         closeLabel={tCommon("actions.close", "Close")}
         footer={
           <Button
-            variant="primary"
-            appearance="solid"
-            size="default"
             htmlType="button"
-            className="w-full text-sm font-medium"
+            variant="primary"
+            className="min-h-11 w-full"
             onClick={() => {
               setVoicePermissionSheetOpen(false);
               handleVoiceStart();
@@ -273,7 +313,7 @@ export function MobileComposer({
           </Button>
         }
       >
-        <p className="text-sm leading-relaxed text-text-2">{voiceError}</p>
+        <p className="mobile-type-secondary text-text-2">{voiceError}</p>
       </BottomSheet>
     </div>
   );
diff --git a/src/modules/MobileRemote/components/composer/MobileComposerAttachmentButton.tsx b/src/modules/MobileRemote/components/composer/MobileComposerAttachmentButton.tsx
index 14065b73bd..aa04a936e6 100644
--- a/src/modules/MobileRemote/components/composer/MobileComposerAttachmentButton.tsx
+++ b/src/modules/MobileRemote/components/composer/MobileComposerAttachmentButton.tsx
@@ -2,7 +2,6 @@ import React, { useCallback, useRef } from "react";
 import { useTranslation } from "react-i18next";
 
 import Button from "@src/components/Button";
-import { PILL_CONTROL_HOVER_CLASS } from "@src/components/CompoundPill/config";
 import { INPUT_AREA_BUTTONS } from "@src/config/inputAreaTokens";
 import { Add01Icon, HugeiconsIcon } from "@src/icons";
 
@@ -47,28 +46,32 @@ export function MobileComposerAttachmentButton({
         onChange={handleChange}
       />
       <Button
-        layout="custom"
-        appearance="custom"
         htmlType="button"
+        variant="tertiary"
+        appearance="ghost"
+        shape="circle"
+        iconOnly
+        style={{
+          width: INPUT_AREA_BUTTONS.iconButtonSize,
+          height: INPUT_AREA_BUTTONS.iconButtonSize,
+          padding: 0,
+        }}
         onClick={handleClick}
         disabled={disabled || busy}
-        className={[
-          `flex items-center justify-center rounded-full text-text-1 transition-colors duration-200 focus:outline-none ${PILL_CONTROL_HOVER_CLASS}`,
-          INPUT_AREA_BUTTONS.iconButtonSizeClass,
-          disabled || busy ? "pointer-events-none opacity-50" : "",
-        ].join(" ")}
+        aria-busy={busy}
         aria-label={t("composer.attachments.addPhotos")}
         title={t("composer.attachments.addPhotos")}
         data-testid="mobile-composer-attach-button"
-      >
-        <HugeiconsIcon
-          icon={Add01Icon}
-          data-icon="plus"
-          size={INPUT_AREA_BUTTONS.iconSize}
-          strokeWidth={1.75}
-          className="text-text-1"
-        />
-      </Button>
+        icon={
+          <HugeiconsIcon
+            icon={Add01Icon}
+            data-icon="plus"
+            size={INPUT_AREA_BUTTONS.iconSize}
+            strokeWidth={1.75}
+            className="text-text-1"
+          />
+        }
+      />
     </>
   );
 }
diff --git a/src/modules/MobileRemote/components/composer/MobileComposerControls.test.ts b/src/modules/MobileRemote/components/composer/MobileComposerControls.test.ts
new file mode 100644
index 0000000000..39a5d41905
--- /dev/null
+++ b/src/modules/MobileRemote/components/composer/MobileComposerControls.test.ts
@@ -0,0 +1,96 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import { MobileComposerAttachmentButton } from "./MobileComposerAttachmentButton";
+import { MobileComposerImagePreview } from "./MobileComposerImagePreview";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+let root: ReturnType<typeof createRoot>;
+let host: HTMLDivElement;
+beforeEach(() => {
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.restoreAllMocks();
+});
+
+it("uses shared attachment Button and preserves busy/disabled gating and native file selection", async () => {
+  const onFilesSelected = vi.fn();
+  const render = async (busy = false, disabled = false) =>
+    act(async () =>
+      root.render(
+        React.createElement(MobileComposerAttachmentButton, {
+          busy,
+          disabled,
+          onFilesSelected,
+        })
+      )
+    );
+  await render();
+  const input = host.querySelector("input")!;
+  const open = vi.spyOn(input, "click");
+  const button = host.querySelector("button")!;
+  expect(button.classList.contains("button")).toBe(true);
+  expect(button.querySelector('[data-icon="plus"]')).not.toBeNull();
+  await act(async () => button.click());
+  expect(open).toHaveBeenCalledOnce();
+  await render(true);
+  expect(button.disabled).toBe(true);
+  await act(async () => button.click());
+  await render(false, true);
+  await act(async () => button.click());
+  expect(open).toHaveBeenCalledOnce();
+  await render();
+  const file = new File(["image"], "photo.png", { type: "image/png" });
+  Object.defineProperty(input, "files", { configurable: true, value: [file] });
+  await act(async () =>
+    input.dispatchEvent(new Event("change", { bubbles: true }))
+  );
+  expect(onFilesSelected).toHaveBeenCalledWith([file]);
+  Object.defineProperty(input, "files", { value: [] });
+  await act(async () =>
+    input.dispatchEvent(new Event("change", { bubbles: true }))
+  );
+  expect(onFilesSelected).toHaveBeenCalledOnce();
+});
+
+it("uses shared removal buttons with a larger hit target and removes only the selected draft image", async () => {
+  const onRemove = vi.fn();
+  const parentClick = vi.fn();
+  const images = ["one", "two"].map((id) => ({
+    id,
+    fileName: `${id}.png`,
+    dataUrl: "data:image/png;base64,AA==",
+  }));
+  await act(async () =>
+    root.render(
+      React.createElement(
+        "div",
+        { onClick: parentClick },
+        React.createElement(MobileComposerImagePreview, { images, onRemove })
+      )
+    )
+  );
+  const buttons = host.querySelectorAll("button");
+  expect(buttons).toHaveLength(2);
+  expect(buttons[1].classList.contains("button")).toBe(true);
+  expect(buttons[1].querySelector('[data-icon="x"]')).not.toBeNull();
+  expect(buttons[1].classList.contains("min-h-11")).toBe(true);
+  expect(buttons[1].getAttribute("aria-label")).toBe("actions.remove: two.png");
+  await act(async () => buttons[1].click());
+  expect(onRemove).toHaveBeenCalledOnce();
+  expect(onRemove).toHaveBeenCalledWith("two");
+  expect(parentClick).not.toHaveBeenCalled();
+  expect(images).toHaveLength(2);
+});
diff --git a/src/modules/MobileRemote/components/composer/MobileComposerDraftContext.tsx b/src/modules/MobileRemote/components/composer/MobileComposerDraftContext.tsx
new file mode 100644
index 0000000000..db6e7ce9d1
--- /dev/null
+++ b/src/modules/MobileRemote/components/composer/MobileComposerDraftContext.tsx
@@ -0,0 +1,37 @@
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useMemo,
+  useSyncExternalStore,
+} from "react";
+
+import { createMobileComposerDraftStore } from "./mobileComposerDraftStore";
+import type {
+  MobileComposerDraftHandle,
+  MobileComposerDraftStore,
+} from "./mobileComposerDraftStore";
+
+export const MobileComposerDraftContext =
+  createContext<MobileComposerDraftStore | null>(null);
+
+export function useMobileComposerDraft(
+  scope = "standalone",
+  providedHandle?: MobileComposerDraftHandle
+) {
+  const owner = useContext(MobileComposerDraftContext);
+  // Standalone composers (tests/embeds) remain isolated, not module-global.
+  const local = useMemo(() => createMobileComposerDraftStore(), []);
+  useEffect(() => () => local.clear(), [local]);
+  const store = owner ?? local;
+  const handle = useMemo(
+    () => providedHandle ?? store.scope(scope),
+    [providedHandle, store, scope]
+  );
+  const snapshot = useSyncExternalStore(
+    handle.subscribe,
+    handle.getSnapshot,
+    handle.getSnapshot
+  );
+  return { handle, snapshot };
+}
diff --git a/src/modules/MobileRemote/components/composer/MobileComposerImagePreview.tsx b/src/modules/MobileRemote/components/composer/MobileComposerImagePreview.tsx
index 7c3f5d823d..22d60f883c 100644
--- a/src/modules/MobileRemote/components/composer/MobileComposerImagePreview.tsx
+++ b/src/modules/MobileRemote/components/composer/MobileComposerImagePreview.tsx
@@ -1,9 +1,10 @@
 import React, { memo, useCallback } from "react";
+import { useTranslation } from "react-i18next";
 
 import Button from "@src/components/Button";
 import { Cancel01Icon, HugeiconsIcon } from "@src/icons";
 
-import type { MobileComposerImage } from "./useMobileComposerImages";
+import type { MobileComposerImage } from "./mobileComposerDraftStore";
 
 export interface MobileComposerImagePreviewProps {
   images: MobileComposerImage[];
@@ -12,6 +13,7 @@ export interface MobileComposerImagePreviewProps {
 
 export const MobileComposerImagePreview = memo(
   ({ images, onRemove }: MobileComposerImagePreviewProps) => {
+    const { t } = useTranslation("common");
     const handleRemove = useCallback(
       (id: string) => (event: React.MouseEvent) => {
         event.stopPropagation();
@@ -24,39 +26,45 @@ export const MobileComposerImagePreview = memo(
 
     return (
       <div
-        className="flex flex-wrap gap-1.5 px-3 pb-1"
+        className="flex flex-wrap gap-3 px-3 pt-2 pb-1"
         data-testid="mobile-composer-image-preview"
       >
         {images.map((image) => (
           <div
             key={image.id}
-            className="group relative inline-flex h-10 w-10 shrink-0 overflow-hidden rounded-md border border-border-2 bg-fill-1"
+            className="group relative inline-flex h-12 w-12 shrink-0 rounded-md border border-border-2 bg-fill-1"
             data-testid="mobile-composer-image-thumbnail"
           >
             <img
               src={image.dataUrl}
               alt={image.fileName}
-              className="h-full w-full object-cover"
+              className="h-full w-full rounded-md object-cover"
               draggable={false}
               loading="lazy"
               decoding="async"
             />
             <Button
-              layout="custom"
-              appearance="custom"
               htmlType="button"
+              iconOnly
+              shape="circle"
+              variant="tertiary"
+              appearance="ghost"
+              style={{ padding: 0 }}
               onClick={handleRemove(image.id)}
-              className="absolute -top-0.5 -right-0.5 flex h-4 w-4 items-center justify-center rounded-full bg-bg-3 text-text-2 shadow-xs hover:bg-fill-2 hover:text-text-1"
-              aria-label={image.fileName}
+              className="absolute -top-3 -right-3 min-h-11 min-w-11"
+              aria-label={`${t("actions.remove")}: ${image.fileName}`}
               data-testid="mobile-composer-image-remove"
-            >
-              <HugeiconsIcon
-                icon={Cancel01Icon}
-                data-icon="x"
-                size={10}
-                strokeWidth={2.5}
-              />
-            </Button>
+              icon={
+                <span className="flex h-5 w-5 items-center justify-center rounded-full bg-bg-3 shadow-xs">
+                  <HugeiconsIcon
+                    icon={Cancel01Icon}
+                    data-icon="x"
+                    size={10}
+                    strokeWidth={2.5}
+                  />
+                </span>
+              }
+            />
           </div>
         ))}
       </div>
diff --git a/src/modules/MobileRemote/components/composer/MobileModelListDropdown.test.ts b/src/modules/MobileRemote/components/composer/MobileModelListDropdown.test.ts
new file mode 100644
index 0000000000..f4e5bf3764
--- /dev/null
+++ b/src/modules/MobileRemote/components/composer/MobileModelListDropdown.test.ts
@@ -0,0 +1,214 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+
+import { MobileRemotePlatformProvider } from "../../platform";
+import { createBrowserMobileRemotePlatform } from "../../platform/browser";
+import { MobileModelListDropdown } from "./MobileModelListDropdown";
+
+vi.mock("@src/components/ModelIcon", () => ({
+  default: () => React.createElement("svg"),
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+let root: ReturnType<typeof createRoot>;
+let host: HTMLDivElement;
+let anchor: HTMLButtonElement;
+const platform = createBrowserMobileRemotePlatform();
+const TestProvider = MobileRemotePlatformProvider as React.ComponentType<
+  React.PropsWithChildren<{ platform: typeof platform }>
+>;
+const originalScroll = Object.getOwnPropertyDescriptor(
+  HTMLElement.prototype,
+  "scrollIntoView"
+);
+const options = [
+  { id: "gpt-5.6-sol", accountId: "a", accountLabel: "Account A" },
+  { id: "gpt-5.6-sol", accountId: "b", accountLabel: "Account B" },
+];
+beforeEach(() => {
+  vi.useFakeTimers();
+  Object.defineProperty(HTMLElement.prototype, "scrollIntoView", {
+    configurable: true,
+    value: vi.fn(),
+  });
+  (
+    globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
+  ).IS_REACT_ACT_ENVIRONMENT = true;
+  host = document.createElement("div");
+  anchor = document.createElement("button");
+  document.body.append(anchor, host);
+  root = createRoot(host);
+  vi.spyOn(anchor, "getBoundingClientRect").mockReturnValue({
+    x: 12,
+    y: 600,
+    top: 600,
+    left: 12,
+    bottom: 640,
+    right: 180,
+    width: 168,
+    height: 40,
+    toJSON: () => ({}),
+  });
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  anchor.remove();
+  vi.useRealTimers();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+  if (originalScroll)
+    Object.defineProperty(
+      HTMLElement.prototype,
+      "scrollIntoView",
+      originalScroll
+    );
+  else Reflect.deleteProperty(HTMLElement.prototype, "scrollIntoView");
+});
+async function render(
+  overrides: Partial<React.ComponentProps<typeof MobileModelListDropdown>> = {}
+) {
+  await act(async () =>
+    root.render(
+      React.createElement(
+        TestProvider,
+        { platform },
+        React.createElement(MobileModelListDropdown, {
+          anchorRef: { current: anchor },
+          open: true,
+          onClose: vi.fn(),
+          options,
+          allOptions: [
+            ...options,
+            {
+              id: "gpt-5.6-sol-high",
+              accountId: "a",
+              accountLabel: "Account A",
+            },
+          ],
+          currentModelId: "gpt-5.6-sol-high",
+          currentAccountId: "a",
+          loadingLabel: "Loading models",
+          emptyLabel: "No models",
+          onSelect: vi.fn(),
+          ...overrides,
+        })
+      )
+    )
+  );
+  await act(async () => vi.advanceTimersByTimeAsync(64));
+}
+
+it("reuses selected model rows, preserves account/family selection and commits keyboard selection once", async () => {
+  const onSelect = vi.fn();
+  await render({ onSelect });
+  const rows = document.querySelectorAll<HTMLElement>('[role="option"]');
+  expect(rows).toHaveLength(2);
+  expect(rows[0].tagName).toBe("DIV");
+  expect(rows[0].getAttribute("aria-selected")).toBe("true");
+  expect(rows[1].getAttribute("aria-selected")).toBe("false");
+  expect(rows[0].querySelector('[data-icon="check"]')).not.toBeNull();
+  const input = document.querySelector("input")!;
+  await act(async () =>
+    input.dispatchEvent(
+      new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true })
+    )
+  );
+  await act(async () =>
+    input.dispatchEvent(
+      new KeyboardEvent("keydown", { key: "Enter", bubbles: true })
+    )
+  );
+  expect(onSelect).toHaveBeenCalledOnce();
+  expect(onSelect).toHaveBeenCalledWith(options[0]);
+});
+
+it("blocks selection while patching and retains shared search, empty and close behavior", async () => {
+  const onSelect = vi.fn();
+  await render({ patching: true, onSelect });
+  const row = document.querySelector<HTMLElement>('[role="option"]')!;
+  expect(row.getAttribute("aria-disabled")).toBe("true");
+  await act(async () => row.click());
+  await act(async () =>
+    document
+      .querySelector("input")!
+      .dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Enter", bubbles: true })
+      )
+  );
+  expect(onSelect).not.toHaveBeenCalled();
+  await render({ onSelect });
+  const input = document.querySelector("input")!;
+  await act(async () => {
+    Object.getOwnPropertyDescriptor(
+      HTMLInputElement.prototype,
+      "value"
+    )!.set!.call(input, "Account B");
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+  });
+  expect(document.querySelectorAll('[role="option"]')).toHaveLength(1);
+  await act(async () =>
+    document.querySelector<HTMLElement>('[role="option"]')!.click()
+  );
+  expect(onSelect).toHaveBeenCalledOnce();
+  expect(onSelect).toHaveBeenCalledWith(options[1]);
+  await render({ options: [], loading: true });
+  expect(document.querySelector('[role="listbox"]')?.textContent).toContain(
+    "Loading models"
+  );
+  await render({ options: [], loading: false });
+  expect(document.querySelector('[role="listbox"]')?.textContent).toContain(
+    "No models"
+  );
+  await render({ open: false });
+  expect(document.querySelector('[role="listbox"]')).toBeNull();
+});
+
+it("repositions an open intrinsic-width menu on resize without changing selection", async () => {
+  const onSelect = vi.fn();
+  await render({ onSelect });
+  const panel = document.querySelector<HTMLElement>(".mobile-model-menu")!;
+  expect(panel.style.width).toBe("");
+  expect(
+    panel.querySelector(".mobile-model-menu__label")?.textContent
+  ).toContain("Account A");
+  vi.spyOn(panel, "getBoundingClientRect").mockReturnValue({
+    x: 200,
+    y: 200,
+    top: 200,
+    bottom: 344,
+    left: 200,
+    right: 456,
+    width: 256,
+    height: 144,
+    toJSON: () => ({}),
+  });
+  vi.spyOn(anchor, "getBoundingClientRect").mockReturnValue({
+    x: 240,
+    y: 100,
+    top: 100,
+    bottom: 140,
+    left: 240,
+    right: 300,
+    width: 60,
+    height: 40,
+    toJSON: () => ({}),
+  });
+  vi.stubGlobal("innerWidth", 320);
+  vi.stubGlobal("innerHeight", 568);
+  await act(async () => {
+    window.dispatchEvent(new Event("resize"));
+    await vi.advanceTimersByTimeAsync(32);
+  });
+  expect(Number.parseFloat(panel.style.left) + 256).toBeLessThanOrEqual(320);
+  expect(panel.style.top).not.toBe(""); // flips below the now-high anchor
+  expect(
+    document.querySelector('[aria-selected="true"]')?.textContent
+  ).toContain("Account A");
+  expect(onSelect).not.toHaveBeenCalled();
+  await render({ open: false });
+  expect(document.querySelector(".mobile-model-menu")).toBeNull();
+});
diff --git a/src/modules/MobileRemote/components/composer/MobileModelListDropdown.tsx b/src/modules/MobileRemote/components/composer/MobileModelListDropdown.tsx
index 4c23f48230..aa9dc21954 100644
--- a/src/modules/MobileRemote/components/composer/MobileModelListDropdown.tsx
+++ b/src/modules/MobileRemote/components/composer/MobileModelListDropdown.tsx
@@ -2,25 +2,22 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 
 import Button from "@src/components/Button";
+import DropdownItem from "@src/components/Dropdown/DropdownItem";
+import DropdownPanel from "@src/components/Dropdown/DropdownPanel";
 import DropdownSearch from "@src/components/Dropdown/DropdownSearch";
 import {
   DROPDOWN_CLASSES,
-  DROPDOWN_ITEM,
   DROPDOWN_PANEL,
 } from "@src/components/Dropdown/tokens";
 import ModelIcon from "@src/components/ModelIcon";
 import { useDropdownEngine } from "@src/hooks/dropdown";
 import { useFilteredItems } from "@src/hooks/search";
-import { HugeiconsIcon, Tick01Icon } from "@src/icons";
 import type { MobileModelOption } from "@src/modules/MobileRemote/connection/types";
 import { useMobileRemotePlatform } from "@src/modules/MobileRemote/platform";
 import { formatModelName } from "@src/util/formatModelName";
-import { getViewportSize } from "@src/util/ui/window/viewport";
 
 import { mobileModelOptionsShareFamily } from "./collapseMobileModelOptions";
-
-const DROPDOWN_WIDTH = 380;
-const VIEWPORT_MARGIN = 12;
+import "./mobileComposerResponsive.scss";
 
 function formatModelLabel(modelId: string): string {
   return formatModelName(modelId) || modelId;
@@ -36,6 +33,9 @@ export interface MobileModelListDropdownProps {
   currentModelId?: string;
   currentAccountId?: string;
   loading?: boolean;
+  error?: string;
+  onRetry?: () => void;
+  retryLabel?: string;
   patching?: boolean;
   loadingLabel: string;
   emptyLabel: string;
@@ -52,6 +52,9 @@ export function MobileModelListDropdown({
   currentModelId,
   currentAccountId,
   loading = false,
+  error,
+  onRetry,
+  retryLabel,
   patching = false,
   loadingLabel,
   emptyLabel,
@@ -97,7 +100,7 @@ export function MobileModelListDropdown({
     onOpenChange: (nextOpen) => {
       if (!nextOpen) onClose();
     },
-    placement: "top",
+    placement: "auto",
     gap: DROPDOWN_PANEL.triggerGap,
     listNavigation: {
       items: filteredItems,
@@ -114,28 +117,17 @@ export function MobileModelListDropdown({
 
   if (!open || !isPositioned || !portalContainer) return null;
 
-  const { width: viewportWidth } = getViewportSize();
-  const panelWidth = Math.min(
-    DROPDOWN_WIDTH,
-    viewportWidth - VIEWPORT_MARGIN * 2
-  );
-  const left = Math.max(
-    VIEWPORT_MARGIN,
-    Math.min(panelPosition.left, viewportWidth - VIEWPORT_MARGIN - panelWidth)
-  );
-
   return createPortal(
-    <div
+    <DropdownPanel
       ref={panelRef}
       role="listbox"
       aria-label={loadingLabel}
       data-testid="mobile-model-picker-dropdown"
-      className={`${DROPDOWN_CLASSES.panelAnimated} fixed flex flex-col overflow-hidden p-1`}
+      className="mobile-model-menu fixed flex flex-col overflow-hidden p-1"
       style={{
         top: panelPosition.top,
         bottom: panelPosition.bottom,
-        left,
-        width: panelWidth,
+        left: panelPosition.left,
         maxHeight: panelPosition.maxHeight,
         visibility: isPositioned ? "visible" : "hidden",
       }}
@@ -151,7 +143,16 @@ export function MobileModelListDropdown({
         className={`${DROPDOWN_CLASSES.optionsContainerOverlay} min-h-0 flex-1`}
         style={{ maxHeight: panelPosition.maxHeight }}
       >
-        {filteredItems.length === 0 ? (
+        {error ? (
+          <div className={DROPDOWN_CLASSES.listMessage}>
+            <p role="alert">{error}</p>
+            {onRetry && (
+              <Button size="small" onClick={onRetry} disabled={loading}>
+                {retryLabel}
+              </Button>
+            )}
+          </div>
+        ) : filteredItems.length === 0 ? (
           <div className={DROPDOWN_CLASSES.listMessage}>
             {loading ? loadingLabel : emptyLabel}
           </div>
@@ -171,42 +172,35 @@ export function MobileModelListDropdown({
               );
             const showSelected = selected || selectedByFamily;
             const label = formatModelLabel(option.id);
+            const navigation = keyboard.getItemProps(index);
             return (
-              <Button
-                layout="custom"
-                appearance="custom"
+              <DropdownItem
                 key={`${option.accountId}:${option.id}`}
-                htmlType="button"
-                role="option"
                 disabled={patching}
-                {...keyboard.getItemProps(index)}
-                className={`${DROPDOWN_CLASSES.item} ${DROPDOWN_CLASSES.itemHover} w-full justify-start`}
+                dataDropdownItemIndex={index}
+                onClick={navigation.onClick}
+                onMouseEnter={navigation.onMouseEnter}
+                highlighted={
+                  navigation["data-dropdown-keyboard-highlight"] === "true"
+                }
+                selected={showSelected}
+                selectedCheckPlacement="icon"
+                fullWidth
+                className="min-h-11"
+                icon={<ModelIcon modelName={option.id} size={14} />}
               >
-                <span className="flex h-5 w-5 shrink-0 items-center justify-center text-text-1">
-                  {showSelected ? (
-                    <HugeiconsIcon
-                      icon={Tick01Icon}
-                      data-icon="check"
-                      size={DROPDOWN_ITEM.iconSize}
-                      strokeWidth={2.25}
-                      className="text-primary-6"
-                    />
-                  ) : (
-                    <ModelIcon modelName={option.id} size={14} />
-                  )}
-                </span>
-                <span className="flex min-w-0 flex-1 items-center gap-1.5 truncate overflow-hidden text-[13px]">
-                  {label}
+                <span className="mobile-model-menu__label">
+                  <span>{label}</span>
+                  <span className="mobile-type-caption text-text-3">
+                    {option.accountLabel}
+                  </span>
                 </span>
-                <span className="relative z-10 ml-1 shrink-0 truncate text-[12px] text-text-3">
-                  {option.accountLabel}
-                </span>
-              </Button>
+              </DropdownItem>
             );
           })
         )}
       </div>
-    </div>,
+    </DropdownPanel>,
     portalContainer
   );
 }
diff --git a/src/modules/MobileRemote/components/composer/MobileModelPicker.test.ts b/src/modules/MobileRemote/components/composer/MobileModelPicker.test.ts
index 491025b239..ce11b14b2e 100644
--- a/src/modules/MobileRemote/components/composer/MobileModelPicker.test.ts
+++ b/src/modules/MobileRemote/components/composer/MobileModelPicker.test.ts
@@ -161,6 +161,38 @@ async function renderPicker(
 }
 
 describe("MobileModelPicker", () => {
+  it("shows a catalog failure with retry while retaining the current model", async () => {
+    const retry = vi.fn();
+    await renderPicker({
+      open: true,
+      options: [],
+      error: "catalog unavailable",
+      onRetry: retry,
+    });
+    expect(document.querySelector('[role="alert"]')?.textContent).toBe(
+      "catalog unavailable"
+    );
+    const button = Array.from(document.querySelectorAll("button")).find(
+      (item) => item.textContent === "transcript.retry"
+    );
+    expect(button).toBeDefined();
+    await act(async () => button!.click());
+    expect(retry).toHaveBeenCalledOnce();
+    expect(host?.textContent).toContain("Sonnet");
+  });
+
+  it("keeps the shared settings trigger interactive while its catalog is loading", async () => {
+    const activate = vi.fn();
+    await renderPicker({ optionsLoading: true, onActivate: activate });
+    const trigger = host!.querySelector(
+      '[data-testid="mobile-model-picker-trigger"]'
+    )!;
+    expect(trigger.querySelector(".pointer-events-none")).toBeNull();
+    const button = trigger.querySelector("button")!;
+    await act(async () => button.focus());
+    expect(activate).toHaveBeenCalled();
+  });
+
   it("renders a desktop-style model pill with the formatted current model", async () => {
     await renderPicker();
     const trigger = host?.querySelector(
diff --git a/src/modules/MobileRemote/components/composer/MobileModelPicker.tsx b/src/modules/MobileRemote/components/composer/MobileModelPicker.tsx
index edddc98ef0..4584f6dcbc 100644
--- a/src/modules/MobileRemote/components/composer/MobileModelPicker.tsx
+++ b/src/modules/MobileRemote/components/composer/MobileModelPicker.tsx
@@ -27,6 +27,10 @@ export interface MobileModelPickerProps {
   config: MobileSessionModelConfig | null;
   options: MobileModelOption[];
   loading?: boolean;
+  optionsLoading?: boolean;
+  error?: string;
+  onActivate?: () => void;
+  onRetry?: () => void;
   patching?: boolean;
   disabled?: boolean;
   /** When true, render inline in the composer footer without outer padding. */
@@ -65,6 +69,10 @@ export function MobileModelPicker({
   config,
   options,
   loading = false,
+  optionsLoading = false,
+  error,
+  onActivate,
+  onRetry,
   patching = false,
   disabled = false,
   embedded = false,
@@ -159,6 +167,9 @@ export function MobileModelPicker({
       <div
         className={triggerWrapperClass}
         data-testid="mobile-model-picker-trigger"
+        // Observe intent on the shared button, including its advanced menu.
+        onPointerDownCapture={onActivate}
+        onFocusCapture={onActivate}
       >
         <ModelSelectorPill
           ref={pillRef}
@@ -172,6 +183,7 @@ export function MobileModelPicker({
           effortSegmentOverride={effortSegment}
           preferCombinedSettingsMenu
           settingsMenuDefaultAdvanced
+          settingsMenuClassName="mobile-model-settings-menu"
           dataTestId="mobile-model-picker-pill"
           ariaLabel={t("modelPicker.selectModel")}
           isActiveSession
@@ -186,8 +198,11 @@ export function MobileModelPicker({
         allOptions={options}
         currentModelId={currentModelId}
         currentAccountId={config.accountId}
-        loading={loading}
+        loading={loading || optionsLoading}
         patching={patching}
+        error={error}
+        onRetry={onRetry}
+        retryLabel={t("transcript.retry")}
         loadingLabel={t("modelPicker.loading")}
         emptyLabel={t("modelPicker.empty")}
         onSelect={handleSelectOption}
diff --git a/src/modules/MobileRemote/components/composer/mobileComposerDraftStore.test.ts b/src/modules/MobileRemote/components/composer/mobileComposerDraftStore.test.ts
new file mode 100644
index 0000000000..5a81251552
--- /dev/null
+++ b/src/modules/MobileRemote/components/composer/mobileComposerDraftStore.test.ts
@@ -0,0 +1,71 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  MOBILE_DRAFT_IMAGE_BUDGET,
+  MOBILE_DRAFT_LIMIT,
+  MOBILE_DRAFT_TEXT_LIMIT,
+  createMobileComposerDraftStore,
+} from "./mobileComposerDraftStore";
+
+describe("navigation draft ownership", () => {
+  it("isolates desktop/session, revokes only one desktop and rejects its late completion", () => {
+    const store = createMobileComposerDraftStore();
+    const one = store.scope(JSON.stringify(["one", "session"]));
+    const two = store.scope(JSON.stringify(["two", "session"]));
+    one.update((draft) => ({ ...draft, text: "one" }));
+    two.update((draft) => ({ ...draft, text: "two" }));
+    const old = one.capture();
+    store.clearDesktop("one");
+    one.update((draft) => ({ ...draft, text: "new pairing" }));
+    one.updateIfCurrent(old, (draft) => ({ ...draft, text: "stale" }));
+    expect(one.getSnapshot().text).toBe("new pairing");
+    expect(two.getSnapshot().text).toBe("two");
+    store.clear();
+    expect(two.getSnapshot().text).toBe("");
+  });
+
+  it("bounds inactive entries and protects the subscribed composer", () => {
+    const store = createMobileComposerDraftStore();
+    const active = store.scope("active");
+    const unsub = active.subscribe(() => undefined);
+    active.update((draft) => ({ ...draft, text: "typing" }));
+    for (let index = 0; index < MOBILE_DRAFT_LIMIT + 5; index++) {
+      store
+        .scope(String(index))
+        .update((draft) => ({ ...draft, text: String(index) }));
+    }
+    expect(active.getSnapshot().text).toBe("typing");
+    expect(store.scope("0").getSnapshot().text).toBe("");
+    expect(store.scope("24").getSnapshot().text).toBe("24");
+    unsub();
+  });
+
+  it("enforces text and aggregate image bounds without truncating active data", () => {
+    const store = createMobileComposerDraftStore();
+    const one = store.scope("one");
+    one.update((draft) => ({ ...draft, text: "keep" }));
+    expect(() =>
+      one.update((draft) => ({
+        ...draft,
+        text: "x".repeat(MOBILE_DRAFT_TEXT_LIMIT + 1),
+      }))
+    ).toThrow(RangeError);
+    expect(one.getSnapshot().text).toBe("keep");
+    const image = {
+      id: "image",
+      fileName: "",
+      dataUrl: "x".repeat(MOBILE_DRAFT_IMAGE_BUDGET / 4 + 1),
+    };
+    one.update((draft) => ({ ...draft, images: [image] }));
+    const two = store.scope("two");
+    two.update((draft) => ({ ...draft, images: [image] }));
+    expect(one.getSnapshot().images).toHaveLength(0);
+    expect(two.getSnapshot().images).toHaveLength(1);
+    const unsub = two.subscribe(() => undefined);
+    expect(() =>
+      one.update((draft) => ({ ...draft, images: [image] }))
+    ).toThrow(RangeError);
+    expect(two.getSnapshot().images).toHaveLength(1);
+    unsub();
+  });
+});
diff --git a/src/modules/MobileRemote/components/composer/mobileComposerDraftStore.ts b/src/modules/MobileRemote/components/composer/mobileComposerDraftStore.ts
new file mode 100644
index 0000000000..cae31f6131
--- /dev/null
+++ b/src/modules/MobileRemote/components/composer/mobileComposerDraftStore.ts
@@ -0,0 +1,178 @@
+import { MAX_CHAT_IMAGES } from "@src/store/ui/chatImageAtom";
+
+import type {
+  MobileConnectionConfig,
+  MobileConnectionState,
+} from "../../connection/types";
+
+export interface MobileComposerImage {
+  id: string;
+  dataUrl: string;
+  fileName: string;
+}
+
+export const MOBILE_DRAFT_LIMIT = 20;
+export const MOBILE_DRAFT_TEXT_LIMIT = 100_000;
+export const MOBILE_DRAFT_IMAGE_BUDGET = 16 * 1024 * 1024;
+
+export interface MobileComposerDraft {
+  text: string;
+  textRevision: number;
+  images: MobileComposerImage[];
+  processing: boolean;
+  submitting: boolean;
+  imageError?: string;
+  submitError?: string;
+}
+
+const EMPTY: MobileComposerDraft = {
+  text: "",
+  textRevision: 0,
+  images: [],
+  processing: false,
+  submitting: false,
+};
+interface Entry {
+  snapshot: MobileComposerDraft;
+}
+type Update = (draft: MobileComposerDraft) => MobileComposerDraft;
+const imageSize = (draft: MobileComposerDraft) =>
+  draft.images.reduce(
+    (size, image) => size + 2 * (image.dataUrl.length + image.fileName.length),
+    0
+  );
+
+export function mobileComposerDesktopScope(
+  config: MobileConnectionConfig | null,
+  connection: Pick<MobileConnectionState, "desktopId">
+) {
+  let endpoint = "";
+  try {
+    if (config?.wsUrl) {
+      const url = new URL(config.wsUrl);
+      endpoint = `${url.origin}${url.pathname}`;
+    }
+  } catch {
+    // Invalid configs cannot connect, but must not share another config's draft.
+    // This key remains private in memory (never logged or persisted).
+    endpoint = JSON.stringify(["invalid-endpoint", config?.wsUrl]);
+  }
+  return JSON.stringify([
+    config?.desktopId ?? connection.desktopId,
+    endpoint,
+    config?.host,
+    config?.port,
+  ]);
+}
+
+/** Memory-only navigation drafts. Never persisted to disk or sent to Cloud. */
+export function createMobileComposerDraftStore() {
+  const entries = new Map<string, Entry>();
+  const listeners = new Map<string, Set<() => void>>();
+  const notify = (key: string) => listeners.get(key)?.forEach((fn) => fn());
+  const remove = (key: string) => {
+    entries.delete(key);
+    notify(key);
+  };
+  const imageBytes = () =>
+    Array.from(entries.values()).reduce(
+      (total, entry) => total + imageSize(entry.snapshot),
+      0
+    );
+  const trim = (currentKey: string) => {
+    for (const key of entries.keys()) {
+      if (
+        entries.size <= MOBILE_DRAFT_LIMIT &&
+        imageBytes() <= MOBILE_DRAFT_IMAGE_BUDGET
+      )
+        break;
+      if (key !== currentKey && !listeners.has(key)) remove(key);
+    }
+  };
+  const ensure = (key: string) => {
+    let entry = entries.get(key);
+    if (!entry) {
+      entry = { snapshot: EMPTY };
+      entries.set(key, entry);
+      trim(key);
+      if (entries.size > MOBILE_DRAFT_LIMIT) {
+        entries.delete(key);
+        throw new RangeError("Too many active mobile drafts");
+      }
+    }
+    return entry;
+  };
+  const write = (key: string, entry: Entry, update: Update) => {
+    if (entries.get(key) !== entry) return;
+    const next = update(entry.snapshot);
+    const protectedImageBytes = Array.from(entries).reduce(
+      (size, [otherKey, other]) =>
+        size +
+        (otherKey !== key && listeners.has(otherKey)
+          ? imageSize(other.snapshot)
+          : 0),
+      0
+    );
+    if (
+      next.text.length > MOBILE_DRAFT_TEXT_LIMIT ||
+      next.images.length > MAX_CHAT_IMAGES ||
+      imageSize(next) + protectedImageBytes > MOBILE_DRAFT_IMAGE_BUDGET
+    ) {
+      throw new RangeError("Mobile draft exceeds its memory budget");
+    }
+    entry.snapshot = {
+      ...next,
+      textRevision:
+        entry.snapshot.textRevision +
+        (next.text === entry.snapshot.text ? 0 : 1),
+    };
+    entries.delete(key);
+    entries.set(key, entry);
+    trim(key);
+    notify(key);
+  };
+  return {
+    clear() {
+      for (const key of Array.from(entries.keys())) remove(key);
+    },
+    clearDesktop(desktopScope: string) {
+      const prefix = `${JSON.stringify([desktopScope]).slice(0, -1)},`;
+      for (const key of Array.from(entries.keys()))
+        if (key.startsWith(prefix)) remove(key);
+    },
+    scope(key: string) {
+      return {
+        getSnapshot: () => entries.get(key)?.snapshot ?? EMPTY,
+        subscribe(fn: () => void) {
+          const entry = entries.get(key);
+          if (entry) {
+            entries.delete(key);
+            entries.set(key, entry);
+          }
+          let subscribers = listeners.get(key);
+          if (!subscribers) {
+            subscribers = new Set();
+            listeners.set(key, subscribers);
+          }
+          subscribers.add(fn);
+          return () => {
+            subscribers.delete(fn);
+            if (!subscribers.size) listeners.delete(key);
+          };
+        },
+        update: (update: Update) => write(key, ensure(key), update),
+        capture: () => ensure(key),
+        isCurrent: (entry: Entry) => entries.get(key) === entry,
+        updateIfCurrent: (entry: Entry, update: Update) =>
+          write(key, entry, update),
+      };
+    },
+  };
+}
+
+export type MobileComposerDraftStore = ReturnType<
+  typeof createMobileComposerDraftStore
+>;
+export type MobileComposerDraftHandle = ReturnType<
+  MobileComposerDraftStore["scope"]
+>;
diff --git a/src/modules/MobileRemote/components/composer/mobileComposerResponsive.scss b/src/modules/MobileRemote/components/composer/mobileComposerResponsive.scss
new file mode 100644
index 0000000000..4b6ec7fb63
--- /dev/null
+++ b/src/modules/MobileRemote/components/composer/mobileComposerResponsive.scss
@@ -0,0 +1,26 @@
+@use "../../mobileUiTokens" as mobile;
+
+.mobile-model-menu.mobile-model-menu {
+  @include mobile.adaptive-menu(16rem);
+
+  // Account names may be longer than model names. Keep their identity visible
+  // on a second line rather than allocating a non-shrinking suffix column.
+  .mobile-model-menu__label {
+    display: flex;
+    flex-direction: column;
+    gap: mobile.$space-1;
+  }
+}
+
+.mobile-model-settings-menu.mobile-model-settings-menu {
+  @include mobile.adaptive-menu(14rem);
+  max-height: calc(100dvh - #{mobile.$space-4 * 2});
+  overflow-y: auto;
+}
+
+[data-mobile-composer="true"] {
+  min-width: 0;
+  max-height: 55dvh;
+  overflow-y: auto;
+  overscroll-behavior: contain;
+}
diff --git a/src/modules/MobileRemote/components/composer/useMobileComposerImages.ts b/src/modules/MobileRemote/components/composer/useMobileComposerImages.ts
index f03c5e89f9..b3c74a6772 100644
--- a/src/modules/MobileRemote/components/composer/useMobileComposerImages.ts
+++ b/src/modules/MobileRemote/components/composer/useMobileComposerImages.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState } from "react";
+import { useCallback } from "react";
 import { useTranslation } from "react-i18next";
 
 import { prepareChatImageFile } from "@src/engines/ChatPanel/hooks/useInputArea/imageExtensions";
@@ -6,23 +6,26 @@ import type { MobileSendAttachment } from "@src/modules/MobileRemote/connection/
 import { MAX_CHAT_IMAGES } from "@src/store/ui/chatImageAtom";
 import { optimizeImage } from "@src/util/optimization/imageOptimizer";
 
-export interface MobileComposerImage {
-  id: string;
-  dataUrl: string;
-  fileName: string;
-}
+import { useMobileComposerDraft } from "./MobileComposerDraftContext";
+import { MOBILE_DRAFT_IMAGE_BUDGET } from "./mobileComposerDraftStore";
+import type {
+  MobileComposerDraftHandle,
+  MobileComposerImage,
+} from "./mobileComposerDraftStore";
 
-export function useMobileComposerImages() {
+export function useMobileComposerImages(
+  draftHandle?: MobileComposerDraftHandle
+) {
   const { t } = useTranslation("mobileRemote");
-  const [images, setImages] = useState<MobileComposerImage[]>([]);
-  const [processing, setProcessing] = useState(false);
-  const [error, setError] = useState<string>();
-  const imagesLengthRef = useRef(0);
-
-  imagesLengthRef.current = images.length;
+  const { handle, snapshot } = useMobileComposerDraft(undefined, draftHandle);
+  const { images, processing, imageError: error } = snapshot;
 
   const ingestFiles = useCallback(
     async (files: File[]) => {
+      if (handle.getSnapshot().processing) return;
+      const entry = handle.capture();
+      const setError = (imageError?: string) =>
+        handle.updateIfCurrent(entry, (draft) => ({ ...draft, imageError }));
       const validFiles = files
         .map(prepareChatImageFile)
         .filter((file): file is File => file !== null);
@@ -33,7 +36,7 @@ export function useMobileComposerImages() {
         return;
       }
 
-      const remaining = MAX_CHAT_IMAGES - imagesLengthRef.current;
+      const remaining = MAX_CHAT_IMAGES - handle.getSnapshot().images.length;
       if (remaining <= 0) {
         setError(
           t("composer.attachments.maxReached", { max: MAX_CHAT_IMAGES })
@@ -53,11 +56,15 @@ export function useMobileComposerImages() {
         setError(undefined);
       }
 
-      setProcessing(true);
+      handle.updateIfCurrent(entry, (draft) => ({
+        ...draft,
+        processing: true,
+      }));
       const newImages: MobileComposerImage[] = [];
 
       try {
         for (const file of filesToProcess) {
+          if (!handle.isCurrent(entry)) return;
           try {
             const result = await optimizeImage(file, {
               maxWidth: 1920,
@@ -65,6 +72,22 @@ export function useMobileComposerImages() {
               quality: 0.85,
               maxFileSizeBytes: 500 * 1024,
             });
+            if (!handle.isCurrent(entry)) return;
+            const retainedBytes = [
+              ...handle.getSnapshot().images,
+              ...newImages,
+            ].reduce(
+              (total, image) =>
+                total + 2 * (image.dataUrl.length + image.fileName.length),
+              0
+            );
+            if (
+              retainedBytes + 2 * (result.dataUrl.length + file.name.length) >
+              MOBILE_DRAFT_IMAGE_BUDGET
+            ) {
+              setError(t("composer.attachments.processFailed"));
+              continue;
+            }
             newImages.push({
               id: `mobile-img_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
               dataUrl: result.dataUrl,
@@ -76,28 +99,41 @@ export function useMobileComposerImages() {
         }
 
         if (newImages.length > 0) {
-          setImages((prev) => [...prev, ...newImages]);
+          try {
+            handle.updateIfCurrent(entry, (draft) => ({
+              ...draft,
+              images: [...draft.images, ...newImages].slice(0, MAX_CHAT_IMAGES),
+            }));
+          } catch {
+            setError(t("composer.attachments.processFailed"));
+          }
         }
       } finally {
-        setProcessing(false);
+        handle.updateIfCurrent(entry, (draft) => ({
+          ...draft,
+          processing: false,
+        }));
       }
     },
-    [t]
+    [handle, t]
   );
 
-  const removeImage = useCallback((id: string) => {
-    setImages((prev) => prev.filter((image) => image.id !== id));
-    setError(undefined);
-  }, []);
-
-  const clearImages = useCallback(() => {
-    setImages([]);
-    setError(undefined);
-  }, []);
+  const removeImage = useCallback(
+    (id: string) => {
+      handle.update((draft) => ({
+        ...draft,
+        images: draft.images.filter((image) => image.id !== id),
+        imageError: undefined,
+      }));
+    },
+    [handle]
+  );
 
   const toSendAttachments = useCallback((): MobileSendAttachment[] => {
-    return images.map(({ dataUrl, fileName }) => ({ dataUrl, fileName }));
-  }, [images]);
+    return handle
+      .getSnapshot()
+      .images.map(({ dataUrl, fileName }) => ({ dataUrl, fileName }));
+  }, [handle]);
 
   return {
     images,
@@ -106,7 +142,6 @@ export function useMobileComposerImages() {
     error,
     ingestFiles,
     removeImage,
-    clearImages,
     toSendAttachments,
   };
 }
diff --git a/src/modules/MobileRemote/components/modals/MobileConfirmModal.tsx b/src/modules/MobileRemote/components/modals/MobileConfirmModal.tsx
index c4dba6e5e6..9ebb7c2feb 100644
--- a/src/modules/MobileRemote/components/modals/MobileConfirmModal.tsx
+++ b/src/modules/MobileRemote/components/modals/MobileConfirmModal.tsx
@@ -42,6 +42,7 @@ export function MobileConfirmModal({
       visible
       title={title}
       size="small"
+      className="mobile-confirm-modal"
       closable={false}
       initialFocusRef={cancelRef}
       onClose={() => decide(false)}
@@ -66,7 +67,7 @@ export function MobileConfirmModal({
         </div>
       }
     >
-      <p className="text-sm leading-6 text-text-2">{description}</p>
+      <p className="mobile-type-secondary text-text-2">{description}</p>
     </Modal>
   );
 }
diff --git a/src/modules/MobileRemote/components/modals/StopConfirmModal.test.ts b/src/modules/MobileRemote/components/modals/StopConfirmModal.test.ts
new file mode 100644
index 0000000000..1088a70194
--- /dev/null
+++ b/src/modules/MobileRemote/components/modals/StopConfirmModal.test.ts
@@ -0,0 +1,48 @@
+// @vitest-environment jsdom
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+
+import { StopConfirmModal } from "./StopConfirmModal";
+
+vi.mock("@src/components/BottomSheet", () => ({
+  default: ({
+    open,
+    children,
+    footer,
+  }: {
+    open: boolean;
+    children: React.ReactNode;
+    footer: React.ReactNode;
+  }) => (open ? React.createElement("section", null, children, footer) : null),
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+describe("StopConfirmModal failure feedback", () => {
+  it("keeps a safe error and retry action visible after failure", () => {
+    const host = document.createElement("div");
+    host.innerHTML = renderToStaticMarkup(
+      React.createElement(StopConfirmModal, {
+        visible: true,
+        failed: true,
+      })
+    );
+    expect(host.querySelector('[role="alert"]')?.textContent).toBe(
+      "stopConfirm.failed"
+    );
+    expect(host.querySelectorAll("button")).toHaveLength(2);
+    expect(host.querySelectorAll("button:disabled")).toHaveLength(0);
+  });
+  it("does not show an old error after dismissing the modal", () => {
+    expect(
+      renderToStaticMarkup(
+        React.createElement(StopConfirmModal, {
+          visible: false,
+          failed: true,
+        })
+      )
+    ).toBe("");
+  });
+});
diff --git a/src/modules/MobileRemote/components/modals/StopConfirmModal.tsx b/src/modules/MobileRemote/components/modals/StopConfirmModal.tsx
index 66c58d2ebc..6d87c477b4 100644
--- a/src/modules/MobileRemote/components/modals/StopConfirmModal.tsx
+++ b/src/modules/MobileRemote/components/modals/StopConfirmModal.tsx
@@ -39,7 +39,7 @@ export function StopConfirmModal({
       onClose={handleCancel}
       bodyClassName="px-5 py-4"
       footer={
-        <div className="flex items-center justify-end gap-2 px-3 py-3">
+        <div className="flex flex-wrap items-center justify-end gap-2 px-3 py-3">
           <Button
             variant="tertiary"
             onClick={handleCancel}
@@ -58,7 +58,7 @@ export function StopConfirmModal({
         </div>
       }
     >
-      <div className="text-[13px] leading-5 text-text-3">
+      <div className="mobile-type-caption text-text-3">
         {t("stopConfirm.body")}
       </div>
       {failed ? (
diff --git a/src/modules/MobileRemote/components/profile/MobileAccountAvatar.tsx b/src/modules/MobileRemote/components/profile/MobileAccountAvatar.tsx
new file mode 100644
index 0000000000..733d3ede4e
--- /dev/null
+++ b/src/modules/MobileRemote/components/profile/MobileAccountAvatar.tsx
@@ -0,0 +1,38 @@
+import React, { useState } from "react";
+
+import PersonAvatar from "@src/components/PersonAvatar";
+
+/** Keep the shared person treatment, with a local fallback for failed profile photos. */
+export function MobileAccountAvatar({
+  name,
+  src,
+  size = 40,
+}: {
+  name: string;
+  src?: string;
+  size?: number;
+}) {
+  const [failedSrc, setFailedSrc] = useState<string>();
+  let photo: string | undefined;
+  try {
+    const url = new URL(src ?? "");
+    if (
+      url.protocol === "https:" &&
+      !url.username &&
+      !url.password &&
+      src !== failedSrc
+    )
+      photo = src;
+  } catch {
+    /* A missing or invalid photo uses the canonical initial avatar. */
+  }
+  return (
+    <span
+      className="inline-flex shrink-0"
+      aria-hidden="true"
+      onErrorCapture={() => setFailedSrc(src)}
+    >
+      <PersonAvatar name={name} src={photo} size={size} />
+    </span>
+  );
+}
diff --git a/src/modules/MobileRemote/components/profile/MobileProfileEntry.test.ts b/src/modules/MobileRemote/components/profile/MobileProfileEntry.test.ts
new file mode 100644
index 0000000000..e9145b0634
--- /dev/null
+++ b/src/modules/MobileRemote/components/profile/MobileProfileEntry.test.ts
@@ -0,0 +1,526 @@
+// @vitest-environment jsdom
+import { readFileSync } from "node:fs";
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import {
+  MobileAuthContext,
+  type MobileAuthContextValue,
+} from "../../auth/MobileAuthContext";
+import { SessionsScreen } from "../../screens/SessionsScreen";
+import { WelcomeScreen } from "../../screens/WelcomeScreen";
+import { MobileProfileEntry } from "./MobileProfileEntry";
+
+const mocks = vi.hoisted(() => ({ openExternal: vi.fn(), select: vi.fn() }));
+vi.mock("../../platform", () => ({
+  useMobileRemotePlatform: () => ({
+    openExternal: mocks.openExternal,
+    runtime: {
+      isHidden: () => false,
+      subscribeVisibility: () => () => {},
+    },
+  }),
+}));
+vi.mock("../../app", () => ({
+  useMobileRemote: () => ({
+    connection: {
+      status: "connected",
+      presence: "online",
+      desktopName: "Home Mac",
+    },
+    sessions: [
+      { id: "codexapp-one", name: "Keep this session", status: "idle" },
+    ],
+    sessionsHasMore: false,
+    loadMoreSessions: vi.fn(),
+  }),
+}));
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+let host: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+let auth: MobileAuthContextValue;
+const env = globalThis as typeof globalThis & {
+  IS_REACT_ACT_ENVIRONMENT?: boolean;
+};
+let previousAct: boolean | undefined;
+
+async function render(welcome = false) {
+  const profileAction = React.createElement(MobileProfileEntry);
+  await act(async () =>
+    root.render(
+      React.createElement(
+        MobileAuthContext.Provider,
+        { value: auth },
+        welcome
+          ? React.createElement(WelcomeScreen, { profileAction })
+          : React.createElement(SessionsScreen, {
+              profileAction,
+              onSelectSession: mocks.select,
+            })
+      )
+    )
+  );
+}
+function dialog() {
+  return document.querySelector<HTMLElement>('[role="dialog"]');
+}
+function button(label: string, scope: ParentNode = dialog() ?? host) {
+  const result = Array.from(
+    scope.querySelectorAll<HTMLButtonElement>("button")
+  ).find(
+    (item) =>
+      item.getAttribute("aria-label") === label || item.textContent === label
+  );
+  expect(result, label).toBeTruthy();
+  return result!;
+}
+async function click(label: string, scope?: ParentNode) {
+  await act(async () => button(label, scope).click());
+}
+async function open() {
+  button("profile.open", host).focus();
+  await click("profile.open", host);
+  await act(async () => vi.advanceTimersByTime(100));
+}
+
+beforeEach(() => {
+  previousAct = env.IS_REACT_ACT_ENVIRONMENT;
+  env.IS_REACT_ACT_ENVIRONMENT = true;
+  // Keep React/jsdom microtasks real; only count application timeout/interval work.
+  vi.useFakeTimers({
+    toFake: ["setTimeout", "clearTimeout", "setInterval", "clearInterval"],
+  });
+  mocks.openExternal.mockReset().mockResolvedValue(undefined);
+  mocks.select.mockReset();
+  auth = {
+    session: {
+      kind: "org2_cloud",
+      supabaseUrl: "https://cloud.example.test",
+      supabaseAnonKey: "anon",
+      userId: "private-user-id",
+      accessToken: "secret-access",
+      refreshToken: "secret-refresh",
+      expiresAt: 2_000_000_000,
+      profile: {
+        displayName: "Ada Lovelace",
+        primaryEmail: "ada@example.test",
+        avatarUrl: "https://images.example.test/ada.png",
+      },
+    },
+    signOut: vi.fn(),
+    isDevelopmentBypass: false,
+  };
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  // jsdom schedules selectionchange at 0 ms when focus moves. Drain only that
+  // browser bookkeeping, not Modal's 100 ms focus timer, which must be cancelled.
+  await act(async () => vi.advanceTimersByTime(1));
+  try {
+    expect(vi.getTimerCount()).toBe(0);
+  } finally {
+    vi.useRealTimers();
+    env.IS_REACT_ACT_ENVIRONMENT = previousAct;
+  }
+});
+
+describe("mobile Profile entry", () => {
+  it.each([false, true])(
+    "keeps the full avatar inside a circular shared Button in the %s welcome slot",
+    async (welcome) => {
+      await render(welcome);
+      const trigger = button("profile.open", host);
+      // Inspect the real Button's inline geometry and content wrappers. jsdom
+      // cannot measure WebKit layout, but catches the desktop defaults that
+      // overrode the mobile CSS and the label wrapper that clipped the avatar.
+      expect(trigger.classList.contains("button")).toBe(true);
+      expect(trigger.type).toBe("button");
+      expect(trigger.getAttribute("aria-haspopup")).toBe("dialog");
+      expect(trigger.style.width).toBe("var(--mobile-profile-trigger-size)");
+      expect(trigger.style.height).toBe("var(--mobile-profile-trigger-size)");
+      expect(trigger.style.borderRadius).toBe("50%");
+      expect(trigger.style.padding).toBe(
+        "var(--mobile-profile-trigger-padding)"
+      );
+      const styles = readFileSync(
+        "src/modules/MobileRemote/components/profile/mobileProfile.scss",
+        "utf8"
+      );
+      const geometry = styles.match(
+        /\.mobile-profile-trigger\s*\{([^}]+)\}/
+      )?.[1];
+      expect(geometry).toContain("--mobile-profile-trigger-size: 48px");
+      expect(geometry).toContain("--mobile-profile-trigger-padding: 3px");
+      expect(trigger.querySelector(".truncate")).toBeNull();
+      const avatar = trigger.querySelector<HTMLElement>(".rounded-full")!;
+      expect(avatar.style.width).toBe("40px");
+      expect(avatar.style.height).toBe("40px");
+      expect(avatar.classList.contains("shrink-0")).toBe(true);
+      expect(avatar.closest('[aria-hidden="true"]')).not.toBeNull();
+      const photo = avatar.querySelector("img")!;
+      expect(photo.getAttribute("src")).toBe(
+        "https://images.example.test/ada.png"
+      );
+      expect(photo.getAttribute("alt")).toBe("");
+      expect(photo.classList.contains("object-cover")).toBe(true);
+
+      if (!welcome) {
+        const header = trigger.closest("header")!;
+        expect(header.classList.contains("mobile-top-bar--root")).toBe(true);
+        expect(header.children[0].contains(trigger)).toBe(true);
+        expect(header.children[1].tagName).toBe("H1");
+        expect(header.children[1].textContent).toBe("tabs.sessions");
+        expect(header.children[2].querySelector("button")?.ariaLabel).toBe(
+          "sessions.viewOptions"
+        );
+      }
+
+      await act(async () => photo.dispatchEvent(new Event("error")));
+      expect(trigger.querySelector("img")).toBeNull();
+      expect(trigger.textContent).toBe("A");
+      expect(trigger.querySelector(".truncate")).toBeNull();
+      expect(
+        trigger.querySelector<HTMLElement>(".rounded-full")?.style.height
+      ).toBe("40px");
+      await open();
+      expect(dialog()?.getAttribute("aria-label")).toBe("profile.title");
+      await click("profile.close");
+      expect(document.activeElement).toBe(trigger);
+    }
+  );
+
+  it.each([false, true])(
+    "opens from the %s welcome slot without starting navigation",
+    async (welcome) => {
+      await render(welcome);
+      expect(dialog()).toBeNull();
+      await open();
+      expect(dialog()?.getAttribute("aria-label")).toBe("profile.title");
+      expect(dialog()?.textContent).toContain("Ada Lovelace");
+      expect(dialog()?.textContent).toContain("ada@example.test");
+      expect(dialog()?.textContent).not.toContain("private-user-id");
+      expect(dialog()?.innerHTML).not.toMatch(/secret-access|secret-refresh/);
+      expect(document.activeElement).toBe(button("profile.close"));
+      expect(mocks.openExternal).not.toHaveBeenCalled();
+      expect(mocks.select).not.toHaveBeenCalled();
+      await click("profile.close");
+      expect(dialog()).toBeNull();
+      expect(document.activeElement).toBe(button("profile.open", host));
+      if (!welcome) expect(host.textContent).toContain("Keep this session");
+    }
+  );
+
+  it("supports help/back, Escape, mask close and repeated open/close without retained timers", async () => {
+    await render();
+    for (let index = 0; index < 3; index += 1) {
+      await open();
+      await click("profile.help");
+      expect(dialog()?.textContent).toContain("profile.pairingStep1");
+      await click("profile.back");
+      expect(dialog()?.textContent).toContain("Ada Lovelace");
+      await act(async () =>
+        document.dispatchEvent(
+          new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
+        )
+      );
+      expect(dialog()).toBeNull();
+      expect(document.body.style.overflow).toBe("");
+      await act(async () => vi.advanceTimersByTime(1));
+      expect(vi.getTimerCount()).toBe(0);
+    }
+    await open();
+    await act(async () =>
+      document
+        .querySelector(".liquid-modal-mask")!
+        .dispatchEvent(new MouseEvent("click", { bubbles: true }))
+    );
+    expect(dialog()).toBeNull();
+  });
+
+  it("traps keyboard focus within the profile", async () => {
+    await render();
+    await open();
+    const first = button("profile.close");
+    const last = button("settings.deleteAccount");
+    last.focus();
+    await act(async () =>
+      last.dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Tab", bubbles: true })
+      )
+    );
+    expect(document.activeElement).toBe(first);
+    await act(async () =>
+      first.dispatchEvent(
+        new KeyboardEvent("keydown", {
+          key: "Tab",
+          shiftKey: true,
+          bubbles: true,
+        })
+      )
+    );
+    expect(document.activeElement).toBe(last);
+  });
+
+  it("moves focus from the removed Help row to Back and keeps Tab within Help", async () => {
+    await render();
+    await open();
+    button("profile.help").focus();
+    await click("profile.help");
+    const back = button("profile.back");
+    expect(document.activeElement).toBe(back);
+    for (const shiftKey of [false, true]) {
+      await act(async () =>
+        back.dispatchEvent(
+          new KeyboardEvent("keydown", {
+            key: "Tab",
+            shiftKey,
+            bubbles: true,
+          })
+        )
+      );
+      expect(document.activeElement).toBe(back);
+    }
+    expect(dialog()?.textContent).toContain("profile.pairingStep1");
+    expect(mocks.openExternal).not.toHaveBeenCalled();
+  });
+
+  it("cancels initial focus when closed immediately and preserves the next overlay", async () => {
+    await render();
+    // Settle the closed session-menu positioning frame before measuring the
+    // profile overlay's own timer cleanup.
+    await act(async () => vi.advanceTimersByTime(20));
+    const trigger = button("profile.open", host);
+    trigger.focus();
+    await click("profile.open", host);
+    expect(dialog()).not.toBeNull();
+    // Close before Modal's deferred initial-focus callback can run.
+    await click("profile.close");
+    await act(async () => vi.advanceTimersByTime(1));
+    expect(dialog()).toBeNull();
+    expect(document.activeElement).toBe(trigger);
+    expect(document.body.style.overflow).toBe("");
+    expect(vi.getTimerCount()).toBe(0);
+
+    await open();
+    expect(document.activeElement).toBe(button("profile.close"));
+    expect(document.querySelectorAll('[role="dialog"]')).toHaveLength(1);
+    expect(auth.signOut).not.toHaveBeenCalled();
+    expect(mocks.openExternal).not.toHaveBeenCalled();
+  });
+
+  it("reuses the confirmation dialog and signs out once only after overlay cleanup", async () => {
+    await render();
+    await open();
+    await click("settings.signOut");
+    expect(document.querySelectorAll('[role="dialog"]')).toHaveLength(1);
+    expect(dialog()?.getAttribute("aria-label")).toBe(
+      "settings.signOutConfirmTitle"
+    );
+    expect(auth.signOut).not.toHaveBeenCalled();
+    await click("settings.cancel");
+    expect(dialog()?.getAttribute("aria-label")).toBe("profile.title");
+    await click("settings.signOut");
+    vi.mocked(auth.signOut).mockImplementation(() => {
+      expect(dialog()).toBeNull();
+      expect(document.body.style.overflow).toBe("");
+    });
+    const confirm = button("settings.signOut");
+    await act(async () => {
+      confirm.click();
+      confirm.click();
+    });
+    expect(auth.signOut).toHaveBeenCalledTimes(1);
+  });
+
+  it("opens only official credential-free pages, exposes failure, and allows retry", async () => {
+    mocks.openExternal.mockRejectedValueOnce(new Error("secret server detail"));
+    await render();
+    await open();
+    await click("settings.manageAccount");
+    expect(dialog()?.querySelector('[role="alert"]')?.textContent).toContain(
+      "settings.openFailed"
+    );
+    expect(dialog()?.textContent).not.toContain("secret server detail");
+    await click("settings.privacyPolicy");
+    expect(dialog()?.querySelector('[role="alert"]')).toBeNull();
+    await click("profile.terms");
+    await click("settings.deleteAccount");
+    expect(mocks.openExternal.mock.calls.map(([url]) => url)).toEqual([
+      "https://org2-cloud-infra.vercel.app/account",
+      "https://org2-cloud-infra.vercel.app/legal/privacy",
+      "https://org2-cloud-infra.vercel.app/legal/terms",
+      "https://org2-cloud-infra.vercel.app/account",
+    ]);
+    expect(auth.signOut).not.toHaveBeenCalled();
+    expect(dialog()?.textContent).toContain("profile.deleteHint");
+  });
+
+  it("single-flights navigation and ignores a failed completion after close/reopen", async () => {
+    let reject!: (error: Error) => void;
+    mocks.openExternal.mockImplementationOnce(
+      () =>
+        new Promise((_, fail) => {
+          reject = fail;
+        })
+    );
+    await render();
+    await open();
+    const manage = button("settings.manageAccount");
+    await act(async () => {
+      manage.click();
+      manage.click();
+    });
+    expect(mocks.openExternal).toHaveBeenCalledTimes(1);
+    expect(button("settings.privacyPolicy").disabled).toBe(true);
+    expect(dialog()?.querySelector('[role="status"]')).not.toBeNull();
+    await click("profile.close");
+    await open();
+    await act(async () => reject(new Error("late failure")));
+    expect(dialog()?.querySelector('[role="alert"]')).toBeNull();
+    expect(button("settings.manageAccount").disabled).toBe(false);
+    await click("settings.manageAccount");
+    expect(mocks.openExternal).toHaveBeenCalledTimes(2);
+  });
+
+  it("clears old account intent and profile when identity changes", async () => {
+    await render();
+    await open();
+    await click("settings.signOut");
+    const oldSignOut = auth.signOut;
+    auth = {
+      ...auth,
+      session: {
+        ...auth.session,
+        userId: "other",
+        profile: { displayName: "Grace" },
+      },
+      signOut: vi.fn(),
+    };
+    await render();
+    expect(dialog()).toBeNull();
+    await open();
+    expect(dialog()?.textContent).toContain("Grace");
+    expect(dialog()?.textContent).not.toContain("Ada Lovelace");
+    expect(oldSignOut).not.toHaveBeenCalled();
+    expect(auth.signOut).not.toHaveBeenCalled();
+  });
+
+  it.each(["resolve", "reject"] as const)(
+    "isolates the same user's new endpoint from a pending old request that will %s",
+    async (outcome) => {
+      let settle!: () => void;
+      mocks.openExternal.mockImplementationOnce(
+        () =>
+          new Promise<void>((resolve, reject) => {
+            settle = () =>
+              outcome === "resolve"
+                ? resolve()
+                : reject(new Error("old endpoint failure"));
+          })
+      );
+      await render();
+      await open();
+      await click("settings.manageAccount");
+      expect(button("settings.manageAccount").disabled).toBe(true);
+
+      auth = {
+        ...auth,
+        session: {
+          ...auth.session,
+          supabaseUrl: "https://other-cloud.example.test",
+          profile: { displayName: "New endpoint profile" },
+        },
+      };
+      await render();
+      expect(dialog()).toBeNull();
+      expect(document.body.style.overflow).toBe("");
+      await open();
+      expect(dialog()?.textContent).toContain("New endpoint profile");
+      expect(dialog()?.textContent).not.toContain("Ada Lovelace");
+      expect(button("settings.manageAccount").disabled).toBe(false);
+
+      await act(async () => settle());
+      expect(dialog()?.querySelector('[role="alert"]')).toBeNull();
+      expect(dialog()?.querySelector('[role="status"]')).toBeNull();
+      await click("settings.manageAccount");
+      expect(mocks.openExternal).toHaveBeenCalledTimes(2);
+      expect(auth.signOut).not.toHaveBeenCalled();
+    }
+  );
+
+  it.each([
+    "not a URL",
+    "/avatar.png",
+    "http://images.example.test/ada.png",
+    "javascript:alert(1)",
+    "data:image/png;base64,aGVsbG8=",
+    "https://username:password@images.example.test/ada.png",
+    "https://username@images.example.test/ada.png",
+  ])("never renders an unsafe profile photo: %s", async (avatarUrl) => {
+    auth = {
+      ...auth,
+      session: {
+        ...auth.session,
+        profile: { ...auth.session.profile, avatarUrl },
+      },
+    };
+    await render();
+    const trigger = button("profile.open", host);
+    expect(trigger.querySelector("img")).toBeNull();
+    expect(trigger.textContent).toBe("A");
+    await open();
+    expect(dialog()?.querySelector("img")).toBeNull();
+    expect(dialog()?.textContent).toContain("Ada Lovelace");
+    expect(dialog()?.innerHTML).not.toContain(avatarUrl);
+    expect(mocks.openExternal).not.toHaveBeenCalled();
+  });
+
+  it("shows a safe initial for missing or failed photos and retries a changed photo", async () => {
+    await render();
+    const trigger = button("profile.open", host);
+    await act(async () =>
+      trigger.querySelector("img")!.dispatchEvent(new Event("error"))
+    );
+    expect(trigger.querySelector("img")).toBeNull();
+    expect(trigger.textContent).toBe("A");
+    auth = {
+      ...auth,
+      session: {
+        ...auth.session,
+        profile: {
+          ...auth.session.profile,
+          avatarUrl: "https://images.example.test/new.png",
+        },
+      },
+    };
+    await render();
+    expect(trigger.querySelector("img")?.getAttribute("src")).toContain(
+      "new.png"
+    );
+    auth = { ...auth, session: { ...auth.session, profile: undefined } };
+    await render();
+    await open();
+    expect(dialog()?.textContent).toContain("profile.fallbackName");
+    expect(dialog()?.textContent).not.toContain("private-user-id");
+  });
+
+  it("does not offer fake account actions in development bypass", async () => {
+    auth = { ...auth, isDevelopmentBypass: true };
+    await render();
+    await open();
+    expect(dialog()?.textContent).toContain("profile.development");
+    expect(dialog()?.textContent).not.toContain("settings.signOut");
+    expect(dialog()?.textContent).not.toContain("settings.deleteAccount");
+    expect(dialog()?.textContent).not.toContain("settings.manageAccount");
+    await click("profile.help");
+    expect(dialog()?.textContent).toContain("profile.connectionHelp");
+  });
+});
diff --git a/src/modules/MobileRemote/components/profile/MobileProfileEntry.tsx b/src/modules/MobileRemote/components/profile/MobileProfileEntry.tsx
new file mode 100644
index 0000000000..a89168f5b3
--- /dev/null
+++ b/src/modules/MobileRemote/components/profile/MobileProfileEntry.tsx
@@ -0,0 +1,117 @@
+import React, { useRef, useState } from "react";
+import { flushSync } from "react-dom";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import { ArrowRight02Icon, HugeiconsIcon } from "@src/icons";
+
+import { useMobileAuth } from "../../auth/MobileAuthContext";
+import { MobileConfirmModal } from "../modals/MobileConfirmModal";
+import { MobileAccountAvatar } from "./MobileAccountAvatar";
+import { MobileProfileSheet } from "./MobileProfileSheet";
+import "./mobileProfile.scss";
+
+export function MobileProfileEntry({
+  variant = "avatar",
+}: {
+  variant?: "avatar" | "row";
+}) {
+  const { session } = useMobileAuth();
+  // A changed account/endpoint drops all old overlay intent before any action can fire.
+  return (
+    <ProfileEntry
+      key={JSON.stringify([session.supabaseUrl, session.userId])}
+      variant={variant}
+    />
+  );
+}
+
+function ProfileEntry({ variant }: { variant: "avatar" | "row" }) {
+  const { t } = useTranslation("mobileRemote");
+  const { session, signOut, isDevelopmentBypass } = useMobileAuth();
+  const [view, setView] = useState<"closed" | "profile" | "sign_out">("closed");
+  const trigger = useRef<HTMLButtonElement>(null);
+  const name =
+    session.profile?.displayName?.trim() ||
+    session.profile?.primaryEmail?.trim() ||
+    t("profile.fallbackName");
+  const close = () => {
+    flushSync(() => setView("closed"));
+    trigger.current?.focus();
+  };
+  return (
+    <>
+      {variant === "row" ? (
+        <Button
+          ref={trigger}
+          htmlType="button"
+          variant="tertiary"
+          appearance="ghost"
+          long
+          className="mobile-profile-settings-entry"
+          style={{ height: "auto", minHeight: 64, padding: "12px 0" }}
+          aria-label={t("profile.open")}
+          aria-haspopup="dialog"
+          onClick={() => setView("profile")}
+        >
+          <span className="flex w-full min-w-0 items-center gap-3 text-left">
+            <MobileAccountAvatar name={name} src={session.profile?.avatarUrl} />
+            <span className="min-w-0 flex-1">
+              <span className="block truncate font-medium">{name}</span>
+              <span className="mobile-type-caption block text-text-3">
+                {t("profile.title")}
+              </span>
+            </span>
+            <HugeiconsIcon
+              icon={ArrowRight02Icon}
+              size={16}
+              aria-hidden="true"
+            />
+          </span>
+        </Button>
+      ) : (
+        <Button
+          appearance="soft"
+          variant="tertiary"
+          shape="circle"
+          iconOnly
+          ref={trigger}
+          htmlType="button"
+          className="mobile-profile-trigger"
+          style={{
+            width: "var(--mobile-profile-trigger-size)",
+            height: "var(--mobile-profile-trigger-size)",
+            padding: "var(--mobile-profile-trigger-padding)",
+          }}
+          aria-label={t("profile.open")}
+          aria-haspopup="dialog"
+          onClick={() => setView("profile")}
+          icon={
+            <MobileAccountAvatar name={name} src={session.profile?.avatarUrl} />
+          }
+        />
+      )}
+      {view === "profile" && (
+        <MobileProfileSheet
+          name={name}
+          onClose={close}
+          onSignOut={() => setView("sign_out")}
+        />
+      )}
+      {view === "sign_out" && !isDevelopmentBypass && (
+        <MobileConfirmModal
+          title={t("settings.signOutConfirmTitle")}
+          description={t("settings.signOutConfirmBody")}
+          cancelLabel={t("settings.cancel")}
+          confirmLabel={t("settings.signOut")}
+          danger
+          onDismiss={() => setView("profile")}
+          onConfirm={() => {
+            close();
+            signOut();
+          }}
+        />
+      )}
+    </>
+  );
+}
diff --git a/src/modules/MobileRemote/components/profile/MobileProfileSheet.tsx b/src/modules/MobileRemote/components/profile/MobileProfileSheet.tsx
new file mode 100644
index 0000000000..a24491999f
--- /dev/null
+++ b/src/modules/MobileRemote/components/profile/MobileProfileSheet.tsx
@@ -0,0 +1,222 @@
+import React, { useLayoutEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import IconButton from "@src/components/Button";
+import { InlineBanner } from "@src/components/InlineBanner";
+import {
+  ArrowLeft01Icon,
+  ArrowRight02Icon,
+  ArrowUpRight01Icon,
+  Cancel01Icon,
+  Delete02Icon,
+  File01Icon,
+  HelpCircleIcon,
+  HugeiconsIcon,
+  Logout02Icon,
+  Shield01Icon,
+  UserCircleIcon,
+} from "@src/icons";
+import Modal from "@src/scaffold/ModalSystem";
+
+import { useMobileAuth } from "../../auth/MobileAuthContext";
+import { useMobileAccountActions } from "../../auth/useMobileAccountActions";
+import { MobileAccountAvatar } from "./MobileAccountAvatar";
+
+export function MobileProfileSheet({
+  name,
+  onClose,
+  onSignOut,
+}: {
+  name: string;
+  onClose: () => void;
+  onSignOut: () => void;
+}) {
+  const { t } = useTranslation("mobileRemote");
+  const { session, isDevelopmentBypass } = useMobileAuth();
+  const { opening, openFailed, openCloudPage } = useMobileAccountActions();
+  const [page, setPage] = useState<"profile" | "help">("profile");
+  const closeRef = useRef<HTMLButtonElement>(null);
+  const title = t(page === "profile" ? "profile.title" : "profile.help");
+  useLayoutEffect(() => {
+    // The Help row unmounts during this transition. Keep keyboard focus inside
+    // the existing Modal rather than letting it fall back to the page body.
+    if (page === "help") closeRef.current?.focus();
+  }, [page]);
+  return (
+    <Modal
+      visible
+      title={title}
+      onClose={onClose}
+      closable={false}
+      className="mobile-profile-sheet"
+      bodyClassName="mobile-profile-body"
+      initialFocusRef={closeRef}
+      headerActions={
+        <IconButton
+          appearance="soft"
+          variant="tertiary"
+          ref={closeRef}
+          htmlType="button"
+          className="mobile-profile-close"
+          aria-label={t(page === "help" ? "profile.back" : "profile.close")}
+          onClick={page === "help" ? () => setPage("profile") : onClose}
+        >
+          <HugeiconsIcon
+            icon={page === "help" ? ArrowLeft01Icon : Cancel01Icon}
+            size={24}
+          />
+        </IconButton>
+      }
+    >
+      {page === "help" ? (
+        <div className="mobile-profile-help">
+          <h2>{t("profile.pairingTitle")}</h2>
+          <ol>
+            <li>{t("profile.pairingStep1")}</li>
+            <li>{t("profile.pairingStep2")}</li>
+            <li>{t("profile.pairingStep3")}</li>
+          </ol>
+          <h2>{t("profile.connectionTitle")}</h2>
+          <p>{t("profile.connectionHelp")}</p>
+        </div>
+      ) : (
+        <>
+          <div className="mobile-profile-identity">
+            <MobileAccountAvatar
+              name={name}
+              src={session.profile?.avatarUrl}
+              size={64}
+            />
+            <div className="min-w-0">
+              <h2>{name}</h2>
+              {session.profile?.primaryEmail?.trim() && (
+                <p>{session.profile.primaryEmail.trim()}</p>
+              )}
+              {isDevelopmentBypass && <p>{t("profile.development")}</p>}
+            </div>
+          </div>
+          {!isDevelopmentBypass && (
+            <ProfileGroup title={t("settings.account")}>
+              <ProfileRow
+                label={t("settings.manageAccount")}
+                icon={UserCircleIcon}
+                external
+                disabled={opening}
+                onClick={() => void openCloudPage("/account")}
+              />
+              <ProfileRow
+                label={t("settings.signOut")}
+                icon={Logout02Icon}
+                onClick={onSignOut}
+              />
+            </ProfileGroup>
+          )}
+          <ProfileGroup title={t("profile.helpAndAbout")}>
+            <ProfileRow
+              label={t("profile.help")}
+              icon={HelpCircleIcon}
+              onClick={() => setPage("help")}
+            />
+            <ProfileRow
+              label={t("settings.privacyPolicy")}
+              icon={Shield01Icon}
+              external
+              disabled={opening}
+              onClick={() => void openCloudPage("/legal/privacy")}
+            />
+            <ProfileRow
+              label={t("profile.terms")}
+              icon={File01Icon}
+              external
+              disabled={opening}
+              onClick={() => void openCloudPage("/legal/terms")}
+            />
+          </ProfileGroup>
+          {!isDevelopmentBypass && (
+            <ProfileGroup title={t("profile.danger")}>
+              <ProfileRow
+                label={t("settings.deleteAccount")}
+                icon={Delete02Icon}
+                danger
+                external
+                disabled={opening}
+                onClick={() => void openCloudPage("/account")}
+              />
+              <p className="mobile-profile-hint">{t("profile.deleteHint")}</p>
+            </ProfileGroup>
+          )}
+          {opening && (
+            <p role="status" className="mobile-profile-hint">
+              {t("profile.opening")}
+            </p>
+          )}
+          {openFailed && (
+            <div role="alert">
+              <InlineBanner tone="warning">
+                {t("settings.openFailed")}
+              </InlineBanner>
+            </div>
+          )}
+          <p className="mobile-profile-brand">ORG2 Remote</p>
+        </>
+      )}
+    </Modal>
+  );
+}
+
+function ProfileGroup({
+  title,
+  children,
+}: React.PropsWithChildren<{ title: string }>) {
+  return (
+    <section className="mobile-profile-group" aria-label={title}>
+      <h3>{title}</h3>
+      <div>{children}</div>
+    </section>
+  );
+}
+
+function ProfileRow({
+  label,
+  icon,
+  onClick,
+  external = false,
+  danger = false,
+  disabled = false,
+}: {
+  label: string;
+  icon: React.ComponentProps<typeof HugeiconsIcon>["icon"];
+  onClick: () => void;
+  external?: boolean;
+  danger?: boolean;
+  disabled?: boolean;
+}) {
+  return (
+    <Button
+      htmlType="button"
+      variant={danger ? "danger" : "secondary"}
+      appearance="ghost"
+      className={`mobile-profile-row ${danger ? "mobile-profile-row--danger" : ""}`}
+      // Shared Button's desktop sizing is inline; explicitly use mobile row sizing.
+      style={{
+        height: "auto",
+        padding: "12px 0",
+        fontSize: "var(--mobile-type-control-size)",
+        borderRadius: 0,
+      }}
+      onClick={onClick}
+      disabled={disabled}
+    >
+      <span className="mobile-profile-row-content">
+        <HugeiconsIcon icon={icon} size={22} aria-hidden="true" />
+        <span className="min-w-0 flex-1 text-left">{label}</span>
+        <HugeiconsIcon
+          icon={external ? ArrowUpRight01Icon : ArrowRight02Icon}
+          size={18}
+          aria-hidden="true"
+        />
+      </span>
+    </Button>
+  );
+}
diff --git a/src/modules/MobileRemote/components/profile/mobileProfile.scss b/src/modules/MobileRemote/components/profile/mobileProfile.scss
new file mode 100644
index 0000000000..7d59f68177
--- /dev/null
+++ b/src/modules/MobileRemote/components/profile/mobileProfile.scss
@@ -0,0 +1,236 @@
+.mobile-profile-trigger {
+  --mobile-profile-trigger-size: 48px;
+  --mobile-profile-trigger-padding: 3px;
+
+  width: var(--mobile-profile-trigger-size);
+  height: var(--mobile-profile-trigger-size);
+  flex-shrink: 0;
+  padding: var(--mobile-profile-trigger-padding);
+  border: 1px solid var(--color-border-2);
+  border-radius: 50%;
+  background: var(--color-bg-2);
+  box-shadow: 0 4px 16px color-mix(in srgb, var(--color-text-1) 8%, transparent);
+  touch-action: manipulation;
+
+  &:focus-visible {
+    outline: 2px solid var(--color-primary-6);
+    outline-offset: 3px;
+  }
+}
+
+.mobile-profile-settings-entry {
+  min-width: 0;
+  > span {
+    width: 100%;
+    min-width: 0;
+  }
+}
+
+// Scope the native-sheet presentation to this Modal consumer. The shared Modal
+// continues to own the portal, focus trap, Escape handling and scroll cleanup.
+.liquid-modal-wrapper:has(.mobile-profile-sheet) {
+  align-items: flex-end;
+
+  > .liquid-modal-container {
+    width: 100%;
+    padding: 0;
+  }
+}
+
+.liquid-modal-content.mobile-profile-sheet {
+  min-width: 0;
+  width: 100%;
+  max-width: 560px;
+  max-height: calc(100dvh - max(24px, env(safe-area-inset-top)));
+  border-radius: 28px 28px 0 0 !important;
+  border-bottom: 0;
+  padding-top: 14px;
+  animation: mobile-profile-enter 220ms ease-out;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 8px;
+    left: calc(50% - 18px);
+    width: 36px;
+    height: 4px;
+    border-radius: 4px;
+    background: var(--color-border-3);
+  }
+
+  // PanelHeader is the Modal's first child. Keep its title/accessible name and
+  // action slot, arranged as a centered title with a leading 44px close button.
+  > :first-child {
+    min-height: 64px;
+    height: auto;
+    padding: 8px 20px 12px;
+    border: 0;
+    background: transparent;
+
+    > :first-child {
+      justify-content: center;
+      font-size: var(--mobile-type-title-size);
+      font-weight: var(--mobile-type-emphasis-weight);
+
+      // PanelHeader's title has an inline desktop size. Keep this override
+      // local to the Profile header and preserve Modal's accessible title.
+      > span {
+        font-size: inherit !important;
+        font-weight: inherit;
+      }
+    }
+
+    > :last-child {
+      order: -1;
+    }
+    &::after {
+      content: "";
+      flex: 0 0 44px;
+    }
+  }
+}
+
+.mobile-profile-close {
+  width: 44px;
+  height: 44px;
+  border-radius: 50%;
+  background: var(--color-fill-1);
+  color: var(--color-text-1);
+  touch-action: manipulation;
+}
+
+.mobile-profile-body {
+  padding: 4px 24px max(24px, env(safe-area-inset-bottom));
+  overscroll-behavior: contain;
+}
+
+.mobile-profile-identity {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 12px 0 20px;
+
+  h2 {
+    margin: 0;
+    font-size: var(--mobile-type-title-size);
+    font-weight: var(--mobile-type-emphasis-weight);
+    line-height: var(--mobile-type-heading-leading);
+    overflow-wrap: anywhere;
+  }
+  p {
+    margin: 4px 0 0;
+    font-size: var(--mobile-type-secondary-size);
+    color: var(--color-text-3);
+    overflow-wrap: anywhere;
+  }
+}
+
+.mobile-profile-group {
+  margin-top: 24px;
+
+  > h3 {
+    margin: 0 0 6px;
+    font-size: var(--mobile-type-secondary-size);
+    font-weight: var(--mobile-type-regular-weight);
+    color: var(--color-text-3);
+  }
+}
+
+.mobile-profile-row {
+  display: flex;
+  width: 100%;
+  height: auto;
+  min-height: 56px;
+  padding: 12px 0;
+  border: 0;
+  border-radius: 0;
+  color: var(--color-text-1);
+  font-size: var(--mobile-type-control-size);
+  font-weight: var(--mobile-type-regular-weight);
+  touch-action: manipulation;
+
+  + .mobile-profile-row {
+    border-top: 1px solid var(--color-border-1);
+  }
+  > span {
+    width: 100%;
+    white-space: normal;
+    overflow: visible;
+  }
+  &:focus-visible {
+    outline: 2px solid var(--color-primary-6);
+    outline-offset: 2px;
+  }
+  &--danger {
+    color: var(--color-danger-6);
+  }
+}
+
+.mobile-profile-row-content {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  width: 100%;
+
+  > svg {
+    flex-shrink: 0;
+    color: var(--color-text-3);
+  }
+  .mobile-profile-row--danger & > svg {
+    color: inherit;
+  }
+}
+
+.mobile-profile-hint {
+  margin: 4px 0 0;
+  font-size: var(--mobile-type-caption-size);
+  line-height: var(--mobile-type-body-leading);
+  color: var(--color-text-3);
+}
+.mobile-profile-brand {
+  margin: 28px 0 0;
+  text-align: center;
+  font-size: var(--mobile-type-caption-size);
+  letter-spacing: 0.08em;
+  color: var(--color-text-3);
+}
+.mobile-profile-help {
+  padding: 8px 0 32px;
+  h2 {
+    margin: 20px 0 12px;
+    font-size: var(--mobile-type-heading-size);
+    font-weight: var(--mobile-type-emphasis-weight);
+  }
+  ol {
+    list-style: decimal;
+    padding-left: 24px;
+  }
+  li {
+    padding: 0 0 14px 4px;
+  }
+  p,
+  li {
+    font-size: var(--mobile-type-body-size);
+    line-height: var(--mobile-type-reading-leading);
+    color: var(--color-text-2);
+  }
+}
+
+@keyframes mobile-profile-enter {
+  from {
+    transform: translateY(32px);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .liquid-modal-wrapper:has(.mobile-profile-sheet),
+  .liquid-modal-wrapper:has(.mobile-profile-sheet) .liquid-modal-mask,
+  .liquid-modal-content.mobile-profile-sheet {
+    animation: none;
+  }
+}
diff --git a/src/modules/MobileRemote/components/sessionGrouping.test.ts b/src/modules/MobileRemote/components/sessionGrouping.test.ts
new file mode 100644
index 0000000000..f4edc1e2cb
--- /dev/null
+++ b/src/modules/MobileRemote/components/sessionGrouping.test.ts
@@ -0,0 +1,99 @@
+import { describe, expect, it } from "vitest";
+
+import type { MobileSessionRow } from "../connection/types";
+import { groupMobileSessions } from "./sessionGrouping";
+
+const now = new Date(2026, 8, 9, 12).getTime();
+function row(id: string, updatedAtMs?: number): MobileSessionRow {
+  return { id, name: id, status: "idle", repoName: "Workspace", updatedAtMs };
+}
+
+describe("groupMobileSessions", () => {
+  it("groups by path, keeps same-name workspaces distinct, and preserves canonical rows", () => {
+    const rows = [
+      { ...row("a"), repoPath: "/first/app", repoName: "App" },
+      { ...row("b"), repoPath: "/second/app", repoName: "App" },
+      { ...row("c"), repoPath: "/first/app", repoName: "App" },
+      { ...row("legacy"), repoName: "App" },
+      { ...row("missing"), repoName: null },
+      { ...row("path-only"), repoPath: "/other", repoName: null },
+    ];
+    const original = structuredClone(rows);
+    const groups = groupMobileSessions(rows, "workspace");
+    expect(groups.map((group) => group.sessions.map((row) => row.id))).toEqual([
+      ["a", "c"],
+      ["b"],
+      ["legacy"],
+      ["missing"],
+      ["path-only"],
+    ]);
+    expect(groups.map((group) => group.label)).toEqual([
+      "App · /first/app",
+      "App · /second/app",
+      "App",
+      undefined,
+      "/other",
+    ]);
+    expect(new Set(groups.map((group) => group.id)).size).toBe(5);
+    expect(groups[3].id).toBe("no_workspace");
+    expect(groups[0].sessions[1]).toBe(rows[2]);
+    expect(rows).toEqual(original);
+    expect(groupMobileSessions(rows, "none")[0].sessions).toEqual(original);
+    expect(groupMobileSessions([], "workspace")).toEqual([]);
+  });
+
+  it("keeps the default flat ordering and original metadata references", () => {
+    const rows = [row("old", 0), row("new", now)];
+    const [group] = groupMobileSessions(rows, "none", now);
+    expect(group.id).toBe("all");
+    expect(group.sessions).toEqual(rows);
+    expect(group.sessions[0]).toBe(rows[0]);
+    expect(group.sessions[0].repoName).toBe("Workspace");
+  });
+
+  it("groups on local calendar boundaries without changing within-group order", () => {
+    const rows = [
+      row("old", new Date(2026, 8, 8, 23, 59).getTime()),
+      row("today-first", new Date(2026, 8, 9).getTime()),
+      row("unknown"),
+      row("today-second", now),
+    ];
+    expect(
+      groupMobileSessions(rows, "time", now).map((group) => [
+        group.id,
+        group.sessions.map((session) => session.id),
+      ])
+    ).toEqual([
+      ["today", ["today-first", "today-second"]],
+      ["earlier", ["old"]],
+      ["unknown", ["unknown"]],
+    ]);
+    expect(rows.map((session) => session.id)).toEqual([
+      "old",
+      "today-first",
+      "unknown",
+      "today-second",
+    ]);
+  });
+
+  it("does not invent a date for missing, malformed, or future-day timestamps", () => {
+    const rows = [
+      row("missing"),
+      row("nan", NaN),
+      row("infinite", Infinity),
+      row("invalid-date", 9e15),
+      row("future", new Date(2026, 8, 10).getTime()),
+    ];
+    expect(groupMobileSessions(rows, "time", now)).toEqual([
+      { id: "unknown", sessions: rows },
+    ]);
+  });
+
+  it("has no phantom groups for empty lists and returns to the original order", () => {
+    expect(groupMobileSessions([], "time", now)).toEqual([]);
+    expect(groupMobileSessions([], "none", now)).toEqual([]);
+    const rows = [row("old", 0), row("new", now)];
+    groupMobileSessions(rows, "time", now);
+    expect(groupMobileSessions(rows, "none", now)[0].sessions).toEqual(rows);
+  });
+});
diff --git a/src/modules/MobileRemote/components/sessionGrouping.ts b/src/modules/MobileRemote/components/sessionGrouping.ts
new file mode 100644
index 0000000000..bfbdf8f290
--- /dev/null
+++ b/src/modules/MobileRemote/components/sessionGrouping.ts
@@ -0,0 +1,84 @@
+import type { MobileSessionRow } from "../connection/types";
+
+export type SessionGroupBy = "none" | "time" | "workspace";
+export type MobileSessionGroupId =
+  | "all"
+  | "today"
+  | "earlier"
+  | "unknown"
+  | "no_workspace"
+  | `workspace:${string}`;
+
+export interface MobileSessionGroup {
+  id: MobileSessionGroupId;
+  label?: string;
+  sessions: MobileSessionRow[];
+}
+
+/** Presentation only: preserve canonical row metadata and order within each group. */
+export function groupMobileSessions(
+  sessions: readonly MobileSessionRow[],
+  groupBy: SessionGroupBy,
+  now = Date.now()
+): MobileSessionGroup[] {
+  if (sessions.length === 0) return [];
+  if (groupBy === "none") return [{ id: "all", sessions: [...sessions] }];
+  if (groupBy === "workspace") {
+    const groups = new Map<string, MobileSessionGroup>();
+    for (const session of sessions) {
+      const path = session.repoPath?.trim();
+      const name = session.repoName?.trim();
+      const id: MobileSessionGroupId = path
+        ? `workspace:${JSON.stringify(["path", path])}`
+        : name
+          ? `workspace:${JSON.stringify(["name", name])}`
+          : "no_workspace";
+      let group = groups.get(id);
+      if (!group) {
+        group = { id, label: name || path || undefined, sessions: [] };
+        groups.set(id, group);
+      }
+      group.sessions.push(session);
+    }
+    // Distinct paths may have the same display name. Keep their headings distinct too.
+    const labels = new Map<string, number>();
+    for (const group of groups.values()) {
+      if (group.label)
+        labels.set(group.label, (labels.get(group.label) ?? 0) + 1);
+    }
+    for (const group of groups.values()) {
+      if (group.label && (labels.get(group.label) ?? 0) > 1) {
+        const path = group.sessions[0].repoPath?.trim();
+        if (path) group.label = `${group.label} · ${path}`;
+      }
+    }
+    return [...groups.values()];
+  }
+
+  const today = new Date(now);
+  today.setHours(0, 0, 0, 0);
+  const tomorrow = new Date(today);
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  const groups: MobileSessionGroup[] = [
+    { id: "today", sessions: [] },
+    { id: "earlier", sessions: [] },
+    { id: "unknown", sessions: [] },
+  ];
+
+  for (const session of sessions) {
+    const timestamp = session.updatedAtMs;
+    const valid =
+      typeof timestamp === "number" &&
+      Number.isFinite(timestamp) &&
+      !Number.isNaN(new Date(timestamp).getTime());
+    const index =
+      !valid || timestamp >= tomorrow.getTime()
+        ? 2
+        : timestamp >= today.getTime()
+          ? 0
+          : 1;
+    groups[index].sessions.push(session);
+  }
+
+  return groups.filter((group) => group.sessions.length > 0);
+}
diff --git a/src/modules/MobileRemote/components/sessionRowPresentation.test.ts b/src/modules/MobileRemote/components/sessionRowPresentation.test.ts
new file mode 100644
index 0000000000..daa1d79faf
--- /dev/null
+++ b/src/modules/MobileRemote/components/sessionRowPresentation.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveSessionDisplayMetadata } from "@src/util/session/sessionDisplayMetadata";
+
+import {
+  mobileSessionIconInput,
+  mobileSessionRowStatus,
+} from "./sessionRowPresentation";
+
+describe("mobile row canonical presentation", () => {
+  it.each([
+    "waiting_for_user",
+    "waiting_for_funds",
+    "paused",
+    "installing",
+    "pending",
+    "running",
+    "idle",
+    "completed",
+    "cancelled",
+    "failed",
+    "archived",
+  ])(
+    "retains canonical %s rather than the lossy compatibility state",
+    (lifecycleStatus) => {
+      expect(
+        mobileSessionRowStatus({
+          id: "native",
+          name: "Name",
+          status: "running",
+          lifecycleStatus,
+        })
+      ).toBe(lifecycleStatus);
+    }
+  );
+  it("does not treat an unknown lifecycle as idle or working", () => {
+    expect(
+      mobileSessionRowStatus({
+        id: "native",
+        name: "Name",
+        status: "running",
+        lifecycleStatus: "future_phase",
+      })
+    ).toBe("unknown");
+    expect(
+      mobileSessionRowStatus({
+        id: "old-desktop",
+        name: "Name",
+        status: "running",
+      })
+    ).toBe("running");
+  });
+  it.each([
+    [
+      "sdeagent-native",
+      { agentDefinitionId: "builtin:os_agent", model: "gpt-5" },
+    ],
+    [
+      "sdeagent-custom",
+      { agentIconId: "brain", agentDefinitionId: "custom:reviewer" },
+    ],
+    ["cliagent-managed", { cliAgentType: "claude_code" }],
+    [
+      "codexapp-imported",
+      { externalHistorySource: "codex_app", model: "gpt-5" },
+    ],
+    ["claudecode-imported", { externalHistorySource: "claude_code" }],
+  ])("uses the Desktop metadata resolver for %s", (id, display) => {
+    const input = mobileSessionIconInput(id, display);
+    const mobile = resolveSessionDisplayMetadata({
+      kind: "local",
+      session: input,
+    });
+    const desktop = resolveSessionDisplayMetadata({
+      kind: "local",
+      session: { session_id: id, ...display, importedFrom: input.importedFrom },
+    });
+    expect(mobile.agentIconId).toBe(desktop.agentIconId);
+  });
+  it("keeps old imported-ID fallback and ignores an unknown source alias", () => {
+    const source = mobileSessionIconInput("codexapp-imported", {
+      externalHistorySource: "future_source",
+    });
+    expect(source.importedFrom).toBeUndefined();
+    expect(
+      resolveSessionDisplayMetadata({ kind: "local", session: source })
+        .agentIconId
+    ).toBe(
+      resolveSessionDisplayMetadata({
+        kind: "local",
+        session: { session_id: "codexapp-imported" },
+      }).agentIconId
+    );
+  });
+});
diff --git a/src/modules/MobileRemote/components/sessionRowPresentation.ts b/src/modules/MobileRemote/components/sessionRowPresentation.ts
new file mode 100644
index 0000000000..165789aafd
--- /dev/null
+++ b/src/modules/MobileRemote/components/sessionRowPresentation.ts
@@ -0,0 +1,46 @@
+import { IMPORTED_HISTORY_SOURCE_DESCRIPTORS } from "@src/api/tauri/externalHistory/imported/descriptors";
+import {
+  type SessionStatus,
+  isActiveStatus,
+  isTerminalStatus,
+} from "@src/types/session/session";
+import type { LocalSessionDisplayInput } from "@src/util/session/sessionDisplayMetadata";
+
+import type {
+  MobileSessionDisplay,
+  MobileSessionRow,
+} from "../connection/types";
+
+export type MobileRowStatus =
+  | SessionStatus
+  | "installing"
+  | "offline"
+  | "awaiting_approval"
+  | "unknown";
+
+/** Projection only: never use a display status to drive a session command. */
+export function mobileSessionRowStatus(
+  session: MobileSessionRow
+): MobileRowStatus {
+  const status = session.lifecycleStatus;
+  if (status == null) return session.status;
+  if (isActiveStatus(status) || isTerminalStatus(status))
+    return status as MobileRowStatus;
+  return "unknown";
+}
+
+export function mobileSessionIconInput(
+  sessionId: string,
+  display?: MobileSessionDisplay
+): LocalSessionDisplayInput {
+  const source = IMPORTED_HISTORY_SOURCE_DESCRIPTORS.find(
+    (item) => item.sourceId === display?.externalHistorySource
+  );
+  return {
+    session_id: sessionId,
+    ...display,
+    importedFrom: source
+      ? { externalHistorySource: source.sourceId }
+      : undefined,
+  };
+}
diff --git a/src/modules/MobileRemote/components/sessionViewMenu.scss b/src/modules/MobileRemote/components/sessionViewMenu.scss
new file mode 100644
index 0000000000..fcd18107e1
--- /dev/null
+++ b/src/modules/MobileRemote/components/sessionViewMenu.scss
@@ -0,0 +1,11 @@
+@use "../mobileUiTokens" as mobile;
+
+// Keep the desktop Dropdown presentation and row density. Mobile only adds
+// intrinsic sizing and viewport clamping.
+.mobile-session-view-menu.mobile-session-view-menu {
+  @include mobile.adaptive-menu;
+
+  [role="option"] {
+    min-height: 2rem;
+  }
+}
diff --git a/src/modules/MobileRemote/components/transcript/AgentBubble.tsx b/src/modules/MobileRemote/components/transcript/AgentBubble.tsx
index 0e724f50b3..92cf163adf 100644
--- a/src/modules/MobileRemote/components/transcript/AgentBubble.tsx
+++ b/src/modules/MobileRemote/components/transcript/AgentBubble.tsx
@@ -7,15 +7,17 @@ import PortableAgentMessageContent from "./PortableAgentMessageContent";
 export interface AgentBubbleProps {
   text: string;
   streaming?: boolean;
+  children?: React.ReactNode;
 }
 
-export function AgentBubble({ text, streaming }: AgentBubbleProps) {
+export function AgentBubble({ text, streaming, children }: AgentBubbleProps) {
   return (
     <ChatAssistantMessageBody
       testId="mobile-agent-message"
       className="text-left"
     >
-      <PortableAgentMessageContent text={text} />
+      <PortableAgentMessageContent text={text} streaming={streaming} />
+      {children}
       {streaming ? <span className="ml-1 animate-pulse">▍</span> : null}
     </ChatAssistantMessageBody>
   );
diff --git a/src/modules/MobileRemote/components/transcript/ChatTranscript.test.ts b/src/modules/MobileRemote/components/transcript/ChatTranscript.test.ts
index 8396ef7d28..4af1b5969b 100644
--- a/src/modules/MobileRemote/components/transcript/ChatTranscript.test.ts
+++ b/src/modules/MobileRemote/components/transcript/ChatTranscript.test.ts
@@ -13,6 +13,11 @@ import {
 } from "vitest";
 
 import type { TranscriptItem } from "../../lib/transcriptReducer";
+import {
+  MobileRemotePlatformProvider,
+  type MobileRemotePlatformProviderProps,
+} from "../../platform/MobileRemotePlatformContext";
+import { createBrowserMobileRemotePlatform } from "../../platform/browser";
 import { ChatTranscript } from "./ChatTranscript";
 import type { MobileFileTarget } from "./mobileFileTool";
 
@@ -21,13 +26,23 @@ vi.mock("react-i18next", () => ({
 }));
 
 vi.mock("./AgentBubble", () => ({
-  AgentBubble: ({ text }: { text: string }) =>
-    React.createElement("div", null, text),
+  AgentBubble: ({
+    text,
+    children,
+  }: {
+    text: string;
+    children?: React.ReactNode;
+  }) => React.createElement("div", null, text, children),
 }));
 
 vi.mock("./UserBubble", () => ({
-  UserBubble: ({ text }: { text: string }) =>
-    React.createElement("div", null, text),
+  UserBubble: ({
+    text,
+    children,
+  }: {
+    text: string;
+    children?: React.ReactNode;
+  }) => React.createElement("div", null, text, children),
 }));
 
 vi.mock("@src/components/FileTypeIcon", () => ({
@@ -55,6 +70,7 @@ const USER_ITEM: TranscriptItem = {
   kind: "user",
   text: "First question",
 };
+const platform = createBrowserMobileRemotePlatform();
 
 describe("ChatTranscript tail follow", () => {
   let container: HTMLDivElement;
@@ -113,20 +129,28 @@ describe("ChatTranscript tail follow", () => {
       forceFollowKey?: string;
       waitingForAgent?: boolean;
       onOpenFile?: (eventId: string, target: MobileFileTarget) => Promise<void>;
+      loadImage?: (eventId: string, index: number) => Promise<string>;
+      imageScope?: string;
     } = {}
   ) => {
     await act(async () => {
       root.render(
-        React.createElement(ChatTranscript, {
-          sessionId: options.sessionId ?? "session-1",
-          roundId: options.roundId,
-          items,
-          phase: "ready",
-          forceFollowKey: options.forceFollowKey,
-          waitingForAgent: options.waitingForAgent,
-          onOpenFile: options.onOpenFile,
-          onRetry: vi.fn(),
-        })
+        React.createElement(
+          MobileRemotePlatformProvider,
+          { platform } as MobileRemotePlatformProviderProps,
+          React.createElement(ChatTranscript, {
+            sessionId: options.sessionId ?? "session-1",
+            roundId: options.roundId,
+            items,
+            phase: "ready",
+            forceFollowKey: options.forceFollowKey,
+            waitingForAgent: options.waitingForAgent,
+            onOpenFile: options.onOpenFile,
+            onRetry: vi.fn(),
+            loadImage: options.loadImage,
+            imageScope: options.imageScope ?? "endpoint/account/desktop",
+          })
+        )
       );
     });
     const scrollRoot = container.querySelector<HTMLDivElement>("[role=log]");
@@ -153,6 +177,134 @@ describe("ChatTranscript tail follow", () => {
     });
   };
 
+  it("mounts event image controls in the transcript and clears them on round change", async () => {
+    const loadImage = vi
+      .fn()
+      .mockResolvedValue("data:image/jpeg;base64,aGVsbG8=");
+    await renderTranscript(
+      [{ id: "photo", kind: "user", text: "caption", imageCount: 1 }],
+      { roundId: "one", loadImage }
+    );
+    const button = Array.from(container.querySelectorAll("button")).find(
+      (button) => button.textContent?.includes("images.load")
+    );
+    expect(button).toBeDefined();
+    await act(async () => button!.click());
+    expect(loadImage).toHaveBeenCalledWith("photo", 0);
+    expect(container.querySelector("img")).not.toBeNull();
+    await renderTranscript(
+      [{ id: "photo", kind: "user", text: "other", imageCount: 1 }],
+      { roundId: "two", loadImage }
+    );
+    expect(container.querySelector("img")).toBeNull();
+  });
+
+  it("keeps loaded user and agent previews offline, disables unloaded images and recovers on demand", async () => {
+    const items: TranscriptItem[] = [
+      { id: "user-photo", kind: "user", text: "caption", imageCount: 1 },
+      { id: "agent-photo", kind: "agent", text: "result", imageCount: 2 },
+    ];
+    const url = "data:image/jpeg;base64,aGVsbG8=";
+    const loadImage = vi.fn().mockResolvedValue(url);
+    const loadButtons = () =>
+      Array.from(container.querySelectorAll("button")).filter((button) =>
+        button.textContent?.includes("images.load")
+      );
+    await renderTranscript(items, { loadImage });
+    await act(async () => loadButtons()[0].click());
+    await act(async () => loadButtons()[0].click());
+    expect(container.querySelectorAll("img")).toHaveLength(2);
+    await renderTranscript(items);
+    expect(container.querySelectorAll("img")).toHaveLength(2);
+    const offlineButton = Array.from(container.querySelectorAll("button")).find(
+      (button) => button.textContent?.includes("images.unavailable")
+    )!;
+    expect(offlineButton.disabled).toBe(true);
+    await act(async () => offlineButton.click());
+    expect(loadImage).toHaveBeenCalledTimes(2);
+    const restoredLoad = vi.fn().mockResolvedValue(url);
+    await renderTranscript(items, { loadImage: restoredLoad });
+    expect(container.querySelectorAll("img")).toHaveLength(2);
+    expect(restoredLoad).not.toHaveBeenCalled();
+    await act(async () => loadButtons()[0].click());
+    expect(restoredLoad).toHaveBeenCalledOnce();
+    expect(container.querySelectorAll("img")).toHaveLength(3);
+  });
+
+  it.each(["endpoint", "account", "desktop", "session", "round"])(
+    "clears ready images and rejects pending results on %s switch, even with the same loader",
+    async (changedScope) => {
+      const items: TranscriptItem[] = [
+        { id: "photo", kind: "user", text: "caption", imageCount: 2 },
+      ];
+      const url = "data:image/jpeg;base64,aGVsbG8=";
+      let resolve!: (value: string) => void;
+      const loadImage = vi
+        .fn()
+        .mockResolvedValueOnce(url)
+        .mockImplementationOnce(
+          () =>
+            new Promise<string>((done) => {
+              resolve = done;
+            })
+        );
+      const scope = { endpoint: "a", account: "a", desktop: "a" };
+      const options = {
+        imageScope: JSON.stringify(scope),
+        sessionId: "session",
+        roundId: "round",
+        loadImage,
+      };
+      await renderTranscript(items, options);
+      const loadButtons = () =>
+        Array.from(container.querySelectorAll("button")).filter((button) =>
+          button.textContent?.includes("images.load")
+        );
+      await act(async () => loadButtons()[0].click());
+      act(() => loadButtons()[0].click());
+      expect(container.querySelectorAll("img")).toHaveLength(1);
+      await renderTranscript(items, {
+        ...options,
+        imageScope: JSON.stringify({
+          ...scope,
+          ...(["endpoint", "account", "desktop"].includes(changedScope)
+            ? { [changedScope]: "b" }
+            : {}),
+        }),
+        sessionId: changedScope === "session" ? "other-session" : "session",
+        roundId: changedScope === "round" ? "other-round" : "round",
+      });
+      expect(container.querySelector("img")).toBeNull();
+      await act(async () => resolve(url));
+      expect(container.querySelector("img")).toBeNull();
+      expect(loadButtons()).toHaveLength(2);
+    }
+  );
+
+  it("retains at most eight previews across message rows and reconnects", async () => {
+    const items: TranscriptItem[] = Array.from({ length: 9 }, (_, index) => ({
+      id: `photo-${index}`,
+      kind: index % 2 === 0 ? "user" : "agent",
+      text: "photo",
+      imageCount: 1,
+    }));
+    const loadImage = vi
+      .fn()
+      .mockResolvedValue("data:image/jpeg;base64,aGVsbG8=");
+    await renderTranscript(items, { loadImage });
+    const buttons = Array.from(container.querySelectorAll("button")).filter(
+      (button) => button.textContent?.includes("images.load")
+    );
+    for (const button of buttons) await act(async () => button.click());
+    expect(loadImage).toHaveBeenCalledTimes(9);
+    expect(container.querySelectorAll("img")).toHaveLength(8);
+    await renderTranscript(items);
+    expect(container.querySelectorAll("img")).toHaveLength(8);
+    await renderTranscript(items, { loadImage });
+    expect(loadImage).toHaveBeenCalledTimes(9);
+    expect(container.querySelectorAll("img")).toHaveLength(8);
+  });
+
   it("follows appended and streaming content while the reader is at the bottom", async () => {
     await renderTranscript([USER_ITEM]);
     const agentItem: TranscriptItem = {
@@ -178,12 +330,16 @@ describe("ChatTranscript tail follow", () => {
 
     await act(async () => {
       root.render(
-        React.createElement(ChatTranscript, {
-          sessionId: "session-1",
-          items: [],
-          phase: "loading",
-          onRetry: vi.fn(),
-        })
+        React.createElement(
+          MobileRemotePlatformProvider,
+          { platform } as MobileRemotePlatformProviderProps,
+          React.createElement(ChatTranscript, {
+            sessionId: "session-1",
+            items: [],
+            phase: "loading",
+            onRetry: vi.fn(),
+          })
+        )
       );
     });
 
@@ -194,12 +350,42 @@ describe("ChatTranscript tail follow", () => {
     expect(loading?.classList.contains("flex-1")).toBe(true);
     expect(loading?.classList.contains("min-h-0")).toBe(true);
     expect(loading?.querySelector('[aria-busy="true"]')).not.toBeNull();
+    expect(
+      loading?.querySelector('[role="status"]')?.getAttribute("aria-label")
+    ).toBe("transcript.loading");
+    expect(
+      loading?.querySelectorAll(".mobile-loading-dots > span").length
+    ).toBe(3);
 
     await act(async () => {
       vi.advanceTimersByTime(300);
     });
 
-    expect(container.textContent).toContain("transcript.loading");
+    expect(container.textContent).not.toContain("transcript.loading");
+    const hidden = vi.spyOn(document, "hidden", "get").mockReturnValue(true);
+    await act(async () =>
+      document.dispatchEvent(new Event("visibilitychange"))
+    );
+    expect(
+      loading
+        ?.querySelector(".mobile-loading-dots")
+        ?.getAttribute("data-paused")
+    ).toBe("true");
+    hidden.mockReturnValue(false);
+    await act(async () =>
+      document.dispatchEvent(new Event("visibilitychange"))
+    );
+    expect(
+      loading
+        ?.querySelector(".mobile-loading-dots")
+        ?.getAttribute("data-paused")
+    ).toBe("false");
+    hidden.mockRestore();
+    await renderTranscript([USER_ITEM]);
+    expect(
+      container.querySelector('[data-mobile-transcript-loading="true"]')
+    ).toBeNull();
+    expect(container.textContent).toContain("First question");
   });
 
   it("shows the shared ChatPanel loading block while waiting for first Agent output", async () => {
@@ -220,9 +406,7 @@ describe("ChatTranscript tail follow", () => {
     expect(
       container.querySelector('[data-mobile-agent-loading="true"]')
     ).not.toBeNull();
-    expect(
-      container.querySelector('[data-testid="chat-loading-block"]')
-    ).not.toBeNull();
+    expect(container.querySelector(".mobile-loading-dots")).not.toBeNull();
 
     await renderTranscript(
       [
@@ -382,7 +566,9 @@ describe("ChatTranscript tail follow", () => {
     const dialog = document.body.querySelector<HTMLElement>('[role="dialog"]');
     expect(dialog).not.toBeNull();
     expect(
-      dialog?.querySelector('[data-mobile-tool-detail="tool-read-1"]')
+      dialog?.querySelector(
+        '[data-mobile-file-document="/repo/src/session.ts"]'
+      )
     ).not.toBeNull();
     expect(dialog?.textContent).toContain("session.ts");
     expect(dialog?.textContent).not.toContain('"lineCount": 42');
diff --git a/src/modules/MobileRemote/components/transcript/ChatTranscript.tsx b/src/modules/MobileRemote/components/transcript/ChatTranscript.tsx
index 763e1c1172..1f0188f621 100644
--- a/src/modules/MobileRemote/components/transcript/ChatTranscript.tsx
+++ b/src/modules/MobileRemote/components/transcript/ChatTranscript.tsx
@@ -1,7 +1,6 @@
-import React, { useState } from "react";
+import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import ChatLoadingBlock from "@src/components/ChatLoadingBlock";
 import { Placeholder } from "@src/components/Placeholder";
 import ScrollToBottomButton from "@src/components/ScrollToBottomButton";
 import { CHAT_ITEM_PADDING_X } from "@src/engines/ChatPanel/blocks/primitives/config";
@@ -9,7 +8,17 @@ import { CHAT_ITEM_PADDING_X } from "@src/engines/ChatPanel/blocks/primitives/co
 import type { TranscriptLoadPhase } from "../../lib/transcriptLoadState";
 import type { TranscriptItem } from "../../lib/transcriptReducer";
 import { AgentBubble } from "./AgentBubble";
-import { MobileToolCall, MobileToolDetailSheet } from "./MobileToolCall";
+import {
+  type LoadMessageImage,
+  MobileMessageImages,
+  createImageRetention,
+} from "./MobileMessageImages";
+import { MobileToolCall } from "./MobileToolCall";
+import { MobileToolDetailModal } from "./MobileToolDetailModal";
+import {
+  MobileLoadingDots,
+  MobileTranscriptLoading,
+} from "./MobileTranscriptLoading";
 import { UserBubble } from "./UserBubble";
 import {
   MOBILE_CHAT_ITEM_GAP,
@@ -29,7 +38,11 @@ export interface ChatTranscriptProps {
   /** Show ChatPanel's loading block until the active turn paints output. */
   waitingForAgent?: boolean;
   onRetry: () => void;
+  loadImage?: LoadMessageImage;
+  /** Endpoint + authenticated user + desktop identity, independent of connectivity. */
+  imageScope?: string;
   onOpenFile?: (eventId: string, target: MobileFileTarget) => Promise<void>;
+  footer?: React.ReactNode;
 }
 
 export function ChatTranscript({
@@ -42,9 +55,19 @@ export function ChatTranscript({
   waitingForAgent = false,
   onRetry,
   onOpenFile,
+  loadImage,
+  imageScope,
+  footer,
 }: ChatTranscriptProps) {
   const { t } = useTranslation("mobileRemote");
   const transcriptScope = `${sessionId}:${roundId ?? "no-round"}`;
+  const imageResourceScope = JSON.stringify([imageScope, sessionId, roundId]);
+  const retention = useMemo(
+    () => createImageRetention(),
+    // A new authenticated resource owns a fresh retention scope, not each RPC.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [imageResourceScope]
+  );
   const [toolDetail, setToolDetail] = useState<{
     scope: string;
     itemId: string;
@@ -95,19 +118,7 @@ export function ChatTranscript({
   }
 
   if (phase === "loading" && items.length === 0) {
-    return (
-      <div
-        className="flex min-h-0 flex-1"
-        data-mobile-transcript-loading="true"
-      >
-        <Placeholder
-          fillParentHeight
-          placement="sidebar"
-          title={t("transcript.loading")}
-          variant="loading"
-        />
-      </div>
-    );
+    return <MobileTranscriptLoading label={t("transcript.loading")} />;
   }
 
   if (phase === "empty") {
@@ -123,10 +134,10 @@ export function ChatTranscript({
   }
 
   return (
-    <div className="relative min-h-0 flex-1">
+    <div className="mobile-chat-transcript relative min-h-0 min-w-0 flex-1">
       <div
         ref={scrollRef}
-        className="h-full min-h-0 overflow-y-auto px-2 py-3"
+        className="h-full min-h-0 min-w-0 overflow-y-auto px-2 py-3"
         role="log"
         aria-live="polite"
       >
@@ -139,10 +150,28 @@ export function ChatTranscript({
             );
             let content: React.ReactNode;
             if (item.kind === "user") {
-              content = <UserBubble text={item.text} />;
+              content = (
+                <UserBubble text={item.text}>
+                  <MobileMessageImages
+                    key={imageResourceScope}
+                    eventId={item.id}
+                    count={item.imageCount ?? 0}
+                    loadImage={loadImage}
+                    retention={retention}
+                  />
+                </UserBubble>
+              );
             } else if (item.kind === "agent") {
               content = (
-                <AgentBubble text={item.text} streaming={item.streaming} />
+                <AgentBubble text={item.text} streaming={item.streaming}>
+                  <MobileMessageImages
+                    key={imageResourceScope}
+                    eventId={item.id}
+                    count={item.imageCount ?? 0}
+                    loadImage={loadImage}
+                    retention={retention}
+                  />
+                </AgentBubble>
               );
             } else {
               content = (
@@ -169,12 +198,13 @@ export function ChatTranscript({
               </div>
             );
           })}
+          {footer}
           {waitingForAgent ? (
             <div
               className={`${MOBILE_CHAT_ITEM_GAP} ${CHAT_ITEM_PADDING_X}`}
               data-mobile-agent-loading="true"
             >
-              <ChatLoadingBlock />
+              <MobileLoadingDots label={t("composerAccepted")} />
             </div>
           ) : null}
         </div>
@@ -188,7 +218,7 @@ export function ChatTranscript({
         </div>
       ) : null}
       {selectedTool ? (
-        <MobileToolDetailSheet
+        <MobileToolDetailModal
           key={`${transcriptScope}:${selectedTool.id}`}
           item={selectedTool}
           open={toolDetailOpen}
diff --git a/src/modules/MobileRemote/components/transcript/MobileFileIdentity.tsx b/src/modules/MobileRemote/components/transcript/MobileFileIdentity.tsx
new file mode 100644
index 0000000000..ec10838275
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileFileIdentity.tsx
@@ -0,0 +1,64 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import FileTypeIcon from "@src/components/FileTypeIcon";
+import { ArrowDown01Icon, HugeiconsIcon } from "@src/icons";
+import { getPathSegments } from "@src/util/file/pathUtils";
+
+import type { MobileFileTarget } from "./mobileFileTool";
+
+/** Presentation only: never shorten the path used for remote file operations. */
+export function MobileFileIdentity({ target }: { target: MobileFileTarget }) {
+  const { t } = useTranslation("mobileRemote");
+  const directories = getPathSegments(target.filePath).slice(0, -1);
+  const directory =
+    directories.length > 2
+      ? `… / ${directories.slice(-2).join(" / ")}`
+      : directories.join(" / ");
+
+  return (
+    <details
+      key={target.filePath}
+      className="mobile-file-identity group min-w-0 flex-1"
+    >
+      <summary
+        tabIndex={0}
+        className="flex min-h-11 cursor-pointer list-none items-center gap-3 rounded-lg text-left focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
+        aria-label={`${target.fileName} · ${t("fileViewer.fileLocation")}`}
+      >
+        <span
+          className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-fill-2"
+          aria-hidden="true"
+        >
+          <FileTypeIcon fileName={target.fileName} size="large" />
+        </span>
+        <span className="min-w-0 flex-1">
+          <span
+            className="mobile-type-secondary block truncate font-semibold text-text-1"
+            title={target.fileName}
+          >
+            {target.fileName}
+          </span>
+          <span className="mobile-type-caption mt-0.5 flex min-w-0 items-center gap-1 font-normal text-text-3">
+            <span className="truncate" data-mobile-file-directory="">
+              {directory || t("fileViewer.fileLocation")}
+            </span>
+            <HugeiconsIcon
+              icon={ArrowDown01Icon}
+              size={12}
+              strokeWidth={1.75}
+              aria-hidden="true"
+              className="shrink-0 group-open:rotate-180"
+            />
+          </span>
+        </span>
+      </summary>
+      <div
+        className="mobile-type-caption mt-2 max-h-32 overflow-auto rounded-lg bg-fill-1 px-3 py-2 font-normal break-all text-text-2 select-text"
+        data-mobile-file-full-path=""
+      >
+        {target.filePath}
+      </div>
+    </details>
+  );
+}
diff --git a/src/modules/MobileRemote/components/transcript/MobileFilePreview.tsx b/src/modules/MobileRemote/components/transcript/MobileFilePreview.tsx
deleted file mode 100644
index 40ab90215f..0000000000
--- a/src/modules/MobileRemote/components/transcript/MobileFilePreview.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from "react";
-
-import { getLanguageFromPath } from "@src/config/languageMap";
-import {
-  EVENT_SNIPPET_INNER_PADDING_CLASS,
-  getEventBlockContainerClasses,
-} from "@src/engines/ChatPanel/blocks/primitives/config";
-import { useSyntaxHighlight } from "@src/hooks/code/useSyntaxHighlight";
-import { getLanguageFromFilePath } from "@src/util/editor/extension";
-
-import type { MobileFileTarget } from "./mobileFileTool";
-
-export interface MobileFilePreviewProps {
-  target: MobileFileTarget;
-}
-
-/**
- * Browser-safe file preview using the same lazy Prism pipeline and theme
- * tokens as Desktop ChatPanel output. The source text remains visible while
- * the grammar chunk loads or when a language is unsupported.
- */
-export default function MobileFilePreview({ target }: MobileFilePreviewProps) {
-  const source = target.diff ?? target.content ?? "";
-  const language = target.diff
-    ? "diff"
-    : target.language ||
-      getLanguageFromFilePath(target.filePath) ||
-      getLanguageFromPath(target.filePath) ||
-      "text";
-  const highlightedHtml = useSyntaxHighlight(source, {
-    lang: language,
-    enabled: source.length > 0,
-  });
-
-  if (!source) return null;
-
-  return (
-    <div
-      className={`${getEventBlockContainerClasses()} min-w-0`}
-      data-mobile-file-preview={target.diff ? "diff" : "code"}
-      data-mobile-highlight-language={language}
-      data-mobile-file-line={target.line}
-    >
-      <div className="scrollbar-hide max-h-80 overflow-auto">
-        <pre
-          className={`chat-code prism-html m-0 min-w-max whitespace-pre ${EVENT_SNIPPET_INNER_PADDING_CLASS} leading-normal text-text-2`}
-        >
-          {highlightedHtml ? (
-            <code dangerouslySetInnerHTML={{ __html: highlightedHtml }} />
-          ) : (
-            <code>{source}</code>
-          )}
-        </pre>
-      </div>
-    </div>
-  );
-}
-
-MobileFilePreview.displayName = "MobileFilePreview";
diff --git a/src/modules/MobileRemote/components/transcript/MobileFileViewer.test.ts b/src/modules/MobileRemote/components/transcript/MobileFileViewer.test.ts
new file mode 100644
index 0000000000..6eddfca6bc
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileFileViewer.test.ts
@@ -0,0 +1,817 @@
+// @vitest-environment jsdom
+import {
+  ensureSyntaxTree,
+  highlightingFor,
+  syntaxTree,
+} from "@codemirror/language";
+import { getOriginalDoc } from "@codemirror/merge";
+import { EditorView } from "@codemirror/view";
+import { tags } from "@lezer/highlight";
+import React, { act } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import * as themes from "@src/features/CodeMirror/config/themeConfig";
+
+import type { TranscriptItem } from "../../lib/transcriptReducer";
+import {
+  MobileRemotePlatformProvider,
+  type MobileRemotePlatformProviderProps,
+} from "../../platform/MobileRemotePlatformContext";
+import { createBrowserMobileRemotePlatform } from "../../platform/browser";
+import MobileFileViewer from "./MobileFileViewer";
+import { MobileToolDetailModal } from "./MobileToolDetailModal";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+const file = {
+  id: "read-file",
+  kind: "tool",
+  text: "read_file",
+  toolStatus: "completed",
+  toolData: {
+    kind: "file",
+    filePath: "src/example.ts",
+    fileName: "example.ts",
+    language: "typescript",
+    startLine: 7,
+    content: "const value = '<safe>';\nconsole.log(value);",
+    lineCount: 2,
+  },
+} satisfies TranscriptItem;
+let root: Root;
+let host: HTMLDivElement;
+let platform: ReturnType<typeof createBrowserMobileRemotePlatform>;
+const write = vi.fn<(text: string) => Promise<void>>();
+const openDesktop = vi.fn<() => Promise<void>>();
+
+beforeEach(() => {
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  host = document.createElement("div");
+  document.body.appendChild(host);
+  root = createRoot(host);
+  platform = {
+    ...createBrowserMobileRemotePlatform(),
+    writeClipboardText: write,
+  };
+  write.mockReset().mockResolvedValue(undefined);
+  openDesktop.mockReset().mockResolvedValue(undefined);
+  // jsdom has no text geometry; the real editor still mounts, updates and destroys.
+  Object.defineProperty(Range.prototype, "getClientRects", {
+    configurable: true,
+    value: () => [],
+  });
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+  Reflect.deleteProperty(Range.prototype, "getClientRects");
+});
+
+async function render(
+  item: TranscriptItem = file,
+  visible = true,
+  canOpenDesktop = true
+) {
+  await act(async () =>
+    root.render(
+      React.createElement(
+        MobileRemotePlatformProvider,
+        { platform } as MobileRemotePlatformProviderProps,
+        React.createElement(MobileToolDetailModal, {
+          item,
+          open: visible,
+          onClose: vi.fn(),
+          onOpenFile: canOpenDesktop ? openDesktop : undefined,
+        })
+      )
+    )
+  );
+}
+async function editor() {
+  await act(async () => {
+    await import("./MobileReadonlyEditor");
+  });
+  await vi.waitFor(async () => {
+    await act(async () => {});
+    expect(document.querySelector(".cm-content")).not.toBeNull();
+  });
+  return EditorView.findFromDOM(document.querySelector(".cm-content")!)!;
+}
+async function click(selector: string) {
+  await act(async () =>
+    (document.querySelector(selector) as HTMLButtonElement).click()
+  );
+}
+
+describe("Mobile document viewing lifecycle", () => {
+  it("revokes Desktop actions without removing the local document and ignores the old response", async () => {
+    let finish!: () => void;
+    openDesktop.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          finish = resolve;
+        })
+    );
+    await render();
+    const view = await editor();
+    await click("[data-mobile-open-file]");
+    await render(file, true, false);
+    expect(document.querySelector("[data-mobile-open-file]")).toBeNull();
+    expect(await editor()).toBe(view);
+    await render(file, true, true);
+    await act(async () => finish());
+    expect(document.querySelector("[data-mobile-open-file]")?.textContent).toBe(
+      "fileViewer.openDesktop"
+    );
+    expect(await editor()).toBe(view);
+    expect(openDesktop).toHaveBeenCalledTimes(1);
+  });
+
+  it("single-flights rapid Desktop clicks and supports failure retry without remounting the editor", async () => {
+    let reject!: (reason: Error) => void;
+    openDesktop.mockImplementationOnce(
+      () =>
+        new Promise<void>((_, fail) => {
+          reject = fail;
+        })
+    );
+    await render();
+    const view = await editor();
+    const button = document.querySelector<HTMLButtonElement>(
+      "[data-mobile-open-file]"
+    )!;
+    await act(async () => {
+      button.click();
+      button.click();
+    });
+    expect(openDesktop).toHaveBeenCalledTimes(1);
+    expect(await editor()).toBe(view);
+    await act(async () => reject(new Error("Desktop offline")));
+    expect(document.querySelector('[role="alert"]')?.textContent).toBe(
+      "transcript.tools.openFileFailed"
+    );
+    await click("[data-mobile-open-file]");
+    expect(openDesktop).toHaveBeenCalledTimes(2);
+    expect(button.textContent).toBe("transcript.tools.fileOpenRequested");
+    expect(document.querySelector('[role="alert"]')).toBeNull();
+    expect(await editor()).toBe(view);
+  });
+
+  it("disposes the closed preview and ignores its response after reopening", async () => {
+    let finish!: () => void;
+    openDesktop.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          finish = resolve;
+        })
+    );
+    await render();
+    const oldEditor = await editor();
+    const destroy = vi.spyOn(oldEditor, "destroy");
+    await click("[data-mobile-open-file]");
+    await render(file, false);
+    expect(document.querySelector('[role="dialog"]')).toBeNull();
+    expect(destroy).toHaveBeenCalledTimes(1);
+    await render();
+    expect(await editor()).not.toBe(oldEditor);
+    await act(async () => finish());
+    expect(document.querySelector("[data-mobile-open-file]")?.textContent).toBe(
+      "fileViewer.openDesktop"
+    );
+    await click("[data-mobile-open-file]");
+    expect(openDesktop).toHaveBeenCalledTimes(2);
+    expect(document.querySelector("[data-mobile-open-file]")?.textContent).toBe(
+      "transcript.tools.fileOpenRequested"
+    );
+  });
+
+  it("isolates a replaced tool even when the file path and target index match", async () => {
+    let fail!: (reason: Error) => void;
+    openDesktop.mockImplementationOnce(
+      () =>
+        new Promise<void>((_, reject) => {
+          fail = reject;
+        })
+    );
+    await render();
+    await click("[data-mobile-open-file]");
+    await render({ ...file, id: "another-tool" });
+    await act(async () => fail(new Error("Old request failed")));
+    expect(document.querySelector('[role="alert"]')).toBeNull();
+    expect(document.querySelector("[data-mobile-open-file]")?.textContent).toBe(
+      "fileViewer.openDesktop"
+    );
+    await click("[data-mobile-open-file]");
+    expect(openDesktop).toHaveBeenCalledTimes(2);
+  });
+
+  it("resets the Desktop outcome when a target is replaced at the same index", async () => {
+    await render();
+    await click("[data-mobile-open-file]");
+    expect(document.querySelector("[data-mobile-open-file]")?.textContent).toBe(
+      "transcript.tools.fileOpenRequested"
+    );
+    await render({
+      ...file,
+      toolData: {
+        ...file.toolData,
+        filePath: "src/other.ts",
+        fileName: "other.ts",
+      },
+    });
+    expect(
+      document.querySelector('[data-mobile-open-file="src/other.ts"]')
+        ?.textContent
+    ).toBe("fileViewer.openDesktop");
+    expect(openDesktop).toHaveBeenCalledTimes(1);
+  });
+
+  function edit(oldContent: string, newContent: string): TranscriptItem {
+    return {
+      ...file,
+      toolData: {
+        kind: "edit",
+        filePath: "src/example.ts",
+        fileName: "example.ts",
+        language: "typescript",
+        oldContent,
+        newContent,
+        newStartLine: 7,
+        isDeleted: newContent === "",
+        applyPatchSegments: [],
+      },
+    };
+  }
+
+  it("uses the actual merge engine with language tokens and added/deleted backgrounds, without write controls", async () => {
+    const original = 'const answer = "before";';
+    const modified = 'const answer = "after";';
+    await render(edit(original, modified));
+    const view = await editor();
+    ensureSyntaxTree(view.state, view.state.doc.length, 100);
+    expect(getOriginalDoc(view.state).toString()).toBe(original);
+    expect(view.state.doc.toString()).toBe(modified);
+    expect(view.state.readOnly).toBe(true);
+    expect(view.contentDOM.getAttribute("contenteditable")).toBe("false");
+    const added = view.contentDOM.querySelector(".cm-changedLine");
+    const removed = view.contentDOM.querySelector(".cm-deletedLine");
+    expect(added?.textContent).toBe(modified);
+    expect(removed?.textContent).toBe(original);
+    for (const line of [added, removed]) {
+      const spans = [...line!.querySelectorAll("span")];
+      const keyword = spans.find((span) => span.textContent === "const");
+      const string = spans.find(
+        (span) =>
+          span.textContent?.includes('"') &&
+          span.className !== keyword?.className
+      );
+      expect(keyword?.className).toBeTruthy();
+      expect(string?.className).toBeTruthy();
+      expect(keyword?.className).not.toBe(string?.className);
+    }
+    expect(view.dom.querySelector(".cm-mergeButtons")).toBeNull();
+    const copy = [...document.querySelectorAll("button")].find(
+      (button) =>
+        button.getAttribute("aria-label") === "fileViewer.copyModified"
+    )!;
+    await act(async () => copy.click());
+    expect(write).toHaveBeenCalledWith(modified);
+    const wrap = document.querySelector(
+      'button[aria-pressed="true"]'
+    ) as HTMLButtonElement;
+    await act(async () => wrap.click());
+    expect(await editor()).toBe(view);
+    expect(getOriginalDoc(view.state).toString()).toBe(original);
+    const destroy = vi.spyOn(view, "destroy");
+    await render(edit(original, modified), false);
+    expect(destroy).toHaveBeenCalledOnce();
+    expect(document.querySelector(".cm-editor")).toBeNull();
+    expect(openDesktop).not.toHaveBeenCalled();
+  });
+
+  it("handles additions, full deletions and same-file snapshot replacement without stale original text", async () => {
+    await render(edit("", "const added = true;"));
+    const first = await editor();
+    expect(
+      first.contentDOM.querySelector(".cm-changedLine")?.textContent
+    ).toContain("const added");
+    const destroy = vi.spyOn(first, "destroy");
+    await render(edit("const deleted = true;", ""));
+    const second = await editor();
+    expect(destroy).toHaveBeenCalledOnce();
+    expect(getOriginalDoc(second.state).toString()).toBe(
+      "const deleted = true;"
+    );
+    expect(
+      second.contentDOM.querySelector(".cm-deletedLine")?.textContent
+    ).toContain("const deleted");
+    expect(second.state.doc.toString()).toBe("");
+    expect(document.body.textContent).not.toContain("fileViewer.empty");
+    await render(edit("const deleted = true;", "const modified = true;"));
+    expect(await editor()).toBe(second);
+    expect(second.state.doc.toString()).toBe("const modified = true;");
+    await render(edit("const same = true;", "const same = true;"));
+    expect(
+      (await editor()).contentDOM.querySelector(".cm-changedLine")
+    ).toBeNull();
+  });
+
+  it("does not diff independently truncated snapshots; keeps and copies the exact patch", async () => {
+    const item = edit("const before = 1;\n…", "const after = 2;\n…");
+    if (item.toolData?.kind !== "edit")
+      throw new Error("Expected edit fixture");
+    const patch = "@@ -1 +1 @@\n-const before = 1;\n+const after = 2;\n…";
+    await render({
+      ...item,
+      toolDataTruncated: true,
+      toolData: { ...item.toolData!, diff: patch },
+    });
+    expect((await editor()).state.doc.toString()).toBe(patch);
+    expect(document.querySelector(".cm-changedLine")).toBeNull();
+    expect(document.body.textContent).toContain("fileViewer.patchFallback");
+    const copy = [...document.querySelectorAll("button")].find(
+      (button) => button.getAttribute("aria-label") === "fileViewer.copyPatch"
+    )!;
+    await act(async () => copy.click());
+    expect(write).toHaveBeenCalledWith(patch);
+  });
+  it("opens the actual read-only editor locally, preserves offset and toggles wrap without remounting", async () => {
+    await render();
+    const view = await editor();
+    expect(
+      document.querySelector('[role="dialog"]')?.getAttribute("aria-label")
+    ).toBe("example.ts");
+    expect(view.state.readOnly).toBe(true);
+    expect(view.contentDOM.getAttribute("contenteditable")).toBe("false");
+    expect(view.state.doc.toString()).toBe(
+      "const value = '<safe>';\nconsole.log(value);"
+    );
+    expect(document.querySelector(".cm-lineNumbers")?.textContent).toContain(
+      "7"
+    );
+    expect(view.contentDOM.classList.contains("cm-lineWrapping")).toBe(true);
+    expect(openDesktop).not.toHaveBeenCalled();
+    await click('button[aria-pressed="true"]');
+    expect(await editor()).toBe(view);
+    expect(view.contentDOM.classList.contains("cm-lineWrapping")).toBe(false);
+    await click('[data-mobile-open-file="src/example.ts"]');
+    expect(openDesktop).toHaveBeenCalledTimes(1);
+  });
+
+  it.each([
+    ["/home/test/project/src/example.ts", "… / project / src"],
+    ["C:\\work\\project\\src\\example.ts", "… / project / src"],
+    ["src/example.ts", "src"],
+    ["example.ts", "fileViewer.fileLocation"],
+  ])(
+    "keeps %s exact while presenting a compact, expandable file identity",
+    async (filePath, directory) => {
+      const item = { ...file, toolData: { ...file.toolData!, filePath } };
+      await render(item);
+      const view = await editor();
+      const details = document.querySelector(
+        "details.mobile-file-identity"
+      ) as HTMLDetailsElement;
+      expect(
+        document.querySelector(
+          ".mobile-tool-preview.mobile-tool-preview--file.modal-fullscreen"
+        )
+      ).not.toBeNull();
+      const summary = details.querySelector("summary")!;
+      expect(
+        document.querySelector('[role="dialog"]')?.getAttribute("aria-label")
+      ).toBe("example.ts");
+      expect(
+        document.querySelector("[data-mobile-file-directory]")?.textContent
+      ).toBe(directory);
+      expect(details.querySelector("img")?.getAttribute("aria-hidden")).toBe(
+        "true"
+      );
+      expect(
+        details.querySelector("[data-mobile-file-full-path]")?.textContent
+      ).toBe(filePath);
+      expect(
+        document
+          .querySelector(".mobile-file-viewer [title]")
+          ?.getAttribute("title")
+      ).not.toBe(filePath);
+      expect(details.open).toBe(false);
+      expect(summary.tabIndex).toBe(0);
+      await act(async () => summary.click());
+      expect(details.open).toBe(true);
+      expect(await editor()).toBe(view);
+      expect(openDesktop).not.toHaveBeenCalled();
+      await click("[data-mobile-open-file]");
+      expect(openDesktop).toHaveBeenCalledWith(
+        expect.objectContaining({ filePath })
+      );
+      await render({
+        ...file,
+        toolData: {
+          ...file.toolData!,
+          filePath: "src/next.ts",
+          fileName: "next.ts",
+        },
+      });
+      expect(
+        (
+          document.querySelector(
+            "details.mobile-file-identity"
+          ) as HTMLDetailsElement
+        ).open
+      ).toBe(false);
+      expect(
+        document.querySelector('[role="dialog"]')?.getAttribute("aria-label")
+      ).toBe("next.ts");
+    }
+  );
+
+  it("copies the exact snapshot, recovers from clipboard errors and destroys the editor on close", async () => {
+    await render();
+    const view = await editor();
+    const destroy = vi.spyOn(view, "destroy");
+    write.mockRejectedValueOnce(new Error("denied"));
+    const copy = [...document.querySelectorAll("button")].find(
+      (button) => button.getAttribute("aria-label") === "actions.copy"
+    )!;
+    await act(async () => copy.click());
+    expect(document.querySelector('[role="alert"]')?.textContent).toContain(
+      "status.copyFailed"
+    );
+    await act(async () => copy.click());
+    expect(write).toHaveBeenLastCalledWith(view.state.doc.toString());
+    expect(copy.getAttribute("aria-label")).toBe("status.copied");
+    expect(copy.textContent).toBe("");
+    expect(document.querySelector('[role="status"]')?.textContent).toBe(
+      "status.copied"
+    );
+    await render(file, false);
+    expect(destroy).toHaveBeenCalledTimes(1);
+    expect(document.querySelector(".cm-editor")).toBeNull();
+    await render();
+    expect(await editor()).not.toBe(view);
+  });
+
+  it("keeps icon controls accessible during copying, suppresses repeat taps, and ignores results for a replaced file", async () => {
+    let finish!: () => void;
+    write.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          finish = resolve;
+        })
+    );
+    await render();
+    const view = await editor();
+    const copy = document.querySelector(
+      'button[aria-label="actions.copy"]'
+    ) as HTMLButtonElement;
+    const wrap = document.querySelector(
+      'button[aria-label="fileViewer.wrap"]'
+    ) as HTMLButtonElement;
+    for (const button of [copy, wrap]) {
+      expect(button.textContent).toBe("");
+      expect(button.querySelector('svg[aria-hidden="true"]')).not.toBeNull();
+      expect(button.classList.contains("min-h-11")).toBe(true);
+      expect(button.classList.contains("min-w-11")).toBe(true);
+      expect(button.title).toBe(button.getAttribute("aria-label"));
+    }
+    expect(wrap.getAttribute("aria-pressed")).toBe("true");
+    await act(async () => {
+      copy.click();
+      copy.click();
+    });
+    expect(write).toHaveBeenCalledOnce();
+    expect(copy.disabled).toBe(true);
+    expect(copy.getAttribute("aria-busy")).toBe("true");
+    await act(async () => wrap.click());
+    expect(wrap.getAttribute("aria-pressed")).toBe("false");
+    expect(await editor()).toBe(view);
+    await render({
+      ...file,
+      toolData: {
+        ...file.toolData!,
+        filePath: "src/next.ts",
+        fileName: "next.ts",
+        content: "const next = 2;",
+      },
+    });
+    await act(async () => finish());
+    const nextCopy = document.querySelector(
+      'button[aria-label="actions.copy"]'
+    ) as HTMLButtonElement;
+    expect(nextCopy.disabled).toBe(false);
+    expect(document.querySelector('[role="status"]')?.textContent).toBe("");
+    await act(async () => nextCopy.click());
+    expect(write).toHaveBeenLastCalledWith("const next = 2;");
+    expect(nextCopy.getAttribute("aria-label")).toBe("status.copied");
+    expect(openDesktop).not.toHaveBeenCalled();
+  });
+
+  it("collapses patch and truncation notices into one compact summary without losing the explanation", async () => {
+    const item = edit("before", "after");
+    if (item.toolData?.kind !== "edit")
+      throw new Error("Expected edit fixture");
+    await render({
+      ...item,
+      toolDataTruncated: true,
+      toolData: {
+        ...item.toolData,
+        diff: "@@ -1 +1 @@\n-before\n+after",
+      },
+    });
+    await editor();
+    const summary = document.querySelector("[aria-describedby]")!;
+    expect(summary.textContent).toBe("fileViewer.patch · fileViewer.partial");
+    const explanation = document.getElementById(
+      summary.getAttribute("aria-describedby")!
+    )!;
+    expect(explanation.classList.contains("sr-only")).toBe(true);
+    expect(explanation.textContent).toContain("fileViewer.patchFallback");
+    expect(explanation.textContent).toContain("transcript.tools.truncated");
+    expect(summary.getAttribute("title")).toBe(explanation.textContent);
+    expect(document.querySelector(".mobile-file-viewer p")).toBeNull();
+    await render(edit("before", "after"));
+    expect(document.body.textContent).not.toContain("fileViewer.partial");
+    expect(document.body.textContent).not.toContain("fileViewer.patchFallback");
+    expect(document.body.textContent).toContain("fileViewer.diff");
+  });
+
+  it.each(["", "  \n\t"])(
+    "renders exact empty/whitespace content %j",
+    async (content) => {
+      await render({ ...file, toolData: { ...file.toolData!, content } });
+      expect((await editor()).state.doc.toString()).toBe(content);
+      expect(document.body.textContent).not.toContain("fileViewer.unavailable");
+      expect(document.body.textContent?.includes("fileViewer.empty")).toBe(
+        content === ""
+      );
+    }
+  );
+
+  it("keeps missing snapshot distinct from empty and retains the truncation notice", async () => {
+    await render({
+      ...file,
+      toolDataTruncated: true,
+      toolData: { ...file.toolData!, content: undefined },
+    });
+    expect(document.querySelector(".cm-editor")).toBeNull();
+    expect(document.body.textContent).toContain("fileViewer.unavailable");
+    expect(document.body.textContent).toContain("transcript.tools.truncated");
+    expect(document.body.textContent).toContain("fileViewer.partial");
+    for (const label of ["actions.copy", "fileViewer.wrap"]) {
+      const button = document.querySelector(
+        `button[aria-label="${label}"]`
+      ) as HTMLButtonElement;
+      expect(button.disabled).toBe(true);
+      expect(button.textContent).toBe("");
+    }
+  });
+
+  it("switches files locally and ignores a stale Desktop response", async () => {
+    const item: TranscriptItem = {
+      ...file,
+      toolData: {
+        kind: "edit",
+        filePath: "a.ts",
+        fileName: "a.ts",
+        language: "typescript",
+        isDeleted: false,
+        applyPatchSegments: ["a", "b"].map((name) => ({
+          filePath: `${name}.ts`,
+          fileName: `${name}.ts`,
+          language: "typescript",
+          isDeleted: false,
+          oldContent: "",
+          newContent: `const ${name} = 1;`,
+          applyPatchSegments: [],
+        })),
+      },
+    };
+    let resolve!: () => void;
+    openDesktop.mockImplementationOnce(
+      () =>
+        new Promise<void>((done) => {
+          resolve = done;
+        })
+    );
+    await render(item);
+    const first = await editor();
+    const destroy = vi.spyOn(first, "destroy");
+    await click('[data-mobile-open-file="a.ts"]');
+    await click('[data-mobile-file-target="b.ts"]');
+    expect((await editor()).state.doc.toString()).toBe("const b = 1;");
+    expect(destroy).toHaveBeenCalledTimes(1);
+    await act(async () => resolve());
+    expect(
+      document.querySelector('[data-mobile-open-file="b.ts"]')?.textContent
+    ).toBe("fileViewer.openDesktop");
+    expect(openDesktop).toHaveBeenCalledTimes(1);
+    await render(item, false);
+    await render(item);
+    expect(
+      document
+        .querySelector('[data-mobile-file-target="a.ts"]')
+        ?.getAttribute("aria-pressed")
+    ).toBe("true");
+    expect((await editor()).state.doc.toString()).toBe("const a = 1;");
+    expect(openDesktop).toHaveBeenCalledTimes(1);
+  });
+
+  it("keeps content readable if an editor render fails", async () => {
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(themes, "getCodeMirrorTheme").mockImplementation(() => {
+      throw new Error("editor unavailable");
+    });
+    const target = {
+      targetIndex: 0,
+      fileName: "fallback.ts",
+      filePath: "fallback.ts",
+      content: "const fallback = true;",
+    };
+    await act(async () =>
+      root.render(
+        React.createElement(
+          MobileRemotePlatformProvider,
+          { platform } as MobileRemotePlatformProviderProps,
+          React.createElement(MobileFileViewer, {
+            target,
+            targets: [target],
+            onSelect: vi.fn(),
+            truncated: false,
+          })
+        )
+      )
+    );
+    await vi.waitFor(async () => {
+      await act(async () => {});
+      expect(host.querySelector("pre")?.textContent).toBe(target.content);
+    });
+    expect(host.textContent).toContain("fileViewer.plainTextFallback");
+  });
+
+  it("retains both exact source versions when the merge renderer fails, and recovers for the next file", async () => {
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    const theme = vi
+      .spyOn(themes, "getCodeMirrorTheme")
+      .mockImplementation(() => {
+        throw new Error("editor unavailable");
+      });
+    const before = '<img src="x" onerror="alert(1)">';
+    const after = "";
+    await render(edit(before, after));
+    await vi.waitFor(() =>
+      expect(document.body.textContent).toContain(
+        "fileViewer.plainTextFallback"
+      )
+    );
+    expect(
+      [...document.querySelectorAll("pre")].map((node) => node.textContent)
+    ).toEqual([before, after]);
+    expect(document.querySelector("pre img")).toBeNull();
+    theme.mockRestore();
+    await render(file);
+    expect((await editor()).state.doc.toString()).toBe(file.toolData.content);
+    expect(document.body.textContent).not.toContain(
+      "fileViewer.plainTextFallback"
+    );
+  });
+
+  it("keeps one visible merge editor and releases it on every repeated open/close cycle", async () => {
+    const item = edit("const before = false;", "const after = true;");
+    for (let index = 0; index < 3; index++) {
+      await render(item);
+      const view = await editor();
+      expect(document.querySelectorAll(".cm-editor")).toHaveLength(1);
+      const destroy = vi.spyOn(view, "destroy");
+      await render(item, false);
+      expect(destroy).toHaveBeenCalledOnce();
+      expect(document.querySelectorAll(".cm-editor")).toHaveLength(0);
+    }
+    expect(openDesktop).not.toHaveBeenCalled();
+  });
+
+  it("renders a diff as a snapshot and keeps long documents bounded without discarding source", async () => {
+    await render({
+      ...file,
+      toolData: {
+        kind: "edit",
+        filePath: "a.ts",
+        fileName: "a.ts",
+        language: "typescript",
+        isDeleted: false,
+        applyPatchSegments: [],
+        diff: "@@ -1 +1 @@\n-old\n+new",
+      },
+    });
+    expect((await editor()).state.doc.toString()).toContain("+new");
+    expect(document.body.textContent).toContain("fileViewer.patch");
+    const content = "const value = 1;\n".repeat(7_000);
+    await render({ ...file, toolData: { ...file.toolData!, content } });
+    const view = await editor();
+    expect(view.state.doc.toString()).toBe(content);
+    expect(syntaxTree(view.state).length).toBe(0);
+    expect(view.contentDOM.querySelectorAll(".cm-line").length).toBeLessThan(
+      7_000
+    );
+  });
+
+  it("highlights actual added/deleted lines in a multi-file diff, including after wrap and file switches", async () => {
+    const patch =
+      "--- /dev/null\n+++ b/example.ts\n@@ -0,0 +1,2 @@\n+import { useEffect } from 'react';\n+const ready = true;\n-old value";
+    const snapshot: TranscriptItem = {
+      ...file,
+      toolData: {
+        kind: "edit",
+        filePath: "example.ts",
+        fileName: "example.ts",
+        language: "typescript",
+        isDeleted: false,
+        applyPatchSegments: ["a", "b"].map((name) => ({
+          filePath: `${name}.ts`,
+          fileName: `${name}.ts`,
+          language: "typescript",
+          isDeleted: false,
+          applyPatchSegments: [],
+          diff: patch,
+        })),
+      },
+    };
+    await render(snapshot);
+    async function expectDiffHighlight() {
+      const view = await editor();
+      ensureSyntaxTree(view.state, view.state.doc.length, 100);
+      const inserted = highlightingFor(view.state, [tags.inserted]);
+      const deleted = highlightingFor(view.state, [tags.deleted]);
+      expect(inserted, "theme must define added-line styling").toBeTruthy();
+      const added = [...view.contentDOM.querySelectorAll(".cm-line")].find(
+        (line) => line.textContent?.startsWith("+import")
+      );
+      const removed = [...view.contentDOM.querySelectorAll(".cm-line")].find(
+        (line) => line.textContent === "-old value"
+      );
+      expect(added?.querySelector("span")?.className).toContain(inserted);
+      expect(removed?.querySelector("span")?.className).toContain(deleted);
+      expect(view.state.doc.toString()).toBe(patch);
+      return view;
+    }
+    const view = await expectDiffHighlight();
+    const wrap = [...document.querySelectorAll("button")].find(
+      (button) => button.getAttribute("aria-label") === "fileViewer.wrap"
+    )!;
+    await act(async () => wrap.click());
+    expect(await expectDiffHighlight()).toBe(view);
+    await click('[data-mobile-file-target="b.ts"]');
+    await expectDiffHighlight();
+    expect(openDesktop).not.toHaveBeenCalled();
+  });
+
+  it("highlights every added Markdown line even when transport truncation selects the raw patch fallback", async () => {
+    const patch = [
+      "--- /dev/null",
+      "+++ b/docs/mobile-search-recovery.md",
+      "@@ -0,0 +1,112 @@",
+      "+# Mobile Remote 会话搜索：恢复与请求生命周期",
+      "+",
+      "+日期：2026-09-08",
+      "+",
+      "+## 本轮范围",
+      "+",
+      "+在工作区已有的历史会话搜索功能上补齐失败恢复：明确的重试入口、翻页失败重试原游标、断线结束 loading。",
+      "…",
+    ].join("\n");
+    await render({
+      ...file,
+      toolDataTruncated: true,
+      toolData: {
+        kind: "edit",
+        filePath: "docs/mobile-search-recovery.md",
+        fileName: "mobile-search-recovery.md",
+        language: "markdown",
+        oldContent: "",
+        newContent: "# Mobile Remote\n…",
+        diff: patch,
+        isDeleted: false,
+        applyPatchSegments: [],
+      },
+    });
+    const view = await editor();
+    ensureSyntaxTree(view.state, view.state.doc.length, 100);
+    expect(view.state.doc.toString()).toBe(patch);
+    expect(document.body.textContent).toContain("fileViewer.patchFallback");
+    const inserted = highlightingFor(view.state, [tags.inserted]);
+    expect(inserted).toBeTruthy();
+    const addedLines = [...view.contentDOM.querySelectorAll(".cm-line")].filter(
+      (line) => line.textContent?.startsWith("+")
+    );
+    expect(addedLines).toHaveLength(8);
+    for (const line of addedLines) {
+      expect(line.querySelector("span")?.className).toContain(inserted);
+    }
+    expect(openDesktop).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/modules/MobileRemote/components/transcript/MobileFileViewer.tsx b/src/modules/MobileRemote/components/transcript/MobileFileViewer.tsx
new file mode 100644
index 0000000000..fcb56123a5
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileFileViewer.tsx
@@ -0,0 +1,157 @@
+import React, { Suspense, lazy, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import { MarkdownFallbackBoundary } from "@src/components/MarkDown/MarkdownFallbackBoundary";
+import { Placeholder } from "@src/components/Placeholder";
+import { createLogger } from "@src/hooks/logger";
+
+import { MobileFileViewerControls } from "./MobileFileViewerControls";
+import { type MobileFileTarget, mobileFilePreview } from "./mobileFileTool";
+import type { MobileDesktopFileAction } from "./useMobileFilePreview";
+
+const Editor = lazy(
+  () =>
+    import(
+      /* webpackChunkName: "mobile-readonly-editor" */ "./MobileReadonlyEditor"
+    )
+);
+
+export default function MobileFileViewer({
+  target,
+  targets,
+  onSelect,
+  truncated,
+  desktopAction,
+}: {
+  target: MobileFileTarget;
+  targets: MobileFileTarget[];
+  onSelect: (index: number) => void;
+  truncated: boolean;
+  desktopAction?: MobileDesktopFileAction;
+}) {
+  const { t } = useTranslation("mobileRemote");
+  const [wrap, setWrap] = useState(true);
+  const preview = mobileFilePreview(target, truncated);
+  const source = preview.content;
+  return (
+    <div className="mobile-file-viewer flex h-full min-h-0 flex-col">
+      <MobileFileViewerControls
+        target={target}
+        targets={targets}
+        onSelect={onSelect}
+        preview={preview}
+        truncated={truncated}
+        wrap={wrap}
+        onToggleWrap={() => setWrap((current) => !current)}
+      />
+      <div
+        className="relative min-h-0 flex-1 overflow-hidden"
+        data-mobile-file-document={target.filePath}
+      >
+        {source === undefined ? (
+          <Placeholder
+            placement="detail-panel"
+            variant="empty"
+            title={t("fileViewer.unavailable")}
+          />
+        ) : (
+          <>
+            {source.length === 0 && !preview.original && (
+              <span className="mobile-type-caption pointer-events-none absolute top-3 right-3 z-10 text-text-3">
+                {t("fileViewer.empty")}
+              </span>
+            )}
+            <MarkdownFallbackBoundary
+              resetKey={`${target.filePath}:${preview.original ?? ""}:${source}`}
+              label="Mobile file viewer"
+              fallback={
+                <div className="h-full overflow-auto p-3">
+                  <p
+                    role="status"
+                    className="mobile-type-caption mb-2 text-text-3"
+                  >
+                    {t("fileViewer.plainTextFallback")}
+                  </p>
+                  {preview.kind === "merge" && (
+                    <>
+                      <p className="mobile-type-caption text-text-3">
+                        {t("fileViewer.original")}
+                      </p>
+                      <pre
+                        className={`chat-code ${wrap ? "break-words whitespace-pre-wrap" : "whitespace-pre"}`}
+                      >
+                        {preview.original}
+                      </pre>
+                      <p className="mobile-type-caption mt-3 text-text-3">
+                        {t("fileViewer.modified")}
+                      </p>
+                    </>
+                  )}
+                  <pre
+                    className={`chat-code ${wrap ? "break-words whitespace-pre-wrap" : "whitespace-pre"}`}
+                  >
+                    {source}
+                  </pre>
+                </div>
+              }
+            >
+              <Suspense
+                fallback={
+                  <Placeholder
+                    placement="detail-panel"
+                    variant="loading"
+                    title={t("transcript.tools.loadingPreview")}
+                  />
+                }
+              >
+                <Editor
+                  key={`${target.targetIndex}:${target.filePath}`}
+                  content={source}
+                  original={preview.original}
+                  filePath={target.filePath}
+                  language={preview.kind === "patch" ? "diff" : target.language}
+                  startLine={preview.kind === "patch" ? 1 : target.line}
+                  wrap={wrap}
+                />
+              </Suspense>
+            </MarkdownFallbackBoundary>
+          </>
+        )}
+      </div>
+      {desktopAction && (
+        <div className="shrink-0 border-t border-border-2 px-3 py-1">
+          {desktopAction.state.phase === "failed" && (
+            <p role="alert" className="mobile-type-caption text-danger-6">
+              {t("transcript.tools.openFileFailed", {
+                message: desktopAction.state.message,
+              })}
+            </p>
+          )}
+          <Button
+            size="small"
+            appearance="ghost"
+            className="min-h-11"
+            loading={desktopAction.state.phase === "opening"}
+            onClick={() => {
+              void desktopAction
+                .open()
+                .catch((error) =>
+                  logger.warn("Desktop navigation failed", error)
+                );
+            }}
+            data-mobile-open-file={target.filePath}
+          >
+            {t(
+              desktopAction.state.phase === "requested"
+                ? "transcript.tools.fileOpenRequested"
+                : "fileViewer.openDesktop"
+            )}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
+
+const logger = createLogger("MobileFileViewer");
diff --git a/src/modules/MobileRemote/components/transcript/MobileFileViewerControls.tsx b/src/modules/MobileRemote/components/transcript/MobileFileViewerControls.tsx
new file mode 100644
index 0000000000..fcb95013b5
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileFileViewerControls.tsx
@@ -0,0 +1,160 @@
+import React, { useId } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import IconButton from "@src/components/Button";
+import {
+  Copy01Icon,
+  HugeiconsIcon,
+  Loading03Icon,
+  TextWrapIcon,
+  Tick01Icon,
+} from "@src/icons";
+
+import type { MobileFileTarget, mobileFilePreview } from "./mobileFileTool";
+import { useMobileCopyText } from "./useMobileCopyText";
+
+interface MobileFileViewerControlsProps {
+  target: MobileFileTarget;
+  targets: MobileFileTarget[];
+  onSelect: (index: number) => void;
+  preview: ReturnType<typeof mobileFilePreview>;
+  truncated: boolean;
+  wrap: boolean;
+  onToggleWrap: () => void;
+}
+
+/** Local document controls; no transcript, connection or Desktop request ownership. */
+export function MobileFileViewerControls({
+  target,
+  targets,
+  onSelect,
+  preview,
+  truncated,
+  wrap,
+  onToggleWrap,
+}: MobileFileViewerControlsProps) {
+  const { t } = useTranslation("mobileRemote");
+  const { t: common } = useTranslation("common");
+  const previewDescriptionId = useId();
+  const source = preview.content;
+  const clipboard = useMobileCopyText(source ?? "");
+  const copyLabel =
+    clipboard.state === "copied"
+      ? common("status.copied")
+      : preview.kind === "merge"
+        ? t("fileViewer.copyModified")
+        : preview.kind === "patch"
+          ? t("fileViewer.copyPatch")
+          : common("actions.copy");
+  const previewDescription = [
+    truncated ? t("transcript.tools.truncated") : "",
+    preview.kind === "patch" ? t("fileViewer.patchFallback") : "",
+  ]
+    .filter(Boolean)
+    .join(" · ");
+  return (
+    <div className="shrink-0 border-b border-border-2 px-3 pb-2">
+      {targets.length > 1 && (
+        <div
+          className="flex gap-1 overflow-x-auto pt-2"
+          aria-label={t("fileViewer.files")}
+        >
+          {targets.map((file) => (
+            <Button
+              key={`${file.targetIndex}:${file.filePath}`}
+              size="small"
+              className="min-h-11 max-w-56 shrink-0"
+              appearance={
+                target.targetIndex === file.targetIndex ? "solid" : "ghost"
+              }
+              aria-pressed={target.targetIndex === file.targetIndex}
+              onClick={() => onSelect(file.targetIndex)}
+              data-mobile-file-target={file.filePath}
+            >
+              <span className="truncate">{file.fileName}</span>
+            </Button>
+          ))}
+        </div>
+      )}
+      <div className="flex min-h-11 items-center gap-1">
+        <span
+          className="mobile-type-caption mr-auto min-w-0 text-text-3"
+          title={previewDescription || undefined}
+          aria-describedby={
+            previewDescription ? previewDescriptionId : undefined
+          }
+        >
+          {t(
+            preview.kind === "snapshot"
+              ? "fileViewer.snapshot"
+              : preview.kind === "patch"
+                ? "fileViewer.patch"
+                : "fileViewer.diff"
+          )}
+          {truncated && <> · {t("fileViewer.partial")}</>}
+        </span>
+        <IconButton
+          appearance="soft"
+          htmlType="button"
+          size="large"
+          variant={clipboard.state === "copied" ? "success" : "tertiary"}
+          className="min-h-11 min-w-11 shrink-0 rounded-lg focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
+          disabled={source === undefined || clipboard.state === "pending"}
+          aria-busy={clipboard.state === "pending"}
+          aria-label={copyLabel}
+          title={copyLabel}
+          onClick={clipboard.copy}
+        >
+          <HugeiconsIcon
+            icon={
+              clipboard.state === "copied"
+                ? Tick01Icon
+                : clipboard.state === "pending"
+                  ? Loading03Icon
+                  : Copy01Icon
+            }
+            size={18}
+            strokeWidth={1.75}
+            aria-hidden="true"
+            className={
+              clipboard.state === "pending" ? "animate-spin" : undefined
+            }
+          />
+        </IconButton>
+        <IconButton
+          appearance="soft"
+          htmlType="button"
+          size="large"
+          className="min-h-11 min-w-11 shrink-0 rounded-lg focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
+          aria-label={t("fileViewer.wrap")}
+          title={t("fileViewer.wrap")}
+          aria-pressed={wrap}
+          variant={wrap ? "primary" : "tertiary"}
+          disabled={source === undefined}
+          onClick={onToggleWrap}
+        >
+          <HugeiconsIcon
+            icon={TextWrapIcon}
+            size={18}
+            strokeWidth={1.75}
+            aria-hidden="true"
+          />
+        </IconButton>
+      </div>
+      {previewDescription && (
+        <span id={previewDescriptionId} className="sr-only">
+          {previewDescription}
+        </span>
+      )}
+      <span role="status" className="sr-only">
+        {clipboard.state === "copied" ? common("status.copied") : ""}
+      </span>
+      {clipboard.state === "failed" && (
+        <p role="alert" className="mobile-type-caption text-danger-6">
+          {common("status.copyFailed")}
+        </p>
+      )}
+    </div>
+  );
+}
diff --git a/src/modules/MobileRemote/components/transcript/MobileGenericToolDetail.tsx b/src/modules/MobileRemote/components/transcript/MobileGenericToolDetail.tsx
new file mode 100644
index 0000000000..3524859cf1
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileGenericToolDetail.tsx
@@ -0,0 +1,64 @@
+import React from "react";
+
+interface MobileGenericToolDetailProps {
+  itemId: string;
+  summary: string;
+  metadataText: string;
+  output: string;
+  truncated: boolean;
+  detailsLabel: string;
+  outputLabel: string;
+  truncatedLabel: string;
+}
+
+/** Read-only fallback for tools without a dedicated mobile presentation. */
+export function MobileGenericToolDetail({
+  itemId,
+  summary,
+  metadataText,
+  output,
+  truncated,
+  detailsLabel,
+  outputLabel,
+  truncatedLabel,
+}: MobileGenericToolDetailProps) {
+  return (
+    <div
+      data-mobile-tool-detail={itemId}
+      data-mobile-tool-detail-kind="generic"
+    >
+      {summary ? (
+        <pre className="mobile-tool-preview__summary mobile-type-code">
+          {summary}
+        </pre>
+      ) : null}
+      {metadataText ? (
+        <section className="mobile-tool-preview__section">
+          <div className="mobile-tool-preview__label mobile-type-caption">
+            {detailsLabel}
+          </div>
+          <pre className="mobile-tool-preview__code mobile-type-code">
+            {metadataText}
+          </pre>
+        </section>
+      ) : null}
+      {output ? (
+        <section className="mobile-tool-preview__section">
+          <div className="mobile-tool-preview__label mobile-type-caption">
+            {outputLabel}
+          </div>
+          <pre className="mobile-tool-preview__code mobile-type-code">
+            {output}
+          </pre>
+        </section>
+      ) : null}
+      {truncated ? (
+        <p className="mobile-tool-detail__truncated mobile-type-caption text-text-3">
+          {truncatedLabel}
+        </p>
+      ) : null}
+    </div>
+  );
+}
+
+MobileGenericToolDetail.displayName = "MobileGenericToolDetail";
diff --git a/src/modules/MobileRemote/components/transcript/MobileMessageImages.test.ts b/src/modules/MobileRemote/components/transcript/MobileMessageImages.test.ts
new file mode 100644
index 0000000000..9b7e784da1
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileMessageImages.test.ts
@@ -0,0 +1,197 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import {
+  MobileMessageImages,
+  createImageRetention,
+} from "./MobileMessageImages";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+vi.mock("@src/components/Button", () => ({
+  default: ({
+    children,
+    variant: _variant,
+    ...props
+  }: React.ButtonHTMLAttributes<HTMLButtonElement> & { variant?: string }) =>
+    React.createElement("button", props, children),
+}));
+vi.mock("@src/scaffold/ModalSystem", () => ({
+  default: ({ children }: { children: React.ReactNode }) =>
+    React.createElement("div", { role: "dialog" }, children),
+}));
+
+describe("MobileMessageImages", () => {
+  it("bounds retained previews and releases unmounted entries", () => {
+    const retention = createImageRetention();
+    const first = vi.fn();
+    retention.retain("first", first);
+    for (let i = 0; i < 8; i += 1) retention.retain(String(i), vi.fn());
+    expect(first).toHaveBeenCalledOnce();
+    const disposed = vi.fn();
+    retention.retain("removed", disposed)();
+    for (let i = 10; i < 20; i += 1) retention.retain(String(i), vi.fn());
+    expect(disposed).not.toHaveBeenCalled();
+  });
+  let root: Root;
+  let container: HTMLDivElement;
+  beforeEach(() => {
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+    container = document.createElement("div");
+    document.body.append(container);
+    root = createRoot(container);
+  });
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+  });
+  const url = "data:image/jpeg;base64,aGVsbG8=";
+  it("loads only on demand, single-flights clicks, then opens a preview", async () => {
+    let resolve!: (value: string) => void;
+    const load = vi.fn(
+      () =>
+        new Promise<string>((done) => {
+          resolve = done;
+        })
+    );
+    act(() =>
+      root.render(
+        React.createElement(MobileMessageImages, {
+          eventId: "e",
+          count: 1,
+          loadImage: load,
+        })
+      )
+    );
+    expect(load).not.toHaveBeenCalled();
+    act(() => {
+      container.querySelector("button")!.click();
+      container.querySelector("button")!.click();
+    });
+    expect(load).toHaveBeenCalledTimes(1);
+    expect(container.textContent).toContain("images.loading");
+    await act(async () => resolve(url));
+    expect(container.querySelector("img")?.src).toBe(url);
+    act(() => container.querySelector("button")!.click());
+    expect(container.querySelector('[role="dialog"]')).not.toBeNull();
+  });
+  it("supports failure followed by retry", async () => {
+    const load = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("offline"))
+      .mockResolvedValue(url);
+    act(() =>
+      root.render(
+        React.createElement(MobileMessageImages, {
+          eventId: "e",
+          count: 1,
+          loadImage: load,
+        })
+      )
+    );
+    await act(async () => container.querySelector("button")!.click());
+    expect(container.textContent).toContain("images.retry");
+    await act(async () => container.querySelector("button")!.click());
+    expect(container.querySelector("img")?.src).toBe(url);
+  });
+  it("discards late responses after changing desktop and does not retain its image", async () => {
+    let resolve!: (value: string) => void;
+    const oldLoad = () =>
+      new Promise<string>((done) => {
+        resolve = done;
+      });
+    act(() =>
+      root.render(
+        React.createElement(MobileMessageImages, {
+          eventId: "e",
+          count: 1,
+          loadImage: oldLoad,
+        })
+      )
+    );
+    act(() => container.querySelector("button")!.click());
+    act(() =>
+      root.render(
+        React.createElement(MobileMessageImages, { eventId: "e", count: 1 })
+      )
+    );
+    await act(async () => resolve(url));
+    expect(container.querySelector("img")).toBeNull();
+    expect(container.querySelector("button")!.disabled).toBe(true);
+  });
+  it("allows an already loaded preview offline and retries decode failures only after reconnect", async () => {
+    const load = vi.fn().mockResolvedValue(url);
+    const render = (available: boolean) =>
+      act(() =>
+        root.render(
+          React.createElement(MobileMessageImages, {
+            eventId: "e",
+            count: 1,
+            loadImage: available ? load : undefined,
+          })
+        )
+      );
+    render(true);
+    await act(async () => container.querySelector("button")!.click());
+    render(false);
+    act(() => container.querySelector("button")!.click());
+    expect(
+      container.querySelector('[role="dialog"] img')?.getAttribute("src")
+    ).toBe(url);
+    act(() =>
+      container.querySelector("img")!.dispatchEvent(new Event("error"))
+    );
+    expect(container.querySelector('[role="dialog"]')).toBeNull();
+    expect(container.querySelector("button")!.disabled).toBe(true);
+    render(true);
+    expect(container.textContent).toContain("images.retry");
+    await act(async () => container.querySelector("button")!.click());
+    expect(container.querySelector("img")?.getAttribute("src")).toBe(url);
+    expect(load).toHaveBeenCalledTimes(2);
+  });
+  it("retires interrupted requests and only accepts a fresh explicit request after reconnect", async () => {
+    let resolve!: (value: string) => void;
+    const oldLoad = vi.fn(
+      () =>
+        new Promise<string>((done) => {
+          resolve = done;
+        })
+    );
+    const render = (
+      loadImage?: (eventId: string, index: number) => Promise<string>
+    ) =>
+      act(() =>
+        root.render(
+          React.createElement(MobileMessageImages, {
+            eventId: "e",
+            count: 1,
+            loadImage,
+          })
+        )
+      );
+    render(oldLoad);
+    act(() => container.querySelector("button")!.click());
+    render();
+    expect(container.querySelector("button")!.disabled).toBe(true);
+    const restoredLoad = vi.fn().mockResolvedValue(url);
+    render(restoredLoad);
+    expect(restoredLoad).not.toHaveBeenCalled();
+    await act(async () => container.querySelector("button")!.click());
+    await act(async () => resolve("data:image/jpeg;base64,b2xk"));
+    expect(container.querySelector("img")?.getAttribute("src")).toBe(url);
+    expect(restoredLoad).toHaveBeenCalledOnce();
+  });
+  it("has no requests or controls for a message without images", () => {
+    act(() =>
+      root.render(
+        React.createElement(MobileMessageImages, { eventId: "e", count: 0 })
+      )
+    );
+    expect(container.innerHTML).toBe("");
+  });
+});
diff --git a/src/modules/MobileRemote/components/transcript/MobileMessageImages.tsx b/src/modules/MobileRemote/components/transcript/MobileMessageImages.tsx
new file mode 100644
index 0000000000..76b6e78f03
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileMessageImages.tsx
@@ -0,0 +1,182 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Button from "@src/components/Button";
+import { createLogger } from "@src/hooks/logger";
+import Modal from "@src/scaffold/ModalSystem";
+
+export type LoadMessageImage = (
+  eventId: string,
+  imageIndex: number
+) => Promise<string>;
+
+/** One transcript owns at most eight decoded previews; no app-global cache. */
+export function createImageRetention() {
+  const retained = new Map<string, () => void>();
+  return {
+    retain(key: string, evict: () => void) {
+      retained.get(key)?.();
+      retained.delete(key);
+      retained.set(key, evict);
+      while (retained.size > 8) {
+        const oldest = retained.keys().next().value!;
+        const dispose = retained.get(oldest)!;
+        retained.delete(oldest);
+        dispose();
+      }
+      return () => {
+        if (retained.get(key) === evict) retained.delete(key);
+      };
+    },
+  };
+}
+type ImageRetention = ReturnType<typeof createImageRetention>;
+
+/** Images are explicitly loaded, not embedded in every transcript snapshot. */
+function MessageImage({
+  eventId,
+  index,
+  loadImage,
+  retention,
+}: {
+  eventId: string;
+  index: number;
+  loadImage?: LoadMessageImage;
+  retention?: ImageRetention;
+}) {
+  const { t } = useTranslation("mobileRemote");
+  const generation = useRef(0);
+  const busy = useRef(false);
+  const release = useRef<(() => void) | undefined>(undefined);
+  const [state, setState] = useState<{
+    phase: "loading" | "ready" | "error";
+    url?: string;
+  }>();
+  const [open, setOpen] = useState(false);
+  useEffect(() => {
+    busy.current = false;
+    setState(undefined);
+    setOpen(false);
+    return () => {
+      generation.current += 1;
+      release.current?.();
+    };
+  }, [eventId, index, retention]);
+  useEffect(() => {
+    // Transport availability is not image ownership. Keep completed previews
+    // across reconnects, but never accept a result from a retired RPC client.
+    busy.current = false;
+    setState((current) => (current?.phase === "loading" ? undefined : current));
+    return () => {
+      generation.current += 1;
+    };
+  }, [loadImage]);
+  const current = state;
+  const load = async () => {
+    if (!loadImage || busy.current) return;
+    busy.current = true;
+    const request = generation.current;
+    setState({ phase: "loading" });
+    try {
+      const url = await loadImage(eventId, index);
+      if (request === generation.current) {
+        release.current?.();
+        release.current = retention?.retain(`${eventId}:${index}`, () => {
+          setState(undefined);
+          setOpen(false);
+        });
+        setState({ phase: "ready", url });
+      }
+    } catch {
+      if (request === generation.current) setState({ phase: "error" });
+    } finally {
+      if (request === generation.current) busy.current = false;
+    }
+  };
+  const fail = () => {
+    release.current?.();
+    setState({ phase: "error" });
+    setOpen(false);
+  };
+  const label = t("images.label", { number: index + 1 });
+  return (
+    <div className="my-2" aria-busy={current?.phase === "loading"}>
+      {current?.phase === "ready" && current.url ? (
+        <>
+          <Button
+            variant="secondary"
+            appearance="ghost"
+            className="max-w-full"
+            style={{ height: "auto", minHeight: 44, padding: 0 }}
+            aria-label={label}
+            onClick={() => setOpen(true)}
+          >
+            <img
+              src={current.url}
+              alt={label}
+              className="max-h-64 max-w-full rounded-lg object-contain"
+              onError={fail}
+            />
+          </Button>
+          {open && (
+            <Modal visible title={label} onClose={() => setOpen(false)}>
+              <img
+                src={current.url}
+                alt={label}
+                className="h-auto w-full object-contain"
+                onError={fail}
+              />
+            </Modal>
+          )}
+        </>
+      ) : (
+        <Button
+          variant="secondary"
+          style={{ minHeight: 44 }}
+          disabled={!loadImage || current?.phase === "loading"}
+          onClick={() => {
+            void load().catch((error) =>
+              logger.warn("Background operation failed", error)
+            );
+          }}
+        >
+          {!loadImage
+            ? t("images.unavailable")
+            : current?.phase === "loading"
+              ? t("images.loading")
+              : current?.phase === "error"
+                ? t("images.retry")
+                : t("images.load", { number: index + 1 })}
+        </Button>
+      )}
+    </div>
+  );
+}
+
+export function MobileMessageImages({
+  eventId,
+  count,
+  loadImage,
+  retention,
+}: {
+  eventId: string;
+  count: number;
+  loadImage?: LoadMessageImage;
+  retention?: ImageRetention;
+}) {
+  return (
+    <>
+      {Array.from({ length: Math.min(Math.max(0, count), 8) }, (_, index) => (
+        <MessageImage
+          key={`${eventId}:${index}`}
+          eventId={eventId}
+          index={index}
+          loadImage={loadImage}
+          retention={retention}
+        />
+      ))}
+    </>
+  );
+}
+
+const logger = createLogger("MobileMessageImages");
diff --git a/src/modules/MobileRemote/components/transcript/MobileReadonlyEditor.tsx b/src/modules/MobileRemote/components/transcript/MobileReadonlyEditor.tsx
new file mode 100644
index 0000000000..98b66d1a96
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileReadonlyEditor.tsx
@@ -0,0 +1,99 @@
+import { StreamLanguage } from "@codemirror/language";
+import { diff } from "@codemirror/legacy-modes/mode/diff";
+import { unifiedMergeView } from "@codemirror/merge";
+import { EditorView, lineNumbers } from "@codemirror/view";
+import CodeMirror from "@uiw/react-codemirror";
+import React, { memo, useMemo } from "react";
+
+import { codeMirrorCspNonceExtension } from "@src/features/CodeMirror/config/csp";
+import {
+  CODEMIRROR_BASE_LAYOUT_THEME,
+  getCodeMirrorTheme,
+} from "@src/features/CodeMirror/config/themeConfig";
+import { getLanguageExtension } from "@src/features/CodeMirror/shared/languageExtensions";
+import { MERGE_THEME_OVERRIDE } from "@src/features/CodeMirror/shared/mergeTheme";
+
+const setup = {
+  lineNumbers: false,
+  foldGutter: false,
+  highlightActiveLine: false,
+  highlightActiveLineGutter: false,
+  autocompletion: false,
+  history: false,
+  searchKeymap: false,
+};
+const diffLanguage = StreamLanguage.define(diff);
+
+/** Workstation's engine/theme/languages without Desktop services or writes. */
+export default memo(function MobileReadonlyEditor({
+  content,
+  original,
+  filePath,
+  language,
+  startLine = 1,
+  wrap,
+  height = "100%",
+}: {
+  content: string;
+  original?: string;
+  filePath: string;
+  language?: string;
+  startLine?: number;
+  wrap: boolean;
+  height?: "100%" | "auto";
+}) {
+  const highlight = content.length <= 100_000;
+  // Keep the diff extension stable when only wrapping or editor layout changes.
+  const merge = useMemo(
+    () =>
+      original === undefined
+        ? []
+        : [
+            MERGE_THEME_OVERRIDE,
+            unifiedMergeView({
+              original,
+              mergeControls: false,
+              highlightChanges: true,
+              syntaxHighlightDeletions: true,
+              syntaxHighlightDeletionsMaxLength: 20_000,
+              diffConfig: { scanLimit: 500, timeout: 50 },
+            }),
+          ],
+    [original]
+  );
+  const extensions = useMemo(() => {
+    const syntax = highlight
+      ? language === "diff"
+        ? diffLanguage
+        : getLanguageExtension(filePath, language)
+      : null;
+    return [
+      codeMirrorCspNonceExtension,
+      CODEMIRROR_BASE_LAYOUT_THEME,
+      lineNumbers({ formatNumber: (line) => String(line + startLine - 1) }),
+      EditorView.contentAttributes.of({
+        "aria-label": filePath,
+        tabindex: "0",
+      }),
+      ...(syntax ? [syntax] : []),
+      ...merge,
+      ...(wrap ? [EditorView.lineWrapping] : []),
+    ];
+  }, [highlight, filePath, language, startLine, wrap, merge]);
+  return (
+    <CodeMirror
+      // The library initializes the original document once. A new snapshot
+      // gets a fresh editor; wrapping keeps the same editor and scroll state.
+      key={original}
+      value={content}
+      readOnly
+      editable={false}
+      autoFocus={false}
+      height={height}
+      theme={getCodeMirrorTheme()}
+      basicSetup={setup}
+      extensions={extensions}
+      className="mobile-readonly-editor h-full min-h-0"
+    />
+  );
+});
diff --git a/src/modules/MobileRemote/components/transcript/MobileSearchDetail.tsx b/src/modules/MobileRemote/components/transcript/MobileSearchDetail.tsx
new file mode 100644
index 0000000000..1620b9584c
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileSearchDetail.tsx
@@ -0,0 +1,61 @@
+import React from "react";
+
+import { HugeiconsIcon, Search01Icon } from "@src/icons";
+
+import type { MobileSearchDetail as MobileSearchDetailModel } from "./mobileToolPresentation";
+
+interface MobileSearchDetailProps extends MobileSearchDetailModel {
+  isLoading: boolean;
+  isFailed: boolean;
+  truncated: boolean;
+  truncatedLabel: string;
+}
+
+/** Narrow-screen counterpart to Desktop's SearchBlock presentation. */
+export function MobileSearchDetail({
+  query,
+  output,
+  isLoading,
+  isFailed,
+  truncated,
+  truncatedLabel,
+}: MobileSearchDetailProps) {
+  const state = isFailed ? "failed" : isLoading ? "running" : "done";
+
+  return (
+    <section
+      className="mobile-search-detail"
+      data-mobile-tool-detail-kind="search"
+      data-mobile-tool-detail-state={state}
+    >
+      <div className="mobile-search-detail__frame">
+        {query ? (
+          <div className="mobile-search-detail__query">
+            <HugeiconsIcon
+              icon={Search01Icon}
+              size={16}
+              strokeWidth={1.75}
+              aria-hidden="true"
+            />
+            <pre>{query}</pre>
+          </div>
+        ) : null}
+        {output ? (
+          <pre
+            className="mobile-search-detail__results"
+            aria-live={isLoading ? "polite" : undefined}
+          >
+            {output}
+          </pre>
+        ) : null}
+      </div>
+      {truncated ? (
+        <p className="mobile-tool-detail__truncated mobile-type-caption text-text-3">
+          {truncatedLabel}
+        </p>
+      ) : null}
+    </section>
+  );
+}
+
+MobileSearchDetail.displayName = "MobileSearchDetail";
diff --git a/src/modules/MobileRemote/components/transcript/MobileTerminalDetail.tsx b/src/modules/MobileRemote/components/transcript/MobileTerminalDetail.tsx
new file mode 100644
index 0000000000..b5cf287881
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileTerminalDetail.tsx
@@ -0,0 +1,64 @@
+import Ansi from "ansi-to-react";
+import React, { useMemo } from "react";
+
+import { processAnsiContent } from "@src/engines/TerminalCore/components/TerminalDisplay/utils/ansiProcessor";
+
+import type { MobileShellDetail } from "./mobileToolPresentation";
+
+interface MobileTerminalDetailProps extends MobileShellDetail {
+  isLoading: boolean;
+  isFailed: boolean;
+  truncated: boolean;
+  truncatedLabel: string;
+}
+
+/** iOS counterpart to Desktop's TerminalBlock content presentation. */
+export function MobileTerminalDetail({
+  command,
+  output,
+  exitCode,
+  isLoading,
+  isFailed,
+  truncated,
+  truncatedLabel,
+}: MobileTerminalDetailProps) {
+  const processedOutput = useMemo(() => processAnsiContent(output), [output]);
+  const state = isFailed ? "failed" : isLoading ? "running" : "done";
+
+  return (
+    <section
+      className="mobile-terminal-detail"
+      data-mobile-tool-detail-kind="shell"
+      data-mobile-tool-detail-state={state}
+    >
+      <div className="mobile-terminal-detail__frame">
+        {command ? (
+          <div className="mobile-terminal-detail__command">
+            <span className="mobile-terminal-detail__prompt" aria-hidden="true">
+              $
+            </span>
+            <pre>{command}</pre>
+          </div>
+        ) : null}
+        {output ? (
+          <pre
+            className="mobile-terminal-detail__output"
+            aria-live={isLoading ? "polite" : undefined}
+          >
+            <Ansi>{processedOutput}</Ansi>
+          </pre>
+        ) : null}
+        {!isLoading && exitCode !== undefined && exitCode !== 0 ? (
+          <div className="mobile-terminal-detail__exit">exit {exitCode}</div>
+        ) : null}
+      </div>
+      {truncated ? (
+        <p className="mobile-terminal-detail__truncated mobile-type-caption text-text-3">
+          {truncatedLabel}
+        </p>
+      ) : null}
+    </section>
+  );
+}
+
+MobileTerminalDetail.displayName = "MobileTerminalDetail";
diff --git a/src/modules/MobileRemote/components/transcript/MobileToolCall.test.ts b/src/modules/MobileRemote/components/transcript/MobileToolCall.test.ts
index e738ee9744..6be2345a70 100644
--- a/src/modules/MobileRemote/components/transcript/MobileToolCall.test.ts
+++ b/src/modules/MobileRemote/components/transcript/MobileToolCall.test.ts
@@ -8,12 +8,12 @@ import { _resetToolRegistry } from "@src/engines/SessionCore/rendering/registry/
 import { BookOpen02Icon, Search01Icon, Wrench01Icon } from "@src/icons";
 
 import type { TranscriptItem } from "../../lib/transcriptReducer";
+import { MobileToolCall } from "./MobileToolCall";
 import {
-  MobileToolCall,
   mobileToolSummary,
   normalizeMobileToolLifecycle,
   resolveMobileToolIconName,
-} from "./MobileToolCall";
+} from "./mobileToolPresentation";
 
 vi.mock("react-i18next", () => ({
   useTranslation: () => ({ t: (key: string) => key }),
diff --git a/src/modules/MobileRemote/components/transcript/MobileToolCall.tsx b/src/modules/MobileRemote/components/transcript/MobileToolCall.tsx
index ad7e7b11d5..09ee7aee8f 100644
--- a/src/modules/MobileRemote/components/transcript/MobileToolCall.tsx
+++ b/src/modules/MobileRemote/components/transcript/MobileToolCall.tsx
@@ -19,10 +19,6 @@ import type { TranscriptItem } from "../../lib/transcriptReducer";
 import { record, stringValue } from "./mobileToolPresentation";
 import { useMobileToolPresentation } from "./useMobileToolPresentation";
 
-export {
-  MobileToolDetailSheet,
-  type MobileToolDetailSheetProps,
-} from "./MobileToolDetailSheet";
 export {
   mobileToolSummary,
   normalizeMobileToolLifecycle,
diff --git a/src/modules/MobileRemote/components/transcript/MobileToolDetailModal.test.ts b/src/modules/MobileRemote/components/transcript/MobileToolDetailModal.test.ts
new file mode 100644
index 0000000000..f567294024
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileToolDetailModal.test.ts
@@ -0,0 +1,275 @@
+// @vitest-environment jsdom
+import React, { act, useState } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { TranscriptItem } from "../../lib/transcriptReducer";
+import {
+  MobileRemotePlatformProvider,
+  type MobileRemotePlatformProviderProps,
+} from "../../platform/MobileRemotePlatformContext";
+import { createBrowserMobileRemotePlatform } from "../../platform/browser";
+import { MobileToolDetailModal } from "./MobileToolDetailModal";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+const command: TranscriptItem = {
+  id: "command-preview",
+  kind: "tool",
+  text: "run_shell",
+  toolCanonical: "run_shell",
+  toolStatus: "completed",
+  toolData: {
+    kind: "shell",
+    command: "pnpm test",
+    output: "Checks passed",
+    exitCode: 0,
+    isFailure: false,
+  },
+};
+
+function Harness({ item }: { item: TranscriptItem }) {
+  const [open, setOpen] = useState(false);
+  return React.createElement(
+    MobileRemotePlatformProvider,
+    {
+      platform: createBrowserMobileRemotePlatform(),
+    } as MobileRemotePlatformProviderProps,
+    React.createElement("button", { onClick: () => setOpen(true) }, "Preview"),
+    React.createElement(MobileToolDetailModal, {
+      item,
+      open,
+      onClose: () => setOpen(false),
+    })
+  );
+}
+
+describe("Mobile tool fullscreen preview", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.unstubAllGlobals();
+  });
+
+  async function open(item = command) {
+    await act(async () => root.render(React.createElement(Harness, { item })));
+    const trigger = container.querySelector("button")!;
+    trigger.focus();
+    await act(async () => trigger.click());
+    return trigger;
+  }
+
+  it("opens an edge-to-edge named dialog and Escape restores the mounted conversation", async () => {
+    const trigger = await open();
+    expect(
+      document.querySelector(".mobile-tool-preview.modal-fullscreen")
+    ).not.toBeNull();
+    expect(document.querySelector(".orgii-bottom-sheet-panel")).toBeNull();
+    expect(
+      document.querySelector('[role="dialog"]')?.getAttribute("aria-label")
+    ).toBeTruthy();
+    expect(
+      document.querySelector(".mobile-tool-preview__body")?.textContent
+    ).toContain("Checks passed");
+    const terminal = document.querySelector(
+      '[data-mobile-tool-detail-kind="shell"]'
+    );
+    expect(terminal?.getAttribute("data-mobile-tool-detail-state")).toBe(
+      "done"
+    );
+    expect(terminal?.textContent).toContain("$pnpm test");
+    expect(terminal?.textContent).toContain("Checks passed");
+    expect(document.querySelector(".mobile-tool-preview__section")).toBeNull();
+    expect(document.body.style.overflow).toBe("hidden");
+
+    await act(async () => {
+      document.dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
+      );
+    });
+    expect(document.querySelector('[role="dialog"]')).toBeNull();
+    expect(document.activeElement).toBe(trigger);
+    expect(container.querySelector("button")).toBe(trigger);
+    expect(document.body.style.overflow).toBe("");
+  });
+
+  it("keeps streaming shell output visible and announces updates", async () => {
+    await open({
+      ...command,
+      toolStatus: "running",
+      toolData: {
+        kind: "shell",
+        command: "pnpm test --watch",
+        streamOutput: "Running checks…",
+        isFailure: false,
+      },
+    });
+
+    const terminal = document.querySelector(
+      '[data-mobile-tool-detail-kind="shell"]'
+    );
+    expect(terminal?.getAttribute("data-mobile-tool-detail-state")).toBe(
+      "running"
+    );
+    expect(terminal?.textContent).toContain("pnpm test --watch");
+    const output = terminal?.querySelector(".mobile-terminal-detail__output");
+    expect(output?.textContent).toContain("Running checks…");
+    expect(output?.getAttribute("aria-live")).toBe("polite");
+  });
+
+  it("shows a failed shell exit code without exposing raw metadata", async () => {
+    await open({
+      ...command,
+      toolStatus: "failed",
+      toolDataTruncated: true,
+      toolData: {
+        kind: "shell",
+        command: "pnpm test",
+        output: "Tests failed",
+        exitCode: 7,
+        isFailure: true,
+      },
+    });
+
+    const terminal = document.querySelector(
+      '[data-mobile-tool-detail-kind="shell"]'
+    );
+    expect(terminal?.getAttribute("data-mobile-tool-detail-state")).toBe(
+      "failed"
+    );
+    expect(terminal?.textContent).toContain("Tests failed");
+    expect(terminal?.textContent).toContain("exit 7");
+    expect(terminal?.textContent).toContain("transcript.tools.truncated");
+    expect(document.querySelector(".mobile-tool-preview__section")).toBeNull();
+  });
+
+  it("keeps explicit close reachable for empty results and allows reopening", async () => {
+    const trigger = await open({ ...command, toolData: undefined });
+    await act(async () => {
+      (
+        document.querySelector(
+          '[aria-label="transcript.tools.closeDetails"]'
+        ) as HTMLButtonElement
+      ).click();
+    });
+    expect(document.querySelector('[role="dialog"]')).toBeNull();
+    await act(async () => trigger.click());
+    expect(document.querySelector(".mobile-tool-preview")).not.toBeNull();
+  });
+
+  it("shows the complete search command with mobile detail typography", async () => {
+    const fullCommand =
+      "rg -n 'struct AgentMessageRow|tool_output' src/modules/MobileRemote";
+    await open({
+      ...command,
+      toolCanonical: "code_search",
+      toolSummary: fullCommand,
+      toolData: {
+        kind: "search",
+        query: "struct AgentMessageRow|tool_output",
+        totalMatches: 12,
+        results: [
+          {
+            file: "src/message.ts",
+            line: 42,
+            content: "struct AgentMessageRow",
+          },
+        ],
+      },
+    });
+
+    const search = document.querySelector(
+      '[data-mobile-tool-detail-kind="search"]'
+    );
+    expect(search?.textContent).toContain(fullCommand);
+    expect(search?.textContent).toContain(
+      "src/message.ts:42  struct AgentMessageRow"
+    );
+    expect(search?.textContent).not.toContain("...");
+    expect(
+      document.querySelector('[data-mobile-tool-detail-kind="generic"]')
+    ).toBeNull();
+    expect(
+      document
+        .querySelector(".mobile-tool-preview__status")
+        ?.classList.contains("mobile-type-caption")
+    ).toBe(true);
+  });
+
+  it("keeps unsupported tools on the explicit generic detail fallback", async () => {
+    await open({
+      ...command,
+      toolCanonical: "custom_inspector",
+      toolSummary: "Inspect workspace state",
+      toolData: {
+        kind: "unknown",
+        action: "inspect",
+        scope: "workspace",
+      },
+    });
+
+    const generic = document.querySelector(
+      '[data-mobile-tool-detail-kind="generic"]'
+    );
+    expect(generic?.textContent).toContain("Inspect workspace state");
+    expect(generic?.textContent).toContain("transcript.tools.details");
+    expect(generic?.textContent).toContain('"scope": "workspace"');
+  });
+
+  it("preserves readonly file selection and truncation notice without executing anything", async () => {
+    await open({
+      ...command,
+      toolCanonical: "apply_patch",
+      toolDataTruncated: true,
+      toolData: {
+        kind: "edit",
+        filePath: "src/a.ts",
+        fileName: "a.ts",
+        language: "typescript",
+        isDeleted: false,
+        applyPatchSegments: [
+          {
+            filePath: "src/a.ts",
+            fileName: "a.ts",
+            newContent: "const a = 1;",
+            language: "typescript",
+            isDeleted: false,
+            applyPatchSegments: [],
+          },
+          {
+            filePath: "src/b.ts",
+            fileName: "b.ts",
+            newContent: "const b = 2;",
+            language: "typescript",
+            isDeleted: false,
+            applyPatchSegments: [],
+          },
+        ],
+      },
+    });
+    const target = document.querySelector(
+      '[data-mobile-file-target="src/b.ts"]'
+    ) as HTMLButtonElement;
+    await act(async () => target.click());
+    expect(target.getAttribute("aria-pressed")).toBe("true");
+    expect(document.querySelector("[data-mobile-open-file]")).toBeNull();
+    expect(
+      document.querySelector('[data-mobile-file-document="src/b.ts"]')
+    ).not.toBeNull();
+    expect(
+      document.querySelector(".mobile-file-viewer__body")?.textContent
+    ).toContain("transcript.tools.truncated");
+  });
+});
diff --git a/src/modules/MobileRemote/components/transcript/MobileToolDetailModal.tsx b/src/modules/MobileRemote/components/transcript/MobileToolDetailModal.tsx
new file mode 100644
index 0000000000..3e97e2dcc0
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileToolDetailModal.tsx
@@ -0,0 +1,162 @@
+import React from "react";
+
+import Button from "@src/components/Button";
+import { EventBlockHeaderInfo } from "@src/engines/ChatPanel/blocks/primitives/EventBlockHeaderTextSlots";
+import { Cancel01Icon, HugeiconsIcon } from "@src/icons";
+import Modal from "@src/scaffold/ModalSystem";
+
+import type { TranscriptItem } from "../../lib/transcriptReducer";
+import { MobileFileIdentity } from "./MobileFileIdentity";
+import MobileFileViewer from "./MobileFileViewer";
+import { MobileGenericToolDetail } from "./MobileGenericToolDetail";
+import { MobileSearchDetail } from "./MobileSearchDetail";
+import { MobileTerminalDetail } from "./MobileTerminalDetail";
+import type { MobileFileTarget } from "./mobileFileTool";
+import "./mobileToolPreview.scss";
+import { useMobileFilePreview } from "./useMobileFilePreview";
+import { useMobileToolPresentation } from "./useMobileToolPresentation";
+
+export interface MobileToolDetailModalProps {
+  item: TranscriptItem;
+  open: boolean;
+  onClose: () => void;
+  onOpenFile?: (target: MobileFileTarget) => Promise<void>;
+}
+
+export function MobileToolDetailModal(props: MobileToolDetailModalProps) {
+  return props.open ? (
+    <MobileToolDetailContent key={props.item.id} {...props} />
+  ) : null;
+}
+
+function MobileToolDetailContent({
+  item,
+  open,
+  onClose,
+  onOpenFile,
+}: MobileToolDetailModalProps) {
+  const {
+    t,
+    title,
+    detailSummary,
+    output,
+    shellDetail,
+    searchDetail,
+    fileTargets,
+    metadataText,
+    statusLabel,
+    isLoading,
+    isFailed,
+  } = useMobileToolPresentation(item);
+  const { selectedTarget, selectTarget, desktopAction, reset } =
+    useMobileFilePreview(fileTargets, onOpenFile);
+  const handleClose = () => {
+    reset();
+    onClose();
+  };
+
+  return (
+    <Modal
+      visible={open}
+      onClose={handleClose}
+      size="fullscreen"
+      radius={0}
+      maskClosable={false}
+      closable={false}
+      className={
+        selectedTarget
+          ? "mobile-tool-preview mobile-tool-preview--file"
+          : "mobile-tool-preview"
+      }
+      aria-label={selectedTarget?.fileName ?? title}
+      title={
+        selectedTarget ? <MobileFileIdentity target={selectedTarget} /> : title
+      }
+      headerActions={
+        <>
+          {!selectedTarget && (
+            <EventBlockHeaderInfo
+              isLoading={isLoading}
+              className={`mobile-tool-preview__status mobile-type-caption ${
+                isFailed
+                  ? "text-danger-6"
+                  : isLoading
+                    ? "text-info-6"
+                    : "text-text-3"
+              }`}
+            >
+              {statusLabel}
+            </EventBlockHeaderInfo>
+          )}
+          <Button
+            iconOnly
+            shape="circle"
+            appearance="soft"
+            variant="tertiary"
+            htmlType="button"
+            className="mobile-tool-preview__close focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
+            style={{
+              width: "var(--mobile-tool-touch-size)",
+              height: "var(--mobile-tool-touch-size)",
+            }}
+            aria-label={t("transcript.tools.closeDetails")}
+            onClick={handleClose}
+            icon={
+              <HugeiconsIcon
+                icon={Cancel01Icon}
+                size={18}
+                strokeWidth={1.75}
+                aria-hidden="true"
+              />
+            }
+          />
+        </>
+      }
+      bodyClassName={
+        selectedTarget
+          ? "mobile-file-viewer__body"
+          : "mobile-tool-preview__body"
+      }
+    >
+      {selectedTarget ? (
+        <MobileFileViewer
+          key={item.id}
+          target={selectedTarget}
+          targets={fileTargets}
+          onSelect={selectTarget}
+          truncated={Boolean(item.toolDataTruncated)}
+          desktopAction={desktopAction}
+        />
+      ) : shellDetail ? (
+        <MobileTerminalDetail
+          {...shellDetail}
+          isLoading={isLoading}
+          isFailed={isFailed}
+          truncated={Boolean(item.toolDataTruncated)}
+          truncatedLabel={t("transcript.tools.truncated")}
+        />
+      ) : searchDetail ? (
+        <MobileSearchDetail
+          {...searchDetail}
+          isLoading={isLoading}
+          isFailed={isFailed}
+          truncated={Boolean(item.toolDataTruncated)}
+          truncatedLabel={t("transcript.tools.truncated")}
+        />
+      ) : (
+        <MobileGenericToolDetail
+          itemId={item.id}
+          summary={detailSummary}
+          metadataText={fileTargets.length === 0 ? metadataText : ""}
+          output={fileTargets.length === 0 ? output : ""}
+          truncated={Boolean(item.toolDataTruncated)}
+          detailsLabel={t("transcript.tools.details")}
+          outputLabel={t("transcript.tools.output")}
+          truncatedLabel={t("transcript.tools.truncated")}
+        />
+      )}
+    </Modal>
+  );
+}
+
+MobileToolDetailModal.displayName = "MobileToolDetailModal";
diff --git a/src/modules/MobileRemote/components/transcript/MobileToolDetailSheet.tsx b/src/modules/MobileRemote/components/transcript/MobileToolDetailSheet.tsx
deleted file mode 100644
index dd6b54a228..0000000000
--- a/src/modules/MobileRemote/components/transcript/MobileToolDetailSheet.tsx
+++ /dev/null
@@ -1,284 +0,0 @@
-import React, { Suspense, lazy, useCallback, useRef, useState } from "react";
-
-import BottomSheet from "@src/components/BottomSheet";
-import Button from "@src/components/Button";
-import FileTypeIcon from "@src/components/FileTypeIcon";
-import { Placeholder } from "@src/components/Placeholder";
-import { getToolIcon } from "@src/config/toolIcons";
-import { EventBlockHeaderIcon } from "@src/engines/ChatPanel/blocks/primitives/EventBlockHeaderIcon";
-import { EventBlockHeaderInfo } from "@src/engines/ChatPanel/blocks/primitives/EventBlockHeaderTextSlots";
-import { SESSION_UI_TOKENS } from "@src/engines/ChatPanel/blocks/primitives/config";
-import { HugeiconsIcon, SquareArrowUpRight02Icon } from "@src/icons";
-
-import type { TranscriptItem } from "../../lib/transcriptReducer";
-import type { MobileFileTarget } from "./mobileFileTool";
-import { record, stringValue } from "./mobileToolPresentation";
-import { useMobileToolPresentation } from "./useMobileToolPresentation";
-
-const MobileFilePreview = lazy(
-  () =>
-    import(/* webpackChunkName: "mobile-file-preview" */ "./MobileFilePreview")
-);
-
-export interface MobileToolDetailSheetProps {
-  item: TranscriptItem;
-  open: boolean;
-  onClose: () => void;
-  onOpenFile?: (target: MobileFileTarget) => Promise<void>;
-}
-
-type OpenFileState =
-  | { phase: "idle" }
-  | { phase: "opening"; targetIndex: number }
-  | { phase: "requested"; targetIndex: number }
-  | { phase: "failed"; targetIndex: number; message: string };
-
-export function MobileToolDetailSheet({
-  item,
-  open,
-  onClose,
-  onOpenFile,
-}: MobileToolDetailSheetProps) {
-  const {
-    t,
-    rawName,
-    title,
-    summary,
-    output,
-    fileTargets,
-    metadataText,
-    statusLabel,
-    isLoading,
-    isFailed,
-  } = useMobileToolPresentation(item);
-  const [selectedTargetIndex, setSelectedTargetIndex] = useState(
-    () => fileTargets[0]?.targetIndex ?? 0
-  );
-  const [openFileState, setOpenFileState] = useState<OpenFileState>({
-    phase: "idle",
-  });
-  const openRequestRef = useRef(0);
-  const selectedTarget =
-    fileTargets.find((target) => target.targetIndex === selectedTargetIndex) ??
-    fileTargets[0];
-  const firstTargetIndex = fileTargets[0]?.targetIndex ?? 0;
-
-  const handleClose = useCallback(() => {
-    openRequestRef.current += 1;
-    setSelectedTargetIndex(firstTargetIndex);
-    setOpenFileState({ phase: "idle" });
-    onClose();
-  }, [firstTargetIndex, onClose]);
-
-  const handleOpenFile = useCallback(
-    async (target: MobileFileTarget) => {
-      if (!onOpenFile || openFileState.phase === "opening") return;
-      const requestId = ++openRequestRef.current;
-      setSelectedTargetIndex(target.targetIndex);
-      setOpenFileState({ phase: "opening", targetIndex: target.targetIndex });
-      try {
-        await onOpenFile(target);
-        if (openRequestRef.current !== requestId) return;
-        setOpenFileState({
-          phase: "requested",
-          targetIndex: target.targetIndex,
-        });
-      } catch (error) {
-        if (openRequestRef.current !== requestId) return;
-        setOpenFileState({
-          phase: "failed",
-          targetIndex: target.targetIndex,
-          message: error instanceof Error ? error.message : String(error),
-        });
-      }
-    },
-    [onOpenFile, openFileState.phase]
-  );
-
-  const renderOpenLabel = (target: MobileFileTarget) => {
-    if (
-      openFileState.phase === "requested" &&
-      openFileState.targetIndex === target.targetIndex
-    ) {
-      return t("transcript.tools.fileOpenRequested");
-    }
-    return t("transcript.tools.openFile");
-  };
-
-  return (
-    <BottomSheet
-      open={open}
-      onClose={handleClose}
-      showCloseButton
-      closeLabel={t("transcript.tools.closeDetails")}
-      title={
-        <span className="flex min-w-0 items-center gap-2">
-          <EventBlockHeaderIcon
-            icon={getToolIcon(rawName, {
-              size: SESSION_UI_TOKENS.ICON.SIZE_MD,
-              className: SESSION_UI_TOKENS.ICON.DEFAULT,
-              action: stringValue(record(item.toolData)?.action) || undefined,
-            })}
-            isCollapsed
-            hasContent={false}
-            isLoading={isLoading}
-            isFailed={isFailed}
-          />
-          <span className="min-w-0 truncate">{title}</span>
-          <EventBlockHeaderInfo
-            isLoading={isLoading}
-            className={`shrink-0 font-normal ${
-              isFailed
-                ? "text-danger-6"
-                : isLoading
-                  ? "text-info-6"
-                  : "text-text-3"
-            }`}
-          >
-            {statusLabel}
-          </EventBlockHeaderInfo>
-        </span>
-      }
-      bodyClassName="!px-4 !pb-5"
-    >
-      <div data-mobile-tool-detail={item.id}>
-        {summary ? (
-          <p className="chat-block-content mb-4 leading-5 break-words text-text-2">
-            {summary}
-          </p>
-        ) : null}
-        {fileTargets.length > 0 ? (
-          <section className="mb-4" data-mobile-file-targets="true">
-            <div className={`${SESSION_UI_TOKENS.TEXT.LABEL_XS} mb-1.5`}>
-              {t("transcript.tools.files")}
-            </div>
-            <div className="flex flex-col gap-2">
-              {fileTargets.map((target) => {
-                const selected =
-                  target.targetIndex === selectedTarget?.targetIndex;
-                const opening =
-                  openFileState.phase === "opening" &&
-                  openFileState.targetIndex === target.targetIndex;
-                return (
-                  <div
-                    key={`${target.targetIndex}:${target.filePath}:${target.line ?? ""}`}
-                    className={`flex min-w-0 items-center gap-2 rounded-lg border px-2.5 py-2 ${
-                      selected
-                        ? "border-primary-5 bg-fill-1"
-                        : "border-border-2 bg-bg-2"
-                    }`}
-                    data-mobile-file-target={target.filePath}
-                  >
-                    <Button
-                      layout="custom"
-                      appearance="custom"
-                      htmlType="button"
-                      className="flex min-w-0 flex-1 items-center gap-2 border-0 bg-transparent p-0 text-left focus-visible:ring-2 focus-visible:ring-primary-6/30 focus-visible:outline-none"
-                      onClick={() => setSelectedTargetIndex(target.targetIndex)}
-                      aria-pressed={selected}
-                    >
-                      <FileTypeIcon fileName={target.fileName} size="small" />
-                      <span className="min-w-0 flex-1">
-                        <span className="chat-block-xs block truncate font-medium text-text-1">
-                          {target.fileName}
-                        </span>
-                        <span
-                          className="chat-code-sm block truncate text-text-3"
-                          title={target.filePath}
-                        >
-                          {target.filePath}
-                          {target.line ? `:${target.line}` : ""}
-                        </span>
-                      </span>
-                    </Button>
-                    <Button
-                      size="small"
-                      variant="primary"
-                      appearance="ghost"
-                      icon={
-                        <HugeiconsIcon
-                          icon={SquareArrowUpRight02Icon}
-                          size={SESSION_UI_TOKENS.ICON.SIZE_SM}
-                        />
-                      }
-                      loading={opening}
-                      disabled={!onOpenFile}
-                      aria-label={t("transcript.tools.openFileNamed", {
-                        file: target.fileName,
-                      })}
-                      onClick={() => void handleOpenFile(target)}
-                      data-mobile-open-file={target.filePath}
-                    >
-                      {renderOpenLabel(target)}
-                    </Button>
-                  </div>
-                );
-              })}
-            </div>
-            {!onOpenFile ? (
-              <p className="chat-block-xs mt-1.5 text-text-3">
-                {t("transcript.tools.openFileUnavailable")}
-              </p>
-            ) : null}
-            {openFileState.phase === "failed" ? (
-              <p className="chat-block-xs mt-1.5 text-danger-6" role="alert">
-                {t("transcript.tools.openFileFailed", {
-                  message: openFileState.message,
-                })}
-              </p>
-            ) : null}
-          </section>
-        ) : null}
-        {selectedTarget?.content || selectedTarget?.diff ? (
-          <section className="mb-4" data-mobile-file-highlight="true">
-            <div className={`${SESSION_UI_TOKENS.TEXT.LABEL_XS} mb-1.5`}>
-              {selectedTarget.diff
-                ? t("transcript.tools.changes")
-                : t("transcript.tools.preview")}
-            </div>
-            <Suspense
-              fallback={
-                <div className="min-h-24 rounded-lg border border-border-2 bg-bg-2">
-                  <Placeholder
-                    placement="sidebar"
-                    variant="loading"
-                    title={t("transcript.tools.loadingPreview")}
-                  />
-                </div>
-              }
-            >
-              <MobileFilePreview target={selectedTarget} />
-            </Suspense>
-          </section>
-        ) : null}
-        {fileTargets.length === 0 && metadataText ? (
-          <section className="mb-4">
-            <div className={`${SESSION_UI_TOKENS.TEXT.LABEL_XS} mb-1.5`}>
-              {t("transcript.tools.details")}
-            </div>
-            <pre className="chat-code-sm overflow-x-auto rounded-lg bg-fill-1 p-3 leading-5 break-words whitespace-pre-wrap text-text-2">
-              {metadataText}
-            </pre>
-          </section>
-        ) : null}
-        {fileTargets.length === 0 && output ? (
-          <section className="mb-4">
-            <div className={`${SESSION_UI_TOKENS.TEXT.LABEL_XS} mb-1.5`}>
-              {t("transcript.tools.output")}
-            </div>
-            <pre className="chat-code-sm overflow-x-auto rounded-lg bg-fill-1 p-3 leading-5 break-words whitespace-pre-wrap text-text-2">
-              {output}
-            </pre>
-          </section>
-        ) : null}
-        {item.toolDataTruncated ? (
-          <p className="chat-block-xs text-text-3">
-            {t("transcript.tools.truncated")}
-          </p>
-        ) : null}
-      </div>
-    </BottomSheet>
-  );
-}
-
-MobileToolDetailSheet.displayName = "MobileToolDetailSheet";
diff --git a/src/modules/MobileRemote/components/transcript/MobileTranscriptLoading.tsx b/src/modules/MobileRemote/components/transcript/MobileTranscriptLoading.tsx
new file mode 100644
index 0000000000..8abaf8b6db
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/MobileTranscriptLoading.tsx
@@ -0,0 +1,38 @@
+import React, { useEffect, useState } from "react";
+
+import { useMobileRemotePlatform } from "../../platform";
+import "./mobileTranscriptLoading.scss";
+
+export function MobileLoadingDots({ label }: { label: string }) {
+  const { runtime } = useMobileRemotePlatform();
+  const [hidden, setHidden] = useState(() => runtime.isHidden());
+  useEffect(() => {
+    const update = () => setHidden(runtime.isHidden());
+    update();
+    return runtime.subscribeVisibility(update);
+  }, [runtime]);
+  return (
+    <div
+      className="mobile-loading-dots"
+      role="status"
+      aria-label={label}
+      aria-busy="true"
+      data-paused={hidden}
+    >
+      <span aria-hidden="true" />
+      <span aria-hidden="true" />
+      <span aria-hidden="true" />
+    </div>
+  );
+}
+
+export function MobileTranscriptLoading({ label }: { label: string }) {
+  return (
+    <div
+      className="flex min-h-0 flex-1 items-center justify-center"
+      data-mobile-transcript-loading="true"
+    >
+      <MobileLoadingDots label={label} />
+    </div>
+  );
+}
diff --git a/src/modules/MobileRemote/components/transcript/PortableAgentMessageContent.tsx b/src/modules/MobileRemote/components/transcript/PortableAgentMessageContent.tsx
index 04649c49f4..355e0c08d9 100644
--- a/src/modules/MobileRemote/components/transcript/PortableAgentMessageContent.tsx
+++ b/src/modules/MobileRemote/components/transcript/PortableAgentMessageContent.tsx
@@ -6,6 +6,7 @@ import PortableMarkdown from "./PortableMarkdown";
 
 export interface PortableAgentMessageContentProps {
   text: string;
+  streaming?: boolean;
 }
 
 /**
@@ -15,7 +16,7 @@ export interface PortableAgentMessageContentProps {
  * rendering through the browser-safe Markdown subset.
  */
 const PortableAgentMessageContent: React.FC<PortableAgentMessageContentProps> =
-  memo(({ text }) => {
+  memo(({ text, streaming }) => {
     const projectedText = useMemo(
       () => projectPortableAgentMessageText(text),
       [text]
@@ -23,7 +24,9 @@ const PortableAgentMessageContent: React.FC<PortableAgentMessageContentProps> =
 
     if (!projectedText) return null;
 
-    return <PortableMarkdown textContent={projectedText} />;
+    return (
+      <PortableMarkdown textContent={projectedText} streaming={streaming} />
+    );
   });
 
 PortableAgentMessageContent.displayName = "PortableAgentMessageContent";
diff --git a/src/modules/MobileRemote/components/transcript/PortableCodeBlock.tsx b/src/modules/MobileRemote/components/transcript/PortableCodeBlock.tsx
new file mode 100644
index 0000000000..af3ac26b8c
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/PortableCodeBlock.tsx
@@ -0,0 +1,57 @@
+import React, { memo } from "react";
+import { useTranslation } from "react-i18next";
+
+import { CodeBlockToolbar } from "@src/components/MarkDown/CodeBlockToolbar";
+import { useSyntaxHighlight } from "@src/hooks/code/useSyntaxHighlight";
+
+import { useMobileCopyText } from "./useMobileCopyText";
+
+const MAX_HIGHLIGHT_CHARACTERS = 20_000;
+
+export const PortableCodeBlock = memo(function PortableCodeBlock({
+  code,
+  language,
+  streaming,
+}: {
+  code: string;
+  language: string;
+  streaming: boolean;
+}) {
+  const { t } = useTranslation("common");
+  const { state: copyState, copy } = useMobileCopyText(code);
+  const html = useSyntaxHighlight(code, {
+    lang: language,
+    enabled: !streaming && code.length <= MAX_HIGHLIGHT_CHARACTERS,
+  });
+
+  const label =
+    copyState === "copied"
+      ? t("status.copied")
+      : copyState === "pending"
+        ? t("status.loading")
+        : t("actions.copy");
+  return (
+    <div className="code-block-wrapper" data-mobile-code-block="">
+      <CodeBlockToolbar
+        touch
+        copyLabel={label}
+        copied={copyState === "copied"}
+        pending={copyState === "pending"}
+        onCopy={copy}
+      />
+      {copyState === "failed" && (
+        <div role="alert" className="px-3 text-danger-6">
+          {t("status.copyFailed")}
+        </div>
+      )}
+      <pre className="prism-html m-0 overflow-x-auto p-3">
+        <code
+          className={`language-${language}`}
+          {...(html
+            ? { dangerouslySetInnerHTML: { __html: html } }
+            : { children: code })}
+        />
+      </pre>
+    </div>
+  );
+});
diff --git a/src/modules/MobileRemote/components/transcript/PortableMarkdown.test.ts b/src/modules/MobileRemote/components/transcript/PortableMarkdown.test.ts
new file mode 100644
index 0000000000..59c0b9df44
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/PortableMarkdown.test.ts
@@ -0,0 +1,198 @@
+// @vitest-environment jsdom
+import { createInstance } from "i18next";
+import React, { act } from "react";
+import { type Root, createRoot } from "react-dom/client";
+import { I18nextProvider } from "react-i18next";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { loadPrismHtml } from "@src/hooks/code/prismHtmlLoader";
+import common from "@src/i18n/locales/en/common.json";
+
+import {
+  MobileRemotePlatformProvider,
+  type MobileRemotePlatformProviderProps,
+} from "../../platform/MobileRemotePlatformContext";
+import type { MobileRemotePlatform } from "../../platform/types";
+import { AgentBubble } from "./AgentBubble";
+
+const i18n = createInstance();
+(
+  globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+await i18n.init({
+  lng: "en",
+  resources: { en: { common } },
+  initImmediate: false,
+});
+
+let root: Root;
+let host: HTMLDivElement;
+let platform: MobileRemotePlatform;
+const write = vi.fn<(text: string) => Promise<void>>();
+
+async function render(text: string, streaming = false) {
+  await act(async () =>
+    root.render(
+      React.createElement(
+        I18nextProvider,
+        { i18n },
+        React.createElement(
+          MobileRemotePlatformProvider,
+          { platform } as MobileRemotePlatformProviderProps,
+          React.createElement(AgentBubble, { text, streaming })
+        )
+      )
+    )
+  );
+}
+async function clickCopy() {
+  await act(async () =>
+    (host.querySelector("button") as HTMLButtonElement).click()
+  );
+}
+
+beforeEach(() => {
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+  write.mockReset().mockResolvedValue(undefined);
+  platform = {
+    writeClipboardText: write,
+    runtime: {
+      setTimeout: (callback: () => void, delay: number) =>
+        window.setTimeout(callback, delay),
+      clearTimeout: (id: number) => window.clearTimeout(id),
+    },
+  } as unknown as MobileRemotePlatform;
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  vi.useRealTimers();
+});
+
+describe("portable Markdown fenced-code interaction", () => {
+  it("keeps inline code inline and copies the exact fenced source using shared toolbar", async () => {
+    await render(
+      "Inline `answer`\n\n```typescript\nconst answer = '<safe>';\n```\n"
+    );
+    expect(host.querySelector("p code")?.textContent).toBe("answer");
+    expect(host.querySelectorAll("button")).toHaveLength(1);
+    expect(
+      host.querySelector(".code-block-toolbar[data-touch]")
+    ).not.toBeNull();
+    expect(host.querySelector("pre code")?.textContent).toBe(
+      "const answer = '<safe>';"
+    );
+    await clickCopy();
+    expect(write).toHaveBeenCalledWith("const answer = '<safe>';");
+    expect(host.querySelector("button")?.getAttribute("aria-label")).toBe(
+      "Copied"
+    );
+    await act(async () => {
+      await loadPrismHtml();
+    });
+    expect(host.querySelector("pre .token.keyword")).not.toBeNull();
+  });
+
+  it("shows failure, preserves source and allows a successful retry", async () => {
+    write.mockRejectedValueOnce(new Error("denied"));
+    await render("```\nhello\n```");
+    await clickCopy();
+    expect(host.querySelector('[role="alert"]')?.textContent).toBe(
+      "Copy failed"
+    );
+    expect(host.querySelector("pre code")?.textContent).toBe("hello");
+    expect(host.querySelector("button")?.getAttribute("aria-label")).toBe(
+      "Copy"
+    );
+    await clickCopy();
+    expect(write).toHaveBeenCalledTimes(2);
+    expect(host.querySelector('[role="alert"]')).toBeNull();
+    expect(host.querySelector("button")?.getAttribute("aria-label")).toBe(
+      "Copied"
+    );
+  });
+
+  it("locks duplicate writes and ignores late results after source changes", async () => {
+    let finish!: () => void;
+    write.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          finish = resolve;
+        })
+    );
+    await render("```\nold\n```");
+    await clickCopy();
+    expect((host.querySelector("button") as HTMLButtonElement).disabled).toBe(
+      true
+    );
+    await clickCopy();
+    expect(write).toHaveBeenCalledTimes(1);
+    await render("```\nnew\n```");
+    await render("```\nold\n```");
+    expect((host.querySelector("button") as HTMLButtonElement).disabled).toBe(
+      false
+    );
+    await render("```\nnew\n```");
+    await act(async () => finish());
+    expect(host.querySelector("button")?.getAttribute("aria-label")).toBe(
+      "Copy"
+    );
+    await clickCopy();
+    expect(write).toHaveBeenLastCalledWith("new");
+  });
+
+  it("bounds a stalled clipboard operation and cleans timeout on unmount", async () => {
+    vi.useFakeTimers();
+    write.mockImplementation(() => new Promise<void>(() => undefined));
+    await render("```\nhello\n```", true);
+    await clickCopy();
+    expect(vi.getTimerCount()).toBe(1);
+    await act(async () => vi.advanceTimersByTime(3_000));
+    expect(host.querySelector('[role="alert"]')?.textContent).toBe(
+      "Copy failed"
+    );
+    await clickCopy();
+    await render("No code remains");
+    expect(vi.getTimerCount()).toBe(0);
+  });
+
+  it("does not retain a pending copy when the shell changes", async () => {
+    let finish!: () => void;
+    write.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          finish = resolve;
+        })
+    );
+    await render("```\nhello\n```");
+    await clickCopy();
+    platform = { ...platform };
+    await render("```\nhello\n```");
+    await act(async () => finish());
+    expect(host.querySelector("button")?.getAttribute("aria-label")).toBe(
+      "Copy"
+    );
+    expect((host.querySelector("button") as HTMLButtonElement).disabled).toBe(
+      false
+    );
+  });
+
+  it("keeps streaming and oversized fences readable without eager tokenization", async () => {
+    await render("```typescript\nconst stream = true;\n```", true);
+    expect(host.querySelector("pre .token")).toBeNull();
+    await render("```typescript\nconst stream = true;\n```", false);
+    await act(async () => {
+      await loadPrismHtml();
+    });
+    expect(host.querySelector("pre .token.keyword")).not.toBeNull();
+    await render(
+      `\`\`\`typescript\n${"const large = 1;\n".repeat(2_000)}\`\`\``
+    );
+    expect(host.querySelector("pre .token")).toBeNull();
+    expect(host.querySelector("pre code")?.textContent?.length).toBeGreaterThan(
+      20_000
+    );
+  });
+});
diff --git a/src/modules/MobileRemote/components/transcript/PortableMarkdown.tsx b/src/modules/MobileRemote/components/transcript/PortableMarkdown.tsx
index f0042e9afd..062cff121f 100644
--- a/src/modules/MobileRemote/components/transcript/PortableMarkdown.tsx
+++ b/src/modules/MobileRemote/components/transcript/PortableMarkdown.tsx
@@ -1,11 +1,14 @@
-import React, { memo } from "react";
+import React, { memo, useMemo } from "react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 
 import "@src/components/MarkDown/index.scss";
 
+import { PortableCodeBlock } from "./PortableCodeBlock";
+
 export interface PortableMarkdownProps {
   textContent: string;
+  streaming?: boolean;
 }
 
 /**
@@ -16,11 +19,42 @@ export interface PortableMarkdownProps {
  * the public mobile bundle.
  */
 const PortableMarkdown: React.FC<PortableMarkdownProps> = memo(
-  ({ textContent }) => (
-    <ReactMarkdown className="chat-markdown-body" remarkPlugins={[remarkGfm]}>
-      {textContent}
-    </ReactMarkdown>
-  )
+  ({ textContent, streaming = false }) => {
+    const components = useMemo(
+      () => ({
+        pre: ({ children }: { children?: React.ReactNode }) => {
+          const child = React.Children.toArray(children)[0];
+          if (
+            !React.isValidElement<{
+              children?: React.ReactNode;
+              className?: string;
+            }>(child)
+          )
+            return <pre>{children}</pre>;
+          return (
+            <PortableCodeBlock
+              code={String(child.props.children ?? "").replace(/\n$/, "")}
+              language={
+                /language-([^\s]+)/.exec(child.props.className ?? "")?.[1] ??
+                "text"
+              }
+              streaming={streaming}
+            />
+          );
+        },
+      }),
+      [streaming]
+    );
+    return (
+      <ReactMarkdown
+        className="chat-markdown-body"
+        remarkPlugins={[remarkGfm]}
+        components={components}
+      >
+        {textContent}
+      </ReactMarkdown>
+    );
+  }
 );
 
 PortableMarkdown.displayName = "PortableMarkdown";
diff --git a/src/modules/MobileRemote/components/transcript/RoundNavigator.test.ts b/src/modules/MobileRemote/components/transcript/RoundNavigator.test.ts
index 7033e1d5cf..a5b0508536 100644
--- a/src/modules/MobileRemote/components/transcript/RoundNavigator.test.ts
+++ b/src/modules/MobileRemote/components/transcript/RoundNavigator.test.ts
@@ -153,8 +153,50 @@ describe("RoundNavigator", () => {
     expect(button("turn-pagination-next-round").disabled).toBe(false);
   });
 
+  it("keeps sorting inside the open sheet and marks the selected round", async () => {
+    const onSelect = vi.fn();
+    await renderNavigator("r1", onSelect);
+    act(() => button("turn-pagination-current-round").click());
+    const sheet = container.querySelector('[data-testid="round-sheet"]')!;
+    const list = sheet.querySelector('[data-mobile-round-list="true"]')!;
+    expect(list.querySelector("button")?.getAttribute("data-page-index")).toBe(
+      "2"
+    );
+    expect(
+      list
+        .querySelector('[aria-current="true"]')
+        ?.getAttribute("data-page-index")
+    ).toBe("0");
+    const sort = Array.from(sheet.querySelectorAll("button")).find((item) =>
+      item.textContent?.includes("rounds.newestFirst")
+    )!;
+    act(() => sort.click());
+    expect(list.querySelector("button")?.getAttribute("data-page-index")).toBe(
+      "0"
+    );
+    act(() =>
+      (list.querySelector('[data-page-index="1"]') as HTMLButtonElement).click()
+    );
+    expect(onSelect).toHaveBeenCalledWith("r2");
+    expect(container.querySelector('[data-testid="round-sheet"]')).toBeNull();
+  });
+
   it("labels a truncated round body", async () => {
     await renderNavigator("r1", vi.fn(), true, true);
     expect(container.textContent).toContain("部分内容已截断");
   });
+
+  it("places partial and truncated notes below navigation and removes them when complete", async () => {
+    await renderNavigator("r1", vi.fn(), false, true);
+    const nav = container.querySelector("nav")!;
+    const note = nav.querySelector("[data-turn-navigation-status]")!;
+    expect(note.parentElement).toBe(nav);
+    expect(note.textContent).toBe("仅显示最近轮次 · 部分内容已截断");
+    expect(button("turn-pagination-current-round").textContent).toBe("第 1 轮");
+    expect(button("turn-pagination-next-round").disabled).toBe(false);
+
+    await renderNavigator("r1", vi.fn(), true, false);
+    expect(nav.querySelector("[data-turn-navigation-status]")).toBeNull();
+    expect(button("turn-pagination-current-round").textContent).toBe("第 1 轮");
+  });
 });
diff --git a/src/modules/MobileRemote/components/transcript/RoundNavigator.tsx b/src/modules/MobileRemote/components/transcript/RoundNavigator.tsx
index 6ace283bb4..b5f63d8ddd 100644
--- a/src/modules/MobileRemote/components/transcript/RoundNavigator.tsx
+++ b/src/modules/MobileRemote/components/transcript/RoundNavigator.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import BottomSheet from "@src/components/BottomSheet";
+import Button from "@src/components/Button";
 import {
   TurnNavigationRoundList,
   TurnNavigationToolbar,
@@ -106,11 +107,25 @@ export function RoundNavigator({
       <BottomSheet
         open={listOpen}
         onClose={() => setListOpen(false)}
-        title={t("common:pagination.latestRound")}
+        title={t("mobileRemote:rounds.navigationLabel")}
+        className="mobile-round-sheet"
         showCloseButton
         closeLabel={t("common:actions.close")}
       >
+        <div className="mobile-round-sheet__actions">
+          <Button
+            variant="tertiary"
+            onClick={() => setSortAscending((ascending) => !ascending)}
+          >
+            {t(
+              sortAscending
+                ? "mobileRemote:rounds.oldestFirst"
+                : "mobileRemote:rounds.newestFirst"
+            )}
+          </Button>
+        </div>
         <TurnNavigationRoundList
+          mobile
           items={roundItems}
           currentPageIndex={currentIndex}
           onSelect={(pageIndex) => {
diff --git a/src/modules/MobileRemote/components/transcript/UserBubble.tsx b/src/modules/MobileRemote/components/transcript/UserBubble.tsx
index 7918ac26bc..1a65dbc2e4 100644
--- a/src/modules/MobileRemote/components/transcript/UserBubble.tsx
+++ b/src/modules/MobileRemote/components/transcript/UserBubble.tsx
@@ -6,13 +6,15 @@ import PortableUserMessageContent from "./PortableUserMessageContent";
 
 export interface UserBubbleProps {
   text: string;
+  children?: React.ReactNode;
 }
 
-export function UserBubble({ text }: UserBubbleProps) {
+export function UserBubble({ text, children }: UserBubbleProps) {
   return (
     <div className="flex justify-end">
       <ChatBubbleBody variant="sessionUser" className="!max-w-[85%]">
         <PortableUserMessageContent text={text} />
+        {children}
       </ChatBubbleBody>
     </div>
   );
diff --git a/src/modules/MobileRemote/components/transcript/mobileFileTool.test.ts b/src/modules/MobileRemote/components/transcript/mobileFileTool.test.ts
index e6618fa924..0550a0175c 100644
--- a/src/modules/MobileRemote/components/transcript/mobileFileTool.test.ts
+++ b/src/modules/MobileRemote/components/transcript/mobileFileTool.test.ts
@@ -1,10 +1,11 @@
-import React from "react";
-import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vitest";
 
 import type { TranscriptItem } from "../../lib/transcriptReducer";
-import MobileFilePreview from "./MobileFilePreview";
-import { mobileFileTargets } from "./mobileFileTool";
+import {
+  MOBILE_MERGE_MAX_CHARACTERS,
+  mobileFilePreview,
+  mobileFileTargets,
+} from "./mobileFileTool";
 
 describe("mobile file tool projection", () => {
   it("preserves authoritative apply-patch target indexes and line numbers", () => {
@@ -55,29 +56,104 @@ describe("mobile file tool projection", () => {
     ]);
   });
 
-  it("renders source immediately with the shared Prism token container", () => {
-    const html = renderToStaticMarkup(
-      React.createElement(MobileFilePreview, {
-        target: {
-          targetIndex: 0,
-          filePath: "src/example.ts",
-          fileName: "example.ts",
+  it.each(["", "  \n\t", "const value = '<safe>';\n"])(
+    "preserves exact new content %j instead of stale old content",
+    (content) => {
+      const targets = mobileFileTargets({
+        id: "empty-edit",
+        kind: "tool",
+        text: "edit_file",
+        toolData: {
+          kind: "edit",
+          filePath: "src/empty.ts",
+          fileName: "empty.ts",
           language: "typescript",
-          line: 7,
-          content: "const value = '<safe>';",
+          newContent: content,
+          oldContent: "stale content",
+          isDeleted: false,
+          applyPatchSegments: [],
         },
-      })
-    );
+      });
+      expect(targets[0]?.content).toBe(content);
+      expect(targets[0]?.newContent).toBe(content);
+      expect(targets[0]?.oldContent).toBe("stale content");
+      expect(mobileFilePreview(targets[0]!, false)).toEqual({
+        kind: "merge",
+        content,
+        original: "stale content",
+      });
+    }
+  );
 
-    expect(html).toContain('data-mobile-file-preview="code"');
-    expect(html).toContain('data-mobile-highlight-language="typescript"');
-    expect(html).toContain('data-mobile-file-line="7"');
-    expect(html).toContain("prism-html");
-    expect(html).toContain("border-border-1");
-    expect(html).toContain("bg-event-block");
-    expect(html).toContain("chat-code");
-    expect(html).toContain("px-3 py-1.5");
-    expect(html).not.toContain("example.ts:7");
-    expect(html).toContain("&lt;safe&gt;");
+  it("retains each patch segment's canonical pair, including added and deleted files", () => {
+    const targets = mobileFileTargets({
+      id: "patch",
+      kind: "tool",
+      text: "apply_patch",
+      toolData: {
+        kind: "edit",
+        filePath: "a.ts",
+        fileName: "a.ts",
+        language: "typescript",
+        isDeleted: false,
+        applyPatchSegments: [
+          {
+            filePath: "a.ts",
+            fileName: "a.ts",
+            language: "typescript",
+            oldContent: "",
+            newContent: "const a = 1;",
+            isDeleted: false,
+            applyPatchSegments: [],
+          },
+          {
+            filePath: "b.ts",
+            fileName: "b.ts",
+            language: "typescript",
+            oldContent: "const b = 2;",
+            newContent: "",
+            isDeleted: true,
+            applyPatchSegments: [],
+          },
+        ],
+      },
+    });
+    expect(targets.map((target) => mobileFilePreview(target, false))).toEqual([
+      { kind: "merge", content: "const a = 1;", original: "" },
+      { kind: "merge", content: "", original: "const b = 2;" },
+    ]);
+  });
+
+  it("never treats a missing side, independently truncated pair or oversized pair as a complete comparison", () => {
+    const target = {
+      targetIndex: 0,
+      filePath: "a.ts",
+      fileName: "a.ts",
+      diff: "@@ -1 +1 @@\n-a\n+b",
+      oldContent: "a",
+      newContent: "b",
+      content: "b",
+    };
+    for (const [input, truncated] of [
+      [{ ...target, oldContent: undefined }, false],
+      [{ ...target, newContent: undefined }, false],
+      [target, true],
+      [
+        { ...target, oldContent: "a".repeat(MOBILE_MERGE_MAX_CHARACTERS) },
+        false,
+      ],
+    ] as const) {
+      expect(mobileFilePreview(input, truncated)).toEqual({
+        kind: "patch",
+        content: target.diff,
+        original: undefined,
+      });
+    }
+    expect(
+      mobileFilePreview(
+        { ...target, oldContent: undefined, diff: undefined },
+        false
+      )
+    ).toEqual({ kind: "snapshot", content: "b", original: undefined });
   });
 });
diff --git a/src/modules/MobileRemote/components/transcript/mobileFileTool.ts b/src/modules/MobileRemote/components/transcript/mobileFileTool.ts
index 00a9f4c4a6..cd0841a5c4 100644
--- a/src/modules/MobileRemote/components/transcript/mobileFileTool.ts
+++ b/src/modules/MobileRemote/components/transcript/mobileFileTool.ts
@@ -12,10 +12,42 @@ export interface MobileFileTarget {
   line?: number;
   content?: string;
   diff?: string;
+  /** Canonical before/after snapshots, never inferred from missing content. */
+  oldContent?: string;
+  newContent?: string;
   linesAdded?: number;
   linesRemoved?: number;
 }
 
+export const MOBILE_MERGE_MAX_CHARACTERS = 100_000;
+
+/** A compacted pair may end at different offsets: never diff those prefixes. */
+export function mobileFilePreview(
+  target: MobileFileTarget,
+  truncated: boolean
+) {
+  if (
+    !truncated &&
+    target.oldContent !== undefined &&
+    target.newContent !== undefined &&
+    target.oldContent.length + target.newContent.length <=
+      MOBILE_MERGE_MAX_CHARACTERS
+  ) {
+    return {
+      kind: "merge" as const,
+      content: target.newContent,
+      original: target.oldContent,
+    };
+  }
+  return target.diff !== undefined
+    ? { kind: "patch" as const, content: target.diff, original: undefined }
+    : {
+        kind: "snapshot" as const,
+        content: target.content,
+        original: undefined,
+      };
+}
+
 function record(value: unknown): Record<string, unknown> | null {
   return value && typeof value === "object"
     ? (value as Record<string, unknown>)
@@ -27,7 +59,9 @@ function stringValue(value: unknown): string | undefined {
 }
 
 function textValue(value: unknown): string | undefined {
-  return typeof value === "string" && value.trim() ? value : undefined;
+  // Empty/whitespace-only is valid file content, not a missing snapshot.
+  // In particular, an edit to an empty file must not fall back to oldContent.
+  return typeof value === "string" ? value : undefined;
 }
 
 function numberValue(value: unknown): number | undefined {
@@ -63,6 +97,8 @@ function targetFromRecord(
       textValue(value.content) ??
       textValue(value.oldContent),
     diff: textValue(value.diff),
+    oldContent: textValue(value.oldContent),
+    newContent: textValue(value.newContent),
     linesAdded: numberValue(value.linesAdded),
     linesRemoved: numberValue(value.linesRemoved),
   };
diff --git a/src/modules/MobileRemote/components/transcript/mobileToolPresentation.ts b/src/modules/MobileRemote/components/transcript/mobileToolPresentation.ts
index 8f415a8852..5c9ad278ef 100644
--- a/src/modules/MobileRemote/components/transcript/mobileToolPresentation.ts
+++ b/src/modules/MobileRemote/components/transcript/mobileToolPresentation.ts
@@ -1,5 +1,8 @@
 import { formatSearchQuerySubtitle } from "@src/engines/ChatPanel/blocks/ToolCallBlock/helpers/argsSummary";
-import { isSearchTool } from "@src/engines/SessionCore/rendering/registry/toolCategories";
+import {
+  isSearchTool,
+  isShellTool,
+} from "@src/engines/SessionCore/rendering/registry/toolCategories";
 
 import type {
   MobileToolData,
@@ -136,17 +139,19 @@ function formatMobileToolSubtitleValue(
     : summary;
 }
 
-export function mobileToolSummary(item: TranscriptItem): string {
+export function mobileToolDetailSummary(item: TranscriptItem): string {
   const projected = item.toolSummary?.trim();
-  if (projected) return formatMobileToolSubtitleValue(item, projected);
+  if (projected) return projected;
   const structured = summaryFromToolData(item.toolData);
-  if (structured) return formatMobileToolSubtitleValue(item, structured);
+  if (structured) return structured;
   if (item.toolFilePath?.trim()) return item.toolFilePath.trim();
   if (item.toolCommand?.trim()) return item.toolCommand.trim();
   const fallback = item.text.trim();
-  return fallback !== item.toolName
-    ? formatMobileToolSubtitleValue(item, fallback)
-    : "";
+  return fallback !== item.toolName ? fallback : "";
+}
+
+export function mobileToolSummary(item: TranscriptItem): string {
+  return formatMobileToolSubtitleValue(item, mobileToolDetailSummary(item));
 }
 
 export function outputFromToolData(data?: MobileToolData): string {
@@ -226,6 +231,71 @@ export function outputFromToolData(data?: MobileToolData): string {
   return "";
 }
 
+export interface MobileShellDetail {
+  command: string;
+  output: string;
+  exitCode?: number;
+}
+
+export interface MobileSearchDetail {
+  query: string;
+  output: string;
+}
+
+function textValue(value: unknown): string {
+  return typeof value === "string" && value.trim() ? value : "";
+}
+
+/**
+ * Project the shell fields used by Desktop's TerminalBlock into a small,
+ * browser-safe model for the iOS detail surface. Preserve output whitespace;
+ * terminal output is presentation data, not a label to normalize.
+ */
+export function mobileShellDetail(
+  item: TranscriptItem
+): MobileShellDetail | null {
+  const payload = record(item.toolData);
+  const action = stringValue(payload?.action).toLowerCase();
+  const isShell =
+    toolKind(item.toolData) === "shell" ||
+    isShellTool(resolveMobileToolIconName(item));
+
+  // Desktop renders process termination as a compact lifecycle row rather
+  // than a terminal. Keep that action on the generic mobile detail path too.
+  if (!isShell || action === "kill") return null;
+
+  const command =
+    textValue(payload?.command) ||
+    textValue(item.toolCommand) ||
+    mobileToolDetailSummary(item);
+  const output =
+    textValue(payload?.output) ||
+    textValue(payload?.streamOutput) ||
+    textValue(payload?.errorMessage);
+  const exitCode =
+    typeof payload?.exitCode === "number" && Number.isFinite(payload.exitCode)
+      ? payload.exitCode
+      : undefined;
+
+  return command || output ? { command, output, exitCode } : null;
+}
+
+/** Mobile counterpart to Desktop's SearchBlock projection. */
+export function mobileSearchDetail(
+  item: TranscriptItem
+): MobileSearchDetail | null {
+  if (!isMobileSearchTool(item)) return null;
+
+  const payload = record(item.toolData);
+  const query =
+    textValue(item.toolSummary) ||
+    textValue(payload?.query) ||
+    mobileToolDetailSummary(item);
+  const output = outputFromToolData(item.toolData);
+
+  return query || output ? { query, output } : null;
+}
+
 export function compactMetadata(
   data?: MobileToolData
 ): Record<string, unknown> {
diff --git a/src/modules/MobileRemote/components/transcript/mobileToolPreview.scss b/src/modules/MobileRemote/components/transcript/mobileToolPreview.scss
new file mode 100644
index 0000000000..00154400b1
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/mobileToolPreview.scss
@@ -0,0 +1,242 @@
+@use "../../mobileUiTokens" as mobile;
+
+// The shared Modal owns portal, focus, Escape and scroll-lock cleanup.
+// Edge-to-edge presentation is local to Remote; desktop modals are unchanged.
+.liquid-modal-wrapper:has(.mobile-tool-preview) {
+  border-radius: 0;
+  animation: none;
+
+  > .liquid-modal-container {
+    width: 100%;
+    height: 100%;
+    max-height: 100%;
+    padding: 0;
+  }
+}
+
+.liquid-modal-content.modal-fullscreen.mobile-tool-preview {
+  --mobile-tool-touch-size: #{mobile.$touch-target};
+
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+  height: 100%;
+  min-height: 0;
+  max-height: 100%;
+  border: 0;
+  box-shadow: none;
+  animation: none;
+  padding-top: env(safe-area-inset-top, 0px);
+  padding-left: env(safe-area-inset-left, 0px);
+  padding-right: env(safe-area-inset-right, 0px);
+
+  > :first-child {
+    flex-shrink: 0;
+    height: auto;
+    min-height: 56px;
+    padding: 6px 16px;
+    border-bottom: 1px solid var(--color-border-2);
+  }
+}
+
+.mobile-tool-preview__status {
+  display: inline-flex;
+  min-height: 26px;
+  align-items: center;
+  padding: 0 9px;
+  border-radius: 999px;
+  background: var(--color-fill-1);
+  font-weight: var(--mobile-type-medium-weight);
+  white-space: nowrap;
+}
+
+.mobile-tool-preview__close {
+  flex-shrink: 0;
+  background: var(--color-fill-1);
+  color: var(--color-text-2);
+  touch-action: manipulation;
+}
+
+// File identity owns both lines in one header; keep the trailing close action
+// aligned to the collapsed row even while the user inspects a long full path.
+.liquid-modal-content.modal-fullscreen.mobile-tool-preview--file
+  > :first-child {
+  align-items: flex-start;
+  min-height: 60px;
+  padding: 8px 16px;
+}
+
+.mobile-file-identity > summary::-webkit-details-marker {
+  display: none;
+}
+
+.mobile-tool-preview__body {
+  min-height: 0;
+  overscroll-behavior: contain;
+  padding: 16px 16px calc(20px + env(safe-area-inset-bottom, 0px));
+}
+
+.mobile-terminal-detail__frame,
+.mobile-search-detail__frame {
+  overflow: hidden;
+  border: 1px solid var(--color-border-1);
+  border-radius: mobile.$space-3;
+  background: var(--color-bg-2);
+}
+
+.mobile-search-detail__query {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  align-items: start;
+  gap: mobile.$space-2;
+  padding: mobile.$space-3 mobile.$space-4;
+  background: var(--color-fill-1);
+  color: var(--color-text-1);
+
+  svg {
+    margin-top: calc(#{mobile.$space-1} / 2);
+    color: var(--color-text-3);
+  }
+
+  pre {
+    min-width: 0;
+    margin: 0;
+    overflow-wrap: anywhere;
+    font-family: var(--font-mono);
+    font-size: var(--mobile-type-code-size);
+    line-height: var(--mobile-type-code-leading);
+    white-space: pre-wrap;
+  }
+}
+
+.mobile-search-detail__results {
+  max-width: 100%;
+  margin: 0;
+  padding: mobile.$space-3 mobile.$space-4;
+  overflow-x: auto;
+  color: var(--color-text-2);
+  font-family: var(--font-mono);
+  font-size: var(--mobile-type-code-size);
+  line-height: var(--mobile-type-code-leading);
+  overscroll-behavior-x: contain;
+  user-select: text;
+  white-space: pre;
+}
+
+.mobile-search-detail__query + .mobile-search-detail__results {
+  border-top: 1px solid var(--color-border-1);
+}
+
+.mobile-terminal-detail__command {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  gap: mobile.$space-2;
+  padding: mobile.$space-3 mobile.$space-4;
+  background: var(--color-fill-1);
+  color: var(--color-text-1);
+  font-family: var(--font-mono);
+  font-size: var(--mobile-type-code-size);
+  line-height: var(--mobile-type-code-leading);
+
+  pre {
+    min-width: 0;
+    margin: 0;
+    overflow-wrap: anywhere;
+    white-space: pre-wrap;
+  }
+}
+
+.mobile-terminal-detail__prompt {
+  color: var(--color-text-3);
+  user-select: none;
+}
+
+.mobile-terminal-detail__output {
+  max-width: 100%;
+  margin: 0;
+  padding: mobile.$space-3 mobile.$space-4;
+  overflow-x: auto;
+  color: var(--color-text-2);
+  font-family: var(--font-mono);
+  font-size: var(--mobile-type-code-size);
+  line-height: var(--mobile-type-code-leading);
+  overscroll-behavior-x: contain;
+  user-select: text;
+  white-space: pre;
+}
+
+.mobile-terminal-detail__command + .mobile-terminal-detail__output {
+  border-top: 1px solid var(--color-border-1);
+}
+
+.mobile-terminal-detail__exit {
+  padding: mobile.$space-1 mobile.$space-4 mobile.$space-2;
+  border-top: 1px solid var(--color-border-1);
+  color: var(--color-danger-6);
+  font-family: var(--font-mono);
+  font-size: var(--mobile-type-caption-size);
+  line-height: var(--mobile-type-caption-leading);
+  text-align: right;
+}
+
+.mobile-terminal-detail__truncated,
+.mobile-tool-detail__truncated {
+  margin: mobile.$space-3 0 0;
+}
+
+.mobile-tool-preview__summary,
+.mobile-tool-preview__code {
+  max-width: 100%;
+  margin: 0;
+  border-radius: 10px;
+  background: var(--color-fill-1);
+  color: var(--color-text-2);
+  font-family: var(--font-mono);
+  user-select: text;
+}
+
+.mobile-tool-preview__summary {
+  margin-bottom: 18px;
+  padding: 10px 12px;
+  overflow-wrap: anywhere;
+  white-space: pre-wrap;
+}
+
+.mobile-tool-preview__section {
+  margin-bottom: 18px;
+}
+
+.mobile-tool-preview__label {
+  margin-bottom: 6px;
+  color: var(--color-text-3);
+  font-weight: var(--mobile-type-medium-weight);
+}
+
+.mobile-tool-preview__code {
+  padding: 12px;
+  overflow-x: auto;
+  white-space: pre;
+  overscroll-behavior-x: contain;
+}
+
+.mobile-file-viewer__body {
+  display: flex;
+  flex: 1;
+  min-height: 0;
+  padding: 0 0 env(safe-area-inset-bottom, 0px);
+  overflow: hidden;
+
+  > .mobile-file-viewer {
+    width: 100%;
+    height: auto;
+    flex: 1;
+  }
+
+  .mobile-readonly-editor .cm-editor {
+    height: 100%;
+  }
+
+  .cm-scroller {
+    overscroll-behavior: contain;
+  }
+}
diff --git a/src/modules/MobileRemote/components/transcript/mobileTranscriptLoading.scss b/src/modules/MobileRemote/components/transcript/mobileTranscriptLoading.scss
new file mode 100644
index 0000000000..2acfab7839
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/mobileTranscriptLoading.scss
@@ -0,0 +1,43 @@
+@use "../../mobileUiTokens" as tokens;
+.mobile-loading-dots {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: tokens.$space-2;
+  min-height: tokens.$touch-target;
+  color: var(--color-text-3);
+  > span {
+    width: tokens.$space-2;
+    height: tokens.$space-2;
+    border-radius: 50%;
+    background: currentColor;
+    animation: mobile-loading-dot 1.2s ease-in-out infinite;
+    &:nth-child(2) {
+      animation-delay: 0.15s;
+    }
+    &:nth-child(3) {
+      animation-delay: 0.3s;
+    }
+  }
+  &[data-paused="true"] > span {
+    animation-play-state: paused;
+  }
+}
+@keyframes mobile-loading-dot {
+  0%,
+  60%,
+  100% {
+    opacity: 0.35;
+    transform: translateY(0);
+  }
+  30% {
+    opacity: 1;
+    transform: translateY(-#{tokens.$space-1});
+  }
+}
+@media (prefers-reduced-motion: reduce) {
+  .mobile-loading-dots > span {
+    animation: none;
+    opacity: 0.65;
+  }
+}
diff --git a/src/modules/MobileRemote/components/transcript/useMobileCopyText.ts b/src/modules/MobileRemote/components/transcript/useMobileCopyText.ts
new file mode 100644
index 0000000000..7fbf5e461b
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/useMobileCopyText.ts
@@ -0,0 +1,57 @@
+import { useEffect, useRef, useState } from "react";
+
+import { useMobileRemotePlatform } from "../../platform/MobileRemotePlatformContext";
+
+type CopyState = "idle" | "pending" | "copied" | "failed";
+
+/** One-shot clipboard action shared by chat snippets and the file viewer. */
+export function useMobileCopyText(text: string) {
+  const platform = useMobileRemotePlatform();
+  const [result, setResult] = useState<{
+    text: string;
+    owner: typeof platform;
+    state: CopyState;
+  } | null>(null);
+  if (result && (result.text !== text || result.owner !== platform))
+    setResult(null);
+  const state =
+    result?.text === text && result.owner === platform ? result.state : "idle";
+  const generation = useRef(0);
+  const pending = useRef(false);
+  const timer = useRef<number | null>(null);
+  useEffect(
+    () => () => {
+      generation.current += 1;
+      pending.current = false;
+      if (timer.current !== null) platform.runtime.clearTimeout(timer.current);
+      timer.current = null;
+    },
+    [text, platform]
+  );
+
+  const copy = () => {
+    if (pending.current) return;
+    pending.current = true;
+    const attempt = ++generation.current;
+    setResult({ text, owner: platform, state: "pending" });
+    const finish = (next: CopyState) => {
+      if (attempt !== generation.current) return;
+      generation.current += 1;
+      pending.current = false;
+      if (timer.current !== null) platform.runtime.clearTimeout(timer.current);
+      timer.current = null;
+      setResult({ text, owner: platform, state: next });
+    };
+    timer.current = platform.runtime.setTimeout(() => finish("failed"), 3_000);
+    try {
+      if (!platform.writeClipboardText) return finish("failed");
+      void platform.writeClipboardText(text).then(
+        () => finish("copied"),
+        () => finish("failed")
+      );
+    } catch {
+      finish("failed");
+    }
+  };
+  return { state, copy };
+}
diff --git a/src/modules/MobileRemote/components/transcript/useMobileFilePreview.ts b/src/modules/MobileRemote/components/transcript/useMobileFilePreview.ts
new file mode 100644
index 0000000000..3aaf1b8ec3
--- /dev/null
+++ b/src/modules/MobileRemote/components/transcript/useMobileFilePreview.ts
@@ -0,0 +1,85 @@
+import { useCallback, useLayoutEffect, useRef, useState } from "react";
+
+import type { MobileFileTarget } from "./mobileFileTool";
+
+export type MobileDesktopFileState =
+  | { phase: "idle" }
+  | { phase: "opening" }
+  | { phase: "requested" }
+  | { phase: "failed"; message: string };
+
+export interface MobileDesktopFileAction {
+  state: MobileDesktopFileState;
+  open: () => Promise<void>;
+}
+
+/** One mounted tool preview owns selection and explicit Desktop requests. */
+export function useMobileFilePreview(
+  targets: MobileFileTarget[],
+  onOpenFile?: (target: MobileFileTarget) => Promise<void>
+) {
+  const [selectedIndex, setSelectedIndex] = useState(
+    () => targets[0]?.targetIndex
+  );
+  const selectedTarget =
+    targets.find((target) => target.targetIndex === selectedIndex) ??
+    targets[0];
+  const [state, setState] = useState<MobileDesktopFileState>({ phase: "idle" });
+  // The token is also a synchronous single-flight gate, before React rerenders.
+  const request = useRef<object | null>(null);
+  const available = Boolean(onOpenFile);
+
+  const invalidate = useCallback(() => {
+    request.current = null;
+    setState({ phase: "idle" });
+  }, []);
+
+  useLayoutEffect(() => {
+    invalidate();
+    return () => {
+      request.current = null;
+    };
+  }, [
+    selectedTarget?.targetIndex,
+    selectedTarget?.filePath,
+    available,
+    invalidate,
+  ]);
+
+  const selectTarget = (index: number) => {
+    if (index === selectedTarget?.targetIndex) return;
+    if (!targets.some((target) => target.targetIndex === index)) return;
+    invalidate();
+    setSelectedIndex(index);
+  };
+
+  const open = async () => {
+    if (!selectedTarget || !onOpenFile || request.current) return;
+    const token = {};
+    request.current = token;
+    setState({ phase: "opening" });
+    try {
+      await onOpenFile(selectedTarget);
+      if (request.current !== token) return;
+      setState({ phase: "requested" });
+    } catch (error) {
+      if (request.current !== token) return;
+      setState({
+        phase: "failed",
+        message: error instanceof Error ? error.message : String(error),
+      });
+    } finally {
+      if (request.current === token) request.current = null;
+    }
+  };
+
+  return {
+    selectedTarget,
+    selectTarget,
+    desktopAction: onOpenFile && selectedTarget ? { state, open } : undefined,
+    reset: () => {
+      invalidate();
+      setSelectedIndex(targets[0]?.targetIndex);
+    },
+  };
+}
diff --git a/src/modules/MobileRemote/components/transcript/useMobileToolPresentation.ts b/src/modules/MobileRemote/components/transcript/useMobileToolPresentation.ts
index 390ba93c39..d9e425c9bb 100644
--- a/src/modules/MobileRemote/components/transcript/useMobileToolPresentation.ts
+++ b/src/modules/MobileRemote/components/transcript/useMobileToolPresentation.ts
@@ -6,10 +6,15 @@ import type { TranscriptItem } from "../../lib/transcriptReducer";
 import { mobileFileTargets } from "./mobileFileTool";
 import {
   compactMetadata,
+  mobileSearchDetail,
+  mobileShellDetail,
+  mobileToolDetailSummary,
   mobileToolSummary,
   normalizeMobileToolLifecycle,
   outputFromToolData,
+  record,
   resolveMobileToolIconName,
+  stringValue,
   toolLabelKey,
 } from "./mobileToolPresentation";
 
@@ -22,7 +27,10 @@ export function useMobileToolPresentation(item: TranscriptItem) {
     ? t(`transcript.tools.labels.${labelKey}`)
     : formatToolName(rawName);
   const summary = mobileToolSummary(item);
+  const detailSummary = mobileToolDetailSummary(item);
   const output = outputFromToolData(item.toolData);
+  const shellDetail = mobileShellDetail(item);
+  const searchDetail = mobileSearchDetail(item);
   const fileTargets = mobileFileTargets(item);
   const metadata = compactMetadata(item.toolData);
   const metadataText =
@@ -38,9 +46,13 @@ export function useMobileToolPresentation(item: TranscriptItem) {
     t,
     lifecycle,
     rawName,
+    action: stringValue(record(item.toolData)?.action) || undefined,
     title,
     summary,
+    detailSummary,
     output,
+    shellDetail,
+    searchDetail,
     fileTargets,
     metadataText,
     hasDetails,
diff --git a/src/modules/MobileRemote/connection/buildMobileWsUrl.test.ts b/src/modules/MobileRemote/connection/buildMobileWsUrl.test.ts
index 592fedfdc0..21adf178a0 100644
--- a/src/modules/MobileRemote/connection/buildMobileWsUrl.test.ts
+++ b/src/modules/MobileRemote/connection/buildMobileWsUrl.test.ts
@@ -33,6 +33,17 @@ describe("buildMobileWsUrl", () => {
     );
   });
 
+  it("does not replay a URL's one-time code after pairing is confirmed", () => {
+    const url = new URL(
+      buildMobileWsUrl({
+        wsUrl: "wss://relay.example.com/v1/mobile/ws?pairingCode=expired",
+        deviceToken: "saved-device-token",
+      })
+    );
+    expect(url.searchParams.has("pairingCode")).toBe(false);
+    expect(url.searchParams.get("token")).toBe("saved-device-token");
+  });
+
   it("builds LAN url from host port token", () => {
     expect(
       buildMobileWsUrl({ host: "192.168.1.10", port: 13847, token: "secret" })
diff --git a/src/modules/MobileRemote/connection/buildMobileWsUrl.ts b/src/modules/MobileRemote/connection/buildMobileWsUrl.ts
index fefccea735..2bd58014c3 100644
--- a/src/modules/MobileRemote/connection/buildMobileWsUrl.ts
+++ b/src/modules/MobileRemote/connection/buildMobileWsUrl.ts
@@ -12,6 +12,8 @@ export function buildMobileWsUrl(config: MobileConnectionConfig): string {
     url.searchParams.set("token", config.deviceToken.trim());
     if (config.pairingCode?.trim()) {
       url.searchParams.set("pairingCode", config.pairingCode.trim());
+    } else {
+      url.searchParams.delete("pairingCode");
     }
     if (config.deviceLabel?.trim()) {
       url.searchParams.set("deviceLabel", config.deviceLabel.trim());
diff --git a/src/modules/MobileRemote/connection/mobileConnectionStorage.test.ts b/src/modules/MobileRemote/connection/mobileConnectionStorage.test.ts
index 2bb97cda38..0159f325df 100644
--- a/src/modules/MobileRemote/connection/mobileConnectionStorage.test.ts
+++ b/src/modules/MobileRemote/connection/mobileConnectionStorage.test.ts
@@ -80,8 +80,8 @@ describe("mobileConnectionStorage", () => {
 
     expect(loadScopedMobileConnectionConfig("user-a", storage)).toBeNull();
     expect(listScopedMobilePairedDesktops("user-a", storage)).toEqual([
-      { id: "desktop-b", name: "Office Mac", active: false, updatedAtMs: 2 },
-      { id: "desktop-a", name: "Home Mac", active: false, updatedAtMs: 1 },
+      { id: "desktop-b", name: "desktop-b", active: false, updatedAtMs: 2 },
+      { id: "desktop-a", name: "desktop-a", active: false, updatedAtMs: 1 },
     ]);
     expect(listScopedMobilePairedDesktops("user-b", storage)).toEqual([]);
   });
@@ -118,8 +118,8 @@ describe("mobileConnectionStorage", () => {
       desktopId: "desktop-a",
     });
     expect(listScopedMobilePairedDesktops("user-a", storage)).toEqual([
-      { id: "desktop-b", name: "Office Mac", active: false, updatedAtMs: 2 },
-      { id: "desktop-a", name: "Home Mac", active: true, updatedAtMs: 1 },
+      { id: "desktop-b", name: "desktop-b", active: false, updatedAtMs: 2 },
+      { id: "desktop-a", name: "desktop-a", active: true, updatedAtMs: 1 },
     ]);
     expect(
       JSON.stringify(listScopedMobilePairedDesktops("user-a", storage))
diff --git a/src/modules/MobileRemote/connection/mobileDesktopIdentity.test.ts b/src/modules/MobileRemote/connection/mobileDesktopIdentity.test.ts
new file mode 100644
index 0000000000..6050159074
--- /dev/null
+++ b/src/modules/MobileRemote/connection/mobileDesktopIdentity.test.ts
@@ -0,0 +1,104 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  desktopIdentityName,
+  parseDesktopIdentity,
+  withInitializedDesktop,
+} from "./mobileDesktopIdentity";
+import {
+  activePairingConfig,
+  parsePairingInventory,
+  summarizePairingInventory,
+  updatePairingInventory,
+} from "./mobilePairedDesktopInventory";
+
+describe("desktop metadata ownership", () => {
+  const config = {
+    host: "office.local",
+    port: 8765,
+    deviceLabel: "Alex's iPhone",
+    deviceToken: "private-token",
+  };
+  const identity = { name: "Office Mac", model: "Mac14,7", username: "alex" };
+
+  it("hydrates confirmed metadata without changing pairing ID, credentials or phone label", () => {
+    const initial = updatePairingInventory(
+      parsePairingInventory(null),
+      config,
+      1
+    );
+    expect(initial.desktops[0].name).toBe("office.local");
+    const identified = withInitializedDesktop(config, {
+      desktopId: "desktop-process-42",
+      desktopIdentity: identity,
+    });
+    const saved = updatePairingInventory(initial, identified, 2);
+    const reloaded = parsePairingInventory(JSON.stringify(saved));
+    expect(reloaded.desktops).toHaveLength(1);
+    expect(reloaded.activeDesktopId).toBe(initial.activeDesktopId);
+    expect(activePairingConfig(reloaded)).toEqual({
+      ...config,
+      desktopIdentity: identity,
+    });
+    expect(summarizePairingInventory(reloaded)[0]).toMatchObject({
+      name: "Office Mac",
+      desktopIdentity: identity,
+    });
+    expect(JSON.stringify(summarizePairingInventory(reloaded))).not.toContain(
+      "private-token"
+    );
+    expect(JSON.stringify(summarizePairingInventory(reloaded))).not.toContain(
+      "Alex's iPhone"
+    );
+  });
+
+  it("preserves known labels across old-server reconnect and updates only the same pairing", () => {
+    const known = withInitializedDesktop(config, { desktopIdentity: identity });
+    expect(withInitializedDesktop(known, {})).toBe(known);
+    expect(withInitializedDesktop(known, { desktopIdentity: identity })).toBe(
+      known
+    );
+    const initial = updatePairingInventory(
+      parsePairingInventory(null),
+      known,
+      1
+    );
+    const another = updatePairingInventory(
+      initial,
+      { wsUrl: "wss://elsewhere.test", desktopId: "other" },
+      2
+    );
+    const updated = updatePairingInventory(
+      another,
+      withInitializedDesktop(known, { desktopName: "Renamed Mac" }),
+      3
+    );
+    expect(updated.desktops[0].name).toBe("Renamed Mac");
+    expect(updated.desktops[0].config.desktopIdentity).toEqual({
+      ...identity,
+      name: "Renamed Mac",
+    });
+    expect(updated.desktops[1]).toEqual(another.desktops[0]);
+  });
+
+  it("accepts partial labels, rejects malformed values, and never fabricates a model", () => {
+    expect(
+      parseDesktopIdentity({ name: ["bad"], model: 42, username: "\u0000" })
+    ).toBeUndefined();
+    expect(
+      parseDesktopIdentity({ username: " alex ", serialNumber: "do-not-copy" })
+    ).toEqual({ username: "alex" });
+    expect(desktopIdentityName({ model: "Mac14,7", username: "alex" })).toBe(
+      "Mac14,7 · alex"
+    );
+    expect(
+      withInitializedDesktop(config, {
+        desktopIdentity: null,
+        desktopName: " Old Mac ",
+      }).desktopIdentity
+    ).toEqual({ name: "Old Mac" });
+    expect(parseDesktopIdentity({ name: "机".repeat(200) })?.name).toHaveLength(
+      128
+    );
+  });
+});
diff --git a/src/modules/MobileRemote/connection/mobileDesktopIdentity.ts b/src/modules/MobileRemote/connection/mobileDesktopIdentity.ts
new file mode 100644
index 0000000000..c2e18a8139
--- /dev/null
+++ b/src/modules/MobileRemote/connection/mobileDesktopIdentity.ts
@@ -0,0 +1,70 @@
+import type { MobileConnectionConfig, MobileDesktopIdentity } from "./types";
+
+function label(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const text = value.trim();
+  if (
+    !text ||
+    Array.from(text).some((character) => {
+      const code = character.codePointAt(0)!;
+      return code < 32 || (code >= 127 && code <= 159);
+    })
+  )
+    return undefined;
+  return Array.from(text).slice(0, 128).join("");
+}
+
+/** Validate wire and persisted metadata; strip all unrecognized fields. */
+export function parseDesktopIdentity(
+  value: unknown
+): MobileDesktopIdentity | undefined {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return undefined;
+  const input = value as Record<string, unknown>;
+  const name = label(input.name);
+  const model = label(input.model);
+  const username = label(input.username);
+  if (!name && !model && !username) return undefined;
+  return {
+    ...(name && { name }),
+    ...(model && { model }),
+    ...(username && { username }),
+  };
+}
+
+export function desktopIdentityName(
+  identity: MobileDesktopIdentity | undefined
+): string | undefined {
+  const valid = parseDesktopIdentity(identity);
+  return (
+    valid?.name ||
+    [valid?.model, valid?.username].filter(Boolean).join(" · ") ||
+    undefined
+  );
+}
+
+export function pairedDesktopId(config: MobileConnectionConfig): string {
+  const endpoint =
+    config.wsUrl?.trim() ||
+    [config.host?.trim(), config.port].filter(Boolean).join(":");
+  return config.desktopId?.trim() || `endpoint:${endpoint}`;
+}
+
+/** Keep routing credentials/ID unchanged, including LAN endpoint-based pairings. */
+export function withInitializedDesktop(
+  config: MobileConnectionConfig,
+  response: unknown
+): MobileConnectionConfig {
+  const init =
+    response && typeof response === "object"
+      ? (response as Record<string, unknown>)
+      : {};
+  const identity =
+    parseDesktopIdentity(init.desktopIdentity) ??
+    parseDesktopIdentity({ name: init.desktopName });
+  const previous = parseDesktopIdentity(config.desktopIdentity);
+  if (!identity) return config;
+  const next = { ...previous, ...identity };
+  if (JSON.stringify(next) === JSON.stringify(previous)) return config;
+  return { ...config, desktopIdentity: next };
+}
diff --git a/src/modules/MobileRemote/connection/mobilePairedDesktopInventory.ts b/src/modules/MobileRemote/connection/mobilePairedDesktopInventory.ts
index 4cf56227d1..5376f4d20f 100644
--- a/src/modules/MobileRemote/connection/mobilePairedDesktopInventory.ts
+++ b/src/modules/MobileRemote/connection/mobilePairedDesktopInventory.ts
@@ -1,3 +1,8 @@
+import {
+  desktopIdentityName,
+  pairedDesktopId,
+  parseDesktopIdentity,
+} from "./mobileDesktopIdentity";
 import type {
   MobileConnectionConfig,
   MobilePairedDesktopSummary,
@@ -67,18 +72,20 @@ export function updatePairingInventory(
   nowMs: number
 ): StoredPairingInventory {
   if (!config) return { ...inventory, activeDesktopId: null };
-  const endpoint =
-    config.wsUrl?.trim() ||
-    [config.host?.trim(), config.port].filter(Boolean).join(":");
-  const id = config.desktopId?.trim() || `endpoint:${endpoint}`;
+  const id = pairedDesktopId(config);
+  const previous = inventory.desktops.find((desktop) => desktop.id === id);
+  const desktopIdentity =
+    parseDesktopIdentity(config.desktopIdentity) ??
+    parseDesktopIdentity(previous?.config.desktopIdentity);
   const desktop: StoredPairedDesktop = {
     id,
     name:
-      config.deviceLabel?.trim() ||
+      desktopIdentityName(desktopIdentity) ||
+      previous?.name ||
       config.desktopId?.trim() ||
       config.host?.trim() ||
       "Paired Desktop",
-    config,
+    config: desktopIdentity ? { ...config, desktopIdentity } : config,
     updatedAtMs: nowMs,
   };
   return {
@@ -121,10 +128,13 @@ export function selectPairingInventory(
 export function summarizePairingInventory(
   inventory: StoredPairingInventory
 ): MobilePairedDesktopSummary[] {
-  return inventory.desktops.map(({ id, name, updatedAtMs }) => ({
+  return inventory.desktops.map(({ id, name, config, updatedAtMs }) => ({
     id,
     name,
     updatedAtMs,
     active: id === inventory.activeDesktopId,
+    ...(parseDesktopIdentity(config.desktopIdentity) && {
+      desktopIdentity: parseDesktopIdentity(config.desktopIdentity),
+    }),
   }));
 }
diff --git a/src/modules/MobileRemote/connection/mobilePairedDesktopPresence.test.ts b/src/modules/MobileRemote/connection/mobilePairedDesktopPresence.test.ts
new file mode 100644
index 0000000000..ec55112b0e
--- /dev/null
+++ b/src/modules/MobileRemote/connection/mobilePairedDesktopPresence.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  parsePairingInventory,
+  selectPairingInventory,
+  summarizePairingInventory,
+  updatePairingInventory,
+} from "./mobilePairedDesktopInventory";
+import { derivePairedDesktopPresence } from "./mobilePairedDesktopPresence";
+
+describe("derivePairedDesktopPresence", () => {
+  it("does not invent devices from an online transport", () => {
+    expect(
+      derivePairedDesktopPresence({ desktops: [], activePresence: "online" })
+    ).toEqual([]);
+  });
+
+  it.each(["online", "offline", "unknown"] as const)(
+    "only associates %s with the selected desktop, never with other saved pairings",
+    (activePresence) => {
+      const desktops = [
+        { id: "home", name: "Home Mac", active: true, updatedAtMs: 1 },
+        {
+          id: "office",
+          name: "Office Mac",
+          active: false,
+          updatedAtMs: Date.now(),
+        },
+      ];
+      expect(derivePairedDesktopPresence({ desktops, activePresence })).toEqual(
+        [
+          {
+            id: "home",
+            name: "Home Mac",
+            current: true,
+            presence: activePresence,
+          },
+          {
+            id: "office",
+            name: "Office Mac",
+            current: false,
+            presence: "unknown",
+          },
+        ]
+      );
+      expect(desktops[1]).not.toHaveProperty("presence");
+    }
+  );
+
+  it("preserves the invariant through real pairing writes, reload, selection and deselection", () => {
+    const home = updatePairingInventory(
+      parsePairingInventory(null),
+      {
+        desktopId: "home",
+        deviceLabel: "Home Mac",
+        wsUrl: "wss://home.example/ws",
+      },
+      1
+    );
+    const office = updatePairingInventory(
+      home,
+      {
+        desktopId: "office",
+        deviceLabel: "Office Mac",
+        wsUrl: "wss://office.example/ws",
+      },
+      2
+    );
+    const reloaded = parsePairingInventory(JSON.stringify(office));
+    const project = (inventory: typeof reloaded) =>
+      derivePairedDesktopPresence({
+        desktops: summarizePairingInventory(inventory),
+        activePresence: "online",
+      });
+    expect(project(reloaded).map(({ presence }) => presence)).toEqual([
+      "online",
+      "unknown",
+    ]);
+    const selected = selectPairingInventory(reloaded, "home")!;
+    expect(project(selected.inventory).map(({ presence }) => presence)).toEqual(
+      ["unknown", "online"]
+    );
+    const cleared = updatePairingInventory(selected.inventory, null, 3);
+    expect(project(cleared).map(({ presence }) => presence)).toEqual([
+      "unknown",
+      "unknown",
+    ]);
+    expect(JSON.stringify(cleared)).not.toContain("presence");
+    expect(reloaded.activeDesktopId).toBe("office");
+  });
+});
diff --git a/src/modules/MobileRemote/connection/mobilePairedDesktopPresence.ts b/src/modules/MobileRemote/connection/mobilePairedDesktopPresence.ts
new file mode 100644
index 0000000000..e29afea080
--- /dev/null
+++ b/src/modules/MobileRemote/connection/mobilePairedDesktopPresence.ts
@@ -0,0 +1,30 @@
+import type { DesktopPresence, MobilePairedDesktopSummary } from "./types";
+
+export interface PairedDesktopPresence {
+  id: string;
+  name: string;
+  details?: string;
+  presence: DesktopPresence;
+  current: boolean;
+}
+
+/**
+ * Pairing storage records selection, not presence. Only the selected desktop
+ * has a live transport observation; other saved desktops are not probed.
+ * Never persist this projection or infer availability from updatedAtMs.
+ */
+export function derivePairedDesktopPresence(input: {
+  desktops: MobilePairedDesktopSummary[];
+  activePresence: DesktopPresence;
+}): PairedDesktopPresence[] {
+  return input.desktops.map((desktop) => ({
+    id: desktop.id,
+    name: desktop.name,
+    details:
+      [desktop.desktopIdentity?.model, desktop.desktopIdentity?.username]
+        .filter(Boolean)
+        .join(" · ") || undefined,
+    presence: desktop.active ? input.activePresence : "unknown",
+    current: desktop.active,
+  }));
+}
diff --git a/src/modules/MobileRemote/connection/mobileRpcClient.test.ts b/src/modules/MobileRemote/connection/mobileRpcClient.test.ts
index 1b85e74bcb..66048046c2 100644
--- a/src/modules/MobileRemote/connection/mobileRpcClient.test.ts
+++ b/src/modules/MobileRemote/connection/mobileRpcClient.test.ts
@@ -2,6 +2,10 @@
 import { describe, expect, it, vi } from "vitest";
 
 import { createMobileRpcClient } from "./mobileRpcClient";
+import {
+  cachedMobileSessionIdentity,
+  resolveMobileSessionIdentity,
+} from "./mobileSessionIdentityCache";
 
 type WebSocketListener = (event: { data: string }) => void;
 
@@ -31,6 +35,134 @@ const runtime = {
 };
 
 describe("createMobileRpcClient", () => {
+  it.each([
+    "session/list_changed",
+    "relay/presence",
+    "close",
+    "explicit-close",
+  ])(
+    "invalidates cached identities on %s even while no chat page is mounted",
+    async (event) => {
+      const socket = createMockSocket();
+      const client = createMobileRpcClient(
+        socket as unknown as WebSocket,
+        runtime
+      );
+      const lookup = resolveMobileSessionIdentity(client, "mirror");
+      await Promise.resolve();
+      socket.emit(
+        "message",
+        JSON.stringify({
+          jsonrpc: "2.0",
+          id: 1,
+          result: { sessionId: "owner", managed: true },
+        })
+      );
+      await lookup;
+      expect(cachedMobileSessionIdentity(client, "mirror")).toBeDefined();
+      if (event === "close") socket.emit("close", "");
+      else if (event === "explicit-close") client.close();
+      else
+        socket.emit(
+          "message",
+          JSON.stringify({
+            jsonrpc: "2.0",
+            method: event,
+            params: { online: false },
+          })
+        );
+      expect(cachedMobileSessionIdentity(client, "mirror")).toBeUndefined();
+    }
+  );
+
+  it("aborts locally, ignores the late reply, and allows another RPC immediately", async () => {
+    vi.useFakeTimers();
+    try {
+      const socket = createMockSocket();
+      const client = createMobileRpcClient(
+        socket as unknown as WebSocket,
+        runtime
+      );
+      const controller = new AbortController();
+      const remove = vi.spyOn(controller.signal, "removeEventListener");
+      const old = client.call("session/list", {}, controller.signal);
+      const rejected = expect(old).rejects.toMatchObject({
+        name: "AbortError",
+      });
+      controller.abort();
+      await rejected;
+      expect(remove).toHaveBeenCalledOnce();
+      const fresh = client.call("session/list");
+      socket.emit(
+        "message",
+        JSON.stringify({ jsonrpc: "2.0", id: 2, result: "fresh" })
+      );
+      await expect(fresh).resolves.toBe("fresh");
+      socket.emit(
+        "message",
+        JSON.stringify({ jsonrpc: "2.0", id: 1, result: "old" })
+      );
+      expect(vi.getTimerCount()).toBe(0);
+      expect(socket.close).not.toHaveBeenCalled();
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("does not send pre-aborted requests or leak resources after send failure", async () => {
+    vi.useFakeTimers();
+    try {
+      const socket = createMockSocket();
+      const client = createMobileRpcClient(
+        socket as unknown as WebSocket,
+        runtime
+      );
+      const controller = new AbortController();
+      controller.abort();
+      await expect(
+        client.call("session/list", {}, controller.signal)
+      ).rejects.toMatchObject({ name: "AbortError" });
+      expect(socket.send).not.toHaveBeenCalled();
+      socket.send.mockImplementation(() => {
+        throw new Error("send failed");
+      });
+      await expect(client.call("session/list")).rejects.toThrow("send failed");
+      expect(vi.getTimerCount()).toBe(0);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("keeps aborted wire requests bounded and releases tombstones on timeout and close", async () => {
+    vi.useFakeTimers();
+    try {
+      const socket = createMockSocket();
+      const client = createMobileRpcClient(
+        socket as unknown as WebSocket,
+        runtime
+      );
+      for (let i = 0; i < 128; i++) {
+        const controller = new AbortController();
+        const request = client.call("session/list", {}, controller.signal);
+        const rejected = expect(request).rejects.toMatchObject({
+          name: "AbortError",
+        });
+        controller.abort();
+        await rejected;
+      }
+      await expect(client.call("session/list")).rejects.toThrow(
+        "Too many pending"
+      );
+      await vi.advanceTimersByTimeAsync(15_000);
+      expect(vi.getTimerCount()).toBe(0);
+      const pending = client.call("session/list");
+      client.close();
+      await expect(pending).rejects.toThrow("RPC client closed");
+      expect(vi.getTimerCount()).toBe(0);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
   it("resolves call results by id", async () => {
     const socket = createMockSocket();
     const client = createMobileRpcClient(
diff --git a/src/modules/MobileRemote/connection/mobileRpcClient.ts b/src/modules/MobileRemote/connection/mobileRpcClient.ts
index 9251642211..8a90695a0a 100644
--- a/src/modules/MobileRemote/connection/mobileRpcClient.ts
+++ b/src/modules/MobileRemote/connection/mobileRpcClient.ts
@@ -1,4 +1,5 @@
 import type { MobileRemoteRuntimePort } from "../platform/types";
+import { invalidateMobileSessionIdentities } from "./mobileSessionIdentityCache";
 import type {
   JsonRpcInbound,
   JsonRpcNotification,
@@ -13,7 +14,11 @@ export type RpcNotificationHandler = (
 ) => void;
 
 export interface MobileRpcClient {
-  call<T>(method: string, params?: Record<string, unknown>): Promise<T>;
+  call<T>(
+    method: string,
+    params?: Record<string, unknown>,
+    signal?: AbortSignal
+  ): Promise<T>;
   notify(method: string, params?: Record<string, unknown>): void;
   onNotification(handler: RpcNotificationHandler): () => void;
   close(): void;
@@ -24,6 +29,7 @@ interface PendingCall {
   resolve: (value: unknown) => void;
   reject: (error: Error) => void;
   timeoutId: number;
+  cleanup: () => void;
 }
 
 const CLOSED = 3;
@@ -41,6 +47,7 @@ export function createMobileRpcClient(
   const flushPending = (error: Error) => {
     for (const entry of pending.values()) {
       runtime.clearTimeout(entry.timeoutId);
+      entry.cleanup();
       entry.reject(error);
     }
     pending.clear();
@@ -59,6 +66,7 @@ export function createMobileRpcClient(
       if (!waiter) return;
       pending.delete(parsed.id);
       runtime.clearTimeout(waiter.timeoutId);
+      waiter.cleanup();
       if (parsed.error) {
         waiter.reject(
           new Error(parsed.error.message || `RPC error ${parsed.error.code}`)
@@ -70,20 +78,34 @@ export function createMobileRpcClient(
     }
 
     const notification = parsed as JsonRpcNotification;
+    if (
+      notification.method === "session/list_changed" ||
+      (notification.method === "relay/presence" &&
+        notification.params?.online === false)
+    )
+      invalidateMobileSessionIdentities(client);
     for (const handler of notificationHandlers) {
       handler(notification.method, notification.params);
     }
   });
 
   socket.addEventListener("close", () => {
+    invalidateMobileSessionIdentities(client);
     flushPending(new Error("WebSocket closed"));
   });
 
-  return {
+  const client: MobileRpcClient = {
     get readyState() {
       return socket.readyState;
     },
-    call<T>(method: string, params: Record<string, unknown> = {}): Promise<T> {
+    call<T>(
+      method: string,
+      params: Record<string, unknown> = {},
+      signal?: AbortSignal
+    ): Promise<T> {
+      const abortError = () =>
+        new DOMException("RPC call aborted", "AbortError");
+      if (signal?.aborted) return Promise.reject(abortError());
       if (socket.readyState !== 1) {
         return Promise.reject(new Error("WebSocket is not open"));
       }
@@ -98,16 +120,43 @@ export function createMobileRpcClient(
         params,
       };
       return new Promise<T>((resolve, reject) => {
+        const cleanup = () => signal?.removeEventListener("abort", onAbort);
+        const onAbort = () => {
+          const entry = pending.get(id);
+          if (!entry) return;
+          cleanup();
+          // Local cancellation cannot stop work already sent to Desktop.
+          // Retain a bounded tombstone until reply/timeout, so repeated aborts
+          // cannot bypass the outstanding-wire-request limit.
+          pending.set(id, {
+            timeoutId: entry.timeoutId,
+            resolve: () => {},
+            reject: () => {},
+            cleanup: () => {},
+          });
+          reject(abortError());
+        };
         const timeoutId = runtime.setTimeout(() => {
+          const entry = pending.get(id);
           pending.delete(id);
-          reject(new Error(`RPC call timed out: ${method}`));
+          entry?.cleanup();
+          entry?.reject(new Error(`RPC call timed out: ${method}`));
         }, RPC_TIMEOUT_MS);
         pending.set(id, {
           resolve: (value) => resolve(value as T),
           reject,
           timeoutId,
+          cleanup,
         });
-        socket.send(JSON.stringify(request));
+        signal?.addEventListener("abort", onAbort, { once: true });
+        try {
+          socket.send(JSON.stringify(request));
+        } catch (error) {
+          pending.delete(id);
+          runtime.clearTimeout(timeoutId);
+          cleanup();
+          reject(error);
+        }
       });
     },
     notify(method: string, params: Record<string, unknown> = {}) {
@@ -119,12 +168,14 @@ export function createMobileRpcClient(
       return () => notificationHandlers.delete(handler);
     },
     close() {
+      invalidateMobileSessionIdentities(client);
       if (socket.readyState !== CLOSED) {
         socket.close();
       }
       flushPending(new Error("RPC client closed"));
     },
   };
+  return client;
 }
 
 export function toMobileRpcError(error: unknown): MobileRpcError {
diff --git a/src/modules/MobileRemote/connection/mobileSessionIdentityCache.test.ts b/src/modules/MobileRemote/connection/mobileSessionIdentityCache.test.ts
new file mode 100644
index 0000000000..8cab4c4d3e
--- /dev/null
+++ b/src/modules/MobileRemote/connection/mobileSessionIdentityCache.test.ts
@@ -0,0 +1,134 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import type { MobileRpcClient } from "./mobileRpcClient";
+import {
+  MobileSessionIdentityInvalidated,
+  cachedMobileSessionIdentity,
+  invalidateMobileSessionIdentities,
+  resolveMobileSessionIdentity,
+} from "./mobileSessionIdentityCache";
+
+function clientWith(
+  call = vi.fn().mockResolvedValue({ sessionId: "owner", managed: true })
+) {
+  return {
+    call,
+    close: vi.fn(),
+    notify: vi.fn(),
+    onNotification: () => () => {},
+    readyState: 1,
+  } satisfies MobileRpcClient;
+}
+
+describe("connection-scoped session identity cache", () => {
+  afterEach(() => vi.useRealTimers());
+
+  it("shares pending lookups and retains only validated successes for this client", async () => {
+    let finish!: (value: unknown) => void;
+    const call = vi.fn(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        })
+    );
+    const client = clientWith(call);
+    const first = resolveMobileSessionIdentity(client, "mirror");
+    const second = resolveMobileSessionIdentity(client, "mirror");
+    expect(second).toBe(first);
+    await Promise.resolve();
+    finish({ sessionId: "owner", managed: true });
+    await first;
+    expect(cachedMobileSessionIdentity(client, "mirror")).toEqual({
+      sessionId: "owner",
+      managed: true,
+    });
+    await resolveMobileSessionIdentity(client, "mirror");
+    expect(call).toHaveBeenCalledOnce();
+    const other = clientWith();
+    expect(cachedMobileSessionIdentity(other, "mirror")).toBeUndefined();
+    await resolveMobileSessionIdentity(other, "mirror");
+    expect(other.call).toHaveBeenCalledOnce();
+  });
+
+  it("does not retain failures or malformed responses", async () => {
+    const call = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("unavailable"))
+      .mockResolvedValueOnce({ sessionId: " ", managed: true })
+      .mockResolvedValueOnce({ sessionId: "safe", managed: false });
+    const client = clientWith(call);
+    await expect(resolveMobileSessionIdentity(client, "s")).rejects.toThrow(
+      "unavailable"
+    );
+    await expect(resolveMobileSessionIdentity(client, "s")).rejects.toThrow(
+      "Invalid session identity"
+    );
+    expect(cachedMobileSessionIdentity(client, "s")).toBeUndefined();
+    await expect(resolveMobileSessionIdentity(client, "s")).resolves.toEqual({
+      sessionId: "safe",
+      managed: false,
+    });
+    expect(call).toHaveBeenCalledTimes(3);
+  });
+
+  it("bounds successful entries and expires them lazily without timers", async () => {
+    vi.useFakeTimers();
+    const client = clientWith();
+    for (let index = 0; index < 33; index++)
+      await resolveMobileSessionIdentity(client, String(index));
+    expect(cachedMobileSessionIdentity(client, "0")).toBeUndefined();
+    expect(cachedMobileSessionIdentity(client, "1")).toBeDefined();
+    await vi.advanceTimersByTimeAsync(5 * 60_000);
+    expect(cachedMobileSessionIdentity(client, "32")).toBeUndefined();
+    await resolveMobileSessionIdentity(client, "32");
+    expect(client.call).toHaveBeenCalledTimes(34);
+    expect(vi.getTimerCount()).toBe(0);
+  });
+
+  it("cancels invalidated flights and prevents a late result from repopulating the cache", async () => {
+    let finishOld!: (value: unknown) => void;
+    const call = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            finishOld = resolve;
+          })
+      )
+      .mockResolvedValueOnce({ sessionId: "new-owner", managed: true });
+    const client = clientWith(call);
+    const old = resolveMobileSessionIdentity(client, "s");
+    const rejected = expect(old).rejects.toBeInstanceOf(
+      MobileSessionIdentityInvalidated
+    );
+    await Promise.resolve();
+    const signal = call.mock.calls[0][2] as AbortSignal;
+    invalidateMobileSessionIdentities(client);
+    expect(signal.aborted).toBe(true);
+    await resolveMobileSessionIdentity(client, "s");
+    finishOld({ sessionId: "old-owner", managed: true });
+    await rejected;
+    expect(cachedMobileSessionIdentity(client, "s")?.sessionId).toBe(
+      "new-owner"
+    );
+  });
+
+  it("bounds distinct pending lookups and releases capacity when they settle", async () => {
+    let finish!: (value: unknown) => void;
+    const pending = new Promise((resolve) => {
+      finish = resolve;
+    });
+    const client = clientWith(vi.fn().mockReturnValue(pending));
+    const flights = Array.from({ length: 8 }, (_, index) =>
+      resolveMobileSessionIdentity(client, String(index))
+    );
+    await expect(
+      resolveMobileSessionIdentity(client, "overflow")
+    ).rejects.toThrow("Too many pending");
+    finish({ sessionId: "owner", managed: true });
+    await Promise.all(flights);
+    await expect(
+      resolveMobileSessionIdentity(client, "fresh")
+    ).resolves.toEqual({ sessionId: "owner", managed: true });
+  });
+});
diff --git a/src/modules/MobileRemote/connection/mobileSessionIdentityCache.ts b/src/modules/MobileRemote/connection/mobileSessionIdentityCache.ts
new file mode 100644
index 0000000000..715529a99c
--- /dev/null
+++ b/src/modules/MobileRemote/connection/mobileSessionIdentityCache.ts
@@ -0,0 +1,113 @@
+import type { MobileRpcClient } from "./mobileRpcClient";
+
+export interface MobileSessionIdentity {
+  sessionId: string;
+  managed: boolean;
+}
+
+const MAX_IDENTITIES = 32;
+const MAX_PENDING_IDENTITIES = 8;
+const IDENTITY_TTL_MS = 5 * 60_000;
+
+type Cache = {
+  generation: number;
+  resolved: Map<string, { value: MobileSessionIdentity; expiresAt: number }>;
+  pending: Map<
+    string,
+    { promise: Promise<MobileSessionIdentity>; abort: AbortController }
+  >;
+};
+
+// The authenticated RPC client is the lifetime and isolation boundary: no disk
+// persistence, no session-id-only global cache, and no new network listeners.
+const caches = new WeakMap<MobileRpcClient, Cache>();
+
+export class MobileSessionIdentityInvalidated extends Error {
+  constructor() {
+    super("Session identity was invalidated");
+  }
+}
+
+export function cachedMobileSessionIdentity(
+  client: MobileRpcClient,
+  requested: string
+): MobileSessionIdentity | undefined {
+  const entry = caches.get(client)?.resolved.get(requested);
+  return entry && entry.expiresAt > Date.now() ? entry.value : undefined;
+}
+
+export function invalidateMobileSessionIdentities(client: MobileRpcClient) {
+  const cache = caches.get(client);
+  if (!cache) return;
+  cache.generation += 1;
+  cache.resolved.clear();
+  const abandoned = Array.from(cache.pending.values());
+  cache.pending.clear();
+  for (const flight of abandoned) flight.abort.abort();
+}
+
+export function resolveMobileSessionIdentity(
+  client: MobileRpcClient,
+  requested: string
+): Promise<MobileSessionIdentity> {
+  let cache = caches.get(client);
+  if (!cache) {
+    cache = { generation: 0, resolved: new Map(), pending: new Map() };
+    caches.set(client, cache);
+  }
+  const hit = cachedMobileSessionIdentity(client, requested);
+  if (hit) return Promise.resolve(hit);
+  const pending = cache.pending.get(requested);
+  if (pending) return pending.promise;
+  if (cache.pending.size >= MAX_PENDING_IDENTITIES) {
+    return Promise.reject(
+      new Error("Too many pending session identity lookups")
+    );
+  }
+  const owner = cache;
+  const generation = owner.generation;
+  const abort = new AbortController();
+  // Keep a shared request alive across route unmount/remount. Its lifetime is
+  // bounded by the RPC timeout and cancelled by connection/list invalidation.
+  const promise = Promise.resolve().then(async () => {
+    try {
+      if (generation !== owner.generation)
+        throw new MobileSessionIdentityInvalidated();
+      const result = await client.call<{
+        sessionId?: unknown;
+        managed?: unknown;
+      }>("session/resolve", { sessionId: requested }, abort.signal);
+      if (generation !== owner.generation)
+        throw new MobileSessionIdentityInvalidated();
+      if (
+        typeof result?.sessionId !== "string" ||
+        !result.sessionId.trim() ||
+        result.sessionId.length > 256 ||
+        typeof result.managed !== "boolean"
+      )
+        throw new Error("Invalid session identity");
+      const value = { sessionId: result.sessionId, managed: result.managed };
+      for (const [key, entry] of owner.resolved) {
+        if (entry.expiresAt <= Date.now()) owner.resolved.delete(key);
+      }
+      owner.resolved.delete(requested);
+      owner.resolved.set(requested, {
+        value,
+        expiresAt: Date.now() + IDENTITY_TTL_MS,
+      });
+      while (owner.resolved.size > MAX_IDENTITIES) {
+        owner.resolved.delete(owner.resolved.keys().next().value!);
+      }
+      return value;
+    } catch (error) {
+      if (generation !== owner.generation)
+        throw new MobileSessionIdentityInvalidated();
+      throw error;
+    } finally {
+      if (owner.pending.get(requested)?.promise === promise)
+        owner.pending.delete(requested);
+    }
+  });
+  owner.pending.set(requested, { promise, abort });
+  return promise;
+}
diff --git a/src/modules/MobileRemote/connection/sessionDiscoveryContract.test.ts b/src/modules/MobileRemote/connection/sessionDiscoveryContract.test.ts
new file mode 100644
index 0000000000..852f66b439
--- /dev/null
+++ b/src/modules/MobileRemote/connection/sessionDiscoveryContract.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  hasValidSessionPresentation,
+  isSessionSearchRows,
+} from "./sessionDiscoveryContract";
+
+describe("mobile session presentation ingestion", () => {
+  const row = { id: "native", name: "Name", status: "idle" };
+  it("accepts old Desktop rows and bounded optional metadata", () => {
+    expect(isSessionSearchRows([row])).toBe(true);
+    expect(
+      isSessionSearchRows([
+        {
+          ...row,
+          lifecycleStatus: "waiting_for_user",
+          display: { model: "gpt-5", agentDefinitionId: "builtin:sde" },
+        },
+      ])
+    ).toBe(true);
+    expect(
+      isSessionSearchRows([{ ...row, lifecycleStatus: "future_phase" }])
+    ).toBe(true);
+  });
+  it.each([
+    { display: [] },
+    { display: { model: 42 } },
+    { display: { model: "x".repeat(513) } },
+    { lifecycleStatus: {} },
+  ])(
+    "rejects invalid presentation at both list and search boundaries: %j",
+    (fields) => {
+      expect(hasValidSessionPresentation({ ...row, ...fields })).toBe(false);
+      expect(isSessionSearchRows([{ ...row, ...fields }])).toBe(false);
+    }
+  );
+});
diff --git a/src/modules/MobileRemote/connection/sessionDiscoveryContract.ts b/src/modules/MobileRemote/connection/sessionDiscoveryContract.ts
new file mode 100644
index 0000000000..1ae618569f
--- /dev/null
+++ b/src/modules/MobileRemote/connection/sessionDiscoveryContract.ts
@@ -0,0 +1,94 @@
+import type { MobilePendingPermission, MobileSessionRow } from "./types";
+
+function record(value: unknown): value is Record<string, unknown> {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
+
+function validDate(value: unknown): boolean {
+  return (
+    typeof value === "number" &&
+    Number.isFinite(value) &&
+    !Number.isNaN(new Date(value).getTime())
+  );
+}
+
+export function isSessionDisplay(value: unknown): boolean {
+  return (
+    value == null ||
+    (record(value) &&
+      Object.entries(value).every(
+        ([key, field]) =>
+          [
+            "cliAgentType",
+            "agentOrgId",
+            "agentDefinitionId",
+            "agentIconId",
+            "model",
+            "externalHistorySource",
+          ].includes(key) &&
+          typeof field === "string" &&
+          field.length <= 512
+      ))
+  );
+}
+
+export function hasValidSessionPresentation(row: unknown): boolean {
+  return (
+    record(row) &&
+    (row.mergeStatus == null ||
+      (typeof row.mergeStatus === "string" && row.mergeStatus.length <= 64)) &&
+    (row.lifecycleStatus == null ||
+      (typeof row.lifecycleStatus === "string" &&
+        row.lifecycleStatus.length <= 64)) &&
+    isSessionDisplay(row.display)
+  );
+}
+
+/** Reject malformed wire data at ingestion; never hide individual invalid rows. */
+export function isSessionSearchRows(
+  value: unknown
+): value is MobileSessionRow[] {
+  return (
+    Array.isArray(value) &&
+    value.length <= 50 &&
+    value.every(
+      (row: unknown) =>
+        record(row) &&
+        typeof row.id === "string" &&
+        row.id.length > 0 &&
+        typeof row.name === "string" &&
+        typeof row.status === "string" &&
+        ["running", "idle", "offline"].includes(row.status) &&
+        hasValidSessionPresentation(row) &&
+        (row.updatedAtMs == null || validDate(row.updatedAtMs)) &&
+        (row.repoName == null || typeof row.repoName === "string")
+    )
+  );
+}
+
+export function isPendingPermissions(
+  value: unknown
+): value is MobilePendingPermission[] {
+  return (
+    Array.isArray(value) &&
+    value.length <= 2000 &&
+    value.every(
+      (row: unknown) =>
+        record(row) &&
+        row.kind === "permission" &&
+        typeof row.origin === "string" &&
+        ["rust_agent", "cli_hook", "acp"].includes(row.origin) &&
+        typeof row.sessionId === "string" &&
+        row.sessionId.length > 0 &&
+        typeof row.requestId === "string" &&
+        row.requestId.length > 0 &&
+        typeof row.toolName === "string" &&
+        record(row.toolArgs) &&
+        validDate(row.createdAtMs) &&
+        (row.sessionName == null || typeof row.sessionName === "string") &&
+        (row.toolCallId == null || typeof row.toolCallId === "string") &&
+        (row.toolArgsTruncated == null ||
+          typeof row.toolArgsTruncated === "boolean")
+    )
+  );
+}
diff --git a/src/modules/MobileRemote/connection/types.ts b/src/modules/MobileRemote/connection/types.ts
index 68348d3a3e..f3901ddb09 100644
--- a/src/modules/MobileRemote/connection/types.ts
+++ b/src/modules/MobileRemote/connection/types.ts
@@ -14,13 +14,35 @@ export class MobileConnectionAuthorizationError extends Error {}
 export type MobilePermissionTier = "full" | "read_only";
 
 export interface MobileRemoteCapabilities {
+  /** Resolve historical mirrors to their current managed execution owner. */
+  sessionIdentity?: boolean;
+  /** Resolve and subscribe under one connection-owned opening lease. */
+  sessionOpen?: boolean;
+  changeReview?: boolean;
+  sessionReadState?: boolean;
+  sessionSearch?: boolean;
+  pendingInteractions?: boolean;
   roundHistory?: boolean;
   /** Open an event-owned file in the paired Desktop app. */
   openSessionFile?: boolean;
+  sessionImages?: boolean;
   /** Session model picker backed by desktop KeyVault. */
   modelSelection?: boolean;
 }
 
+export interface MobilePendingPermission {
+  kind: "permission";
+  origin: "rust_agent" | "cli_hook" | "acp";
+  sessionId: string;
+  requestId: string;
+  toolName: string;
+  toolCallId?: string;
+  toolArgs: Record<string, unknown>;
+  toolArgsTruncated?: boolean;
+  createdAtMs: number;
+  sessionName?: string;
+}
+
 export interface MobileRpcError {
   code: number;
   message: string;
@@ -42,6 +64,8 @@ export interface MobileModelOption {
 }
 
 export interface MobileSessionModelState {
+  optionsLoading?: boolean;
+  optionsError?: string;
   config: MobileSessionModelConfig | null;
   options: MobileModelOption[];
   loading: boolean;
@@ -55,19 +79,41 @@ export interface MobileSendAttachment {
   fileName?: string;
 }
 
+/** Display metadata reported by the paired Desktop, never phone or Cloud identity. */
+export interface MobileDesktopIdentity {
+  name?: string;
+  model?: string;
+  username?: string;
+}
+
 export interface InitializeResult {
   protocolVersion: number;
   desktopId?: string;
   desktopName?: string;
+  desktopIdentity?: MobileDesktopIdentity;
   orgiiVersion?: string;
   tier?: MobilePermissionTier;
   capabilities?: MobileRemoteCapabilities;
 }
 
+/** Bounded, optional inputs to Desktop's shared icon resolver. */
+export interface MobileSessionDisplay {
+  cliAgentType?: string;
+  agentOrgId?: string;
+  agentDefinitionId?: string;
+  agentIconId?: string;
+  model?: string;
+  externalHistorySource?: string;
+}
+
 export interface MobileSessionRow {
   id: string;
   name: string;
   status: "running" | "idle" | "offline";
+  /** Canonical directory lifecycle; absent on older Desktop builds. */
+  lifecycleStatus?: string;
+  mergeStatus?: string | null;
+  display?: MobileSessionDisplay;
   category?: "live" | "cloud";
   sendCapability?: "native" | "external_codex" | "read_only";
   updatedAtMs?: number;
@@ -86,6 +132,9 @@ export interface MobileConnectionConfig {
   /** Phase 1 pending pairing that becomes active after desktop SAS confirmation. */
   pairingCode?: string;
   desktopId?: string;
+  /** Last authenticated desktop metadata, retained for offline display. */
+  desktopIdentity?: MobileDesktopIdentity;
+  /** This phone's label, sent to Desktop. Never a desktop display name. */
   deviceLabel?: string;
 }
 
@@ -95,6 +144,7 @@ export interface MobilePairedDesktopSummary {
   name: string;
   active: boolean;
   updatedAtMs: number;
+  desktopIdentity?: MobileDesktopIdentity;
 }
 
 export interface MobileConnectionState {
diff --git a/src/modules/MobileRemote/dev/MobileRemoteDevelopmentRoot.test.ts b/src/modules/MobileRemote/dev/MobileRemoteDevelopmentRoot.test.ts
index 0f099e417c..a07362f833 100644
--- a/src/modules/MobileRemote/dev/MobileRemoteDevelopmentRoot.test.ts
+++ b/src/modules/MobileRemote/dev/MobileRemoteDevelopmentRoot.test.ts
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import React from "react";
-import { renderToStaticMarkup } from "react-dom/server";
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
 import { I18nextProvider } from "react-i18next";
 import { describe, expect, it, vi } from "vitest";
 
@@ -20,19 +20,47 @@ describe("MobileRemoteDevelopmentRoot", () => {
     await i18n.changeLanguage("en");
     const platform = createBrowserMobileRemotePlatform();
     const createClient = vi.spyOn(platform.auth, "createClient");
-
-    const markup = renderToStaticMarkup(
-      React.createElement(
-        I18nextProvider,
-        { i18n },
-        React.createElement(MobileRemoteDevelopmentRoot, { platform })
-      )
+    let finishRestore!: () => void;
+    vi.spyOn(platform.connection, "load").mockReturnValue(
+      new Promise<null>((resolve) => {
+        finishRestore = () => resolve(null);
+      })
     );
+    vi.spyOn(platform.connection, "listPairedDesktops").mockResolvedValue([]);
+    const actEnvironment = globalThis as typeof globalThis & {
+      IS_REACT_ACT_ENVIRONMENT?: boolean;
+    };
+    const previousActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
+    actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
+    const host = document.createElement("div");
+    document.body.append(host);
+    const root = createRoot(host);
+    try {
+      await act(async () =>
+        root.render(
+          React.createElement(
+            I18nextProvider,
+            { i18n },
+            React.createElement(MobileRemoteDevelopmentRoot, { platform })
+          )
+        )
+      );
+      expect(host.querySelector('[aria-busy="true"]')).not.toBeNull();
+      expect(host.textContent).not.toContain("Mobile Remote");
+      expect(createClient).not.toHaveBeenCalled();
 
-    expect(markup).toContain("Mobile Remote");
-    expect(markup).not.toContain("Try demo");
-    expect(markup).toContain("Scan or paste pairing code");
-    expect(createClient).not.toHaveBeenCalled();
+      await act(async () => finishRestore());
+      expect(host.querySelector('[aria-busy="true"]')).toBeNull();
+      expect(host.textContent).toContain("Mobile Remote");
+      expect(host.textContent).toContain(enMobileRemote.welcome.scanQr);
+      expect(host.textContent).not.toContain("Try demo");
+      expect(createClient).not.toHaveBeenCalled();
+    } finally {
+      await act(async () => root.unmount());
+      host.remove();
+      actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
+      vi.restoreAllMocks();
+    }
   });
 
   it("reuses the stored account scope when development has no own pairings", async () => {
diff --git a/src/modules/MobileRemote/lib/loadSubscriptionHistory.test.ts b/src/modules/MobileRemote/lib/loadSubscriptionHistory.test.ts
new file mode 100644
index 0000000000..ca32487976
--- /dev/null
+++ b/src/modules/MobileRemote/lib/loadSubscriptionHistory.test.ts
@@ -0,0 +1,226 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { loadSubscriptionHistory } from "./loadSubscriptionHistory";
+import {
+  type TranscriptSubscribeResult,
+  applyTranscriptSubscribeResult,
+  beginTranscriptLoad,
+  createInitialTranscriptLoadState,
+  getSelectedTranscriptView,
+} from "./transcriptLoadState";
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (reason: Error) => void;
+  const promise = new Promise<T>((yes, no) => {
+    resolve = yes;
+    reject = no;
+  });
+  return { promise, resolve, reject };
+}
+function result(partial = true): TranscriptSubscribeResult {
+  return {
+    sessionId: "s",
+    historyDeferred: partial,
+    rounds: {
+      items: (partial ? ["r2"] : ["r1", "r2"]).map((id) => ({ id })),
+      complete: !partial,
+    },
+    snapshot: {
+      sessionId: "s",
+      roundId: "r2",
+      version: 1,
+      snapshotDelta: false,
+      upserts: [
+        {
+          id: "answer",
+          source: "assistant",
+          displayVariant: "message",
+          displayText: "Latest answer",
+        },
+      ],
+    },
+  };
+}
+
+describe("progressive subscription history", () => {
+  it("opens an owner and hydrates its directory with one initial RPC", async () => {
+    const first = {
+      ...result(),
+      sessionId: "owner",
+      managed: true,
+      subscriptionId: "lease",
+      snapshot: { ...result().snapshot, sessionId: "owner" },
+    };
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(first)
+      .mockResolvedValueOnce({ ...first, historyDeferred: false });
+    const identity = vi.fn();
+    const apply = vi.fn();
+    await loadSubscriptionHistory({ call }, "mirror", () => true, apply, true, {
+      subscriptionId: "lease",
+      onIdentity: identity,
+    });
+    expect(call.mock.calls.map(([method]) => method)).toEqual([
+      "session/open",
+      "session/history",
+    ]);
+    expect(call.mock.calls[1][1]).toEqual({ sessionId: "owner" });
+    expect(identity).toHaveBeenCalledWith("owner", true);
+    expect(apply).toHaveBeenCalledWith(first);
+  });
+
+  it("rejects a mismatched opening before publishing identity or body", async () => {
+    const identity = vi.fn();
+    const apply = vi.fn();
+    const call = vi.fn().mockResolvedValue({
+      ...result(),
+      managed: false,
+      subscriptionId: "wrong",
+    });
+    await expect(
+      loadSubscriptionHistory({ call }, "s", () => true, apply, true, {
+        subscriptionId: "expected",
+        onIdentity: identity,
+      })
+    ).rejects.toThrow("Invalid session opening");
+    expect(identity).not.toHaveBeenCalled();
+    expect(apply).not.toHaveBeenCalled();
+  });
+
+  it("shares in-flight directory reads and releases them after completion", async () => {
+    const directory = deferred<TranscriptSubscribeResult>();
+    const call = vi
+      .fn()
+      .mockImplementation((method: string) =>
+        method === "session/history"
+          ? directory.promise
+          : Promise.resolve(result())
+      );
+    const client = { call };
+    await loadSubscriptionHistory(client, "s", () => true, vi.fn());
+    await loadSubscriptionHistory(client, "s", () => true, vi.fn());
+    expect(
+      call.mock.calls.filter(([method]) => method === "session/history")
+    ).toHaveLength(1);
+    directory.resolve(result(false));
+    await directory.promise;
+    await loadSubscriptionHistory(client, "s", () => true, vi.fn());
+    expect(
+      call.mock.calls.filter(([method]) => method === "session/history")
+    ).toHaveLength(2);
+  });
+
+  it("bounds pending directory reads per connection", async () => {
+    const directory = deferred<TranscriptSubscribeResult>();
+    const call = vi
+      .fn()
+      .mockImplementation((method: string) =>
+        method === "session/history"
+          ? directory.promise
+          : Promise.resolve(result())
+      );
+    const client = { call };
+    for (let i = 0; i < 12; i++) {
+      await loadSubscriptionHistory(client, String(i), () => true, vi.fn());
+    }
+    expect(
+      call.mock.calls.filter(([method]) => method === "session/history")
+    ).toHaveLength(8);
+    directory.reject(new Error("connection closed"));
+    await Promise.resolve();
+    await Promise.resolve();
+    await loadSubscriptionHistory(client, "another", () => true, vi.fn());
+    expect(
+      call.mock.calls.filter(([method]) => method === "session/history")
+    ).toHaveLength(9);
+  });
+  it("makes the latest body ready before the directory RPC resolves", async () => {
+    const directory = deferred<TranscriptSubscribeResult>();
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(result())
+      .mockReturnValueOnce(directory.promise);
+    let state = beginTranscriptLoad(createInitialTranscriptLoadState(), "s", 1);
+    const apply = (r: TranscriptSubscribeResult) => {
+      state = applyTranscriptSubscribeResult(state, r, "s", 1);
+    };
+    expect(
+      await loadSubscriptionHistory({ call }, "s", () => true, apply)
+    ).toBe(true);
+    expect(getSelectedTranscriptView(state).phase).toBe("ready");
+    expect(getSelectedTranscriptView(state).items).toHaveLength(1);
+    expect(state.roundsComplete).toBe(false);
+    directory.resolve(result(false));
+    await directory.promise;
+    await Promise.resolve();
+    expect(state.roundsComplete).toBe(true);
+    expect(state.rounds.map((r) => r.id)).toEqual(["r1", "r2"]);
+    expect(getSelectedTranscriptView(state).items).toHaveLength(1);
+    expect(call.mock.calls).toEqual([
+      ["session/subscribe", { sessionId: "s", latestOnly: true }],
+      ["session/history", { sessionId: "s" }],
+    ]);
+  });
+
+  it("keeps the first body on directory timeout, and retries on reopening", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(result())
+      .mockRejectedValueOnce(new Error("timeout"))
+      .mockResolvedValueOnce(result())
+      .mockResolvedValueOnce(result(false));
+    const apply = vi.fn();
+    await loadSubscriptionHistory({ call }, "s", () => true, apply);
+    await Promise.resolve();
+    expect(apply).toHaveBeenCalledTimes(1);
+    await loadSubscriptionHistory({ call }, "s", () => true, apply);
+    await Promise.resolve();
+    expect(apply).toHaveBeenLastCalledWith(result(false));
+  });
+
+  it("does not hydrate or start directory work after a stale initial response", async () => {
+    const call = vi.fn().mockResolvedValue(result());
+    const apply = vi.fn();
+    expect(
+      await loadSubscriptionHistory({ call }, "s", () => false, apply)
+    ).toBe(false);
+    expect(call).toHaveBeenCalledTimes(1);
+    expect(apply).not.toHaveBeenCalled();
+  });
+
+  it("ignores directory completion after connection/session/generation replacement", async () => {
+    const directory = deferred<TranscriptSubscribeResult>();
+    let current = true;
+    const call = vi
+      .fn()
+      .mockResolvedValueOnce(result())
+      .mockReturnValueOnce(directory.promise);
+    const apply = vi.fn();
+    await loadSubscriptionHistory({ call }, "s", () => current, apply);
+    current = false;
+    directory.resolve(result(false));
+    await directory.promise;
+    expect(apply).toHaveBeenCalledTimes(1);
+  });
+
+  it("preserves first-request errors for the existing retry/error UI", async () => {
+    const call = vi.fn().mockRejectedValue(new Error("offline"));
+    const apply = vi.fn();
+    await expect(
+      loadSubscriptionHistory({ call }, "s", () => true, apply)
+    ).rejects.toThrow("offline");
+    expect(apply).not.toHaveBeenCalled();
+    expect(call).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not request another history on old servers or empty full responses", async () => {
+    const legacy = { sessionId: "s", rounds: { items: [], complete: true } };
+    const call = vi.fn().mockResolvedValue(legacy);
+    const apply = vi.fn();
+    await loadSubscriptionHistory({ call }, "s", () => true, apply);
+    expect(call).toHaveBeenCalledTimes(1);
+    expect(apply).toHaveBeenCalledWith(legacy);
+  });
+});
diff --git a/src/modules/MobileRemote/lib/loadSubscriptionHistory.ts b/src/modules/MobileRemote/lib/loadSubscriptionHistory.ts
new file mode 100644
index 0000000000..fdf30ad815
--- /dev/null
+++ b/src/modules/MobileRemote/lib/loadSubscriptionHistory.ts
@@ -0,0 +1,88 @@
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import type { TranscriptSubscribeResult } from "./transcriptLoadState";
+
+type HistoryClient = Pick<MobileRpcClient, "call">;
+const MAX_DIRECTORY_READS = 8;
+const directoryReads = new WeakMap<
+  HistoryClient,
+  Map<string, Promise<TranscriptSubscribeResult>>
+>();
+
+function directoryRead(client: HistoryClient, sessionId: string) {
+  let reads = directoryReads.get(client);
+  if (!reads) {
+    reads = new Map();
+    directoryReads.set(client, reads);
+  }
+  const existing = reads.get(sessionId);
+  if (existing) return existing;
+  if (reads.size >= MAX_DIRECTORY_READS) return null;
+  const read = client.call<TranscriptSubscribeResult>("session/history", {
+    sessionId,
+  });
+  reads.set(sessionId, read);
+  const release = () => {
+    if (reads.get(sessionId) === read) reads.delete(sessionId);
+  };
+  void read.then(release, release);
+  return read;
+}
+
+/**
+ * A subscription owns the first body; directory hydration is a read-only RPC.
+ * All results belong to the caller's connection/session/generation. No timers,
+ * settled-data caches or detached server jobs are created; RPC lifetime stays client-owned.
+ */
+export async function loadSubscriptionHistory(
+  client: HistoryClient,
+  sessionId: string,
+  isCurrent: () => boolean,
+  apply: (result: TranscriptSubscribeResult) => void,
+  latestOnly = true,
+  opening?: {
+    subscriptionId: string;
+    onIdentity: (sessionId: string, managed: boolean) => void;
+  }
+): Promise<boolean> {
+  const first = await client.call<TranscriptSubscribeResult>(
+    opening ? "session/open" : "session/subscribe",
+    {
+      sessionId,
+      latestOnly,
+      ...(opening ? { subscriptionId: opening.subscriptionId } : {}),
+    }
+  );
+  if (!isCurrent()) return false;
+  if (opening) {
+    const identity = first as TranscriptSubscribeResult & {
+      managed?: unknown;
+      subscriptionId?: unknown;
+    };
+    if (
+      typeof identity.sessionId !== "string" ||
+      !identity.sessionId.trim() ||
+      identity.sessionId.length > 256 ||
+      typeof identity.managed !== "boolean" ||
+      identity.subscriptionId !== opening.subscriptionId ||
+      identity.snapshot?.sessionId !== identity.sessionId
+    ) {
+      throw new Error("Invalid session opening");
+    }
+    sessionId = identity.sessionId;
+    opening.onIdentity(sessionId, identity.managed);
+  }
+  apply(first);
+  if (first.historyDeferred === true) {
+    // Return immediately so model/permission hydration is not held behind the
+    // full history read. Closing the owning client terminates this RPC.
+    void directoryRead(client, sessionId)
+      ?.then((result) => {
+        if (isCurrent()) apply(result);
+      })
+      .catch(() => {
+        // Keep the successful latest body and incomplete directory. Reopening
+        // or the next explicit refresh retries, without a retry/polling loop.
+      });
+  }
+  return true;
+}
diff --git a/src/modules/MobileRemote/lib/transcriptLoadStateTypes.ts b/src/modules/MobileRemote/lib/transcriptLoadStateTypes.ts
index 158416d445..55298a5c9a 100644
--- a/src/modules/MobileRemote/lib/transcriptLoadStateTypes.ts
+++ b/src/modules/MobileRemote/lib/transcriptLoadStateTypes.ts
@@ -48,6 +48,8 @@ export interface TranscriptSubscribeResult {
   sessionId?: string;
   rounds?: TranscriptRoundIndexEnvelope;
   snapshot?: TranscriptSnapshotEnvelope;
+  /** Latest body is ready; the full directory is available through session/history. */
+  historyDeferred?: boolean;
 }
 
 export interface TranscriptRoundResult {
diff --git a/src/modules/MobileRemote/lib/transcriptReducer.test.ts b/src/modules/MobileRemote/lib/transcriptReducer.test.ts
index 8a0d407d7b..cb6efcc4ee 100644
--- a/src/modules/MobileRemote/lib/transcriptReducer.test.ts
+++ b/src/modules/MobileRemote/lib/transcriptReducer.test.ts
@@ -8,6 +8,15 @@ import {
 } from "./transcriptReducer";
 
 describe("transcriptReducer", () => {
+  it("preserves bounded image metadata without accepting image payloads", () => {
+    const next = reduceTranscriptFromUpserts(createInitialTranscriptState(), [
+      { id: "image", source: "user", imageCount: 2, displayText: "screenshot" },
+      { id: "many", source: "user", imageCount: 999 },
+      { id: "bad", source: "user", imageCount: -1 },
+    ]);
+    expect(next.items.map((item) => item.imageCount)).toEqual([2, 8, 0]);
+    expect(next.items[0].text).toBe("screenshot");
+  });
   it("projects user and agent upserts", () => {
     const next = reduceTranscriptFromUpserts(createInitialTranscriptState(), [
       {
diff --git a/src/modules/MobileRemote/lib/transcriptReducer.ts b/src/modules/MobileRemote/lib/transcriptReducer.ts
index 7bd9942097..080608e39f 100644
--- a/src/modules/MobileRemote/lib/transcriptReducer.ts
+++ b/src/modules/MobileRemote/lib/transcriptReducer.ts
@@ -3,6 +3,12 @@ import type { ExtractedData } from "@src/engines/SessionCore/core/types";
 
 export type TranscriptItemKind = "user" | "agent" | "tool";
 
+function boundedImageCount(value: unknown): number {
+  return typeof value === "number" && Number.isInteger(value) && value > 0
+    ? Math.min(value, 8)
+    : 0;
+}
+
 export type MobileToolData =
   | ExtractedData
   | ({ kind: "unknown" } & Record<string, unknown>);
@@ -11,6 +17,7 @@ export interface TranscriptItem {
   id: string;
   kind: TranscriptItemKind;
   text: string;
+  imageCount?: number;
   toolName?: string;
   toolCanonical?: string;
   toolStatus?: string;
@@ -31,6 +38,7 @@ export interface TranscriptItem {
 }
 
 export interface SnapshotUpsertEvent {
+  imageCount?: number;
   id?: string;
   turnIntentId?: string;
   uiCanonical?: string;
@@ -170,6 +178,7 @@ export function reduceTranscriptFromUpserts(
       mergeItem({
         id,
         kind: "user",
+        imageCount: boundedImageCount(event.imageCount),
         text: resolveEventText(event),
         createdAt: event.createdAt,
         turnIntentId: event.turnIntentId,
@@ -181,6 +190,7 @@ export function reduceTranscriptFromUpserts(
       mergeItem({
         id,
         kind: "agent",
+        imageCount: boundedImageCount(event.imageCount),
         text: resolveEventText(event),
         streaming:
           event.displayStatus?.toLowerCase() === "running" ||
diff --git a/src/modules/MobileRemote/mobileBrowserBoundary.test.ts b/src/modules/MobileRemote/mobileBrowserBoundary.test.ts
index 93354c7d69..1da8f73e48 100644
--- a/src/modules/MobileRemote/mobileBrowserBoundary.test.ts
+++ b/src/modules/MobileRemote/mobileBrowserBoundary.test.ts
@@ -10,6 +10,28 @@ import {
 } from "@src/test/staticImportGraph";
 
 describe("mobile remote browser boundary", () => {
+  it("loads only browser-safe Workstation editor leaves for mobile documents", () => {
+    const editor = walkStaticImports([
+      "modules/MobileRemote/components/transcript/MobileReadonlyEditor.tsx",
+    ]);
+    expect(
+      reachableFilesMatching(
+        editor,
+        /^(modules\/WorkStation\/|features\/CodeMirror\/CodeMirrorEditor|services\/|api\/)/u
+      )
+    ).toEqual([]);
+    // The shared editor leaves no longer require the native logger backend.
+    expect(
+      importersOfPackage(editor, "@tauri-apps/api").map(
+        (chain) => chain.split("  <-  ")[0]
+      )
+    ).toEqual([]);
+    expect(
+      [...editor.packages].filter(
+        (name) => name.startsWith("@tauri-apps/") && name !== "@tauri-apps/api"
+      )
+    ).toEqual([]);
+  });
   const graph = walkStaticImports(["mobileRemoteEntry.tsx"]);
   const mobileAuthGraph = walkStaticImports([
     "modules/MobileRemote/auth/MobileAuthGate.tsx",
diff --git a/src/modules/MobileRemote/mobileChrome.scss b/src/modules/MobileRemote/mobileChrome.scss
index 40e7bc70a8..3183306ed2 100644
--- a/src/modules/MobileRemote/mobileChrome.scss
+++ b/src/modules/MobileRemote/mobileChrome.scss
@@ -1,5 +1,6 @@
-// Mobile-only chrome. Session rows, transcript typography, and the composer
-// continue to use their existing design tokens and surfaces.
+@use "./mobileUiTokens" as mobile;
+
+// Mobile-only chrome; typography is owned by the mobile entry's semantic scale.
 .mobile-shell {
   --mobile-accent: #171717;
   --mobile-accent-pressed: #333;
@@ -9,18 +10,20 @@
   --mobile-glass-solid: #f5f5f5;
   --mobile-glass-edge: rgb(0 0 0 / 10%);
   --mobile-glass-highlight: rgb(255 255 255 / 92%);
-  --mobile-glass-shadow: 0 8px 28px rgb(0 0 0 / 10%), 0 2px 6px rgb(0 0 0 / 4%);
+  --mobile-glass-shadow: 0 2px 10px rgb(0 0 0 / 5%);
   --mobile-glass-blur: blur(20px);
   --mobile-selected: rgb(0 0 0 / 7%);
-  --mobile-canvas: #ededed;
-  --mobile-touch-size: 44px;
+  --mobile-canvas: #f8f8f8;
+  --mobile-touch-size: #{mobile.$touch-target};
   --mobile-action-height: 54px;
   --mobile-action-padding: 14px 22px;
-  --mobile-action-font-size: 17px;
-  --mobile-tab-height: 56px;
-  --mobile-tab-padding: 7px 12px;
+  --mobile-action-font-size: var(--mobile-type-control-size);
+  --mobile-tab-height: 48px;
+  --mobile-tab-padding: 5px 12px;
 
   background: var(--mobile-canvas);
+  font-size: var(--mobile-type-body-size);
+  line-height: var(--mobile-type-body-leading);
 
   // This palette belongs to navigation only; it never replaces the app's
   // semantic colors inherited by session content or status indicators.
@@ -33,18 +36,72 @@
     --mobile-glass-solid: #202020;
     --mobile-glass-edge: rgb(255 255 255 / 12%);
     --mobile-glass-highlight: rgb(255 255 255 / 24%);
-    --mobile-glass-shadow:
-      0 8px 28px rgb(0 0 0 / 28%), 0 2px 6px rgb(0 0 0 / 16%);
+    --mobile-glass-shadow: 0 2px 10px rgb(0 0 0 / 16%);
     --mobile-selected: rgb(255 255 255 / 10%);
     --mobile-canvas: #101010;
   }
 }
 
 .mobile-shell__viewport {
-  max-width: 393px;
+  min-width: 0;
+  // Fluid on phones; keep long conversation lines readable on wider screens.
+  // A continuous cap also avoids breakpoint jumps when the keyboard resizes.
+  max-width: 48rem;
   background: var(--mobile-canvas);
 }
 
+// Onboarding/error screens share a scroll owner. Auto margins center short
+// content, but collapse to zero when landscape/keyboard space runs out.
+.mobile-flow-screen {
+  min-width: 0;
+  min-height: 0;
+  overflow-y: auto;
+  overscroll-behavior: contain;
+  overflow-wrap: anywhere;
+  padding-bottom: max(#{mobile.$space-4}, env(safe-area-inset-bottom));
+  > * {
+    flex-shrink: 0;
+    max-width: 100%;
+  }
+}
+.mobile-flow-screen--centered {
+  justify-content: flex-start;
+  > :first-child {
+    margin-top: auto;
+  }
+  > :last-child {
+    margin-bottom: auto;
+  }
+}
+.mobile-auth-content {
+  flex: 1 0 auto;
+  padding-block: mobile.$space-4;
+}
+
+.liquid-modal-content.mobile-confirm-modal {
+  min-width: 0;
+  width: min(26rem, calc(100vw - 2 * #{mobile.$space-4}));
+  max-width: calc(100vw - 2 * #{mobile.$space-4});
+  max-height: calc(
+    100dvh - 2 *
+      #{mobile.$space-4} - env(safe-area-inset-top, 0px) - env(
+        safe-area-inset-bottom,
+        0px
+      )
+  );
+  overflow-wrap: anywhere;
+
+  button {
+    min-height: mobile.$touch-target;
+    height: auto;
+    max-width: 100%;
+    > .truncate {
+      white-space: normal;
+      overflow-wrap: anywhere;
+    }
+  }
+}
+
 .mobile-top-bar {
   position: relative;
   z-index: 1;
@@ -62,9 +119,9 @@
   .mobile-top-bar__title {
     order: 2;
     flex: 0 0 100%;
-    font-size: 34px;
-    font-weight: 700;
-    line-height: 1.15;
+    font-size: var(--mobile-type-large-title-size);
+    font-weight: var(--mobile-type-strong-weight);
+    line-height: var(--mobile-type-title-leading);
     letter-spacing: -0.035em;
   }
 }
@@ -81,9 +138,9 @@
 
   .mobile-top-bar__title {
     grid-column: 2;
-    font-size: 17px;
-    font-weight: 600;
-    line-height: 1.3;
+    font-size: var(--mobile-type-heading-size);
+    font-weight: var(--mobile-type-emphasis-weight);
+    line-height: var(--mobile-type-heading-leading);
     letter-spacing: -0.02em;
     text-align: center;
   }
@@ -147,14 +204,15 @@
 
 .mobile-tab-dock {
   flex-shrink: 0;
-  padding: 10px 20px max(12px, env(safe-area-inset-bottom));
+  padding: 8px 20px max(10px, env(safe-area-inset-bottom));
 }
 
 .mobile-tab-bar {
   display: flex;
   gap: 4px;
-  padding: 5px;
+  padding: 4px;
   border-radius: 999px;
+  box-shadow: 0 2px 8px color-mix(in srgb, var(--mobile-accent) 4%, transparent);
 }
 
 .mobile-tab-button {
@@ -163,9 +221,9 @@
   color: var(--mobile-chrome-muted);
 
   &[aria-current="page"] {
-    color: var(--mobile-on-accent);
-    background: var(--mobile-accent);
-    box-shadow: inset 0 1px 0 var(--mobile-glass-highlight);
+    color: var(--mobile-accent);
+    background: var(--mobile-selected);
+    box-shadow: none;
   }
 }
 
@@ -173,21 +231,21 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  gap: 4px;
+  gap: 2px;
 }
 
 .mobile-tab-button__label {
   max-width: 100%;
   overflow: hidden;
-  font-size: 11px;
-  font-weight: 600;
-  line-height: 1.2;
+  font-size: var(--mobile-type-micro-size);
+  font-weight: var(--mobile-type-emphasis-weight);
+  line-height: var(--mobile-type-title-leading);
   text-overflow: ellipsis;
 }
 
 .mobile-action-button {
   width: 100%;
-  font-weight: 600;
+  font-weight: var(--mobile-type-emphasis-weight);
   letter-spacing: -0.015em;
 
   // Shared Button uses a truncating label for dense desktop controls. Large
@@ -235,8 +293,7 @@
 }
 
 .mobile-shell
-  .mobile-action-button[data-mobile-variant="primary"]:active:not(:disabled),
-.mobile-shell .mobile-tab-button[aria-current="page"]:active:not(:disabled) {
+  .mobile-action-button[data-mobile-variant="primary"]:active:not(:disabled) {
   background: var(--mobile-accent-pressed);
 }
 
@@ -251,8 +308,7 @@
   }
 
   .mobile-shell
-    .mobile-action-button[data-mobile-variant="primary"]:hover:not(:disabled),
-  .mobile-shell .mobile-tab-button[aria-current="page"]:hover:not(:disabled) {
+    .mobile-action-button[data-mobile-variant="primary"]:hover:not(:disabled) {
     background: var(--mobile-accent-pressed);
   }
 }
diff --git a/src/modules/MobileRemote/mobileDiscovery.scss b/src/modules/MobileRemote/mobileDiscovery.scss
new file mode 100644
index 0000000000..9e44b21ca1
--- /dev/null
+++ b/src/modules/MobileRemote/mobileDiscovery.scss
@@ -0,0 +1,380 @@
+@use "./mobileUiTokens" as mobile;
+
+// Mobile presentation only: data, pagination and permission ownership stay in
+// the existing hooks. Shared controls keep their keyboard/disabled behavior.
+.mobile-discovery {
+  @include mobile.search-field;
+
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  min-width: 0;
+  min-height: 0;
+
+  .mobile-top-bar--root {
+    display: grid;
+    grid-template-columns: var(--mobile-touch-size) minmax(0, 1fr) auto;
+    align-items: center;
+    padding: 10px 20px 12px;
+    gap: 12px;
+  }
+  .mobile-top-bar__title {
+    order: 0;
+    grid-column: 2;
+    font-size: var(--mobile-type-title-size);
+    font-weight: var(--mobile-type-emphasis-weight);
+    letter-spacing: -0.02em;
+    text-align: center;
+  }
+  .mobile-top-bar__trailing {
+    min-width: var(--mobile-touch-size);
+    justify-self: end;
+  }
+  .mobile-discovery-cancel {
+    width: auto;
+    min-width: 44px;
+    min-height: 44px;
+    padding: 0 8px;
+    font-size: var(--mobile-type-body-size);
+    box-shadow: none;
+    border: 0;
+    border-radius: 12px;
+    background: transparent;
+  }
+}
+
+.mobile-discovery-identity {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  gap: 12px;
+  font-size: var(--mobile-type-secondary-size);
+}
+.mobile-discovery-identity > :last-child {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.mobile-discovery-scroll {
+  flex: 1;
+  min-height: 0;
+  min-width: 0;
+  overflow-y: auto;
+  padding: 8px 20px 16px;
+  overscroll-behavior-y: contain;
+}
+.mobile-discovery-section-label {
+  padding: 16px 0 6px;
+  color: var(--color-text-3);
+  font-size: var(--mobile-type-caption-size);
+  font-weight: var(--mobile-type-medium-weight);
+}
+.mobile-discovery-inbox-entry {
+  padding: 0 20px 8px;
+}
+.mobile-inbox-entry {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+  min-height: 44px;
+  border: 0;
+  border-radius: 12px;
+  padding: 8px 12px;
+  background: var(--color-fill-1);
+  color: var(--color-text-1);
+  text-align: left;
+  font-size: var(--mobile-type-control-size);
+  cursor: pointer;
+  > svg {
+    flex-shrink: 0;
+  }
+}
+.mobile-inbox-entry__label {
+  flex: 1;
+  min-width: 0;
+  font-weight: var(--mobile-type-medium-weight);
+}
+.mobile-inbox-entry__count {
+  font-size: var(--mobile-type-caption-size);
+  color: var(--color-text-2);
+  font-variant-numeric: tabular-nums;
+}
+.mobile-session-list {
+  display: flex;
+  flex-direction: column;
+}
+.mobile-session-row {
+  position: relative;
+  align-items: center;
+  border: 0;
+  border-radius: mobile.$space-3;
+  background: transparent;
+  color: var(--color-text-1);
+  // Extend the hit/highlight surface into the list gutter, not the content:
+  // icons, titles and status dots keep their existing column alignment.
+  width: calc(100% + #{2 * mobile.$space-2});
+  margin-inline: -#{mobile.$space-2};
+  padding: mobile.$space-3 mobile.$space-2;
+  cursor: pointer;
+  min-width: 0;
+}
+.mobile-session-row__content {
+  align-items: flex-start;
+  gap: 12px;
+}
+.mobile-session-row__content > :first-child {
+  margin-top: 4px;
+}
+.mobile-session-row__heading {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  min-width: 0;
+}
+.mobile-session-row__title {
+  display: block;
+  min-width: 0;
+  flex: 1;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-size: var(--mobile-type-body-size);
+  line-height: var(--mobile-type-control-leading);
+  font-weight: var(--mobile-type-medium-weight);
+}
+.mobile-session-row__meta {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+  min-height: 17px;
+  margin-top: 4px;
+  font-size: var(--mobile-type-caption-size);
+  line-height: var(--mobile-type-control-leading);
+  color: var(--color-text-3);
+}
+.mobile-session-row__workspace {
+  min-width: 0;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.mobile-session-row__time {
+  flex-shrink: 0;
+  margin-left: auto;
+  white-space: nowrap;
+  font-variant-numeric: tabular-nums;
+}
+.mobile-session-row--compact {
+  min-height: mobile.$touch-target;
+  padding-block: mobile.$space-2;
+
+  .mobile-session-row__content {
+    align-items: center;
+  }
+  .mobile-session-row__content > :first-child {
+    margin-top: 0;
+  }
+  .mobile-session-row__heading {
+    gap: mobile.$space-2;
+  }
+}
+.mobile-discovery .mobile-discovery-more {
+  min-height: 44px;
+  width: 100%;
+  margin-top: 16px;
+  font-size: var(--mobile-type-control-size);
+}
+.mobile-discovery-search {
+  flex-shrink: 0;
+  min-width: 0;
+  padding: 10px 20px;
+  background: var(--mobile-canvas);
+  border-top: 0;
+}
+.mobile-discovery .mobile-search-launcher {
+  display: flex;
+  justify-content: flex-start;
+  width: 100%;
+  min-height: var(--mobile-search-height);
+  border: 1px solid var(--mobile-search-border);
+  background: var(--mobile-search-surface);
+  color: var(--color-text-3);
+  font-weight: var(--mobile-type-regular-weight);
+  box-shadow: var(--mobile-search-shadow);
+}
+.mobile-search-icon {
+  width: var(--mobile-search-icon-size);
+  height: var(--mobile-search-icon-size);
+  color: var(--color-text-1);
+}
+.mobile-discovery-notice {
+  margin: 0;
+  padding: 6px 20px;
+  color: var(--color-text-2);
+  font-size: var(--mobile-type-caption-size);
+  line-height: var(--mobile-type-body-leading);
+}
+.mobile-session-device-tabs {
+  flex-shrink: 0;
+  padding: 2px 20px 10px;
+}
+.mobile-session-device-tabs__list {
+  width: max-content;
+  min-width: 100%;
+}
+@media (max-width: 360px) {
+  .mobile-discovery {
+    .mobile-top-bar--root {
+      padding-inline: 14px;
+    }
+    .mobile-discovery-scroll,
+    .mobile-discovery-search,
+    .mobile-session-device-tabs {
+      padding-inline: 14px;
+    }
+  }
+}
+.mobile-search-input {
+  .mobile-search-clear {
+    width: 44px;
+    height: 44px;
+    padding: 0;
+    background: transparent;
+    box-shadow: none;
+  }
+  input::-webkit-search-cancel-button {
+    -webkit-appearance: none;
+  }
+}
+.mobile-search-form {
+  display: flex;
+  align-items: center;
+  gap: var(--mobile-search-gap);
+}
+.mobile-discovery .mobile-search-input.input-wrapper {
+  height: var(--mobile-search-height);
+  .input-inner {
+    padding-inline: var(--mobile-search-padding-x);
+    border-radius: var(--mobile-search-radius);
+    background: var(--mobile-search-surface);
+    box-shadow: var(--mobile-search-shadow);
+  }
+  &:not(.input-focused) .input-inner {
+    border-color: var(--mobile-search-border);
+  }
+  .input-prefix {
+    margin-right: var(--mobile-search-gap);
+  }
+  .input {
+    font-size: var(--mobile-search-font-size);
+  }
+}
+.mobile-pending-list {
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  padding-bottom: 8px;
+  font-size: var(--mobile-type-control-size);
+  line-height: var(--mobile-type-body-leading);
+}
+.mobile-pending-card {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  width: 100%;
+  min-width: 0;
+  padding: 18px;
+  border: 1px solid var(--color-border-2);
+  border-radius: 18px;
+  background: var(--color-bg-2);
+  color: var(--color-text-1);
+  text-align: left;
+  &:disabled {
+    opacity: 0.6;
+  }
+}
+.mobile-pending-card__title {
+  font-size: var(--mobile-type-body-size);
+  font-weight: var(--mobile-type-emphasis-weight);
+  line-height: var(--mobile-type-control-leading);
+  overflow-wrap: anywhere;
+}
+.mobile-pending-card__request {
+  padding: 10px 12px;
+  border-radius: 10px;
+  background: var(--color-fill-1);
+  font-size: var(--mobile-type-caption-size);
+  line-height: var(--mobile-type-body-leading);
+  overflow-wrap: anywhere;
+  white-space: pre-wrap;
+  max-height: 8em;
+  overflow-y: auto;
+}
+.mobile-discovery
+  :is(.mobile-inbox-entry, .mobile-session-row, .mobile-pending-card) {
+  touch-action: manipulation;
+  -webkit-tap-highlight-color: transparent;
+  &:focus-visible {
+    outline: 2px solid var(--color-primary-6);
+    outline-offset: 3px;
+  }
+  &:active:not(:disabled) {
+    background: var(--color-fill-2);
+  }
+}
+
+// Reuse Desktop round-list layout and typography; mobile only adapts the sheet
+// and touch targets. No raw preview text is hidden.
+.mobile-round-sheet {
+  border-radius: 24px 24px 0 0;
+  .orgii-bottom-sheet-header {
+    padding: 10px 20px;
+  }
+  .orgii-bottom-sheet-close {
+    width: 44px;
+    height: 44px;
+    border-radius: 50%;
+    background: var(--color-fill-1);
+  }
+  .orgii-bottom-sheet-body {
+    padding: 0 20px 16px;
+  }
+}
+.mobile-round-sheet__actions {
+  display: flex;
+  justify-content: flex-end;
+  padding-bottom: 8px;
+  button {
+    min-height: 44px;
+    font-size: var(--mobile-type-secondary-size);
+  }
+}
+[data-mobile-round-list="true"] {
+  max-height: none;
+  > button {
+    min-height: 44px;
+  }
+}
+.mobile-shell [data-turn-navigation-toolbar="mobile"] {
+  padding: 0 12px;
+  background: transparent;
+  button {
+    min-height: 44px;
+    min-width: 44px;
+  }
+}
+
+.mobile-chat-transcript {
+  overflow-wrap: anywhere;
+}
+.mobile-chat-transcript [data-transcript-item-kind] {
+  min-width: 0;
+  max-width: 100%;
+}
+.mobile-chat-transcript [data-transcript-item-kind="user"] > div {
+  min-width: 0;
+}
diff --git a/src/modules/MobileRemote/mobileDiscovery.test.ts b/src/modules/MobileRemote/mobileDiscovery.test.ts
new file mode 100644
index 0000000000..05bcbd47a2
--- /dev/null
+++ b/src/modules/MobileRemote/mobileDiscovery.test.ts
@@ -0,0 +1,38 @@
+// @vitest-environment jsdom
+import { resolve } from "node:path";
+import { compile } from "sass";
+import { describe, expect, it } from "vitest";
+
+const css = compile(resolve("src/modules/MobileRemote/mobileDiscovery.scss"), {
+  quietDeps: true,
+}).css;
+
+function rule(selector: string): CSSStyleDeclaration {
+  const style = document.createElement("style");
+  style.textContent = css;
+  document.head.append(style);
+  const found = Array.from(style.sheet!.cssRules).find(
+    (entry) => (entry as CSSStyleRule).selectorText === selector
+  ) as CSSStyleRule | undefined;
+  style.remove();
+  if (!found) throw new Error(`Missing style: ${selector}`);
+  return found.style;
+}
+
+describe("session row highlight surface", () => {
+  it("adds symmetric inset without moving the existing content columns", () => {
+    const row = rule(".mobile-session-row");
+    expect(row.getPropertyValue("padding")).toBe("12px 8px");
+    expect(row.getPropertyValue("margin-inline")).toBe("-8px");
+    expect(row.getPropertyValue("width")).toBe("calc(100% + 16px)");
+    expect(row.getPropertyValue("border-radius")).toBe("12px");
+  });
+
+  it("keeps compact rows touch-sized without overriding horizontal inset", () => {
+    const compact = rule(".mobile-session-row--compact");
+    expect(compact.getPropertyValue("min-height")).toBe("44px");
+    expect(compact.getPropertyValue("padding-block")).toBe("8px");
+    expect(compact.getPropertyValue("padding")).toBe("");
+    expect(compact.getPropertyValue("padding-inline")).toBe("");
+  });
+});
diff --git a/src/modules/MobileRemote/mobileI18n.test.ts b/src/modules/MobileRemote/mobileI18n.test.ts
index 698e8d85d5..5b8f58b0c5 100644
--- a/src/modules/MobileRemote/mobileI18n.test.ts
+++ b/src/modules/MobileRemote/mobileI18n.test.ts
@@ -3,6 +3,127 @@ import { describe, expect, it } from "vitest";
 import { mobileI18n, mobileI18nReady } from "./mobileI18n";
 
 describe("mobileI18n", () => {
+  it("keeps infrastructure jargon out of everyday pairing and task prompts", async () => {
+    await mobileI18nReady;
+    const keys = [
+      "profile.connectionHelp",
+      "pairing.scanHint",
+      "pairing.urlPlaceholder",
+      "pairing.errors.empty",
+      "pairing.errors.invalid",
+      "pairing.errors.unsupportedVersion",
+      "settings.demoBanner",
+      "stopConfirm.title",
+      "stopConfirm.body",
+      "changeReview.partial",
+      "changeReview.unavailable",
+      "fileViewer.patchFallback",
+    ];
+    for (const language of ["zh", "en"]) {
+      const t = mobileI18n.getFixedT(language, "mobileRemote");
+      for (const key of keys) {
+        expect(t(key)).not.toBe(key);
+        expect(t(key)).not.toMatch(
+          /Cloud|Relay|WebSocket|payload|fixtures|snapshot|Agent turn|cancel command|shell|载荷|快照|cancel 指令/i
+        );
+      }
+      expect(t("stopConfirm.body")).toContain(
+        language === "zh" ? "可能仍会继续运行" : "may keep running"
+      );
+    }
+  });
+  it("uses product-facing account copy without infrastructure branding", async () => {
+    await mobileI18nReady;
+    for (const language of ["en", "zh"]) {
+      const t = mobileI18n.getFixedT(language, "mobileRemote");
+      expect(t("auth.title")).toBe(
+        language === "zh" ? "登录 ORG2" : "Sign in to ORG2"
+      );
+      expect(t("auth.subtitle")).toBe(
+        language === "zh"
+          ? "登录后，连接电脑，随时继续会话"
+          : "Connect your computer and pick up your conversations wherever you are"
+      );
+      for (const key of [
+        "auth.title",
+        "auth.subtitle",
+        "auth.signIn",
+        "settings.manageAccount",
+        "settings.deleteAccount",
+        "profile.deleteHint",
+        "profile.pairingStep1",
+      ]) {
+        expect(t(key)).not.toBe(key);
+        expect(t(key)).not.toMatch(/cloud/i);
+      }
+      expect(t("profile.deleteHint")).toMatch(
+        language === "zh" ? /确认/ : /confirm/
+      );
+    }
+  });
+  it("ships lifecycle labels, clipboard feedback and bounded-draft errors in both mobile locales", async () => {
+    await mobileI18nReady;
+    const states = [
+      "pending",
+      "installing",
+      "queued",
+      "in_progress",
+      "waiting_for_user",
+      "waiting_for_funds",
+      "paused",
+      "completed",
+      "failed",
+      "error",
+      "cancelled",
+      "abandoned",
+      "timeout",
+      "killed",
+      "archived",
+    ];
+    for (const language of ["en", "zh"]) {
+      const remote = mobileI18n.getFixedT(language, "mobileRemote");
+      for (const state of states) {
+        const key = `sessions.state.${state}`;
+        expect(remote(key)).not.toBe(key);
+        expect(remote(key).length).toBeGreaterThan(0);
+      }
+      const common = mobileI18n.getFixedT(language, "common");
+      expect(common("actions.copy")).toBe(language === "en" ? "Copy" : "复制");
+      expect(common("status.copyFailed")).toBe(
+        language === "en" ? "Copy failed" : "复制失败"
+      );
+      expect(common("status.copied")).not.toBe("status.copied");
+      expect(common("status.loading")).not.toBe("status.loading");
+      const sessions = mobileI18n.getFixedT(language, "sessions");
+      expect(sessions("chat.draftTooLong", { max: 100_000 })).toBe(
+        language === "en"
+          ? "Draft is too long (maximum 100000 characters)"
+          : "草稿过长（最多 100000 个字符）"
+      );
+    }
+  });
+  it("includes consolidated account and device-status copy in the native bundle", async () => {
+    await mobileI18nReady;
+    const expected = {
+      en: [
+        "Help & about",
+        "Device authorization",
+        "Current computer",
+        "Status unknown",
+      ],
+      zh: ["帮助与关于", "设备授权", "当前电脑", "状态未知"],
+    };
+    const keys = [
+      "profile.helpAndAbout",
+      "settings.authorization",
+      "devices.currentDesktop",
+      "devices.presenceUnknown",
+    ];
+    for (const [language, values] of Object.entries(expected)) {
+      const t = mobileI18n.getFixedT(language, "mobileRemote");
+      expect(keys.map((key) => t(key))).toEqual(values);
+    }
+  });
   it("contains the standalone mobile namespaces in English and Chinese", async () => {
     await mobileI18nReady;
     await mobileI18n.changeLanguage("en");
@@ -12,9 +133,7 @@ describe("mobileI18n", () => {
     expect(mobileI18n.t("composerAccepted", { ns: "mobileRemote" })).toBe(
       "Sent — waiting for the Agent…"
     );
-    expect(mobileI18n.t("auth.signIn", { ns: "mobileRemote" })).toBe(
-      "Sign in to ORG2 Cloud"
-    );
+    expect(mobileI18n.t("auth.signIn", { ns: "mobileRemote" })).toBe("Sign in");
     expect(
       mobileI18n.t("settings.permissionFull", { ns: "mobileRemote" })
     ).toBe("Full access");
@@ -27,16 +146,17 @@ describe("mobileI18n", () => {
     expect(mobileI18n.t("composerAccepted", { ns: "mobileRemote" })).toBe(
       "已发送，正在等待 Agent 回复…"
     );
-    expect(mobileI18n.t("auth.signIn", { ns: "mobileRemote" })).toBe(
-      "登录 ORG2 Cloud"
-    );
+    expect(mobileI18n.t("auth.signIn", { ns: "mobileRemote" })).toBe("登录");
     expect(
       mobileI18n.t("settings.permissionFull", { ns: "mobileRemote" })
     ).toBe("完整访问");
-    expect(mobileI18n.t("devices.primary", { ns: "mobileRemote" })).toBe(
-      "主桌面"
+    expect(mobileI18n.t("devices.currentDesktop", { ns: "mobileRemote" })).toBe(
+      "当前电脑"
     );
     expect(mobileI18n.t("actions.close", { ns: "common" })).toBe("关闭");
+    expect(mobileI18n.t("rounds.newestFirst", { ns: "mobileRemote" })).toBe(
+      "最新优先 ↓"
+    );
     expect(mobileI18n.t("actions.back")).toBe("返回");
     expect(mobileI18n.t("actions.search")).toBe("搜索");
     expect(mobileI18n.t("selectors.modelProperties.model")).toBe("模型");
diff --git a/src/modules/MobileRemote/mobileI18n.ts b/src/modules/MobileRemote/mobileI18n.ts
index e087b96ead..9fbb290d4b 100644
--- a/src/modules/MobileRemote/mobileI18n.ts
+++ b/src/modules/MobileRemote/mobileI18n.ts
@@ -12,6 +12,12 @@ const enSupport = {
       back: "Back",
       search: "Search",
       add: "Add",
+      copy: "Copy",
+    },
+    status: {
+      copied: "Copied",
+      loading: "Loading…",
+      copyFailed: "Copy failed",
     },
     tooltips: {
       startVoiceInput: "Start voice input",
@@ -47,6 +53,7 @@ const enSupport = {
     },
     chat: {
       typeMessage: "Type a message…",
+      draftTooLong: "Draft is too long (maximum {{max}} characters)",
       send: "Send",
       permissionPrompt: "Your permission is needed",
       commandConfirmTitle: "Command Requires Approval",
@@ -76,6 +83,7 @@ const enMobileRemoteResources = {
   ...enMobileRemote,
   selectors: enSupport.common.selectors,
   rounds: {
+    ...enMobileRemote.rounds,
     navigationLabel: "Conversation rounds",
     label: "Round {{current}} of {{total}}",
     previous: "Previous",
@@ -94,6 +102,12 @@ const zhSupport = {
       back: "返回",
       search: "搜索",
       add: "添加",
+      copy: "复制",
+    },
+    status: {
+      copied: "已复制",
+      loading: "加载中…",
+      copyFailed: "复制失败",
     },
     tooltips: {
       startVoiceInput: "开始语音输入",
@@ -129,6 +143,7 @@ const zhSupport = {
     },
     chat: {
       typeMessage: "输入消息…",
+      draftTooLong: "草稿过长（最多 {{max}} 个字符）",
       send: "发送",
       permissionPrompt: "需要你的授权",
       commandConfirmTitle: "命令需要审批",
@@ -157,6 +172,7 @@ const zhMobileRemoteResources = {
   ...zhMobileRemote,
   selectors: zhSupport.common.selectors,
   rounds: {
+    ...zhMobileRemote.rounds,
     navigationLabel: "会话轮次",
     label: "第 {{current}} / {{total}} 轮",
     previous: "上一轮",
diff --git a/src/modules/MobileRemote/mobileTypography.test.ts b/src/modules/MobileRemote/mobileTypography.test.ts
new file mode 100644
index 0000000000..38e4e4e9c1
--- /dev/null
+++ b/src/modules/MobileRemote/mobileTypography.test.ts
@@ -0,0 +1,55 @@
+import { readFileSync, readdirSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { compile } from "sass";
+import { describe, expect, it } from "vitest";
+
+const root = fileURLToPath(new URL("./", import.meta.url));
+const read = (path: string) => readFileSync(`${root}${path}`, "utf8");
+
+describe("mobile typography contract", () => {
+  it("compiles root-scoped roles for both normal and portaled mobile UI", () => {
+    const css = compile(`${root}mobileViewport.scss`).css;
+    expect(css).toContain("--mobile-type-body-size: 1rem");
+    expect(css).toContain("--mobile-type-code-size: 0.8125rem");
+    expect(css).toContain("html .mobile-type-caption");
+    expect(css).toContain("--chat-font-size: var(--mobile-type-body-size)");
+    expect(css).toContain(
+      "--chat-code-font-size: var(--mobile-type-code-size)"
+    );
+    expect(css).not.toMatch(/--text-(xs|sm|base|lg):/);
+    expect(css).not.toMatch(/font-size:\s*\d+px/);
+    for (const entry of [
+      "mobileRemoteEntry.tsx",
+      "mobileRemoteNativeEntry.tsx",
+    ]) {
+      expect(read(`../../${entry}`)).toContain(
+        "MobileRemote/mobileViewport.scss"
+      );
+    }
+  });
+
+  it("resolves every mobile typography reference to a centrally declared token", () => {
+    const css = compile(`${root}mobileViewport.scss`).css;
+    const declarations = new Set(
+      [...css.matchAll(/(--mobile-type-[\w-]+):/g)].map((match) => match[1])
+    );
+    for (const file of readdirSync(root, { recursive: true }) as string[]) {
+      if (!/\.(scss|tsx)$/.test(file)) continue;
+      for (const match of read(file).matchAll(
+        /var\((--mobile-type-[\w-]+)\)/g
+      )) {
+        expect(declarations.has(match[1]), `${file}: ${match[1]}`).toBe(true);
+      }
+    }
+  });
+
+  it("keeps literal mobile type sizes in the central scale, not consumers", () => {
+    for (const file of readdirSync(root, { recursive: true }) as string[]) {
+      if (!/\.(scss|tsx)$/.test(file) || file === "_mobileTypography.scss")
+        continue;
+      expect(read(file), file).not.toMatch(/font-size:\s*\d+(?:\.\d+)?px/);
+      expect(read(file), file).not.toMatch(/fontSize:\s*\d/);
+      expect(read(file), file).not.toMatch(/\btext-(xs|sm|base|lg|xl)\b/);
+    }
+  });
+});
diff --git a/src/modules/MobileRemote/mobileViewport.scss b/src/modules/MobileRemote/mobileViewport.scss
index 5ea0cf35b6..f68ec86d32 100644
--- a/src/modules/MobileRemote/mobileViewport.scss
+++ b/src/modules/MobileRemote/mobileViewport.scss
@@ -5,31 +5,30 @@
  * blank strip below the 100dvh app shell.
  */
 
-// Mirror Desktop ChatHistory typography for tool blocks and chat surfaces.
-// Mobile Remote renders EventBlockHeader outside `.wp__chat__history`, so the
-// scoped `.chat-block-header` reset from ChatHistory/index.scss never applies
-// and rows inherit the browser's 16px body size instead of 13px.
-$mobile-chat-font-size: 13px;
-$mobile-chat-code-font-size: 13px;
-$mobile-chat-line-height: 1.6;
+@use "./mobileTypography" as typography;
+
+// Adapt shared transcript consumers to mobile roles, including body-portaled
+// sheets. This entry-only stylesheet never changes Desktop typography.
 // Desktop CHAT_ITEM_GAP is py-1 (4px per side, 8px between items). Mobile
 // transcript uses py-0.5 by default and 2px between consecutive tool rows.
 $mobile-chat-item-gap-y: 2px;
 $mobile-chat-tool-run-gap-y: 2px;
 
 html {
-  --chat-font-size: #{$mobile-chat-font-size};
-  --chat-code-font-size: #{$mobile-chat-code-font-size};
-  --chat-line-height: #{$mobile-chat-line-height};
+  @include typography.tokens;
+  @include typography.utilities;
+  --chat-font-size: var(--mobile-type-body-size);
+  --chat-code-font-size: var(--mobile-type-code-size);
+  --chat-line-height: var(--mobile-type-reading-leading);
   --mobile-chat-item-gap-y: #{$mobile-chat-item-gap-y};
   --mobile-chat-tool-run-gap-y: #{$mobile-chat-tool-run-gap-y};
-  --chat-block-xs-size: calc(var(--chat-font-size) - 2px);
-  --chat-block-content-size: var(--chat-code-font-size);
-  --chat-block-title-size: var(--chat-font-size);
-  --chat-block-md-size: var(--chat-font-size);
+  --chat-block-xs-size: var(--mobile-type-caption-size);
+  --chat-block-content-size: var(--mobile-type-secondary-size);
+  --chat-block-title-size: var(--mobile-type-secondary-size);
+  --chat-block-md-size: var(--mobile-type-secondary-size);
 
   .chat-block-header {
-    font-size: var(--chat-block-title-size, #{$mobile-chat-font-size});
+    font-size: var(--chat-block-title-size);
   }
 
   .chat-block-icon {
@@ -69,3 +68,32 @@ body,
     height: 100dvh;
   }
 }
+
+// This stylesheet is loaded only by the Remote entries. Shared sheet behavior
+// is unchanged; all mobile permission/stop/round sheets use the visible height.
+html .orgii-bottom-sheet-panel {
+  min-width: 0;
+  width: 100%;
+  max-width: 48rem;
+  align-self: center;
+  max-height: calc(100dvh - max(16px, env(safe-area-inset-top, 0px)));
+  padding-left: env(safe-area-inset-left, 0px);
+  padding-right: env(safe-area-inset-right, 0px);
+  overflow-wrap: anywhere;
+  .orgii-bottom-sheet-body {
+    min-height: 0;
+  }
+  .orgii-bottom-sheet-close {
+    width: 44px;
+    height: 44px;
+  }
+  .orgii-bottom-sheet-footer button {
+    min-height: 44px;
+    max-width: 100%;
+    height: auto;
+    > .truncate {
+      white-space: normal;
+      overflow-wrap: anywhere;
+    }
+  }
+}
diff --git a/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.recovery.test.ts b/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.recovery.test.ts
new file mode 100644
index 0000000000..5f1f215866
--- /dev/null
+++ b/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.recovery.test.ts
@@ -0,0 +1,82 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { expect, it, vi } from "vitest";
+
+import { useMobileRemoteCoordinator } from "./useMobileRemoteCoordinator";
+
+const mocks = vi.hoisted(() => ({
+  retryConnection: vi.fn(),
+  disconnect: vi.fn(),
+}));
+vi.mock("../app", () => ({
+  useMobileRemote: () => ({
+    connection: { status: "error", demoMode: false },
+    connectionConfig: null,
+    sessions: [],
+    stopSession: vi.fn(),
+    ...mocks,
+  }),
+}));
+
+it("single-flights reconnection, consumes the old bridge intent, and keeps repair separate with visible failures", async () => {
+  const environment = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  };
+  const previous = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  const root = createRoot(document.createElement("div"));
+  let current!: ReturnType<typeof useMobileRemoteCoordinator>;
+  function Probe() {
+    const value = useMobileRemoteCoordinator(null);
+    React.useEffect(() => {
+      current = value;
+    });
+    return null;
+  }
+  let reject!: (error: Error) => void;
+  mocks.retryConnection.mockReturnValue(
+    new Promise((_resolve, fail) => {
+      reject = fail;
+    })
+  );
+  mocks.disconnect
+    .mockRejectedValueOnce(new Error("locked"))
+    .mockResolvedValue(undefined);
+  try {
+    act(() => root.render(React.createElement(Probe)));
+    act(() =>
+      current.handleAcceptPairing({
+        config: { wsUrl: "wss://fixture.example/ws", pairingCode: "code" },
+        requiresSas: false,
+      })
+    );
+    let pending!: Promise<void>;
+    await act(async () => {
+      pending = current.handleConnectionRetry();
+      await current.handleConnectionRetry();
+    });
+    expect(current.nav.pendingConfig).toBeNull();
+    expect(current.connectionRecovering).toBe(true);
+    expect(mocks.retryConnection).toHaveBeenCalledOnce();
+    expect(mocks.disconnect).not.toHaveBeenCalled();
+    await act(async () => {
+      reject(new Error("offline"));
+      await pending;
+    });
+    expect(current.connectionRecoveryError).toBe("retry");
+    expect(current.connectionRecovering).toBe(false);
+    act(() =>
+      current.dispatch({ type: "select_session", sessionId: "keep-selection" })
+    );
+    await act(async () => current.handleConnectionRepair());
+    expect(current.connectionRecoveryError).toBe("repair");
+    expect(current.nav.screen).toBe("chat");
+    await act(async () => current.handleConnectionRepair());
+    expect(current.connectionRecoveryError).toBeNull();
+    expect(current.nav.screen).toBe("welcome");
+  } finally {
+    act(() => root.unmount());
+    environment.IS_REACT_ACT_ENVIRONMENT = previous;
+  }
+});
diff --git a/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.test.ts b/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.test.ts
index ca9063c08b..fa6c654add 100644
--- a/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.test.ts
+++ b/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.test.ts
@@ -3,10 +3,14 @@ import React, { act } from "react";
 import { type Root, createRoot } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-import { StopConfirmModal } from "../components/modals/StopConfirmModal";
+import type { MobileConnectionConfig } from "../connection/types";
 import { useMobileRemoteCoordinator } from "./useMobileRemoteCoordinator";
 
-const mocks = vi.hoisted(() => ({ stopSession: vi.fn(), disconnect: vi.fn() }));
+const mocks = vi.hoisted(() => ({
+  stopSession: vi.fn(),
+  disconnect: vi.fn(),
+  connectionConfig: null as MobileConnectionConfig | null,
+}));
 vi.mock("../app", () => ({
   useMobileRemote: () => ({
     connection: { status: "disconnected", demoMode: false },
@@ -15,37 +19,21 @@ vi.mock("../app", () => ({
   }),
 }));
 
-vi.mock("react-i18next", () => ({
-  useTranslation: () => ({ t: (key: string) => key }),
-}));
-
 describe("useMobileRemoteCoordinator", () => {
   let root: Root;
   let container: HTMLDivElement;
   let current: ReturnType<typeof useMobileRemoteCoordinator>;
+  let renderedScreens: string[];
   const environment = globalThis as typeof globalThis & {
     IS_REACT_ACT_ENVIRONMENT?: boolean;
   };
   let previous: boolean | undefined;
-  function Probe({
-    intent = null,
-    modal = false,
-  }: {
-    intent?: string | null;
-    modal?: boolean;
-  }) {
+  function Probe({ intent = null }: { intent?: string | null }) {
     const value = useMobileRemoteCoordinator(intent);
+    renderedScreens.push(value.nav.screen);
     React.useEffect(() => {
       current = value;
     });
-    if (modal)
-      return React.createElement(StopConfirmModal, {
-        visible: value.nav.stopModalOpen,
-        confirming: value.stopConfirming,
-        failed: value.stopFailed,
-        onConfirm: () => void value.handleConfirmStop(),
-        onCancel: () => value.dispatch({ type: "close_stop_modal" }),
-      });
     return React.createElement("div", null, value.nav.screen);
   }
   beforeEach(() => {
@@ -53,6 +41,8 @@ describe("useMobileRemoteCoordinator", () => {
     environment.IS_REACT_ACT_ENVIRONMENT = true;
     mocks.stopSession.mockReset().mockResolvedValue(undefined);
     mocks.disconnect.mockReset().mockResolvedValue(undefined);
+    mocks.connectionConfig = null;
+    renderedScreens = [];
     container = document.createElement("div");
     root = createRoot(container);
     act(() => root.render(React.createElement(Probe)));
@@ -61,6 +51,45 @@ describe("useMobileRemoteCoordinator", () => {
     act(() => root.unmount());
     environment.IS_REACT_ACT_ENVIRONMENT = previous;
   });
+  it("opens sessions for a restored device before the transport connects", () => {
+    renderedScreens = [];
+    mocks.connectionConfig = { wsUrl: "wss://relay.example.com/mobile/ws" };
+    act(() => root.render(React.createElement(Probe)));
+    expect(renderedScreens[0]).toBe("sessions");
+    expect(container.textContent).toBe("sessions");
+    expect(current.showTabBar).toBe(true);
+  });
+  it("keeps first-time devices on welcome", () => {
+    expect(container.textContent).toBe("welcome");
+  });
+  it("does not treat a fresh pairing code as a restored device", () => {
+    mocks.connectionConfig = {
+      wsUrl: "wss://relay.example.com/mobile/ws",
+      pairingCode: "fresh-code",
+    };
+    act(() => root.render(React.createElement(Probe)));
+    expect(container.textContent).toBe("welcome");
+    act(() =>
+      current.handleAcceptPairing({
+        config: mocks.connectionConfig!,
+        requiresSas: true,
+        sasPhrase: "verify-me",
+      })
+    );
+    expect(container.textContent).toBe("sas");
+  });
+  it("keeps an explicit new pairing intent ahead of a restored device", () => {
+    mocks.connectionConfig = { wsUrl: "wss://old.example.com/mobile/ws" };
+    act(() =>
+      root.render(
+        React.createElement(Probe, {
+          intent: "wss://relay.example.com/mobile/ws?token=test",
+        })
+      )
+    );
+    expect(container.textContent).toBe("connecting");
+    expect(current.nav.pendingConfig?.wsUrl).toContain("relay.example.com");
+  });
   it("consumes a recovered pairing link once and preserves subsequent navigation", () => {
     const intent = "wss://relay.example.com/mobile/ws?token=test";
     act(() => root.render(React.createElement(Probe, { intent })));
@@ -118,44 +147,65 @@ describe("useMobileRemoteCoordinator", () => {
     expect(current.stopConfirming).toBe(false);
   });
   it("releases the stop lock after rejection so another attempt is possible", async () => {
-    act(() => current.dispatch({ type: "select_session", sessionId: "a" }));
+    act(() => {
+      current.dispatch({ type: "select_session", sessionId: "a" });
+      current.dispatch({ type: "open_stop_modal" });
+    });
     mocks.stopSession.mockRejectedValueOnce(new Error("offline"));
     await act(async () => {
       await expect(current.handleConfirmStop()).resolves.toBeUndefined();
     });
     expect(current.stopConfirming).toBe(false);
     expect(current.stopFailed).toBe(true);
+    expect(current.nav.stopModalOpen).toBe(true);
     await act(async () => {
       await current.handleConfirmStop();
     });
     expect(mocks.stopSession).toHaveBeenCalledTimes(2);
+    expect(current.stopFailed).toBe(false);
+    expect(current.nav.stopModalOpen).toBe(false);
   });
-  it("keeps the rendered stop dialog open on failure and retries the desktop command", async () => {
-    await act(async () =>
-      root.render(React.createElement(Probe, { modal: true }))
+  it("clears a stop failure when dismissed and does not leak it to another session", async () => {
+    act(() => {
+      current.dispatch({ type: "select_session", sessionId: "a" });
+      current.dispatch({ type: "open_stop_modal" });
+    });
+    mocks.stopSession.mockRejectedValueOnce(new Error("private-token"));
+    await act(async () => current.handleConfirmStop());
+    expect(current.stopFailed).toBe(true);
+    act(() => current.dispatch({ type: "close_stop_modal" }));
+    expect(current.stopFailed).toBe(false);
+    act(() => {
+      current.dispatch({ type: "select_session", sessionId: "b" });
+      current.dispatch({ type: "open_stop_modal" });
+    });
+    expect(current.stopFailed).toBe(false);
+  });
+  it("ignores a late stop failure after switching the connection scope", async () => {
+    let reject!: (reason: Error) => void;
+    mocks.stopSession.mockImplementationOnce(
+      () =>
+        new Promise<void>((_, fail) => {
+          reject = fail;
+        })
     );
     act(() => {
       current.dispatch({ type: "select_session", sessionId: "a" });
       current.dispatch({ type: "open_stop_modal" });
     });
-    mocks.stopSession.mockRejectedValueOnce(new Error("offline"));
-    const clickStop = async () => {
-      const button = document.querySelector<HTMLButtonElement>(
-        "[data-modal-primary-action]"
-      );
-      expect(button).not.toBeNull();
-      await act(async () => button!.click());
+    let pending!: Promise<void>;
+    await act(async () => {
+      pending = current.handleConfirmStop();
+    });
+    mocks.connectionConfig = {
+      wsUrl: "wss://another-desktop.example/mobile/ws",
     };
-    await clickStop();
-    expect(current.nav.stopModalOpen).toBe(true);
-    expect(document.querySelector('[role="alert"]')?.textContent).toContain(
-      "stopConfirm.failed"
-    );
-    expect(mocks.stopSession).toHaveBeenCalledTimes(1);
-    await clickStop();
-    expect(mocks.stopSession).toHaveBeenCalledTimes(2);
-    expect(mocks.stopSession).toHaveBeenLastCalledWith("a");
-    expect(current.nav.stopModalOpen).toBe(false);
-    expect(document.querySelector('[role="alert"]')).toBeNull();
+    act(() => root.render(React.createElement(Probe)));
+    await act(async () => {
+      reject(new Error("old desktop rejected"));
+      await pending;
+    });
+    expect(current.stopFailed).toBe(false);
+    expect(current.stopConfirming).toBe(false);
   });
 });
diff --git a/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.ts b/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.ts
index 2318b5aaf2..13305751c4 100644
--- a/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.ts
+++ b/src/modules/MobileRemote/navigation/useMobileRemoteCoordinator.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useReducer, useRef } from "react";
+import { useCallback, useEffect, useReducer, useRef, useState } from "react";
 
 import { useMobileRemote } from "../app";
 import { parseMobileRemoteWsUrl } from "../connection/parseMobileRemoteWsUrl";
@@ -10,49 +10,52 @@ import {
   reduceMobileRemoteNav,
 } from "./mobileRemoteNavigation";
 
-type CoordinatorState = {
-  nav: ReturnType<typeof createInitialMobileRemoteNavState>;
-  stopConfirming: boolean;
-  stopFailed: boolean;
-};
-type CoordinatorAction =
-  | MobileRemoteNavAction
-  | { type: "stop_pending" }
-  | { type: "stop_failed" };
-function reduceCoordinator(
-  state: CoordinatorState,
-  action: CoordinatorAction
-): CoordinatorState {
-  if (action.type === "stop_pending")
-    return { ...state, stopConfirming: true, stopFailed: false };
-  if (action.type === "stop_failed")
-    return { ...state, stopConfirming: false, stopFailed: true };
-  return {
-    nav: reduceMobileRemoteNav(state.nav, action),
-    stopConfirming: action.type === "open_stop_modal" && state.stopConfirming,
-    stopFailed: false,
-  };
-}
-
 /** Route intent owner; connection execution remains in ConnectingLiveBridge. */
 export function useMobileRemoteCoordinator(
   recoveredPairingIntent: string | null
 ) {
-  const { connection, sessions, stopSession, disconnect } = useMobileRemote();
-  const [{ nav, stopConfirming, stopFailed }, reduce] = useReducer(
-    reduceCoordinator,
+  const {
+    connection,
+    connectionConfig,
+    sessions,
+    stopSession,
+    disconnect,
+    retryConnection,
+  } = useMobileRemote();
+  const [connectionRecovering, setConnectionRecovering] = useState(false);
+  const [connectionRecoveryError, setConnectionRecoveryError] = useState<
+    "retry" | "repair" | null
+  >(null);
+  const recoveryAttemptRef = useRef<symbol | null>(null);
+  useEffect(
+    () => () => {
+      recoveryAttemptRef.current = null;
+    },
+    []
+  );
+  const [storedNav, reduce] = useReducer(
+    reduceMobileRemoteNav,
     undefined,
-    () => ({
-      nav: createInitialMobileRemoteNavState(),
-      stopConfirming: false,
-      stopFailed: false,
-    })
+    createInitialMobileRemoteNavState
   );
+  // Project the restored route during render, before effects: no welcome-frame flash.
+  const nav =
+    storedNav.screen === "welcome" &&
+    !recoveredPairingIntent &&
+    !connection.demoMode &&
+    (connection.status === "connected" ||
+      (connectionConfig && !connectionConfig.pairingCode))
+      ? reduceMobileRemoteNav(storedNav, { type: "connecting_complete" })
+      : storedNav;
+  const [stopConfirming, setStopConfirming] = useState(false);
+  const [stopFailed, setStopFailed] = useState(false);
   const stopAttemptRef = useRef<symbol | null>(null);
   const dispatch = useCallback((action: MobileRemoteNavAction) => {
     // Navigation supersedes modal-local work, but does not cancel the remote command.
     if (action.type !== "open_stop_modal") {
       stopAttemptRef.current = null;
+      setStopConfirming(false);
+      setStopFailed(false);
     }
     reduce(action);
   }, []);
@@ -62,12 +65,20 @@ export function useMobileRemoteCoordinator(
     },
     []
   );
+  useEffect(() => {
+    stopAttemptRef.current = null;
+    setStopConfirming(false);
+    setStopFailed(false);
+  }, [
+    connection.desktopId,
+    connectionConfig?.desktopId,
+    connectionConfig?.wsUrl,
+    connectionConfig?.host,
+    connectionConfig?.port,
+  ]);
   const consumedPairingLinkRef = useRef<string | null>(null);
 
-  const showTabBar =
-    nav.screen === "sessions" &&
-    connection.status === "connected" &&
-    !nav.selectedSessionId;
+  const showTabBar = nav.screen === "sessions" && !nav.selectedSessionId;
   const selectedSessionName = nav.selectedSessionId
     ? resolveMobileSessionTitle(sessions, nav.selectedSessionId)
     : "";
@@ -78,13 +89,22 @@ export function useMobileRemoteCoordinator(
 
   useEffect(() => {
     if (
-      connection.status === "connected" &&
+      (connection.status === "connected" ||
+        (connectionConfig && !connectionConfig.pairingCode)) &&
       !connection.demoMode &&
-      nav.screen === "welcome"
+      !recoveredPairingIntent &&
+      storedNav.screen === "welcome"
     ) {
       dispatch({ type: "connecting_complete" });
     }
-  }, [connection.demoMode, connection.status, nav.screen, dispatch]);
+  }, [
+    connection.demoMode,
+    connection.status,
+    connectionConfig,
+    recoveredPairingIntent,
+    storedNav.screen,
+    dispatch,
+  ]);
 
   useEffect(() => {
     if (
@@ -119,24 +139,61 @@ export function useMobileRemoteCoordinator(
     if (!nav.selectedSessionId || stopAttemptRef.current) return;
     const attempt = Symbol("mobile-stop");
     stopAttemptRef.current = attempt;
-    reduce({ type: "stop_pending" });
+    setStopConfirming(true);
+    setStopFailed(false);
     try {
       await stopSession(nav.selectedSessionId);
       if (stopAttemptRef.current === attempt) {
         dispatch({ type: "close_stop_modal" });
       }
     } catch {
+      if (stopAttemptRef.current === attempt) setStopFailed(true);
+    } finally {
       if (stopAttemptRef.current === attempt) {
         stopAttemptRef.current = null;
-        reduce({ type: "stop_failed" });
+        setStopConfirming(false);
       }
     }
   }, [nav.selectedSessionId, stopSession, dispatch]);
 
-  const handleConnectionRetry = useCallback(() => {
-    void disconnect().catch(() => undefined);
-    dispatch({ type: "back_to_welcome" });
-  }, [disconnect, dispatch]);
+  const recoverConnection = useCallback(
+    async (kind: "retry" | "repair") => {
+      if (recoveryAttemptRef.current) return;
+      const attempt = Symbol("connection-recovery");
+      recoveryAttemptRef.current = attempt;
+      setConnectionRecovering(true);
+      setConnectionRecoveryError(null);
+      try {
+        if (kind === "retry") {
+          // The provider now owns this attempt. Consume the old pairing intent
+          // before leaving the error gate so its bridge cannot start a second one.
+          if (nav.pendingConfig) dispatch({ type: "back_to_welcome" });
+          await retryConnection();
+        } else {
+          await disconnect();
+          if (recoveryAttemptRef.current === attempt)
+            dispatch({ type: "back_to_welcome" });
+        }
+      } catch {
+        if (recoveryAttemptRef.current === attempt)
+          setConnectionRecoveryError(kind);
+      } finally {
+        if (recoveryAttemptRef.current === attempt) {
+          recoveryAttemptRef.current = null;
+          setConnectionRecovering(false);
+        }
+      }
+    },
+    [disconnect, dispatch, nav.pendingConfig, retryConnection]
+  );
+  const handleConnectionRetry = useCallback(
+    () => recoverConnection("retry"),
+    [recoverConnection]
+  );
+  const handleConnectionRepair = useCallback(
+    () => recoverConnection("repair"),
+    [recoverConnection]
+  );
 
   return {
     connection,
@@ -151,5 +208,8 @@ export function useMobileRemoteCoordinator(
     handleAcceptPairing,
     handleConfirmStop,
     handleConnectionRetry,
+    handleConnectionRepair,
+    connectionRecovering,
+    connectionRecoveryError,
   };
 }
diff --git a/src/modules/MobileRemote/platform/browser/browserMobileRemotePlatform.ts b/src/modules/MobileRemote/platform/browser/browserMobileRemotePlatform.ts
index 3381662706..881cc3eda6 100644
--- a/src/modules/MobileRemote/platform/browser/browserMobileRemotePlatform.ts
+++ b/src/modules/MobileRemote/platform/browser/browserMobileRemotePlatform.ts
@@ -21,6 +21,7 @@ import {
 } from "../../connection/mobileConnectionStorage";
 import { scanCameraQr } from "../scanCameraQr";
 import type { MobileRemotePlatform } from "../types";
+import { writeClipboardText } from "../writeClipboardText";
 import { createBrowserMobileAuthClient } from "./browserMobileAuthClient";
 
 const MOBILE_AUTH_ROOT_PATH = "/orgii/mobile";
@@ -42,6 +43,7 @@ export function createBrowserMobileRemotePlatform(): MobileRemotePlatform {
 
   return {
     kind: "browser",
+    writeClipboardText,
     scanQr: scanCameraQr,
     openExternal: (url) => window.location.assign(url),
     clientInfo: {
@@ -49,7 +51,11 @@ export function createBrowserMobileRemotePlatform(): MobileRemotePlatform {
       version: "0.1.0",
       defaultDeviceLabel: "ORG2 Mobile",
     },
-    runtime,
+    runtime: {
+      ...runtime,
+      readPreference: (key) => localStorage.getItem(key),
+      writePreference: (key, value) => localStorage.setItem(key, value),
+    },
     auth: {
       createClient: () =>
         createBrowserMobileAuthClient({
diff --git a/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.test.ts b/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.test.ts
index b9ad42615e..2dccc1b8f6 100644
--- a/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.test.ts
+++ b/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.test.ts
@@ -263,6 +263,11 @@ describe("createTauriMobileRemotePlatformWithBridge", () => {
       wsUrl: "wss://relay.example/a",
       desktopId: "desktop-a",
       deviceLabel: "Home Mac",
+      desktopIdentity: {
+        name: "Office Mac",
+        model: "Mac14,7",
+        username: "alex",
+      },
       deviceToken: "secret-a",
     });
     first.controller.dispose();
@@ -273,8 +278,25 @@ describe("createTauriMobileRemotePlatformWithBridge", () => {
     ).resolves.toMatchObject({
       desktopId: "desktop-a",
       deviceLabel: "Home Mac",
+      desktopIdentity: {
+        name: "Office Mac",
+        model: "Mac14,7",
+        username: "alex",
+      },
       deviceToken: "secret-a",
     });
+    await expect(
+      second.platform.connection.listPairedDesktops("local-development")
+    ).resolves.toEqual([
+      expect.objectContaining({
+        name: "Office Mac",
+        desktopIdentity: {
+          name: "Office Mac",
+          model: "Mac14,7",
+          username: "alex",
+        },
+      }),
+    ]);
     second.controller.dispose();
   });
 
diff --git a/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.ts b/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.ts
index fa6bde8fdb..51f6654968 100644
--- a/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.ts
+++ b/src/modules/MobileRemote/platform/tauri/tauriMobileRemotePlatform.ts
@@ -16,6 +16,7 @@ import type {
   MobileRemotePlatform,
   MobileRemoteRuntimePort,
 } from "../types";
+import { writeClipboardText } from "../writeClipboardText";
 import { createNativeSocketPreparation } from "./nativeSocketPreparation";
 import { createTauriMobileAuthClient } from "./tauriMobileAuthClient";
 import type {
@@ -212,6 +213,7 @@ export async function createTauriMobileRemotePlatformWithBridge({
 
   const platform: MobileRemotePlatform = {
     kind: "ios",
+    writeClipboardText,
     scanQr: (video, signal) =>
       import("../scanCameraQr").then(({ scanCameraQr }) =>
         scanCameraQr(video, signal)
@@ -350,6 +352,9 @@ function createDefaultRuntime(): MobileRemoteRuntimePort {
   return {
     now: () => Date.now(),
     random: () => Math.random(),
+    readPreference: (key) => globalThis.localStorage.getItem(key),
+    writePreference: (key, value) =>
+      globalThis.localStorage.setItem(key, value),
     randomUUID: () => globalThis.crypto.randomUUID(),
     setTimeout: (callback, delayMs) =>
       globalThis.document.defaultView!.setTimeout(callback, delayMs),
diff --git a/src/modules/MobileRemote/platform/types.ts b/src/modules/MobileRemote/platform/types.ts
index fc7339c723..d85b227109 100644
--- a/src/modules/MobileRemote/platform/types.ts
+++ b/src/modules/MobileRemote/platform/types.ts
@@ -8,6 +8,8 @@ import type {
 export type MobileRemoteIntentEvent = "auth_callback" | "pairing";
 
 export interface MobileRemoteRuntimePort {
+  readPreference?(key: string): string | null;
+  writePreference?(key: string, value: string): void;
   now(): number;
   random(): number;
   randomUUID(): string;
@@ -68,6 +70,8 @@ export interface MobileRemoteConnectionPort {
  * Tauri globals. Platform shells own credentials, navigation and lifecycle.
  */
 export interface MobileRemotePlatform {
+  /** Optional for alternate shells without clipboard access; invoked by user gesture only. */
+  writeClipboardText?(text: string): Promise<void>;
   /** User-initiated, one-shot scan. Aborting must release the camera. */
   scanQr?(video: HTMLVideoElement, signal: AbortSignal): Promise<string>;
   /** Opens an external page using the shell's navigation implementation. */
diff --git a/src/modules/MobileRemote/platform/writeClipboardText.test.ts b/src/modules/MobileRemote/platform/writeClipboardText.test.ts
new file mode 100644
index 0000000000..beb640fc3f
--- /dev/null
+++ b/src/modules/MobileRemote/platform/writeClipboardText.test.ts
@@ -0,0 +1,46 @@
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { writeClipboardText } from "./writeClipboardText";
+
+afterEach(() => vi.restoreAllMocks());
+
+describe("mobile shell clipboard adapter", () => {
+  it("writes through the Web Clipboard API without reading it", async () => {
+    const writeText = vi.fn().mockResolvedValue(undefined);
+    Object.defineProperty(navigator, "clipboard", {
+      configurable: true,
+      value: { writeText },
+    });
+    await writeClipboardText("exact code\n");
+    expect(writeText).toHaveBeenCalledWith("exact code\n");
+  });
+
+  it("propagates permission failure instead of claiming success", async () => {
+    Object.defineProperty(navigator, "clipboard", {
+      configurable: true,
+      value: { writeText: vi.fn().mockRejectedValue(new Error("denied")) },
+    });
+    await expect(writeClipboardText("code")).rejects.toThrow("denied");
+  });
+
+  it("cleans the legacy fallback and restores focus on failure", async () => {
+    Object.defineProperty(navigator, "clipboard", {
+      configurable: true,
+      value: undefined,
+    });
+    Object.defineProperty(document, "execCommand", {
+      configurable: true,
+      value: vi.fn(() => false),
+    });
+    const button = document.createElement("button");
+    document.body.append(button);
+    button.focus();
+    await expect(writeClipboardText("code")).rejects.toThrow(
+      "Clipboard write failed"
+    );
+    expect(document.querySelector("textarea")).toBeNull();
+    expect(document.activeElement).toBe(button);
+    button.remove();
+  });
+});
diff --git a/src/modules/MobileRemote/platform/writeClipboardText.ts b/src/modules/MobileRemote/platform/writeClipboardText.ts
new file mode 100644
index 0000000000..171c719796
--- /dev/null
+++ b/src/modules/MobileRemote/platform/writeClipboardText.ts
@@ -0,0 +1,34 @@
+/** Called directly from a user gesture in both Safari and the iOS WebView. */
+export async function writeClipboardText(text: string): Promise<void> {
+  if (globalThis.navigator.clipboard?.writeText) {
+    await globalThis.navigator.clipboard.writeText(text);
+    return;
+  }
+
+  // Older WebViews lack the async API. Keep the fallback synchronous so the
+  // original user gesture remains valid, and always restore focus/selection.
+  const document = globalThis.document;
+  const focused = document.activeElement as HTMLElement | null;
+  const selection = document.getSelection();
+  const ranges = selection
+    ? Array.from({ length: selection.rangeCount }, (_, index) =>
+        selection.getRangeAt(index).cloneRange()
+      )
+    : [];
+  const textarea = document.createElement("textarea");
+  textarea.value = text;
+  textarea.style.position = "fixed";
+  textarea.style.opacity = "0";
+  document.body.appendChild(textarea);
+  try {
+    textarea.focus();
+    textarea.select();
+    if (!document.execCommand("copy"))
+      throw new Error("Clipboard write failed");
+  } finally {
+    textarea.remove();
+    focused?.focus({ preventScroll: true });
+    selection?.removeAllRanges();
+    for (const range of ranges) selection?.addRange(range);
+  }
+}
diff --git a/src/modules/MobileRemote/screens/ConnectingLiveBridge.test.ts b/src/modules/MobileRemote/screens/ConnectingLiveBridge.test.ts
index 18cce1c98e..2a14eda2ea 100644
--- a/src/modules/MobileRemote/screens/ConnectingLiveBridge.test.ts
+++ b/src/modules/MobileRemote/screens/ConnectingLiveBridge.test.ts
@@ -21,6 +21,7 @@ import { ConnectingLiveBridge } from "./ConnectingLiveBridge";
 const mocks = vi.hoisted(() => ({
   connectLive: vi.fn(),
   refreshSessions: vi.fn(),
+  connection: { status: "connecting" },
 }));
 
 const TestMobileRemotePlatformProvider =
@@ -37,6 +38,7 @@ vi.mock("../app", () => ({
   useMobileRemote: () => ({
     connectLive: mocks.connectLive,
     refreshSessions: mocks.refreshSessions,
+    connection: mocks.connection,
   }),
 }));
 
@@ -81,6 +83,7 @@ describe("ConnectingLiveBridge", () => {
   });
 
   beforeEach(() => {
+    mocks.connection.status = "connecting";
     container = document.createElement("div");
     document.body.appendChild(container);
     root = createRoot(container);
@@ -199,4 +202,21 @@ describe("ConnectingLiveBridge", () => {
       vi.useRealTimers();
     }
   });
+
+  it("finishes once a confirmed device recovers after the first attempt failed", async () => {
+    const onComplete = vi.fn();
+    const platform = createBrowserMobileRemotePlatform();
+    const config = { wsUrl: "wss://relay.example.com/v1/mobile/ws" };
+    mocks.connectLive.mockRejectedValueOnce(new Error("desktop is offline"));
+    await act(async () =>
+      root.render(renderBridge(platform, config, onComplete))
+    );
+    expect(onComplete).not.toHaveBeenCalled();
+    mocks.connection.status = "connected";
+    await act(async () =>
+      root.render(renderBridge(platform, config, onComplete))
+    );
+    expect(onComplete).toHaveBeenCalledOnce();
+    expect(mocks.connectLive).toHaveBeenCalledOnce();
+  });
 });
diff --git a/src/modules/MobileRemote/screens/ConnectingLiveBridge.tsx b/src/modules/MobileRemote/screens/ConnectingLiveBridge.tsx
index d2618fc572..0479632fa0 100644
--- a/src/modules/MobileRemote/screens/ConnectingLiveBridge.tsx
+++ b/src/modules/MobileRemote/screens/ConnectingLiveBridge.tsx
@@ -1,4 +1,6 @@
-import React, { useCallback, useEffect, useRef } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+
+import { createLogger } from "@src/hooks/logger";
 
 import { useMobileRemote } from "../app";
 import type { MobileConnectionConfig } from "../connection/types";
@@ -17,9 +19,12 @@ export function ConnectingLiveBridge({
   demoMode,
   onComplete,
 }: ConnectingLiveBridgeProps) {
-  const { connectLive } = useMobileRemote();
+  const { connectLive, connection } = useMobileRemote();
   const { runtime } = useMobileRemotePlatform();
   const startedRef = useRef(false);
+  const [failedAttempt, setFailedAttempt] =
+    useState<MobileConnectionConfig | null>(null);
+  const completedRef = useRef(false);
 
   const runDemoConnecting = useCallback(() => {
     const timer = runtime.setTimeout(onComplete, 900);
@@ -28,8 +33,21 @@ export function ConnectingLiveBridge({
 
   useEffect(() => {
     startedRef.current = false;
+    completedRef.current = false;
   }, [pendingConfig]);
 
+  useEffect(() => {
+    if (
+      failedAttempt &&
+      failedAttempt === pendingConfig &&
+      !completedRef.current &&
+      connection.status === "connected"
+    ) {
+      completedRef.current = true;
+      onComplete();
+    }
+  }, [failedAttempt, pendingConfig, connection.status, onComplete]);
+
   // The demo timer and the live connect are separate attempts with separate
   // inputs. Keeping them in one effect put demoMode in the live path's
   // dependencies, and connectLive clears demoMode partway through pairing:
@@ -52,11 +70,14 @@ export function ConnectingLiveBridge({
       try {
         await connectLive(pendingConfig);
         if (cancelled) return;
+        completedRef.current = true;
         onComplete();
       } catch {
         // ConnectionErrorScreen handles connection.status === "error".
+        // A confirmed device may instead be waiting for Desktop to restart.
+        if (!cancelled) setFailedAttempt(pendingConfig);
       }
-    })();
+    })().catch((error) => logger.warn("Background operation failed", error));
 
     return () => {
       cancelled = true;
@@ -67,3 +88,5 @@ export function ConnectingLiveBridge({
 }
 
 ConnectingLiveBridge.displayName = "ConnectingLiveBridge";
+
+const logger = createLogger("ConnectingLiveBridge");
diff --git a/src/modules/MobileRemote/screens/ConnectingScreen.tsx b/src/modules/MobileRemote/screens/ConnectingScreen.tsx
index 8c60417f02..4de4ca3fc9 100644
--- a/src/modules/MobileRemote/screens/ConnectingScreen.tsx
+++ b/src/modules/MobileRemote/screens/ConnectingScreen.tsx
@@ -4,21 +4,24 @@ import { useTranslation } from "react-i18next";
 import { Placeholder } from "@src/components/Placeholder";
 
 export interface ConnectingScreenProps {
+  restoring?: boolean;
   /** @deprecated Demo-only timer path — live connect is driven by ConnectingLiveBridge. */
   onComplete?: () => void;
   delayMs?: number;
 }
 
 /** M-03 Connecting */
-export function ConnectingScreen(_props: ConnectingScreenProps) {
+export function ConnectingScreen({ restoring = false }: ConnectingScreenProps) {
   const { t } = useTranslation("mobileRemote");
 
   return (
-    <div className="flex flex-1 items-center justify-center px-6">
+    <div className="mobile-flow-screen mobile-flow-screen--centered flex flex-1 flex-col items-center px-6">
       <Placeholder
         variant="loading"
-        title={t("pairing.connectingTitle")}
-        subtitle={t("pairing.connectingSubtitle")}
+        title={t(
+          restoring ? "connection.restoring" : "pairing.connectingTitle"
+        )}
+        subtitle={restoring ? undefined : t("pairing.connectingSubtitle")}
       />
     </div>
   );
diff --git a/src/modules/MobileRemote/screens/ConnectionErrorScreen.test.ts b/src/modules/MobileRemote/screens/ConnectionErrorScreen.test.ts
new file mode 100644
index 0000000000..e8e5af1995
--- /dev/null
+++ b/src/modules/MobileRemote/screens/ConnectionErrorScreen.test.ts
@@ -0,0 +1,56 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { expect, it, vi } from "vitest";
+
+import { ConnectionErrorScreen } from "./ConnectionErrorScreen";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+it("offers separate retry and re-pair actions, disables both during recovery, and announces failure", () => {
+  const environment = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+  };
+  const previous = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  const container = document.createElement("div");
+  const root = createRoot(container);
+  const onRetry = vi.fn();
+  const onRepair = vi.fn();
+  try {
+    act(() =>
+      root.render(
+        React.createElement(ConnectionErrorScreen, { onRetry, onRepair })
+      )
+    );
+    const buttons = container.querySelectorAll("button");
+    act(() => buttons[0].click());
+    expect(onRetry).toHaveBeenCalledOnce();
+    expect(onRepair).not.toHaveBeenCalled();
+    act(() => buttons[1].click());
+    expect(onRepair).toHaveBeenCalledOnce();
+    act(() =>
+      root.render(
+        React.createElement(ConnectionErrorScreen, {
+          onRetry,
+          onRepair,
+          busy: true,
+          actionError: "retry",
+        })
+      )
+    );
+    expect(
+      Array.from(container.querySelectorAll("button")).every(
+        (button) => button.disabled
+      )
+    ).toBe(true);
+    expect(container.querySelector('[role="alert"]')?.textContent).toContain(
+      "connectionRecovery.retryFailed"
+    );
+  } finally {
+    act(() => root.unmount());
+    environment.IS_REACT_ACT_ENVIRONMENT = previous;
+  }
+});
diff --git a/src/modules/MobileRemote/screens/ConnectionErrorScreen.tsx b/src/modules/MobileRemote/screens/ConnectionErrorScreen.tsx
index a47d1e4831..2666c69173 100644
--- a/src/modules/MobileRemote/screens/ConnectionErrorScreen.tsx
+++ b/src/modules/MobileRemote/screens/ConnectionErrorScreen.tsx
@@ -9,28 +9,50 @@ import { MobileActionButton } from "../components/MobileActionButton";
 export interface ConnectionErrorScreenProps {
   message?: string;
   onRetry?: () => void;
+  onRepair?: () => void;
+  busy?: boolean;
+  actionError?: "retry" | "repair" | null;
 }
 
 export function ConnectionErrorScreen({
   message,
   onRetry,
+  onRepair,
+  busy = false,
+  actionError,
 }: ConnectionErrorScreenProps) {
   const { t } = useTranslation("mobileRemote");
 
   return (
-    <div className="flex flex-1 flex-col items-center justify-center px-6">
+    <div className="mobile-flow-screen mobile-flow-screen--centered flex flex-1 flex-col items-center px-6">
       <Placeholder
         variant="error"
         title={t("connectionFailed", { defaultValue: "Connection failed" })}
         subtitle={message}
       />
+      {actionError ? (
+        <p role="alert" className="text-error mobile-type-secondary mt-4">
+          {t(`connectionRecovery.${actionError}Failed`)}
+        </p>
+      ) : null}
       {onRetry ? (
         <MobileActionButton
           variant="primary"
           className="mt-6 w-full max-w-xs"
           onClick={onRetry}
+          disabled={busy}
+        >
+          {t("connectionRecovery.retry", { defaultValue: "Reconnect" })}
+        </MobileActionButton>
+      ) : null}
+      {onRepair ? (
+        <MobileActionButton
+          variant="secondary"
+          className="mt-3 w-full max-w-xs"
+          onClick={onRepair}
+          disabled={busy}
         >
-          {t("actions.retry", { ns: "common", defaultValue: "Retry" })}
+          {t("connectionRecovery.repair", { defaultValue: "Pair again" })}
         </MobileActionButton>
       ) : null}
     </div>
diff --git a/src/modules/MobileRemote/screens/QRScanScreen.tsx b/src/modules/MobileRemote/screens/QRScanScreen.tsx
index adcce5985c..0a46b977b8 100644
--- a/src/modules/MobileRemote/screens/QRScanScreen.tsx
+++ b/src/modules/MobileRemote/screens/QRScanScreen.tsx
@@ -91,8 +91,10 @@ export function QRScanScreen({ onBack, onAcceptPairing }: QRScanScreenProps) {
   return (
     <>
       <MobileTopBar title={t("pairing.scanTitle")} onBack={onBack} />
-      <div className="flex flex-1 flex-col px-4 py-4">
-        <p className="mb-3 text-sm text-text-2">{t("pairing.scanHint")}</p>
+      <div className="mobile-flow-screen flex flex-1 flex-col px-4 py-4">
+        <p className="mobile-type-secondary mb-3 text-text-2">
+          {t("pairing.scanHint")}
+        </p>
         {scanning ? (
           <div className="mb-4 flex flex-col gap-3">
             <video
@@ -103,7 +105,7 @@ export function QRScanScreen({ onBack, onAcceptPairing }: QRScanScreenProps) {
               aria-label={t("pairing.cameraPreview")}
               className="aspect-square w-full rounded-xl bg-black object-cover"
             />
-            <p role="status" className="text-sm text-text-2">
+            <p role="status" className="mobile-type-secondary text-text-2">
               {t("pairing.scanning")}
             </p>
             <MobileActionButton
diff --git a/src/modules/MobileRemote/screens/SASConfirmScreen.tsx b/src/modules/MobileRemote/screens/SASConfirmScreen.tsx
index 62ec98a5fb..a9f234e5ae 100644
--- a/src/modules/MobileRemote/screens/SASConfirmScreen.tsx
+++ b/src/modules/MobileRemote/screens/SASConfirmScreen.tsx
@@ -21,10 +21,12 @@ export function SASConfirmScreen({
   return (
     <>
       <MobileTopBar title={t("pairing.sasTitle")} onBack={onBack} />
-      <div className="flex flex-1 flex-col px-4 py-4">
-        <p className="mb-4 text-sm text-text-2">{t("pairing.sasHint")}</p>
+      <div className="mobile-flow-screen flex flex-1 flex-col px-4 py-4">
+        <p className="mobile-type-secondary mb-4 text-text-2">
+          {t("pairing.sasHint")}
+        </p>
         <div className="rounded-lg border border-border-2 bg-bg-2 px-4 py-6 text-center">
-          <p className="font-mono text-xl text-text-1">{phrase}</p>
+          <p className="mobile-type-title font-mono text-text-1">{phrase}</p>
         </div>
         <div className="mt-6">
           <MobileActionButton onClick={onConfirm}>
diff --git a/src/modules/MobileRemote/screens/SessionChatScreen.test.ts b/src/modules/MobileRemote/screens/SessionChatScreen.test.ts
index ab0fdc6118..34823105b8 100644
--- a/src/modules/MobileRemote/screens/SessionChatScreen.test.ts
+++ b/src/modules/MobileRemote/screens/SessionChatScreen.test.ts
@@ -12,24 +12,48 @@ import {
   vi,
 } from "vitest";
 
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import { invalidateMobileSessionIdentities } from "../connection/mobileSessionIdentityCache";
 import type { TranscriptItem } from "../lib/transcriptReducer";
 import { SessionChatScreen } from "./SessionChatScreen";
 
 const mocks = vi.hoisted(() => ({
   context: {} as Record<string, unknown>,
   transcriptProps: null as Record<string, unknown> | null,
+  composerProps: null as Record<string, unknown> | null,
+  permissionProps: null as Record<string, unknown> | null,
 }));
 
 vi.mock("../app", () => ({
   useMobileRemote: () => mocks.context,
 }));
 
+vi.mock("../platform", () => ({
+  useMobileRemotePlatform: () => ({
+    runtime: {
+      isHidden: () => false,
+      subscribeVisibility: () => () => {},
+    },
+  }),
+}));
+
 vi.mock("../components/MobileTopBar", () => ({
   MobileTopBar: () => null,
 }));
+vi.mock("../components/MobileActionButton", () => ({
+  MobileActionButton: (props: Record<string, unknown>) =>
+    React.createElement("button", props),
+}));
 
 vi.mock("../components/composer/MobileComposer", () => ({
-  MobileComposer: () => null,
+  MobileComposer: (props: Record<string, unknown>) => {
+    mocks.composerProps = props;
+    return React.createElement(
+      "div",
+      { "data-testid": "composer" },
+      String(props.disabledReason ?? "")
+    );
+  },
 }));
 
 vi.mock("../components/transcript/ChatTranscript", () => ({
@@ -48,7 +72,10 @@ vi.mock("@src/components/Button", () => ({
 }));
 
 vi.mock("@src/components/PermissionPrompt", () => ({
-  PermissionSheet: () => null,
+  PermissionSheet: (props: Record<string, unknown>) => {
+    mocks.permissionProps = props;
+    return null;
+  },
 }));
 
 vi.mock("@src/icons", () => ({
@@ -100,6 +127,7 @@ function createContext(overrides: Record<string, unknown> = {}) {
       loading: false,
       patching: false,
     },
+    loadSessionModels: vi.fn().mockResolvedValue(undefined),
     setSessionModel: vi.fn().mockResolvedValue(undefined),
     sendMessage: vi.fn(),
     respondPermission: vi.fn(),
@@ -107,6 +135,7 @@ function createContext(overrides: Record<string, unknown> = {}) {
     unsubscribeSession: vi.fn().mockResolvedValue(undefined),
     selectRound: vi.fn(),
     retrySelectedRound: vi.fn(),
+    retryConnection: vi.fn().mockResolvedValue(true),
     ...overrides,
   };
 }
@@ -127,6 +156,7 @@ describe("SessionChatScreen Agent loading state", () => {
     document.body.appendChild(container);
     root = createRoot(container);
     mocks.transcriptProps = null;
+    mocks.composerProps = null;
     mocks.context = createContext();
   });
 
@@ -151,6 +181,407 @@ describe("SessionChatScreen Agent loading state", () => {
     });
   }
 
+  it("mounts combined opening immediately and keeps canonical route replacement on one subscription", async () => {
+    const call = vi.fn();
+    const context = createContext({
+      rpc: { call },
+      openingReady: false,
+      openedSession: {
+        requested: "mirror",
+        sessionId: "old-owner",
+        managed: true,
+      },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionOpen: true, sessionIdentity: true },
+      },
+    });
+    mocks.context = context;
+    const onCanonicalSession = vi.fn();
+    const render = (sessionId: string) =>
+      root.render(
+        React.createElement(SessionChatScreen, {
+          sessionId,
+          sessionName: "Mirror",
+          sendCapability: "read_only",
+          onCanonicalSession,
+        })
+      );
+    await act(async () => render("mirror"));
+    expect(call).not.toHaveBeenCalled();
+    expect(container.textContent).not.toContain("connection.resolvingSession");
+    expect(context.subscribeSession).toHaveBeenCalledWith("mirror");
+    expect(onCanonicalSession).not.toHaveBeenCalled();
+    expect(mocks.composerProps?.disabled).toBe(true);
+    mocks.context = {
+      ...context,
+      openingReady: true,
+      openedSession: { requested: "mirror", sessionId: "owner", managed: true },
+    };
+    await act(async () => render("mirror"));
+    expect(onCanonicalSession).toHaveBeenCalledWith("owner");
+    expect(mocks.composerProps?.disabled).toBe(false);
+    await act(async () => render("owner"));
+    expect(context.subscribeSession).toHaveBeenCalledTimes(1);
+    expect(context.unsubscribeSession).not.toHaveBeenCalled();
+    await act(async () => {
+      await (mocks.composerProps!.onSend as (value: string) => Promise<void>)(
+        "hello"
+      );
+    });
+    expect(context.sendMessage).toHaveBeenCalledWith("owner", "hello", []);
+  });
+
+  it("resolves before chat mounts, then uses one managed id for subscribe/send/model and navigation", async () => {
+    let resolve!: (value: unknown) => void;
+    const call = vi.fn(
+      () =>
+        new Promise((done) => {
+          resolve = done;
+        })
+    );
+    const onCanonicalSession = vi.fn();
+    mocks.context = createContext({
+      rpc: { call },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    await act(async () =>
+      root.render(
+        React.createElement(SessionChatScreen, {
+          sessionId: "mirror",
+          sessionName: "Imported mirror",
+          sendCapability: "read_only",
+          onCanonicalSession,
+        })
+      )
+    );
+    expect(mocks.context.subscribeSession).not.toHaveBeenCalled();
+    expect(mocks.composerProps).toBeNull();
+    expect(container.textContent).toContain("connection.resolvingSession");
+    expect(container.textContent).not.toContain("transcript.loading");
+    expect(container.querySelector(".mobile-loading-dots")).not.toBeNull();
+    await act(async () =>
+      resolve({ sessionId: "cliagent-owner", managed: true })
+    );
+    expect(onCanonicalSession).toHaveBeenCalledWith("cliagent-owner");
+    expect(mocks.context.subscribeSession).toHaveBeenCalledWith(
+      "cliagent-owner"
+    );
+    expect(mocks.composerProps?.disabled).toBe(false);
+    await act(async () => {
+      await (mocks.composerProps?.onSend as (text: string) => Promise<void>)(
+        "hello"
+      );
+      await (
+        mocks.composerProps?.modelPicker as {
+          onSelect: (option: unknown) => Promise<void>;
+        }
+      ).onSelect({ id: "model", accountId: "account" });
+    });
+    expect(mocks.context.sendMessage).toHaveBeenCalledWith(
+      "cliagent-owner",
+      "hello",
+      []
+    );
+    expect(mocks.context.setSessionModel).toHaveBeenCalledWith(
+      "cliagent-owner",
+      { id: "model", accountId: "account" }
+    );
+  });
+
+  it("reopens a resolved conversation without another identity request or confirmation gate", async () => {
+    const call = vi
+      .fn()
+      .mockResolvedValue({ sessionId: "owner", managed: true });
+    const rpc: MobileRpcClient = {
+      call,
+      notify: vi.fn(),
+      close: vi.fn(),
+      readyState: 1,
+      onNotification: () => () => {},
+    };
+    const context = createContext({
+      rpc,
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "read_only",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    mocks.context = context;
+    await renderScreen();
+    await act(async () => root.render(null));
+    mocks.composerProps = null;
+    await renderScreen();
+    expect(call).toHaveBeenCalledOnce();
+    expect(container.textContent).not.toContain("connection.resolvingSession");
+    expect(
+      container.querySelector('[data-testid="chat-transcript"]')
+    ).not.toBeNull();
+    expect(mocks.composerProps).toMatchObject({ disabled: true });
+    expect(context.sendMessage).not.toHaveBeenCalled();
+    expect(context.subscribeSession).toHaveBeenCalledTimes(2);
+
+    await act(async () => root.render(null));
+    invalidateMobileSessionIdentities(rpc);
+    call.mockResolvedValueOnce({
+      sessionId: "replacement-owner",
+      managed: true,
+    });
+    await renderScreen();
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(context.subscribeSession).toHaveBeenLastCalledWith(
+      "replacement-owner"
+    );
+  });
+
+  it("shares an unresolved request across exit and reentry without aborting the new consumer", async () => {
+    let finish!: (value: unknown) => void;
+    const call = vi.fn(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve;
+        })
+    );
+    const context = createContext({
+      rpc: { call },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    mocks.context = context;
+    await renderScreen();
+    await act(async () => root.render(null));
+    await renderScreen();
+    expect(call).toHaveBeenCalledOnce();
+    expect(context.subscribeSession).not.toHaveBeenCalled();
+    await act(async () => finish({ sessionId: "owner", managed: true }));
+    expect(context.subscribeSession).toHaveBeenCalledOnce();
+    expect(context.subscribeSession).toHaveBeenCalledWith("owner");
+  });
+
+  it("retries a failed identity exactly once when the same relay connection recovers", async () => {
+    const call = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("desktop is offline"))
+      .mockResolvedValueOnce({ sessionId: "recovered-owner", managed: true });
+    const context = createContext({
+      rpc: { call },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    mocks.context = context;
+    await renderScreen();
+    expect(container.querySelector('[role="alert"]')).not.toBeNull();
+    expect(context.subscribeSession).not.toHaveBeenCalled();
+
+    mocks.context = {
+      ...context,
+      connection: { ...context.connection, presence: "offline" },
+    };
+    await renderScreen();
+    expect(container.textContent).toContain("connection.reconnecting");
+    expect(call).toHaveBeenCalledTimes(1);
+    mocks.context = context;
+    await renderScreen();
+    await renderScreen();
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(context.subscribeSession).toHaveBeenCalledOnce();
+    expect(context.subscribeSession).toHaveBeenCalledWith("recovered-owner");
+    expect(
+      container.querySelector('[data-testid="chat-transcript"]')
+    ).not.toBeNull();
+  });
+
+  it("cancels an offline identity attempt and rejects its late result after recovery", async () => {
+    let finishOld!: (value: unknown) => void;
+    const call = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise((done) => {
+            finishOld = done;
+          })
+      )
+      .mockResolvedValueOnce({ sessionId: "new-owner", managed: true });
+    const context = createContext({
+      rpc: { call },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    mocks.context = context;
+    await renderScreen();
+    const signal = call.mock.calls[0][2] as AbortSignal;
+    mocks.context = {
+      ...context,
+      connection: { ...context.connection, presence: "offline" },
+    };
+    await renderScreen();
+    expect(signal.aborted).toBe(true);
+    mocks.context = context;
+    await renderScreen();
+    await act(async () =>
+      finishOld({ sessionId: "stale-owner", managed: true })
+    );
+    expect(context.subscribeSession).toHaveBeenCalledOnce();
+    expect(context.subscribeSession).toHaveBeenCalledWith("new-owner");
+    expect(context.sendMessage).not.toHaveBeenCalled();
+  });
+
+  it("offers provider-owned reconnect during identity loading and keeps a resolved chat readable offline", async () => {
+    let resolve!: (value: unknown) => void;
+    const call = vi.fn(
+      () =>
+        new Promise((done) => {
+          resolve = done;
+        })
+    );
+    const context = createContext({
+      rpc: { call },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    mocks.context = context;
+    await renderScreen();
+    await act(async () => container.querySelector("button")!.click());
+    expect(context.retryConnection).toHaveBeenCalledOnce();
+    expect(context.subscribeSession).not.toHaveBeenCalled();
+    await act(async () => resolve({ sessionId: "owner", managed: true }));
+    mocks.context = {
+      ...context,
+      connection: { ...context.connection, presence: "offline" },
+    };
+    await renderScreen();
+    expect(
+      container.querySelector('[data-testid="chat-transcript"]')
+    ).not.toBeNull();
+    expect(mocks.composerProps?.disabled).toBe(true);
+    expect(context.subscribeSession).toHaveBeenCalledOnce();
+    expect(context.subscribeSession).toHaveBeenCalledWith("owner");
+  });
+
+  it("does not mount a writable chat on resolution failure and supports explicit retry", async () => {
+    const call = vi
+      .fn()
+      .mockRejectedValueOnce(new Error("ambiguous owner"))
+      .mockResolvedValueOnce({ sessionId: "session-a", managed: false });
+    mocks.context = createContext({
+      rpc: { call },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    await renderScreen();
+    expect(mocks.context.subscribeSession).not.toHaveBeenCalled();
+    expect(container.querySelector('[role="alert"]')).not.toBeNull();
+    await act(async () => container.querySelector("button")!.click());
+    expect(mocks.context.subscribeSession).toHaveBeenCalledWith("session-a");
+    expect(call).toHaveBeenCalledTimes(2);
+  });
+
+  it("ignores a previous connection's late identity response", async () => {
+    let finishOld!: (value: unknown) => void;
+    const connection = {
+      status: "connected",
+      presence: "online",
+      tier: "full",
+      capabilities: { sessionIdentity: true },
+    };
+    const subscribeSession = vi.fn().mockResolvedValue(undefined);
+    mocks.context = createContext({
+      connection,
+      subscribeSession,
+      rpc: {
+        call: vi.fn(
+          () =>
+            new Promise((done) => {
+              finishOld = done;
+            })
+        ),
+      },
+    });
+    await renderScreen();
+    mocks.context = createContext({
+      connection,
+      subscribeSession,
+      rpc: {
+        call: vi
+          .fn()
+          .mockResolvedValue({ sessionId: "new-owner", managed: true }),
+      },
+    });
+    await renderScreen();
+    await act(async () => finishOld({ sessionId: "old-owner", managed: true }));
+    expect(subscribeSession).toHaveBeenCalledTimes(1);
+    expect(subscribeSession).toHaveBeenLastCalledWith("new-owner");
+  });
+
+  it("keeps device read-only permission after resolving a managed mirror", async () => {
+    mocks.context = createContext({
+      rpc: {
+        call: vi
+          .fn()
+          .mockResolvedValue({ sessionId: "managed", managed: true }),
+      },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "read_only",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    await renderScreen();
+    expect(mocks.context.subscribeSession).toHaveBeenCalledWith("managed");
+    expect(mocks.composerProps?.disabled).toBe(true);
+    expect(mocks.composerProps?.disabledReason).toBe("composerDeviceReadOnly");
+    expect(mocks.context.sendMessage).not.toHaveBeenCalled();
+  });
+
+  it("rejects malformed identity responses without falling back to the imported write path", async () => {
+    mocks.context = createContext({
+      rpc: {
+        call: vi.fn().mockResolvedValue({ sessionId: "", managed: true }),
+      },
+      connection: {
+        status: "connected",
+        presence: "online",
+        tier: "full",
+        capabilities: { sessionIdentity: true },
+      },
+    });
+    await renderScreen();
+    expect(mocks.context.subscribeSession).not.toHaveBeenCalled();
+    expect(mocks.context.sendMessage).not.toHaveBeenCalled();
+    expect(mocks.composerProps).toBeNull();
+    expect(container.querySelector('[role="alert"]')).not.toBeNull();
+  });
+
   it("shows loading only until the current turn paints Agent output", async () => {
     await renderScreen();
     expect(mocks.transcriptProps?.waitingForAgent).toBe(true);
@@ -179,4 +610,128 @@ describe("SessionChatScreen Agent loading state", () => {
     await renderScreen();
     expect(mocks.transcriptProps?.waitingForAgent).toBe(false);
   });
+  it("marks only the successfully loaded current session; never loading/error/old-session or unsupported/offline views", async () => {
+    const markVisited = vi.fn();
+    for (const [phase, transcriptSessionId, online, supported, shouldMark] of [
+      ["loading", "session-a", true, true, false],
+      ["error", "session-a", true, true, false],
+      ["ready", "previous-session", true, true, false],
+      ["ready", "session-a", false, true, false],
+      ["ready", "session-a", true, false, false],
+      ["ready", "session-a", true, true, true],
+      ["empty", "session-a", true, true, true],
+    ]) {
+      markVisited.mockClear();
+      mocks.context = createContext({
+        readStateSync: { markVisited },
+        transcriptPhase: phase,
+        transcriptSessionId,
+        connection: {
+          status: "connected",
+          presence: online ? "online" : "offline",
+          tier: "read_only",
+          capabilities: { sessionReadState: supported },
+        },
+      });
+      await renderScreen();
+      expect(markVisited).toHaveBeenCalledTimes(shouldMark ? 1 : 0);
+      if (shouldMark) expect(markVisited).toHaveBeenCalledWith("session-a");
+    }
+  });
+
+  it.each([
+    ["online", "full", false, undefined],
+    ["offline", "full", true, "composerOffline"],
+    ["online", "read_only", true, "composerDeviceReadOnly"],
+    ["offline", "read_only", true, "composerDeviceReadOnly"],
+  ])(
+    "distinguishes %s connectivity from %s device permissions",
+    async (presence, tier, disabled, reason) => {
+      mocks.context = createContext({
+        connection: { status: "connected", presence, tier },
+      });
+      await renderScreen();
+      expect(mocks.composerProps?.disabled).toBe(disabled);
+      expect(mocks.composerProps?.disabledReason).toBe(reason);
+      if (reason) expect(container.textContent).toContain(reason);
+      expect(mocks.context.sendMessage).not.toHaveBeenCalled();
+    }
+  );
+
+  it("retains the imported-session restriction independently of full device access", async () => {
+    await act(async () =>
+      root.render(
+        React.createElement(SessionChatScreen, {
+          sessionId: "session-a",
+          sessionName: "Imported",
+          sendCapability: "read_only",
+        })
+      )
+    );
+    expect(mocks.composerProps?.disabled).toBe(true);
+    expect(mocks.composerProps?.disabledReason).toBe("composerReadOnly");
+  });
+
+  it("keeps image scope stable offline and credential refresh, but changes it for another desktop or endpoint", async () => {
+    const connection = {
+      status: "connected",
+      presence: "online",
+      tier: "full",
+      capabilities: { sessionImages: true },
+    };
+    const config = {
+      desktopId: "desktop-a",
+      wsUrl: "wss://relay.example/v1/mobile/ws?token=secret",
+    };
+    mocks.context = createContext({ connection, connectionConfig: config });
+    await renderScreen();
+    const scope = mocks.transcriptProps?.imageScope;
+    expect(typeof mocks.transcriptProps?.loadImage).toBe("function");
+    expect(String(scope)).not.toContain("secret");
+    mocks.context = createContext({
+      connection: { ...connection, presence: "offline" },
+      connectionConfig: config,
+    });
+    await renderScreen();
+    expect(mocks.transcriptProps?.loadImage).toBeUndefined();
+    expect(mocks.transcriptProps?.imageScope).toBe(scope);
+    mocks.context = createContext({
+      connection,
+      connectionConfig: {
+        ...config,
+        wsUrl: "wss://relay.example/v1/mobile/ws?ticket=new",
+      },
+    });
+    await renderScreen();
+    expect(mocks.transcriptProps?.imageScope).toBe(scope);
+    mocks.context = createContext({
+      connection,
+      connectionConfig: { ...config, desktopId: "desktop-b" },
+    });
+    await renderScreen();
+    expect(mocks.transcriptProps?.imageScope).not.toBe(scope);
+    mocks.context = createContext({
+      connection,
+      connectionConfig: {
+        ...config,
+        wsUrl: "wss://other.example/v1/mobile/ws",
+      },
+    });
+    await renderScreen();
+    expect(mocks.transcriptProps?.imageScope).not.toBe(scope);
+  });
+
+  it("passes safe approval failure feedback into the active sheet and clears it on recovery", async () => {
+    const activePermission = { sessionId: "session-a", requestId: "request-a" };
+    mocks.context = createContext({ activePermission, permissionFailed: true });
+    await renderScreen();
+    expect(mocks.permissionProps?.open).toBe(true);
+    expect(mocks.permissionProps?.error).toBe("permission.submitFailed");
+    mocks.context = createContext({
+      activePermission,
+      permissionFailed: false,
+    });
+    await renderScreen();
+    expect(mocks.permissionProps?.error).toBeUndefined();
+  });
 });
diff --git a/src/modules/MobileRemote/screens/SessionChatScreen.tsx b/src/modules/MobileRemote/screens/SessionChatScreen.tsx
index ca683b51d8..659ffd4421 100644
--- a/src/modules/MobileRemote/screens/SessionChatScreen.tsx
+++ b/src/modules/MobileRemote/screens/SessionChatScreen.tsx
@@ -1,14 +1,19 @@
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useContext, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import Button from "@src/components/Button";
 import { PermissionSheet } from "@src/components/PermissionPrompt";
-import { HugeiconsIcon, StopCircleIcon } from "@src/icons";
+import { createLogger } from "@src/hooks/logger";
 
 import { useMobileRemote } from "../app";
+import { useMobileSessionIdentity } from "../app/useMobileSessionIdentity";
+import { MobileAuthContext } from "../auth/MobileAuthContext";
+import { MobileActionButton } from "../components/MobileActionButton";
 import { MobileTopBar } from "../components/MobileTopBar";
+import { MobileChangeReview } from "../components/changes/MobileChangeReview";
 import { MobileComposer } from "../components/composer/MobileComposer";
+import { mobileComposerDesktopScope } from "../components/composer/mobileComposerDraftStore";
 import { ChatTranscript } from "../components/transcript/ChatTranscript";
+import { MobileLoadingDots } from "../components/transcript/MobileTranscriptLoading";
 import { RoundNavigator } from "../components/transcript/RoundNavigator";
 import type {
   MobileModelOption,
@@ -20,22 +25,98 @@ export interface SessionChatScreenProps {
   sessionName: string;
   sendCapability?: "native" | "external_codex" | "read_only";
   onBack?: () => void;
-  onOpenStopModal?: () => void;
+  onCanonicalSession?: (sessionId: string) => void;
+}
+
+export function SessionChatScreen(props: SessionChatScreenProps) {
+  const { connection, rpc, retryConnection, openedSession, openingReady } =
+    useMobileRemote();
+  const combinedOpen = connection.capabilities?.sessionOpen === true;
+  const { t } = useTranslation("mobileRemote");
+  const identity = useMobileSessionIdentity(
+    rpc,
+    props.sessionId,
+    connection.capabilities?.sessionIdentity === true && !combinedOpen,
+    connection.presence === "online"
+  );
+  const { onCanonicalSession, sessionId } = props;
+  useEffect(() => {
+    const canonical =
+      combinedOpen && openingReady && openedSession?.requested === sessionId
+        ? openedSession.sessionId
+        : identity.sessionId;
+    if (canonical && canonical !== sessionId) onCanonicalSession?.(canonical);
+  }, [
+    combinedOpen,
+    openingReady,
+    openedSession,
+    identity.sessionId,
+    sessionId,
+    onCanonicalSession,
+  ]);
+  if (!identity.sessionId) {
+    const online = connection.presence === "online";
+    const label = online
+      ? t("connection.resolvingSession")
+      : t("connection.reconnecting");
+    return (
+      <>
+        <MobileTopBar title={props.sessionName} onBack={props.onBack} />
+        <div className="flex flex-1 flex-col items-center justify-center gap-4 px-6">
+          {!identity.error && <MobileLoadingDots label={label} />}
+          <p role={identity.error ? "alert" : undefined}>
+            {online && identity.error
+              ? t("transcript.errorDetail", { message: identity.error })
+              : label}
+          </p>
+          {online && identity.error && (
+            <MobileActionButton onClick={identity.retry}>
+              {t("transcript.retry")}
+            </MobileActionButton>
+          )}
+          <MobileActionButton
+            variant="secondary"
+            onClick={() => {
+              // The provider owns single-flight recovery, credential scope,
+              // and errors; do not retain a second reconnect state here.
+              void retryConnection().catch(() => undefined);
+            }}
+          >
+            {t("connectionRecovery.retry")}
+          </MobileActionButton>
+          {connection.error && (
+            <p role="alert">{t("connectionRecovery.retryFailed")}</p>
+          )}
+        </div>
+      </>
+    );
+  }
+  return (
+    <SessionChatContent
+      {...props}
+      sessionId={identity.sessionId}
+      sendCapability={identity.managed ? "native" : props.sendCapability}
+    />
+  );
 }
 
 /** M-08 Chat + M-11 Permission Sheet (via interaction queue). */
-export function SessionChatScreen({
-  sessionId,
+function SessionChatContent({
+  sessionId: requestedSessionId,
   sessionName,
   sendCapability = "native",
   onBack,
-  onOpenStopModal,
 }: SessionChatScreenProps) {
   const { t } = useTranslation("mobileRemote");
   const {
     connection,
+    connectionConfig,
+    rpc,
+    openedSession,
+    openingReady,
     transcriptItems,
     transcriptPhase,
+    transcriptSessionId,
     transcriptError,
     transcriptTruncated,
     transcriptRounds,
@@ -46,6 +127,7 @@ export function SessionChatScreen({
     activePermission,
     permissionQueueDepth,
     permissionSubmitting,
+    permissionFailed,
     sessionModel,
     sendMessage,
     openSessionFileInDesktop,
@@ -56,26 +138,118 @@ export function SessionChatScreen({
     selectRound,
     retrySelectedRound,
     setSessionModel,
+    loadSessionModels,
+    readStateSync,
   } = useMobileRemote();
+  const combinedOpen = connection.capabilities?.sessionOpen === true;
+  const opened =
+    combinedOpen &&
+    openedSession &&
+    (openedSession.requested === requestedSessionId ||
+      openedSession.sessionId === requestedSessionId)
+      ? openedSession
+      : null;
+  const sessionId =
+    opened && openingReady ? opened.sessionId : requestedSessionId;
+  // Canonical route replacement represents the same opening, not another subscription.
+  const subscriptionKey = opened?.requested ?? requestedSessionId;
   const [modelPickerOpen, setModelPickerOpen] = useState(false);
+  const draftScope = JSON.stringify([
+    mobileComposerDesktopScope(connectionConfig, connection),
+    sessionId,
+  ]);
+  const auth = useContext(MobileAuthContext);
+  const imageEndpointUrl = connectionConfig?.wsUrl;
+  const imageScope = useMemo(() => {
+    let endpoint = "";
+    if (imageEndpointUrl) {
+      try {
+        const url = new URL(imageEndpointUrl);
+        // Cache identity never contains credentials, query tickets or fragments.
+        endpoint = `${url.origin}${url.pathname}`;
+      } catch {
+        endpoint = "invalid-endpoint";
+      }
+    }
+    return JSON.stringify([
+      auth?.session.supabaseUrl,
+      auth?.session.userId,
+      endpoint,
+      connectionConfig?.host,
+      connectionConfig?.port,
+      connectionConfig?.desktopId ?? connection.desktopId,
+    ]);
+  }, [
+    auth?.session.supabaseUrl,
+    auth?.session.userId,
+    imageEndpointUrl,
+    connectionConfig?.host,
+    connectionConfig?.port,
+    connectionConfig?.desktopId,
+    connection.desktopId,
+  ]);
+
+  const loadImage = useCallback(
+    async (eventId: string, imageIndex: number) => {
+      if (!rpc || !activeRoundId) throw new Error("Desktop is unavailable");
+      const response = await rpc.call<{ dataUrl?: unknown }>("session/image", {
+        sessionId,
+        roundId: activeRoundId,
+        eventId,
+        imageIndex,
+      });
+      const url = response?.dataUrl;
+      if (
+        typeof url !== "string" ||
+        url.length > 525000 ||
+        !/^data:image\/jpeg;base64,[A-Za-z0-9+/]+=*$/.test(url)
+      ) {
+        throw new Error("Invalid image response");
+      }
+      return url;
+    },
+    [rpc, sessionId, activeRoundId]
+  );
 
   useEffect(() => {
-    void subscribeSession(sessionId).catch(() => undefined);
+    void subscribeSession(subscriptionKey).catch(() => undefined);
     return () => {
       void unsubscribeSession();
     };
-  }, [sessionId, subscribeSession, unsubscribeSession]);
+  }, [subscriptionKey, subscribeSession, unsubscribeSession]);
 
   const writable =
     connection.status === "connected" &&
     connection.presence === "online" &&
     connection.tier !== "read_only";
-  const sendSupported = sendCapability !== "read_only";
+  useEffect(() => {
+    if (
+      (transcriptPhase === "ready" || transcriptPhase === "empty") &&
+      transcriptSessionId === sessionId &&
+      connection.status === "connected" &&
+      connection.presence === "online" &&
+      connection.capabilities?.sessionReadState === true
+    ) {
+      readStateSync?.markVisited(sessionId);
+    }
+  }, [
+    transcriptPhase,
+    transcriptSessionId,
+    sessionId,
+    connection.status,
+    connection.presence,
+    connection.capabilities?.sessionReadState,
+    readStateSync,
+  ]);
+  const sendSupported =
+    (opened?.managed || sendCapability !== "read_only") &&
+    (!combinedOpen || (Boolean(opened) && openingReady));
   const composerDisabled = !writable || !sendSupported;
   const permissionOpen =
     activePermission != null && activePermission.sessionId === sessionId;
   const canOpenDesktopFile =
     writable &&
+    (!combinedOpen || openingReady) &&
     Boolean(activeRoundId) &&
     connection.capabilities?.openSessionFile === true;
 
@@ -152,27 +326,7 @@ export function SessionChatScreen({
 
   return (
     <>
-      <MobileTopBar
-        title={sessionName}
-        onBack={onBack}
-        trailing={
-          <Button
-            htmlType="button"
-            size="mini"
-            variant="danger"
-            style={{
-              width: "var(--mobile-touch-size)",
-              height: "var(--mobile-touch-size)",
-            }}
-            aria-label={t("stopConfirm.confirm")}
-            onClick={onOpenStopModal}
-            disabled={!writable || !sendSupported}
-            appearance="soft"
-            iconOnly
-            icon={<HugeiconsIcon icon={StopCircleIcon} size={16} />}
-          />
-        }
-      />
+      <MobileTopBar title={sessionName} onBack={onBack} />
       <div className="relative flex min-h-0 flex-1 flex-col bg-chat-container">
         <RoundNavigator
           rounds={transcriptRounds}
@@ -184,22 +338,48 @@ export function SessionChatScreen({
         <ChatTranscript
           sessionId={sessionId}
           roundId={activeRoundId}
+          imageScope={imageScope}
           items={transcriptItems}
           phase={transcriptPhase}
           error={transcriptError}
           forceFollowKey={activeSendStatus?.turnIntentId}
           waitingForAgent={waitingForAgent}
+          footer={
+            connection.capabilities?.changeReview && activeRoundId ? (
+              <MobileChangeReview
+                key={`${sessionId}:${activeRoundId}`}
+                client={rpc}
+                sessionId={sessionId}
+                roundId={activeRoundId}
+                online={connection.presence === "online"}
+                revision={transcriptItems
+                  .filter((item) => item.kind === "tool")
+                  .map((item) => `${item.id}:${item.toolStatus}`)
+                  .join("|")}
+              />
+            ) : undefined
+          }
           onOpenFile={canOpenDesktopFile ? handleOpenDesktopFile : undefined}
           onRetry={handleRetryHistory}
+          loadImage={
+            connection.presence === "online" &&
+            connection.capabilities?.sessionImages
+              ? loadImage
+              : undefined
+          }
         />
         <MobileComposer
+          key={draftScope}
+          draftScope={draftScope}
           disabled={composerDisabled}
           disabledReason={
-            !sendSupported
-              ? t("composerReadOnly")
-              : composerDisabled
-                ? t("composerOffline")
-                : sessionModel.error
+            connection.tier === "read_only"
+              ? t("composerDeviceReadOnly")
+              : !sendSupported
+                ? t("composerReadOnly")
+                : composerDisabled
+                  ? t("composerOffline")
+                  : sessionModel.error
           }
           statusMessage={composerStatus}
           statusTone={
@@ -216,9 +396,26 @@ export function SessionChatScreen({
                   config: sessionModel.config,
                   options: sessionModel.options,
                   loading: sessionModel.loading,
+                  optionsLoading: sessionModel.optionsLoading,
+                  error: sessionModel.optionsError,
+                  onActivate: () => {
+                    void loadSessionModels(sessionId).catch((error) =>
+                      logger.warn("Background operation failed", error)
+                    );
+                  },
+                  onRetry: () => {
+                    void loadSessionModels(sessionId).catch((error) =>
+                      logger.warn("Background operation failed", error)
+                    );
+                  },
                   patching: sessionModel.patching,
                   open: modelPickerOpen,
-                  onOpen: () => setModelPickerOpen(true),
+                  onOpen: () => {
+                    setModelPickerOpen(true);
+                    void loadSessionModels(sessionId).catch((error) =>
+                      logger.warn("Background operation failed", error)
+                    );
+                  },
                   onClose: () => setModelPickerOpen(false),
                   onSelect: handleSelectModel,
                 }
@@ -232,6 +429,10 @@ export function SessionChatScreen({
         desktopName={connection.desktopName}
         queueDepth={permissionQueueDepth}
         submitting={!writable || permissionSubmitting}
+        error={permissionFailed ? t("permission.submitFailed") : undefined}
+        notice={
+          activePermission?.toolArgsTruncated ? t("inbox.truncated") : undefined
+        }
         onAllow={handleAllow}
         onDeny={handleDeny}
         onAlwaysAllow={handleAlwaysAllow}
@@ -242,3 +443,5 @@ export function SessionChatScreen({
 }
 
 SessionChatScreen.displayName = "SessionChatScreen";
+
+const logger = createLogger("SessionChatScreen");
diff --git a/src/modules/MobileRemote/screens/SessionsScreen.features.test.ts b/src/modules/MobileRemote/screens/SessionsScreen.features.test.ts
new file mode 100644
index 0000000000..6af61d50bb
--- /dev/null
+++ b/src/modules/MobileRemote/screens/SessionsScreen.features.test.ts
@@ -0,0 +1,325 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import {
+  type Mock,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from "vitest";
+
+import {
+  type MobileReadStateSync,
+  createMobileReadStateSync,
+} from "../app/mobileReadStateSync";
+import type { MobilePendingInbox } from "../app/useMobilePendingInbox";
+import type {
+  MobileRpcClient,
+  RpcNotificationHandler,
+} from "../connection/mobileRpcClient";
+import type {
+  MobileConnectionState,
+  MobileSessionRow,
+} from "../connection/types";
+import { SessionsScreen } from "./SessionsScreen";
+
+const state = vi.hoisted(() => ({
+  connection: {} as MobileConnectionState,
+  sessions: [] as MobileSessionRow[],
+  pendingInbox: {} as MobilePendingInbox,
+  rpc: null,
+  sessionsHasMore: false,
+  loadMoreSessions: vi.fn(),
+  focusPermission: vi.fn(),
+  readStateSync: undefined as MobileReadStateSync | undefined,
+}));
+vi.mock("../app", () => ({ useMobileRemote: () => state }));
+vi.mock("../platform", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../platform")>();
+  const { createBrowserMobileRemotePlatform } =
+    await import("../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { ...actual, useMobileRemotePlatform: () => platform };
+});
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, options?: { name?: string }) =>
+      options?.name ? `${key} ${options.name}` : key,
+    i18n: { language: "en" },
+  }),
+}));
+
+describe("SessionsScreen feature transitions", () => {
+  let host: HTMLDivElement;
+  let root: ReturnType<typeof createRoot>;
+  let select: Mock<(sessionId: string) => void>;
+  const button = (text: string) =>
+    Array.from(host.querySelectorAll("button")).find((element) =>
+      element.textContent?.includes(text)
+    )!;
+  const render = () =>
+    act(async () =>
+      root.render(
+        React.createElement(SessionsScreen, { onSelectSession: select })
+      )
+    );
+  beforeEach(() => {
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+    host = document.createElement("div");
+    document.body.append(host);
+    root = createRoot(host);
+    select = vi.fn<(sessionId: string) => void>();
+    state.connection = {
+      status: "connected",
+      presence: "online",
+      desktopId: "one",
+      desktopName: "Work Mac",
+      demoMode: false,
+      capabilities: { pendingInteractions: true, sessionSearch: true },
+    };
+    state.sessions = [
+      {
+        id: "session-a",
+        name: "Session A",
+        status: "idle",
+        repoName: "Workspace A",
+      },
+    ];
+    state.pendingInbox = {
+      phase: "syncing",
+      complete: false,
+      items: [],
+      refresh: vi.fn(),
+    };
+    state.focusPermission.mockClear();
+    state.readStateSync = undefined;
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    state.readStateSync?.dispose();
+    host.remove();
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  it("shows unknown rather than zero before the global snapshot is complete", async () => {
+    await render();
+    expect(button("inbox.title").textContent).toContain("inbox.syncing");
+    expect(button("inbox.title").textContent).not.toMatch(/·\s*0/);
+    expect(
+      host.querySelector(
+        '[data-testid="mobile-remote-session-row"] [aria-label="sessions.state.unknown"]'
+      )
+    ).not.toBeNull();
+    state.pendingInbox = {
+      ...state.pendingInbox,
+      phase: "ready",
+      complete: true,
+    };
+    await render();
+    // The compact inbox entry disappears only after a complete, empty snapshot.
+    expect(button("inbox.title")).toBeUndefined();
+    expect(
+      host.querySelector(
+        '[data-testid="mobile-remote-session-row"] [aria-label="sessions.state.idle"]'
+      )
+    ).not.toBeNull();
+  });
+  it("updates the rendered unread dot from push without refreshing the roster or waking a hidden list", async () => {
+    let notify!: RpcNotificationHandler;
+    let visited = false;
+    const call = vi.fn(async () => ({
+      visitedIds: visited ? ["session-a"] : [],
+    }));
+    const client = {
+      call,
+      onNotification: (fn: RpcNotificationHandler) => {
+        notify = fn;
+        return () => undefined;
+      },
+    } as unknown as MobileRpcClient;
+    state.readStateSync = createMobileReadStateSync();
+    state.readStateSync.connect(client, "desktop");
+    state.sessions[0].lifecycleStatus = "completed";
+    await render();
+    expect(
+      host.querySelector('[aria-label="sessions.state.unread"]')
+    ).not.toBeNull();
+    await act(async () => {
+      visited = true;
+      notify("session/read_state_changed", {});
+    });
+    expect(
+      host.querySelector('[aria-label="sessions.state.unread"]')
+    ).toBeNull();
+    expect(call.mock.calls).toHaveLength(2);
+    await act(async () =>
+      root.render(React.createElement(SessionsScreen, { active: false }))
+    );
+    await act(async () => notify("session/read_state_changed", {}));
+    expect(call.mock.calls).toHaveLength(2);
+  });
+
+  it("shows canonical waiting state while the permissions inbox is syncing, then offline on disconnect", async () => {
+    state.sessions[0].lifecycleStatus = "waiting_for_user";
+    await render();
+    expect(
+      host.querySelector('[data-session-status="waiting_for_user"]')
+    ).not.toBeNull();
+    state.connection.presence = "offline";
+    await render();
+    expect(
+      host.querySelector('[data-session-status="offline"]')
+    ).not.toBeNull();
+    expect(
+      host.querySelector('[data-session-status="waiting_for_user"]')
+    ).toBeNull();
+    state.connection.presence = "online";
+    state.sessions[0].lifecycleStatus = "completed";
+    await render();
+    expect(
+      host.querySelector('[data-session-status="completed"]')
+    ).not.toBeNull();
+  });
+
+  it("derives approval state from the global inbox and retains a flat list with workspace metadata", async () => {
+    state.pendingInbox = {
+      ...state.pendingInbox,
+      phase: "ready",
+      complete: true,
+      items: [
+        {
+          kind: "permission",
+          origin: "rust_agent",
+          sessionId: "session-a",
+          requestId: "request-a",
+          toolName: "shell",
+          toolArgs: { command: "pwd" },
+          createdAtMs: 1000,
+        },
+      ],
+    };
+    await render();
+    const row = host.querySelector(
+      '[data-testid="mobile-remote-session-row"]'
+    )!;
+    expect(
+      row.querySelector('[aria-label="sessions.state.awaiting_approval"]')
+    ).not.toBeNull();
+    expect(row.textContent).toContain("Workspace A");
+    expect(host.querySelector('[aria-label="sessions.groupBy"]')).toBeNull();
+    state.pendingInbox = { ...state.pendingInbox, items: [] };
+    await render();
+    expect(
+      row.querySelector('[aria-label="sessions.state.idle"]')
+    ).not.toBeNull();
+  });
+
+  it("keeps pending items readable offline but disables navigation and explains reconnect", async () => {
+    state.pendingInbox = {
+      ...state.pendingInbox,
+      phase: "ready",
+      complete: true,
+      items: [
+        {
+          kind: "permission",
+          origin: "rust_agent",
+          sessionId: "session-a",
+          requestId: "request-a",
+          toolName: "shell",
+          toolArgs: { command: "pwd" },
+          createdAtMs: 1000,
+        },
+      ],
+    };
+    await render();
+    await act(async () => button("inbox.title").click());
+    expect(button("inbox.open").disabled).toBe(false);
+    await act(async () => button("inbox.open").click());
+    expect(select).toHaveBeenCalledWith("session-a");
+    expect(state.focusPermission).toHaveBeenCalledWith("request-a");
+    select.mockClear();
+    state.connection = { ...state.connection, presence: "offline" };
+    await render();
+    expect(host.textContent).toContain("inbox.offline");
+    expect(button("inbox.open").disabled).toBe(true);
+    await act(async () => button("inbox.open").click());
+    expect(select).not.toHaveBeenCalled();
+    expect(host.textContent).toContain("pwd");
+  });
+
+  it("returns focus to the remounted inbox entry after cancelling the pending list", async () => {
+    await render();
+    await act(async () => button("inbox.title").click());
+    await act(async () => button("inbox.backToSessions").click());
+    expect(document.activeElement).toBe(button("inbox.title"));
+  });
+
+  it("keeps one page heading and returns to the original search trigger on Escape", async () => {
+    await render();
+    const trigger = host.querySelector<HTMLButtonElement>(
+      '[aria-label="search.title"]'
+    )!;
+    await act(async () => trigger.click());
+    expect(host.querySelectorAll("h1")).toHaveLength(1);
+    expect(host.querySelector("h1")?.textContent).toBe("tabs.sessions");
+    expect(host.querySelector("h2")).toBeNull();
+    await act(async () =>
+      host
+        .querySelector("section")!
+        .dispatchEvent(
+          new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
+        )
+    );
+    expect(host.querySelector("h1")?.textContent).toBe("tabs.sessions");
+    expect(document.activeElement).toBe(
+      host.querySelector('[aria-label="search.title"]')
+    );
+  });
+
+  it("search makes computer scope explicit and cancel preserves the original list node and scroll", async () => {
+    await render();
+    const row = host.querySelector(
+      '[data-testid="mobile-remote-session-row"]'
+    )!;
+    const list = row.closest<HTMLDivElement>(".mobile-discovery-scroll")!;
+    list.scrollTop = 320;
+    const searchButton = host.querySelector<HTMLButtonElement>(
+      '[aria-label="search.title"]'
+    )!;
+    await act(async () => searchButton.click());
+    expect(host.textContent).not.toContain("search.scope");
+    expect(list.hidden).toBe(false);
+    await act(async () => button("search.cancel").click());
+    expect(
+      host.querySelector('[data-testid="mobile-remote-session-row"]')
+    ).toBe(row);
+    expect(list.hidden).toBe(false);
+    expect(list.scrollTop).toBe(320);
+    expect(document.activeElement).toBe(
+      host.querySelector('[aria-label="search.title"]')
+    );
+  });
+
+  it("explains unsupported server search instead of sending a legacy unfiltered request", async () => {
+    state.connection = { ...state.connection, capabilities: {} };
+    await render();
+    await act(async () =>
+      host
+        .querySelector<HTMLButtonElement>('[aria-label="search.title"]')!
+        .click()
+    );
+    expect(host.textContent).toContain("search.unsupported");
+    expect(host.querySelector(".mobile-search-scope")).toBeNull();
+    expect(host.querySelector("form")).toBeNull();
+    await act(async () => button("search.cancel").click());
+    expect(host.querySelector('[aria-label="search.title"]')).not.toBeNull();
+    expect(host.textContent).not.toContain("search.unsupported");
+  });
+});
diff --git a/src/modules/MobileRemote/screens/SessionsScreen.redesign.test.ts b/src/modules/MobileRemote/screens/SessionsScreen.redesign.test.ts
new file mode 100644
index 0000000000..04456ec0a5
--- /dev/null
+++ b/src/modules/MobileRemote/screens/SessionsScreen.redesign.test.ts
@@ -0,0 +1,328 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { MobilePendingInbox } from "../app/useMobilePendingInbox";
+import type {
+  MobileConnectionState,
+  MobilePairedDesktopSummary,
+  MobileSessionRow,
+} from "../connection/types";
+import { SessionsScreen } from "./SessionsScreen";
+
+const state = vi.hoisted(() => ({
+  connection: {} as MobileConnectionState,
+  sessions: [] as MobileSessionRow[],
+  pairedDesktops: [] as MobilePairedDesktopSummary[],
+  switchPairedDesktop: vi.fn(),
+  pendingInbox: undefined as MobilePendingInbox | undefined,
+  sessionsHasMore: false,
+  loadMoreSessions: vi.fn(),
+  rpc: null,
+}));
+vi.mock("../app", () => ({ useMobileRemote: () => state }));
+vi.mock("../platform", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../platform")>();
+  const { createBrowserMobileRemotePlatform } =
+    await import("../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { ...actual, useMobileRemotePlatform: () => platform };
+});
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+    i18n: { language: "en" },
+  }),
+}));
+
+describe("SessionsScreen redesigned navigation", () => {
+  let host: HTMLDivElement;
+  let root: ReturnType<typeof createRoot>;
+  const select = vi.fn();
+  const render = (active = true) =>
+    act(async () =>
+      root.render(
+        React.createElement(SessionsScreen, {
+          active,
+          onSelectSession: select,
+          profileAction: React.createElement(
+            "button",
+            { "aria-label": "Account" },
+            "A"
+          ),
+        })
+      )
+    );
+  const click = (element: HTMLElement) => act(async () => element.click());
+  const tabs = () =>
+    Array.from(
+      host.querySelectorAll<HTMLButtonElement>(
+        "[data-testid=mobile-session-device-tab]"
+      )
+    );
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    state.connection = {
+      status: "connected",
+      presence: "online",
+      demoMode: false,
+      desktopId: "mac",
+      desktopName: "MacBook Pro · Alice",
+      capabilities: { sessionSearch: true },
+    };
+    state.sessions = [
+      {
+        id: "today",
+        name: "Today session",
+        status: "idle",
+        repoName: "Workspace A",
+        updatedAtMs: Date.now(),
+      },
+      {
+        id: "older",
+        name: "Older session",
+        status: "idle",
+        repoName: "Workspace B",
+        updatedAtMs: new Date(2020, 0, 1).getTime(),
+      },
+      {
+        id: "unknown",
+        name: "Unknown date",
+        status: "idle",
+        repoName: "Workspace C",
+      },
+    ];
+    state.pairedDesktops = [
+      { id: "mac", name: "MacBook Pro · Alice", active: true, updatedAtMs: 1 },
+      { id: "studio", name: "Mac Studio · Bob", active: false, updatedAtMs: 2 },
+    ];
+    state.pendingInbox = undefined;
+    state.switchPairedDesktop.mockReset();
+    select.mockClear();
+    host = document.createElement("div");
+    document.body.append(host);
+    root = createRoot(host);
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    host.remove();
+    vi.unstubAllGlobals();
+  });
+
+  it("keeps the account left, options menu right, and search outside the header", async () => {
+    await render();
+    const header = host.querySelector("header")!;
+    expect(
+      header.querySelector(
+        ".mobile-top-bar__trailing [aria-label='sessions.viewOptions']"
+      )
+    ).not.toBeNull();
+    expect(
+      header.querySelector(".mobile-top-bar__leading [aria-label='Account']")
+    ).not.toBeNull();
+    expect(header.querySelectorAll("h1")).toHaveLength(1);
+    expect(header.querySelector("[aria-label='search.title']")).toBeNull();
+    const search = host.querySelector<HTMLButtonElement>(
+      "[aria-label='search.title']"
+    )!;
+    expect(search.closest(".mobile-discovery-search--launcher")).not.toBeNull();
+    const searchIcon = search.querySelector(".mobile-search-icon")!;
+    const searchLabel = Array.from(search.children).find(
+      (element) => element.textContent === "search.title"
+    )!;
+    expect(searchLabel).toBeDefined();
+    expect(searchLabel.contains(searchIcon)).toBe(false);
+    expect(searchIcon.parentElement?.parentElement).toBe(search);
+    expect(search.style.borderRadius).toBe("var(--mobile-search-radius)");
+    await click(search);
+    expect(
+      host.querySelector(".mobile-discovery-search form[role=search] input")
+    ).not.toBeNull();
+    expect(host.querySelector("header input")).toBeNull();
+    expect(document.activeElement).toBe(host.querySelector("input"));
+  });
+
+  it("groups canonical sessions by time through the dropdown and returns to the unchanged flat order", async () => {
+    await render();
+    const menu = () =>
+      host.querySelector<HTMLButtonElement>(
+        "[aria-label='sessions.viewOptions']"
+      )!;
+    const option = (mode: string) =>
+      document.querySelector<HTMLElement>(
+        `[data-testid=mobile-group-${mode}]`
+      )!;
+    const original = state.sessions.slice();
+    await click(menu());
+    await click(option("time"));
+    expect(host.textContent).toContain("sessions.groupToday");
+    expect(host.textContent).toContain("sessions.groupEarlier");
+    expect(host.textContent).toContain("sessions.groupUnknown");
+    expect(host.textContent).toContain("Workspace A");
+    const rows = host.querySelectorAll<HTMLButtonElement>(
+      "[data-testid=mobile-remote-session-row]"
+    );
+    await click(rows[1]);
+    expect(select).toHaveBeenCalledWith("older");
+    await click(menu());
+    await click(option("none"));
+    expect(
+      host.querySelector(".mobile-discovery-section-label")?.textContent
+    ).toBe("sessions.all");
+    expect(
+      Array.from(
+        host.querySelectorAll(".mobile-session-row__title"),
+        (node) => node.textContent
+      )
+    ).toEqual(original.map((row) => row.name));
+    expect(state.sessions).toEqual(original);
+  });
+
+  it("groups by workspace, incorporates arriving rows, and preserves the selection through search cancel", async () => {
+    state.sessions[2].repoName = "Workspace A";
+    await render();
+    const menu = () =>
+      host.querySelector<HTMLButtonElement>(
+        "[aria-label='sessions.viewOptions']"
+      )!;
+    const headings = () =>
+      Array.from(
+        host.querySelectorAll(".mobile-discovery-section-label"),
+        (node) => node.textContent
+      );
+    await click(menu());
+    await click(
+      document.querySelector<HTMLElement>(
+        "[data-testid=mobile-group-workspace]"
+      )!
+    );
+    expect(headings()).toEqual(["Workspace A", "Workspace B"]);
+    expect(
+      host.querySelectorAll(".mobile-session-row__workspace")
+    ).toHaveLength(0);
+    expect(host.querySelectorAll(".mobile-session-row__time")).toHaveLength(0);
+    expect(host.querySelectorAll(".mobile-session-row--compact")).toHaveLength(
+      3
+    );
+    expect(host.querySelectorAll(".mobile-session-row__meta")).toHaveLength(0);
+    expect(host.querySelectorAll("[data-session-status]")).toHaveLength(3);
+    expect(state.sessions[0].repoName).toBe("Workspace A");
+    expect(
+      Array.from(
+        host.querySelectorAll(".mobile-session-row__title"),
+        (node) => node.textContent
+      )
+    ).toEqual(["Today session", "Unknown date", "Older session"]);
+    state.sessions = [
+      ...state.sessions,
+      { id: "new", name: "New session", status: "idle" },
+    ];
+    await render();
+    expect(headings()).toEqual([
+      "Workspace A",
+      "Workspace B",
+      "sessions.groupNoWorkspace",
+    ]);
+    await click(
+      host.querySelector<HTMLButtonElement>("[aria-label='search.title']")!
+    );
+    const cancel = Array.from(host.querySelectorAll("button")).find(
+      (button) => button.textContent === "search.cancel"
+    )!;
+    await click(cancel);
+    expect(headings()).toEqual([
+      "Workspace A",
+      "Workspace B",
+      "sessions.groupNoWorkspace",
+    ]);
+    await click(menu());
+    await click(
+      document.querySelector<HTMLElement>("[data-testid=mobile-group-none]")!
+    );
+    expect(headings()).toEqual(["sessions.all"]);
+    expect(host.querySelectorAll(".mobile-session-row__time")).toHaveLength(2);
+    expect(host.querySelectorAll(".mobile-session-row--compact")).toHaveLength(
+      0
+    );
+    expect(
+      host.querySelectorAll(".mobile-session-row__workspace")
+    ).toHaveLength(3);
+    expect(
+      Array.from(
+        host.querySelectorAll(".mobile-session-row__title"),
+        (node) => node.textContent
+      )
+    ).toEqual(state.sessions.map((row) => row.name));
+  });
+
+  it("locks a pending device switch, reports failure, and retries without optimistic device selection", async () => {
+    let reject!: (reason: Error) => void;
+    state.switchPairedDesktop.mockImplementationOnce(
+      () =>
+        new Promise<void>((_resolve, fail) => {
+          reject = fail;
+        })
+    );
+    await render();
+    await click(tabs()[0]);
+    expect(state.switchPairedDesktop).not.toHaveBeenCalled();
+    await act(async () => {
+      tabs()[1].click();
+      tabs()[1].click();
+    });
+    expect(state.switchPairedDesktop).toHaveBeenCalledTimes(1);
+    expect(state.switchPairedDesktop).toHaveBeenCalledWith("studio");
+    expect(tabs().every((tab) => tab.disabled)).toBe(true);
+    expect(tabs()[0].dataset.active).toBe("true");
+    await act(async () => reject(new Error("offline")));
+    expect(host.querySelector("[role=alert]")?.textContent).toBe(
+      "devices.switchFailed"
+    );
+    expect(tabs().every((tab) => !tab.disabled)).toBe(true);
+    state.switchPairedDesktop.mockResolvedValueOnce(undefined);
+    await click(tabs()[1]);
+    expect(state.switchPairedDesktop).toHaveBeenCalledTimes(2);
+    expect(host.querySelector("[role=alert]")).toBeNull();
+    state.pairedDesktops = state.pairedDesktops.map((desktop) => ({
+      ...desktop,
+      active: desktop.id === "studio",
+    }));
+    state.connection = {
+      ...state.connection,
+      desktopId: "studio",
+      desktopName: "Mac Studio · Bob",
+    };
+    await render();
+    expect(tabs()[1].dataset.active).toBe("true");
+  });
+
+  it("shows a single offline/reconnect notice while preserving loaded workspace labels", async () => {
+    state.connection = {
+      ...state.connection,
+      status: "connecting",
+      presence: "offline",
+    };
+    await render();
+    expect(
+      host.querySelectorAll(".mobile-discovery-notice[role=status]")
+    ).toHaveLength(1);
+    expect(host.querySelector(".mobile-discovery-notice")?.textContent).toBe(
+      "connection.reconnecting"
+    );
+    expect(host.textContent).toContain("Workspace A");
+    expect(
+      host.querySelectorAll("[data-testid=mobile-remote-session-row]")
+    ).toHaveLength(3);
+    state.connection = {
+      ...state.connection,
+      status: "connected",
+      presence: "online",
+    };
+    await render();
+    expect(host.querySelector(".mobile-discovery-notice")).toBeNull();
+    await render(false);
+    expect(host.innerHTML).toBe("");
+  });
+});
diff --git a/src/modules/MobileRemote/screens/SessionsScreen.search.test.ts b/src/modules/MobileRemote/screens/SessionsScreen.search.test.ts
new file mode 100644
index 0000000000..f9ed930c4f
--- /dev/null
+++ b/src/modules/MobileRemote/screens/SessionsScreen.search.test.ts
@@ -0,0 +1,433 @@
+// @vitest-environment jsdom
+import React, { act } from "react";
+import { createRoot } from "react-dom/client";
+import {
+  type Mock,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from "vitest";
+
+import type { MobileRpcClient } from "../connection/mobileRpcClient";
+import type { MobileConnectionState } from "../connection/types";
+import { SessionsScreen } from "./SessionsScreen";
+
+const state = vi.hoisted(() => ({
+  connection: {} as MobileConnectionState,
+  rpc: null as MobileRpcClient | null,
+  sessions: [{ id: "recent", name: "Recent session", status: "idle" }],
+  sessionsHasMore: false,
+  loadMoreSessions: vi.fn(),
+}));
+vi.mock("../app", () => ({ useMobileRemote: () => state }));
+vi.mock("../platform", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../platform")>();
+  const { createBrowserMobileRemotePlatform } =
+    await import("../platform/browser");
+  const platform = createBrowserMobileRemotePlatform();
+  return { ...actual, useMobileRemotePlatform: () => platform };
+});
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, values?: { query?: string; name?: string }) =>
+      `${key}${values?.query ? ` ${values.query}` : ""}${values?.name ? ` ${values.name}` : ""}`,
+    i18n: { language: "en" },
+  }),
+}));
+
+function deferred() {
+  let resolve!: (value: unknown) => void;
+  let reject!: (reason: Error) => void;
+  const promise = new Promise((yes, no) => {
+    resolve = yes;
+    reject = no;
+  });
+  return { promise, resolve, reject };
+}
+const page = (name: string, nextOffset = 50, hasMore = false) => ({
+  sessions: [
+    { id: name, name, status: "idle", repoName: "Project", updatedAtMs: 1000 },
+  ],
+  nextOffset,
+  hasMore,
+});
+
+describe("SessionsScreen search recovery", () => {
+  let host: HTMLDivElement;
+  let root: ReturnType<typeof createRoot>;
+  let call: ReturnType<typeof vi.fn>;
+  let select: Mock<(sessionId: string) => void>;
+  const render = (active = true) =>
+    act(async () =>
+      root.render(
+        React.createElement(SessionsScreen, { onSelectSession: select, active })
+      )
+    );
+  const button = (key: string) =>
+    Array.from(host.querySelectorAll("button")).find(
+      (node) => node.textContent === key
+    )!;
+  const openSearch = () =>
+    act(async () =>
+      host
+        .querySelector<HTMLButtonElement>('[aria-label="search.title"]')!
+        .click()
+    );
+  const typeQuery = (value: string) =>
+    act(async () => {
+      const input = host.querySelector("input")!;
+      Object.getOwnPropertyDescriptor(
+        HTMLInputElement.prototype,
+        "value"
+      )!.set!.call(input, value);
+      input.dispatchEvent(new Event("input", { bubbles: true }));
+    });
+  const submit = () =>
+    act(async () => {
+      host
+        .querySelector("form")!
+        .dispatchEvent(
+          new Event("submit", { bubbles: true, cancelable: true })
+        );
+    });
+  beforeEach(() => {
+    vi.useFakeTimers();
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = true;
+    host = document.createElement("div");
+    document.body.append(host);
+    root = createRoot(host);
+    call = vi.fn();
+    select = vi.fn<(sessionId: string) => void>();
+    state.rpc = { call } as unknown as MobileRpcClient;
+    state.connection = {
+      status: "connected",
+      presence: "online",
+      demoMode: false,
+      desktopName: "Work Mac",
+      capabilities: { sessionSearch: true },
+    };
+  });
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    host.remove();
+    vi.useRealTimers();
+    (
+      globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+    ).IS_REACT_ACT_ENVIRONMENT = false;
+  });
+
+  it("keeps workspace labels on search results even when the main list is grouped by workspace", async () => {
+    call.mockResolvedValueOnce(page("Historic session"));
+    await render();
+    await act(async () =>
+      host
+        .querySelector<HTMLButtonElement>(
+          "[aria-label='sessions.viewOptions']"
+        )!
+        .click()
+    );
+    await act(async () =>
+      document
+        .querySelector<HTMLElement>("[data-testid=mobile-group-workspace]")!
+        .click()
+    );
+    await openSearch();
+    await typeQuery("Historic");
+    await act(async () => vi.advanceTimersByTime(200));
+    const row = Array.from(
+      host.querySelectorAll("[data-testid=mobile-remote-session-row]")
+    ).find((node) => node.textContent?.includes("Historic session"))!;
+    expect(
+      row.querySelector(".mobile-session-row__workspace")?.textContent
+    ).toBe("Project");
+    await act(async () => button("search.cancel").click());
+    expect(
+      host.querySelector(".mobile-discovery-section-label")?.textContent
+    ).toBe("sessions.groupNoWorkspace");
+  });
+
+  it("debounces typing in place, shows progress, retries and opens historical results", async () => {
+    const first = deferred();
+    call
+      .mockReturnValueOnce(first.promise)
+      .mockResolvedValueOnce(page("Historic session"));
+    await render();
+    await openSearch();
+    await typeQuery("orig");
+    await act(async () => vi.advanceTimersByTime(150));
+    await typeQuery("original");
+    await act(async () => vi.advanceTimersByTime(199));
+    expect(call).not.toHaveBeenCalled();
+    await act(async () => vi.advanceTimersByTime(1));
+    expect(host.textContent).toContain("search.loading");
+    expect(button("search.submit")).toBeUndefined();
+    expect(host.querySelector("h1")?.textContent).toBe("tabs.sessions");
+    await act(async () => first.reject(new Error("timeout")));
+    expect(host.querySelector('[role="alert"]')?.textContent).toContain(
+      "search.error"
+    );
+    await act(async () => button("search.retry").click());
+    expect(call).toHaveBeenLastCalledWith(
+      "session/list",
+      {
+        query: "original",
+        offset: 0,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+    expect(host.textContent).toContain("search.resultsFor original");
+    expect(host.querySelector("input")?.value).toBe("original");
+    const row = Array.from(
+      host.querySelectorAll<HTMLButtonElement>(
+        '[data-testid="mobile-remote-session-row"]'
+      )
+    ).find((node) => node.textContent?.includes("Historic session"))!;
+    expect(row.textContent).toContain("Project");
+    expect(row.querySelector("time")).not.toBeNull();
+    await act(async () => row.click());
+    expect(select).toHaveBeenCalledWith("Historic session");
+  });
+
+  it("retries the failed next page without restarting or losing the last successful page", async () => {
+    call
+      .mockResolvedValueOnce(page("First page", 125, true))
+      .mockRejectedValueOnce(new Error("network"))
+      .mockResolvedValueOnce(page("Next page", 200));
+    await render();
+    await openSearch();
+    await typeQuery("project");
+    await submit();
+    await act(async () => button("search.next").click());
+    expect(host.textContent).toContain("First page");
+    expect(button("search.next")).toBeUndefined();
+    await act(async () => button("search.retry").click());
+    expect(call).toHaveBeenLastCalledWith(
+      "session/list",
+      {
+        query: "project",
+        offset: 125,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+    expect(host.textContent).toContain("Next page");
+    expect(host.textContent).not.toContain("First page");
+  });
+
+  it("clearing the input cancels loading and never displays its late result", async () => {
+    const request = deferred();
+    call.mockReturnValue(request.promise);
+    await render();
+    await openSearch();
+    await typeQuery("old");
+    await submit();
+    await act(async () =>
+      host
+        .querySelector<HTMLButtonElement>('[aria-label="search.clear"]')!
+        .click()
+    );
+    expect(document.activeElement).toBe(host.querySelector("input"));
+    expect(host.textContent).not.toContain("search.loading");
+    expect(
+      host
+        .querySelector('[data-testid="mobile-remote-session-row"]')
+        ?.closest("[hidden]")
+    ).toBeNull();
+    await act(async () => request.resolve(page("Stale result")));
+    expect(host.textContent).not.toContain("Stale result");
+    expect(host.textContent).not.toContain("search.resultsFor");
+  });
+
+  it("disconnect ends loading, disables retry and recovers explicitly when online", async () => {
+    const request = deferred();
+    call
+      .mockReturnValueOnce(request.promise)
+      .mockResolvedValueOnce({ sessions: [], nextOffset: 0, hasMore: false });
+    await render();
+    await openSearch();
+    await typeQuery("query");
+    await submit();
+    state.connection = { ...state.connection, presence: "offline" };
+    await render();
+    expect(host.textContent).not.toContain("search.loading");
+    expect(host.textContent).toContain("search.offline");
+    expect(button("search.retry").disabled).toBe(true);
+    state.connection = { ...state.connection, presence: "online" };
+    await render();
+    expect(call).toHaveBeenCalledTimes(1);
+    await act(async () => button("search.retry").click());
+    await act(async () => request.resolve(page("Old connection")));
+    expect(host.textContent).toContain("search.empty");
+    expect(host.textContent).not.toContain("Old connection");
+  });
+
+  it("cancel during a request restores the original list and a new query ignores the cancelled result", async () => {
+    const request = deferred();
+    call
+      .mockReturnValueOnce(request.promise)
+      .mockResolvedValueOnce(page("Fresh result"));
+    await render();
+    const list = host
+      .querySelector('[data-testid="mobile-remote-session-row"]')!
+      .closest<HTMLDivElement>(".mobile-discovery-scroll")!;
+    list.scrollTop = 200;
+    await openSearch();
+    await typeQuery("cancelled");
+    await submit();
+    // Browsers may report zero scrollTop while display:none. Keep the visible offset.
+    list.scrollTop = 0;
+    await act(async () => list.dispatchEvent(new Event("scroll")));
+    await act(async () => button("search.cancel").click());
+    expect(list.hidden).toBe(false);
+    expect(list.scrollTop).toBe(200);
+    expect(document.activeElement?.getAttribute("aria-label")).toBe(
+      "search.title"
+    );
+    await openSearch();
+    await typeQuery("fresh");
+    await submit();
+    await act(async () => request.resolve(page("Cancelled result")));
+    expect(host.textContent).toContain("Fresh result");
+    expect(host.textContent).not.toContain("Cancelled result");
+  });
+
+  it("debounces edits and releases an aborted RPC without waiting for its reply", async () => {
+    const old = deferred();
+    call
+      .mockImplementationOnce(
+        (_method, _params, signal: AbortSignal) =>
+          new Promise((resolve, reject) => {
+            signal.addEventListener(
+              "abort",
+              () => reject(new DOMException("Aborted", "AbortError")),
+              { once: true }
+            );
+            void old.promise.then(resolve, reject);
+          })
+      )
+      .mockResolvedValueOnce(page("Latest"));
+    await render();
+    await openSearch();
+    await typeQuery("old");
+    await act(async () => vi.advanceTimersByTime(200));
+    await typeQuery("middle");
+    await act(async () => vi.advanceTimersByTime(100));
+    await typeQuery("latest");
+    await act(async () => vi.advanceTimersByTime(200));
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(host.textContent).toContain("Latest");
+    await act(async () => old.resolve(page("Stale")));
+    expect(call).toHaveBeenCalledTimes(2);
+    expect(call).toHaveBeenLastCalledWith(
+      "session/list",
+      {
+        query: "latest",
+        offset: 0,
+        limit: 50,
+      },
+      expect.any(AbortSignal)
+    );
+    expect(host.textContent).toContain("Latest");
+    expect(host.textContent).not.toContain("Stale");
+  });
+
+  it("waits for Chinese composition and Enter flushes only once", async () => {
+    call.mockResolvedValue(page("中文结果"));
+    await render();
+    await openSearch();
+    await act(async () =>
+      host
+        .querySelector("input")!
+        .dispatchEvent(
+          new CompositionEvent("compositionstart", { bubbles: true })
+        )
+    );
+    await typeQuery("中文");
+    await act(async () =>
+      host.querySelector("input")!.dispatchEvent(
+        new KeyboardEvent("keydown", {
+          key: "Escape",
+          isComposing: true,
+          bubbles: true,
+        })
+      )
+    );
+    expect(host.querySelector("input")).not.toBeNull();
+    await act(async () => vi.advanceTimersByTime(500));
+    await submit();
+    expect(call).not.toHaveBeenCalled();
+    await act(async () =>
+      host
+        .querySelector("input")!
+        .dispatchEvent(
+          new CompositionEvent("compositionend", { bubbles: true })
+        )
+    );
+    await submit();
+    await act(async () => vi.advanceTimersByTime(500));
+    expect(call).toHaveBeenCalledTimes(1);
+    expect(host.textContent).toContain("中文结果");
+  });
+
+  it("cancels queued debounce on cancel, inactivity, visibility loss and unmount", async () => {
+    call.mockResolvedValue(page("Result"));
+    await render();
+    await openSearch();
+    await typeQuery("cancel");
+    await act(async () => button("search.cancel").click());
+    await act(async () => vi.advanceTimersByTime(300));
+    expect(call).not.toHaveBeenCalled();
+    await openSearch();
+    await typeQuery("hidden");
+    await render(false);
+    await act(async () => vi.advanceTimersByTime(300));
+    expect(call).not.toHaveBeenCalled();
+    expect(host.textContent).toBe("");
+    await render();
+    const visibility = vi
+      .spyOn(document, "hidden", "get")
+      .mockReturnValue(true);
+    await act(async () =>
+      document.dispatchEvent(new Event("visibilitychange"))
+    );
+    await act(async () => vi.advanceTimersByTime(300));
+    expect(call).not.toHaveBeenCalled();
+    visibility.mockReturnValue(false);
+    await act(async () =>
+      document.dispatchEvent(new Event("visibilitychange"))
+    );
+    await act(async () => root.render(null));
+    await act(async () => vi.advanceTimersByTime(300));
+    expect(call).not.toHaveBeenCalled();
+    visibility.mockRestore();
+  });
+
+  it("retains the query, result page and both scroll positions while inactive", async () => {
+    call.mockResolvedValue(page("Historic"));
+    await render();
+    const all = host.querySelector(".mobile-discovery-scroll")!;
+    all.scrollTop = 120;
+    await act(async () => all.dispatchEvent(new Event("scroll")));
+    await openSearch();
+    await typeQuery("history");
+    await act(async () => vi.advanceTimersByTime(200));
+    const results = host.querySelector(".mobile-discovery-scroll")!;
+    results.scrollTop = 220;
+    await act(async () => results.dispatchEvent(new Event("scroll")));
+    await render(false);
+    await act(async () => vi.advanceTimersByTime(1000));
+    await render();
+    expect(host.querySelector("input")?.value).toBe("history");
+    expect(host.textContent).toContain("Historic");
+    expect(host.querySelector(".mobile-discovery-scroll")?.scrollTop).toBe(220);
+    expect(call).toHaveBeenCalledTimes(1);
+    await act(async () => button("search.cancel").click());
+    expect(host.querySelector(".mobile-discovery-scroll")?.scrollTop).toBe(120);
+  });
+});
diff --git a/src/modules/MobileRemote/screens/SessionsScreen.test.ts b/src/modules/MobileRemote/screens/SessionsScreen.test.ts
index 04a4241256..a0440bb50c 100644
--- a/src/modules/MobileRemote/screens/SessionsScreen.test.ts
+++ b/src/modules/MobileRemote/screens/SessionsScreen.test.ts
@@ -6,7 +6,12 @@ import { describe, expect, it, vi } from "vitest";
 import { SessionsScreen } from "./SessionsScreen";
 
 const state = vi.hoisted(() => ({
-  connection: { desktopId: "one", desktopName: "Mac", presence: "online" },
+  connection: {
+    desktopId: "one",
+    desktopName: "Mac",
+    presence: "online",
+    status: "connected",
+  },
   sessions: [
     { id: "codexapp-a", name: "Session A", status: "idle", repoPath: "/repo" },
   ],
@@ -17,6 +22,8 @@ vi.mock("../app", () => ({ useMobileRemote: () => state }));
 vi.mock("../platform", () => ({
   useMobileRemotePlatform: () => ({
     runtime: {
+      isHidden: () => false,
+      subscribeVisibility: () => () => {},
       readPreference: (key: string) => localStorage.getItem(key),
       writePreference: (key: string, value: string) =>
         localStorage.setItem(key, value),
@@ -46,8 +53,25 @@ describe("SessionsScreen", () => {
       )
     );
     expect(host.querySelector('[aria-label="sessions.groupBy"]')).toBeNull();
-    expect(host.querySelector("[aria-expanded]")).toBeNull();
+    expect(host.querySelector(".mobile-session-group-toggle")).toBeNull();
     expect(host.textContent).toContain("Session A");
+    state.connection.status = "connecting";
+    await act(() =>
+      root.render(
+        React.createElement(SessionsScreen, { onSelectSession: select })
+      )
+    );
+    expect(host.querySelector('[role="status"]')?.textContent).toBe(
+      "connection.reconnecting"
+    );
+    expect(host.textContent).toContain("Session A");
+    state.connection.status = "connected";
+    await act(() =>
+      root.render(
+        React.createElement(SessionsScreen, { onSelectSession: select })
+      )
+    );
+    expect(host.querySelector('[role="status"]')).toBeNull();
     await act(() =>
       host
         .querySelector<HTMLButtonElement>(
diff --git a/src/modules/MobileRemote/screens/SessionsScreen.tsx b/src/modules/MobileRemote/screens/SessionsScreen.tsx
index 96dfd08438..92eedfc26c 100644
--- a/src/modules/MobileRemote/screens/SessionsScreen.tsx
+++ b/src/modules/MobileRemote/screens/SessionsScreen.tsx
@@ -1,64 +1,377 @@
-import React, { useState } from "react";
+import React, { useEffect, useLayoutEffect, useRef, useState } from "react";
+import { flushSync } from "react-dom";
 import { useTranslation } from "react-i18next";
 
 import Button from "@src/components/Button";
-import { LIST_PANEL_SECTION_HEADER } from "@src/components/ListPanel/tokens";
+import IconButton from "@src/components/Button";
+import Input from "@src/components/Input";
+import InlineAlert from "@src/components/PageNotice";
+import { Placeholder } from "@src/components/Placeholder";
+import { createLogger } from "@src/hooks/logger";
+import {
+  ArrowRight01Icon,
+  Cancel01Icon,
+  HugeiconsIcon,
+  Notification01Icon,
+  Search01Icon,
+} from "@src/icons";
 
 import { useMobileRemote } from "../app";
+import { useMobileVisitedSessions } from "../app/useMobileReadStateSync";
+import { useMobileSessionSearch } from "../app/useMobileSessionSearch";
 import { MobileTopBar } from "../components/MobileTopBar";
+import { PendingInboxList } from "../components/PendingInboxList";
+import { SessionDeviceTabs } from "../components/SessionDeviceTabs";
 import { SessionListItem } from "../components/SessionListItem";
-import { DesktopPresenceLabel } from "../components/badges/DesktopPresenceLabel";
-import { OfflineBanner } from "../components/banners/OfflineBanner";
+import { SessionViewMenu } from "../components/SessionViewMenu";
+import {
+  type SessionGroupBy,
+  groupMobileSessions,
+} from "../components/sessionGrouping";
+import { mobileSessionRowStatus } from "../components/sessionRowPresentation";
+import { derivePairedDesktopPresence } from "../connection/mobilePairedDesktopPresence";
+import "../mobileDiscovery.scss";
+import { useMobileRemotePlatform } from "../platform";
+
+const SEARCH_ACTION_STYLE = {
+  minHeight: 44,
+  fontSize: "var(--mobile-type-control-size)",
+};
+// Override Button's inline size defaults through its supported style API.
+const SEARCH_LAUNCHER_STYLE = {
+  height: "var(--mobile-search-height)",
+  padding: "0 var(--mobile-search-padding-x)",
+  borderRadius: "var(--mobile-search-radius)",
+  fontSize: "var(--mobile-search-font-size)",
+};
 
 export interface SessionsScreenProps {
   onSelectSession?: (sessionId: string) => void;
+  profileAction?: React.ReactNode;
+  /** Keep the bounded search state across chat navigation, without hidden UI/work. */
+  active?: boolean;
 }
 
 /** M-05 Sessions / Online (M-06 offline banner when presence offline). */
-export function SessionsScreen({ onSelectSession }: SessionsScreenProps) {
+export function SessionsScreen({
+  onSelectSession,
+  profileAction,
+  active = true,
+}: SessionsScreenProps) {
   const { t } = useTranslation("mobileRemote");
-  const { connection, sessions, sessionsHasMore, loadMoreSessions } =
-    useMobileRemote();
+  const { runtime } = useMobileRemotePlatform();
+  const {
+    connection,
+    rpc,
+    pendingInbox,
+    focusPermission,
+    sessions,
+    sessionsHasMore,
+    loadMoreSessions,
+    readStateSync,
+    pairedDesktops = [],
+    switchPairedDesktop,
+  } = useMobileRemote();
+  const visitedSessions = useMobileVisitedSessions(readStateSync);
+  const [groupBy, setGroupBy] = useState<SessionGroupBy>("none");
+  const [switching, setSwitching] = useState(false);
+  const [switchError, setSwitchError] = useState(false);
+  const switchingRef = useRef(false);
+  const mounted = useRef(true);
+  useEffect(() => {
+    mounted.current = true;
+    return () => {
+      mounted.current = false;
+    };
+  }, []);
+  const desktops = derivePairedDesktopPresence({
+    desktops: pairedDesktops,
+    activePresence: connection.presence,
+  });
+  const deviceItems = desktops.length
+    ? desktops
+    : [
+        {
+          id: connection.desktopId ?? "current",
+          name: connection.desktopName ?? "Desktop",
+          presence: connection.presence,
+          current: true,
+        },
+      ];
+  const currentDesktopId = deviceItems.find((item) => item.current)?.id ?? null;
+  const groups = groupMobileSessions(sessions, groupBy);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(false);
   const offline = connection.presence === "offline";
+  const online =
+    connection.status === "connected" && connection.presence === "online";
+  const [view, setView] = useState<"all" | "search" | "pending">("all");
+  const [query, setQuery] = useState("");
+  const [composing, setComposing] = useState(false);
+  const [visible, setVisible] = useState(() => !runtime.isHidden());
+  useEffect(() => {
+    const update = () => setVisible(!runtime.isHidden());
+    update();
+    return runtime.subscribeVisibility(update);
+  }, [runtime]);
+  const search = useMobileSessionSearch(rpc, online && active && visible);
+  const { search: runSearch, phase: searchPhase } = search;
+  useEffect(() => {
+    if (
+      !active ||
+      !visible ||
+      !online ||
+      composing ||
+      view !== "search" ||
+      !query.trim() ||
+      searchPhase !== "idle" ||
+      connection.capabilities?.sessionSearch !== true
+    )
+      return;
+    const timer = runtime.setTimeout(() => void runSearch(query), 200);
+    return () => runtime.clearTimeout(timer);
+  }, [
+    active,
+    visible,
+    online,
+    composing,
+    view,
+    query,
+    searchPhase,
+    runSearch,
+    runtime,
+    connection.capabilities?.sessionSearch,
+  ]);
+  const searchButton = useRef<HTMLButtonElement>(null);
+  const inboxButton = useRef<HTMLButtonElement>(null);
+  const searchInput = useRef<HTMLInputElement>(null);
+  const allList = useRef<HTMLDivElement>(null);
+  const searchList = useRef<HTMLDivElement>(null);
+  const scrollPositions = useRef({ all: 0, search: 0 });
+  const showResults = view === "search" && !!query.trim();
+  const showAll = view !== "pending" && !showResults;
+  useEffect(() => {
+    readStateSync?.watch(
+      active && visible && view !== "pending"
+        ? (showResults ? search.sessions : sessions).map((row) => row.id)
+        : []
+    );
+  }, [
+    readStateSync,
+    active,
+    visible,
+    view,
+    showResults,
+    search.sessions,
+    sessions,
+  ]);
+  useEffect(() => () => readStateSync?.watch([]), [readStateSync]);
+  useLayoutEffect(() => {
+    if (!active) return;
+    if (showAll && allList.current)
+      allList.current.scrollTop = scrollPositions.current.all;
+    if (showResults && searchList.current)
+      searchList.current.scrollTop = scrollPositions.current.search;
+  }, [active, showAll, showResults]);
+  const pending = new Set(pendingInbox?.items.map((item) => item.sessionId));
+  const renderSession = (
+    session: (typeof sessions)[number],
+    showWorkspace: boolean
+  ) => (
+    <SessionListItem
+      key={session.id}
+      sessionId={session.id}
+      name={session.name}
+      display={session.display}
+      visited={visitedSessions?.get(session.id)}
+      mergeStatus={session.mergeStatus}
+      status={
+        !online
+          ? "offline"
+          : pending.has(session.id)
+            ? "awaiting_approval"
+            : !session.lifecycleStatus &&
+                pendingInbox &&
+                pendingInbox.phase !== "unsupported" &&
+                (pendingInbox.phase !== "ready" || !pendingInbox.complete)
+              ? "unknown"
+              : mobileSessionRowStatus(session)
+      }
+      workspaceName={showWorkspace ? session.repoName : undefined}
+      compact={!showWorkspace}
+      updatedAtMs={session.updatedAtMs}
+      onSelect={() => {
+        scrollPositions.current = {
+          all:
+            showAll && allList.current
+              ? allList.current.scrollTop
+              : scrollPositions.current.all,
+          search:
+            searchList.current?.scrollTop ?? scrollPositions.current.search,
+        };
+        onSelectSession?.(session.id);
+      }}
+    />
+  );
+  const closeSecondary = () => {
+    const target = view === "search" ? searchButton : inboxButton;
+    flushSync(() => setView("all"));
+    search.cancel();
+    setQuery("");
+    setComposing(false);
+    scrollPositions.current.search = 0;
+    target.current?.focus();
+  };
+
+  // Retain only controller state while in chat; do not render hidden rows.
+  if (!active) return null;
 
   return (
-    <>
+    <section
+      className="mobile-discovery"
+      onKeyDown={(event) => {
+        if (
+          event.key === "Escape" &&
+          view !== "all" &&
+          !composing &&
+          !event.nativeEvent.isComposing
+        ) {
+          event.preventDefault();
+          closeSecondary();
+        }
+      }}
+    >
       <MobileTopBar
-        title={t("tabs.sessions")}
-        leading={
-          <DesktopPresenceLabel
-            desktopName={connection.desktopName ?? "Desktop"}
-            presence={connection.presence}
-          />
+        title={t(view === "pending" ? "inbox.title" : "tabs.sessions")}
+        leading={profileAction}
+        trailing={
+          view === "pending" ? (
+            <Button
+              variant="tertiary"
+              className="mobile-discovery-cancel"
+              onClick={closeSecondary}
+            >
+              {t("inbox.backToSessions")}
+            </Button>
+          ) : (
+            <SessionViewMenu value={groupBy} onChange={setGroupBy} />
+          )
         }
       />
-      {offline ? (
-        <div className="px-3 pt-3">
-          <OfflineBanner desktopName={connection.desktopName} />
-        </div>
+      <SessionDeviceTabs
+        items={deviceItems}
+        currentId={currentDesktopId}
+        disabled={switching}
+        onSelect={(id) => {
+          if (
+            switchingRef.current ||
+            id === currentDesktopId ||
+            !switchPairedDesktop
+          )
+            return;
+          switchingRef.current = true;
+          setSwitching(true);
+          setSwitchError(false);
+          closeSecondary();
+          void switchPairedDesktop(id)
+            .catch(() => {
+              if (mounted.current) setSwitchError(true);
+            })
+            .finally(() => {
+              switchingRef.current = false;
+              if (mounted.current) setSwitching(false);
+            });
+        }}
+      />
+      {switchError ? (
+        <p role="alert" className="mobile-discovery-notice">
+          {t("devices.switchFailed")}
+        </p>
       ) : null}
-      <div className="flex-1 overflow-y-auto px-2 py-3">
-        <div className={`px-2 pb-1 ${LIST_PANEL_SECTION_HEADER.typography}`}>
-          Live
-        </div>
-        <div className="flex flex-col gap-1">
-          {sessions.map((session) => (
-            <SessionListItem
-              key={session.id}
-              sessionId={session.id}
-              name={session.name}
-              status={session.status === "offline" ? "idle" : session.status}
-              onSelect={() => onSelectSession?.(session.id)}
-            />
-          ))}
+      {view === "all" &&
+      pendingInbox &&
+      pendingInbox.phase !== "unsupported" &&
+      !(
+        pendingInbox.phase === "ready" &&
+        pendingInbox.complete &&
+        pendingInbox.items.length === 0
+      ) ? (
+        <div className="mobile-discovery-inbox-entry">
+          <Button
+            layout="custom"
+            appearance="custom"
+            htmlType="button"
+            ref={inboxButton}
+            className="mobile-inbox-entry"
+            onClick={() => setView("pending")}
+          >
+            <HugeiconsIcon icon={Notification01Icon} size={20} aria-hidden />
+            <span className="mobile-inbox-entry__label">
+              {t("inbox.title")}
+            </span>
+            <span className="mobile-inbox-entry__count">
+              {pendingInbox.phase === "ready" && pendingInbox.complete
+                ? pendingInbox.items.length
+                : t(
+                    pendingInbox.phase === "error"
+                      ? "inbox.unavailable"
+                      : "inbox.syncing"
+                  )}
+            </span>
+            <HugeiconsIcon icon={ArrowRight01Icon} size={18} aria-hidden />
+          </Button>
         </div>
+      ) : null}
+      {connection.status === "connecting" ||
+      connection.status === "disconnected" ||
+      offline ? (
+        <p role="status" className="mobile-discovery-notice">
+          {t(
+            connection.status === "connecting" ||
+              connection.status === "disconnected"
+              ? "connection.reconnecting"
+              : "search.offline"
+          )}
+        </p>
+      ) : null}
+      <div
+        ref={allList}
+        onScroll={(event) => {
+          if (showAll)
+            scrollPositions.current.all = event.currentTarget.scrollTop;
+        }}
+        hidden={!showAll}
+        className={showAll ? "mobile-discovery-scroll" : "hidden"}
+      >
+        {groups.map((group) => (
+          <React.Fragment key={group.id}>
+            <div className="mobile-discovery-section-label break-words">
+              {group.label ??
+                t(
+                  group.id === "all"
+                    ? "sessions.all"
+                    : group.id === "today"
+                      ? "sessions.groupToday"
+                      : group.id === "earlier"
+                        ? "sessions.groupEarlier"
+                        : group.id === "no_workspace"
+                          ? "sessions.groupNoWorkspace"
+                          : "sessions.groupUnknown"
+                )}
+            </div>
+            <div className="mobile-session-list">
+              {group.sessions.map((session) =>
+                renderSession(session, groupBy !== "workspace")
+              )}
+            </div>
+          </React.Fragment>
+        ))}
         {sessions.length >= 1000 ? (
-          <p className="text-text-secondary px-2">{t("sessions.limit")}</p>
+          <p className="px-2 text-text-2">{t("sessions.limit")}</p>
         ) : null}
         {sessionsHasMore ? (
           <Button
+            className="mobile-discovery-more"
             disabled={offline || loading}
             loading={loading}
             onClick={() => {
@@ -74,8 +387,207 @@ export function SessionsScreen({ onSelectSession }: SessionsScreenProps) {
           </Button>
         ) : null}
       </div>
-    </>
+      {view === "pending" && pendingInbox ? (
+        <div className="mobile-discovery-scroll">
+          <PendingInboxList
+            inbox={pendingInbox}
+            onFocusPermission={focusPermission}
+            sessions={sessions}
+            desktopName={connection.desktopName ?? "Desktop"}
+            online={online}
+            onSelectSession={onSelectSession}
+          />
+        </div>
+      ) : null}
+      {showResults && connection.capabilities?.sessionSearch === true ? (
+        <div
+          ref={searchList}
+          className="mobile-discovery-scroll"
+          onScroll={(event) => {
+            scrollPositions.current.search = event.currentTarget.scrollTop;
+          }}
+        >
+          <>
+            {online &&
+            (search.phase === "loading" || search.phase === "idle") ? (
+              <p role="status" className="py-3">
+                {t("search.loading")}
+              </p>
+            ) : null}
+            {search.phase === "error" ? (
+              <InlineAlert
+                type="danger"
+                role="alert"
+                className="my-3"
+                action={
+                  <Button
+                    style={SEARCH_ACTION_STYLE}
+                    disabled={!online}
+                    onClick={() => void search.retry()}
+                  >
+                    {t("search.retry")}
+                  </Button>
+                }
+              >
+                <span className="mobile-type-body">{t("search.error")}</span>
+              </InlineAlert>
+            ) : null}
+            {search.phase === "ready" && search.sessions.length === 0 ? (
+              <Placeholder
+                variant="empty"
+                placement="detail-panel"
+                title={t(search.hasMore ? "search.continue" : "search.empty")}
+                icon={<HugeiconsIcon icon={Search01Icon} size={24} />}
+              />
+            ) : null}
+            {search.query ? (
+              <p className="mobile-type-secondary pt-3 break-words text-text-2">
+                {t("search.resultsFor", { query: search.query })}
+              </p>
+            ) : null}
+            <div
+              aria-busy={search.phase === "loading"}
+              className="mobile-session-list py-3"
+            >
+              {search.sessions.map((session) => renderSession(session, true))}
+            </div>
+            {search.hasMore && search.phase !== "error" ? (
+              <Button
+                style={SEARCH_ACTION_STYLE}
+                disabled={!online || search.phase === "loading"}
+                onClick={() => void search.loadNext()}
+              >
+                {t("search.next")}
+              </Button>
+            ) : null}
+          </>
+        </div>
+      ) : null}
+      {view === "all" ? (
+        <div className="mobile-discovery-search mobile-discovery-search--launcher">
+          <Button
+            ref={searchButton}
+            variant="tertiary"
+            className="mobile-search-launcher"
+            style={SEARCH_LAUNCHER_STYLE}
+            icon={
+              <HugeiconsIcon
+                icon={Search01Icon}
+                className="mobile-search-icon"
+                aria-hidden
+              />
+            }
+            aria-label={t("search.title")}
+            onClick={() => {
+              flushSync(() => setView("search"));
+              searchInput.current?.focus();
+            }}
+          >
+            {t("search.title")}
+          </Button>
+        </div>
+      ) : null}
+      {view === "search" ? (
+        <div className="mobile-discovery-search">
+          {connection.capabilities?.sessionSearch !== true ? (
+            <div className="mobile-search-form">
+              <p className="min-w-0 flex-1">{t("search.unsupported")}</p>
+              <Button
+                variant="tertiary"
+                className="mobile-discovery-cancel"
+                onClick={closeSecondary}
+              >
+                {t("search.cancel")}
+              </Button>
+            </div>
+          ) : (
+            <form
+              role="search"
+              className="mobile-search-form"
+              onSubmit={(event) => {
+                event.preventDefault();
+                if (composing) return;
+                void search
+                  .search(query)
+                  .catch((error) =>
+                    logger.warn("Background operation failed", error)
+                  );
+                if (online && query.trim()) searchInput.current?.blur();
+              }}
+            >
+              <Input
+                ref={searchInput}
+                enterKeyHint="search"
+                prefix={
+                  <HugeiconsIcon
+                    icon={Search01Icon}
+                    className="mobile-search-icon"
+                    aria-hidden
+                  />
+                }
+                type="search"
+                aria-label={t("search.placeholder")}
+                placeholder={t("search.placeholder")}
+                value={query}
+                maxLength={200}
+                suffix={
+                  query ? (
+                    <IconButton
+                      appearance="soft"
+                      variant="tertiary"
+                      htmlType="button"
+                      aria-label={t("search.clear")}
+                      className="mobile-search-clear"
+                      onClick={() => {
+                        setQuery("");
+                        setComposing(false);
+                        search.cancel();
+                        scrollPositions.current.search = 0;
+                        searchInput.current?.focus();
+                      }}
+                    >
+                      <HugeiconsIcon
+                        icon={Cancel01Icon}
+                        size={18}
+                        aria-hidden
+                      />
+                    </IconButton>
+                  ) : undefined
+                }
+                className="mobile-search-input min-w-0 flex-1"
+                onCompositionStart={() => {
+                  setComposing(true);
+                  search.cancel();
+                }}
+                onCompositionEnd={() => setComposing(false)}
+                onChange={(value) => {
+                  if (showAll && allList.current)
+                    scrollPositions.current.all = allList.current.scrollTop;
+                  setQuery(value);
+                  search.cancel();
+                  scrollPositions.current.search = 0;
+                  if (searchList.current) searchList.current.scrollTop = 0;
+                }}
+                size="large"
+              />
+              <Button
+                variant="tertiary"
+                className="mobile-discovery-cancel"
+                onClick={closeSecondary}
+              >
+                {t("search.cancel")}
+              </Button>
+            </form>
+          )}
+          {!online ? (
+            <p className="text-text-2">{t("search.offline")}</p>
+          ) : null}
+        </div>
+      ) : null}
+    </section>
   );
 }
 
 SessionsScreen.displayName = "SessionsScreen";
+
+const logger = createLogger("SessionsScreen");
diff --git a/src/modules/MobileRemote/screens/WelcomeScreen.tsx b/src/modules/MobileRemote/screens/WelcomeScreen.tsx
index 953550d444..901dc0dabb 100644
--- a/src/modules/MobileRemote/screens/WelcomeScreen.tsx
+++ b/src/modules/MobileRemote/screens/WelcomeScreen.tsx
@@ -7,37 +7,48 @@ import { MobileActionButton } from "../components/MobileActionButton";
 
 export interface WelcomeScreenProps {
   onOpenPairing?: () => void;
+  profileAction?: React.ReactNode;
 }
 
 /** M-01 Welcome / Unpaired */
-export function WelcomeScreen({ onOpenPairing }: WelcomeScreenProps) {
+export function WelcomeScreen({
+  onOpenPairing,
+  profileAction,
+}: WelcomeScreenProps) {
   const { t } = useTranslation("mobileRemote");
 
   return (
-    <div className="flex flex-1 flex-col items-center justify-center px-6 pb-16 text-center">
-      <div
-        className="mobile-welcome-icon mb-6 flex h-16 w-16 items-center justify-center rounded-2xl"
-        aria-hidden="true"
-      >
-        <HugeiconsIcon icon={SmartPhone01Icon} size={32} />
-      </div>
-      <h1 className="mb-2 text-xl font-semibold text-text-1">
-        {t("welcome.title")}
-      </h1>
-      <p className="mb-10 text-sm text-text-3">{t("welcome.subtitle")}</p>
-      <div className="flex w-full max-w-xs flex-col gap-3">
-        <MobileActionButton
-          variant="primary"
-          className="w-full"
-          icon={
-            <HugeiconsIcon icon={Camera01Icon} size={16} aria-hidden="true" />
-          }
-          onClick={onOpenPairing}
+    <>
+      {profileAction && (
+        <header className="shrink-0 px-6 pt-5">{profileAction}</header>
+      )}
+      <div className="mobile-flow-screen mobile-flow-screen--centered flex flex-1 flex-col items-center px-6 text-center">
+        <div
+          className="mobile-welcome-icon mb-6 flex h-16 w-16 items-center justify-center rounded-2xl"
+          aria-hidden="true"
         >
-          {t("welcome.scanQr")}
-        </MobileActionButton>
+          <HugeiconsIcon icon={SmartPhone01Icon} size={32} />
+        </div>
+        <h1 className="mobile-type-title mb-2 font-semibold text-text-1">
+          {t("welcome.title")}
+        </h1>
+        <p className="mobile-type-secondary mb-10 text-text-3">
+          {t("welcome.subtitle")}
+        </p>
+        <div className="flex w-full max-w-xs flex-col gap-3">
+          <MobileActionButton
+            variant="primary"
+            className="w-full"
+            icon={
+              <HugeiconsIcon icon={Camera01Icon} size={16} aria-hidden="true" />
+            }
+            onClick={onOpenPairing}
+          >
+            {t("welcome.scanQr")}
+          </MobileActionButton>
+        </div>
       </div>
-    </div>
+    </>
   );
 }
 
diff --git a/src/modules/MobileRemote/screens/devices/DevicesTab.test.ts b/src/modules/MobileRemote/screens/devices/DevicesTab.test.ts
index 16c4060240..63867eeaf5 100644
--- a/src/modules/MobileRemote/screens/devices/DevicesTab.test.ts
+++ b/src/modules/MobileRemote/screens/devices/DevicesTab.test.ts
@@ -6,15 +6,20 @@ import {
   afterAll,
   afterEach,
   beforeAll,
+  beforeEach,
   describe,
   expect,
   it,
   vi,
 } from "vitest";
 
-import { DevicesTab, derivePairedDesktopsFromInventory } from "./DevicesTab";
+import { DevicesTab } from "./DevicesTab";
 
-const mocks = vi.hoisted(() => ({ switchPairedDesktop: vi.fn() }));
+const mocks = vi.hoisted(() => ({
+  switchPairedDesktop: vi.fn(),
+  presence: "online",
+  activeDesktopId: "desktop-1",
+}));
 const reactActEnvironment = globalThis as typeof globalThis & {
   IS_REACT_ACT_ENVIRONMENT?: boolean;
 };
@@ -22,21 +27,26 @@ const reactActEnvironment = globalThis as typeof globalThis & {
 vi.mock("../../app", () => ({
   useMobileRemote: () => ({
     connection: {
-      desktopId: "desktop-1",
+      desktopId: mocks.activeDesktopId,
       desktopName: "Home Mac",
-      presence: "online",
+      presence: mocks.presence,
     },
     pairedDesktops: [
       {
         id: "desktop-1",
         name: "Home Mac",
-        active: true,
+        desktopIdentity: {
+          name: "Home Mac",
+          model: "Mac14,7",
+          username: "alex",
+        },
+        active: mocks.activeDesktopId === "desktop-1",
         updatedAtMs: 1,
       },
       {
         id: "desktop-2",
         name: "Office Mac",
-        active: false,
+        active: mocks.activeDesktopId === "desktop-2",
         updatedAtMs: 2,
       },
     ],
@@ -51,6 +61,8 @@ const translations: Record<string, string> = {
   "devices.thisDeviceSubtitle": "Full remote · Active now",
   "devices.pairedDesktops": "Paired desktops",
   "devices.primary": "Primary",
+  "devices.currentDesktop": "Current computer",
+  "devices.presenceUnknown": "Status unknown",
   "devices.online": "Online",
   "devices.offline": "Offline",
   "devices.unknown": "Connecting",
@@ -66,6 +78,10 @@ vi.mock("react-i18next", () => ({
 }));
 
 describe("DevicesTab", () => {
+  beforeEach(() => {
+    mocks.presence = "online";
+    mocks.activeDesktopId = "desktop-1";
+  });
   beforeAll(() => {
     reactActEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
   });
@@ -85,41 +101,17 @@ describe("DevicesTab", () => {
     expect(html).toContain('data-testid="mobile-remote-paired-desktops"');
     expect(html).toContain("section-layout-row");
     expect(html).toContain("Home Mac");
-    expect(html).toContain("Primary");
+    expect(html).toContain("Mac14,7 · alex");
+    expect(html).toContain("Current computer");
     expect(html).toContain("Online");
     expect(html).toContain("bg-success-6");
   });
 
-  it("does not invent paired devices from the transient connection", () => {
-    expect(
-      derivePairedDesktopsFromInventory({
-        desktops: [],
-        activePresence: "online",
-      })
-    ).toEqual([]);
-  });
-
-  it("keeps inactive local pairings visible but offline", () => {
-    expect(
-      derivePairedDesktopsFromInventory({
-        desktops: [
-          {
-            id: "desktop-old",
-            name: "Office Mac",
-            active: false,
-            updatedAtMs: 1,
-          },
-        ],
-        activePresence: "online",
-      })
-    ).toEqual([
-      {
-        id: "desktop-old",
-        name: "Office Mac",
-        presence: "offline",
-        primary: false,
-      },
-    ]);
+  it("keeps unobserved desktops unknown without a connecting animation", () => {
+    const html = renderToStaticMarkup(React.createElement(DevicesTab));
+    expect(html).toContain("Status unknown");
+    expect(html).not.toContain("Offline");
+    expect(html).not.toContain("animate-pulse");
   });
 
   it("routes an inactive desktop row through the shared switch action", async () => {
@@ -141,7 +133,7 @@ describe("DevicesTab", () => {
     }
   });
 
-  it("disables every desktop row and marks the selected row busy while switching", async () => {
+  it("locks switch controls while keeping the current computer readable", async () => {
     let resolveSwitch!: () => void;
     const pendingSwitch = new Promise<void>((resolve) => {
       resolveSwitch = resolve;
@@ -160,10 +152,19 @@ describe("DevicesTab", () => {
       act(() => officeButton?.click());
 
       const buttons = Array.from(container.querySelectorAll("button"));
-      expect(buttons).toHaveLength(2);
+      expect(buttons).toHaveLength(1);
       expect(buttons.every((button) => button.disabled)).toBe(true);
       expect(officeButton?.getAttribute("aria-busy")).toBe("true");
       expect(container.querySelector('[role="alert"]')).toBeNull();
+      const current = container.querySelector('[aria-current="true"]');
+      expect(current?.tagName).toBe("SPAN");
+      expect(current?.textContent).toContain("Home Mac");
+      expect(current?.textContent).toContain("Current computer");
+      expect(current?.closest("button")).toBeNull();
+      const currentDetails = current?.querySelector(".flex-col");
+      expect(currentDetails?.children[0]?.textContent).toBe("Home Mac");
+      expect(currentDetails?.children[1]?.textContent).toBe("Mac14,7 · alex");
+      expect(currentDetails?.children[2]?.textContent).toBe("Current computer");
 
       await act(async () => {
         resolveSwitch();
@@ -199,6 +200,48 @@ describe("DevicesTab", () => {
       expect(container.querySelector('[role="alert"]')?.textContent).toContain(
         "Could not switch desktops"
       );
+      mocks.switchPairedDesktop.mockResolvedValue(undefined);
+      await act(async () => officeButton?.click());
+      expect(mocks.switchPairedDesktop).toHaveBeenCalledTimes(2);
+      expect(container.querySelector('[role="alert"]')).toBeNull();
+    } finally {
+      act(() => root.unmount());
+      container.remove();
+    }
+  });
+
+  it("moves the current marker and live presence when selection changes", async () => {
+    const container = document.createElement("div");
+    document.body.appendChild(container);
+    const root = createRoot(container);
+    try {
+      await act(async () => root.render(React.createElement(DevicesTab)));
+      expect(
+        container.querySelector('[aria-current="true"]')?.textContent
+      ).toContain("Home Mac");
+
+      mocks.activeDesktopId = "desktop-2";
+      mocks.presence = "unknown";
+      await act(async () => root.render(React.createElement(DevicesTab)));
+      expect(
+        container.querySelector('[aria-current="true"]')?.textContent
+      ).toContain("Office Mac");
+      expect(container.textContent).toContain("Connecting");
+      expect(container.textContent).toContain("Status unknown");
+      expect(container.textContent).not.toContain("Online");
+
+      mocks.presence = "online";
+      await act(async () => root.render(React.createElement(DevicesTab)));
+      expect(container.textContent).toContain("Online");
+      expect(container.textContent).not.toContain("Connecting");
+
+      mocks.presence = "offline";
+      await act(async () => root.render(React.createElement(DevicesTab)));
+      expect(container.textContent).toContain("Offline");
+      expect(container.textContent).toContain("Status unknown");
+      expect(
+        container.querySelector('[aria-current="true"]')?.textContent
+      ).toContain("Office Mac");
     } finally {
       act(() => root.unmount());
       container.remove();
diff --git a/src/modules/MobileRemote/screens/devices/DevicesTab.tsx b/src/modules/MobileRemote/screens/devices/DevicesTab.tsx
index f576a60d74..5ba0a880f2 100644
--- a/src/modules/MobileRemote/screens/devices/DevicesTab.tsx
+++ b/src/modules/MobileRemote/screens/devices/DevicesTab.tsx
@@ -14,29 +14,8 @@ import {
 
 import { useMobileRemote } from "../../app";
 import { MobileTopBar } from "../../components/MobileTopBar";
-import type {
-  DesktopPresence,
-  MobilePairedDesktopSummary,
-} from "../../connection/types";
-
-export interface PairedDesktopRow {
-  id: string;
-  name: string;
-  presence: DesktopPresence;
-  primary?: boolean;
-}
-
-export function derivePairedDesktopsFromInventory(input: {
-  desktops: MobilePairedDesktopSummary[];
-  activePresence: DesktopPresence;
-}): PairedDesktopRow[] {
-  return input.desktops.map((desktop) => ({
-    id: desktop.id,
-    name: desktop.name,
-    presence: desktop.active ? input.activePresence : "offline",
-    primary: desktop.active,
-  }));
-}
+import { derivePairedDesktopPresence } from "../../connection/mobilePairedDesktopPresence";
+import type { DesktopPresence } from "../../connection/types";
 
 function resolveDotColor(presence: DesktopPresence): string {
   switch (presence) {
@@ -45,7 +24,7 @@ function resolveDotColor(presence: DesktopPresence): string {
     case "offline":
       return "bg-text-4";
     default:
-      return "bg-warning-6";
+      return "bg-text-4";
   }
 }
 
@@ -75,7 +54,7 @@ export function DevicesTab() {
     pairedDesktops: pairedDesktopInventory,
     switchPairedDesktop,
   } = useMobileRemote();
-  const pairedDesktops = derivePairedDesktopsFromInventory({
+  const pairedDesktops = derivePairedDesktopPresence({
     desktops: pairedDesktopInventory,
     activePresence: connection.presence,
   });
@@ -83,7 +62,7 @@ export function DevicesTab() {
   return (
     <>
       <MobileTopBar title={t("devices.title")} />
-      <div className="flex-1 overflow-y-auto px-4 py-4">
+      <div className="mobile-flow-screen flex-1 px-4 py-4">
         <div className="flex flex-col gap-5">
           <SectionContainer
             title={t("devices.thisDevice")}
@@ -132,59 +111,92 @@ export function DevicesTab() {
                     layout="inline"
                     className="py-1"
                     label={
-                      <Button
-                        variant="tertiary"
-                        appearance="ghost"
-                        long
-                        className="min-w-0 justify-start text-left disabled:cursor-default"
-                        style={{ height: 44, minHeight: 44, padding: 0 }}
-                        disabled={
-                          desktop.primary || switchingDesktopId !== null
-                        }
-                        loading={switchingDesktopId === desktop.id}
-                        aria-busy={switchingDesktopId === desktop.id}
-                        aria-current={desktop.primary ? "true" : undefined}
-                        aria-label={
-                          desktop.primary
-                            ? undefined
-                            : t("devices.switchTo", { name: desktop.name })
-                        }
-                        icon={
+                      desktop.current ? (
+                        <span
+                          aria-current="true"
+                          className="flex min-h-11 min-w-0 items-center gap-2 text-text-1"
+                        >
                           <HugeiconsIcon
                             icon={LaptopIcon}
                             size={16}
                             className="shrink-0 text-text-3"
                             aria-hidden="true"
                           />
-                        }
-                        onClick={async () => {
-                          setSwitchError(null);
-                          setSwitchingDesktopId(desktop.id);
-                          try {
-                            await switchPairedDesktop(desktop.id);
-                          } catch {
-                            setSwitchError(t("devices.switchFailed"));
-                          } finally {
-                            setSwitchingDesktopId(null);
+                          <span className="flex min-w-0 flex-1 flex-col gap-1">
+                            <span className="break-words">{desktop.name}</span>
+                            {desktop.details ? (
+                              <span
+                                className={`font-normal break-words ${SECTION_VALUE_SMALL_MUTED_CLASSES}`}
+                              >
+                                {desktop.details}
+                              </span>
+                            ) : null}
+                            <span
+                              className={`font-normal ${SECTION_VALUE_SMALL_MUTED_CLASSES}`}
+                            >
+                              {t("devices.currentDesktop")}
+                            </span>
+                          </span>
+                        </span>
+                      ) : (
+                        <Button
+                          variant="tertiary"
+                          appearance="ghost"
+                          long
+                          className="min-w-0 justify-start text-left disabled:cursor-default"
+                          style={{
+                            height: "auto",
+                            minHeight: 44,
+                            padding: "8px 0",
+                          }}
+                          disabled={switchingDesktopId !== null}
+                          loading={switchingDesktopId === desktop.id}
+                          aria-busy={switchingDesktopId === desktop.id}
+                          aria-label={t("devices.switchTo", {
+                            name: desktop.name,
+                          })}
+                          icon={
+                            <HugeiconsIcon
+                              icon={LaptopIcon}
+                              size={16}
+                              className="shrink-0 text-text-3"
+                              aria-hidden="true"
+                            />
                           }
-                        }}
-                      >
-                        <span className="truncate">{desktop.name}</span>
-                        {desktop.primary ? (
-                          <span
-                            className={`shrink-0 font-normal ${SECTION_VALUE_SMALL_MUTED_CLASSES}`}
-                          >
-                            · {t("devices.primary")}
+                          onClick={async () => {
+                            setSwitchError(null);
+                            setSwitchingDesktopId(desktop.id);
+                            try {
+                              await switchPairedDesktop(desktop.id);
+                            } catch {
+                              setSwitchError(t("devices.switchFailed"));
+                            } finally {
+                              setSwitchingDesktopId(null);
+                            }
+                          }}
+                        >
+                          <span className="flex min-w-0 flex-1 flex-col gap-1 whitespace-normal">
+                            <span className="break-words">{desktop.name}</span>
+                            {desktop.details ? (
+                              <span
+                                className={`font-normal break-words ${SECTION_VALUE_SMALL_MUTED_CLASSES}`}
+                              >
+                                {desktop.details}
+                              </span>
+                            ) : null}
                           </span>
-                        ) : null}
-                      </Button>
+                        </Button>
+                      )
                     }
                   >
                     <StatusDot
                       color={resolveDotColor(desktop.presence)}
-                      label={resolvePresenceLabel(desktop.presence, t)}
+                      label={
+                        desktop.current
+                          ? resolvePresenceLabel(desktop.presence, t)
+                          : t("devices.presenceUnknown")
+                      }
                       size="inline"
-                      pulse={desktop.presence === "unknown"}
                     />
                   </SectionRow>
                 ))}
diff --git a/src/modules/MobileRemote/screens/mobileFlowLayout.test.ts b/src/modules/MobileRemote/screens/mobileFlowLayout.test.ts
new file mode 100644
index 0000000000..8068401c6c
--- /dev/null
+++ b/src/modules/MobileRemote/screens/mobileFlowLayout.test.ts
@@ -0,0 +1,42 @@
+import React from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vitest";
+
+import { MobileShell } from "../components/MobileShell";
+import { ConnectingScreen } from "./ConnectingScreen";
+import { ConnectionErrorScreen } from "./ConnectionErrorScreen";
+import { SASConfirmScreen } from "./SASConfirmScreen";
+import { WelcomeScreen } from "./WelcomeScreen";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+describe("mobile flow scroll ownership", () => {
+  it.each([
+    ["welcome", React.createElement(WelcomeScreen)],
+    ["connecting", React.createElement(ConnectingScreen)],
+    [
+      "error",
+      React.createElement(ConnectionErrorScreen, {
+        onRetry: vi.fn(),
+        onRepair: vi.fn(),
+      }),
+    ],
+    [
+      "verification",
+      React.createElement(SASConfirmScreen, {
+        phrase: "LongVerificationPhrase".repeat(8),
+      }),
+    ],
+  ])(
+    "keeps %s content in a bounded scroll region inside the shell",
+    (_name, screen) => {
+      const html = renderToStaticMarkup(
+        React.createElement(MobileShell, null, screen)
+      );
+      expect(html).toContain("mobile-shell__viewport");
+      expect(html).toContain("mobile-flow-screen");
+    }
+  );
+});
diff --git a/src/modules/MobileRemote/screens/settings/SettingsTab.test.ts b/src/modules/MobileRemote/screens/settings/SettingsTab.test.ts
index 351185563b..1b20c3f4e2 100644
--- a/src/modules/MobileRemote/screens/settings/SettingsTab.test.ts
+++ b/src/modules/MobileRemote/screens/settings/SettingsTab.test.ts
@@ -1,31 +1,35 @@
 // @vitest-environment jsdom
 import React, { act } from "react";
 import { createRoot } from "react-dom/client";
-import { renderToStaticMarkup } from "react-dom/server";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { SettingsTab, resolvePermissionTierLabel } from "./SettingsTab";
 
 const mocks = vi.hoisted(() => ({
   signOut: vi.fn(),
   navigate: vi.fn(),
-  isDevelopmentBypass: false,
+  bypass: false,
   connection: {
-    status: "connected" as const,
-    presence: "online" as const,
+    status: "connected",
+    presence: "online",
     desktopName: "Home Mac",
-    tier: "full" as const,
+    tier: "full",
     demoMode: false,
   },
+  config: {
+    wsUrl:
+      "wss://name:password@relay.example.test/v1/mobile/ws?ticket=secret#pairing",
+  },
 }));
 vi.mock("../../platform", () => ({
   useMobileRemotePlatform: () => ({ openExternal: mocks.navigate }),
 }));
-
 vi.mock("../../app", () => ({
-  useMobileRemote: () => ({ connection: mocks.connection }),
+  useMobileRemote: () => ({
+    connection: mocks.connection,
+    connectionConfig: mocks.config,
+  }),
 }));
-
 vi.mock("../../auth/MobileAuthContext", () => ({
   useMobileAuth: () => ({
     session: {
@@ -33,191 +37,186 @@ vi.mock("../../auth/MobileAuthContext", () => ({
       profile: { primaryEmail: "mobile@example.test" },
     },
     signOut: mocks.signOut,
-    isDevelopmentBypass: mocks.isDevelopmentBypass,
+    isDevelopmentBypass: mocks.bypass,
   }),
 }));
-
-const translations: Record<string, string> = {
-  "settings.title": "Settings",
-  "settings.account": "Account",
-  "settings.signedInAs": "Signed in as",
-  "settings.signOut": "Sign out",
-  "settings.connection": "Connection",
-  "settings.desktop": "Desktop",
-  "settings.relay": "Relay",
-  "settings.permissionTier": "Permission tier",
-  "settings.permissionFull": "Full access",
-  "settings.permissionReadOnly": "Read only",
-  "settings.mode": "Mode",
-  "settings.modeLive": "Live",
-  "settings.help": "Help",
-  "settings.pairingGuide": "Pairing guide",
-  "settings.revokePairing": "Revoke pairing",
-  "settings.online": "Online",
-  "settings.notAvailable": "—",
-  "settings.unknownRelay": "Not connected",
-};
-
 vi.mock("react-i18next", () => ({
-  useTranslation: () => ({
-    t: (key: string) => translations[key] ?? key,
-  }),
+  useTranslation: () => ({ t: (key: string) => key }),
 }));
 
-describe("SettingsTab", () => {
-  it("requires confirmation, supports cancel/Escape/mask, and closes before signing out once", async () => {
-    const env = globalThis as typeof globalThis & {
-      IS_REACT_ACT_ENVIRONMENT?: boolean;
-    };
-    env.IS_REACT_ACT_ENVIRONMENT = true;
-    const host = document.createElement("div");
-    document.body.append(host);
-    const root = createRoot(host);
-    mocks.signOut.mockReset();
-    try {
-      await act(async () => root.render(React.createElement(SettingsTab)));
-      const trigger = Array.from(host.querySelectorAll("button")).find(
-        (b) => b.textContent === "Sign out"
-      )!;
-      const open = async () => {
-        trigger.focus();
-        await act(async () => trigger.click());
-        expect(document.querySelector('[role="dialog"]')).not.toBeNull();
-        expect(mocks.signOut).not.toHaveBeenCalled();
-      };
-      await open();
-      await act(async () => {
-        Array.from(document.querySelectorAll('[role="dialog"] button'))
-          .find((b) => b.textContent === "settings.cancel")!
-          .dispatchEvent(new MouseEvent("click", { bubbles: true }));
-      });
-      expect(document.querySelector('[role="dialog"]')).toBeNull();
-      expect(document.activeElement).toBe(trigger);
-      await open();
-      await act(async () => {
-        document.dispatchEvent(
-          new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
-        );
-      });
-      expect(document.querySelector('[role="dialog"]')).toBeNull();
-      await open();
-      await act(async () => {
-        document
-          .querySelector(".liquid-modal-mask")!
-          .dispatchEvent(new MouseEvent("click", { bubbles: true }));
-      });
-      expect(document.querySelector('[role="dialog"]')).toBeNull();
-      await open();
-      mocks.signOut.mockImplementation(() => {
-        expect(document.querySelector('[role="dialog"]')).toBeNull();
-        expect(document.body.style.overflow).toBe("");
-      });
-      const confirm = Array.from(
-        document.querySelectorAll('[role="dialog"] button')
-      ).find((b) => b.textContent === "Sign out") as HTMLButtonElement;
-      await act(async () => {
-        confirm.click();
-        confirm.click();
-      });
-      expect(mocks.signOut).toHaveBeenCalledTimes(1);
-      expect(mocks.navigate).not.toHaveBeenCalled();
-    } finally {
-      await act(async () => root.unmount());
-      host.remove();
-      env.IS_REACT_ACT_ENVIRONMENT = false;
-    }
+let host: HTMLDivElement;
+let root: ReturnType<typeof createRoot>;
+const env = globalThis as typeof globalThis & {
+  IS_REACT_ACT_ENVIRONMENT?: boolean;
+};
+let previousAct: boolean | undefined;
+function dialog() {
+  return document.querySelector<HTMLElement>('[role="dialog"]');
+}
+function button(label: string, scope: ParentNode = dialog() ?? host) {
+  const result = Array.from(
+    scope.querySelectorAll<HTMLButtonElement>("button")
+  ).find(
+    (item) =>
+      item.getAttribute("aria-label") === label || item.textContent === label
+  );
+  expect(result, label).toBeTruthy();
+  return result!;
+}
+async function click(label: string, scope?: ParentNode) {
+  await act(async () => button(label, scope).click());
+}
+async function render(props = {}) {
+  await act(async () => root.render(React.createElement(SettingsTab, props)));
+}
+beforeEach(() => {
+  previousAct = env.IS_REACT_ACT_ENVIRONMENT;
+  env.IS_REACT_ACT_ENVIRONMENT = true;
+  vi.useFakeTimers({
+    toFake: ["setTimeout", "clearTimeout", "setInterval", "clearInterval"],
   });
-  it("opens shared account and privacy pages without credentials and permits retry after failure", async () => {
-    const env = globalThis as typeof globalThis & {
-      IS_REACT_ACT_ENVIRONMENT?: boolean;
-    };
-    env.IS_REACT_ACT_ENVIRONMENT = true;
-    const host = document.createElement("div");
-    const root = createRoot(host);
-    mocks.navigate.mockReset();
-    mocks.navigate.mockRejectedValueOnce(new Error("open failed"));
-    try {
-      await act(async () => {
-        root.render(React.createElement(SettingsTab));
-      });
-      const click = async (label: string) => {
-        await act(async () => {
-          Array.from(host.querySelectorAll("button"))
-            .find((button) => button.textContent === label)!
-            .click();
-        });
-      };
-      await click("settings.manageAccount");
-      expect(host.textContent).toContain("settings.openFailed");
-      mocks.navigate.mockResolvedValue(undefined);
-      await click("settings.deleteAccount");
-      expect(host.textContent).not.toContain("settings.openFailed");
-      await click("settings.privacyPolicy");
-      expect(mocks.navigate.mock.calls.map(([url]) => url)).toEqual([
-        "https://org2-cloud-infra.vercel.app/account",
-        "https://org2-cloud-infra.vercel.app/account",
-        "https://org2-cloud-infra.vercel.app/legal/privacy",
-      ]);
-    } finally {
-      await act(async () => root.unmount());
-      env.IS_REACT_ACT_ENVIRONMENT = false;
-    }
+  mocks.navigate.mockReset().mockResolvedValue(undefined);
+  mocks.signOut.mockReset();
+  mocks.bypass = false;
+  host = document.createElement("div");
+  document.body.append(host);
+  root = createRoot(host);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  host.remove();
+  await act(async () => vi.advanceTimersByTime(1));
+  expect(vi.getTimerCount()).toBe(0);
+  vi.useRealTimers();
+  env.IS_REACT_ACT_ENVIRONMENT = previousAct;
+});
+
+describe("SettingsTab shared account destination", () => {
+  it("opens actual Profile, supports help/back and restores the Settings trigger on Escape", async () => {
+    await render();
+    expect(host.textContent).toContain("mobile@example.test");
+    for (const key of [
+      "settings.signOut",
+      "settings.deleteAccount",
+      "settings.privacyPolicy",
+    ])
+      expect(host.textContent).not.toContain(key);
+    const trigger = button("profile.open", host);
+    trigger.focus();
+    await click("profile.open", host);
+    await act(async () => vi.advanceTimersByTime(100));
+    expect(dialog()?.getAttribute("aria-label")).toBe("profile.title");
+    expect(document.activeElement).toBe(button("profile.close"));
+    await click("profile.help");
+    expect(document.activeElement).toBe(button("profile.back"));
+    await click("profile.back");
+    expect(dialog()?.textContent).toContain("mobile@example.test");
+    await act(async () =>
+      document.dispatchEvent(
+        new KeyboardEvent("keydown", { key: "Escape", bubbles: true })
+      )
+    );
+    expect(dialog()).toBeNull();
+    expect(document.activeElement).toBe(trigger);
+    expect(host.textContent).toContain("Home Mac");
+    expect(mocks.navigate).not.toHaveBeenCalled();
   });
-  beforeEach(() => {
-    mocks.navigate.mockReset();
-    mocks.isDevelopmentBypass = false;
-    localStorage.clear();
-    localStorage.setItem(
-      "orgii-mobile-remote-config:user:user-a",
-      JSON.stringify({ wsUrl: "wss://relay.example.test/v1/mobile/ws" })
+  it("retains shared confirmation: cancel returns to Profile, confirmed signout fires once after cleanup", async () => {
+    await render();
+    await click("profile.open", host);
+    await click("settings.signOut");
+    expect(dialog()?.getAttribute("aria-label")).toBe(
+      "settings.signOutConfirmTitle"
     );
+    expect(mocks.signOut).not.toHaveBeenCalled();
+    await click("settings.cancel");
+    expect(dialog()?.getAttribute("aria-label")).toBe("profile.title");
+    await click("settings.signOut");
+    mocks.signOut.mockImplementation(() => {
+      expect(dialog()).toBeNull();
+      expect(document.body.style.overflow).toBe("");
+    });
+    const confirm = button("settings.signOut");
+    await act(async () => {
+      confirm.click();
+      confirm.click();
+    });
+    expect(mocks.signOut).toHaveBeenCalledTimes(1);
   });
-
-  it("uses shared section rows and localizes protocol permission values", () => {
-    const html = renderToStaticMarkup(React.createElement(SettingsTab));
-
-    expect(html).toContain('data-testid="mobile-remote-connection-settings"');
-    expect(html).toContain('data-testid="mobile-remote-account-settings"');
-    expect(html).toContain("mobile@example.test");
-    expect(html).toContain("section-layout-row");
-    expect(html).toContain("flex-row justify-between gap-4");
-    expect(html).toContain("flex min-w-0 items-center flex-1");
-    expect(html).toContain("block w-full min-w-0 truncate text-right");
-    expect(html).toContain("Home Mac · Online");
-    expect(html).toContain("Full access");
-    expect(html).not.toContain(">full<");
-    expect(html).not.toContain("Revoke pairing");
+  it("keeps web actions in Profile with retry and no local account deletion", async () => {
+    await render();
+    await click("profile.open", host);
+    mocks.navigate.mockRejectedValueOnce(new Error("private failure"));
+    await click("settings.manageAccount");
+    expect(dialog()?.textContent).toContain("settings.openFailed");
+    await click("settings.deleteAccount");
+    expect(dialog()?.textContent).not.toContain("settings.openFailed");
+    expect(dialog()?.textContent).toContain("profile.deleteHint");
+    await click("settings.privacyPolicy");
+    expect(mocks.navigate.mock.calls.map(([url]) => url)).toEqual([
+      "https://org2-cloud-infra.vercel.app/account",
+      "https://org2-cloud-infra.vercel.app/account",
+      "https://org2-cloud-infra.vercel.app/legal/privacy",
+    ]);
+    expect(mocks.signOut).not.toHaveBeenCalled();
+    expect(dialog()?.querySelectorAll(".mobile-profile-group")).toHaveLength(3);
   });
-
-  it("only renders help actions when the owning behavior is supplied", () => {
-    const html = renderToStaticMarkup(
-      React.createElement(SettingsTab, {
-        onOpenPairingGuide: vi.fn(),
-        onRevokePairing: vi.fn(),
-      })
+  it("keeps desktop and permissions without a connection-details entry or hidden endpoint", async () => {
+    const original = mocks.config.wsUrl;
+    await render();
+    expect(host.textContent).toContain("Home Mac · settings.online");
+    expect(host.textContent).toContain("settings.permissionFull");
+    expect(host.textContent).not.toContain("settings.connectionDetails");
+    expect(host.textContent).not.toContain("settings.relay");
+    expect(host.textContent).not.toContain("settings.mode");
+    expect(host.innerHTML).not.toMatch(
+      /relay.example.test|password|ticket=secret|#pairing/
     );
-
-    expect(html).toContain('data-testid="mobile-remote-help-settings"');
-    expect(html).toContain("Pairing guide");
-    expect(html).toContain("Revoke pairing");
-    expect(html.match(/<button/g)).toHaveLength(6);
-    expect(html).toContain("settings.manageAccount");
-    expect(html).toContain("settings.deleteAccount");
-    expect(html).toContain("settings.privacyPolicy");
+    const connection = host.querySelector(
+      '[data-testid="mobile-remote-connection-settings"]'
+    )!;
+    expect(connection.querySelector("button")).toBeNull();
+    expect(mocks.config.wsUrl).toBe(original);
+    expect(mocks.navigate).not.toHaveBeenCalled();
   });
-
-  it("does not render a non-functional sign-out action for the development bypass", () => {
-    mocks.isDevelopmentBypass = true;
-
-    const html = renderToStaticMarkup(React.createElement(SettingsTab));
-
-    expect(html).toContain("mobile@example.test");
-    expect(html).not.toContain("Sign out");
+  it("places optional revoke in authorization, not help, and never renders an unwired action", async () => {
+    await render();
+    expect(host.textContent).not.toContain("settings.revokePairing");
+    const onRevokePairing = vi.fn(),
+      onOpenPairingGuide = vi.fn();
+    await render({ onRevokePairing, onOpenPairingGuide });
+    expect(
+      host.querySelector('[data-testid="mobile-remote-authorization-settings"]')
+        ?.textContent
+    ).toContain("settings.revokePairing");
+    expect(
+      host.querySelector('[data-testid="mobile-remote-help-settings"]')
+        ?.textContent
+    ).not.toContain("settings.revokePairing");
+    await click("settings.revokePairing", host);
+    expect(onRevokePairing).toHaveBeenCalledTimes(1);
+    expect(onOpenPairingGuide).not.toHaveBeenCalled();
   });
-
-  it("maps both wire permission tiers to presentation copy", () => {
-    const t = (key: string) => translations[key] ?? key;
-    expect(resolvePermissionTierLabel("full", t)).toBe("Full access");
-    expect(resolvePermissionTierLabel("read_only", t)).toBe("Read only");
+  it("supports Profile/help in development bypass without fake account actions", async () => {
+    mocks.bypass = true;
+    await render();
+    await click("profile.open", host);
+    expect(dialog()?.textContent).toContain("profile.development");
+    for (const key of [
+      "settings.signOut",
+      "settings.deleteAccount",
+      "settings.manageAccount",
+    ])
+      expect(dialog()?.textContent).not.toContain(key);
+    await click("profile.help");
+    expect(dialog()?.textContent).toContain("profile.connectionHelp");
+  });
+  it("localizes protocol permissions", () => {
+    expect(resolvePermissionTierLabel("full", (key) => key)).toBe(
+      "settings.permissionFull"
+    );
+    expect(resolvePermissionTierLabel("read_only", (key) => key)).toBe(
+      "settings.permissionReadOnly"
+    );
   });
 });
diff --git a/src/modules/MobileRemote/screens/settings/SettingsTab.tsx b/src/modules/MobileRemote/screens/settings/SettingsTab.tsx
index 7abb8b3f6b..7f5186738b 100644
--- a/src/modules/MobileRemote/screens/settings/SettingsTab.tsx
+++ b/src/modules/MobileRemote/screens/settings/SettingsTab.tsx
@@ -3,8 +3,7 @@ import { useTranslation } from "react-i18next";
 
 import Button from "@src/components/Button";
 import { InlineBanner } from "@src/components/InlineBanner";
-import { ORG2_CLOUD_OFFICIAL_WEB_ORIGIN } from "@src/features/Org2Cloud/config";
-import { ArrowRight02Icon, HugeiconsIcon, Unlink02Icon } from "@src/icons";
+import { ArrowRight02Icon, HugeiconsIcon } from "@src/icons";
 import {
   SECTION_VALUE_SMALL_MUTED_CLASSES,
   SectionContainer,
@@ -12,38 +11,9 @@ import {
 } from "@src/modules/shared/layouts/SectionLayout";
 
 import { useMobileRemote } from "../../app";
-import { useMobileAuth } from "../../auth/MobileAuthContext";
 import { MobileTopBar } from "../../components/MobileTopBar";
-import { MobileConfirmModal } from "../../components/modals/MobileConfirmModal";
-import { buildMobileWsUrl } from "../../connection/buildMobileWsUrl";
-import type {
-  MobileConnectionConfig,
-  MobilePermissionTier,
-} from "../../connection/types";
-import { useMobileRemotePlatform } from "../../platform";
-
-export function resolveRelayLabel(
-  config: MobileConnectionConfig | null,
-  demoMode: boolean
-): string {
-  if (demoMode) {
-    return "demo";
-  }
-  if (!config) {
-    return "";
-  }
-  try {
-    if (config.wsUrl?.trim()) {
-      return config.wsUrl.trim();
-    }
-    if (config.host?.trim()) {
-      return buildMobileWsUrl(config);
-    }
-  } catch {
-    return "";
-  }
-  return "";
-}
+import { MobileProfileEntry } from "../../components/profile/MobileProfileEntry";
+import type { MobilePermissionTier } from "../../connection/types";
 
 function presenceLabel(
   presence: "online" | "offline" | "unknown",
@@ -78,111 +48,33 @@ export interface SettingsTabProps {
   onRevokePairing?: () => void;
 }
 
-/** M-17 Settings — connection info and demo/live mode label. */
+/** Connection preferences and one entry into the shared account destination. */
 export function SettingsTab({
   onOpenPairingGuide,
   onRevokePairing,
 }: SettingsTabProps) {
   const { t } = useTranslation("mobileRemote");
-  const { connection, connectionConfig } = useMobileRemote();
-  const { session, signOut, isDevelopmentBypass } = useMobileAuth();
-  const [confirmSignOut, setConfirmSignOut] = React.useState(false);
-  const platform = useMobileRemotePlatform();
-  const [opening, setOpening] = React.useState(false);
-  const [openFailed, setOpenFailed] = React.useState(false);
-  const openingRef = React.useRef(false);
-  const openCloudPage = async (path: "/account" | "/legal/privacy") => {
-    if (openingRef.current) return;
-    openingRef.current = true;
-    setOpening(true);
-    setOpenFailed(false);
-    try {
-      await platform.openExternal(
-        new URL(path, ORG2_CLOUD_OFFICIAL_WEB_ORIGIN).href
-      );
-    } catch {
-      setOpenFailed(true);
-    } finally {
-      openingRef.current = false;
-      setOpening(false);
-    }
-  };
-
-  const relayLabel = resolveRelayLabel(connectionConfig, connection.demoMode);
+  const { connection } = useMobileRemote();
 
   const desktopValue = connection.desktopName
     ? `${connection.desktopName} · ${presenceLabel(connection.presence, t)}`
     : t("settings.notAvailable");
 
-  const modeLabel = connection.demoMode
-    ? t("settings.modeDemo")
-    : t("settings.modeLive");
-
   return (
     <>
       <MobileTopBar title={t("settings.title")} />
-      {confirmSignOut && !isDevelopmentBypass ? (
-        <MobileConfirmModal
-          title={t("settings.signOutConfirmTitle")}
-          description={t("settings.signOutConfirmBody")}
-          cancelLabel={t("settings.cancel")}
-          confirmLabel={t("settings.signOut")}
-          danger
-          onDismiss={() => setConfirmSignOut(false)}
-          onConfirm={signOut}
-        />
-      ) : null}
       {connection.demoMode ? (
         <InlineBanner tone="info">{t("settings.demoBanner")}</InlineBanner>
       ) : null}
-      <div className="flex-1 overflow-y-auto px-4 py-4">
+      <div className="mobile-flow-screen flex-1 px-4 py-4">
         <div className="flex flex-col gap-5">
           <SectionContainer
             title={t("settings.account")}
             dataTestId="mobile-remote-account-settings"
           >
-            <SettingsValueRow
-              label={t("settings.signedInAs")}
-              value={
-                session.profile?.primaryEmail ??
-                session.profile?.displayName ??
-                session.userId
-              }
-            />
-            {!isDevelopmentBypass ? (
-              <>
-                <SectionRow showHeader={false}>
-                  <p className="text-sm text-text-2">
-                    {t("settings.accountWebHint")}
-                  </p>
-                </SectionRow>
-                <SettingsActionRow
-                  label={t("settings.manageAccount")}
-                  disabled={opening}
-                  onClick={() => void openCloudPage("/account")}
-                />
-                <SettingsActionRow
-                  label={t("settings.deleteAccount")}
-                  disabled={opening}
-                  onClick={() => void openCloudPage("/account")}
-                />
-                <SettingsActionRow
-                  label={t("settings.signOut")}
-                  danger
-                  onClick={() => setConfirmSignOut(true)}
-                />
-              </>
-            ) : null}
-            <SettingsActionRow
-              label={t("settings.privacyPolicy")}
-              disabled={opening}
-              onClick={() => void openCloudPage("/legal/privacy")}
-            />
-            {openFailed ? (
-              <InlineBanner tone="info">
-                {t("settings.openFailed")}
-              </InlineBanner>
-            ) : null}
+            <SectionRow showHeader={false} className="!py-0">
+              <MobileProfileEntry variant="row" />
+            </SectionRow>
           </SectionContainer>
 
           <SectionContainer
@@ -193,39 +85,33 @@ export function SettingsTab({
               label={t("settings.desktop")}
               value={desktopValue}
             />
-            <SettingsValueRow
-              label={t("settings.relay")}
-              value={
-                connection.demoMode
-                  ? t("settings.notAvailable")
-                  : relayLabel || t("settings.unknownRelay")
-              }
-            />
+          </SectionContainer>
+
+          <SectionContainer
+            title={t("settings.authorization")}
+            dataTestId="mobile-remote-authorization-settings"
+          >
             <SettingsValueRow
               label={t("settings.permissionTier")}
               value={resolvePermissionTierLabel(connection.tier, t)}
             />
-            <SettingsValueRow label={t("settings.mode")} value={modeLabel} />
+            {onRevokePairing ? (
+              <SettingsActionRow
+                label={t("settings.revokePairing")}
+                danger
+                onClick={onRevokePairing}
+              />
+            ) : null}
           </SectionContainer>
-
-          {onOpenPairingGuide || onRevokePairing ? (
+          {onOpenPairingGuide ? (
             <SectionContainer
               title={t("settings.help")}
               dataTestId="mobile-remote-help-settings"
             >
-              {onOpenPairingGuide ? (
-                <SettingsActionRow
-                  label={t("settings.pairingGuide")}
-                  onClick={onOpenPairingGuide}
-                />
-              ) : null}
-              {onRevokePairing ? (
-                <SettingsActionRow
-                  label={t("settings.revokePairing")}
-                  danger
-                  onClick={onRevokePairing}
-                />
-              ) : null}
+              <SettingsActionRow
+                label={t("settings.pairingGuide")}
+                onClick={onOpenPairingGuide}
+              />
             </SectionContainer>
           ) : null}
         </div>
@@ -245,7 +131,7 @@ function SettingsValueRow({ label, value }: SettingsRowProps) {
   return (
     <SectionRow label={label} layout="inline" equalColumns>
       <span
-        className={`block w-full min-w-0 truncate text-right ${SECTION_VALUE_SMALL_MUTED_CLASSES}`}
+        className={`block w-full min-w-0 text-right break-all ${SECTION_VALUE_SMALL_MUTED_CLASSES}`}
         title={value}
       >
         {value}
@@ -273,20 +159,29 @@ function SettingsActionRow({
         htmlType="button"
         variant={danger ? "danger" : "tertiary"}
         appearance="ghost"
-        size="small"
+        size="default"
         long
-        icon={
-          <HugeiconsIcon
-            icon={danger ? Unlink02Icon : ArrowRight02Icon}
-            size={16}
-          />
-        }
-        iconPosition="right"
-        className="justify-between !px-0 font-normal"
+        style={{
+          height: "auto",
+          minHeight: 44,
+          padding: 0,
+          whiteSpace: "normal",
+        }}
+        className="font-normal [&>span]:w-full [&>span]:whitespace-normal"
         onClick={onClick}
         disabled={disabled}
       >
-        {label}
+        <span className="flex w-full items-center justify-between gap-3 text-left">
+          <span className="min-w-0 break-words">{label}</span>
+          {!danger ? (
+            <HugeiconsIcon
+              icon={ArrowRight02Icon}
+              size={16}
+              className="shrink-0"
+              aria-hidden
+            />
+          ) : null}
+        </span>
       </Button>
     </SectionRow>
   );
diff --git a/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/index.tsx b/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/index.tsx
index 73de35909a..3b9abdbaac 100644
--- a/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/index.tsx
+++ b/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/index.tsx
@@ -21,13 +21,13 @@ import { useDebouncedCallback } from "@src/hooks/perf";
 import { useSessionView } from "@src/hooks/ui/tabs/useSessionView";
 import { useSelector as useSelectorKernel } from "@src/scaffold/GlobalSpotlight/hooks/selectors/useSelector";
 import { sessionMapAtom } from "@src/store/session/sessionAtom";
+import { createLatestOnlySearchRunner } from "@src/util/latestOnlySearchRunner";
 
 import { ALL_SESSIONS_SEARCH_ICON } from "../../hooks/features/spotlightActionDefinitions.navigation";
 import type { BasePaletteProps } from "../../shared";
 import { PaletteBody, SpotlightShell } from "../../shell";
 import type { PathSegment, SpotlightItem } from "../../types";
 import { buildAllSessionsSearchItems } from "./allSessionsSearchItems";
-import { createLatestOnlySearchRunner } from "./latestOnlySearchRunner";
 
 // ============ PROPS ============
 
diff --git a/src/scaffold/ModalSystem/ModalSystem.test.ts b/src/scaffold/ModalSystem/ModalSystem.test.ts
index 17ad9c9ec9..ecabbb717b 100644
--- a/src/scaffold/ModalSystem/ModalSystem.test.ts
+++ b/src/scaffold/ModalSystem/ModalSystem.test.ts
@@ -141,6 +141,26 @@ describe("Modal opening focus", () => {
     );
   });
 
+  it("keeps custom visual titles named without changing string-title defaults", () => {
+    openModal(createElement("div", null, "Body"));
+    expect(
+      document.querySelector('[role="dialog"]')?.getAttribute("aria-label")
+    ).toBe("Create channel");
+    act(() =>
+      root.render(
+        createElement(Modal, {
+          visible: true,
+          title: createElement("span", null, "File identity"),
+          "aria-label": "example.ts",
+        })
+      )
+    );
+    expect(
+      document.querySelector('[role="dialog"]')?.getAttribute("aria-label")
+    ).toBe("example.ts");
+    expect(document.body.textContent).toContain("File identity");
+  });
+
   it("focuses a textarea when it is the first field", () => {
     openModal(createElement("textarea", { "data-testid": "body" }));
 
diff --git a/src/store/session/__tests__/desktopReadStateBridge.test.ts b/src/store/session/__tests__/desktopReadStateBridge.test.ts
new file mode 100644
index 0000000000..fe4efc235e
--- /dev/null
+++ b/src/store/session/__tests__/desktopReadStateBridge.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { startDesktopReadStateBridge } from "../desktopReadStateBridge";
+
+describe("Desktop read-state listener lifetime", () => {
+  it("releases a listener that resolves after unmount, without installing a store subscriber", async () => {
+    let resolve!: (stop: () => void) => void;
+    const subscribe = vi.fn(() => () => undefined);
+    const notifyChanged = vi.fn(async () => undefined);
+    const stopListener = vi.fn();
+    const stop = startDesktopReadStateBridge({
+      listen: () =>
+        new Promise((yes) => {
+          resolve = yes;
+        }),
+      reply: async () => undefined,
+      notifyChanged,
+      subscribe,
+      read: () => new Set(),
+      mark: () => undefined,
+      onError: vi.fn(),
+    });
+    stop();
+    resolve(stopListener);
+    await Promise.resolve();
+    expect(stopListener).toHaveBeenCalledTimes(1);
+    expect(subscribe).not.toHaveBeenCalled();
+    expect(notifyChanged).not.toHaveBeenCalled();
+  });
+  it("rejects expired and malformed commands before the producing write path", async () => {
+    let receive!: (value: unknown) => void;
+    const mark = vi.fn();
+    const reply = vi.fn(async () => undefined);
+    const stop = startDesktopReadStateBridge({
+      listen: async (handler) => {
+        receive = handler;
+        return () => undefined;
+      },
+      reply,
+      notifyChanged: async () => undefined,
+      subscribe: () => () => undefined,
+      read: () => new Set(),
+      mark,
+      onError: vi.fn(),
+    });
+    await Promise.resolve();
+    const request = {
+      requestId: "r",
+      sessionIds: ["a"],
+      markVisited: true,
+      expiresAtMs: Date.now() - 1,
+    };
+    receive(request);
+    receive({ ...request, expiresAtMs: Date.now() + 5000, sessionIds: [42] });
+    expect(mark).not.toHaveBeenCalled();
+    expect(reply).not.toHaveBeenCalled();
+    stop();
+  });
+});
diff --git a/src/store/session/__tests__/visitedSessionsAtom.test.ts b/src/store/session/__tests__/visitedSessionsAtom.test.ts
index a4e345974a..c989c836e5 100644
--- a/src/store/session/__tests__/visitedSessionsAtom.test.ts
+++ b/src/store/session/__tests__/visitedSessionsAtom.test.ts
@@ -49,6 +49,107 @@ async function loadVisitedSessions() {
 }
 
 describe("visited session persistence", () => {
+  it("synchronizes the real Desktop atom bidirectionally and reconciles after mobile reconnect", async () => {
+    const {
+      store,
+      markSessionVisited,
+      markAllSessionsVisited,
+      markAllSessionsVisitedPersisted,
+      visitedSessionsAtom,
+      visitedSessionIdsAtom,
+    } = await loadVisitedSessions();
+    const { startDesktopReadStateBridge } =
+      await import("../desktopReadStateBridge");
+    const { createMobileReadStateSync } =
+      await import("@src/modules/MobileRemote/app/mobileReadStateSync");
+    type Client =
+      import("@src/modules/MobileRemote/connection/mobileRpcClient").MobileRpcClient;
+    type Handler =
+      import("@src/modules/MobileRemote/connection/mobileRpcClient").RpcNotificationHandler;
+    let receive!: (payload: unknown) => void;
+    let sequence = 0;
+    const waiting = new Map<string, (reply: unknown) => void>();
+    const notifications = new Set<Handler>();
+    const notifyChanged = vi.fn(async () => {
+      notifications.forEach((fn) => fn("session/read_state_changed", {}));
+    });
+    const stop = startDesktopReadStateBridge({
+      listen: async (handler) => {
+        receive = handler;
+        return () => undefined;
+      },
+      reply: async (id, visitedIds) => {
+        waiting.get(id)?.({ visitedIds });
+        waiting.delete(id);
+      },
+      notifyChanged,
+      read: () => store.get(visitedSessionsAtom),
+      mark: markAllSessionsVisitedPersisted,
+      subscribe: (fn) => store.sub(visitedSessionsAtom, fn),
+      onError: (error) => {
+        throw error;
+      },
+    });
+    const client: Client = {
+      call: <T>(method: string, params?: Record<string, unknown>) =>
+        new Promise<T>((resolve) => {
+          const requestId = String(++sequence);
+          waiting.set(requestId, (reply) => resolve(reply as T));
+          receive({
+            requestId,
+            sessionIds: params?.sessionIds,
+            markVisited: method === "session/mark_visited",
+            expiresAtMs: Date.now() + 5000,
+          });
+        }),
+      onNotification: (fn) => {
+        notifications.add(fn);
+        return () => {
+          notifications.delete(fn);
+        };
+      },
+      notify: () => undefined,
+      close: () => undefined,
+      readyState: 1,
+    };
+    const flush = async () => {
+      for (let i = 0; i < 80; i++) await Promise.resolve();
+    };
+    const mobile = createMobileReadStateSync();
+    mobile.watch(["desktop-read", "mobile-read", "while-offline"]);
+    mobile.connect(client, "account/desktop");
+    await flush();
+    expect(mobile.getSnapshot().get("desktop-read")).toBe(false);
+    markSessionVisited("desktop-read");
+    await flush();
+    expect(mobile.getSnapshot().get("desktop-read")).toBe(true);
+    mobile.markVisited("mobile-read");
+    await flush();
+    expect(store.get(visitedSessionsAtom).has("mobile-read")).toBe(true);
+    expect(
+      JSON.parse(localStorage.getItem("orgii:visited-sessions")!)
+    ).toContain("mobile-read");
+    expect(mobile.getSnapshot().get("mobile-read")).toBe(true);
+    mobile.connect(null, "account/desktop");
+    markSessionVisited("while-offline");
+    await flush();
+    mobile.connect(client, "account/desktop");
+    await flush();
+    expect(mobile.getSnapshot().get("while-offline")).toBe(true);
+    const before = notifyChanged.mock.calls.length;
+    markAllSessionsVisited(["batch-a", "batch-a", "batch-b"]);
+    await flush();
+    expect(notifyChanged.mock.calls.length - before).toBe(1);
+    const ids = store.get(visitedSessionIdsAtom);
+    markAllSessionsVisited(["batch-a", "batch-b"]);
+    await flush();
+    expect(store.get(visitedSessionIdsAtom)).toBe(ids);
+    expect(notifyChanged.mock.calls.length - before).toBe(1);
+    mobile.dispose();
+    stop();
+    expect(notifications.size).toBe(0);
+    expect(waiting.size).toBe(0);
+  });
   it("keeps navigation state in memory when persistence exceeds quota", async () => {
     const storage = installStorage({
       "orgii:org2-cloud-v1:auth": "protected-auth",
@@ -61,6 +162,19 @@ describe("visited session persistence", () => {
     expect(store.get(visitedSessionIdsAtom)).toEqual(["session-1"]);
     expect(storage.getItem("orgii:org2-cloud-v1:auth")).toBe("protected-auth");
   });
+  it("does not acknowledge a remote mark until persistence succeeds, including retry after quota recovery", async () => {
+    const storage = installStorage();
+    storage.failWrites = true;
+    const { markAllSessionsVisitedPersisted } = await loadVisitedSessions();
+    expect(() => markAllSessionsVisitedPersisted(["remote"])).toThrow(
+      "Could not persist"
+    );
+    storage.failWrites = false;
+    expect(() => markAllSessionsVisitedPersisted(["remote"])).not.toThrow();
+    expect(JSON.parse(storage.getItem("orgii:visited-sessions")!)).toContain(
+      "remote"
+    );
+  });
 
   it("marks a full unread batch in one persisted update while retaining existing read state", async () => {
     const storage = installStorage({
diff --git a/src/store/session/desktopReadStateBridge.ts b/src/store/session/desktopReadStateBridge.ts
new file mode 100644
index 0000000000..2e8d7abd2f
--- /dev/null
+++ b/src/store/session/desktopReadStateBridge.ts
@@ -0,0 +1,100 @@
+import { z } from "zod/v4";
+
+import { createLogger } from "@src/hooks/logger";
+
+const RequestSchema = z.object({
+  requestId: z.string().min(1).max(100),
+  sessionIds: z.array(z.string().min(1).max(1024)).min(1).max(200),
+  markVisited: z.boolean(),
+  expiresAtMs: z.number().finite(),
+});
+
+interface ReadStateOwnerPort {
+  listen: (handler: (payload: unknown) => void) => Promise<() => void>;
+  reply: (requestId: string, visitedIds: string[]) => Promise<void>;
+  notifyChanged: () => Promise<void>;
+  read: () => ReadonlySet<string>;
+  mark: (ids: readonly string[]) => void;
+  subscribe: (changed: () => void) => () => void;
+  onError: (error: unknown) => void;
+}
+
+/** Desktop's existing visited atom is the owner; transport only requests and
+ * acknowledges operations. Mark-all produces one invalidation, never N RPCs. */
+export function startDesktopReadStateBridge(
+  port: ReadStateOwnerPort
+): () => void {
+  let disposed = false;
+  let unlisten: (() => void) | undefined;
+  let unsubscribe: (() => void) | undefined;
+  let publishing = false;
+  let dirty = false;
+  let previous = port.read();
+  const publish = () => {
+    dirty = true;
+    if (publishing) return;
+    publishing = true;
+    void Promise.resolve()
+      .then(async () => {
+        try {
+          while (!disposed && dirty) {
+            dirty = false;
+            await port.notifyChanged();
+          }
+        } catch (error) {
+          if (!disposed) port.onError(error);
+        } finally {
+          publishing = false;
+        }
+      })
+      .catch((error) => logger.warn("Background operation failed", error));
+  };
+  void port
+    .listen((payload) => {
+      if (disposed) return;
+      const parsed = RequestSchema.safeParse(payload);
+      if (!parsed.success || parsed.data.expiresAtMs <= Date.now()) return;
+      const { requestId, sessionIds, markVisited } = parsed.data;
+      try {
+        if (markVisited) {
+          const known = port.read();
+          port.mark(sessionIds.filter((id) => !known.has(id)));
+        }
+        const visited = port.read();
+        // Never acknowledge a mark based on notification delivery alone.
+        void port
+          .reply(
+            requestId,
+            [...new Set(sessionIds)].filter((id) => visited.has(id))
+          )
+          .catch(port.onError);
+      } catch (error) {
+        port.onError(error);
+      }
+    })
+    .then((stop) => {
+      if (disposed) {
+        stop();
+        return;
+      }
+      unlisten = stop;
+      unsubscribe = port.subscribe(() => {
+        const next = port.read();
+        const changed =
+          next.size !== previous.size ||
+          [...next].some((id) => !previous.has(id));
+        previous = next;
+        if (changed) publish();
+      });
+      // A phone may have connected while the Desktop shell was still loading.
+      publish();
+    })
+    .catch(port.onError);
+  return () => {
+    disposed = true;
+    unsubscribe?.();
+    unlisten?.();
+  };
+}
+
+const logger = createLogger("desktopReadStateBridge");
diff --git a/src/store/session/visitedSessionsAtom.ts b/src/store/session/visitedSessionsAtom.ts
index d8942bef07..a018c5afb7 100644
--- a/src/store/session/visitedSessionsAtom.ts
+++ b/src/store/session/visitedSessionsAtom.ts
@@ -22,6 +22,7 @@ const MAX_VISITED_IDS = 5_000;
 const VisitedSessionIdsStorageSchema = z
   .array(z.string().min(1))
   .transform((ids) => [...new Set(ids)].slice(0, MAX_VISITED_IDS));
+const visitedStorage = createZodJsonStorage(VisitedSessionIdsStorageSchema);
 
 /**
  * Raw localStorage-backed list of visited session IDs.
@@ -30,7 +31,7 @@ const VisitedSessionIdsStorageSchema = z
 export const visitedSessionIdsAtom = atomWithStorage<string[]>(
   STORAGE_KEY,
   [],
-  createZodJsonStorage(VisitedSessionIdsStorageSchema),
+  visitedStorage,
   { getOnInit: true }
 );
 visitedSessionIdsAtom.debugLabel = "visitedSessionIdsAtom";
@@ -68,14 +69,16 @@ export function markAllSessionsVisited(sessionIds: readonly string[]): void {
   if (sessionIds.length === 0) return;
   const store = getInstrumentedStore();
   store.set(visitedSessionIdsAtom, (prev) => {
-    const incoming = sessionIds.filter(Boolean);
+    const incoming = [...new Set(sessionIds.filter(Boolean))];
     if (incoming.length === 0) return prev;
     const incomingSet = new Set(incoming);
     const carryOver = prev.filter((id) => !incomingSet.has(id));
     const next = [...incoming, ...carryOver];
-    return next.length > MAX_VISITED_IDS
-      ? next.slice(0, MAX_VISITED_IDS)
-      : next;
+    const bounded = next.slice(0, MAX_VISITED_IDS);
+    return bounded.length === prev.length &&
+      bounded.every((id, index) => id === prev[index])
+      ? prev
+      : bounded;
   });
 }
 
@@ -83,3 +86,20 @@ export const __VISITED_SESSIONS_INTERNALS = {
   STORAGE_KEY,
   MAX_VISITED_IDS,
 };
+
+/** Remote callers need a durable acknowledgment, unlike local navigation
+ * which intentionally remains usable under a storage-quota failure. */
+export function markAllSessionsVisitedPersisted(
+  sessionIds: readonly string[]
+): void {
+  markAllSessionsVisited(sessionIds);
+  const ids = getInstrumentedStore().get(visitedSessionIdsAtom);
+  const serialized = JSON.stringify(ids);
+  if (localStorage.getItem(STORAGE_KEY) !== serialized) {
+    // A retry must persist even when the in-memory mark is already present.
+    visitedStorage.setItem(STORAGE_KEY, ids);
+  }
+  if (localStorage.getItem(STORAGE_KEY) !== serialized) {
+    throw new Error("Could not persist visited sessions");
+  }
+}
diff --git a/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/latestOnlySearchRunner.test.ts b/src/util/__tests__/latestOnlySearchRunner.test.ts
similarity index 95%
rename from src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/latestOnlySearchRunner.test.ts
rename to src/util/__tests__/latestOnlySearchRunner.test.ts
index e9e3a8ba21..d8374e231b 100644
--- a/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/latestOnlySearchRunner.test.ts
+++ b/src/util/__tests__/latestOnlySearchRunner.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { createLatestOnlySearchRunner } from "./latestOnlySearchRunner";
+import { createLatestOnlySearchRunner } from "../latestOnlySearchRunner";
 
 function deferred() {
   let resolve!: () => void;
diff --git a/src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/latestOnlySearchRunner.ts b/src/util/latestOnlySearchRunner.ts
similarity index 100%
rename from src/scaffold/GlobalSpotlight/palettes/AllSessionsSearchPalette/latestOnlySearchRunner.ts
rename to src/util/latestOnlySearchRunner.ts
diff --git a/src/util/session/sessionDisplayMetadata.ts b/src/util/session/sessionDisplayMetadata.ts
index cf80948f4d..7cefa100ec 100644
--- a/src/util/session/sessionDisplayMetadata.ts
+++ b/src/util/session/sessionDisplayMetadata.ts
@@ -34,7 +34,9 @@ type ImportedSessionDisplayInput = Partial<
 export interface LocalSessionDisplayInput {
   session_id: string;
   user_input?: string;
-  cliAgentType?: Session["cliAgentType"];
+  // Wire adapters can carry an older/newer provider alias. Validation and
+  // fallback stay in parseCliAgentType instead of unsafe casts at each caller.
+  cliAgentType?: string;
   agentOrgId?: string;
   agentDisplayName?: string;
   agentDefinitionId?: string;
diff --git a/src/util/session/sessionStatusDot.ts b/src/util/session/sessionStatusDot.ts
index bb4f8986e1..9e04f1120d 100644
--- a/src/util/session/sessionStatusDot.ts
+++ b/src/util/session/sessionStatusDot.ts
@@ -23,7 +23,7 @@ export function isSessionPendingAsking(session: Session): boolean {
 }
 
 export function isSessionCompletedUnread(
-  session: Session,
+  session: { session_id: string; status: string; mergeStatus?: string | null },
   visitedSessions: ReadonlySet<string>
 ): boolean {
   if (!isTerminalStatus(session.status)) return false;