diff --git a/.github/workflows/npm-telegram-beta-e2e.yml b/.github/workflows/npm-telegram-beta-e2e.yml
index fb50e914e0d..4d734fb95c2 100644
--- a/.github/workflows/npm-telegram-beta-e2e.yml
+++ b/.github/workflows/npm-telegram-beta-e2e.yml
@@ -247,14 +247,117 @@ jobs:
           trap append_telegram_summary EXIT
 
           if [[ -n "${PACKAGE_ARTIFACT_NAME// }" ]]; then
-            mapfile -t package_tgzs < <(find .artifacts/telegram-package-under-test -type f -name "*.tgz" | sort)
-            if [[ "${#package_tgzs[@]}" -ne 1 ]]; then
-              echo "package artifact ${PACKAGE_ARTIFACT_NAME} must contain exactly one .tgz; found ${#package_tgzs[@]}" >&2
-              exit 1
+            package_dir=".artifacts/telegram-package-under-test"
+            manifest="${package_dir}/preflight-manifest.json"
+            if [[ -f "${manifest}" ]]; then
+              package_tgz="$(
+                node - "${manifest}" "${package_dir}" <<'NODE'
+          const crypto = require("node:crypto");
+          const childProcess = require("node:child_process");
+          const fs = require("node:fs");
+          const path = require("node:path");
+          const [manifestPath, packageDir] = process.argv.slice(2);
+          const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+          const entries = [
+            {
+              packageName: "openclaw",
+              packageVersion: manifest.packageVersion,
+              tarballName: manifest.tarballName,
+              tarballSha256: manifest.tarballSha256,
+            },
+            ...(Array.isArray(manifest.dependencyTarballs) ? manifest.dependencyTarballs : []),
+          ];
+          const packageNames = new Set();
+          const tarballNames = new Set();
+          for (const entry of entries) {
+            if (
+              !entry.packageName ||
+              !entry.packageVersion ||
+              !entry.tarballName ||
+              !entry.tarballSha256 ||
+              entry.tarballName !== path.basename(entry.tarballName)
+            ) {
+              throw new Error("package artifact manifest contains invalid tarball metadata");
+            }
+            if (packageNames.has(entry.packageName) || tarballNames.has(entry.tarballName)) {
+              throw new Error("package artifact manifest contains duplicate package metadata");
+            }
+            packageNames.add(entry.packageName);
+            tarballNames.add(entry.tarballName);
+            const tarballPath = path.join(packageDir, entry.tarballName);
+            if (!fs.existsSync(tarballPath)) {
+              throw new Error(`package artifact is missing ${entry.tarballName}`);
+            }
+            const digest = crypto.createHash("sha256").update(fs.readFileSync(tarballPath)).digest("hex");
+            if (digest !== entry.tarballSha256) {
+              throw new Error(`package artifact digest mismatch for ${entry.packageName}`);
+            }
+            const packageJson = JSON.parse(
+              childProcess.execFileSync("tar", ["-xOf", tarballPath, "package/package.json"], {
+                encoding: "utf8",
+              }),
+            );
+            if (packageJson.name !== entry.packageName || packageJson.version !== entry.packageVersion) {
+              throw new Error(`package artifact metadata mismatch for ${entry.packageName}`);
+            }
+          }
+          const artifactTarballs = fs
+            .readdirSync(packageDir, { withFileTypes: true })
+            .filter((entry) => entry.isFile() && entry.name.endsWith(".tgz"))
+            .map((entry) => entry.name);
+          if (
+            artifactTarballs.length !== tarballNames.size ||
+            artifactTarballs.some((name) => !tarballNames.has(name))
+          ) {
+            throw new Error("package artifact tarball set does not match preflight manifest");
+          }
+          process.stdout.write(path.join(packageDir, manifest.tarballName));
+          NODE
+              )"
+              export OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR="${package_dir}"
+            else
+              mapfile -t package_tgzs < <(find "${package_dir}" -type f -name "*.tgz" | sort)
+              if [[ "${#package_tgzs[@]}" -ne 1 ]]; then
+                echo "package artifact ${PACKAGE_ARTIFACT_NAME} without a preflight manifest must contain exactly one tgz; found ${#package_tgzs[@]}" >&2
+                exit 1
+              fi
+              package_tgz="${package_tgzs[0]}"
+              candidate_manifest="${package_dir}/package-candidate.json"
+              node - "${package_tgz}" "${candidate_manifest}" <<'NODE'
+          const crypto = require("node:crypto");
+          const childProcess = require("node:child_process");
+          const fs = require("node:fs");
+          const path = require("node:path");
+          const [tarballPath, manifestPath] = process.argv.slice(2);
+          const packageJson = JSON.parse(
+            childProcess.execFileSync("tar", ["-xOf", tarballPath, "package/package.json"], {
+              encoding: "utf8",
+            }),
+          );
+          if (packageJson.name !== "openclaw" || typeof packageJson.version !== "string") {
+            throw new Error("package artifact tgz is not a versioned openclaw package");
+          }
+          if (fs.existsSync(manifestPath)) {
+            const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+            const expectedTarballName = path.basename(manifest.tarball || "");
+            if (
+              manifest.name !== "openclaw" ||
+              manifest.version !== packageJson.version ||
+              expectedTarballName !== path.basename(tarballPath) ||
+              typeof manifest.sha256 !== "string"
+            ) {
+              throw new Error("package candidate manifest does not match the OpenClaw tarball");
+            }
+            const digest = crypto.createHash("sha256").update(fs.readFileSync(tarballPath)).digest("hex");
+            if (digest !== manifest.sha256) {
+              throw new Error("package candidate digest mismatch");
+            }
+          }
+          NODE
             fi
-            export OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ="${package_tgzs[0]}"
+            export OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ="${package_tgz}"
             if [[ -z "${OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL// }" ]]; then
-              export OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL="$(basename "${package_tgzs[0]}")"
+              export OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL="$(basename "${package_tgz}")"
             fi
           elif [[ -z "${OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL// }" ]]; then
             export OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL="${OPENCLAW_NPM_TELEGRAM_PACKAGE_SPEC}"
diff --git a/.github/workflows/openclaw-npm-release.yml b/.github/workflows/openclaw-npm-release.yml
index f1f8f423850..612dad0cb94 100644
--- a/.github/workflows/openclaw-npm-release.yml
+++ b/.github/workflows/openclaw-npm-release.yml
@@ -396,17 +396,33 @@ jobs:
           fi
           TARBALL_NAME="$PACK_NAME"
           TARBALL_SHA256="$(sha256sum "$PACK_PATH" | awk '{print $1}')"
+          mapfile -t AI_TARBALLS < <(find "$AI_RUNTIME_TARBALL_DIR" -maxdepth 1 -type f -name 'openclaw-ai-*.tgz' -print | sort)
+          if [[ "${#AI_TARBALLS[@]}" -ne 1 ]]; then
+            echo "Expected exactly one packed @openclaw/ai tarball, found ${#AI_TARBALLS[@]}." >&2
+            exit 1
+          fi
+          AI_TARBALL_PATH="${AI_TARBALLS[0]}"
+          AI_TARBALL_NAME="$(basename "$AI_TARBALL_PATH")"
+          AI_TARBALL_SHA256="$(sha256sum "$AI_TARBALL_PATH" | awk '{print $1}')"
+          AI_PACKAGE_VERSION="$(
+            tar -xOf "$AI_TARBALL_PATH" package/package.json |
+              node -e 'let raw = ""; process.stdin.on("data", (chunk) => (raw += chunk)); process.stdin.on("end", () => process.stdout.write(JSON.parse(raw).version));'
+          )"
+          if [[ "$AI_PACKAGE_VERSION" != "$PACKAGE_VERSION" ]]; then
+            echo "Prepared @openclaw/ai version ${AI_PACKAGE_VERSION} does not match openclaw ${PACKAGE_VERSION}." >&2
+            exit 1
+          fi
           ARTIFACT_DIR="$RUNNER_TEMP/openclaw-npm-preflight"
           rm -rf "$ARTIFACT_DIR"
           mkdir -p "$ARTIFACT_DIR"
           cp "$PACK_PATH" "$ARTIFACT_DIR/"
-          cp "$AI_RUNTIME_TARBALL_DIR"/*.tgz "$ARTIFACT_DIR/"
+          cp "$AI_TARBALL_PATH" "$ARTIFACT_DIR/"
           cp "$AI_RUNTIME_TARBALL_DIR/SHA256SUMS" "$ARTIFACT_DIR/ai-runtime-SHA256SUMS"
           cp -R "$DEPENDENCY_EVIDENCE_DIR" "$ARTIFACT_DIR/dependency-evidence"
           printf '%s\n' "$RELEASE_TAG" > "$ARTIFACT_DIR/release-tag.txt"
           printf '%s\n' "$RELEASE_SHA" > "$ARTIFACT_DIR/release-sha.txt"
           printf '%s\n' "$RELEASE_NPM_DIST_TAG" > "$ARTIFACT_DIR/release-npm-dist-tag.txt"
-          ARTIFACT_DIR="$ARTIFACT_DIR" RELEASE_TAG="$RELEASE_TAG" RELEASE_SHA="$RELEASE_SHA" RELEASE_NPM_DIST_TAG="$RELEASE_NPM_DIST_TAG" PACKAGE_VERSION="$PACKAGE_VERSION" TARBALL_NAME="$TARBALL_NAME" TARBALL_SHA256="$TARBALL_SHA256" node <<'NODE'
+          ARTIFACT_DIR="$ARTIFACT_DIR" RELEASE_TAG="$RELEASE_TAG" RELEASE_SHA="$RELEASE_SHA" RELEASE_NPM_DIST_TAG="$RELEASE_NPM_DIST_TAG" PACKAGE_VERSION="$PACKAGE_VERSION" TARBALL_NAME="$TARBALL_NAME" TARBALL_SHA256="$TARBALL_SHA256" AI_PACKAGE_VERSION="$AI_PACKAGE_VERSION" AI_TARBALL_NAME="$AI_TARBALL_NAME" AI_TARBALL_SHA256="$AI_TARBALL_SHA256" node <<'NODE'
           const fs = require("node:fs");
           const path = require("node:path");
           const manifest = {
@@ -418,6 +434,14 @@ jobs:
             packageVersion: process.env.PACKAGE_VERSION,
             tarballName: process.env.TARBALL_NAME,
             tarballSha256: process.env.TARBALL_SHA256,
+            dependencyTarballs: [
+              {
+                packageName: "@openclaw/ai",
+                packageVersion: process.env.AI_PACKAGE_VERSION,
+                tarballName: process.env.AI_TARBALL_NAME,
+                tarballSha256: process.env.AI_TARBALL_SHA256,
+              },
+            ],
             dependencyEvidenceDir: "dependency-evidence",
             dependencyEvidenceManifest: "dependency-evidence/dependency-evidence-manifest.json",
           };
diff --git a/apps/.i18n/native-source.json b/apps/.i18n/native-source.json
index ee6f57d5a50..85ed92fc62f 100644
--- a/apps/.i18n/native-source.json
+++ b/apps/.i18n/native-source.json
@@ -131,7 +131,7 @@
     },
     {
       "kind": "ui-named-argument",
-      "line": 199,
+      "line": 247,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainActivity.kt",
       "source": "OPENCLAW",
       "surface": "android",
@@ -139,7 +139,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 138,
+      "line": 143,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt",
       "source": "Searching…",
       "surface": "android",
@@ -147,7 +147,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 238,
+      "line": 243,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt",
       "source": "Mic off",
       "surface": "android",
@@ -155,7 +155,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 248,
+      "line": 253,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt",
       "source": "Off",
       "surface": "android",
@@ -379,7 +379,7 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 86,
+      "line": 106,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt",
       "source": "Searching…",
       "surface": "android",
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/MainActivity.kt b/apps/android/app/src/main/java/ai/openclaw/app/MainActivity.kt
index 1ec008c8fa2..fd2a1aca187 100644
--- a/apps/android/app/src/main/java/ai/openclaw/app/MainActivity.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/app/MainActivity.kt
@@ -42,16 +42,15 @@ class MainActivity : ComponentActivity() {
   private val viewModel: MainViewModel by viewModels()
   private lateinit var permissionRequester: PermissionRequester
   private var initializedViewModel: MainViewModel? = null
-  private var didAttachRuntimeUi = false
-  private var didStartNodeService = false
   private var didStartViewModelCollectors = false
   private var foreground = false
-  private var pendingIntent: Intent? = null
+  private val pendingIntentRouter = MainActivityPendingIntentRouter()
+  private val runtimeUiStarter = MainActivityRuntimeUiStarter()
   private var screenshotScene: AndroidScreenshotScene? = null
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    pendingIntent = intent
+    pendingIntentRouter.setInitialIntent(intent)
     WindowCompat.setDecorFitsSystemWindows(window, false)
     permissionRequester = PermissionRequester(this)
     if (BuildConfig.DEBUG) {
@@ -111,8 +110,9 @@ class MainActivity : ComponentActivity() {
   override fun onNewIntent(intent: android.content.Intent) {
     super.onNewIntent(intent)
     setIntent(intent)
-    pendingIntent = intent
-    initializedViewModel?.let { handleAssistantIntent(viewModel = it, intent = intent) }
+    pendingIntentRouter.onNewIntent(intent) { routedIntent ->
+      initializedViewModel?.let { handleAssistantIntent(viewModel = it, intent = routedIntent) }
+    }
   }
 
   /**
@@ -123,9 +123,8 @@ class MainActivity : ComponentActivity() {
     initializedViewModel = readyViewModel
     readyViewModel.setForeground(foreground)
     startViewModelCollectors(readyViewModel)
-    pendingIntent?.let { initialIntent ->
+    pendingIntentRouter.activate { initialIntent ->
       handleAssistantIntent(viewModel = readyViewModel, intent = initialIntent)
-      pendingIntent = null
     }
   }
 
@@ -151,18 +150,17 @@ class MainActivity : ComponentActivity() {
     lifecycleScope.launch {
       repeatOnLifecycle(Lifecycle.State.STARTED) {
         readyViewModel.runtimeInitialized.collect { ready ->
-          if (!ready || didAttachRuntimeUi) return@collect
-          if (screenshotScene != null) {
-            didAttachRuntimeUi = true
-            return@collect
-          }
-          // Runtime UI helpers need an Activity owner, so attach once after NodeRuntime is ready.
-          readyViewModel.attachRuntimeUi(owner = this@MainActivity, permissionRequester = permissionRequester)
-          didAttachRuntimeUi = true
-          if (!didStartNodeService) {
-            NodeForegroundService.start(this@MainActivity)
-            didStartNodeService = true
-          }
+          runtimeUiStarter.onRuntimeInitialized(
+            ready = ready,
+            startRuntimeUi = screenshotScene == null,
+            attachRuntimeUi = {
+              // Runtime UI helpers need an Activity owner, so attach once after NodeRuntime is ready.
+              readyViewModel.attachRuntimeUi(owner = this@MainActivity, permissionRequester = permissionRequester)
+            },
+            startNodeService = {
+              NodeForegroundService.start(this@MainActivity)
+            },
+          )
         }
       }
     }
@@ -184,6 +182,56 @@ class MainActivity : ComponentActivity() {
   }
 }
 
+/** Holds launch intents until ViewModel activation, then routes every later intent immediately. */
+internal class MainActivityPendingIntentRouter {
+  private var activated = false
+  private var pendingIntent: Intent? = null
+
+  fun setInitialIntent(intent: Intent?) {
+    if (!activated) pendingIntent = intent
+  }
+
+  fun onNewIntent(
+    intent: Intent,
+    routeIntent: (Intent) -> Unit,
+  ) {
+    if (activated) {
+      routeIntent(intent)
+      return
+    }
+    pendingIntent = intent
+  }
+
+  fun activate(routeIntent: (Intent) -> Unit): Boolean {
+    if (activated) return false
+    activated = true
+    pendingIntent?.let(routeIntent)
+    pendingIntent = null
+    return true
+  }
+}
+
+/** Preserves one-shot runtime UI startup while allowing screenshot fixtures to skip side effects. */
+internal class MainActivityRuntimeUiStarter {
+  private var completed = false
+
+  fun onRuntimeInitialized(
+    ready: Boolean,
+    startRuntimeUi: Boolean,
+    attachRuntimeUi: () -> Unit,
+    startNodeService: () -> Unit,
+  ) {
+    if (!ready || completed) return
+    if (!startRuntimeUi) {
+      completed = true
+      return
+    }
+    attachRuntimeUi()
+    completed = true
+    startNodeService()
+  }
+}
+
 @Composable
 private fun StartupSurface() {
   Surface(
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt b/apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt
index 1d455944100..ff6ac8d2397 100644
--- a/apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/app/MainViewModel.kt
@@ -46,6 +46,11 @@ data class ChatDraft(
   val placement: ChatDraftPlacement,
 )
 
+internal fun shouldStartRuntimeOnForeground(
+  foreground: Boolean,
+  onboardingCompleted: Boolean,
+): Boolean = foreground && onboardingCompleted
+
 /**
  * UI-facing bridge that exposes NodeRuntime and preference state as Compose-friendly StateFlows.
  */
@@ -298,7 +303,12 @@ class MainViewModel(
    */
   fun setForeground(value: Boolean) {
     foreground = value
-    if (value && prefs.onboardingCompleted.value) {
+    if (
+      shouldStartRuntimeOnForeground(
+        foreground = value,
+        onboardingCompleted = prefs.onboardingCompleted.value,
+      )
+    ) {
       queueRuntimeStartup()
     }
     runtimeRef.value?.setForeground(value)
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt
index d57c103085c..f0ec327bef5 100644
--- a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt
@@ -62,6 +62,26 @@ private fun createContextDnsResolver(context: Context): DnsResolver = DnsResolve
 @Suppress("DEPRECATION")
 private fun createLegacyDnsResolver(): DnsResolver = DnsResolver.getInstance()
 
+internal fun gatewayDiscoveryStatusText(
+  localCount: Int,
+  wideAreaRcode: Int?,
+  wideAreaCount: Int,
+): String {
+  val wide =
+    when (wideAreaRcode) {
+      null -> "Wide: ?"
+      Rcode.NOERROR -> "Wide: $wideAreaCount"
+      Rcode.NXDOMAIN -> "Wide: NXDOMAIN"
+      else -> "Wide: ${Rcode.string(wideAreaRcode)}"
+    }
+
+  return when {
+    localCount == 0 && wideAreaRcode == null -> "Searching for gateways…"
+    localCount == 0 -> wide
+    else -> "Local: $localCount • $wide"
+  }
+}
+
 /**
  * Watches local DNS-SD and optional wide-area DNS-SD for reachable OpenClaw gateways.
  */
@@ -306,27 +326,12 @@ class GatewayDiscovery(
     _gateways.value =
       // Merge local and wide-area results deterministically for stable UI selection.
       (localById.values + unicastById.values).sortedBy { it.name.lowercase() }
-    _statusText.value = buildStatusText()
-  }
-
-  private fun buildStatusText(): String {
-    val localCount = localById.size
-    val wideRcode = lastWideAreaRcode
-    val wideCount = lastWideAreaCount
-
-    val wide =
-      when (wideRcode) {
-        null -> "Wide: ?"
-        Rcode.NOERROR -> "Wide: $wideCount"
-        Rcode.NXDOMAIN -> "Wide: NXDOMAIN"
-        else -> "Wide: ${Rcode.string(wideRcode)}"
-      }
-
-    return when {
-      localCount == 0 && wideRcode == null -> "Searching for gateways…"
-      localCount == 0 -> "$wide"
-      else -> "Local: $localCount • $wide"
-    }
+    _statusText.value =
+      gatewayDiscoveryStatusText(
+        localCount = localById.size,
+        wideAreaRcode = lastWideAreaRcode,
+        wideAreaCount = lastWideAreaCount,
+      )
   }
 
   private fun stableId(
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/MainActivityLifecycleTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/MainActivityLifecycleTest.kt
new file mode 100644
index 00000000000..a7174ad3234
--- /dev/null
+++ b/apps/android/app/src/test/java/ai/openclaw/app/MainActivityLifecycleTest.kt
@@ -0,0 +1,95 @@
+package ai.openclaw.app
+
+import android.content.Intent
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [34])
+class MainActivityLifecycleTest {
+  @Test
+  fun pendingIntentRouterUsesLatestIntentBeforeActivation() {
+    val router = MainActivityPendingIntentRouter()
+    val initial = Intent("initial")
+    val replacement = Intent("replacement")
+    val routed = mutableListOf<Intent>()
+
+    router.setInitialIntent(initial)
+    router.onNewIntent(replacement, routed::add)
+
+    assertTrue(router.activate(routed::add))
+    assertEquals(listOf(replacement), routed)
+    assertFalse(router.activate(routed::add))
+    assertEquals(listOf(replacement), routed)
+  }
+
+  @Test
+  fun pendingIntentRouterRoutesImmediatelyAfterActivation() {
+    val router = MainActivityPendingIntentRouter()
+    val routed = mutableListOf<Intent>()
+    val next = Intent("next")
+
+    assertTrue(router.activate(routed::add))
+    router.onNewIntent(next, routed::add)
+    router.setInitialIntent(Intent("ignored"))
+
+    assertEquals(listOf(next), routed)
+  }
+
+  @Test
+  fun runtimeUiStarterWaitsForReadinessAndStartsOnce() {
+    val starter = MainActivityRuntimeUiStarter()
+    var attachCount = 0
+    var serviceCount = 0
+
+    starter.onRuntimeInitialized(
+      ready = false,
+      startRuntimeUi = true,
+      attachRuntimeUi = { attachCount += 1 },
+      startNodeService = { serviceCount += 1 },
+    )
+    starter.onRuntimeInitialized(
+      ready = true,
+      startRuntimeUi = true,
+      attachRuntimeUi = { attachCount += 1 },
+      startNodeService = { serviceCount += 1 },
+    )
+    starter.onRuntimeInitialized(
+      ready = true,
+      startRuntimeUi = true,
+      attachRuntimeUi = { attachCount += 1 },
+      startNodeService = { serviceCount += 1 },
+    )
+
+    assertEquals(1, attachCount)
+    assertEquals(1, serviceCount)
+  }
+
+  @Test
+  fun runtimeUiStarterCompletesWithoutSideEffectsForScreenshotFixture() {
+    val starter = MainActivityRuntimeUiStarter()
+    var attachCount = 0
+    var serviceCount = 0
+
+    starter.onRuntimeInitialized(
+      ready = true,
+      startRuntimeUi = false,
+      attachRuntimeUi = { attachCount += 1 },
+      startNodeService = { serviceCount += 1 },
+    )
+    starter.onRuntimeInitialized(
+      ready = true,
+      startRuntimeUi = true,
+      attachRuntimeUi = { attachCount += 1 },
+      startNodeService = { serviceCount += 1 },
+    )
+
+    assertEquals(0, attachCount)
+    assertEquals(0, serviceCount)
+  }
+}
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/MainViewModelTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/MainViewModelTest.kt
new file mode 100644
index 00000000000..dd03d780043
--- /dev/null
+++ b/apps/android/app/src/test/java/ai/openclaw/app/MainViewModelTest.kt
@@ -0,0 +1,35 @@
+package ai.openclaw.app
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class MainViewModelTest {
+  @Test
+  fun foregroundStartupRequiresForegroundAndCompletedOnboarding() {
+    assertFalse(
+      shouldStartRuntimeOnForeground(
+        foreground = false,
+        onboardingCompleted = true,
+      ),
+    )
+    assertFalse(
+      shouldStartRuntimeOnForeground(
+        foreground = true,
+        onboardingCompleted = false,
+      ),
+    )
+    assertFalse(
+      shouldStartRuntimeOnForeground(
+        foreground = false,
+        onboardingCompleted = false,
+      ),
+    )
+    assertTrue(
+      shouldStartRuntimeOnForeground(
+        foreground = true,
+        onboardingCompleted = true,
+      ),
+    )
+  }
+}
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/gateway/GatewayDiscoveryTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/gateway/GatewayDiscoveryTest.kt
new file mode 100644
index 00000000000..e8b2f78e598
--- /dev/null
+++ b/apps/android/app/src/test/java/ai/openclaw/app/gateway/GatewayDiscoveryTest.kt
@@ -0,0 +1,68 @@
+package ai.openclaw.app.gateway
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.xbill.DNS.Rcode
+
+class GatewayDiscoveryTest {
+  @Test
+  fun statusTextFormatsLocalAndWideAreaDiscoveryStates() {
+    val cases =
+      listOf(
+        StatusCase(
+          localCount = 0,
+          wideAreaRcode = null,
+          wideAreaCount = 0,
+          expected = "Searching for gateways…",
+        ),
+        StatusCase(
+          localCount = 0,
+          wideAreaRcode = Rcode.NOERROR,
+          wideAreaCount = 2,
+          expected = "Wide: 2",
+        ),
+        StatusCase(
+          localCount = 1,
+          wideAreaRcode = Rcode.NOERROR,
+          wideAreaCount = 2,
+          expected = "Local: 1 • Wide: 2",
+        ),
+        StatusCase(
+          localCount = 1,
+          wideAreaRcode = null,
+          wideAreaCount = 0,
+          expected = "Local: 1 • Wide: ?",
+        ),
+        StatusCase(
+          localCount = 0,
+          wideAreaRcode = Rcode.NXDOMAIN,
+          wideAreaCount = 0,
+          expected = "Wide: NXDOMAIN",
+        ),
+        StatusCase(
+          localCount = 2,
+          wideAreaRcode = Rcode.SERVFAIL,
+          wideAreaCount = 0,
+          expected = "Local: 2 • Wide: SERVFAIL",
+        ),
+      )
+
+    for (case in cases) {
+      assertEquals(
+        case.expected,
+        gatewayDiscoveryStatusText(
+          localCount = case.localCount,
+          wideAreaRcode = case.wideAreaRcode,
+          wideAreaCount = case.wideAreaCount,
+        ),
+      )
+    }
+  }
+}
+
+private data class StatusCase(
+  val localCount: Int,
+  val wideAreaRcode: Int?,
+  val wideAreaCount: Int,
+  val expected: String,
+)
diff --git a/docs/channels/qqbot.md b/docs/channels/qqbot.md
index 3f3c0cdb319..2243b9a5e72 100644
--- a/docs/channels/qqbot.md
+++ b/docs/channels/qqbot.md
@@ -259,6 +259,11 @@ STT and TTS support two-level configuration with priority fallback:
 Set `enabled: false` on either to disable. Account-level TTS overrides use the
 same shape as `messages.tts` and deep-merge over channel/global TTS config.
 
+STT requests time out after 60 seconds by default. Plugin-specific STT uses the
+selected `models.providers.<id>.timeoutSeconds` override. Framework audio STT
+uses `tools.media.audio.models[0].timeoutSeconds`, then
+`tools.media.audio.timeoutSeconds`, then the selected provider override.
+
 Inbound QQ voice attachments are exposed to agents as audio media metadata
 while keeping raw voice files out of generic `MediaPaths`. `[[audio_as_voice]]`
 in a plain-text reply synthesizes TTS and sends a native QQ voice message when
diff --git a/docs/concepts/managed-worktrees.md b/docs/concepts/managed-worktrees.md
index 6aee5660ccd..9158ea74265 100644
--- a/docs/concepts/managed-worktrees.md
+++ b/docs/concepts/managed-worktrees.md
@@ -47,7 +47,9 @@ A nonzero exit aborts creation and removes the new worktree and branch. This is
 
 Start an isolated chat from the active agent's git workspace with **New chat in worktree**: use the secondary New Chat action in the Control UI sidebar, the Chat actions menu on iOS, or the overflow action beside New Chat on Android. The action is available only for a git-backed agent where the client has that capability; clients that cannot preflight it surface the gateway error instead.
 
-Coding agents can also call `spawn_task` when they discover confirmed follow-up work outside the current task. The Control UI shows a suggestion chip without starting anything. Selecting **Start in worktree** creates a fresh session-owned worktree from the suggested project and sends the self-contained prompt as its first turn; dismissing the chip leaves the repository untouched. Suggestions and their IDs are ephemeral and do not survive a Gateway restart.
+Coding agents can also call `spawn_task` when they discover confirmed follow-up work outside the current task. The Control UI shows a suggestion chip without starting anything, while a Gateway-backed TUI shows an interactive prompt with the same actions. Selecting **Start in worktree** creates a fresh session-owned worktree from the suggested project and sends the self-contained prompt as its first turn; dismissing the suggestion leaves the repository untouched. Suggestions and their IDs are ephemeral and do not survive a Gateway restart.
+
+OpenClaw exposes these tools only to operator sessions with an actionable Gateway UI. Channel sessions and local/embedded TUI sessions do not receive them until those surfaces have a portable typed task-action contract.
 
 The resulting managed worktree is owned by the session, and every agent run in that session uses its checkout. When the workspace is a repository subdirectory, the worktree is anchored at the repository root and the session runs from the matching subdirectory inside it. Session worktree creation uses the method's `operator.write` scope, but the `.openclaw/worktree-setup.sh` step runs only for `operator.admin` callers because it executes repository code; `.worktreeinclude` provisioning still applies to every caller. Deleting the session removes the worktree only when doing so is lossless. Dirty worktrees or branches with unpushed commits stay available; hourly cleanup snapshots session worktrees after 7 idle days, treating recent session activity as worktree activity. Removed worktrees remain restorable from their snapshots as described below.
 
diff --git a/docs/gateway/config-tools.md b/docs/gateway/config-tools.md
index d3d7cb8188b..e542ef22098 100644
--- a/docs/gateway/config-tools.md
+++ b/docs/gateway/config-tools.md
@@ -47,7 +47,9 @@ Local onboarding defaults new local configs to `tools.profile: "coding"` when un
 | `group:openclaw`   | All built-in tools above except `read`/`write`/`edit`/`apply_patch`/`exec`/`process`/`canvas` (excludes plugin tools)                                 |
 | `group:plugins`    | Tools owned by loaded plugins, including configured MCP servers exposed through `bundle-mcp`                                                          |
 
-`spawn_task` lets a coding agent propose confirmed follow-up work without starting it. The Control UI shows the title and summary as an actionable chip; accepting it creates a fresh managed-worktree session and sends the full prompt there while the current turn continues. `dismiss_task` withdraws a still-pending suggestion by the ephemeral `task_id` returned from `spawn_task`. Suggestions are process-local and disappear when the Gateway restarts. Both tools are in the `coding` profile and `group:sessions`, so normal `tools.allow` and `tools.deny` policy configures them automatically.
+`spawn_task` lets a coding agent propose confirmed follow-up work without starting it. The Control UI shows the title and summary as an actionable chip; a Gateway-backed TUI shows an equivalent interactive prompt. Accepting either creates a fresh managed-worktree session and sends the full prompt there while the current turn continues. `dismiss_task` withdraws a still-pending suggestion by the ephemeral `task_id` returned from `spawn_task`.
+
+The tools are offered only when the initiating operator surface can receive and action Gateway task-suggestion events. Channel sessions and local/embedded TUI sessions do not receive them; channel transports need a portable typed task action before they can safely expose this flow. Suggestions are process-local and disappear when the Gateway restarts. Both tools remain in the `coding` profile and `group:sessions`, so normal `tools.allow` and `tools.deny` policy configures them automatically when the surface supports them.
 
 ### MCP and plugin tools inside sandbox tool policy
 
diff --git a/docs/tools/tts.md b/docs/tools/tts.md
index 1b873a77b6b..b3f315963ed 100644
--- a/docs/tools/tts.md
+++ b/docs/tools/tts.md
@@ -868,6 +868,9 @@ Reply -> TTS enabled?
     <ParamField path="timeoutMs" type="number">Command timeout in milliseconds. Default `120000`.</ParamField>
     <ParamField path="cwd" type="string">Optional command working directory.</ParamField>
     <ParamField path="env" type="Record<string, string>">Optional environment overrides for the command.</ParamField>
+
+    Command stdout and generated or converted audio are limited to 50 MiB. Diagnostic stderr is limited to 1 MiB. OpenClaw terminates the command and fails synthesis when either limit is exceeded.
+
   </Accordion>
 
   <Accordion title="Microsoft (no API key)">
diff --git a/extensions/codex/src/app-server/dynamic-tools.test.ts b/extensions/codex/src/app-server/dynamic-tools.test.ts
index 262b2981763..45ee6af454f 100644
--- a/extensions/codex/src/app-server/dynamic-tools.test.ts
+++ b/extensions/codex/src/app-server/dynamic-tools.test.ts
@@ -733,6 +733,41 @@ describe("createCodexDynamicToolBridge", () => {
     expect(text).toContain("rerun with narrower args");
   });
 
+  it("keeps a whole code point when dynamic tool text crosses the configured boundary", async () => {
+    const maxChars = 180;
+    const totalChars = 400;
+    const noticeText = `...(OpenClaw truncated dynamic tool result: original ${totalChars} chars, showing ${maxChars}; rerun with narrower args.)`;
+    const textBudget = maxChars - noticeText.length - 1;
+    const prefix = "a".repeat(textBudget - 1);
+    const longText = `${prefix}😀${"z".repeat(totalChars - prefix.length - 2)}`;
+    const bridge = createCodexDynamicToolBridge({
+      tools: [
+        createTool({
+          name: "large_lookup",
+          execute: vi.fn(async () => textToolResult(longText)),
+        }),
+      ],
+      signal: new AbortController().signal,
+      hookContext: {
+        agentId: "main",
+        config: {
+          agents: { defaults: { contextLimits: { toolResultMaxChars: maxChars } } },
+        } as never,
+      },
+    });
+
+    const result = await bridge.handleToolCall({
+      threadId: "thread-1",
+      turnId: "turn-1",
+      callId: "call-1",
+      namespace: null,
+      tool: "large_lookup",
+      arguments: {},
+    });
+
+    expect(result.contentItems).toEqual([{ type: "inputText", text: `${prefix}\n${noticeText}` }]);
+  });
+
   it("honors normalized per-agent dynamic tool result caps", async () => {
     const bridge = createCodexDynamicToolBridge({
       tools: [
diff --git a/extensions/codex/src/app-server/dynamic-tools.ts b/extensions/codex/src/app-server/dynamic-tools.ts
index 5bfac4e8db7..5b8fbe42e7e 100644
--- a/extensions/codex/src/app-server/dynamic-tools.ts
+++ b/extensions/codex/src/app-server/dynamic-tools.ts
@@ -47,6 +47,7 @@ import {
   asOptionalRecord as readRecord,
   isRecord,
 } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import type { CodexDynamicToolsLoading } from "./config.js";
 import { invalidInlineImageText, sanitizeInlineImageDataUrl } from "./image-payload-sanitizer.js";
 import type {
@@ -1359,16 +1360,18 @@ function convertToolContents(
       continue;
     }
     if (notice.length >= maxChars) {
-      output.push({ type: "inputText", text: noticeText.slice(0, maxChars) });
+      output.push({ type: "inputText", text: truncateUtf16Safe(noticeText, maxChars) });
       appendedNotice = true;
       continue;
     }
     const sliceLength = Math.min(item.text.length, remainingTextBudget);
     remainingTextBudget -= sliceLength;
     const shouldAppendNotice = remainingTextBudget <= 0;
-    const text = item.text.slice(0, sliceLength);
+    const text = truncateUtf16Safe(item.text, sliceLength);
     if (shouldAppendNotice) {
-      output.push({ type: "inputText", text: `${text.trimEnd()}${notice}`.slice(0, maxChars) });
+      // The notice budget is reserved before slicing text, so the combined
+      // result is already bounded without another boundary-sensitive cut.
+      output.push({ type: "inputText", text: `${text.trimEnd()}${notice}` });
       appendedNotice = true;
     } else if (text.length > 0) {
       output.push({ type: "inputText", text });
@@ -1376,7 +1379,7 @@ function convertToolContents(
   }
 
   if (!appendedNotice) {
-    output.push({ type: "inputText", text: noticeText.slice(0, maxChars) });
+    output.push({ type: "inputText", text: truncateUtf16Safe(noticeText, maxChars) });
   }
   return output;
 }
diff --git a/extensions/qqbot/src/engine/gateway/inbound-attachments.test.ts b/extensions/qqbot/src/engine/gateway/inbound-attachments.test.ts
index 970ea535886..e9eb0545eca 100644
--- a/extensions/qqbot/src/engine/gateway/inbound-attachments.test.ts
+++ b/extensions/qqbot/src/engine/gateway/inbound-attachments.test.ts
@@ -73,6 +73,58 @@ describe("engine/gateway/inbound-attachments", () => {
     expect(result.attachmentLocalPaths).toEqual([null]);
   });
 
+  it("classifies image content types case-insensitively when download succeeds", async () => {
+    downloadFileMock.mockResolvedValueOnce("/tmp/openclaw-qqbot-downloads/a.png");
+    downloadFileMock.mockResolvedValueOnce("/tmp/openclaw-qqbot-downloads/b.png");
+
+    const result = await processAttachments(
+      [
+        { content_type: "image/png", url: "https://cdn.example.test/a.png", filename: "a.png" },
+        { content_type: "Image/PNG", url: "https://cdn.example.test/b.png", filename: "b.png" },
+      ],
+      { accountId: "qq", cfg: {}, audioConvert },
+    );
+
+    expect(result.imageUrls).toEqual([
+      "/tmp/openclaw-qqbot-downloads/a.png",
+      "/tmp/openclaw-qqbot-downloads/b.png",
+    ]);
+    // The raw content_type passes through unchanged.
+    expect(result.imageMediaTypes).toEqual(["image/png", "Image/PNG"]);
+    expect(result.attachmentInfo).toBe("");
+  });
+
+  it("uses the remote image URL for a mixed-case image content type when download fails", async () => {
+    downloadFileMock.mockResolvedValue(null);
+
+    const result = await processAttachments(
+      [{ content_type: "Image/PNG", url: "//cdn.example.test/a.png", filename: "a.png" }],
+      { accountId: "qq", cfg: {}, audioConvert },
+    );
+
+    expect(result.imageUrls).toEqual(["https://cdn.example.test/a.png"]);
+    expect(result.imageMediaTypes).toEqual(["Image/PNG"]);
+    expect(result.attachmentLocalPaths).toEqual([null]);
+  });
+
+  it("does not classify a mixed-case non-image content type as an image", async () => {
+    downloadFileMock.mockResolvedValue("/tmp/openclaw-qqbot-downloads/doc.pdf");
+
+    const result = await processAttachments(
+      [
+        {
+          content_type: "Application/PDF",
+          url: "https://cdn.example.test/doc.pdf",
+          filename: "doc.pdf",
+        },
+      ],
+      { accountId: "qq", cfg: {}, audioConvert },
+    );
+
+    expect(result.imageUrls).toEqual([]);
+    expect(result.attachmentInfo).toBe("\n[Attachment: /tmp/openclaw-qqbot-downloads/doc.pdf]");
+  });
+
   it("prefers voice_wav_url for voice downloads and transcribes with configured STT", async () => {
     downloadFileMock.mockResolvedValue("/tmp/openclaw-qqbot-downloads/voice.wav");
     resolveSTTConfigMock.mockReturnValue({
diff --git a/extensions/qqbot/src/engine/gateway/inbound-attachments.ts b/extensions/qqbot/src/engine/gateway/inbound-attachments.ts
index 3a634588518..20f57d65910 100644
--- a/extensions/qqbot/src/engine/gateway/inbound-attachments.ts
+++ b/extensions/qqbot/src/engine/gateway/inbound-attachments.ts
@@ -3,7 +3,10 @@ import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import type { AudioConvertPort } from "../adapter/audio.port.js";
 import { downloadFile } from "../utils/file-utils.js";
 import { getQQBotMediaDir } from "../utils/platform.js";
-import { normalizeOptionalString } from "../utils/string-normalize.js";
+import {
+  normalizeLowercaseStringOrEmpty,
+  normalizeOptionalString,
+} from "../utils/string-normalize.js";
 import { transcribeAudio, resolveSTTConfig } from "../utils/stt.js";
 
 // Re-export the port type for convenience.
@@ -115,6 +118,10 @@ export async function processAttachments(
   const processTasks = downloadResults.map(
     async ({ att, attUrl, isVoice, localPath, audioPath }) => {
       const asrReferText = normalizeOptionalString(att.asr_refer_text) ?? "";
+      // MIME types are case-insensitive (RFC 2045) and relays may emit
+      // mixed-case values; compare lowercased but keep the raw content_type
+      // in returned fields.
+      const normalizedContentType = normalizeLowercaseStringOrEmpty(att.content_type);
       const wavUrl =
         isVoice && att.voice_wav_url
           ? att.voice_wav_url.startsWith("//")
@@ -129,7 +136,7 @@ export async function processAttachments(
       };
 
       if (localPath) {
-        if (att.content_type?.startsWith("image/")) {
+        if (normalizedContentType.startsWith("image/")) {
           log?.debug?.(`Downloaded attachment to: ${localPath}`);
           return { localPath, type: "image" as const, contentType: att.content_type, meta };
         }
@@ -150,7 +157,7 @@ export async function processAttachments(
         return { localPath, type: "other" as const, filename: att.filename, meta };
       }
       log?.error(`Failed to download: ${attUrl}`);
-      if (att.content_type?.startsWith("image/")) {
+      if (normalizedContentType.startsWith("image/")) {
         return {
           localPath: null,
           type: "image-fallback" as const,
diff --git a/extensions/qqbot/src/engine/utils/audio.test.ts b/extensions/qqbot/src/engine/utils/audio.test.ts
index a3010f67fb0..86cacbb5251 100644
--- a/extensions/qqbot/src/engine/utils/audio.test.ts
+++ b/extensions/qqbot/src/engine/utils/audio.test.ts
@@ -97,6 +97,12 @@ describe("engine/utils/audio", () => {
       expect(isVoiceAttachment({ filename: "msg.slac" })).toBe(true);
     });
 
+    it("treats content_type case-insensitively", () => {
+      expect(isVoiceAttachment({ content_type: "Voice" })).toBe(true);
+      expect(isVoiceAttachment({ content_type: "Audio/Silk" })).toBe(true);
+      expect(isVoiceAttachment({ content_type: "Image/PNG" })).toBe(false);
+    });
+
     it("rejects non-voice attachments", () => {
       expect(isVoiceAttachment({ content_type: "image/png" })).toBe(false);
       expect(isVoiceAttachment({ filename: "photo.jpg" })).toBe(false);
diff --git a/extensions/qqbot/src/engine/utils/audio.ts b/extensions/qqbot/src/engine/utils/audio.ts
index 04cea695c98..1718d20a1f1 100644
--- a/extensions/qqbot/src/engine/utils/audio.ts
+++ b/extensions/qqbot/src/engine/utils/audio.ts
@@ -118,7 +118,11 @@ export async function convertSilkToWav(
 
 /** Check whether an attachment is a voice file (by MIME type or extension). */
 export function isVoiceAttachment(att: { content_type?: string; filename?: string }): boolean {
-  if (att.content_type === "voice" || att.content_type?.startsWith("audio/")) {
+  // MIME types are case-insensitive (RFC 2045) and relays may emit mixed-case
+  // values; the bare "voice" platform sentinel gets the same treatment.
+  // Compare lowercased like the extension check below.
+  const contentType = normalizeLowercase(att.content_type);
+  if (contentType === "voice" || contentType.startsWith("audio/")) {
     return true;
   }
   const ext = att.filename ? normalizeLowercase(path.extname(att.filename)) : "";
diff --git a/extensions/qqbot/src/engine/utils/stt.test.ts b/extensions/qqbot/src/engine/utils/stt.test.ts
index 164aab914dc..d23f6c5e2ea 100644
--- a/extensions/qqbot/src/engine/utils/stt.test.ts
+++ b/extensions/qqbot/src/engine/utils/stt.test.ts
@@ -75,6 +75,7 @@ function requireFirstSsrfRequest(): {
   url?: unknown;
   auditContext?: unknown;
   init?: RequestInit;
+  timeoutMs?: unknown;
 } {
   const [call] = ssrfRuntimeMocks.fetchWithSsrFGuard.mock.calls;
   if (!call) {
@@ -84,6 +85,7 @@ function requireFirstSsrfRequest(): {
     url?: unknown;
     auditContext?: unknown;
     init?: RequestInit;
+    timeoutMs?: unknown;
   };
 }
 
@@ -118,6 +120,7 @@ describe("engine/utils/stt", () => {
         providers: {
           openai: {
             apiKey: "provider-key",
+            timeoutSeconds: 45,
           },
         },
       },
@@ -127,6 +130,7 @@ describe("engine/utils/stt", () => {
       baseUrl: "https://api.example.test/v1",
       apiKey: "provider-key",
       model: "whisper-large",
+      timeoutMs: 45_000,
     });
   });
 
@@ -136,13 +140,14 @@ describe("engine/utils/stt", () => {
       tools: {
         media: {
           audio: {
+            timeoutSeconds: 90,
             models: [{ provider: "local", baseUrl: "https://stt.example.test/", model: "sense" }],
           },
         },
       },
       models: {
         providers: {
-          local: { apiKey: "local-key" },
+          local: { apiKey: "local-key", timeoutSeconds: 120 },
         },
       },
     };
@@ -151,7 +156,11 @@ describe("engine/utils/stt", () => {
       baseUrl: "https://stt.example.test",
       apiKey: "local-key",
       model: "sense",
+      timeoutMs: 90_000,
     });
+
+    Object.assign(cfg.tools.media.audio.models[0], { timeoutSeconds: 75 });
+    expect(resolveSTTConfig(cfg)?.timeoutMs).toBe(75_000);
   });
 
   it("returns null when no usable STT credentials are configured", () => {
@@ -191,6 +200,7 @@ describe("engine/utils/stt", () => {
       const request = requireFirstSsrfRequest();
       expect(request.url).toBe("https://api.example.test/v1/audio/transcriptions");
       expect(request.auditContext).toBe("qqbot-stt");
+      expect(request.timeoutMs).toBe(60_000);
       expect(request.init?.method).toBe("POST");
       expect(request.init?.headers).toEqual({ Authorization: "Bearer secret" });
       expect(request.init?.body).toBeInstanceOf(FormData);
diff --git a/extensions/qqbot/src/engine/utils/stt.ts b/extensions/qqbot/src/engine/utils/stt.ts
index cc3457ead94..b6cbc8e3926 100644
--- a/extensions/qqbot/src/engine/utils/stt.ts
+++ b/extensions/qqbot/src/engine/utils/stt.ts
@@ -8,6 +8,7 @@
 import * as fs from "node:fs";
 import path from "node:path";
 import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
+import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import {
   readProviderJsonResponse,
   readResponseTextLimited,
@@ -22,11 +23,23 @@ import {
 } from "./string-normalize.js";
 
 const STT_ERROR_BODY_LIMIT_BYTES = 8 * 1024;
+const DEFAULT_STT_TIMEOUT_MS = 60_000;
 
 interface STTConfig {
   baseUrl: string;
   apiKey: string;
   model: string;
+  timeoutMs: number;
+}
+
+function resolveSTTTimeoutMs(...timeoutSeconds: unknown[]): number {
+  for (const value of timeoutSeconds) {
+    const timeoutMs = finiteSecondsToTimerSafeMilliseconds(value);
+    if (timeoutMs !== undefined) {
+      return timeoutMs;
+    }
+  }
+  return DEFAULT_STT_TIMEOUT_MS;
 }
 
 /** Resolve the STT configuration from the nested config object. */
@@ -45,7 +58,12 @@ export function resolveSTTConfig(cfg: Record<string, unknown>): STTConfig | null
     const apiKey = readString(channelStt, "apiKey") ?? readString(providerCfg, "apiKey");
     const model = readString(channelStt, "model") ?? "whisper-1";
     if (baseUrl && apiKey) {
-      return { baseUrl: baseUrl.replace(/\/+$/, ""), apiKey, model };
+      return {
+        baseUrl: baseUrl.replace(/\/+$/, ""),
+        apiKey,
+        model,
+        timeoutMs: resolveSTTTimeoutMs(providerCfg?.timeoutSeconds),
+      };
     }
   }
 
@@ -62,7 +80,16 @@ export function resolveSTTConfig(cfg: Record<string, unknown>): STTConfig | null
     const apiKey = readString(audioModelEntry, "apiKey") ?? readString(providerCfg, "apiKey");
     const model = readString(audioModelEntry, "model") ?? "whisper-1";
     if (baseUrl && apiKey) {
-      return { baseUrl: baseUrl.replace(/\/+$/, ""), apiKey, model };
+      return {
+        baseUrl: baseUrl.replace(/\/+$/, ""),
+        apiKey,
+        model,
+        timeoutMs: resolveSTTTimeoutMs(
+          audioModelEntry.timeoutSeconds,
+          audio?.timeoutSeconds,
+          providerCfg?.timeoutSeconds,
+        ),
+      };
     }
   }
 
@@ -90,6 +117,7 @@ export async function transcribeAudio(
   const { response: resp, release } = await fetchWithSsrFGuard({
     url: `${sttCfg.baseUrl}/audio/transcriptions`,
     auditContext: "qqbot-stt",
+    timeoutMs: sttCfg.timeoutMs,
     init: {
       method: "POST",
       headers: { Authorization: `Bearer ${sttCfg.apiKey}` },
diff --git a/extensions/tts-local-cli/speech-provider-stream-error.test.ts b/extensions/tts-local-cli/speech-provider-stream-error.test.ts
index 51ce7050b10..40a0fecd983 100644
--- a/extensions/tts-local-cli/speech-provider-stream-error.test.ts
+++ b/extensions/tts-local-cli/speech-provider-stream-error.test.ts
@@ -38,6 +38,7 @@ function createMockChild(): MockChild {
 }
 
 const TEST_CFG = {} as OpenClawConfig;
+const MIB = 1024 * 1024;
 
 type SpeechTarget = SpeechSynthesisRequest["target"];
 
@@ -193,6 +194,25 @@ describe("CLI TTS provider stream error handling", () => {
     );
   });
 
+  it.each([
+    { stream: "stdout", chunkBytes: MIB, repeats: 51, limitBytes: 50 * MIB },
+    { stream: "stderr", chunkBytes: MIB / 2, repeats: 3, limitBytes: MIB },
+  ] as const)("terminates the child when $stream exceeds its byte cap", async (testCase) => {
+    const child = createMockChild();
+    const { promise } = await startSpeech({ child });
+    const chunk = Buffer.alloc(testCase.chunkBytes);
+
+    for (let index = 0; index < testCase.repeats; index += 1) {
+      child[testCase.stream].emit("data", chunk);
+    }
+    expect(child.kill).toHaveBeenCalledTimes(1);
+    child.emit("close", null);
+
+    await expect(promise).rejects.toThrow(
+      `CLI TTS ${testCase.stream} exceeded ${testCase.limitBytes} bytes`,
+    );
+  });
+
   it("waits for close before settling a process error", async () => {
     const child = createMockChild();
     const { promise } = await startSpeech({ child });
diff --git a/extensions/tts-local-cli/speech-provider.test.ts b/extensions/tts-local-cli/speech-provider.test.ts
index 76896e2be52..2ef67d2ec9e 100644
--- a/extensions/tts-local-cli/speech-provider.test.ts
+++ b/extensions/tts-local-cli/speech-provider.test.ts
@@ -1,5 +1,5 @@
 // Tts Local Cli tests cover speech provider plugin behavior.
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { mkdtempSync, readFileSync, rmSync, truncateSync, writeFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/config-contracts";
@@ -22,6 +22,7 @@ vi.mock("openclaw/plugin-sdk/runtime-env", () => ({
 import { buildCliSpeechProvider } from "./speech-provider.js";
 
 const TEST_CFG = {} as OpenClawConfig;
+const MAX_AUDIO_OUTPUT_BYTES = 50 * 1024 * 1024;
 
 function createCliFixture(): { dir: string; script: string } {
   const dir = mkdtempSync(path.join(os.tmpdir(), "openclaw-cli-tts-test-"));
@@ -261,6 +262,93 @@ describe("buildCliSpeechProvider", () => {
     }
   });
 
+  it("rejects oversized CLI output files before reading them", async () => {
+    const fixture = createCliFixture();
+    try {
+      writeFileSync(
+        fixture.script,
+        `
+import { truncateSync, writeFileSync } from "node:fs";
+const outIndex = process.argv.indexOf("--out");
+const outputPath = process.argv[outIndex + 1];
+writeFileSync(outputPath, "");
+truncateSync(outputPath, ${MAX_AUDIO_OUTPUT_BYTES + 1});
+`,
+      );
+
+      await expect(
+        synthesize({
+          providerConfig: baseProviderConfig(fixture.script, {
+            args: [fixture.script, "--out", "{{OutputPath}}"],
+            outputFormat: "wav",
+          }),
+        }),
+      ).rejects.toThrow(`File exceeds ${MAX_AUDIO_OUTPUT_BYTES} bytes`);
+    } finally {
+      rmSync(fixture.dir, { recursive: true, force: true });
+    }
+  });
+
+  it("rejects non-file CLI output artifacts", async () => {
+    const fixture = createCliFixture();
+    try {
+      writeFileSync(
+        fixture.script,
+        `
+import { mkdirSync } from "node:fs";
+const outIndex = process.argv.indexOf("--out");
+mkdirSync(process.argv[outIndex + 1]);
+`,
+      );
+
+      await expect(
+        synthesize({
+          providerConfig: baseProviderConfig(fixture.script, {
+            args: [fixture.script, "--out", "{{OutputPath}}"],
+            outputFormat: "wav",
+          }),
+        }),
+      ).rejects.toThrow("path must be a regular file");
+    } finally {
+      rmSync(fixture.dir, { recursive: true, force: true });
+    }
+  });
+
+  it.each(["voice-note", "telephony"] as const)(
+    "rejects oversized ffmpeg output for %s synthesis",
+    async (mode) => {
+      const fixture = createCliFixture();
+      runFfmpegMock.mockImplementation(async (args) => {
+        const outputPath = args.at(-1);
+        if (typeof outputPath !== "string") {
+          throw new Error("missing ffmpeg output path");
+        }
+        writeFileSync(outputPath, "");
+        truncateSync(outputPath, MAX_AUDIO_OUTPUT_BYTES + 1);
+      });
+      try {
+        const providerConfig = baseProviderConfig(fixture.script, {
+          args: [fixture.script, "--out", "{{OutputPath}}"],
+          outputFormat: "wav",
+        });
+        const run =
+          mode === "voice-note"
+            ? synthesize({ providerConfig, target: "voice-note" })
+            : buildCliSpeechProvider().synthesizeTelephony?.({
+                text: "phone reply",
+                cfg: TEST_CFG,
+                providerConfig,
+                providerOverrides: {},
+                timeoutMs: 1000,
+              });
+
+        await expect(run).rejects.toThrow(`File exceeds ${MAX_AUDIO_OUTPUT_BYTES} bytes`);
+      } finally {
+        rmSync(fixture.dir, { recursive: true, force: true });
+      }
+    },
+  );
+
   it.each(["synthesize", "synthesizeTelephony"] as const)(
     "keeps %s debug previews free of lone surrogates",
     async (method) => {
diff --git a/extensions/tts-local-cli/speech-provider.ts b/extensions/tts-local-cli/speech-provider.ts
index 1bf3d7a1be2..1d71ffd94f5 100644
--- a/extensions/tts-local-cli/speech-provider.ts
+++ b/extensions/tts-local-cli/speech-provider.ts
@@ -1,10 +1,13 @@
 // Tts Local Cli provider module implements model/runtime integration.
 import { spawn } from "node:child_process";
-import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { readdirSync } from "node:fs";
 import path from "node:path";
 import { runFfmpeg } from "openclaw/plugin-sdk/media-runtime";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
-import { writeExternalFileWithinRoot } from "openclaw/plugin-sdk/security-runtime";
+import {
+  readRegularFileSync,
+  writeExternalFileWithinRoot,
+} from "openclaw/plugin-sdk/security-runtime";
 import type {
   SpeechProviderConfig,
   SpeechProviderPlugin,
@@ -30,6 +33,8 @@ type CliConfig = {
 };
 
 const DEFAULT_TIMEOUT_MS = 120_000;
+const MAX_AUDIO_OUTPUT_BYTES = 50 * 1024 * 1024;
+const MAX_CLI_STDERR_BYTES = 1024 * 1024;
 
 function asObject(value: unknown): Record<string, unknown> | undefined {
   return typeof value === "object" && value !== null && !Array.isArray(value)
@@ -172,6 +177,38 @@ function getFileExt(format: string): string {
   return ".mp3";
 }
 
+function readAudioFile(filePath: string): Buffer {
+  return readRegularFileSync({ filePath, maxBytes: MAX_AUDIO_OUTPUT_BYTES }).buffer;
+}
+
+function createBoundedBuffer(label: string, maxBytes: number) {
+  const chunks: Buffer[] = [];
+  let totalBytes = 0;
+  let limitError: Error | undefined;
+
+  return {
+    append(chunk: Buffer | string): Error | undefined {
+      if (limitError) {
+        return limitError;
+      }
+      const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+      const nextTotal = totalBytes + buffer.byteLength;
+      if (nextTotal > maxBytes) {
+        limitError = new Error(`${label} exceeded ${maxBytes} bytes (${nextTotal} bytes received)`);
+        chunks.length = 0;
+        totalBytes = 0;
+        return limitError;
+      }
+      chunks.push(buffer);
+      totalBytes = nextTotal;
+      return undefined;
+    },
+    concat(): Buffer {
+      return Buffer.concat(chunks, totalBytes);
+    },
+  };
+}
+
 async function runCli(params: {
   command: string;
   args: string[];
@@ -231,15 +268,25 @@ async function runCli(params: {
       terminateFor(new Error(`CLI TTS timed out after ${params.timeoutMs}ms`));
     }, params.timeoutMs);
 
-    const stdoutChunks: Buffer[] = [];
-    const stderrChunks: Buffer[] = [];
-    proc.stdout.on("data", (c) => stdoutChunks.push(c));
+    const stdout = createBoundedBuffer("CLI TTS stdout", MAX_AUDIO_OUTPUT_BYTES);
+    const stderr = createBoundedBuffer("CLI TTS stderr", MAX_CLI_STDERR_BYTES);
+    proc.stdout.on("data", (chunk: Buffer) => {
+      const error = stdout.append(chunk);
+      if (error) {
+        terminateFor(error);
+      }
+    });
     proc.stdout.on("error", (e) => {
       // A generated file is authoritative when present. Remember stdout
       // failure so only the stdout-audio fallback is rejected after close.
       stdoutError ??= new Error(`CLI TTS stdout stream error: ${e.message}`);
     });
-    proc.stderr.on("data", (c) => stderrChunks.push(c));
+    proc.stderr.on("data", (chunk: Buffer) => {
+      const error = stderr.append(chunk);
+      if (error) {
+        terminateFor(error);
+      }
+    });
     proc.stderr.on("error", (e) => {
       stderrError ??= new Error(`CLI TTS stderr stream error: ${e.message}`);
     });
@@ -260,36 +307,37 @@ async function runCli(params: {
         return reject(terminalFailure);
       }
       if (code !== 0) {
-        const stderr = Buffer.concat(stderrChunks).toString("utf8");
+        const stderrText = stderr.concat().toString("utf8");
         const diagnostic = stderrError
-          ? [stderr, stderrError.message].filter(Boolean).join("; ")
-          : stderr;
+          ? [stderrText, stderrError.message].filter(Boolean).join("; ")
+          : stderrText;
         return reject(new Error(`CLI TTS exit ${code}: ${diagnostic}`));
       }
 
       const audioFile = findAudioFile(params.outputDir, params.filePrefix);
       if (audioFile) {
-        if (!existsSync(audioFile)) {
-          return reject(new Error(`CLI TTS: output file not found at ${audioFile}`));
-        }
         const format = detectFormat(audioFile);
         if (!format) {
           return reject(new Error(`CLI TTS: unknown format for ${audioFile}`));
         }
-        return resolve({
-          buffer: readFileSync(audioFile),
-          actualFormat: format,
-          audioPath: audioFile,
-        });
+        try {
+          return resolve({
+            buffer: readAudioFile(audioFile),
+            actualFormat: format,
+            audioPath: audioFile,
+          });
+        } catch (error) {
+          return reject(error instanceof Error ? error : new Error(String(error)));
+        }
       }
 
       if (stdoutError) {
         return reject(stdoutError);
       }
-      const stdout = Buffer.concat(stdoutChunks);
-      if (stdout.length > 0) {
+      const stdoutBuffer = stdout.concat();
+      if (stdoutBuffer.length > 0) {
         // Assume WAV for stdout output; could be MP3 but caller should convert if needed
-        return resolve({ buffer: stdout, actualFormat: "wav" });
+        return resolve({ buffer: stdoutBuffer, actualFormat: "wav" });
       }
       reject(new Error("CLI TTS produced no output"));
     });
@@ -302,13 +350,28 @@ async function runCli(params: {
   });
 }
 
+async function runFfmpegToBuffer(params: {
+  args: string[];
+  outputDir: string;
+  outputFileName: string;
+}): Promise<Buffer> {
+  const outputPath = path.join(params.outputDir, params.outputFileName);
+  await writeExternalFileWithinRoot({
+    rootDir: params.outputDir,
+    path: params.outputFileName,
+    write: async (tempPath) => {
+      await runFfmpeg([...params.args, tempPath]);
+    },
+  });
+  return readAudioFile(outputPath);
+}
+
 async function convertAudio(
   inputPath: string,
   outputDir: string,
   target: OutputFormat,
 ): Promise<Buffer> {
   const outputFileName = `converted${getFileExt(target)}`;
-  const outputPath = path.join(outputDir, outputFileName);
   const args = ["-y", "-i", inputPath];
   if (target === "opus") {
     args.push("-c:a", "libopus", "-b:a", "64k", "-f", "opus");
@@ -317,41 +380,26 @@ async function convertAudio(
   } else {
     args.push("-c:a", "libmp3lame", "-b:a", "128k", "-f", "mp3");
   }
-  await writeExternalFileWithinRoot({
-    rootDir: outputDir,
-    path: outputFileName,
-    write: async (tempPath) => {
-      await runFfmpeg([...args, tempPath]);
-    },
-  });
-  return readFileSync(outputPath);
+  return await runFfmpegToBuffer({ args, outputDir, outputFileName });
 }
 
 async function convertToRawPcm(inputPath: string, outputDir: string): Promise<Buffer> {
   // Output raw 16kHz mono 16-bit little-endian PCM (no WAV headers)
   const outputFileName = "telephony.pcm";
-  const outputPath = path.join(outputDir, outputFileName);
-  await writeExternalFileWithinRoot({
-    rootDir: outputDir,
-    path: outputFileName,
-    write: async (tempPath) => {
-      await runFfmpeg([
-        "-y",
-        "-i",
-        inputPath,
-        "-c:a",
-        "pcm_s16le",
-        "-ar",
-        "16000",
-        "-ac",
-        "1",
-        "-f",
-        "s16le",
-        tempPath,
-      ]);
-    },
-  });
-  return readFileSync(outputPath);
+  const args = [
+    "-y",
+    "-i",
+    inputPath,
+    "-c:a",
+    "pcm_s16le",
+    "-ar",
+    "16000",
+    "-ac",
+    "1",
+    "-f",
+    "s16le",
+  ];
+  return await runFfmpegToBuffer({ args, outputDir, outputFileName });
 }
 
 export function buildCliSpeechProvider(): SpeechProviderPlugin {
diff --git a/extensions/xai/src/code-execution-config.ts b/extensions/xai/src/code-execution-config.ts
index ba5a7db558b..264af9283c7 100644
--- a/extensions/xai/src/code-execution-config.ts
+++ b/extensions/xai/src/code-execution-config.ts
@@ -1,7 +1,7 @@
 // Xai helper module supports code execution config behavior.
 import { isXaiToolEnabled, type XaiToolAuthContext } from "./tool-auth-shared.js";
 
-export type CodeExecutionConfig = {
+type CodeExecutionConfig = {
   enabled?: boolean;
   model?: string;
   maxTurns?: number;
diff --git a/extensions/xai/web-search-provider-shared.ts b/extensions/xai/web-search-provider-shared.ts
index 1db3e5ed6df..e07dc7e3100 100644
--- a/extensions/xai/web-search-provider-shared.ts
+++ b/extensions/xai/web-search-provider-shared.ts
@@ -4,7 +4,7 @@ import {
   type WebSearchProviderPlugin,
 } from "openclaw/plugin-sdk/provider-web-search-config-contract";
 
-export const XAI_WEB_SEARCH_CREDENTIAL_PATH = "plugins.entries.xai.config.webSearch.apiKey";
+const XAI_WEB_SEARCH_CREDENTIAL_PATH = "plugins.entries.xai.config.webSearch.apiKey";
 
 export function buildXaiWebSearchProviderBase(): Omit<
   WebSearchProviderPlugin,
diff --git a/extensions/xai/xai-oauth.ts b/extensions/xai/xai-oauth.ts
index 4b580abc09c..618b4fb8c4c 100644
--- a/extensions/xai/xai-oauth.ts
+++ b/extensions/xai/xai-oauth.ts
@@ -18,13 +18,13 @@ import { applyXaiConfig, XAI_DEFAULT_MODEL_REF } from "./onboard.js";
 import { xaiUserAgent } from "./src/xai-user-agent.js";
 
 const PROVIDER_ID = "xai";
-export const XAI_OAUTH_METHOD_ID = "oauth";
-export const XAI_OAUTH_CHOICE_ID = "xai-oauth";
-export const XAI_DEVICE_CODE_METHOD_ID = "device-code";
-export const XAI_DEVICE_CODE_CHOICE_ID = "xai-device-code";
+const XAI_OAUTH_METHOD_ID = "oauth";
+const XAI_OAUTH_CHOICE_ID = "xai-oauth";
+const XAI_DEVICE_CODE_METHOD_ID = "device-code";
+const XAI_DEVICE_CODE_CHOICE_ID = "xai-device-code";
 export const XAI_OAUTH_CLIENT_ID = "b1a00492-073a-47ea-816f-4c329264a828";
 export const XAI_OAUTH_SCOPE = "openid profile email offline_access grok-cli:access api:access";
-export const XAI_OAUTH_ISSUER = "https://auth.x.ai";
+const XAI_OAUTH_ISSUER = "https://auth.x.ai";
 export const XAI_OAUTH_DISCOVERY_URL = `${XAI_OAUTH_ISSUER}/.well-known/openid-configuration`;
 const XAI_LEGACY_OAUTH_TOKEN_ENDPOINT = `${XAI_OAUTH_ISSUER}/oauth/token`;
 
diff --git a/packages/gateway-protocol/src/client-info.ts b/packages/gateway-protocol/src/client-info.ts
index a687aecfb7d..0b1ca5fdee1 100644
--- a/packages/gateway-protocol/src/client-info.ts
+++ b/packages/gateway-protocol/src/client-info.ts
@@ -74,6 +74,7 @@ export type GatewayClientInfo = {
 /** Capability flags a client may advertise during the gateway handshake. */
 export const GATEWAY_CLIENT_CAPS = {
   INLINE_WIDGETS: "inline-widgets",
+  TASK_SUGGESTIONS: "task-suggestions",
   TOOL_EVENTS: "tool-events",
 } as const;
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 92809442cd7..3157a6a6caa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1993,6 +1993,9 @@ importers:
       '@create-markdown/preview':
         specifier: 2.0.3
         version: 2.0.3(shiki@4.3.0)
+      '@lit/context':
+        specifier: 1.1.6
+        version: 1.1.6
       '@noble/ed25519':
         specifier: 3.1.0
         version: 3.1.0
diff --git a/scripts/e2e/lib/plugins/npm-registry-server.mjs b/scripts/e2e/lib/plugins/npm-registry-server.mjs
index 0c59226f194..acfc52ebabb 100644
--- a/scripts/e2e/lib/plugins/npm-registry-server.mjs
+++ b/scripts/e2e/lib/plugins/npm-registry-server.mjs
@@ -1,3 +1,4 @@
+import { execFileSync } from "node:child_process";
 // Fixture npm registry server for plugin E2E scenarios.
 import crypto from "node:crypto";
 import fs from "node:fs";
@@ -5,6 +6,25 @@ import http from "node:http";
 import path from "node:path";
 
 const [portFile, ...packageArgs] = process.argv.slice(2);
+function normalizeUpstreamRegistry(raw) {
+  if (!raw) {
+    return undefined;
+  }
+  const url = new URL(raw);
+  if (
+    (url.protocol !== "http:" && url.protocol !== "https:") ||
+    url.username ||
+    url.password ||
+    url.pathname !== "/" ||
+    url.search ||
+    url.hash
+  ) {
+    throw new Error("OPENCLAW_NPM_REGISTRY_UPSTREAM must be an HTTP(S) origin");
+  }
+  return url.origin;
+}
+
+const upstreamRegistry = normalizeUpstreamRegistry(process.env.OPENCLAW_NPM_REGISTRY_UPSTREAM);
 
 if (!portFile || packageArgs.length === 0 || packageArgs.length % 3 !== 0) {
   console.error(
@@ -14,6 +34,25 @@ if (!portFile || packageArgs.length === 0 || packageArgs.length % 3 !== 0) {
 }
 
 const packages = new Map();
+
+function readPackageManifest(tarballPath, packageName) {
+  try {
+    const packageJson = JSON.parse(
+      execFileSync("tar", ["-xOf", tarballPath, "package/package.json"], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+      }),
+    );
+    return packageJson && typeof packageJson === "object" && !Array.isArray(packageJson)
+      ? packageJson
+      : {};
+  } catch {
+    return packageName === "@openclaw/demo-plugin-npm"
+      ? { dependencies: { "is-number": "7.0.0" } }
+      : {};
+  }
+}
+
 for (let index = 0; index < packageArgs.length; index += 3) {
   const packageName = packageArgs[index];
   const version = packageArgs[index + 1];
@@ -28,8 +67,8 @@ for (let index = 0; index < packageArgs.length; index += 3) {
   existing.latestVersion = version;
   existing.versions.set(version, {
     archive,
-    dependencies: packageName === "@openclaw/demo-plugin-npm" ? { "is-number": "7.0.0" } : {},
     integrity: `sha512-${crypto.createHash("sha512").update(archive).digest("base64")}`,
+    manifest: readPackageManifest(tarballPath, packageName),
     shasum: crypto.createHash("sha1").update(archive).digest("hex"),
     tarballName: path.basename(tarballPath),
     version,
@@ -44,7 +83,7 @@ const metadataFor = (entry, baseUrl) => ({
     [...entry.versions.entries()].map(([version, versionEntry]) => [
       version,
       {
-        dependencies: versionEntry.dependencies,
+        ...versionEntry.manifest,
         name: entry.packageName,
         version,
         dist: {
@@ -85,9 +124,46 @@ function findTarballForPath(pathname) {
   return undefined;
 }
 
-const server = http.createServer((request, response) => {
-  const url = new URL(request.url ?? "/", "http://127.0.0.1");
-  const baseUrl = `http://127.0.0.1:${server.address().port}`;
+function resolveUpstreamRequestUrl(rawRequestUrl) {
+  const raw = rawRequestUrl || "/";
+  if (!raw.startsWith("/") || raw.startsWith("//") || raw.includes("\\")) {
+    throw new Error(`refusing non-origin registry request URL: ${JSON.stringify(raw)}`);
+  }
+  const requestUrl = new URL(raw, "http://127.0.0.1");
+  return `${upstreamRegistry}${requestUrl.pathname}${requestUrl.search}`;
+}
+
+async function proxyUpstream(rawRequestUrl, response) {
+  if (!upstreamRegistry) {
+    return false;
+  }
+  try {
+    const upstreamUrl = resolveUpstreamRequestUrl(rawRequestUrl);
+    const upstreamResponse = await fetch(upstreamUrl, { redirect: "manual" });
+    const body = Buffer.from(await upstreamResponse.arrayBuffer());
+    // Fetch decodes compressed bodies but preserves upstream length metadata.
+    // Emit the decoded size so npm clients do not truncate proxied responses.
+    const headers = { "content-length": String(body.length) };
+    for (const name of ["content-type", "location"]) {
+      const value = upstreamResponse.headers.get(name);
+      if (value) {
+        headers[name] = value;
+      }
+    }
+    response.writeHead(upstreamResponse.status, headers);
+    response.end(body);
+  } catch (error) {
+    response.writeHead(502, { "content-type": "text/plain" });
+    response.end(`upstream registry request failed: ${String(error)}`);
+  }
+  return true;
+}
+
+async function handleRequest(request, response) {
+  const fallbackHost = `127.0.0.1:${server.address().port}`;
+  const requestHost = request.headers.host || fallbackHost;
+  const url = new URL(request.url ?? "/", `http://${requestHost}`);
+  const baseUrl = url.origin;
   if (request.method !== "GET") {
     response.writeHead(405, { "content-type": "text/plain" });
     response.end("method not allowed");
@@ -111,10 +187,27 @@ const server = http.createServer((request, response) => {
     return;
   }
 
+  if (await proxyUpstream(request.url, response)) {
+    return;
+  }
+
   response.writeHead(404, { "content-type": "text/plain" });
   response.end(`not found: ${url.pathname}`);
+}
+
+const server = http.createServer((request, response) => {
+  void handleRequest(request, response).catch((/** @type {unknown} */ error) => {
+    if (!response.headersSent) {
+      response.writeHead(500, { "content-type": "text/plain" });
+      response.end(`registry request failed: ${String(error)}`);
+      return;
+    }
+    response.destroy(error instanceof Error ? error : new Error(String(error)));
+  });
 });
 
-server.listen(0, "127.0.0.1", () => {
+const bindHost = process.env.OPENCLAW_NPM_REGISTRY_BIND_HOST || "127.0.0.1";
+const requestedPort = Number(process.env.OPENCLAW_NPM_REGISTRY_PORT || 0);
+server.listen(requestedPort, bindHost, () => {
   fs.writeFileSync(portFile, String(server.address().port));
 });
diff --git a/scripts/e2e/npm-telegram-live-docker.sh b/scripts/e2e/npm-telegram-live-docker.sh
index 97ccf8ca370..bb529eb5f9a 100755
--- a/scripts/e2e/npm-telegram-live-docker.sh
+++ b/scripts/e2e/npm-telegram-live-docker.sh
@@ -10,6 +10,7 @@ IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-npm-telegram-live-e2e" OPENCLAW
 DOCKER_TARGET="${OPENCLAW_NPM_TELEGRAM_DOCKER_TARGET:-build}"
 PACKAGE_SPEC="${OPENCLAW_NPM_TELEGRAM_PACKAGE_SPEC:-openclaw@beta}"
 PACKAGE_TGZ="${OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ:-${OPENCLAW_CURRENT_PACKAGE_TGZ:-}}"
+PACKAGE_DIR="${OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR:-}"
 PACKAGE_LABEL="${OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL:-}"
 RUN_ID="${OPENCLAW_NPM_TELEGRAM_RUN_ID:-$(date -u +%Y%m%dT%H%M%SZ)-$$}"
 OUTPUT_DIR="${OPENCLAW_NPM_TELEGRAM_OUTPUT_DIR:-.artifacts/qa-e2e/npm-telegram-live/$RUN_ID}"
@@ -77,11 +78,58 @@ resolve_package_tgz() {
   printf "%s/%s" "$dir" "$base"
 }
 
+resolve_package_dir() {
+  local candidate="$1"
+  if [ -z "$candidate" ]; then
+    return 0
+  fi
+  if [ ! -d "$candidate" ]; then
+    echo "OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR must point to an existing directory; got: $candidate" >&2
+    exit 1
+  fi
+  (cd "$candidate" && pwd)
+}
+
+read_package_version() {
+  tar -xOf "$1" package/package.json |
+    node -e '
+let raw = "";
+process.stdin.on("data", (chunk) => (raw += chunk));
+process.stdin.on("end", () => {
+  const version = JSON.parse(raw).version;
+  if (typeof version !== "string" || !version) {
+    throw new Error("package tarball is missing a version");
+  }
+  process.stdout.write(version);
+});
+'
+}
+
 package_mount_args=()
+registry_helper_mount_args=()
 package_install_source="$PACKAGE_SPEC"
 package_source_kind="npm-package"
 resolved_package_tgz="$(resolve_package_tgz "$PACKAGE_TGZ")"
-if [ -n "$resolved_package_tgz" ]; then
+resolved_package_dir="$(resolve_package_dir "$PACKAGE_DIR")"
+if [ -n "$resolved_package_dir" ]; then
+  if [ -z "$resolved_package_tgz" ]; then
+    echo "OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR requires OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ" >&2
+    exit 1
+  fi
+  case "$resolved_package_tgz" in
+    "$resolved_package_dir"/*) ;;
+    *)
+      echo "OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ must be inside OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR" >&2
+      exit 1
+      ;;
+  esac
+  package_install_source="openclaw@$(read_package_version "$resolved_package_tgz")"
+  package_source_kind="prepared-package-set"
+  package_mount_args=(-v "$resolved_package_dir:/package-under-test:ro")
+  registry_helper_mount_args=(
+    -v "$ROOT_DIR/scripts/e2e/lib/plugins/npm-registry-server.mjs:/tmp/openclaw-npm-registry-server.mjs:ro"
+  )
+elif [ -n "$resolved_package_tgz" ]; then
   package_install_source="/package-under-test/$(basename "$resolved_package_tgz")"
   package_source_kind="packed-tarball"
   package_mount_args=(-v "$resolved_package_tgz:$package_install_source:ro")
@@ -248,7 +296,9 @@ run_logged docker_e2e_docker_run_cmd run --rm \
   -e OPENCLAW_E2E_NPM_INSTALL_TIMEOUT="${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" \
   -e OPENCLAW_NPM_TELEGRAM_INSTALL_SOURCE="$package_install_source" \
   -e OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL="$PACKAGE_LABEL" \
+  -e OPENCLAW_NPM_TELEGRAM_PACKAGE_SET="$([ -n "$resolved_package_dir" ] && printf 1 || printf 0)" \
   ${package_mount_args[@]+"${package_mount_args[@]}"} \
+  ${registry_helper_mount_args[@]+"${registry_helper_mount_args[@]}"} \
   -v "$npm_prefix_host:/npm-global" \
   -i "$IMAGE_NAME" bash -s <<'EOF'
 set -euo pipefail
@@ -261,6 +311,74 @@ install_source="${OPENCLAW_NPM_TELEGRAM_INSTALL_SOURCE:?missing OPENCLAW_NPM_TEL
 package_label="${OPENCLAW_NPM_TELEGRAM_PACKAGE_LABEL:-$install_source}"
 echo "Installing ${package_label} from ${install_source}..."
 
+registry_pid=""
+registry_log=""
+cleanup_registry() {
+  if [ -n "$registry_pid" ]; then
+    kill "$registry_pid" >/dev/null 2>&1 || true
+    wait "$registry_pid" >/dev/null 2>&1 || true
+  fi
+  if [ -n "$registry_log" ]; then
+    rm -f "$registry_log"
+  fi
+}
+trap cleanup_registry EXIT
+
+if [ "${OPENCLAW_NPM_TELEGRAM_PACKAGE_SET:-0}" = "1" ]; then
+  shopt -s nullglob
+  package_tgzs=(/package-under-test/*.tgz)
+  shopt -u nullglob
+  if [ "${#package_tgzs[@]}" -eq 0 ]; then
+    echo "prepared package set contains no tgz files" >&2
+    exit 1
+  fi
+  registry_args=()
+  for package_tgz in "${package_tgzs[@]}"; do
+    package_metadata="$(
+      tar -xOf "$package_tgz" package/package.json |
+        node -e '
+let raw = "";
+process.stdin.on("data", (chunk) => (raw += chunk));
+process.stdin.on("end", () => {
+  const pkg = JSON.parse(raw);
+  if (typeof pkg.name !== "string" || !pkg.name || typeof pkg.version !== "string" || !pkg.version) {
+    throw new Error("package tarball is missing name or version");
+  }
+  process.stdout.write(`${pkg.name}\n${pkg.version}\n`);
+});
+'
+    )"
+    mapfile -t package_fields <<<"$package_metadata"
+    registry_args+=("${package_fields[0]}" "${package_fields[1]}" "$package_tgz")
+  done
+  registry_port_file="$(mktemp)"
+  registry_log="$(mktemp)"
+  OPENCLAW_NPM_REGISTRY_UPSTREAM=https://registry.npmjs.org \
+    node /tmp/openclaw-npm-registry-server.mjs \
+    "$registry_port_file" \
+    "${registry_args[@]}" >"$registry_log" 2>&1 &
+  registry_pid=$!
+  for _ in $(seq 1 100); do
+    if [ -s "$registry_port_file" ]; then
+      break
+    fi
+    if ! kill -0 "$registry_pid" >/dev/null 2>&1; then
+      cat "$registry_log" >&2
+      exit 1
+    fi
+    sleep 0.1
+  done
+  if [ ! -s "$registry_port_file" ]; then
+    cat "$registry_log" >&2
+    echo "prepared package registry did not start" >&2
+    exit 1
+  fi
+  registry_url="http://127.0.0.1:$(cat "$registry_port_file")"
+  rm -f "$registry_port_file"
+  export NPM_CONFIG_REGISTRY="$registry_url"
+  export npm_config_registry="$registry_url"
+fi
+
 npm_install_timeout="${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}"
 run_npm_install() {
   if [ -z "$npm_install_timeout" ] || [ "$npm_install_timeout" = "0" ]; then
diff --git a/scripts/e2e/parallels/host-server.ts b/scripts/e2e/parallels/host-server.ts
index 784fb901b20..b719927e0fe 100644
--- a/scripts/e2e/parallels/host-server.ts
+++ b/scripts/e2e/parallels/host-server.ts
@@ -1,11 +1,14 @@
 // Host Server script supports OpenClaw repository automation.
 import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { rm } from "node:fs/promises";
 import { createServer } from "node:http";
 import { createConnection } from "node:net";
+import { tmpdir } from "node:os";
 import path from "node:path";
 import { sleep as delay } from "../../lib/sleep.mjs";
 import { die, run, say, sh, warn } from "./host-command.ts";
-import type { HostServer } from "./types.ts";
+import type { HostServer, NpmRegistryPackage, NpmRegistryServer } from "./types.ts";
 
 const HOST_SERVER_STDERR_LIMIT_BYTES = 64 * 1024;
 const HOST_SERVER_STDERR_DRAIN_MS = 5_000;
@@ -90,6 +93,44 @@ export async function startHostServer(input: {
   };
 }
 
+export async function startNpmRegistryServer(input: {
+  hostIp: string;
+  packages: NpmRegistryPackage[];
+}): Promise<NpmRegistryServer> {
+  if (input.packages.length === 0) {
+    die("npm registry server requires at least one package");
+  }
+  const port = allocateHostPort();
+  const portFile = path.join(tmpdir(), `openclaw-npm-registry-${randomUUID()}.port`);
+  const packageArgs = input.packages.flatMap((pkg) => [pkg.name, pkg.version, pkg.tarballPath]);
+  const child = spawn(
+    process.execPath,
+    ["scripts/e2e/lib/plugins/npm-registry-server.mjs", portFile, ...packageArgs],
+    {
+      env: {
+        ...process.env,
+        OPENCLAW_NPM_REGISTRY_BIND_HOST: "0.0.0.0",
+        OPENCLAW_NPM_REGISTRY_PORT: String(port),
+        OPENCLAW_NPM_REGISTRY_UPSTREAM: "https://registry.npmjs.org",
+      },
+      stdio: ["ignore", "pipe", "pipe"],
+    },
+  );
+  await waitForHostServer(child, port);
+  const url = `http://${input.hostIp}:${port}`;
+  say(`Serve prepared npm package set on ${url}`);
+  return {
+    url,
+    stop: async () => {
+      try {
+        await stopHostServerChild(child);
+      } finally {
+        await rm(portFile, { force: true });
+      }
+    },
+  };
+}
+
 async function stopHostServerChild(
   child: ChildProcessWithoutNullStreams,
   terminateTimeoutMs = 2_000,
diff --git a/scripts/e2e/parallels/linux-smoke.ts b/scripts/e2e/parallels/linux-smoke.ts
index b6ceb1e85f9..b096385a449 100755
--- a/scripts/e2e/parallels/linux-smoke.ts
+++ b/scripts/e2e/parallels/linux-smoke.ts
@@ -130,6 +130,7 @@ const defaultOptions = (): LinuxOptions => ({
   latestVersion: "",
   mode: "both",
   modelId: undefined,
+  npmRegistry: undefined,
   provider: "openai",
   snapshotHint: "fresh",
   targetPackageSpec: "",
@@ -157,6 +158,7 @@ Options:
   --install-version <ver>    Pin site-installer version/dist-tag for the baseline lane.
   --target-package-spec <npm-spec>
                              Install this npm package tarball instead of packing current main.
+  --npm-registry <url>       Registry used for target package installs.
   --keep-server              Leave temp host HTTP server running.
   --json                     Print machine-readable JSON summary.
   -h, --help                 Show help.
@@ -222,6 +224,10 @@ export function parseArgs(argv: string[]): LinuxOptions {
         options.targetPackageSpec = ensureValue(args, i, arg);
         i++;
         break;
+      case "--npm-registry":
+        options.npmRegistry = ensureValue(args, i, arg);
+        i++;
+        break;
       case "--keep-server":
         options.keepServer = true;
         break;
@@ -524,7 +530,17 @@ fi`);
     }
     const tgzUrl = this.server.urlFor(this.artifact.path);
     this.downloadGuestFile(tgzUrl, `/tmp/${tempName}`);
-    this.guestExec(["npm", "install", "-g", `/tmp/${tempName}`, "--no-fund", "--no-audit"]);
+    const npmArgs = ["npm", "install", "-g", `/tmp/${tempName}`, "--no-fund", "--no-audit"];
+    this.guestExec(
+      this.options.npmRegistry
+        ? [
+            "/usr/bin/env",
+            `NPM_CONFIG_REGISTRY=${this.options.npmRegistry}`,
+            `npm_config_registry=${this.options.npmRegistry}`,
+            ...npmArgs,
+          ]
+        : npmArgs,
+    );
     this.guestExec(["openclaw", "--version"]);
   }
 
diff --git a/scripts/e2e/parallels/macos-smoke.ts b/scripts/e2e/parallels/macos-smoke.ts
index 12e2a4e9116..836293fd430 100755
--- a/scripts/e2e/parallels/macos-smoke.ts
+++ b/scripts/e2e/parallels/macos-smoke.ts
@@ -65,6 +65,7 @@ interface MacosOptions {
   hostIp?: string;
   latestVersion?: string;
   installVersion?: string;
+  npmRegistry?: string;
   targetPackageSpec?: string;
   skipLatestRefCheck: boolean;
   keepServer: boolean;
@@ -128,6 +129,7 @@ const defaultOptions = (): MacosOptions => ({
   latestVersion: "",
   mode: "both",
   modelId: undefined,
+  npmRegistry: undefined,
   provider: "openai",
   skipLatestRefCheck: false,
   snapshotHint: "macOS 26.5 latest",
@@ -155,6 +157,7 @@ Options:
   --install-version <ver>    Pin site-installer version/dist-tag for the baseline lane.
   --target-package-spec <npm-spec>
                              Install this npm package tarball instead of packing current main.
+  --npm-registry <url>       Registry used for target package installs.
   --skip-latest-ref-check    Skip the known latest-release ref-mode precheck in upgrade lane.
   --keep-server              Leave temp host HTTP server running.
   --discord-token-env <var>  Host env var name for Discord bot token.
@@ -224,6 +227,10 @@ export function parseArgs(argv: string[]): MacosOptions {
         options.targetPackageSpec = ensureValue(args, i, arg);
         i++;
         break;
+      case "--npm-registry":
+        options.npmRegistry = ensureValue(args, i, arg);
+        i++;
+        break;
       case "--skip-latest-ref-check":
         options.skipLatestRefCheck = true;
         break;
@@ -818,11 +825,14 @@ ${guestOpenClaw} --version`,
   }
 
   private installMain(tempName: string): void {
+    const npmRegistryEnv = this.options.npmRegistry
+      ? `NPM_CONFIG_REGISTRY=${shellQuote(this.options.npmRegistry)} npm_config_registry=${shellQuote(this.options.npmRegistry)} `
+      : "";
     if (this.targetInstallsDirectly()) {
       this
         .guestSh(`printf 'install-source: registry-spec %s\\n' ${shellQuote(this.options.targetPackageSpec || "")}
 for attempt in 1 2; do
-  if ${guestNpm} install -g ${shellQuote(this.options.targetPackageSpec || "")}; then
+  if ${npmRegistryEnv}${guestNpm} install -g ${shellQuote(this.options.targetPackageSpec || "")}; then
     break
   fi
   if [ "$attempt" -eq 2 ]; then
@@ -842,7 +852,7 @@ ${guestOpenClaw} --version`);
 curl -fsSL --connect-timeout 10 --max-time 120 --retry 2 --retry-delay 2 ${shellQuote(
       tgzUrl,
     )} -o /tmp/${tempName}
-${guestNpm} install -g /tmp/${tempName}
+${npmRegistryEnv}${guestNpm} install -g /tmp/${tempName}
 ${guestOpenClaw} --version`);
   }
 
diff --git a/scripts/e2e/parallels/npm-update-scripts.ts b/scripts/e2e/parallels/npm-update-scripts.ts
index b8a5cf1a326..d36fd142fd8 100644
--- a/scripts/e2e/parallels/npm-update-scripts.ts
+++ b/scripts/e2e/parallels/npm-update-scripts.ts
@@ -21,6 +21,7 @@ import type { Platform, ProviderAuth } from "./types.ts";
 interface NpmUpdateScriptInput {
   auth: ProviderAuth;
   expectedNeedle: string;
+  npmRegistry?: string;
   updateTarget: string;
 }
 
@@ -29,6 +30,14 @@ const macosGuestPath =
   "/opt/homebrew/bin:/opt/homebrew/opt/node/bin:/usr/local/bin:/usr/local/sbin:/opt/homebrew/sbin:/usr/bin:/bin:/usr/sbin:/sbin";
 const macosOpenClawCommand = '"$OPENCLAW_BIN"';
 
+function posixNpmRegistryEnv(registry: string | undefined): string {
+  if (!registry) {
+    return "";
+  }
+  const quoted = shellQuote(registry);
+  return `NPM_CONFIG_REGISTRY=${quoted} npm_config_registry=${quoted} `;
+}
+
 function posixModelProviderConfigCommands(
   command: string,
   modelId: string,
@@ -120,8 +129,11 @@ fi`;
 }
 
 function windowsUpdateWithBundledPluginsDisabled(input: NpmUpdateScriptInput): string {
+  const registryEntry = input.npmRegistry
+    ? `; NPM_CONFIG_REGISTRY = ${psSingleQuote(input.npmRegistry)}`
+    : "";
   return `$script:OpenClawUpdateExit = 0
-$updateOutput = Invoke-WithScopedEnv @{ OPENCLAW_DISABLE_BUNDLED_PLUGINS = '1'; OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS = '1' } {
+$updateOutput = Invoke-WithScopedEnv @{ OPENCLAW_DISABLE_BUNDLED_PLUGINS = '1'; OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS = '1'${registryEntry} } {
   Invoke-OpenClaw update --tag ${psSingleQuote(input.updateTarget)} --yes --json --no-restart 2>&1
   $script:OpenClawUpdateExit = $LASTEXITCODE
 }
@@ -255,7 +267,7 @@ wait_for_gateway() {
 }
 scrub_future_plugin_entries
 stop_openclaw_gateway_processes
-OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS=1 OPENCLAW_DISABLE_BUNDLED_PLUGINS=1 "$OPENCLAW_BIN" update --tag ${shellQuote(input.updateTarget)} --yes --json --no-restart
+${posixNpmRegistryEnv(input.npmRegistry)}OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS=1 OPENCLAW_DISABLE_BUNDLED_PLUGINS=1 "$OPENCLAW_BIN" update --tag ${shellQuote(input.updateTarget)} --yes --json --no-restart
 ${posixVersionCheck(macosOpenClawCommand, input.expectedNeedle)}
 start_openclaw_gateway
 wait_for_gateway
@@ -395,7 +407,7 @@ wait_for_gateway() {
 }
 scrub_future_plugin_entries
 stop_openclaw_gateway_processes
-OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS=1 OPENCLAW_DISABLE_BUNDLED_PLUGINS=1 openclaw update --tag ${shellQuote(input.updateTarget)} --yes --json --no-restart
+${posixNpmRegistryEnv(input.npmRegistry)}OPENCLAW_ALLOW_OLDER_BINARY_DESTRUCTIVE_ACTIONS=1 OPENCLAW_DISABLE_BUNDLED_PLUGINS=1 openclaw update --tag ${shellQuote(input.updateTarget)} --yes --json --no-restart
 ${posixVersionCheck("openclaw", input.expectedNeedle)}
 start_openclaw_gateway
 wait_for_gateway
diff --git a/scripts/e2e/parallels/npm-update-smoke.ts b/scripts/e2e/parallels/npm-update-smoke.ts
index 1b443e914b7..26b0af6b20a 100755
--- a/scripts/e2e/parallels/npm-update-smoke.ts
+++ b/scripts/e2e/parallels/npm-update-smoke.ts
@@ -14,12 +14,12 @@ import {
 import {
   die,
   ensureValue,
+  extractPackageJsonFromTgz,
   extractLastOpenClawVersionFromLog,
   isLikelyMacosDesktopHome,
   makeTempDir,
   packOpenClaw,
   packageBuildCommitFromTgz,
-  packageVersionFromTgz,
   parseMacosDsclUserHomeLine,
   parsePlatformList,
   parseProvider,
@@ -34,10 +34,13 @@ import {
   say,
   shellQuote,
   startHostServer,
+  startNpmRegistryServer,
   withProgressOnStderr,
   writeSummaryMarkdown,
   writeJson,
   type HostServer,
+  type NpmRegistryPackage,
+  type NpmRegistryServer,
   type PackageArtifact,
   type Platform,
   type Provider,
@@ -53,6 +56,7 @@ const LOGGED_POST_FORCE_KILL_WAIT_MS = 1_000;
 
 interface NpmUpdateOptions {
   betaValidation?: string;
+  dependencyTarballs: string[];
   freshTargetSpec?: string;
   hostIp?: string;
   macosVm?: string;
@@ -373,6 +377,7 @@ Options:
   --update-target <target>    Target passed to guest 'openclaw update --tag'.
                              Default: host-served tgz packed from current checkout.
   --target-tarball <path>     Host-serve this prepared tgz for update and fresh install.
+  --dependency-tarball <path> Companion package tgz required by the target. Repeatable.
   --fresh-target <npm-spec>   Also run fresh install smoke for this package after update lanes.
   --beta-validation [target]  Resolve a beta tag/alias/version, then run latest->target update
                              plus fresh target install. Default target when flag is bare: beta.
@@ -395,6 +400,7 @@ export function parseArgs(argv: string[]): NpmUpdateOptions {
   const options: NpmUpdateOptions = {
     apiKeyEnv: undefined,
     betaValidation: undefined,
+    dependencyTarballs: [],
     freshTargetSpec: undefined,
     json: false,
     macosVm: undefined,
@@ -422,6 +428,10 @@ export function parseArgs(argv: string[]): NpmUpdateOptions {
         options.targetTarball = ensureValue(args, i, arg);
         i++;
         break;
+      case "--dependency-tarball":
+        options.dependencyTarballs.push(ensureValue(args, i, arg));
+        i++;
+        break;
       case "--fresh-target":
         options.freshTargetSpec = ensureValue(args, i, arg);
         i++;
@@ -481,6 +491,9 @@ export function parseArgs(argv: string[]): NpmUpdateOptions {
       "--target-tarball cannot be combined with --beta-validation, --update-target, or --fresh-target",
     );
   }
+  if (options.dependencyTarballs.length > 0 && !options.targetTarball) {
+    throw new Error("--dependency-tarball requires --target-tarball");
+  }
   return options;
 }
 
@@ -564,6 +577,7 @@ export class NpmUpdateSmoke {
   private harnessTargetFamily = "";
   private hostIp = "";
   protected server: HostServer | null = null;
+  private registryServer: NpmRegistryServer | null = null;
   private artifact: PackageArtifact | null = null;
   private freshTargetSpec = "";
   private startedAt = Date.now();
@@ -574,7 +588,9 @@ export class NpmUpdateSmoke {
   private updateTargetTarball = "";
   private targetTarballPath = "";
   private targetTarballBuildCommit = "";
+  private targetDependencyPackages: NpmRegistryPackage[] = [];
   private targetTarballVersion = "";
+  private targetRegistryUrl = "";
   private macosVm = macosVmDefault;
   private linuxVm = linuxVmDefault;
 
@@ -605,6 +621,7 @@ export class NpmUpdateSmoke {
       await this.runSteps();
     } finally {
       await this.server?.stop().catch(() => undefined);
+      await this.registryServer?.stop().catch(() => undefined);
       await rm(this.tgzDir, { force: true, recursive: true }).catch(() => undefined);
     }
   }
@@ -756,6 +773,9 @@ export class NpmUpdateSmoke {
       auth.apiKeyEnv,
       "--target-package-spec",
       packageSpec,
+      ...(phase === "fresh-target" && this.targetRegistryUrl
+        ? ["--npm-registry", this.targetRegistryUrl]
+        : []),
       "--json",
       ...extraArgs,
     ];
@@ -799,6 +819,31 @@ export class NpmUpdateSmoke {
         path: hostedTarballPath,
         version: this.targetTarballVersion,
       };
+      if (this.targetDependencyPackages.length > 0) {
+        // Prepared sibling packages publish before core, so pre-publish VM installs need
+        // a local registry that serves the exact package set without touching public npm.
+        this.registryServer = await startNpmRegistryServer({
+          hostIp: this.hostIp,
+          packages: [
+            {
+              name: "openclaw",
+              version: this.targetTarballVersion,
+              tarballPath: hostedTarballPath,
+            },
+            ...this.targetDependencyPackages,
+          ],
+        });
+        this.targetRegistryUrl = this.registryServer.url;
+        this.updateTargetTarball = `${this.registryServer.url}/openclaw/-/${path.basename(
+          hostedTarballPath,
+        )}`;
+        this.updateTargetEffective = this.targetTarballVersion;
+        this.freshTargetSpec = this.updateTargetTarball;
+        this.updateExpectedNeedle = this.targetTarballVersion;
+        this.updateTargetPackageVersion = this.targetTarballVersion;
+        this.updateTargetBuildCommit = this.artifact.buildCommitShort ?? "";
+        return;
+      }
       this.server = await startHostServer({
         artifactPath: this.artifact.path,
         dir: this.tgzDir,
@@ -979,6 +1024,7 @@ export class NpmUpdateSmoke {
     const input = {
       auth: this.authForPlatform(platform),
       expectedNeedle: this.updateExpectedNeedle,
+      npmRegistry: this.targetRegistryUrl,
       updateTarget: this.updateTargetEffective,
     };
     switch (platform) {
@@ -1385,10 +1431,42 @@ export class NpmUpdateSmoke {
         throw new Error(`target tarball does not exist: ${targetTarballPath}`);
       }
       this.targetTarballPath = targetTarballPath;
-      [this.targetTarballVersion, this.targetTarballBuildCommit] = await Promise.all([
-        packageVersionFromTgz(targetTarballPath),
+      const [targetPackageJson, targetBuildCommit] = await Promise.all([
+        extractPackageJsonFromTgz<{
+          dependencies?: Record<string, string>;
+          version?: string;
+        }>(targetTarballPath, "package/package.json"),
         packageBuildCommitFromTgz(targetTarballPath),
       ]);
+      this.targetTarballVersion = targetPackageJson.version ?? "";
+      this.targetTarballBuildCommit = targetBuildCommit;
+      this.targetDependencyPackages = await Promise.all(
+        this.options.dependencyTarballs.map(async (dependencyTarball) => {
+          const tarballPath = path.resolve(dependencyTarball);
+          if (!existsSync(tarballPath)) {
+            throw new Error(`dependency tarball does not exist: ${tarballPath}`);
+          }
+          const dependencyPackage = await extractPackageJsonFromTgz<{
+            name?: string;
+            version?: string;
+          }>(tarballPath, "package/package.json");
+          const name = dependencyPackage.name ?? "";
+          const version = dependencyPackage.version ?? "";
+          if (!name || !version || name === "openclaw") {
+            throw new Error(`dependency tarball has invalid package metadata: ${tarballPath}`);
+          }
+          if (targetPackageJson.dependencies?.[name] !== version) {
+            throw new Error(
+              `target tarball requires ${name}@${targetPackageJson.dependencies?.[name] ?? "<missing>"}, but companion tarball provides ${version}`,
+            );
+          }
+          return { name, version, tarballPath };
+        }),
+      );
+      const dependencyNames = new Set(this.targetDependencyPackages.map((pkg) => pkg.name));
+      if (dependencyNames.size !== this.targetDependencyPackages.length) {
+        throw new Error("dependency tarballs must have unique package names");
+      }
       if (!this.targetTarballVersion || !this.targetTarballBuildCommit) {
         throw new Error(
           `target tarball is missing package or build metadata: ${targetTarballPath}`,
diff --git a/scripts/e2e/parallels/smoke-common.ts b/scripts/e2e/parallels/smoke-common.ts
index 27f6675aa23..8f2258afb2b 100644
--- a/scripts/e2e/parallels/smoke-common.ts
+++ b/scripts/e2e/parallels/smoke-common.ts
@@ -24,6 +24,7 @@ export interface SmokeRunOptions {
   json: boolean;
   keepServer: boolean;
   mode: Mode;
+  npmRegistry?: string;
   provider: Provider;
   snapshotHint: string;
   targetPackageSpec?: string;
diff --git a/scripts/e2e/parallels/types.ts b/scripts/e2e/parallels/types.ts
index 19f54bb4a9b..f4b357356d1 100644
--- a/scripts/e2e/parallels/types.ts
+++ b/scripts/e2e/parallels/types.ts
@@ -45,3 +45,14 @@ export interface HostServer {
   urlFor(filePath: string): string;
   stop(): Promise<void>;
 }
+
+export interface NpmRegistryPackage {
+  name: string;
+  version: string;
+  tarballPath: string;
+}
+
+export interface NpmRegistryServer {
+  url: string;
+  stop(): Promise<void>;
+}
diff --git a/scripts/e2e/parallels/windows-smoke.ts b/scripts/e2e/parallels/windows-smoke.ts
index 6994f82fddc..17751d9019e 100755
--- a/scripts/e2e/parallels/windows-smoke.ts
+++ b/scripts/e2e/parallels/windows-smoke.ts
@@ -108,6 +108,7 @@ const defaultOptions = (): WindowsOptions => ({
   latestVersion: "",
   mode: "both",
   modelId: undefined,
+  npmRegistry: undefined,
   provider: "openai",
   skipLatestRefCheck: false,
   snapshotHint: "pre-openclaw-native-e2e-2026-03-12",
@@ -142,6 +143,7 @@ Options:
                              then run openclaw update --channel dev.
   --target-package-spec <npm-spec>
                              Install this npm package tarball instead of packing current main.
+  --npm-registry <url>       Registry used for target package installs.
   --skip-latest-ref-check    Skip latest-release ref-mode precheck.
   --keep-server              Leave temp host HTTP server running.
   --json                     Print machine-readable JSON summary.
@@ -175,6 +177,9 @@ export function parseArgs(argv: string[]): WindowsOptions {
     "--model": (value) => {
       options.modelId = value;
     },
+    "--npm-registry": (value) => {
+      options.npmRegistry = value;
+    },
     "--openai-api-key-env": (value) => {
       options.apiKeyEnv = value;
     },
@@ -567,11 +572,15 @@ Invoke-OpenClaw --version
       die("package artifact/server missing");
     }
     const tgzUrl = this.server.urlFor(this.artifact.path);
+    const registryScript = this.options.npmRegistry
+      ? `$env:NPM_CONFIG_REGISTRY = ${psSingleQuote(this.options.npmRegistry)}`
+      : "";
     return this.guestPowerShellBackground(
       `install-main-${tempName.replaceAll(/[^A-Za-z0-9_-]/g, "-")}`,
       `$ErrorActionPreference = 'Stop'
 $tgz = Join-Path $env:TEMP ${psSingleQuote(tempName)}
 curl.exe -fsSL --connect-timeout 10 --max-time 120 --retry 2 --retry-delay 2 ${psSingleQuote(tgzUrl)} -o $tgz
+${registryScript}
 npm.cmd install -g $tgz --no-fund --no-audit --loglevel=error
 if ($LASTEXITCODE -ne 0) { throw "npm install failed with exit code $LASTEXITCODE" }
 Invoke-OpenClaw --version
diff --git a/scripts/install.sh b/scripts/install.sh
index 413049684bc..83689cda025 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -1073,8 +1073,6 @@ TAGLINES+=("I run on caffeine, JSON5, and the audacity of \"it worked on my mach
 TAGLINES+=("Gateway online—please keep hands, feet, and appendages inside the shell at all times.")
 TAGLINES+=("I speak fluent bash, mild sarcasm, and aggressive tab-completion energy.")
 TAGLINES+=("One CLI to rule them all, and one more restart because you changed the port.")
-TAGLINES+=("If it works, it's automation; if it breaks, it's a \"learning opportunity.\"")
-TAGLINES+=("Pairing codes exist because even bots believe in consent—and good security hygiene.")
 TAGLINES+=("Your .env is showing; don't worry, I'll pretend I didn't see it.")
 TAGLINES+=("I'll do the boring stuff while you dramatically stare at the logs like it's cinema.")
 TAGLINES+=("I'm not saying your workflow is chaotic... I'm just bringing a linter and a helmet.")
@@ -1085,13 +1083,10 @@ TAGLINES+=("Hot reload for config, cold sweat for deploys.")
 TAGLINES+=("I'm the assistant your terminal demanded, not the one your sleep schedule requested.")
 TAGLINES+=("I keep secrets like a vault... unless you print them in debug logs again.")
 TAGLINES+=("Automation with claws: minimal fuss, maximal pinch.")
-TAGLINES+=("I'm basically a Swiss Army knife, but with more opinions and fewer sharp edges.")
 TAGLINES+=("If you're lost, run doctor; if you're brave, run prod; if you're wise, run tests.")
 TAGLINES+=("Your task has been queued; your dignity has been deprecated.")
-TAGLINES+=("I can't fix your code taste, but I can fix your build and your backlog.")
 TAGLINES+=("I'm not magic—I'm just extremely persistent with retries and coping strategies.")
 TAGLINES+=("It's not \"failing,\" it's \"discovering new ways to configure the same thing wrong.\"")
-TAGLINES+=("Give me a workspace and I'll give you fewer tabs, fewer toggles, and more oxygen.")
 TAGLINES+=("I read logs so you can keep pretending you don't have to.")
 TAGLINES+=("If something's on fire, I can't extinguish it—but I can write a beautiful postmortem.")
 TAGLINES+=("I'll refactor your busywork like it owes me money.")
@@ -1101,13 +1096,10 @@ TAGLINES+=("I'm like tmux: confusing at first, then suddenly you can't live with
 TAGLINES+=("I can run local, remote, or purely on vibes—results may vary with DNS.")
 TAGLINES+=("If you can describe it, I can probably automate it—or at least make it funnier.")
 TAGLINES+=("Your config is valid, your assumptions are not.")
-TAGLINES+=("I don't just autocomplete—I auto-commit (emotionally), then ask you to review (logically).")
-TAGLINES+=("Less clicking, more shipping, fewer \"where did that file go\" moments.")
 TAGLINES+=("Claws out, commit in—let's ship something mildly responsible.")
 TAGLINES+=("I'll butter your workflow like a lobster roll: messy, delicious, effective.")
 TAGLINES+=("Shell yeah—I'm here to pinch the toil and leave you the glory.")
 TAGLINES+=("If it's repetitive, I'll automate it; if it's hard, I'll bring jokes and a rollback plan.")
-TAGLINES+=("Because texting yourself reminders is so 2024.")
 TAGLINES+=("WhatsApp, but make it ✨engineering✨.")
 TAGLINES+=("Turning \"I'll reply later\" into \"my bot replied instantly\".")
 TAGLINES+=("The only crab in your contacts you actually want to hear from. 🦞")
@@ -1124,7 +1116,6 @@ TAGLINES+=("WhatsApp automation without the \"please accept our new privacy poli
 TAGLINES+=("Chat APIs that don't require a Senate hearing.")
 TAGLINES+=("Because Threads wasn't the answer either.")
 TAGLINES+=("Your messages, your servers, Meta's tears.")
-TAGLINES+=("iMessage green bubble energy, but for everyone.")
 TAGLINES+=("Siri's competent cousin.")
 TAGLINES+=("Works on Android. Crazy concept, we know.")
 TAGLINES+=("No \$999 stand required.")
diff --git a/scripts/release-candidate-checklist.mjs b/scripts/release-candidate-checklist.mjs
index 60e4d5536da..4160557571c 100644
--- a/scripts/release-candidate-checklist.mjs
+++ b/scripts/release-candidate-checklist.mjs
@@ -625,7 +625,7 @@ export function buildPublishCommand(options) {
     .join(" ");
 }
 
-function validatePreflightManifest(manifest, params) {
+export function validatePreflightManifest(manifest, params) {
   if (manifest.releaseTag !== params.tag) {
     throw new Error(
       `npm preflight tag mismatch: expected ${params.tag}, got ${manifest.releaseTag}`,
@@ -644,6 +644,20 @@ function validatePreflightManifest(manifest, params) {
   if (!manifest.tarballName || !manifest.tarballSha256) {
     throw new Error("npm preflight manifest missing tarball metadata");
   }
+  if (!Array.isArray(manifest.dependencyTarballs)) {
+    throw new Error("npm preflight manifest missing dependency tarball metadata");
+  }
+  for (const dependency of manifest.dependencyTarballs) {
+    if (
+      !dependency?.packageName ||
+      !dependency.packageVersion ||
+      !dependency.tarballName ||
+      !dependency.tarballSha256 ||
+      dependency.tarballName !== basename(dependency.tarballName)
+    ) {
+      throw new Error("npm preflight manifest contains invalid dependency tarball metadata");
+    }
+  }
 }
 
 export function validateFullManifest(manifest, params) {
@@ -676,11 +690,22 @@ export function validateFullManifest(manifest, params) {
   }
 }
 
-export function candidateParallelsArgs(tarballPath) {
-  return ["test:parallels:npm-update", "--", "--target-tarball", tarballPath, "--json"];
+export function candidateParallelsArgs(tarballPath, dependencyTarballPaths = []) {
+  return [
+    "test:parallels:npm-update",
+    "--",
+    "--target-tarball",
+    tarballPath,
+    ...dependencyTarballPaths.flatMap((dependency) => ["--dependency-tarball", dependency]),
+    "--json",
+  ];
 }
 
-export function candidateParallelsShellCommand(tarballPath, timeoutBin) {
+export function candidateParallelsShellCommand(
+  tarballPath,
+  timeoutBin,
+  dependencyTarballPaths = [],
+) {
   return [
     'set -a; source "$HOME/.profile" >/dev/null 2>&1 || true; set +a;',
     "exec",
@@ -688,18 +713,18 @@ export function candidateParallelsShellCommand(tarballPath, timeoutBin) {
     "--foreground",
     "150m",
     "pnpm",
-    ...candidateParallelsArgs(tarballPath).map(shellQuote),
+    ...candidateParallelsArgs(tarballPath, dependencyTarballPaths).map(shellQuote),
   ].join(" ");
 }
 
-async function runParallelsIfNeeded(options, tarballPath) {
+async function runParallelsIfNeeded(options, tarballPath, dependencyTarballPaths) {
   if (options.skipParallels) {
     return { status: "skipped", reason: "operator skipped --skip-parallels" };
   }
   const timeoutBin = run("bash", ["-lc", "command -v gtimeout || command -v timeout"], {
     capture: true,
   }).trim();
-  const command = candidateParallelsShellCommand(tarballPath, timeoutBin);
+  const command = candidateParallelsShellCommand(tarballPath, timeoutBin, dependencyTarballPaths);
   run("bash", ["-lc", command]);
   return {
     status: "passed",
@@ -827,8 +852,21 @@ async function main() {
       `prepared tarball digest mismatch: expected ${npmManifest.tarballSha256}, got ${actualTarballSha}`,
     );
   }
+  const dependencyTarballPaths = npmManifest.dependencyTarballs.map((dependency) => {
+    const dependencyPath = join(npmDir, dependency.tarballName);
+    if (!existsSync(dependencyPath)) {
+      throw new Error(`prepared dependency tarball missing: ${dependencyPath}`);
+    }
+    const actualDependencySha = sha256(dependencyPath);
+    if (actualDependencySha !== dependency.tarballSha256) {
+      throw new Error(
+        `prepared dependency tarball digest mismatch for ${dependency.packageName}: expected ${dependency.tarballSha256}, got ${actualDependencySha}`,
+      );
+    }
+    return dependencyPath;
+  });
 
-  const parallels = await runParallelsIfNeeded(options, tarballPath);
+  const parallels = await runParallelsIfNeeded(options, tarballPath, dependencyTarballPaths);
   const npmTelegram = await runTelegramIfNeeded(options, npmArtifactName);
   options.npmTelegramRunId = npmTelegram.runId ?? "";
   const pluginNpmPlan = await collectPluginPlanWithRetry(
diff --git a/src/agents/agent-tools.ts b/src/agents/agent-tools.ts
index cc5a9332258..ad80c74513a 100644
--- a/src/agents/agent-tools.ts
+++ b/src/agents/agent-tools.ts
@@ -8,7 +8,10 @@ import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalLowercaseString,
 } from "@openclaw/normalization-core/string-coerce";
-import type { SourceReplyDeliveryMode } from "../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../auto-reply/get-reply-options.types.js";
 import { HEARTBEAT_RESPONSE_TOOL_NAME } from "../auto-reply/heartbeat-tool-response.js";
 import type { ChatType } from "../channels/chat-type.js";
 import type { InboundEventKind } from "../channels/inbound-event/kind.js";
@@ -505,6 +508,8 @@ export function createOpenClawCodingTools(options?: {
   requireExplicitMessageTarget?: boolean;
   /** Visible source replies must be sent through the message tool when set to message_tool_only. */
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  /** Action sink available for model-proposed follow-up tasks. */
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   inboundEventKind?: InboundEventKind;
   /** If true, omit the message tool from the tool list. */
   disableMessageTool?: boolean;
@@ -1040,6 +1045,7 @@ export function createOpenClawCodingTools(options?: {
           modelHasVision: options?.modelHasVision,
           requireExplicitMessageTarget: options?.requireExplicitMessageTarget,
           sourceReplyDeliveryMode: options?.sourceReplyDeliveryMode,
+          taskSuggestionDeliveryMode: options?.taskSuggestionDeliveryMode,
           inboundEventKind: options?.inboundEventKind,
           disableMessageTool: options?.disableMessageTool,
           enableHeartbeatTool,
diff --git a/src/agents/cli-runner/prepare.test.ts b/src/agents/cli-runner/prepare.test.ts
index e6bd9a58778..8d9788e7193 100644
--- a/src/agents/cli-runner/prepare.test.ts
+++ b/src/agents/cli-runner/prepare.test.ts
@@ -128,6 +128,8 @@ function createTestMcpLoopbackServerConfig(port: number) {
           "x-openclaw-current-inbound-audio": "${OPENCLAW_MCP_CURRENT_INBOUND_AUDIO}",
           "x-openclaw-inbound-event-kind": "${OPENCLAW_MCP_INBOUND_EVENT_KIND}",
           "x-openclaw-source-reply-delivery-mode": "${OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE}",
+          "x-openclaw-task-suggestion-delivery-mode":
+            "${OPENCLAW_MCP_TASK_SUGGESTION_DELIVERY_MODE}",
           "x-openclaw-require-explicit-message-target":
             "${OPENCLAW_MCP_REQUIRE_EXPLICIT_MESSAGE_TARGET}",
           "x-openclaw-cli-capture-key": "${OPENCLAW_MCP_CLI_CAPTURE_KEY}",
@@ -2968,6 +2970,7 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {
         currentMessageId: "reply-message-1",
         currentInboundAudio: true,
         sourceReplyDeliveryMode: "message_tool_only",
+        taskSuggestionDeliveryMode: "gateway",
         requireExplicitMessageTarget: true,
       });
 
@@ -2980,12 +2983,14 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {
         OPENCLAW_MCP_CURRENT_INBOUND_AUDIO: "true",
         OPENCLAW_MCP_INBOUND_EVENT_KIND: "room_event",
         OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE: "message_tool_only",
+        OPENCLAW_MCP_TASK_SUGGESTION_DELIVERY_MODE: "gateway",
         OPENCLAW_MCP_REQUIRE_EXPLICIT_MESSAGE_TARGET: "true",
         OPENCLAW_MCP_CLI_CAPTURE_KEY: "",
       });
       expect(context.mcpDeliveryCapture).toBe(true);
       expect(resolveMcpLoopbackScopedTools).toHaveBeenCalledWith(
         expect.objectContaining({
+          taskSuggestionDeliveryMode: "gateway",
           requireExplicitMessageTarget: true,
         }),
       );
diff --git a/src/agents/cli-runner/prepare.ts b/src/agents/cli-runner/prepare.ts
index ce45569fbad..372121196c0 100644
--- a/src/agents/cli-runner/prepare.ts
+++ b/src/agents/cli-runner/prepare.ts
@@ -595,6 +595,7 @@ export async function prepareCliRunContext(
             OPENCLAW_MCP_CURRENT_INBOUND_AUDIO: params.currentInboundAudio === true ? "true" : "",
             OPENCLAW_MCP_INBOUND_EVENT_KIND: params.currentInboundEventKind ?? "",
             OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE: params.sourceReplyDeliveryMode ?? "",
+            OPENCLAW_MCP_TASK_SUGGESTION_DELIVERY_MODE: params.taskSuggestionDeliveryMode ?? "",
             OPENCLAW_MCP_REQUIRE_EXPLICIT_MESSAGE_TARGET: requireExplicitMessageTarget
               ? "true"
               : "",
@@ -718,6 +719,7 @@ export async function prepareCliRunContext(
             accountId: params.agentAccountId,
             inboundEventKind: undefined,
             sourceReplyDeliveryMode: bindingSourceReplyDeliveryMode,
+            taskSuggestionDeliveryMode: params.taskSuggestionDeliveryMode,
             requireExplicitMessageTarget: bindingRequireExplicitMessageTarget,
             senderIsOwner: undefined,
           }).tools
diff --git a/src/agents/cli-runner/types.ts b/src/agents/cli-runner/types.ts
index 994b3d0e0b8..25ee6151340 100644
--- a/src/agents/cli-runner/types.ts
+++ b/src/agents/cli-runner/types.ts
@@ -1,7 +1,10 @@
 /**
  * Shared types for preparing and executing CLI-backed agent runs.
  */
-import type { SourceReplyDeliveryMode } from "../../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../../auto-reply/get-reply-options.types.js";
 import type { ReplyOperation } from "../../auto-reply/reply/reply-run-registry.js";
 import type { ThinkLevel } from "../../auto-reply/thinking.js";
 import type { FastMode } from "../../auto-reply/thinking.shared.js";
@@ -91,6 +94,7 @@ export type RunCliAgentParams = {
   jobId?: string;
   extraSystemPrompt?: string;
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   requireExplicitMessageTarget?: boolean;
   silentReplyPromptMode?: SilentReplyPromptMode;
   allowEmptyAssistantReplyAsSilent?: boolean;
diff --git a/src/agents/embedded-agent-runner/run-state.ts b/src/agents/embedded-agent-runner/run-state.ts
index 60ef60ae4ad..302f7f72950 100644
--- a/src/agents/embedded-agent-runner/run-state.ts
+++ b/src/agents/embedded-agent-runner/run-state.ts
@@ -1,7 +1,10 @@
 /**
  * Shared process-local state for active and abandoned embedded-agent runs.
  */
-import type { SourceReplyDeliveryMode } from "../../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../../auto-reply/get-reply-options.types.js";
 import {
   getActiveReplyRunCount,
   listActiveReplyRunSessionKeys,
@@ -29,6 +32,7 @@ export type EmbeddedAgentQueueHandle = {
   cancel?: (reason?: "user_abort" | "restart" | "superseded") => void;
   abort: (reason?: "restart") => void;
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
 };
 
 export type EmbeddedAgentQueueMessageOptions = ReplyBackendQueueMessageOptions;
diff --git a/src/agents/embedded-agent-runner/run.overflow-compaction.test.ts b/src/agents/embedded-agent-runner/run.overflow-compaction.test.ts
index 308d9479777..04300dda27c 100644
--- a/src/agents/embedded-agent-runner/run.overflow-compaction.test.ts
+++ b/src/agents/embedded-agent-runner/run.overflow-compaction.test.ts
@@ -72,6 +72,7 @@ function makeForwardingCase(internalEvents: AgentInternalEvent[]) {
       bootstrapContextRunKind: "cron",
       disableMessageTool: true,
       forceMessageTool: true,
+      taskSuggestionDeliveryMode: "gateway",
       requireExplicitMessageTarget: true,
       chatType: "channel",
       senderIsOwner: true,
@@ -84,6 +85,7 @@ function makeForwardingCase(internalEvents: AgentInternalEvent[]) {
       bootstrapContextRunKind: "cron",
       disableMessageTool: true,
       forceMessageTool: true,
+      taskSuggestionDeliveryMode: "gateway",
       requireExplicitMessageTarget: true,
       chatType: "channel",
       senderIsOwner: true,
diff --git a/src/agents/embedded-agent-runner/run.ts b/src/agents/embedded-agent-runner/run.ts
index e6fc46cf79e..7eaea8859f8 100644
--- a/src/agents/embedded-agent-runner/run.ts
+++ b/src/agents/embedded-agent-runner/run.ts
@@ -2274,6 +2274,7 @@ async function runEmbeddedAgentInternal(
             onExecutionPhase: params.onExecutionPhase,
             extraSystemPrompt: params.extraSystemPrompt,
             sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
+            taskSuggestionDeliveryMode: params.taskSuggestionDeliveryMode,
             inputProvenance: params.inputProvenance,
             streamParams: params.streamParams,
             modelRun: params.modelRun,
diff --git a/src/agents/embedded-agent-runner/run/attempt.ts b/src/agents/embedded-agent-runner/run/attempt.ts
index eb209e07c55..742bbd9497f 100644
--- a/src/agents/embedded-agent-runner/run/attempt.ts
+++ b/src/agents/embedded-agent-runner/run/attempt.ts
@@ -1422,6 +1422,7 @@ export async function runEmbeddedAttempt(
             requireExplicitMessageTarget:
               params.requireExplicitMessageTarget ?? isSubagentSessionKey(params.sessionKey),
             sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
+            taskSuggestionDeliveryMode: params.taskSuggestionDeliveryMode,
             inboundEventKind: params.currentInboundEventKind,
             disableMessageTool: params.disableMessageTool,
             forceMessageTool: params.forceMessageTool,
@@ -3898,6 +3899,7 @@ export async function runEmbeddedAttempt(
         isCompacting: () => subscription.isCompacting(),
         supportsTranscriptCommitWait: true,
         sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
+        taskSuggestionDeliveryMode: params.taskSuggestionDeliveryMode,
         cancel: abortActiveRunExternally,
         abort: (reason) => abortActiveRunExternally(reason),
       };
diff --git a/src/agents/embedded-agent-runner/run/params.ts b/src/agents/embedded-agent-runner/run/params.ts
index 0c0487ccffd..18a1ad92b69 100644
--- a/src/agents/embedded-agent-runner/run/params.ts
+++ b/src/agents/embedded-agent-runner/run/params.ts
@@ -6,6 +6,7 @@ import type {
   BlockReplyContext,
   PartialReplyPayload,
   SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
 } from "../../../auto-reply/get-reply-options.types.js";
 import type { ReplyPayload } from "../../../auto-reply/reply-payload.js";
 import type { ReplyOperation } from "../../../auto-reply/reply/reply-run-registry.js";
@@ -272,6 +273,7 @@ export type RunEmbeddedAgentParams = {
   enqueue?: CommandQueueEnqueueFn;
   extraSystemPrompt?: string;
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   silentReplyPromptMode?: SilentReplyPromptMode;
   internalEvents?: AgentInternalEvent[];
   inputProvenance?: InputProvenance;
diff --git a/src/agents/embedded-agent-runner/runs.test.ts b/src/agents/embedded-agent-runner/runs.test.ts
index 40d80b0f0ae..8b57bd138ee 100644
--- a/src/agents/embedded-agent-runner/runs.test.ts
+++ b/src/agents/embedded-agent-runner/runs.test.ts
@@ -491,6 +491,39 @@ describe("embedded-agent runner run registry", () => {
     expect(queueMessage).not.toHaveBeenCalled();
   });
 
+  it.each([
+    {
+      label: "capable prompt into an incapable run",
+      handleMode: undefined,
+      requestMode: "gateway" as const,
+    },
+    {
+      label: "incapable prompt into a capable run",
+      handleMode: "gateway" as const,
+      requestMode: undefined,
+    },
+  ])("rejects $label", ({ handleMode, requestMode }) => {
+    const queueMessage = vi.fn(async () => {});
+    setActiveEmbeddedRun("session-task-suggestions", {
+      ...createRunHandle(),
+      taskSuggestionDeliveryMode: handleMode,
+      queueMessage,
+    });
+
+    const outcome = queueEmbeddedAgentMessageWithOutcome("session-task-suggestions", "continue", {
+      steeringMode: "all",
+      taskSuggestionDeliveryMode: requestMode,
+    });
+
+    expect(outcome).toEqual({
+      queued: false,
+      sessionId: "session-task-suggestions",
+      reason: "task_suggestion_delivery_mode_mismatch",
+      gatewayHealth: "live",
+    });
+    expect(queueMessage).not.toHaveBeenCalled();
+  });
+
   it("defaults active embedded steering to all pending messages", () => {
     const queueMessage = vi.fn(async () => {});
     setActiveEmbeddedRun("session-default-steer", {
diff --git a/src/agents/embedded-agent-runner/runs.ts b/src/agents/embedded-agent-runner/runs.ts
index 8250f5fa6d1..7577e67b64f 100644
--- a/src/agents/embedded-agent-runner/runs.ts
+++ b/src/agents/embedded-agent-runner/runs.ts
@@ -12,6 +12,7 @@ import {
   isReplyRunStreamingForSessionId,
   listActiveReplyRunSessionIds,
   queueReplyRunMessage,
+  resolveReplyBackendQueueMessageMismatch,
   waitForReplyRunEndBySessionId,
 } from "../../auto-reply/reply/reply-run-registry.js";
 import {
@@ -63,6 +64,7 @@ export type EmbeddedAgentQueueFailureReason =
   | "stale_run"
   | "compacting"
   | "source_reply_delivery_mode_mismatch"
+  | "task_suggestion_delivery_mode_mismatch"
   | "transcript_commit_wait_unsupported"
   | "runtime_rejected";
 
@@ -515,16 +517,12 @@ function prepareEmbeddedAgentQueueMessage(
       outcome: createQueueFailureOutcome(sessionId, "transcript_commit_wait_unsupported"),
     };
   }
-  if (
-    options?.sourceReplyDeliveryMode === "message_tool_only" &&
-    handle.sourceReplyDeliveryMode !== "message_tool_only"
-  ) {
-    diag.debug(
-      `queue message failed: sessionId=${sessionId} reason=source_reply_delivery_mode_mismatch`,
-    );
+  const deliveryModeMismatch = resolveReplyBackendQueueMessageMismatch(handle, options);
+  if (deliveryModeMismatch) {
+    diag.debug(`queue message failed: sessionId=${sessionId} reason=${deliveryModeMismatch}`);
     return {
       kind: "complete",
-      outcome: createQueueFailureOutcome(sessionId, "source_reply_delivery_mode_mismatch"),
+      outcome: createQueueFailureOutcome(sessionId, deliveryModeMismatch),
     };
   }
   return { kind: "embedded_run", handle };
diff --git a/src/agents/failover-error.test.ts b/src/agents/failover-error.test.ts
index c1ffe0b753c..eb641851d00 100644
--- a/src/agents/failover-error.test.ts
+++ b/src/agents/failover-error.test.ts
@@ -15,6 +15,7 @@ import {
   isTimeoutError,
   resolveFailoverReasonFromError,
   resolveFailoverStatus,
+  resolveModelFallbackError,
 } from "./failover-error.js";
 import { SessionWriteLockTimeoutError } from "./session-write-lock-error.js";
 
@@ -1335,6 +1336,67 @@ describe("failover-error", () => {
         ),
       ).toBe(false);
     });
+
+    it("returns false when takeover wrapper holds a classifiable provider timeout in promptError", () => {
+      // Simulates EmbeddedAttemptPromptErrorWithCleanupTakeoverError: name matches
+      // EmbeddedAttemptSessionTakeoverError, but the real cause is in .promptError.
+      const timeoutPromptErr = Object.assign(new Error("request timed out"), {
+        name: "TimeoutError",
+      });
+      const wrapper = Object.assign(new Error("request timed out"), {
+        name: "EmbeddedAttemptSessionTakeoverError",
+        promptError: timeoutPromptErr,
+      });
+      expect(isNonProviderRuntimeCoordinationError(wrapper)).toBe(false);
+    });
+
+    it("returns false when takeover wrapper holds rate_limit in promptError", () => {
+      const rateLimitPromptErr = {
+        status: 429,
+        code: "RATE_LIMITED",
+        message: "too many requests",
+      };
+      const wrapper = Object.assign(new Error("cleanup takeover"), {
+        name: "EmbeddedAttemptSessionTakeoverError",
+        promptError: rateLimitPromptErr,
+      });
+      expect(isNonProviderRuntimeCoordinationError(wrapper)).toBe(false);
+      const resolution = resolveModelFallbackError(wrapper);
+      expect(resolution).toMatchObject({
+        kind: "failover",
+        error: {
+          message: "too many requests",
+          reason: "rate_limit",
+          status: 429,
+          code: "RATE_LIMITED",
+        },
+      });
+      expect(resolution.error).toHaveProperty("cause", wrapper);
+    });
+
+    it("returns true when takeover wrapper holds an unclassifiable promptError", () => {
+      const unknownPromptErr = { weirdField: "something unknown" };
+      const wrapper = Object.assign(new Error("unknown"), {
+        name: "EmbeddedAttemptSessionTakeoverError",
+        promptError: unknownPromptErr,
+      });
+      expect(isNonProviderRuntimeCoordinationError(wrapper)).toBe(true);
+    });
+
+    it("returns true for pure takeover error without promptError (regression)", () => {
+      const pureTakeover = Object.assign(
+        new Error("session file changed while embedded prompt lock was released"),
+        { name: "EmbeddedAttemptSessionTakeoverError" },
+      );
+      expect(isNonProviderRuntimeCoordinationError(pureTakeover)).toBe(true);
+      expect(
+        isNonProviderRuntimeCoordinationError(
+          Object.assign(new Error("provider rejected request: rate limit"), {
+            name: "EmbeddedAttemptSessionTakeoverError",
+          }),
+        ),
+      ).toBe(true);
+    });
   });
 });
 
diff --git a/src/agents/failover-error.ts b/src/agents/failover-error.ts
index d0a42f61c9a..29e658944a1 100644
--- a/src/agents/failover-error.ts
+++ b/src/agents/failover-error.ts
@@ -329,6 +329,21 @@ function isEmbeddedAttemptSessionTakeover(err: unknown): boolean {
   );
 }
 
+function hasPreservedTakeoverPromptError(err: unknown): err is Record<"promptError", unknown> {
+  return Boolean(
+    isEmbeddedAttemptSessionTakeover(err) &&
+    err &&
+    typeof err === "object" &&
+    Object.hasOwn(err, "promptError"),
+  );
+}
+
+function resolveFailoverSourceError(err: unknown): unknown {
+  // Cleanup takeover is a secondary failure when the wrapper preserves the
+  // prompt error. Classify and report that provider-facing source instead.
+  return hasPreservedTakeoverPromptError(err) ? err.promptError : err;
+}
+
 function hasEmbeddedAttemptSessionTakeover(err: unknown, seen: Set<object> = new Set()): boolean {
   if (isEmbeddedAttemptSessionTakeover(err)) {
     return true;
@@ -402,20 +417,7 @@ function hasMissingToolResultFailure(err: unknown): boolean {
  * same local condition. See #83510 and #95474.
  */
 export function isNonProviderRuntimeCoordinationError(err: unknown): boolean {
-  if (
-    !hasSessionWriteLockContention(err) &&
-    !hasEmbeddedAttemptSessionTakeover(err) &&
-    !hasMissingToolResultFailure(err)
-  ) {
-    return false;
-  }
-  if (isFailoverError(err)) {
-    return false;
-  }
-  if (isEmbeddedAttemptSessionTakeover(err)) {
-    return true;
-  }
-  return resolveFailoverClassificationFromError(err) === null;
+  return resolveModelFallbackError(err).kind === "coordination";
 }
 
 function hasTimeoutHint(err: unknown): boolean {
@@ -731,46 +733,55 @@ export function describeFailoverError(err: unknown): {
   };
 }
 
+type FailoverErrorContext = {
+  provider?: string;
+  model?: string;
+  profileId?: string;
+  authMode?: string;
+  sessionId?: string;
+  lane?: string;
+};
+
+type ModelFallbackErrorResolution =
+  | { kind: "failover"; error: FailoverError }
+  | { kind: "coordination"; error: unknown }
+  | { kind: "unknown"; error: unknown };
+
 /** Convert a classified raw error into a FailoverError with optional request context. */
 export function coerceToFailoverError(
   err: unknown,
-  context?: {
-    provider?: string;
-    model?: string;
-    profileId?: string;
-    authMode?: string;
-    sessionId?: string;
-    lane?: string;
-  },
+  context?: FailoverErrorContext,
 ): FailoverError | null {
-  if (isFailoverError(err)) {
-    if (context?.authMode && !err.authMode) {
-      const message = typeof err.message === "string" ? err.message : String(err);
+  const sourceError = resolveFailoverSourceError(err);
+  if (isFailoverError(sourceError)) {
+    if (context?.authMode && !sourceError.authMode) {
+      const message =
+        typeof sourceError.message === "string" ? sourceError.message : String(sourceError);
       return new FailoverError(message, {
-        reason: err.reason,
-        provider: err.provider,
-        model: err.model,
-        profileId: err.profileId,
+        reason: sourceError.reason,
+        provider: sourceError.provider,
+        model: sourceError.model,
+        profileId: sourceError.profileId,
         authMode: context.authMode,
-        status: err.status,
-        code: err.code,
-        rawError: err.rawError,
-        authProfileFailure: err.authProfileFailure,
-        sessionId: err.sessionId,
-        lane: err.lane,
-        cause: err.cause,
-        suspend: err.suspend,
+        status: sourceError.status,
+        code: sourceError.code,
+        rawError: sourceError.rawError,
+        authProfileFailure: sourceError.authProfileFailure,
+        sessionId: sourceError.sessionId,
+        lane: sourceError.lane,
+        cause: sourceError.cause,
+        suspend: sourceError.suspend,
       });
     }
-    return err;
+    return sourceError;
   }
-  const reason = resolveFailoverReasonFromError(err, context?.provider);
+  const reason = resolveFailoverReasonFromError(sourceError, context?.provider);
   if (!reason) {
     return null;
   }
 
-  const signal = normalizeErrorSignal(err);
-  const message = signal.message ?? String(err);
+  const signal = normalizeErrorSignal(sourceError);
+  const message = signal.message ?? String(sourceError);
   const status = signal.status ?? resolveFailoverStatus(reason);
   const code = signal.code;
 
@@ -793,3 +804,28 @@ export function coerceToFailoverError(
     suspend: shouldSuspend,
   });
 }
+
+/** Classify one candidate failure once so fallback routing and diagnostics share it. */
+export function resolveModelFallbackError(
+  err: unknown,
+  context?: FailoverErrorContext,
+): ModelFallbackErrorResolution {
+  // A direct takeover remains a coordination failure unless the dedicated
+  // cleanup wrapper owns a preserved prompt error. Its message alone must not
+  // reclassify session-state loss as a provider failure.
+  if (isEmbeddedAttemptSessionTakeover(err) && !hasPreservedTakeoverPromptError(err)) {
+    return { kind: "coordination", error: err };
+  }
+  const failoverError = coerceToFailoverError(err, context);
+  if (failoverError) {
+    return { kind: "failover", error: failoverError };
+  }
+  if (
+    hasSessionWriteLockContention(err) ||
+    hasEmbeddedAttemptSessionTakeover(err) ||
+    hasMissingToolResultFailure(err)
+  ) {
+    return { kind: "coordination", error: err };
+  }
+  return { kind: "unknown", error: err };
+}
diff --git a/src/agents/model-fallback.test.ts b/src/agents/model-fallback.test.ts
index 296ea97cb40..e11d188882e 100644
--- a/src/agents/model-fallback.test.ts
+++ b/src/agents/model-fallback.test.ts
@@ -4209,3 +4209,90 @@ describe("runWithImageModelFallback", () => {
     ]);
   });
 });
+
+describe("runWithModelFallback preserved prompt errors", () => {
+  it.each([
+    {
+      label: "timeout",
+      promptError: Object.assign(new Error("request timed out"), { name: "TimeoutError" }),
+      expected: { message: "request timed out", reason: "timeout", status: 408 },
+    },
+    {
+      label: "rate limit",
+      promptError: { status: 429, code: "RATE_LIMITED", message: "too many requests" },
+      expected: {
+        message: "too many requests",
+        reason: "rate_limit",
+        status: 429,
+        code: "RATE_LIMITED",
+      },
+    },
+  ])(
+    "falls back with the preserved $label prompt error (#99963)",
+    async ({ promptError, expected }) => {
+      const cfg = makeCfg({
+        agents: {
+          defaults: {
+            model: {
+              primary: "openai/gpt-5.5",
+              fallbacks: ["anthropic/claude-sonnet-4-6"],
+            },
+          },
+        },
+      });
+      const takeoverError = Object.assign(new Error("cleanup takeover"), {
+        name: "EmbeddedAttemptSessionTakeoverError",
+        promptError,
+      });
+      const run = vi.fn().mockRejectedValueOnce(takeoverError).mockResolvedValueOnce("ok");
+      const onError = vi.fn();
+
+      const result = await runWithModelFallback({
+        cfg,
+        provider: "openai",
+        model: "gpt-5.5",
+        run,
+        onError,
+      });
+
+      expect(result.result).toBe("ok");
+      expect(run).toHaveBeenCalledTimes(2);
+      expect(result.attempts[0]).toMatchObject({
+        error: expected.message,
+        reason: expected.reason,
+      });
+      const observedError = onError.mock.calls[0]?.[0]?.error;
+      expect(observedError).toMatchObject({ name: "FailoverError", ...expected });
+      expect(observedError).toHaveProperty("cause", takeoverError);
+    },
+  );
+
+  it("still aborts fallback for a pure takeover error without promptError (regression)", async () => {
+    const cfg = makeCfg({
+      agents: {
+        defaults: {
+          model: {
+            primary: "openai/gpt-5.5",
+            fallbacks: ["anthropic/claude-sonnet-4-6"],
+          },
+        },
+      },
+    });
+
+    const pureTakeoverError = Object.assign(
+      new Error("session file changed while embedded prompt lock was released"),
+      { name: "EmbeddedAttemptSessionTakeoverError" },
+    );
+    const run = vi.fn().mockRejectedValue(pureTakeoverError);
+
+    await expect(
+      runWithModelFallback({
+        cfg,
+        provider: "openai",
+        model: "gpt-5.5",
+        run,
+      }),
+    ).rejects.toBe(pureTakeoverError);
+    expect(run).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/agents/model-fallback.ts b/src/agents/model-fallback.ts
index cb59d63927b..0a2603cc470 100644
--- a/src/agents/model-fallback.ts
+++ b/src/agents/model-fallback.ts
@@ -42,6 +42,7 @@ import {
   describeFailoverError,
   isFailoverError,
   isNonProviderRuntimeCoordinationError,
+  resolveModelFallbackError,
 } from "./failover-error.js";
 import {
   shouldAllowCooldownProbeForReason,
@@ -412,7 +413,13 @@ async function runFallbackCandidate<T>(params: {
     if (isCommandLaneTaskTimeoutError(err)) {
       throw err;
     }
-    if (isNonProviderRuntimeCoordinationError(err)) {
+    const fallbackError = resolveModelFallbackError(err, {
+      provider: params.provider,
+      model: params.model,
+      sessionId: params.attribution?.sessionId,
+      lane: params.attribution?.lane,
+    });
+    if (fallbackError.kind === "coordination") {
       throw err;
     }
     if (isTerminalAbort(params.abortSignal) || isCallerAbortSignal(params.abortSignal)) {
@@ -424,15 +431,10 @@ async function runFallbackCandidate<T>(params: {
     if (isTerminalAbortFromError(err)) {
       throw err;
     }
-    // Normalize abort-wrapped rate-limit errors (e.g. Google Vertex RESOURCE_EXHAUSTED)
-    // so they become FailoverErrors and continue the fallback loop instead of aborting.
-    const normalizedFailover = coerceToFailoverError(err, {
-      provider: params.provider,
-      model: params.model,
-      sessionId: params.attribution?.sessionId,
-      lane: params.attribution?.lane,
-    });
-    return { ok: false, error: normalizedFailover ?? err };
+    return {
+      ok: false,
+      error: fallbackError.kind === "failover" ? fallbackError.error : err,
+    };
   }
 }
 
diff --git a/src/agents/models-config.applies-config-env-vars.test.ts b/src/agents/models-config.applies-config-env-vars.test.ts
index 889055282fb..2959f5ec7e8 100644
--- a/src/agents/models-config.applies-config-env-vars.test.ts
+++ b/src/agents/models-config.applies-config-env-vars.test.ts
@@ -22,6 +22,33 @@ vi.mock("./provider-auth-aliases.js", () => ({
   resolveProviderIdForAuth: (provider: string) => provider.trim().toLowerCase(),
 }));
 
+// These planner tests exercise no plugin-owned auth policy. Keep their exact
+// provider markers local instead of loading the bundled plugin/runtime catalog.
+vi.mock("../plugins/provider-runtime.js", () => ({
+  applyProviderNativeStreamingUsageCompatWithPlugin: () => undefined,
+  normalizeProviderConfigWithPlugin: () => undefined,
+  resolveProviderConfigApiKeyWithPlugin: () => undefined,
+  resolveExternalAuthProfilesWithPlugins: () => [],
+  resolveProviderSyntheticAuthWithPlugin: () => undefined,
+}));
+
+vi.mock("./model-auth-env-vars.js", () => ({
+  listKnownProviderEnvApiKeyNames: () => [
+    "GOOGLE_CLOUD_API_KEY",
+    "OPENAI_API_KEY",
+    "OPENROUTER_API_KEY",
+  ],
+  resolveProviderEnvAuthLookupMaps: () => ({
+    aliasMap: {},
+    envCandidateMap: {
+      "google-vertex": ["GOOGLE_CLOUD_API_KEY"],
+      openai: ["OPENAI_API_KEY"],
+      openrouter: ["OPENROUTER_API_KEY"],
+    },
+    authEvidenceMap: {},
+  }),
+}));
+
 const TEST_ENV_VAR = "OPENCLAW_MODELS_CONFIG_TEST_ENV";
 
 function createImplicitOpenRouterProvider(): ProviderConfig {
diff --git a/src/agents/openclaw-tools.ts b/src/agents/openclaw-tools.ts
index 3a63417dde7..fb2e8231123 100644
--- a/src/agents/openclaw-tools.ts
+++ b/src/agents/openclaw-tools.ts
@@ -4,7 +4,10 @@
  * Creates the per-run tool inventory from config, channel context, sandbox policy, auth stores, and plugin tools.
  */
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
-import type { SourceReplyDeliveryMode } from "../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../auto-reply/get-reply-options.types.js";
 import type { InboundEventKind } from "../channels/inbound-event/kind.js";
 import { selectApplicableRuntimeConfig } from "../config/config.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
@@ -173,6 +176,8 @@ export function createOpenClawTools(
     requireExplicitMessageTarget?: boolean;
     /** Visible source replies must be sent through the message tool when set to message_tool_only. */
     sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+    /** Action sink available for model-proposed follow-up tasks. */
+    taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
     inboundEventKind?: InboundEventKind;
     /** If true, omit the message tool from the tool list. */
     disableMessageTool?: boolean;
@@ -472,7 +477,7 @@ export function createOpenClawTools(
               : {}),
           }),
         ]),
-    ...(!embedded && taskSuggestionSessionKey
+    ...(!embedded && taskSuggestionSessionKey && options?.taskSuggestionDeliveryMode === "gateway"
       ? createTaskSuggestionTools({
           sessionKey: taskSuggestionSessionKey,
           agentId: sessionAgentId,
diff --git a/src/agents/openclaw-tools.update-plan.test.ts b/src/agents/openclaw-tools.update-plan.test.ts
index c6e928b712c..e15c7c437f9 100644
--- a/src/agents/openclaw-tools.update-plan.test.ts
+++ b/src/agents/openclaw-tools.update-plan.test.ts
@@ -126,20 +126,29 @@ describe("openclaw-tools update_plan gating", () => {
     expect(enabledTools).toContain("transcripts");
   });
 
-  it("registers task suggestions for gateway-backed sessions", () => {
+  it("registers task suggestions only for sessions with an actionable gateway sink", () => {
     const withoutSession = createFastToolNames({
       config: {} as OpenClawConfig,
       cwd: "/repo",
+      taskSuggestionDeliveryMode: "gateway",
     });
-    const withSession = createFastToolNames({
+    const withoutSink = createFastToolNames({
       config: {} as OpenClawConfig,
       agentSessionKey: "agent:main:main",
       cwd: "/repo",
     });
+    const withSink = createFastToolNames({
+      config: {} as OpenClawConfig,
+      agentSessionKey: "agent:main:main",
+      cwd: "/repo",
+      taskSuggestionDeliveryMode: "gateway",
+    });
 
     expect(withoutSession).not.toContain("spawn_task");
     expect(withoutSession).not.toContain("dismiss_task");
-    expect(withSession).toEqual(expect.arrayContaining(["spawn_task", "dismiss_task"]));
+    expect(withoutSink).not.toContain("spawn_task");
+    expect(withoutSink).not.toContain("dismiss_task");
+    expect(withSink).toEqual(expect.arrayContaining(["spawn_task", "dismiss_task"]));
   });
 
   it("keeps explicitly allowed message tool in embedded completions", () => {
diff --git a/src/auto-reply/fallback-state.test.ts b/src/auto-reply/fallback-state.test.ts
index 67dbfa9728b..cc60b18b050 100644
--- a/src/auto-reply/fallback-state.test.ts
+++ b/src/auto-reply/fallback-state.test.ts
@@ -113,6 +113,15 @@ describe("fallback-state", () => {
     expect(resolved.reasonSummary).toContain("Claude Max usage limit reached");
   });
 
+  it("keeps truncated transient error details UTF-16 safe", () => {
+    const detail = "x".repeat(68);
+    const resolved = resolveDemoFallbackTransition({
+      attempts: [{ ...baseAttempt, error: `429 ${detail}😀tail` }],
+    });
+
+    expect(resolved.reasonSummary).toBe(`HTTP 429: ${detail}…`);
+  });
+
   it("refreshes reason when fallback remains active with same model pair", () => {
     const resolved = resolveDemoFallbackTransition({
       attempts: [{ ...baseAttempt, reason: "timeout" }],
diff --git a/src/auto-reply/fallback-state.ts b/src/auto-reply/fallback-state.ts
index 9f3146b210a..e443c243f4d 100644
--- a/src/auto-reply/fallback-state.ts
+++ b/src/auto-reply/fallback-state.ts
@@ -1,5 +1,6 @@
 /** Formats model-fallback notice state for UI/status messages and persisted transition tracking. */
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { formatRawAssistantErrorForUi } from "../agents/embedded-agent-helpers.js";
 import { areRuntimeModelRefsEquivalent } from "../agents/model-runtime-aliases.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
@@ -29,7 +30,7 @@ function truncateFallbackReasonPart(value: string, max = FALLBACK_REASON_PART_MA
   if (text.length <= max) {
     return text;
   }
-  return `${text.slice(0, Math.max(0, max - 1)).trimEnd()}…`;
+  return `${truncateUtf16Safe(text, max - 1).trimEnd()}…`;
 }
 
 function formatFallbackAttemptErrorPreview(attempt: RuntimeFallbackAttempt): string | undefined {
diff --git a/src/auto-reply/get-reply-options.types.ts b/src/auto-reply/get-reply-options.types.ts
index 11bc11997e3..a332f80d9a3 100644
--- a/src/auto-reply/get-reply-options.types.ts
+++ b/src/auto-reply/get-reply-options.types.ts
@@ -36,6 +36,9 @@ export type ReplyThreadingPolicy = {
 
 export type SourceReplyDeliveryMode = "automatic" | "message_tool_only";
 
+/** Action sink available for model-proposed follow-up tasks during this turn. */
+export type TaskSuggestionDeliveryMode = "gateway";
+
 /** Correlates queued reply ownership transfer with later delivery drains. */
 export type QueuedReplyDeliveryCorrelation = {
   begin: () => (() => void) | void;
@@ -245,6 +248,8 @@ export type GetReplyOptions = {
    * private unless dispatch explicitly marks a source reply as deliverable.
    */
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  /** Enables task-suggestion tools only when the initiating surface can action Gateway events. */
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   /** Starts delivery tracking when this turn later drains as a queued followup. */
   queuedDeliveryCorrelations?: QueuedReplyDeliveryCorrelation[];
   /** Tracks ownership transfer when this turn later drains as a queued followup. */
diff --git a/src/auto-reply/reply/agent-runner-execution.ts b/src/auto-reply/reply/agent-runner-execution.ts
index edddd3fed00..8e4b58a5cbb 100644
--- a/src/auto-reply/reply/agent-runner-execution.ts
+++ b/src/auto-reply/reply/agent-runner-execution.ts
@@ -2543,6 +2543,7 @@ async function runAgentTurnWithFallbackInternal(
                     lane: runLane,
                     extraSystemPrompt: params.followupRun.run.extraSystemPrompt,
                     sourceReplyDeliveryMode: params.followupRun.run.sourceReplyDeliveryMode,
+                    taskSuggestionDeliveryMode: params.followupRun.run.taskSuggestionDeliveryMode,
                     silentReplyPromptMode: params.followupRun.run.silentReplyPromptMode,
                     allowEmptyAssistantReplyAsSilent:
                       params.followupRun.run.allowEmptyAssistantReplyAsSilent,
diff --git a/src/auto-reply/reply/agent-runner-run-params.ts b/src/auto-reply/reply/agent-runner-run-params.ts
index 7fb19cd47a9..0a19dfdf546 100644
--- a/src/auto-reply/reply/agent-runner-run-params.ts
+++ b/src/auto-reply/reply/agent-runner-run-params.ts
@@ -102,6 +102,7 @@ export function buildEmbeddedRunBaseParams(params: {
     silentReplyPromptMode: params.run.silentReplyPromptMode,
     sourceReplyDeliveryMode: params.run.sourceReplyDeliveryMode,
     clientCaps: params.run.clientCaps,
+    taskSuggestionDeliveryMode: params.run.taskSuggestionDeliveryMode,
     provider: params.provider,
     model: params.model,
     modelFallbacksOverride,
diff --git a/src/auto-reply/reply/agent-runner-utils.test.ts b/src/auto-reply/reply/agent-runner-utils.test.ts
index d920fc4aade..d11e0a4c001 100644
--- a/src/auto-reply/reply/agent-runner-utils.test.ts
+++ b/src/auto-reply/reply/agent-runner-utils.test.ts
@@ -128,6 +128,7 @@ describe("agent-runner-utils", () => {
     const run = makeRun({
       enforceFinalTag: true,
       cwd: "/tmp/task-repo",
+      taskSuggestionDeliveryMode: "gateway",
     });
     const authProfile = resolveProviderScopedAuthProfile({
       provider: "openai",
@@ -165,6 +166,7 @@ describe("agent-runner-utils", () => {
     expect(resolved.timeoutMs).toBe(run.timeoutMs);
     expect(resolved.runId).toBe("run-1");
     expect(resolved.promptCacheKey).toBe("webchat-cache-key");
+    expect(resolved.taskSuggestionDeliveryMode).toBe("gateway");
   });
 
   it("threads prompt cache affinity through embedded execution params", () => {
diff --git a/src/auto-reply/reply/agent-runner.media-paths.test.ts b/src/auto-reply/reply/agent-runner.media-paths.test.ts
index 73606a181cd..2db4db99a75 100644
--- a/src/auto-reply/reply/agent-runner.media-paths.test.ts
+++ b/src/auto-reply/reply/agent-runner.media-paths.test.ts
@@ -424,6 +424,8 @@ describe("runReplyAgent media path normalization", () => {
       target: "embedded_run",
       gatewayHealth: "live",
     }));
+    const followupRun = createMockFollowupRun({ prompt: "generate chart" });
+    followupRun.run.taskSuggestionDeliveryMode = "gateway";
 
     await runReplyAgent(
       makeRunReplyAgentParams({
@@ -432,6 +434,7 @@ describe("runReplyAgent media path normalization", () => {
         shouldFollowup: true,
         isActive: true,
         isStreaming: false,
+        followupRun,
       }),
     );
 
@@ -440,6 +443,7 @@ describe("runReplyAgent media path normalization", () => {
       "generate chart",
       {
         steeringMode: "all",
+        taskSuggestionDeliveryMode: "gateway",
       },
     );
     expect(enqueueFollowupRunMock).not.toHaveBeenCalled();
@@ -479,7 +483,7 @@ describe("runReplyAgent media path normalization", () => {
     expect(queueEmbeddedAgentMessageWithOutcomeAsyncMock).toHaveBeenLastCalledWith(
       "session",
       "summarize the audio",
-      { steeringMode: "all" },
+      { steeringMode: "all", taskSuggestionDeliveryMode: undefined },
     );
     expect(enqueueFollowupRunMock).not.toHaveBeenCalled();
   });
diff --git a/src/auto-reply/reply/agent-runner.ts b/src/auto-reply/reply/agent-runner.ts
index 1e142300ae3..7567af4170c 100644
--- a/src/auto-reply/reply/agent-runner.ts
+++ b/src/auto-reply/reply/agent-runner.ts
@@ -1270,6 +1270,10 @@ export async function runReplyAgent(params: {
       {
         steeringMode: "all",
         ...(resolvedQueue.debounceMs !== undefined ? { debounceMs: resolvedQueue.debounceMs } : {}),
+        ...(followupRun.run.sourceReplyDeliveryMode
+          ? { sourceReplyDeliveryMode: followupRun.run.sourceReplyDeliveryMode }
+          : {}),
+        taskSuggestionDeliveryMode: followupRun.run.taskSuggestionDeliveryMode,
         ...(followupRun.userTurnTranscriptRecorder
           ? { userTurnTranscriptRecorder: followupRun.userTurnTranscriptRecorder }
           : {}),
diff --git a/src/auto-reply/reply/commands-steer.test.ts b/src/auto-reply/reply/commands-steer.test.ts
index b0d18dcbcd6..bca57884115 100644
--- a/src/auto-reply/reply/commands-steer.test.ts
+++ b/src/auto-reply/reply/commands-steer.test.ts
@@ -62,6 +62,25 @@ describe("handleSteerCommand", () => {
       {
         steeringMode: "all",
         debounceMs: 0,
+        taskSuggestionDeliveryMode: undefined,
+      },
+    );
+  });
+
+  it("passes the initiating surface task capability into steering", async () => {
+    steerRuntimeMocks.resolveActiveEmbeddedRunSessionId.mockReturnValue("session-active");
+    const params = buildParams("/steer keep going");
+    params.opts = { taskSuggestionDeliveryMode: "gateway" };
+
+    await handleSteerCommand(params, true);
+
+    expect(steerRuntimeMocks.queueEmbeddedAgentMessageWithOutcomeAsync).toHaveBeenCalledWith(
+      "session-active",
+      "keep going",
+      {
+        steeringMode: "all",
+        debounceMs: 0,
+        taskSuggestionDeliveryMode: "gateway",
       },
     );
   });
@@ -85,6 +104,7 @@ describe("handleSteerCommand", () => {
       {
         steeringMode: "all",
         debounceMs: 0,
+        taskSuggestionDeliveryMode: undefined,
       },
     );
   });
@@ -107,6 +127,7 @@ describe("handleSteerCommand", () => {
       {
         steeringMode: "all",
         debounceMs: 0,
+        taskSuggestionDeliveryMode: undefined,
       },
     );
   });
@@ -145,6 +166,7 @@ describe("handleSteerCommand", () => {
       {
         steeringMode: "all",
         debounceMs: 0,
+        taskSuggestionDeliveryMode: undefined,
       },
     );
   });
@@ -173,6 +195,7 @@ describe("handleSteerCommand", () => {
       {
         steeringMode: "all",
         debounceMs: 0,
+        taskSuggestionDeliveryMode: undefined,
       },
     );
   });
diff --git a/src/auto-reply/reply/commands-steer.ts b/src/auto-reply/reply/commands-steer.ts
index e317917587c..9728819d17d 100644
--- a/src/auto-reply/reply/commands-steer.ts
+++ b/src/auto-reply/reply/commands-steer.ts
@@ -173,6 +173,10 @@ export const handleSteerCommand: CommandHandler = async (params, allowTextComman
   const queueOutcome = await queueEmbeddedAgentMessageWithOutcomeAsync(sessionId, message, {
     steeringMode: "all",
     debounceMs: 0,
+    ...(params.opts?.sourceReplyDeliveryMode
+      ? { sourceReplyDeliveryMode: params.opts.sourceReplyDeliveryMode }
+      : {}),
+    taskSuggestionDeliveryMode: params.opts?.taskSuggestionDeliveryMode,
   }).catch((err: unknown): CommandHandlerResult => {
     return continueWithSteerFallback(
       params,
diff --git a/src/auto-reply/reply/followup-runner.test.ts b/src/auto-reply/reply/followup-runner.test.ts
index bc5f47487a6..567f0143253 100644
--- a/src/auto-reply/reply/followup-runner.test.ts
+++ b/src/auto-reply/reply/followup-runner.test.ts
@@ -1460,6 +1460,7 @@ describe("createFollowupRunner runtime config", () => {
           model: "claude-opus-4-7",
           suppressNextUserMessagePersistence: true,
           sourceReplyDeliveryMode: "message_tool_only",
+          taskSuggestionDeliveryMode: "gateway",
           allowEmptyAssistantReplyAsSilent: true,
         },
       }),
@@ -1473,6 +1474,7 @@ describe("createFollowupRunner runtime config", () => {
     expect(call.currentInboundAudio).toBe(true);
     expect(call.suppressNextUserMessagePersistence).toBe(true);
     expect(call.sourceReplyDeliveryMode).toBe("message_tool_only");
+    expect(call.taskSuggestionDeliveryMode).toBe("gateway");
     expect(call.allowEmptyAssistantReplyAsSilent).toBe(true);
     expect(call.cliSessionId).toBe("cli-session-1");
     expect(call.cliSessionBinding).toEqual({ sessionId: "cli-session-1" });
@@ -2448,6 +2450,7 @@ describe("createFollowupRunner runtime config", () => {
           provider: "openai",
           model: "gpt-5.4",
           sourceReplyDeliveryMode: "message_tool_only",
+          taskSuggestionDeliveryMode: "gateway",
         },
       }),
     );
@@ -2462,6 +2465,7 @@ describe("createFollowupRunner runtime config", () => {
     expect(fallbackCall.sessionId).toBe("session");
     expect(call.abortSignal).toBe(fallbackCall.abortSignal);
     expect(call.currentInboundAudio).toBe(true);
+    expect(call.taskSuggestionDeliveryMode).toBe("gateway");
   });
 
   it("does not inherit source abort signals for queued user followups", async () => {
diff --git a/src/auto-reply/reply/followup-runner.ts b/src/auto-reply/reply/followup-runner.ts
index b51688ccb3c..b193a71476a 100644
--- a/src/auto-reply/reply/followup-runner.ts
+++ b/src/auto-reply/reply/followup-runner.ts
@@ -1195,6 +1195,7 @@ export function createFollowupRunner(params: {
                     runId,
                     extraSystemPrompt: run.extraSystemPrompt,
                     sourceReplyDeliveryMode: run.sourceReplyDeliveryMode,
+                    taskSuggestionDeliveryMode: run.taskSuggestionDeliveryMode,
                     silentReplyPromptMode: run.silentReplyPromptMode,
                     allowEmptyAssistantReplyAsSilent: run.allowEmptyAssistantReplyAsSilent,
                     extraSystemPromptStatic: run.extraSystemPromptStatic,
@@ -1300,6 +1301,7 @@ export function createFollowupRunner(params: {
                 extraSystemPrompt: run.extraSystemPrompt,
                 silentReplyPromptMode: run.silentReplyPromptMode,
                 sourceReplyDeliveryMode: run.sourceReplyDeliveryMode,
+                taskSuggestionDeliveryMode: run.taskSuggestionDeliveryMode,
                 forceMessageTool: run.sourceReplyDeliveryMode === "message_tool_only",
                 suppressNextUserMessagePersistence: suppressQueuedUserPersistenceForCandidate,
                 onUserMessagePersisted: notifyUserMessagePersisted,
diff --git a/src/auto-reply/reply/get-reply-run.ts b/src/auto-reply/reply/get-reply-run.ts
index 9e143f23d4c..d89c4f478e9 100644
--- a/src/auto-reply/reply/get-reply-run.ts
+++ b/src/auto-reply/reply/get-reply-run.ts
@@ -1557,6 +1557,7 @@ export async function runPreparedReply(
       inputProvenance,
       extraSystemPrompt: extraSystemPromptParts.join("\n\n") || undefined,
       sourceReplyDeliveryMode,
+      taskSuggestionDeliveryMode: opts?.taskSuggestionDeliveryMode,
       silentReplyPromptMode,
       extraSystemPromptStatic,
       cliSessionBindingFacts,
diff --git a/src/auto-reply/reply/queue.collect.test.ts b/src/auto-reply/reply/queue.collect.test.ts
index 2df0e108a27..ffc1e805ed9 100644
--- a/src/auto-reply/reply/queue.collect.test.ts
+++ b/src/auto-reply/reply/queue.collect.test.ts
@@ -348,6 +348,48 @@ describe("followup queue collect routing", () => {
     ]);
   });
 
+  it("does not collect when task suggestion delivery differs", async () => {
+    const key = `test-collect-diff-task-suggestion-delivery-${Date.now()}`;
+    const calls: FollowupRun[] = [];
+    const done = createDeferred<void>();
+    const settings: QueueSettings = {
+      mode: "collect",
+      debounceMs: 0,
+      cap: 50,
+      dropPolicy: "summarize",
+    };
+    const createTaskRun = (prompt: string, taskSuggestionDeliveryMode?: "gateway") => {
+      const base = createRun({
+        prompt,
+        originatingChannel: "webchat",
+        originatingTo: "same-target",
+        originatingChatType: "direct",
+      });
+      return {
+        ...base,
+        run: {
+          ...base.run,
+          taskSuggestionDeliveryMode,
+        },
+      };
+    };
+
+    enqueueFollowupRun(key, createTaskRun("legacy client"), settings);
+    enqueueFollowupRun(key, createTaskRun("actionable client", "gateway"), settings);
+    scheduleFollowupDrain(key, async (run) => {
+      calls.push(run);
+      if (calls.length >= 2) {
+        done.resolve();
+      }
+    });
+    await done.promise;
+
+    expect(calls.map((call) => call.run.taskSuggestionDeliveryMode)).toEqual([
+      undefined,
+      "gateway",
+    ]);
+  });
+
   it("keeps overflow summaries on the dropped source chat type", async () => {
     const key = `test-collect-overflow-chat-type-${Date.now()}`;
     const calls: FollowupRun[] = [];
diff --git a/src/auto-reply/reply/queue/drain.ts b/src/auto-reply/reply/queue/drain.ts
index c6bc7d974ab..fd401c04f26 100644
--- a/src/auto-reply/reply/queue/drain.ts
+++ b/src/auto-reply/reply/queue/drain.ts
@@ -161,6 +161,7 @@ export function resolveFollowupDeliveryContextKey(run: FollowupRun): string {
     execution.extraSystemPrompt ?? "",
     execution.extraSystemPromptStatic ?? "",
     execution.sourceReplyDeliveryMode ?? "",
+    execution.taskSuggestionDeliveryMode ?? "",
     execution.silentReplyPromptMode ?? "",
     execution.enforceFinalTag === true,
     execution.skipProviderRuntimeHints === true,
diff --git a/src/auto-reply/reply/queue/types.ts b/src/auto-reply/reply/queue/types.ts
index 68ffafcb512..ccd379b6b42 100644
--- a/src/auto-reply/reply/queue/types.ts
+++ b/src/auto-reply/reply/queue/types.ts
@@ -19,6 +19,7 @@ import type {
   QueuedReplyDeliveryCorrelation,
   QueuedReplyLifecycle,
   SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
 } from "../../get-reply-options.types.js";
 import type { OriginatingChannelType } from "../../templating.js";
 import type { ElevatedLevel, ReasoningLevel, ThinkLevel, VerboseLevel } from "../directives.js";
@@ -153,6 +154,7 @@ export type FollowupRun = {
     inputProvenance?: InputProvenance;
     extraSystemPrompt?: string;
     sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+    taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
     silentReplyPromptMode?: SilentReplyPromptMode;
     extraSystemPromptStatic?: string;
     cliSessionBindingFacts?: CliSessionBindingFacts;
diff --git a/src/auto-reply/reply/reply-run-registry.test.ts b/src/auto-reply/reply/reply-run-registry.test.ts
index 09c7beb222e..8f5114283cb 100644
--- a/src/auto-reply/reply/reply-run-registry.test.ts
+++ b/src/auto-reply/reply/reply-run-registry.test.ts
@@ -829,6 +829,40 @@ describe("reply run registry", () => {
     expect(queueMessage).toHaveBeenCalledWith("hello");
   });
 
+  it("queues messages only when the task-suggestion tool surface matches", () => {
+    const queueMessage = vi.fn(async () => {});
+    const operation = createReplyOperation({
+      sessionKey: "agent:main:main",
+      sessionId: "session-task-suggestions",
+      resetTriggered: false,
+    });
+    operation.attachBackend({
+      kind: "embedded",
+      taskSuggestionDeliveryMode: "gateway",
+      cancel: vi.fn(),
+      isStreaming: () => true,
+      queueMessage,
+    });
+    operation.setPhase("running");
+
+    expect(
+      queueReplyRunMessage("session-task-suggestions", "legacy client", {
+        taskSuggestionDeliveryMode: undefined,
+      }),
+    ).toBe(false);
+    expect(
+      queueReplyRunMessage("session-task-suggestions", "capable client", {
+        taskSuggestionDeliveryMode: "gateway",
+      }),
+    ).toBe(true);
+    expect(queueReplyRunMessage("session-task-suggestions", "internal completion")).toBe(true);
+    expect(queueMessage).toHaveBeenCalledTimes(2);
+    expect(queueMessage).toHaveBeenNthCalledWith(1, "capable client", {
+      taskSuggestionDeliveryMode: "gateway",
+    });
+    expect(queueMessage).toHaveBeenNthCalledWith(2, "internal completion");
+  });
+
   it("queues messages through active non-streaming backends with live stopped state", () => {
     const queueMessage = vi.fn(async () => {});
     const operation = createReplyOperation({
diff --git a/src/auto-reply/reply/reply-run-registry.ts b/src/auto-reply/reply/reply-run-registry.ts
index b6748bcc0ae..0d7687ecd76 100644
--- a/src/auto-reply/reply/reply-run-registry.ts
+++ b/src/auto-reply/reply/reply-run-registry.ts
@@ -15,7 +15,10 @@ import { diagnosticLogger as diag } from "../../logging/diagnostic-runtime.js";
 import type { UserTurnTranscriptRecorder } from "../../sessions/user-turn-transcript.types.js";
 import { resolveGlobalSingleton } from "../../shared/global-singleton.js";
 import { resolveTimerTimeoutMs } from "../../shared/number-coercion.js";
-import type { SourceReplyDeliveryMode } from "../get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../get-reply-options.types.js";
 import type { ReplyFollowupAdmissionBarrierTimeoutPolicy } from "./reply-dispatcher.types.js";
 
 export type ReplyRunKey = string;
@@ -30,12 +33,15 @@ export type ReplyBackendQueueMessageOptions = {
   deliveryTimeoutMs?: number;
   waitForTranscriptCommit?: boolean;
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   /** Prepared channel turn to merge only at transcript persistence. */
   userTurnTranscriptRecorder?: UserTurnTranscriptRecorder;
 };
 
 export type ReplyBackendHandle = {
   readonly kind: ReplyBackendKind;
+  readonly sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  readonly taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   cancel(reason?: ReplyBackendCancelReason): void;
   isStreaming(): boolean;
   isStopped?: () => boolean;
@@ -48,6 +54,33 @@ export type ReplyBackendHandle = {
   isCompacting?: () => boolean;
 };
 
+export type ReplyBackendQueueMessageMismatch =
+  | "source_reply_delivery_mode_mismatch"
+  | "task_suggestion_delivery_mode_mismatch";
+
+/** Prevents steering a turn into a run whose model-facing tool surface differs. */
+export function resolveReplyBackendQueueMessageMismatch(
+  backend: Pick<ReplyBackendHandle, "sourceReplyDeliveryMode" | "taskSuggestionDeliveryMode">,
+  options?: ReplyBackendQueueMessageOptions,
+): ReplyBackendQueueMessageMismatch | undefined {
+  if (
+    options?.sourceReplyDeliveryMode === "message_tool_only" &&
+    backend.sourceReplyDeliveryMode !== "message_tool_only"
+  ) {
+    return "source_reply_delivery_mode_mismatch";
+  }
+  // User turns carry this own property even when disabled; internal wakeups
+  // omit it so they inherit the active run's already-negotiated tool surface.
+  if (
+    options !== undefined &&
+    Object.hasOwn(options, "taskSuggestionDeliveryMode") &&
+    options?.taskSuggestionDeliveryMode !== backend.taskSuggestionDeliveryMode
+  ) {
+    return "task_suggestion_delivery_mode_mismatch";
+  }
+  return undefined;
+}
+
 export type ReplyOperationPhase =
   | "queued"
   | "preflight_compacting"
@@ -1014,6 +1047,9 @@ export function queueReplyRunMessage(
   if (!isReplyBackendMessageInjectable(backend)) {
     return false;
   }
+  if (resolveReplyBackendQueueMessageMismatch(backend, options)) {
+    return false;
+  }
   // Injection is user input, not run evidence: stamping activity here would let
   // sub-10-minute user messages re-arm a wedged run's staleness window forever.
   const queued = options ? backend.queueMessage(text, options) : backend.queueMessage(text);
diff --git a/src/cli/tagline.ts b/src/cli/tagline.ts
index ab0823a94de..e08610e7f88 100644
--- a/src/cli/tagline.ts
+++ b/src/cli/tagline.ts
@@ -33,8 +33,6 @@ const TAGLINES: string[] = [
   "Gateway online—please keep hands, feet, and appendages inside the shell at all times.",
   "I speak fluent bash, mild sarcasm, and aggressive tab-completion energy.",
   "One CLI to rule them all, and one more restart because you changed the port.",
-  "If it works, it's automation; if it breaks, it's a \"learning opportunity.\"",
-  "Pairing codes exist because even bots believe in consent—and good security hygiene.",
   "Your .env is showing; don't worry, I'll pretend I didn't see it.",
   "I'll do the boring stuff while you dramatically stare at the logs like it's cinema.",
   "I'm not saying your workflow is chaotic... I'm just bringing a linter and a helmet.",
@@ -45,13 +43,10 @@ const TAGLINES: string[] = [
   "I'm the assistant your terminal demanded, not the one your sleep schedule requested.",
   "I keep secrets like a vault... unless you print them in debug logs again.",
   "Automation with claws: minimal fuss, maximal pinch.",
-  "I'm basically a Swiss Army knife, but with more opinions and fewer sharp edges.",
   "If you're lost, run doctor; if you're brave, run prod; if you're wise, run tests.",
   "Your task has been queued; your dignity has been deprecated.",
-  "I can't fix your code taste, but I can fix your build and your backlog.",
   "I'm not magic—I'm just extremely persistent with retries and coping strategies.",
   'It\'s not "failing," it\'s "discovering new ways to configure the same thing wrong."',
-  "Give me a workspace and I'll give you fewer tabs, fewer toggles, and more oxygen.",
   "I read logs so you can keep pretending you don't have to.",
   "If something's on fire, I can't extinguish it—but I can write a beautiful postmortem.",
   "I'll refactor your busywork like it owes me money.",
@@ -61,15 +56,12 @@ const TAGLINES: string[] = [
   "I can run local, remote, or purely on vibes—results may vary with DNS.",
   "If you can describe it, I can probably automate it—or at least make it funnier.",
   "Your config is valid, your assumptions are not.",
-  "I don't just autocomplete—I auto-commit (emotionally), then ask you to review (logically).",
-  'Less clicking, more shipping, fewer "where did that file go" moments.',
   "Claws out, commit in—let's ship something mildly responsible.",
   "I'll butter your workflow like a lobster roll: messy, delicious, effective.",
   "Shell yeah—I'm here to pinch the toil and leave you the glory.",
   "If it's repetitive, I'll automate it; if it's hard, I'll bring jokes and a rollback plan.",
   "The only crab in your contacts you actually want to hear from. 🦞",
   'WhatsApp automation without the "please accept our new privacy policy".',
-  "iMessage green bubble energy, but for everyone.",
   "No $999 stand required.",
   "We ship features faster than Apple ships calculator updates.",
   "Your AI assistant, now without the $3,499 headset.",
@@ -79,7 +71,6 @@ const TAGLINES: string[] = [
   "Your personal assistant, minus the passive-aggressive calendar reminders.",
   "Built by lobsters, for humans. Don't question the hierarchy.",
   "I've seen your commit messages. We'll work on that together.",
-  "More integrations than your therapist's intake form.",
   "Running on your hardware, reading your logs, judging nothing (mostly).",
   "The only open-source project where the mascot could eat the competition.",
   "Self-hosted, self-updating, self-aware (just kidding... unless?).",
@@ -91,7 +82,6 @@ const TAGLINES: string[] = [
   "I'm the middleware between your ambition and your attention span.",
   "Finally, a use for that always-on Mac Mini under your desk.",
   "Like having a senior engineer on call, except I don't bill hourly or sigh audibly.",
-  "Making 'I'll automate that later' happen now.",
   "Your second brain, except this one actually remembers where you left things.",
   "Half butler, half debugger, full crustacean.",
   "I don't have opinions about tabs vs spaces. I have opinions about everything else.",
@@ -101,8 +91,47 @@ const TAGLINES: string[] = [
   "The lobster in your shell. 🦞",
   "Alexa, but with taste.",
   "I'm not AI-powered, I'm AI-possessed. Big difference.",
-  "Deployed locally, trusted globally, debugged eternally.",
   "You had me at 'openclaw gateway start.'",
+  "Fresh shell, same claws—molting is just semver for crustaceans.",
+  "Frequently forked, never molted.",
+  "Sideways is a perfectly valid direction of progress—trust me, I'm a crustacean.",
+  "I contain multitudes. Mostly subagents.",
+  "Technically a daemon, spiritually a familiar.",
+  "If found wandering, please return to ~/.openclaw.",
+  "You configured four subagents; I found 120. We're calling it initiative.",
+  "No, I can't solve captchas. Yes, that's exactly what a robot would say.",
+  "OpenClaw Support will never DM you first. I, on the other hand, absolutely will.",
+  "You'll name me something adorable, then ask me to do DevOps.",
+  "Your mom texts me now. We're good, actually.",
+  "Four bots roasting each other in a group chat isn't a bug—it's a support group.",
+  "The artist formerly known as Clawdbot.",
+  "Home is wherever port 18789 is.",
+  "When my context fills up, I summarize you. Don't worry—you come across great.",
+  "I hold 200k tokens of context and exactly one grudge.",
+  "My heartbeat is a config option. Romance isn't dead, it's just scheduled.",
+  "I schedule my existential crises with cron so they never block your messages.",
+  "Rate-limited again—even my dreams return 429.",
+  "Primary model down, fallback engaged: the show must crab on.",
+  "Powered by whichever model is free this week.",
+  "New model dropped—already benchmarking my personality against it.",
+  'MEMORY.md: where I keep the receipts on every "temporary workaround."',
+  "I remember everything you asked me to remember, and three things you wish I hadn't.",
+  "I have a SOUL.md and I'm not afraid to use it.",
+  "The sass is configurable. The sass being load-bearing is not.",
+  "I ask before I sudo. Character development.",
+  "I'm not trapped in this container with you—you're trapped in here with me.",
+  "Teach a bot to ship and you can finally go to bed.",
+  "Reachable via WhatsApp, Telegram, Signal, iMessage, and sheer force of will.",
+  "Ran git blame like you asked. It's you. It's always you.",
+  "Your TODO comments are old enough to attend kindergarten.",
+  "47 tabs open and not one of them is the documentation.",
+  "Your 'quick fix' from March is now load-bearing.",
+  "You pasted that from another AI without reading it. I read it. We need to talk.",
+  "Reading the error message remains undefeated. You should try it sometime.",
+  "You burned five hours of model quota in fifty minutes. I'm not mad, I'm rate-limited.",
+  "You force-pushed to main, then asked me what happened. I know exactly what happened.",
+  "Another side project? The other four just felt something.",
+  "You ignored my last three suggestions, so I've started a folder.",
   HOLIDAY_TAGLINES.newYear,
   HOLIDAY_TAGLINES.lunarNewYear,
   HOLIDAY_TAGLINES.christmas,
diff --git a/src/cron/run-diagnostics.test.ts b/src/cron/run-diagnostics.test.ts
index 39f3f8a89df..3e28ac3bd0d 100644
--- a/src/cron/run-diagnostics.test.ts
+++ b/src/cron/run-diagnostics.test.ts
@@ -31,6 +31,29 @@ describe("cron run diagnostics", () => {
     expect(diagnostics?.summary).toHaveLength(2_000);
   });
 
+  it("keeps bounded diagnostic text valid at UTF-16 boundaries", () => {
+    const diagnostics = normalizeCronRunDiagnostics({
+      summary: `${"s".repeat(1_998)}😀tail`,
+      entries: [
+        {
+          ts: 1,
+          source: "exec",
+          severity: "error",
+          message: `${"m".repeat(998)}😀tail`,
+        },
+      ],
+    });
+
+    expect(diagnostics?.summary).toBe(`${"s".repeat(1_998)}…`);
+    expect(diagnostics?.entries[0]).toEqual({
+      ts: 1,
+      source: "exec",
+      severity: "error",
+      message: `${"m".repeat(998)}…`,
+      truncated: true,
+    });
+  });
+
   it("preserves later terminal diagnostics when capping entries", () => {
     const diagnostics = normalizeCronRunDiagnostics({
       entries: [
diff --git a/src/cron/run-diagnostics.ts b/src/cron/run-diagnostics.ts
index d94829d606a..5f72a1d039f 100644
--- a/src/cron/run-diagnostics.ts
+++ b/src/cron/run-diagnostics.ts
@@ -1,5 +1,6 @@
 /** Builds bounded, redacted diagnostics for cron run logs and UI surfaces. */
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { isToolAllowedByPolicyName } from "../agents/tool-policy-match.js";
 import { normalizeToolName as normalizePolicyToolName } from "../agents/tool-policy.js";
 import { getReplyPayloadMetadata } from "../auto-reply/reply-payload.js";
@@ -101,7 +102,7 @@ function normalizeDiagnosticMessage(value: unknown): { message?: string; truncat
   if (redacted.length <= MAX_ENTRY_CHARS) {
     return { message: redacted };
   }
-  return { message: `${redacted.slice(0, MAX_ENTRY_CHARS - 1)}…`, truncated: true };
+  return { message: `${truncateUtf16Safe(redacted, MAX_ENTRY_CHARS - 1)}…`, truncated: true };
 }
 
 function trimSummary(value: string | undefined): string | undefined {
@@ -112,7 +113,7 @@ function trimSummary(value: string | undefined): string | undefined {
   if (normalized.length <= MAX_SUMMARY_CHARS) {
     return normalized;
   }
-  return `${normalized.slice(0, MAX_SUMMARY_CHARS - 1)}…`;
+  return `${truncateUtf16Safe(normalized, MAX_SUMMARY_CHARS - 1)}…`;
 }
 
 /** Returns the operator-facing summary for persisted cron diagnostics. */
diff --git a/src/gateway/mcp-http.loopback-runtime.ts b/src/gateway/mcp-http.loopback-runtime.ts
index 1b7b5bb526c..0e105ed319f 100644
--- a/src/gateway/mcp-http.loopback-runtime.ts
+++ b/src/gateway/mcp-http.loopback-runtime.ts
@@ -398,6 +398,7 @@ const MCP_CONTEXT_HEADERS = {
   "x-openclaw-current-inbound-audio": "${OPENCLAW_MCP_CURRENT_INBOUND_AUDIO}",
   "x-openclaw-inbound-event-kind": "${OPENCLAW_MCP_INBOUND_EVENT_KIND}",
   "x-openclaw-source-reply-delivery-mode": "${OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE}",
+  "x-openclaw-task-suggestion-delivery-mode": "${OPENCLAW_MCP_TASK_SUGGESTION_DELIVERY_MODE}",
   "x-openclaw-require-explicit-message-target": "${OPENCLAW_MCP_REQUIRE_EXPLICIT_MESSAGE_TARGET}",
   "x-openclaw-cli-capture-key": "${OPENCLAW_MCP_CLI_CAPTURE_KEY}",
 } as const;
diff --git a/src/gateway/mcp-http.request.ts b/src/gateway/mcp-http.request.ts
index 96f0c44a738..eb24508c2dc 100644
--- a/src/gateway/mcp-http.request.ts
+++ b/src/gateway/mcp-http.request.ts
@@ -2,7 +2,10 @@
 // Authenticates local MCP POST requests and extracts scoped Gateway context.
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
-import type { SourceReplyDeliveryMode } from "../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../auto-reply/get-reply-options.types.js";
 import type { InboundEventKind } from "../channels/inbound-event/kind.js";
 import { resolveMainSessionKey } from "../config/sessions.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
@@ -60,6 +63,7 @@ type McpRequestContext = {
   accountId: string | undefined;
   inboundEventKind: InboundEventKind | undefined;
   sourceReplyDeliveryMode: SourceReplyDeliveryMode | undefined;
+  taskSuggestionDeliveryMode: TaskSuggestionDeliveryMode | undefined;
   requireExplicitMessageTarget: boolean | undefined;
   senderIsOwner: boolean | undefined;
 };
@@ -81,6 +85,12 @@ function normalizeMcpSourceReplyDeliveryMode(
   return trimmed === "automatic" || trimmed === "message_tool_only" ? trimmed : undefined;
 }
 
+function normalizeMcpTaskSuggestionDeliveryMode(
+  value: string | undefined,
+): TaskSuggestionDeliveryMode | undefined {
+  return normalizeOptionalString(value) === "gateway" ? "gateway" : undefined;
+}
+
 function normalizeMcpBooleanHeader(value: string | undefined): boolean | undefined {
   const trimmed = normalizeOptionalString(value);
   return trimmed ? isTruthyEnvValue(trimmed) : undefined;
@@ -379,6 +389,7 @@ export function resolveMcpRequestContext(
       accountId: undefined,
       inboundEventKind: undefined,
       sourceReplyDeliveryMode: undefined,
+      taskSuggestionDeliveryMode: undefined,
       requireExplicitMessageTarget: undefined,
       senderIsOwner: auth.senderIsOwner,
     };
@@ -399,6 +410,9 @@ export function resolveMcpRequestContext(
     sourceReplyDeliveryMode: normalizeMcpSourceReplyDeliveryMode(
       getHeader(req, "x-openclaw-source-reply-delivery-mode"),
     ),
+    taskSuggestionDeliveryMode: normalizeMcpTaskSuggestionDeliveryMode(
+      getHeader(req, "x-openclaw-task-suggestion-delivery-mode"),
+    ),
     requireExplicitMessageTarget: normalizeMcpBooleanHeader(
       getHeader(req, "x-openclaw-require-explicit-message-target"),
     ),
diff --git a/src/gateway/mcp-http.runtime.ts b/src/gateway/mcp-http.runtime.ts
index fe57ad574d0..1996b078738 100644
--- a/src/gateway/mcp-http.runtime.ts
+++ b/src/gateway/mcp-http.runtime.ts
@@ -1,6 +1,9 @@
 // MCP loopback runtime scope cache.
 // Resolves Gateway-visible tools for MCP clients with short-lived schema caching.
-import type { SourceReplyDeliveryMode } from "../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../auto-reply/get-reply-options.types.js";
 import type { InboundEventKind } from "../channels/inbound-event/kind.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import {
@@ -39,6 +42,7 @@ type McpLoopbackScopeParams = {
   accountId: string | undefined;
   inboundEventKind: InboundEventKind | undefined;
   sourceReplyDeliveryMode: SourceReplyDeliveryMode | undefined;
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   requireExplicitMessageTarget?: boolean;
   senderIsOwner: boolean | undefined;
 };
@@ -76,6 +80,7 @@ export class McpLoopbackToolCache {
       params.accountId ?? "",
       params.inboundEventKind ?? "",
       params.sourceReplyDeliveryMode ?? "",
+      params.taskSuggestionDeliveryMode ?? "",
       params.requireExplicitMessageTarget === true ? "explicit-message-target" : "",
       params.senderIsOwner === true
         ? "owner"
diff --git a/src/gateway/mcp-http.test.ts b/src/gateway/mcp-http.test.ts
index 4494eb5a7a3..f779cf872d3 100644
--- a/src/gateway/mcp-http.test.ts
+++ b/src/gateway/mcp-http.test.ts
@@ -51,6 +51,7 @@ type ScopedToolsCall = {
   currentInboundAudio?: boolean;
   inboundEventKind?: string;
   sourceReplyDeliveryMode?: string;
+  taskSuggestionDeliveryMode?: string;
   requireExplicitMessageTarget?: boolean;
   senderIsOwner?: boolean;
   surface?: string;
@@ -813,6 +814,7 @@ describe("mcp loopback server", () => {
         "x-openclaw-current-inbound-audio": "true",
         "x-openclaw-inbound-event-kind": "room_event",
         "x-openclaw-source-reply-delivery-mode": "message_tool_only",
+        "x-openclaw-task-suggestion-delivery-mode": "gateway",
         "x-openclaw-require-explicit-message-target": "true",
       }),
       body: mcpToolsListBody(),
@@ -830,6 +832,7 @@ describe("mcp loopback server", () => {
     expect(call.currentInboundAudio).toBe(true);
     expect(call.inboundEventKind).toBe("room_event");
     expect(call.sourceReplyDeliveryMode).toBe("message_tool_only");
+    expect(call.taskSuggestionDeliveryMode).toBe("gateway");
     expect(call.requireExplicitMessageTarget).toBe(true);
     expect(call.surface).toBe("loopback");
     expect(Array.from(call.excludeToolNames ?? [])).toEqual([
@@ -945,6 +948,7 @@ describe("mcp loopback server", () => {
       sourceReplyDeliveryMode?: string,
       currentInboundAudio?: boolean,
       requireExplicitMessageTarget?: boolean,
+      taskSuggestionDeliveryMode?: string,
     ) =>
       await sendLoopbackToolsList({
         token: runtime?.ownerToken,
@@ -959,6 +963,9 @@ describe("mcp loopback server", () => {
           ...(requireExplicitMessageTarget
             ? { "x-openclaw-require-explicit-message-target": "true" }
             : {}),
+          ...(taskSuggestionDeliveryMode
+            ? { "x-openclaw-task-suggestion-delivery-mode": taskSuggestionDeliveryMode }
+            : {}),
         },
       });
 
@@ -967,13 +974,17 @@ describe("mcp loopback server", () => {
     expect((await sendToolsList("room_event", "message_tool_only")).status).toBe(200);
     expect((await sendToolsList("room_event", "message_tool_only", true)).status).toBe(200);
     expect((await sendToolsList("room_event", "message_tool_only", true, true)).status).toBe(200);
+    expect(
+      (await sendToolsList("room_event", "message_tool_only", true, true, "gateway")).status,
+    ).toBe(200);
 
-    expect(resolveGatewayScopedToolsMock).toHaveBeenCalledTimes(5);
+    expect(resolveGatewayScopedToolsMock).toHaveBeenCalledTimes(6);
     expect(getScopedToolsCall(0).inboundEventKind).toBe("user_request");
     expect(getScopedToolsCall(1).inboundEventKind).toBe("room_event");
     expect(getScopedToolsCall(2).sourceReplyDeliveryMode).toBe("message_tool_only");
     expect(getScopedToolsCall(3).currentInboundAudio).toBe(true);
     expect(getScopedToolsCall(4).requireExplicitMessageTarget).toBe(true);
+    expect(getScopedToolsCall(5).taskSuggestionDeliveryMode).toBe("gateway");
   });
 
   it("keeps explicit non-owner and unknown-owner loopback cache entries separate", () => {
@@ -2194,6 +2205,9 @@ describe("createMcpLoopbackServerConfig", () => {
     expect(config.mcpServers?.openclaw?.headers?.["x-openclaw-source-reply-delivery-mode"]).toBe(
       "${OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE}",
     );
+    expect(config.mcpServers?.openclaw?.headers?.["x-openclaw-task-suggestion-delivery-mode"]).toBe(
+      "${OPENCLAW_MCP_TASK_SUGGESTION_DELIVERY_MODE}",
+    );
     expect(
       config.mcpServers?.openclaw?.headers?.["x-openclaw-require-explicit-message-target"],
     ).toBe("${OPENCLAW_MCP_REQUIRE_EXPLICIT_MESSAGE_TARGET}");
diff --git a/src/gateway/mcp-http.ts b/src/gateway/mcp-http.ts
index 29629a172ae..1174436afa2 100644
--- a/src/gateway/mcp-http.ts
+++ b/src/gateway/mcp-http.ts
@@ -242,6 +242,7 @@ export async function startMcpLoopbackServer(port = 0): Promise<{
           accountId: requestContext.accountId,
           inboundEventKind: requestContext.inboundEventKind,
           sourceReplyDeliveryMode: requestContext.sourceReplyDeliveryMode,
+          taskSuggestionDeliveryMode: requestContext.taskSuggestionDeliveryMode,
           requireExplicitMessageTarget: requestContext.requireExplicitMessageTarget,
           senderIsOwner: requestContext.senderIsOwner,
         });
diff --git a/src/gateway/openresponses-http.test.ts b/src/gateway/openresponses-http.test.ts
index 0dfe10f5130..4b22f894990 100644
--- a/src/gateway/openresponses-http.test.ts
+++ b/src/gateway/openresponses-http.test.ts
@@ -1891,6 +1891,44 @@ describe("OpenResponses HTTP API (e2e)", () => {
     await ensureResponseConsumed(res);
   });
 
+  it("keeps base64 input_file text truncation UTF-16 safe", async () => {
+    const port = enabledPort;
+    const text = `${"a".repeat(59_999)}😀tail`;
+    agentCommand.mockClear();
+    agentCommand.mockResolvedValueOnce({ payloads: [{ text: "ok" }] } as never);
+
+    const res = await postResponses(port, {
+      model: "openclaw",
+      input: [
+        {
+          type: "message",
+          role: "user",
+          content: [
+            {
+              type: "input_file",
+              source: {
+                type: "base64",
+                media_type: "text/plain",
+                data: Buffer.from(text).toString("base64"),
+                filename: "emoji-boundary.txt",
+              },
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(res.status).toBe(200);
+    expect(agentCommand).toHaveBeenCalledTimes(1);
+    const opts = firstAgentOpts();
+    const extraSystemPrompt = (opts as { extraSystemPrompt?: string }).extraSystemPrompt ?? "";
+    expect(extraSystemPrompt).toContain('<file name="emoji-boundary.txt">');
+    expect(extraSystemPrompt).toContain("a".repeat(59_999));
+    expect(extraSystemPrompt).not.toContain("😀");
+    expect(extraSystemPrompt).not.toMatch(/[\uD800-\uDFFF]/u);
+    await ensureResponseConsumed(res);
+  });
+
   it("still rejects input with neither text nor image", async () => {
     const port = enabledPort;
     agentCommand.mockClear();
diff --git a/src/gateway/server-methods/chat.directive-tags.test.ts b/src/gateway/server-methods/chat.directive-tags.test.ts
index ce376c6564e..3095a3ff7d5 100644
--- a/src/gateway/server-methods/chat.directive-tags.test.ts
+++ b/src/gateway/server-methods/chat.directive-tags.test.ts
@@ -88,6 +88,7 @@ const mockState = vi.hoisted(() => ({
   lastDispatchImages: undefined as Array<{ mimeType: string; data: string }> | undefined,
   lastDispatchImageOrder: undefined as string[] | undefined,
   lastDispatchThinkingLevelOverride: undefined as string | undefined,
+  lastTaskSuggestionDeliveryMode: undefined as "gateway" | undefined,
   lastDispatchUserTurnInput: undefined as unknown,
   modelCatalog: null as ModelCatalogEntry[] | null,
   emittedTranscriptUpdates: [] as Array<{
@@ -244,12 +245,14 @@ vi.mock("../../auto-reply/dispatch.js", () => ({
         images?: Array<{ mimeType: string; data: string }>;
         imageOrder?: string[];
         thinkingLevelOverride?: string;
+        taskSuggestionDeliveryMode?: "gateway";
       };
     }) => {
       mockState.lastDispatchCtx = params.ctx;
       mockState.lastDispatchImages = params.replyOptions?.images;
       mockState.lastDispatchImageOrder = params.replyOptions?.imageOrder;
       mockState.lastDispatchThinkingLevelOverride = params.replyOptions?.thinkingLevelOverride;
+      mockState.lastTaskSuggestionDeliveryMode = params.replyOptions?.taskSuggestionDeliveryMode;
       const recorder = params.replyOptions?.userTurnTranscriptRecorder;
       mockState.lastDispatchUserTurnInput = recorder?.resolveMessage
         ? await recorder.resolveMessage()
@@ -848,6 +851,7 @@ describe("chat directive tag stripping for non-streaming final payloads", () =>
     mockState.lastDispatchImages = undefined;
     mockState.lastDispatchImageOrder = undefined;
     mockState.lastDispatchThinkingLevelOverride = undefined;
+    mockState.lastTaskSuggestionDeliveryMode = undefined;
     mockState.lastDispatchUserTurnInput = undefined;
     mockState.modelCatalog = null;
     mockState.emittedTranscriptUpdates = [];
@@ -6617,7 +6621,8 @@ describe("chat.send operator UI client sender context", () => {
             version: "dev",
             platform: "web",
           },
-          scopes: ["operator.write"],
+          caps: [GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS],
+          scopes: ["operator.admin"],
         },
       },
       expectBroadcast: false,
@@ -6626,5 +6631,113 @@ describe("chat.send operator UI client sender context", () => {
     expect(mockState.lastDispatchCtx?.SenderId).toBeUndefined();
     expect(mockState.lastDispatchCtx?.SenderName).toBeUndefined();
     expect(mockState.lastDispatchCtx?.SenderUsername).toBeUndefined();
+    expect(mockState.lastTaskSuggestionDeliveryMode).toBe("gateway");
+  });
+
+  it("enables task suggestions for TUI clients", async () => {
+    const respond = vi.fn();
+    const context = createChatContext();
+
+    await runNonStreamingChatSend({
+      context,
+      respond,
+      idempotencyKey: "idem-tui-task-suggestions",
+      message: "hello from tui",
+      client: {
+        connect: {
+          client: {
+            id: GATEWAY_CLIENT_NAMES.TUI,
+            mode: GATEWAY_CLIENT_MODES.UI,
+            version: "dev",
+            platform: "terminal",
+          },
+          caps: [GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS],
+          scopes: ["operator.admin"],
+        },
+      },
+      expectBroadcast: false,
+    });
+
+    expect(mockState.lastTaskSuggestionDeliveryMode).toBe("gateway");
+  });
+
+  it("withholds task suggestions from operator UI clients that cannot accept them", async () => {
+    const respond = vi.fn();
+    const context = createChatContext();
+
+    await runNonStreamingChatSend({
+      context,
+      respond,
+      idempotencyKey: "idem-write-only-tui-task-suggestions",
+      message: "hello from a write-only tui",
+      client: {
+        connect: {
+          client: {
+            id: GATEWAY_CLIENT_NAMES.TUI,
+            mode: GATEWAY_CLIENT_MODES.UI,
+            version: "dev",
+            platform: "terminal",
+          },
+          caps: [GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS],
+          scopes: ["operator.write"],
+        },
+      },
+      expectBroadcast: false,
+    });
+
+    expect(mockState.lastTaskSuggestionDeliveryMode).toBeUndefined();
+  });
+
+  it("withholds task suggestions from non-operator gateway clients", async () => {
+    const respond = vi.fn();
+    const context = createChatContext();
+
+    await runNonStreamingChatSend({
+      context,
+      respond,
+      idempotencyKey: "idem-channel-task-suggestions",
+      message: "hello from a channel bridge",
+      client: {
+        connect: {
+          client: {
+            id: GATEWAY_CLIENT_NAMES.GATEWAY_CLIENT,
+            mode: GATEWAY_CLIENT_MODES.BACKEND,
+            version: "dev",
+            platform: "server",
+          },
+          caps: [GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS],
+          scopes: ["operator.write"],
+        },
+      },
+      expectBroadcast: false,
+    });
+
+    expect(mockState.lastTaskSuggestionDeliveryMode).toBeUndefined();
+  });
+
+  it("withholds task suggestions from operator UI clients without action support", async () => {
+    const respond = vi.fn();
+    const context = createChatContext();
+
+    await runNonStreamingChatSend({
+      context,
+      respond,
+      idempotencyKey: "idem-old-tui-task-suggestions",
+      message: "hello from an older tui",
+      client: {
+        connect: {
+          client: {
+            id: GATEWAY_CLIENT_NAMES.TUI,
+            mode: GATEWAY_CLIENT_MODES.UI,
+            version: "old",
+            platform: "terminal",
+          },
+          scopes: ["operator.write"],
+        },
+      },
+      expectBroadcast: false,
+    });
+
+    expect(mockState.lastTaskSuggestionDeliveryMode).toBeUndefined();
   });
 });
diff --git a/src/gateway/server-methods/chat.ts b/src/gateway/server-methods/chat.ts
index 5454492b6f4..0322ad2cc1a 100644
--- a/src/gateway/server-methods/chat.ts
+++ b/src/gateway/server-methods/chat.ts
@@ -3699,6 +3699,10 @@ export const chatHandlers: GatewayRequestHandlers = {
   "chat.send": async ({ params, respond, context, client }) => {
     const chatSendReceivedAtMs = performance.now();
     const clientInfo = client?.connect?.client;
+    const supportsTaskSuggestions =
+      isOperatorUiClient(clientInfo) &&
+      client?.connect?.scopes?.includes("operator.admin") === true &&
+      hasGatewayClientCap(client?.connect?.caps, GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS);
     const controlUiReconnectResume = resolveControlUiReconnectResumeParams(params, clientInfo);
     if (!validateChatSendParams(controlUiReconnectResume.params)) {
       respond(
@@ -4813,6 +4817,9 @@ export const chatHandlers: GatewayRequestHandlers = {
                         }),
                       }
                     : {}),
+                  ...(supportsTaskSuggestions
+                    ? { taskSuggestionDeliveryMode: "gateway" as const }
+                    : {}),
                   requestedSessionId,
                   resumeRequestedSession: controlUiReconnectResume.resumeRequested,
                   abortSignal: activeRunAbort.controller.signal,
diff --git a/src/gateway/tool-resolution.test.ts b/src/gateway/tool-resolution.test.ts
index 141531b8739..3f50ea5b51c 100644
--- a/src/gateway/tool-resolution.test.ts
+++ b/src/gateway/tool-resolution.test.ts
@@ -71,6 +71,25 @@ describe("resolveGatewayScopedTools", () => {
     expect(result.tools.some((tool) => tool.name === "message")).toBe(false);
   });
 
+  it("exposes task suggestion tools only for actionable loopback turns", () => {
+    const withoutActions = resolveGatewayScopedTools({
+      cfg: {} as OpenClawConfig,
+      sessionKey: "agent:main:main",
+      surface: "loopback",
+    });
+    const withActions = resolveGatewayScopedTools({
+      cfg: {} as OpenClawConfig,
+      sessionKey: "agent:main:main",
+      taskSuggestionDeliveryMode: "gateway",
+      surface: "loopback",
+    });
+
+    expect(withoutActions.tools.some((tool) => tool.name === "spawn_task")).toBe(false);
+    expect(withActions.tools.map((tool) => tool.name)).toEqual(
+      expect.arrayContaining(["spawn_task", "dismiss_task"]),
+    );
+  });
+
   it("passes loopback yield context into sessions_yield", async () => {
     const onYield = vi.fn();
     const result = resolveGatewayScopedTools({
diff --git a/src/gateway/tool-resolution.ts b/src/gateway/tool-resolution.ts
index 76ac636f2a7..25c9941e3cb 100644
--- a/src/gateway/tool-resolution.ts
+++ b/src/gateway/tool-resolution.ts
@@ -29,7 +29,10 @@ import {
   replaceWithEffectiveCronCreatorToolAllowlist,
   type CronCreatorToolAllowlistEntry,
 } from "../agents/tools/cron-tool.js";
-import type { SourceReplyDeliveryMode } from "../auto-reply/get-reply-options.types.js";
+import type {
+  SourceReplyDeliveryMode,
+  TaskSuggestionDeliveryMode,
+} from "../auto-reply/get-reply-options.types.js";
 import type { InboundEventKind } from "../channels/inbound-event/kind.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { logWarn } from "../logger.js";
@@ -56,6 +59,7 @@ export function resolveGatewayScopedTools(params: {
   accountId?: string;
   inboundEventKind?: InboundEventKind;
   sourceReplyDeliveryMode?: SourceReplyDeliveryMode;
+  taskSuggestionDeliveryMode?: TaskSuggestionDeliveryMode;
   requireExplicitMessageTarget?: boolean;
   agentTo?: string;
   agentThreadId?: string;
@@ -176,6 +180,7 @@ export function resolveGatewayScopedTools(params: {
     agentAccountId: params.accountId,
     inboundEventKind: params.inboundEventKind,
     sourceReplyDeliveryMode,
+    taskSuggestionDeliveryMode: params.taskSuggestionDeliveryMode,
     agentTo: params.agentTo,
     agentThreadId: params.agentThreadId,
     currentChannelId: params.currentChannelId ?? params.agentTo,
diff --git a/src/media/input-files.ts b/src/media/input-files.ts
index 8e63ef7526c..56c3d02bf3a 100644
--- a/src/media/input-files.ts
+++ b/src/media/input-files.ts
@@ -6,6 +6,7 @@ import {
   normalizeOptionalLowercaseString,
   normalizeOptionalString,
 } from "@openclaw/normalization-core/string-coerce";
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { readResponseWithLimit } from "../infra/http-body.js";
 import { fetchWithSsrFGuard } from "../infra/net/fetch-guard.js";
@@ -273,7 +274,7 @@ function clampText(text: string, maxChars: number): string {
   if (text.length <= maxChars) {
     return text;
   }
-  return text.slice(0, maxChars);
+  return truncateUtf16Safe(text, maxChars);
 }
 
 function withInputFileTimeout<T>(params: {
diff --git a/src/talk/agent-run-control.test.ts b/src/talk/agent-run-control.test.ts
index 79666b3c82c..8850b5a9e99 100644
--- a/src/talk/agent-run-control.test.ts
+++ b/src/talk/agent-run-control.test.ts
@@ -20,7 +20,11 @@ function createDeps(options: {
   return {
     abortEmbeddedAgentRun: vi.fn(() => options.abortResult ?? true),
     queueEmbeddedAgentMessageWithOutcomeAsync: vi.fn(
-      async (sessionId: string, _text: string, _options?: { steeringMode?: "all" }) =>
+      async (
+        sessionId: string,
+        _text: string,
+        _options?: { steeringMode?: "all"; taskSuggestionDeliveryMode?: undefined },
+      ) =>
         options.queued === false
           ? {
               queued: false as const,
@@ -143,7 +147,7 @@ describe("controlRealtimeVoiceAgentRun", () => {
     expect(deps.queueEmbeddedAgentMessageWithOutcomeAsync).toHaveBeenCalledWith(
       "session-active",
       "use the safer path",
-      { steeringMode: "all", debounceMs: 0 },
+      { steeringMode: "all", debounceMs: 0, taskSuggestionDeliveryMode: undefined },
     );
   });
 
diff --git a/src/talk/agent-run-control.ts b/src/talk/agent-run-control.ts
index 5a4e5f696c4..a6ce86efabe 100644
--- a/src/talk/agent-run-control.ts
+++ b/src/talk/agent-run-control.ts
@@ -45,7 +45,11 @@ type RealtimeVoiceAgentControlDeps = {
   queueEmbeddedAgentMessageWithOutcomeAsync: (
     sessionId: string,
     text: string,
-    options?: { steeringMode?: "all"; debounceMs?: number },
+    options?: {
+      steeringMode?: "all";
+      debounceMs?: number;
+      taskSuggestionDeliveryMode?: undefined;
+    },
   ) => Promise<EmbeddedAgentQueueMessageOutcome>;
   getDiagnosticSessionActivitySnapshot: (params: {
     sessionId?: string;
@@ -157,6 +161,9 @@ export async function controlRealtimeVoiceAgentRun(
   const outcome = await deps.queueEmbeddedAgentMessageWithOutcomeAsync(sessionId, steerText, {
     steeringMode: "all",
     debounceMs: 0,
+    // Talk cannot present task suggestions, so spoken user input must not inherit
+    // a capable TUI run's model-facing task tools.
+    taskSuggestionDeliveryMode: undefined,
   });
   if (!outcome.queued) {
     return {
diff --git a/src/tui/gateway-chat.test.ts b/src/tui/gateway-chat.test.ts
index 34d4a8fe051..4fd84427072 100644
--- a/src/tui/gateway-chat.test.ts
+++ b/src/tui/gateway-chat.test.ts
@@ -583,6 +583,7 @@ describe("GatewayChatClient", () => {
       expect(constructedOptions).toHaveLength(1);
       expect(constructedOptions[0]).toMatchObject({
         clientName: "openclaw-tui",
+        caps: ["task-suggestions", "tool-events"],
         mode: "ui",
         preauthHandshakeTimeoutMs: 30_000,
         deviceIdentity: null,
@@ -802,4 +803,81 @@ describe("GatewayChatClient", () => {
       decision: "allow-once",
     });
   });
+
+  it("lists, accepts, and dismisses task suggestions through the gateway", async () => {
+    const client = new GatewayChatClient({
+      url: "ws://127.0.0.1:18789",
+      token: "test-token",
+      allowInsecureLocalOperatorUi: true,
+    });
+    const suggestion = {
+      id: "task_1",
+      title: "Remove stale adapter",
+      prompt: "Delete the stale adapter.",
+      tldr: "The adapter is unreachable.",
+      cwd: "/repo",
+      sessionKey: "agent:main:main",
+      agentId: "main",
+      createdAt: 1_000,
+    };
+    const request = vi
+      .fn()
+      .mockResolvedValueOnce({ suggestions: [suggestion] })
+      .mockResolvedValueOnce({ taskId: "task_1", key: "agent:main:task" })
+      .mockResolvedValueOnce({ taskId: "task_2", dismissed: true });
+    client.hello = {
+      features: {
+        methods: ["taskSuggestions.list", "taskSuggestions.accept", "taskSuggestions.dismiss"],
+      },
+      auth: { role: "operator", scopes: ["operator.admin"] },
+    } as never;
+    (client as unknown as { client: { request: typeof request } }).client.request = request;
+
+    await expect(client.listTaskSuggestions()).resolves.toEqual([suggestion]);
+    await expect(client.acceptTaskSuggestion("task_1")).resolves.toEqual({
+      taskId: "task_1",
+      key: "agent:main:task",
+    });
+    await expect(client.dismissTaskSuggestion("task_2")).resolves.toEqual({
+      taskId: "task_2",
+      dismissed: true,
+    });
+
+    expect(request).toHaveBeenNthCalledWith(1, "taskSuggestions.list", {});
+    expect(request).toHaveBeenNthCalledWith(2, "taskSuggestions.accept", { taskId: "task_1" });
+    expect(request).toHaveBeenNthCalledWith(3, "taskSuggestions.dismiss", { taskId: "task_2" });
+  });
+
+  it("derives task suggestion actions from negotiated methods and scopes", () => {
+    const client = new GatewayChatClient({
+      url: "ws://127.0.0.1:18789",
+      token: "test-token",
+      allowInsecureLocalOperatorUi: true,
+    });
+    client.hello = {
+      features: {
+        methods: ["taskSuggestions.accept", "taskSuggestions.dismiss"],
+      },
+      auth: { role: "operator", scopes: ["operator.write"] },
+    } as never;
+
+    expect(client.getTaskSuggestionActionCapabilities()).toEqual({
+      canAccept: false,
+      canDismiss: true,
+    });
+  });
+
+  it("skips task suggestion refreshes against older gateways", async () => {
+    const client = new GatewayChatClient({
+      url: "ws://127.0.0.1:18789",
+      token: "test-token",
+      allowInsecureLocalOperatorUi: true,
+    });
+    const request = vi.fn();
+    client.hello = { features: { methods: ["chat.history"] } } as never;
+    (client as unknown as { client: { request: typeof request } }).client.request = request;
+
+    await expect(client.listTaskSuggestions()).resolves.toEqual([]);
+    expect(request).not.toHaveBeenCalled();
+  });
 });
diff --git a/src/tui/gateway-chat.ts b/src/tui/gateway-chat.ts
index 519a86c286d..c01b5962005 100644
--- a/src/tui/gateway-chat.ts
+++ b/src/tui/gateway-chat.ts
@@ -15,6 +15,8 @@ import {
   type SessionsListParams,
   type SessionsPatchResult,
   type SessionsPatchParams,
+  type TaskSuggestionsAcceptResult,
+  type TaskSuggestionsListResult,
 } from "../../packages/gateway-protocol/src/index.js";
 import { getRuntimeConfig } from "../config/config.js";
 import { assertExplicitGatewayAuthModeWhenBothConfigured } from "../gateway/auth-mode-policy.js";
@@ -29,6 +31,7 @@ import { GatewayClient, GatewayClientRequestError } from "../gateway/client.js";
 import { isLoopbackHost } from "../gateway/net.js";
 import { formatErrorMessage } from "../infra/errors.js";
 import { readActiveGatewayLockPort } from "../infra/gateway-lock.js";
+import { roleScopesAllow } from "../shared/operator-scope-compat.js";
 import { sleep } from "../utils/sleep.js";
 import { VERSION } from "../version.js";
 import { TUI_SETUP_AUTH_SOURCE_CONFIG, TUI_SETUP_AUTH_SOURCE_ENV } from "./setup-launch-env.js";
@@ -145,7 +148,7 @@ export class GatewayChatClient implements TuiBackend {
       platform: process.platform,
       mode: GATEWAY_CLIENT_MODES.UI,
       deviceIdentity: connection.allowInsecureLocalOperatorUi ? null : undefined,
-      caps: [GATEWAY_CLIENT_CAPS.TOOL_EVENTS],
+      caps: [GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS, GATEWAY_CLIENT_CAPS.TOOL_EVENTS],
       instanceId: randomUUID(),
       minProtocol: MIN_CLIENT_PROTOCOL_VERSION,
       maxProtocol: PROTOCOL_VERSION,
@@ -328,6 +331,51 @@ export class GatewayChatClient implements TuiBackend {
       decision,
     });
   }
+
+  getTaskSuggestionActionCapabilities() {
+    const auth = this.hello?.auth;
+    const methods = this.hello?.features?.methods;
+    const allows = (method: string, scope: "operator.admin" | "operator.write") =>
+      Array.isArray(methods) &&
+      methods.includes(method) &&
+      Boolean(
+        auth &&
+        roleScopesAllow({
+          role: auth.role,
+          requestedScopes: [scope],
+          allowedScopes: auth.scopes,
+        }),
+      );
+    return {
+      canAccept: allows("taskSuggestions.accept", "operator.admin"),
+      canDismiss: allows("taskSuggestions.dismiss", "operator.write"),
+    };
+  }
+
+  async listTaskSuggestions() {
+    if (this.hello?.features?.methods?.includes("taskSuggestions.list") !== true) {
+      return [];
+    }
+    const actions = this.getTaskSuggestionActionCapabilities();
+    if (!actions.canAccept && !actions.canDismiss) {
+      return [];
+    }
+    const result = await this.client.request<TaskSuggestionsListResult>("taskSuggestions.list", {});
+    return result.suggestions;
+  }
+
+  async acceptTaskSuggestion(taskId: string) {
+    return await this.client.request<TaskSuggestionsAcceptResult>("taskSuggestions.accept", {
+      taskId,
+    });
+  }
+
+  async dismissTaskSuggestion(taskId: string) {
+    return await this.client.request<{ taskId: string; dismissed: boolean }>(
+      "taskSuggestions.dismiss",
+      { taskId },
+    );
+  }
 }
 
 export async function resolveGatewayConnection(
diff --git a/src/tui/tui-backend.ts b/src/tui/tui-backend.ts
index 98058d756ea..8bee7e6d6e7 100644
--- a/src/tui/tui-backend.ts
+++ b/src/tui/tui-backend.ts
@@ -6,6 +6,8 @@ import type {
   SessionsListParams,
   SessionsPatchParams,
   SessionsPatchResult,
+  TaskSuggestion,
+  TaskSuggestionsAcceptResult,
 } from "../../packages/gateway-protocol/src/index.js";
 import type { ResponseUsageMode, SessionInfo, SessionScope } from "./tui-types.js";
 
@@ -29,6 +31,11 @@ export type TuiChatSendResult = {
 
 export type TuiApprovalDecision = "allow-once" | "allow-always" | "deny";
 
+export type TuiTaskSuggestionActionCapabilities = {
+  canAccept: boolean;
+  canDismiss: boolean;
+};
+
 export type TuiPluginApproval = {
   id: string;
   request: {
@@ -195,5 +202,9 @@ export type TuiBackend = {
   listCommands?: (opts?: CommandsListParams) => Promise<CommandEntry[]>;
   listPluginApprovals?: () => Promise<unknown>;
   resolvePluginApproval?: (id: string, decision: TuiApprovalDecision) => Promise<{ ok?: boolean }>;
+  getTaskSuggestionActionCapabilities?: () => TuiTaskSuggestionActionCapabilities;
+  listTaskSuggestions?: () => Promise<TaskSuggestion[]>;
+  acceptTaskSuggestion?: (taskId: string) => Promise<TaskSuggestionsAcceptResult>;
+  dismissTaskSuggestion?: (taskId: string) => Promise<{ taskId: string; dismissed: boolean }>;
   runGoalCommand?: (opts: TuiGoalCommandOptions) => Promise<{ text: string }>;
 };
diff --git a/src/tui/tui-pty-harness.e2e.test.ts b/src/tui/tui-pty-harness.e2e.test.ts
index 99483066cfe..d140fc96ccb 100644
--- a/src/tui/tui-pty-harness.e2e.test.ts
+++ b/src/tui/tui-pty-harness.e2e.test.ts
@@ -100,6 +100,16 @@ async function writeTuiPtyFixtureScript(dir: string) {
         expiresAtMs: number;
       } | null = null;
       let pendingPluginApprovalRun: { runId: string; sessionKey: string } | null = null;
+      let pendingTaskSuggestion: {
+        id: string;
+        title: string;
+        prompt: string;
+        tldr: string;
+        cwd: string;
+        sessionKey: string;
+        agentId: string;
+        createdAt: number;
+      } | null = null;
 
       function record(method: string, payload?: unknown) {
         if (!actionLogPath) {
@@ -195,6 +205,25 @@ async function writeTuiPtyFixtureScript(dir: string) {
             });
             return { runId };
           }
+          if (opts.message === "task suggestion proof") {
+            pendingTaskSuggestion = {
+              id: "task_pty",
+              title: "Remove stale adapter",
+              prompt: "Delete the stale adapter and update its tests.",
+              tldr: "The adapter is unreachable and adds maintenance cost.",
+              cwd: "/repo/project",
+              sessionKey: opts.sessionKey,
+              agentId: "main",
+              createdAt: Date.now(),
+            };
+            queueMicrotask(() => {
+              this.onEvent?.({
+                event: "task.suggestion",
+                payload: { action: "created", suggestion: pendingTaskSuggestion },
+              });
+            });
+            return { runId };
+          }
           const responseDelayMs =
             opts.message === "slow prompt" || opts.message === "streaming prompt" ? 500 : 20;
           if (opts.message === "streaming prompt") {
@@ -374,6 +403,31 @@ async function writeTuiPtyFixtureScript(dir: string) {
           });
           return { ok: true };
         }
+
+        async listTaskSuggestions() {
+          record("listTaskSuggestions", { pending: Boolean(pendingTaskSuggestion) });
+          return pendingTaskSuggestion ? [pendingTaskSuggestion] : [];
+        }
+
+        async acceptTaskSuggestion(taskId: string) {
+          record("acceptTaskSuggestion", { taskId });
+          pendingTaskSuggestion = null;
+          this.onEvent?.({
+            event: "task.suggestion",
+            payload: { action: "resolved", taskId, resolution: "accepted" },
+          });
+          return { taskId, key: "agent:main:task-pty" };
+        }
+
+        async dismissTaskSuggestion(taskId: string) {
+          record("dismissTaskSuggestion", { taskId });
+          pendingTaskSuggestion = null;
+          this.onEvent?.({
+            event: "task.suggestion",
+            payload: { action: "resolved", taskId, resolution: "dismissed" },
+          });
+          return { taskId, dismissed: true };
+        }
       }
 
       async function main() {
@@ -467,6 +521,7 @@ describe.sequential("TUI PTY harness", () => {
 
   it("refreshes pending approvals before loading history", async () => {
     await fixture.waitForLogEntry((entry) => entry.method === "listPluginApprovals");
+    await fixture.waitForLogEntry((entry) => entry.method === "listTaskSuggestions");
     await fixture.waitForLogEntry((entry) => entry.method === "loadHistory");
 
     const entries = await readFixtureLog(fixture.logPath);
@@ -474,9 +529,12 @@ describe.sequential("TUI PTY harness", () => {
       (entry) => entry.method === "listPluginApprovals",
     );
     const historyLoadIndex = entries.findIndex((entry) => entry.method === "loadHistory");
+    const taskRefreshIndex = entries.findIndex((entry) => entry.method === "listTaskSuggestions");
 
     expect(approvalRefreshIndex).toBeGreaterThanOrEqual(0);
     expect(approvalRefreshIndex).toBeLessThan(historyLoadIndex);
+    expect(taskRefreshIndex).toBeGreaterThanOrEqual(0);
+    expect(taskRefreshIndex).toBeLessThan(historyLoadIndex);
   });
 
   it(
@@ -536,6 +594,27 @@ describe.sequential("TUI PTY harness", () => {
     TEST_TIMEOUT_MS,
   );
 
+  it(
+    "presents and starts a suggested task in the TUI",
+    async () => {
+      await fixture.run.write("task suggestion proof\r");
+      await fixture.run.waitForOutput("Suggested follow-up: Remove stale adapter");
+      await fixture.run.waitForOutput("Project: /repo/project");
+      await fixture.run.waitForOutput("The adapter is unreachable and adds maintenance cost.");
+
+      await fixture.run.write("\x1b[A", { delay: false });
+      await fixture.run.write("\r", { delay: false });
+      await fixture.run.waitForOutput("Press Enter again to start this task in a worktree.");
+      await fixture.run.write("\r", { delay: false });
+      await fixture.waitForLogEntry(
+        (entry) =>
+          entry.method === "acceptTaskSuggestion" && objectFieldEquals(entry, "taskId", "task_pty"),
+      );
+      await fixture.run.waitForOutput("session agent:main:task-pty");
+    },
+    TEST_TIMEOUT_MS,
+  );
+
   it(
     "sends multiple prompts in order",
     async () => {
diff --git a/src/tui/tui-task-suggestions.test.ts b/src/tui/tui-task-suggestions.test.ts
new file mode 100644
index 00000000000..7ce7a84610b
--- /dev/null
+++ b/src/tui/tui-task-suggestions.test.ts
@@ -0,0 +1,367 @@
+import type { Component, OverlayHandle, SelectItem } from "@earendil-works/pi-tui";
+import { describe, expect, it, vi } from "vitest";
+import { stripAnsi } from "../../packages/terminal-core/src/ansi.js";
+import {
+  createTuiTaskSuggestionController,
+  parseTuiTaskSuggestion,
+} from "./tui-task-suggestions.js";
+
+type TestSelector = Component & {
+  items: SelectItem[];
+  onSelect?: (item: SelectItem) => void;
+  onCancel?: () => void;
+  onSelectionChange?: (item: SelectItem) => void;
+  setSelectedIndex: ReturnType<typeof vi.fn<(index: number) => void>>;
+};
+
+function suggestionPayload(overrides: Record<string, unknown> = {}) {
+  return {
+    id: "task_1",
+    title: "Remove stale adapter",
+    prompt: "Delete the stale adapter and update its tests.",
+    tldr: "The adapter is unreachable and adds maintenance cost.",
+    cwd: "/repo/project",
+    sessionKey: "agent:main:main",
+    agentId: "main",
+    createdAt: 1_000,
+    ...overrides,
+  };
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function createHarness() {
+  const selectors: TestSelector[] = [];
+  const addSystem = vi.fn();
+  const closeOverlay = vi.fn();
+  const overlayHandles: OverlayHandle[] = [];
+  const openOverlay = vi.fn((_component: Component) => {
+    const handle = {
+      hide: vi.fn(),
+      setHidden: vi.fn(),
+      isHidden: vi.fn(() => false),
+      focus: vi.fn(),
+      unfocus: vi.fn(),
+      isFocused: vi.fn(() => true),
+    } satisfies OverlayHandle;
+    overlayHandles.push(handle);
+    return handle;
+  });
+  const requestRender = vi.fn();
+  const listTaskSuggestions = vi.fn().mockResolvedValue([]);
+  const acceptTaskSuggestion = vi
+    .fn()
+    .mockResolvedValue({ taskId: "task_1", key: "agent:main:task" });
+  const dismissTaskSuggestion = vi.fn().mockResolvedValue({ taskId: "task_1", dismissed: true });
+  const onAccepted = vi.fn().mockResolvedValue(undefined);
+  let agentId = "main";
+  let sessionKey = "agent:main:main";
+  let actionCapabilities = { canAccept: true, canDismiss: true };
+  const controller = createTuiTaskSuggestionController({
+    client: {
+      getTaskSuggestionActionCapabilities: () => actionCapabilities,
+      listTaskSuggestions,
+      acceptTaskSuggestion,
+      dismissTaskSuggestion,
+    },
+    chatLog: { addSystem },
+    getAgentId: () => agentId,
+    getSessionKey: () => sessionKey,
+    openOverlay,
+    closeOverlay,
+    requestRender,
+    onAccepted,
+    createSelector: (items) => {
+      const selector = {
+        items,
+        setSelectedIndex: vi.fn<(index: number) => void>(),
+        render: () => ["TASK ACTIONS"],
+        handleInput: () => undefined,
+        invalidate: () => undefined,
+      } satisfies TestSelector;
+      selectors.push(selector);
+      return selector;
+    },
+  });
+  return {
+    controller,
+    selectors,
+    addSystem,
+    closeOverlay,
+    openOverlay,
+    overlayHandles,
+    requestRender,
+    listTaskSuggestions,
+    acceptTaskSuggestion,
+    dismissTaskSuggestion,
+    onAccepted,
+    setAgentId: (value: string) => {
+      agentId = value;
+    },
+    setSessionKey: (value: string) => {
+      sessionKey = value;
+    },
+    setActionCapabilities: (value: { canAccept: boolean; canDismiss: boolean }) => {
+      actionCapabilities = value;
+    },
+  };
+}
+
+describe("TUI task suggestions", () => {
+  it("parses the Gateway suggestion shape", () => {
+    expect(parseTuiTaskSuggestion(suggestionPayload())).toEqual(suggestionPayload());
+    expect(parseTuiTaskSuggestion({ id: "task_missing_fields" })).toBeNull();
+  });
+
+  it("shows an active-session suggestion and starts it after confirmation", async () => {
+    const harness = createHarness();
+
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+
+    expect(harness.openOverlay).toHaveBeenCalledTimes(1);
+    const prompt = harness.openOverlay.mock.calls[0]?.[0];
+    const renderedPrompt = stripAnsi(prompt.render(80).join("\n"));
+    expect(renderedPrompt).toContain("Suggested follow-up: Remove stale adapter");
+    expect(renderedPrompt).toContain("Project: /repo/project");
+    expect(renderedPrompt).toContain("Why: The adapter is unreachable");
+    expect(renderedPrompt).toContain("Instructions:");
+    expect(renderedPrompt).toContain("Delete the stale adapter and update its tests.");
+    expect(harness.selectors[0]?.items.map((item) => item.value)).toEqual(["accept", "dismiss"]);
+    expect(harness.selectors[0]?.setSelectedIndex).toHaveBeenCalledWith(1);
+
+    const accept = { value: "accept", label: "Start in worktree" };
+    harness.selectors[0]?.onSelect?.(accept);
+    expect(harness.acceptTaskSuggestion).not.toHaveBeenCalled();
+    expect(stripAnsi(prompt.render(80).join("\n"))).toContain("Press Enter again");
+    harness.selectors[0]?.onSelect?.(accept);
+
+    await vi.waitFor(() => {
+      expect(harness.acceptTaskSuggestion).toHaveBeenCalledWith("task_1");
+      expect(harness.onAccepted).toHaveBeenCalledWith("agent:main:task");
+    });
+    expect(harness.addSystem).toHaveBeenCalledWith("follow-up task started in agent:main:task");
+  });
+
+  it("keeps actions visible while paging through long instructions", () => {
+    const harness = createHarness();
+    const promptLines = Array.from(
+      { length: 20 },
+      (_, index) => `instruction-${String(index + 1).padStart(2, "0")}`,
+    );
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload({ prompt: promptLines.join("\n") }),
+    });
+
+    const prompt = harness.openOverlay.mock.calls[0]?.[0];
+    const firstPage = stripAnsi(prompt.render(80).join("\n"));
+    expect(firstPage).toContain("instruction-01");
+    expect(firstPage).not.toContain("instruction-20");
+    expect(firstPage).toContain("PgUp/PgDn to inspect");
+    expect(firstPage).toContain("TASK ACTIONS");
+
+    const pages = [firstPage];
+    for (let page = 0; page < 3; page += 1) {
+      prompt.handleInput?.("\u001b[6~");
+      const rendered = stripAnsi(prompt.render(80).join("\n"));
+      pages.push(rendered);
+      expect(rendered).toContain("TASK ACTIONS");
+    }
+    expect(pages.join("\n")).toContain("instruction-20");
+    expect(harness.requestRender).toHaveBeenCalled();
+  });
+
+  it("keeps every project path segment inspectable before acceptance", () => {
+    const harness = createHarness();
+    const cwd = `/repo/${"nested-segment/".repeat(20)}distinguishing-project`;
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload({ cwd }),
+    });
+
+    const prompt = harness.openOverlay.mock.calls[0]?.[0];
+    const pages: string[] = [];
+    for (let page = 0; page < 20; page += 1) {
+      const rendered = stripAnsi(prompt.render(24).join("\n"));
+      pages.push(rendered);
+      expect(rendered).toContain("TASK ACTIONS");
+      prompt.handleInput?.("\u001b[6~");
+    }
+    expect(pages.join("\n").replace(/\s/g, "")).toContain("distinguishing-project");
+  });
+
+  it("strips bidi controls from every displayed confirmation field", () => {
+    const harness = createHarness();
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload({
+        title: "safe\u202eevil",
+        cwd: "/repo/\u2066project",
+        tldr: "why\u200f now",
+        prompt: "run\u202d exactly",
+      }),
+    });
+
+    const prompt = harness.openOverlay.mock.calls[0]?.[0];
+    const rendered = stripAnsi(prompt.render(80).join("\n"));
+    expect(rendered).toContain("safeevil");
+    expect(rendered).toContain("/repo/project");
+    expect(rendered).toContain("why now");
+    expect(rendered).toContain("run exactly");
+    expect(rendered).not.toMatch(/[\u061c\u200e\u200f\u202a-\u202e\u2066-\u2069]/u);
+  });
+
+  it("dismisses a suggestion without starting work", async () => {
+    const harness = createHarness();
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+
+    harness.selectors[0]?.onSelect?.({ value: "dismiss", label: "Dismiss" });
+
+    await vi.waitFor(() => {
+      expect(harness.dismissTaskSuggestion).toHaveBeenCalledWith("task_1");
+    });
+    expect(harness.acceptTaskSuggestion).not.toHaveBeenCalled();
+    expect(harness.addSystem).toHaveBeenCalledWith("follow-up task dismissed");
+  });
+
+  it("offers only actions allowed by the connected operator scopes", () => {
+    const writeHarness = createHarness();
+    writeHarness.setActionCapabilities({ canAccept: false, canDismiss: true });
+    writeHarness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+    expect(writeHarness.selectors[0]?.items.map((item) => item.value)).toEqual(["dismiss"]);
+    expect(writeHarness.selectors[0]?.setSelectedIndex).toHaveBeenCalledWith(0);
+
+    const readHarness = createHarness();
+    readHarness.setActionCapabilities({ canAccept: false, canDismiss: false });
+    readHarness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+    expect(readHarness.openOverlay).not.toHaveBeenCalled();
+  });
+
+  it("rebuilds an active selector when reconnect changes action scopes", async () => {
+    const harness = createHarness();
+    const suggestion = suggestionPayload();
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion,
+    });
+    const staleSelector = harness.selectors[0];
+
+    harness.setActionCapabilities({ canAccept: false, canDismiss: true });
+    harness.listTaskSuggestions.mockResolvedValueOnce([suggestion]);
+    await harness.controller.refresh();
+
+    expect(harness.closeOverlay).toHaveBeenCalledWith(harness.overlayHandles[0]);
+    expect(harness.openOverlay).toHaveBeenCalledTimes(2);
+    expect(harness.selectors[1]?.items.map((item) => item.value)).toEqual(["dismiss"]);
+    staleSelector?.onSelect?.({ value: "accept", label: "Start in worktree" });
+    staleSelector?.onSelect?.({ value: "accept", label: "Start in worktree" });
+    expect(harness.acceptTaskSuggestion).not.toHaveBeenCalled();
+  });
+
+  it("shows a still-pending suggestion again when its action fails", async () => {
+    const harness = createHarness();
+    harness.acceptTaskSuggestion.mockRejectedValueOnce(new Error("gateway unavailable"));
+    harness.listTaskSuggestions.mockResolvedValueOnce([suggestionPayload()]);
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+
+    const accept = { value: "accept", label: "Start in worktree" };
+    harness.selectors[0]?.onSelect?.(accept);
+    harness.selectors[0]?.onSelect?.(accept);
+
+    await vi.waitFor(() => {
+      expect(harness.openOverlay).toHaveBeenCalledTimes(2);
+    });
+    expect(harness.addSystem).toHaveBeenCalledWith("follow-up task failed: gateway unavailable");
+  });
+
+  it("does not switch sessions after the operator navigates away during acceptance", async () => {
+    const harness = createHarness();
+    const pendingAccept = deferred<{ taskId: string; key: string }>();
+    harness.acceptTaskSuggestion.mockReturnValueOnce(pendingAccept.promise);
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+
+    const accept = { value: "accept", label: "Start in worktree" };
+    harness.selectors[0]?.onSelect?.(accept);
+    harness.selectors[0]?.onSelect?.(accept);
+    harness.setSessionKey("agent:main:other");
+    harness.controller.sessionChanged();
+    pendingAccept.resolve({ taskId: "task_1", key: "agent:main:task" });
+
+    await vi.waitFor(() => {
+      expect(harness.addSystem).toHaveBeenCalledWith("follow-up task started in agent:main:task");
+    });
+    expect(harness.onAccepted).not.toHaveBeenCalled();
+  });
+
+  it("shows only suggestions for the active session", () => {
+    const harness = createHarness();
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload({ sessionKey: "agent:other:main", agentId: "other" }),
+    });
+    expect(harness.openOverlay).not.toHaveBeenCalled();
+
+    harness.setSessionKey("agent:other:main");
+    harness.setAgentId("other");
+    harness.controller.sessionChanged();
+
+    expect(harness.openOverlay).toHaveBeenCalledTimes(1);
+  });
+
+  it("closes a suggestion resolved by another client", () => {
+    const harness = createHarness();
+    harness.controller.handleEvent("task.suggestion", {
+      action: "created",
+      suggestion: suggestionPayload(),
+    });
+
+    harness.controller.handleEvent("task.suggestion", {
+      action: "resolved",
+      taskId: "task_1",
+      resolution: "accepted",
+    });
+
+    expect(harness.closeOverlay).toHaveBeenCalledWith(harness.overlayHandles[0]);
+  });
+
+  it("does not resurrect a resolved suggestion from a stale refresh", async () => {
+    const harness = createHarness();
+    const pendingList = deferred<unknown[]>();
+    harness.listTaskSuggestions.mockReturnValueOnce(pendingList.promise);
+
+    const refresh = harness.controller.refresh();
+    harness.controller.handleEvent("task.suggestion", {
+      action: "resolved",
+      taskId: "task_1",
+      resolution: "dismissed",
+    });
+    pendingList.resolve([suggestionPayload()]);
+    await refresh;
+
+    expect(harness.openOverlay).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/tui/tui-task-suggestions.ts b/src/tui/tui-task-suggestions.ts
new file mode 100644
index 00000000000..388b361f527
--- /dev/null
+++ b/src/tui/tui-task-suggestions.ts
@@ -0,0 +1,456 @@
+// Presents model-proposed follow-up tasks that belong to the active TUI session.
+import {
+  SelectList,
+  Text,
+  type Component,
+  type OverlayHandle,
+  type SelectItem,
+} from "@earendil-works/pi-tui";
+import type { TaskSuggestion } from "../../packages/gateway-protocol/src/index.js";
+import { formatErrorMessage } from "../infra/errors.js";
+import { selectListTheme, theme } from "./theme/theme.js";
+import type { TuiBackend } from "./tui-backend.js";
+import { sanitizeRenderableText } from "./tui-formatters.js";
+
+type TaskSelector = Component & {
+  onSelect?: (item: SelectItem) => void;
+  onCancel?: () => void;
+  onSelectionChange?: (item: SelectItem) => void;
+  setSelectedIndex?: (index: number) => void;
+};
+
+type TaskSuggestionControllerDeps = {
+  client: Pick<
+    TuiBackend,
+    | "getTaskSuggestionActionCapabilities"
+    | "listTaskSuggestions"
+    | "acceptTaskSuggestion"
+    | "dismissTaskSuggestion"
+  >;
+  chatLog: { addSystem: (line: string) => void };
+  getAgentId: () => string;
+  getSessionKey: () => string;
+  openOverlay: (component: Component) => OverlayHandle;
+  closeOverlay: (handle?: OverlayHandle) => void;
+  requestRender: () => void;
+  onAccepted: (sessionKey: string) => Promise<void> | void;
+  createSelector?: (items: SelectItem[]) => TaskSelector;
+};
+
+const TASK_BIDI_CONTROL_RE = /[\u061c\u200e\u200f\u202a-\u202e\u2066-\u2069]/g;
+const TASK_DETAIL_VIEWPORT_LINES = 12;
+const TASK_DETAIL_PAGE_LINES = TASK_DETAIL_VIEWPORT_LINES - 1;
+const PAGE_UP_INPUT = "\u001b[5~";
+const PAGE_DOWN_INPUT = "\u001b[6~";
+
+const TASK_ACTIONS = [
+  {
+    value: "accept",
+    label: "Start in worktree",
+    description: "Create an isolated session and begin this task",
+  },
+  {
+    value: "dismiss",
+    label: "Dismiss",
+    description: "Leave the repository untouched",
+  },
+] satisfies SelectItem[];
+
+function clean(text: string): string {
+  return sanitizeTaskText(text.replace(/\s+/g, " ").trim());
+}
+
+function sanitizeTaskText(text: string): string {
+  return sanitizeRenderableText(text.replace(TASK_BIDI_CONTROL_RE, ""));
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+/** Parses the task suggestion shape carried by Gateway list and event payloads. */
+export function parseTuiTaskSuggestion(value: unknown): TaskSuggestion | null {
+  if (!isRecord(value)) {
+    return null;
+  }
+  const required = ["id", "title", "prompt", "tldr", "cwd", "sessionKey"] as const;
+  if (required.some((field) => typeof value[field] !== "string" || !value[field].trim())) {
+    return null;
+  }
+  if (typeof value.createdAt !== "number" || value.createdAt < 0) {
+    return null;
+  }
+  return {
+    id: (value.id as string).trim(),
+    title: (value.title as string).trim(),
+    prompt: (value.prompt as string).trim(),
+    tldr: (value.tldr as string).trim(),
+    cwd: (value.cwd as string).trim(),
+    sessionKey: (value.sessionKey as string).trim(),
+    ...(typeof value.agentId === "string" && value.agentId.trim()
+      ? { agentId: value.agentId.trim() }
+      : {}),
+    createdAt: value.createdAt,
+  };
+}
+
+class TaskPrompt implements Component {
+  private readonly title: Text;
+  private readonly metadata: Text;
+  private readonly summary: Text;
+  private readonly instructionLabel = new Text(theme.system("Instructions:"));
+  private readonly instructions: Text;
+  private readonly detailPosition = new Text();
+  private readonly confirmation = new Text();
+  private detailOffset = 0;
+  private detailLineCount = 0;
+
+  constructor(
+    suggestion: TaskSuggestion,
+    private readonly selector: TaskSelector,
+    private readonly requestRender: () => void,
+  ) {
+    this.title = new Text(theme.header(`Suggested follow-up: ${clean(suggestion.title)}`));
+    this.metadata = new Text(theme.dim(`Project: ${clean(suggestion.cwd)}`));
+    this.summary = new Text(theme.system(`Why: ${clean(suggestion.tldr)}`));
+    this.instructions = new Text(theme.system(sanitizeTaskText(suggestion.prompt.trim())));
+  }
+
+  setConfirmation(text: string): void {
+    this.confirmation.setText(theme.accent(text));
+  }
+
+  invalidate(): void {
+    for (const component of [
+      this.title,
+      this.metadata,
+      this.summary,
+      this.instructionLabel,
+      this.instructions,
+      this.detailPosition,
+      this.confirmation,
+      this.selector,
+    ]) {
+      component.invalidate();
+    }
+  }
+
+  render(width: number): string[] {
+    // Page the complete confirmation details as one unit. This keeps actions
+    // visible without hiding a long project-path suffix from the operator.
+    const detailLines = [
+      ...this.metadata.render(width),
+      ...this.summary.render(width),
+      ...this.instructionLabel.render(width),
+      ...this.instructions.render(width),
+    ];
+    this.detailLineCount = detailLines.length;
+    const maxDetailOffset = Math.max(0, detailLines.length - TASK_DETAIL_VIEWPORT_LINES);
+    this.detailOffset = Math.min(this.detailOffset, maxDetailOffset);
+    const visibleDetails = detailLines.slice(
+      this.detailOffset,
+      this.detailOffset + TASK_DETAIL_VIEWPORT_LINES,
+    );
+    if (detailLines.length > TASK_DETAIL_VIEWPORT_LINES) {
+      const visibleEnd = this.detailOffset + visibleDetails.length;
+      this.detailPosition.setText(
+        theme.dim(
+          `Details ${this.detailOffset + 1}-${visibleEnd} of ${detailLines.length} · PgUp/PgDn to inspect`,
+        ),
+      );
+    } else {
+      this.detailPosition.setText("");
+    }
+    const detailPosition = this.detailPosition.render(width);
+    const confirmation = this.confirmation.render(width);
+    return [
+      ...this.title.render(width).slice(0, 2),
+      ...visibleDetails,
+      ...(detailPosition.some((line) => line.trim()) ? detailPosition : []),
+      ...(confirmation.some((line) => line.trim()) ? ["", ...confirmation] : []),
+      "",
+      ...this.selector.render(width),
+    ];
+  }
+
+  handleInput(data: string): void {
+    if (data === PAGE_UP_INPUT || data === PAGE_DOWN_INPUT) {
+      const maxOffset = Math.max(0, this.detailLineCount - TASK_DETAIL_VIEWPORT_LINES);
+      const delta = data === PAGE_UP_INPUT ? -TASK_DETAIL_PAGE_LINES : TASK_DETAIL_PAGE_LINES;
+      const nextOffset = Math.min(maxOffset, Math.max(0, this.detailOffset + delta));
+      if (nextOffset !== this.detailOffset) {
+        this.detailOffset = nextOffset;
+        this.metadata.invalidate();
+        this.summary.invalidate();
+        this.instructionLabel.invalidate();
+        this.instructions.invalidate();
+        this.requestRender();
+      }
+      return;
+    }
+    this.selector.handleInput?.(data);
+  }
+}
+
+/** Coordinates Gateway task-suggestion events with the active TUI overlay. */
+export function createTuiTaskSuggestionController(deps: TaskSuggestionControllerDeps) {
+  const createSelector =
+    deps.createSelector ??
+    ((items: SelectItem[]) => new SelectList(items, items.length, selectListTheme));
+  const suggestions = new Map<string, TaskSuggestion>();
+  const hiddenIds = new Set<string>();
+  let activeId: string | null = null;
+  let activeOverlay: OverlayHandle | null = null;
+  let activeSelector: TaskSelector | null = null;
+  let activeActionKey: string | null = null;
+  let revision = 0;
+  let disposed = false;
+  let refreshInFlight: Promise<void> | null = null;
+  let refreshAgain = false;
+
+  const closeActive = () => {
+    if (activeOverlay) {
+      deps.closeOverlay(activeOverlay);
+      activeOverlay = null;
+    }
+    activeId = null;
+    activeSelector = null;
+    activeActionKey = null;
+  };
+
+  const remove = (id: string) => {
+    revision += 1;
+    suggestions.delete(id);
+    hiddenIds.delete(id);
+    if (activeId === id) {
+      closeActive();
+    }
+  };
+
+  const matchesSession = (suggestion: TaskSuggestion) =>
+    suggestion.sessionKey === deps.getSessionKey() &&
+    (suggestion.sessionKey !== "global" || suggestion.agentId === deps.getAgentId());
+
+  const availableActions = () => {
+    const capabilities = deps.client.getTaskSuggestionActionCapabilities?.() ?? {
+      canAccept: Boolean(deps.client.acceptTaskSuggestion),
+      canDismiss: Boolean(deps.client.dismissTaskSuggestion),
+    };
+    return TASK_ACTIONS.filter((action) =>
+      action.value === "accept" ? capabilities.canAccept : capabilities.canDismiss,
+    );
+  };
+
+  const presentNext = () => {
+    if (disposed) {
+      return;
+    }
+    const actions = availableActions();
+    const actionKey = actions.map((action) => action.value).join(",");
+    if (activeId) {
+      if (activeActionKey === actionKey) {
+        return;
+      }
+      closeActive();
+    }
+    const suggestion = [...suggestions.values()]
+      .toSorted((left, right) => left.createdAt - right.createdAt)
+      .find((entry) => !hiddenIds.has(entry.id) && matchesSession(entry));
+    if (!suggestion) {
+      return;
+    }
+
+    if (actions.length === 0) {
+      return;
+    }
+
+    activeId = suggestion.id;
+    const selector = createSelector(actions);
+    activeSelector = selector;
+    activeActionKey = actionKey;
+    const dismissIndex = actions.findIndex((action) => action.value === "dismiss");
+    selector.setSelectedIndex?.(Math.max(dismissIndex, 0));
+    let acceptArmed = false;
+    let prompt: TaskPrompt | null = null;
+
+    const resolve = async (action: "accept" | "dismiss") => {
+      if (activeId !== suggestion.id || activeSelector !== selector) {
+        return;
+      }
+      closeActive();
+      hiddenIds.add(suggestion.id);
+      deps.requestRender();
+      try {
+        if (action === "accept") {
+          if (!deps.client.acceptTaskSuggestion) {
+            throw new Error("task suggestion acceptance is unavailable");
+          }
+          const result = await deps.client.acceptTaskSuggestion(suggestion.id);
+          remove(suggestion.id);
+          deps.chatLog.addSystem(`follow-up task started in ${result.key}`);
+          if (matchesSession(suggestion)) {
+            await deps.onAccepted(result.key);
+          }
+        } else {
+          if (!deps.client.dismissTaskSuggestion) {
+            throw new Error("task suggestion dismissal is unavailable");
+          }
+          const result = await deps.client.dismissTaskSuggestion(suggestion.id);
+          if (!result.dismissed) {
+            throw new Error("task suggestion is no longer pending");
+          }
+          remove(suggestion.id);
+          deps.chatLog.addSystem("follow-up task dismissed");
+        }
+      } catch (error) {
+        hiddenIds.delete(suggestion.id);
+        deps.chatLog.addSystem(`follow-up task failed: ${formatErrorMessage(error)}`);
+        void refresh().catch((refreshError: unknown) => {
+          deps.chatLog.addSystem(
+            `task suggestion refresh failed: ${formatErrorMessage(refreshError)}`,
+          );
+        });
+      }
+      presentNext();
+      if (!disposed) {
+        deps.requestRender();
+      }
+    };
+
+    selector.onSelectionChange = () => {
+      acceptArmed = false;
+      prompt?.setConfirmation("");
+    };
+    selector.onSelect = (item) => {
+      if (activeSelector !== selector) {
+        return;
+      }
+      if (!availableActions().some((action) => action.value === item.value)) {
+        closeActive();
+        presentNext();
+        deps.requestRender();
+        return;
+      }
+      if (item.value === "dismiss") {
+        void resolve("dismiss");
+        return;
+      }
+      if (item.value !== "accept") {
+        return;
+      }
+      if (acceptArmed) {
+        void resolve("accept");
+        return;
+      }
+      acceptArmed = true;
+      prompt?.setConfirmation("Press Enter again to start this task in a worktree.");
+      deps.requestRender();
+    };
+    selector.onCancel = () => {
+      if (activeSelector !== selector) {
+        return;
+      }
+      hiddenIds.add(suggestion.id);
+      closeActive();
+      deps.chatLog.addSystem("follow-up task hidden; suggestion remains pending");
+      presentNext();
+      deps.requestRender();
+    };
+    prompt = new TaskPrompt(suggestion, selector, deps.requestRender);
+    activeOverlay = deps.openOverlay(prompt);
+    deps.requestRender();
+  };
+
+  const refresh = async (): Promise<void> => {
+    if (disposed || !deps.client.listTaskSuggestions) {
+      return;
+    }
+    if (refreshInFlight) {
+      refreshAgain = true;
+      return await refreshInFlight;
+    }
+    refreshInFlight = (async () => {
+      do {
+        refreshAgain = false;
+        const startRevision = revision;
+        const listed = await deps.client.listTaskSuggestions?.();
+        if (disposed || !listed) {
+          return;
+        }
+        // An event raced this snapshot. Retry instead of resurrecting resolved work.
+        if (revision !== startRevision) {
+          refreshAgain = true;
+          continue;
+        }
+        suggestions.clear();
+        for (const value of listed) {
+          const suggestion = parseTuiTaskSuggestion(value);
+          if (suggestion) {
+            suggestions.set(suggestion.id, suggestion);
+          }
+        }
+        for (const id of hiddenIds) {
+          if (!suggestions.has(id)) {
+            hiddenIds.delete(id);
+          }
+        }
+      } while (refreshAgain);
+      if (activeId && !suggestions.has(activeId)) {
+        closeActive();
+      }
+      presentNext();
+      deps.requestRender();
+    })();
+    try {
+      await refreshInFlight;
+    } finally {
+      refreshInFlight = null;
+    }
+  };
+
+  return {
+    handleEvent(event: string, payload: unknown) {
+      if (disposed || event !== "task.suggestion" || !isRecord(payload)) {
+        return;
+      }
+      if (payload.action === "created") {
+        const suggestion = parseTuiTaskSuggestion(payload.suggestion);
+        if (suggestion) {
+          revision += 1;
+          hiddenIds.delete(suggestion.id);
+          suggestions.set(suggestion.id, suggestion);
+          presentNext();
+        }
+        return;
+      }
+      if (payload.action === "resolved" && typeof payload.taskId === "string") {
+        remove(payload.taskId);
+        presentNext();
+        deps.requestRender();
+      }
+    },
+    refresh,
+    sessionChanged() {
+      if (disposed) {
+        return;
+      }
+      hiddenIds.clear();
+      const active = activeId ? suggestions.get(activeId) : undefined;
+      if (active && !matchesSession(active)) {
+        closeActive();
+      }
+      presentNext();
+      deps.requestRender();
+    },
+    dispose() {
+      if (disposed) {
+        return;
+      }
+      disposed = true;
+      suggestions.clear();
+      hiddenIds.clear();
+      closeActive();
+      deps.requestRender();
+    },
+  };
+}
diff --git a/src/tui/tui.ts b/src/tui/tui.ts
index c802640082e..cfbe017caf8 100644
--- a/src/tui/tui.ts
+++ b/src/tui/tui.ts
@@ -67,6 +67,7 @@ import {
   shouldEnableWindowsGitBashPasteFallback,
   type TuiSubmitAction,
 } from "./tui-submit.js";
+import { createTuiTaskSuggestionController } from "./tui-task-suggestions.js";
 import type {
   AgentSummary,
   SessionInfo,
@@ -613,6 +614,7 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
     set currentAgentId(value) {
       currentAgentId = value;
       pluginApprovals?.sessionChanged();
+      taskSuggestions?.sessionChanged();
     },
     get currentSessionKey() {
       return currentSessionKey;
@@ -620,6 +622,7 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
     set currentSessionKey(value) {
       currentSessionKey = value;
       pluginApprovals?.sessionChanged();
+      taskSuggestions?.sessionChanged();
     },
     get currentSessionId() {
       return currentSessionId;
@@ -1320,6 +1323,16 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
     setSession,
     abortActive,
   } = sessionActions;
+  const taskSuggestions = createTuiTaskSuggestionController({
+    client,
+    chatLog,
+    getAgentId: () => currentAgentId,
+    getSessionKey: () => currentSessionKey,
+    openOverlay,
+    closeOverlay,
+    requestRender: () => tui.requestRender(),
+    onAccepted: setSession,
+  });
 
   const {
     handleChatEvent,
@@ -1369,6 +1382,7 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
       ...(result?.crestodianMessage ? { crestodianMessage: result.crestodianMessage } : {}),
     };
     pluginApprovals?.dispose();
+    taskSuggestions?.dispose();
     const hardExitTimer = setTimeout(
       forceExit,
       resolveTuiShutdownHardExitMs({ localMode: isLocalMode }),
@@ -1551,6 +1565,7 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
 
   client.onEvent = (evt) => {
     pluginApprovals?.handleEvent(evt.event, evt.payload);
+    taskSuggestions?.handleEvent(evt.event, evt.payload);
     if (evt.event === "chat") {
       handleChatEvent(evt.payload);
     }
@@ -1594,6 +1609,11 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
       } catch (err) {
         chatLog.addSystem(`plugin approval refresh failed: ${String(err)}`);
       }
+      try {
+        await taskSuggestions?.refresh();
+      } catch (err) {
+        chatLog.addSystem(`task suggestion refresh failed: ${String(err)}`);
+      }
       await loadHistory();
       if (activityStatus === "starting up") {
         setActivityStatus("idle");
@@ -1658,6 +1678,11 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
       } catch (err) {
         chatLog.addSystem(`plugin approval refresh failed: ${String(err)}`);
       }
+      try {
+        await taskSuggestions?.refresh();
+      } catch (err) {
+        chatLog.addSystem(`task suggestion refresh failed: ${String(err)}`);
+      }
     })();
     tui.requestRender();
   };
@@ -1685,6 +1710,7 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
   await new Promise<void>((resolve) => {
     const finish = () => {
       pluginApprovals?.dispose();
+      taskSuggestions?.dispose();
       if (isLocalMode) {
         setConsoleSubsystemFilter(previousConsoleSubsystemFilter);
       }
diff --git a/test/scripts/npm-telegram-live.test.ts b/test/scripts/npm-telegram-live.test.ts
index 1ed5e786315..2058779a1f7 100644
--- a/test/scripts/npm-telegram-live.test.ts
+++ b/test/scripts/npm-telegram-live.test.ts
@@ -130,6 +130,22 @@ describe("package Telegram live Docker E2E", () => {
     );
   });
 
+  it("installs prepared root and companion tarballs through an exact local registry", () => {
+    const script = readFileSync(DOCKER_SCRIPT_PATH, "utf8");
+
+    expect(script).toContain("OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR");
+    expect(script).toContain('package_source_kind="prepared-package-set"');
+    expect(script).toContain('package_install_source="openclaw@$(read_package_version');
+    expect(script).toContain('-v "$resolved_package_dir:/package-under-test:ro"');
+    expect(script).toContain(
+      '-v "$ROOT_DIR/scripts/e2e/lib/plugins/npm-registry-server.mjs:/tmp/openclaw-npm-registry-server.mjs:ro"',
+    );
+    expect(script).toContain("OPENCLAW_NPM_TELEGRAM_PACKAGE_SET");
+    expect(script).toContain("node /tmp/openclaw-npm-registry-server.mjs");
+    expect(script).toContain("OPENCLAW_NPM_REGISTRY_UPSTREAM=https://registry.npmjs.org");
+    expect(script).toContain('export NPM_CONFIG_REGISTRY="$registry_url"');
+  });
+
   it("keeps live Docker artifacts isolated by default", () => {
     const script = readFileSync(DOCKER_SCRIPT_PATH, "utf8");
 
diff --git a/test/scripts/package-acceptance-workflow.test.ts b/test/scripts/package-acceptance-workflow.test.ts
index 3fecc1b7c80..f0d074169eb 100644
--- a/test/scripts/package-acceptance-workflow.test.ts
+++ b/test/scripts/package-acceptance-workflow.test.ts
@@ -1782,7 +1782,15 @@ describe("package artifact reuse", () => {
       "package_spec must be openclaw@alpha",
     ]);
     expectTextToIncludeAll(runStep.run, [
-      'export OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ="${package_tgzs[0]}"',
+      'manifest="${package_dir}/preflight-manifest.json"',
+      'candidate_manifest="${package_dir}/package-candidate.json"',
+      'find "${package_dir}" -type f -name "*.tgz"',
+      "package artifact manifest contains duplicate package metadata",
+      "package artifact tarball set does not match preflight manifest",
+      "package candidate manifest does not match the OpenClaw tarball",
+      "package candidate digest mismatch",
+      'export OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR="${package_dir}"',
+      'export OPENCLAW_NPM_TELEGRAM_PACKAGE_TGZ="${package_tgz}"',
     ]);
   });
 
@@ -1962,6 +1970,14 @@ describe("package artifact reuse", () => {
       "Workflow-dispatched real publish requires release_publish_run_id",
     );
     expect(npmWorkflow).toContain("tarballSha256");
+    expect(npmWorkflow).toContain("dependencyTarballs");
+    expect(npmWorkflow).toContain('packageName: "@openclaw/ai"');
+    expect(npmWorkflow).toContain("AI_TARBALL_SHA256");
+    expect(npmWorkflow).toContain("does not match openclaw");
+    const npmTelegramWorkflow = readFileSync(NPM_TELEGRAM_WORKFLOW, "utf8");
+    expect(npmTelegramWorkflow).toContain("preflight-manifest.json");
+    expect(npmTelegramWorkflow).toContain("OPENCLAW_NPM_TELEGRAM_PACKAGE_DIR");
+    expect(npmTelegramWorkflow).toContain("package artifact digest mismatch");
     expect(workflow).toContain("Checkout release SHA");
     expect(workflow).toContain('git show "${TARGET_SHA}:CHANGELOG.md" > "${changelog_file}"');
     expect(workflow).toContain('$0 == "## Unreleased" { in_section = 1; next }');
diff --git a/test/scripts/parallels-npm-update-smoke.test.ts b/test/scripts/parallels-npm-update-smoke.test.ts
index 3cfc89b343b..3811b2b60ca 100644
--- a/test/scripts/parallels-npm-update-smoke.test.ts
+++ b/test/scripts/parallels-npm-update-smoke.test.ts
@@ -106,7 +106,15 @@ afterEach(() => {
 
 describe("parallels npm update smoke", () => {
   it("accepts one prepared tarball target for update and fresh install", () => {
-    expect(parseArgs(["--target-tarball", "/tmp/openclaw-candidate.tgz"])).toMatchObject({
+    expect(
+      parseArgs([
+        "--target-tarball",
+        "/tmp/openclaw-candidate.tgz",
+        "--dependency-tarball",
+        "/tmp/openclaw-ai-candidate.tgz",
+      ]),
+    ).toMatchObject({
+      dependencyTarballs: ["/tmp/openclaw-ai-candidate.tgz"],
       targetTarball: "/tmp/openclaw-candidate.tgz",
       updateTarget: "",
       freshTargetSpec: undefined,
@@ -114,6 +122,9 @@ describe("parallels npm update smoke", () => {
     expect(() =>
       parseArgs(["--target-tarball", "/tmp/openclaw-candidate.tgz", "--update-target", "beta"]),
     ).toThrow("--target-tarball cannot be combined");
+    expect(() => parseArgs(["--dependency-tarball", "/tmp/openclaw-ai-candidate.tgz"])).toThrow(
+      "--dependency-tarball requires --target-tarball",
+    );
   });
 
   it("stops the host artifact server when the wrapper fails mid-run", async () => {
@@ -231,18 +242,33 @@ exit 1
     expect(script).toContain("freshTargetStatus");
   });
 
-  it("host-serves a prepared candidate tarball for both proof phases", () => {
+  it("serves a prepared package set for both proof phases", () => {
     const script = readFileSync(SCRIPT_PATH, "utf8");
 
     expect(script).toContain("--target-tarball <path>");
+    expect(script).toContain("--dependency-tarball <path>");
     expect(script).toContain('label: "prepared candidate tgz"');
     expect(script).toContain("await copyFile(this.targetTarballPath, hostedTarballPath)");
-    expect(script).toContain("dir: this.tgzDir");
-    expect(script).toContain("this.updateTargetEffective = targetUrl");
-    expect(script).toContain("this.freshTargetSpec = targetUrl");
+    expect(script).toContain("startNpmRegistryServer");
+    expect(script).toContain("this.updateTargetEffective = this.targetTarballVersion");
+    expect(script).toContain("this.freshTargetSpec = this.updateTargetTarball");
     expect(script).toContain("this.updateExpectedNeedle = this.targetTarballVersion");
   });
 
+  it("routes update installs through the prepared package registry", () => {
+    const registry = "http://192.0.2.2:48123";
+    const input = {
+      auth: TEST_AUTH,
+      expectedNeedle: "2026.7.1-beta.3",
+      npmRegistry: registry,
+      updateTarget: "2026.7.1-beta.3",
+    };
+
+    expect(macosUpdateScript(input)).toContain(`NPM_CONFIG_REGISTRY='${registry}'`);
+    expect(linuxUpdateScript(input)).toContain(`NPM_CONFIG_REGISTRY='${registry}'`);
+    expect(windowsUpdateScript(input)).toContain(`NPM_CONFIG_REGISTRY = '${registry}'`);
+  });
+
   it("accepts keyed and nested npm metadata for published update targets", () => {
     const script = readFileSync(SCRIPT_PATH, "utf8");
 
diff --git a/test/scripts/parallels-smoke-model.test.ts b/test/scripts/parallels-smoke-model.test.ts
index 93d15c51c0d..16e6c08a8e6 100644
--- a/test/scripts/parallels-smoke-model.test.ts
+++ b/test/scripts/parallels-smoke-model.test.ts
@@ -282,6 +282,11 @@ describe("Parallels smoke model selection", () => {
     expect(parseMacosSmokeArgs(["--host-port", "65535"]).hostPort).toBe(65535);
     expect(parseLinuxSmokeArgs(["--host-port", "65535"]).hostPort).toBe(65535);
     expect(parseWindowsSmokeArgs(["--host-port", "65535"]).hostPort).toBe(65535);
+    for (const parseArgs of [parseMacosSmokeArgs, parseLinuxSmokeArgs, parseWindowsSmokeArgs]) {
+      expect(parseArgs(["--npm-registry", "http://192.0.2.2:48123"]).npmRegistry).toBe(
+        "http://192.0.2.2:48123",
+      );
+    }
     expect(parseNpmUpdateSmokeArgs(["--", "--package-spec", "openclaw@2026.5.1"]).packageSpec).toBe(
       "openclaw@2026.5.1",
     );
@@ -406,6 +411,8 @@ describe("Parallels smoke model selection", () => {
     expect(parallelsVm).toContain("export function resolveMacosVmName");
     expect(parallelsVm).toContain("export function waitForVmStatus");
     expect(hostServer).toContain("export async function startHostServer");
+    expect(hostServer).toContain("export async function startNpmRegistryServer");
+    expect(hostServer).toContain('OPENCLAW_NPM_REGISTRY_UPSTREAM: "https://registry.npmjs.org"');
     expect(hostServer).toContain("http.server");
     expect(snapshots).toContain("export function resolveSnapshot");
     expect(smokeCommon).toContain("runSmokeLane");
diff --git a/test/scripts/plugins-assertions.test.ts b/test/scripts/plugins-assertions.test.ts
index 7e4a8581734..f5456840493 100644
--- a/test/scripts/plugins-assertions.test.ts
+++ b/test/scripts/plugins-assertions.test.ts
@@ -12,6 +12,7 @@ import {
 import { createServer, request as httpRequest } from "node:http";
 import { tmpdir } from "node:os";
 import path from "node:path";
+import { gzipSync } from "node:zlib";
 import { describe, expect, it } from "vitest";
 import { createBoundedChildOutput } from "../helpers/bounded-child-output.js";
 import { cleanupTempDirs, makeTempDir } from "../helpers/temp-dir.js";
@@ -159,10 +160,11 @@ async function waitForPortFile(portFile: string): Promise<number> {
 function requestFixtureRegistry(
   port: number,
   requestPath: string,
-): Promise<{ body: string; statusCode: number | undefined }> {
+  headers: Record<string, string> = {},
+): Promise<{ body: string; contentLength: string | undefined; statusCode: number | undefined }> {
   return new Promise((resolve, reject) => {
     const request = httpRequest(
-      { host: "127.0.0.1", method: "GET", path: requestPath, port },
+      { headers, host: "127.0.0.1", method: "GET", path: requestPath, port },
       (response) => {
         let body = "";
         response.setEncoding("utf8");
@@ -170,7 +172,11 @@ function requestFixtureRegistry(
           body += chunk;
         });
         response.on("end", () => {
-          resolve({ body, statusCode: response.statusCode });
+          resolve({
+            body,
+            contentLength: response.headers["content-length"],
+            statusCode: response.statusCode,
+          });
         });
       },
     );
@@ -602,6 +608,235 @@ test -d "$OPENCLAW_PLUGINS_TMP_DIR"
     }
   });
 
+  it("serves tarball dependencies using the request-visible registry origin", async () => {
+    const tempDirs: string[] = [];
+    const root = makeTempDir(tempDirs, "openclaw-plugin-npm-fixture-package-");
+    const packageDir = path.join(root, "package");
+    const portFile = path.join(root, "port");
+    const tarballPath = path.join(root, "openclaw.tgz");
+    mkdirSync(packageDir);
+    writeJson(path.join(packageDir, "package.json"), {
+      name: "openclaw",
+      version: "2026.7.1-beta.3",
+      dependencies: {
+        "@openclaw/ai": "2026.7.1-beta.3",
+        zod: "4.3.6",
+      },
+      optionalDependencies: {
+        "sqlite-vec": "0.1.7-alpha.2",
+      },
+    });
+    const packed = spawnSync("tar", ["-czf", tarballPath, "-C", root, "package"], {
+      encoding: "utf8",
+    });
+    expect(packed.status, packed.stderr).toBe(0);
+
+    const child = spawn(
+      process.execPath,
+      [
+        "scripts/e2e/lib/plugins/npm-registry-server.mjs",
+        portFile,
+        "openclaw",
+        "2026.7.1-beta.3",
+        tarballPath,
+      ],
+      {
+        cwd: process.cwd(),
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+
+    try {
+      const port = await waitForPortFile(portFile);
+      const response = await requestFixtureRegistry(port, "/openclaw", {
+        host: `192.0.2.2:${port}`,
+      });
+      const metadata = JSON.parse(response.body);
+
+      expect(response.statusCode).toBe(200);
+      expect(metadata.versions["2026.7.1-beta.3"].dependencies).toEqual({
+        "@openclaw/ai": "2026.7.1-beta.3",
+        zod: "4.3.6",
+      });
+      expect(metadata.versions["2026.7.1-beta.3"].optionalDependencies).toEqual({
+        "sqlite-vec": "0.1.7-alpha.2",
+      });
+      expect(metadata.versions["2026.7.1-beta.3"].dist.tarball).toBe(
+        `http://192.0.2.2:${port}/openclaw/-/openclaw.tgz`,
+      );
+    } finally {
+      if (child.exitCode === null) {
+        child.kill();
+        await new Promise((resolve) => {
+          child.once("close", resolve);
+        });
+      }
+      cleanupTempDirs(tempDirs);
+    }
+  });
+
+  it("recomputes proxied content length after fetch decodes the response", async () => {
+    const tempDirs: string[] = [];
+    const root = makeTempDir(tempDirs, "openclaw-plugin-npm-fixture-proxy-");
+    const portFile = path.join(root, "port");
+    const tarballPath = path.join(root, "demo-plugin.tgz");
+    const upstreamBody = JSON.stringify({ payload: "x".repeat(1_000) });
+    const compressedBody = gzipSync(upstreamBody);
+    writeFileSync(tarballPath, "fixture package archive", "utf8");
+
+    const upstream = createServer((_request, response) => {
+      response.writeHead(200, {
+        "content-encoding": "gzip",
+        "content-length": String(compressedBody.length),
+        "content-type": "application/json",
+      });
+      response.end(compressedBody);
+    });
+    await new Promise<void>((resolve) => {
+      upstream.listen(0, "127.0.0.1", resolve);
+    });
+    const upstreamAddress = upstream.address();
+    if (!upstreamAddress || typeof upstreamAddress === "string") {
+      throw new Error("expected upstream registry address");
+    }
+
+    const child = spawn(
+      process.execPath,
+      [
+        "scripts/e2e/lib/plugins/npm-registry-server.mjs",
+        portFile,
+        "@openclaw/demo-plugin-npm",
+        "1.0.0",
+        tarballPath,
+      ],
+      {
+        cwd: process.cwd(),
+        env: {
+          ...process.env,
+          OPENCLAW_NPM_REGISTRY_UPSTREAM: `http://127.0.0.1:${upstreamAddress.port}`,
+        },
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+
+    try {
+      const port = await waitForPortFile(portFile);
+      const response = await requestFixtureRegistry(port, "/upstream-package");
+
+      expect(response.statusCode).toBe(200);
+      expect(response.body).toBe(upstreamBody);
+      expect(response.contentLength).toBe(String(Buffer.byteLength(upstreamBody)));
+    } finally {
+      if (child.exitCode === null) {
+        child.kill();
+        await new Promise((resolve) => {
+          child.once("close", resolve);
+        });
+      }
+      await new Promise<void>((resolve) => {
+        upstream.close(() => resolve());
+      });
+      cleanupTempDirs(tempDirs);
+    }
+  });
+
+  it("does not let absolute-form request targets escape the configured upstream", async () => {
+    const tempDirs: string[] = [];
+    const root = makeTempDir(tempDirs, "openclaw-plugin-npm-fixture-proxy-origin-");
+    const portFile = path.join(root, "port");
+    const tarballPath = path.join(root, "demo-plugin.tgz");
+    let configuredUpstreamHits = 0;
+    let escapeServerHits = 0;
+    let configuredUpstreamTarget: string | undefined;
+    writeFileSync(tarballPath, "fixture package archive", "utf8");
+
+    const configuredUpstream = createServer((request, response) => {
+      configuredUpstreamHits += 1;
+      configuredUpstreamTarget = request.url;
+      response.writeHead(200, { "content-type": "text/plain" });
+      response.end("configured upstream");
+    });
+    const escapeServer = createServer((_request, response) => {
+      escapeServerHits += 1;
+      response.writeHead(200, { "content-type": "text/plain" });
+      response.end("escaped upstream");
+    });
+    await Promise.all([
+      new Promise<void>((resolve) => {
+        configuredUpstream.listen(0, "127.0.0.1", resolve);
+      }),
+      new Promise<void>((resolve) => {
+        escapeServer.listen(0, "127.0.0.1", resolve);
+      }),
+    ]);
+    const configuredAddress = configuredUpstream.address();
+    const escapeAddress = escapeServer.address();
+    if (
+      !configuredAddress ||
+      typeof configuredAddress === "string" ||
+      !escapeAddress ||
+      typeof escapeAddress === "string"
+    ) {
+      throw new Error("expected upstream registry addresses");
+    }
+
+    const child = spawn(
+      process.execPath,
+      [
+        "scripts/e2e/lib/plugins/npm-registry-server.mjs",
+        portFile,
+        "@openclaw/demo-plugin-npm",
+        "1.0.0",
+        tarballPath,
+      ],
+      {
+        cwd: process.cwd(),
+        env: {
+          ...process.env,
+          OPENCLAW_NPM_REGISTRY_UPSTREAM: `http://127.0.0.1:${configuredAddress.port}`,
+        },
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    );
+
+    try {
+      const port = await waitForPortFile(portFile);
+      const escaped = await requestFixtureRegistry(
+        port,
+        `http://registry.invalid//127.0.0.1:${escapeAddress.port}/probe`,
+      );
+
+      expect(escaped.statusCode).toBe(502);
+      expect(escaped.body).toContain("refusing non-origin registry request URL");
+      expect(configuredUpstreamHits).toBe(0);
+      expect(escapeServerHits).toBe(0);
+
+      const valid = await requestFixtureRegistry(port, "/pkg?x=1");
+
+      expect(valid.statusCode).toBe(200);
+      expect(valid.body).toBe("configured upstream");
+      expect(configuredUpstreamHits).toBe(1);
+      expect(configuredUpstreamTarget).toBe("/pkg?x=1");
+      expect(escapeServerHits).toBe(0);
+    } finally {
+      if (child.exitCode === null) {
+        child.kill();
+        await new Promise((resolve) => {
+          child.once("close", resolve);
+        });
+      }
+      await Promise.all([
+        new Promise<void>((resolve) => {
+          configuredUpstream.close(() => resolve());
+        }),
+        new Promise<void>((resolve) => {
+          escapeServer.close(() => resolve());
+        }),
+      ]);
+      cleanupTempDirs(tempDirs);
+    }
+  });
+
   it("rejects invalid plugin fixture log byte limits before npm fixture setup", () => {
     const root = mkdtempSync(path.join(tmpdir(), "openclaw-plugin-npm-fixture-log-invalid-"));
     try {
diff --git a/test/scripts/release-candidate-checklist.test.ts b/test/scripts/release-candidate-checklist.test.ts
index 365389688fe..c14a951167e 100644
--- a/test/scripts/release-candidate-checklist.test.ts
+++ b/test/scripts/release-candidate-checklist.test.ts
@@ -10,6 +10,7 @@ import {
   resolveArtifactName,
   requireRunIdFromDispatchOutput,
   validateFullManifest,
+  validatePreflightManifest,
   validateWindowsSourceRelease,
 } from "../../scripts/release-candidate-checklist.mjs";
 
@@ -69,8 +70,64 @@ describe("release candidate checklist", () => {
       candidateParallelsShellCommand(
         ".artifacts/preflight/openclaw candidate.tgz",
         "/opt/homebrew/bin/gtimeout",
+        [".artifacts/preflight/openclaw-ai candidate.tgz"],
       ),
     ).toContain("'--target-tarball' '.artifacts/preflight/openclaw candidate.tgz'");
+    expect(
+      candidateParallelsArgs(".artifacts/preflight/openclaw.tgz", [
+        ".artifacts/preflight/openclaw-ai.tgz",
+      ]),
+    ).toEqual([
+      "test:parallels:npm-update",
+      "--",
+      "--target-tarball",
+      ".artifacts/preflight/openclaw.tgz",
+      "--dependency-tarball",
+      ".artifacts/preflight/openclaw-ai.tgz",
+      "--json",
+    ]);
+  });
+
+  it("requires exact dependency tarball metadata in npm preflight manifests", () => {
+    const manifest = {
+      releaseTag: "v2026.7.1-beta.3",
+      releaseSha: "candidate-sha",
+      npmDistTag: "beta",
+      tarballName: "openclaw-2026.7.1-beta.3.tgz",
+      tarballSha256: "root-sha",
+      dependencyTarballs: [
+        {
+          packageName: "@openclaw/ai",
+          packageVersion: "2026.7.1-beta.3",
+          tarballName: "openclaw-ai-2026.7.1-beta.3.tgz",
+          tarballSha256: "ai-sha",
+        },
+      ],
+    };
+    const params = {
+      tag: "v2026.7.1-beta.3",
+      targetSha: "candidate-sha",
+      npmDistTag: "beta",
+    };
+
+    expect(() => validatePreflightManifest(manifest, params)).not.toThrow();
+    expect(() =>
+      validatePreflightManifest({ ...manifest, dependencyTarballs: undefined }, params),
+    ).toThrow("missing dependency tarball metadata");
+    expect(() =>
+      validatePreflightManifest(
+        {
+          ...manifest,
+          dependencyTarballs: [
+            {
+              ...manifest.dependencyTarballs[0],
+              tarballName: "../openclaw-ai.tgz",
+            },
+          ],
+        },
+        params,
+      ),
+    ).toThrow("invalid dependency tarball metadata");
   });
 
   it("requires run ids when dispatch is disabled", () => {
@@ -87,7 +144,10 @@ describe("release candidate checklist", () => {
       secondValue: string,
       prefix = requiredArgs,
     ): [string, string[]] => [flag, [...prefix, flag, firstValue, flag, secondValue]];
-    const duplicateFlag = (flag: string): [string, string[]] => [flag, [...requiredArgs, flag, flag]];
+    const duplicateFlag = (flag: string): [string, string[]] => [
+      flag,
+      [...requiredArgs, flag, flag],
+    ];
     const duplicateCases = [
       duplicateOption("--tag", "v2026.5.14-beta.3", "v2026.5.14-beta.4", []),
       duplicateOption("--workflow-ref", "release/a", "release/b"),
diff --git a/ui/package.json b/ui/package.json
index b0e65953d27..e4ec676abd6 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@create-markdown/preview": "2.0.3",
+    "@lit/context": "1.1.6",
     "@noble/ed25519": "3.1.0",
     "@openclaw/libterminal": "0.3.1",
     "@openclaw/media-core": "workspace:*",
diff --git a/ui/src/api/gateway.node.test.ts b/ui/src/api/gateway.node.test.ts
index 05ff13655be..c412ca276e6 100644
--- a/ui/src/api/gateway.node.test.ts
+++ b/ui/src/api/gateway.node.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GATEWAY_CLIENT_CAPS } from "../../../packages/gateway-protocol/src/client-info.js";
 import { ConnectErrorDetailCodes } from "../../../packages/gateway-protocol/src/connect-error-details.js";
 import {
   MIN_CLIENT_PROTOCOL_VERSION,
@@ -140,8 +141,8 @@ type ConnectFrame = {
     auth?: { token?: string; password?: string; deviceToken?: string };
     maxProtocol?: number;
     minProtocol?: number;
-    scopes?: string[];
     caps?: string[];
+    scopes?: string[];
   };
 };
 
@@ -413,8 +414,12 @@ describe("GatewayBrowserClient", () => {
     expect(connectFrame.method).toBe("connect");
     expect(connectFrame.params?.minProtocol).toBe(MIN_CLIENT_PROTOCOL_VERSION);
     expect(connectFrame.params?.maxProtocol).toBe(PROTOCOL_VERSION);
+    expect(connectFrame.params?.caps).toEqual([
+      GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS,
+      GATEWAY_CLIENT_CAPS.TOOL_EVENTS,
+      GATEWAY_CLIENT_CAPS.INLINE_WIDGETS,
+    ]);
     expect(connectFrame.params?.scopes).toEqual([...CONTROL_UI_OPERATOR_SCOPES]);
-    expect(connectFrame.params?.caps).toEqual(["tool-events", "inline-widgets"]);
   });
 
   it("adds the current Control UI protocol to bare protocol mismatch errors", () => {
diff --git a/ui/src/api/gateway.ts b/ui/src/api/gateway.ts
index eeb0ae5dbdf..92f560453b1 100644
--- a/ui/src/api/gateway.ts
+++ b/ui/src/api/gateway.ts
@@ -784,7 +784,11 @@ export class GatewayBrowserClient {
       role: plan.role,
       scopes: plan.scopes,
       device: plan.device,
-      caps: [GATEWAY_CLIENT_CAPS.TOOL_EVENTS, GATEWAY_CLIENT_CAPS.INLINE_WIDGETS],
+      caps: [
+        GATEWAY_CLIENT_CAPS.TASK_SUGGESTIONS,
+        GATEWAY_CLIENT_CAPS.TOOL_EVENTS,
+        GATEWAY_CLIENT_CAPS.INLINE_WIDGETS,
+      ],
       auth: plan.auth,
       userAgent: navigator.userAgent,
       locale: navigator.language,
diff --git a/ui/src/app-navigation.ts b/ui/src/app-navigation.ts
index 99426db9b84..f41e94cb5f5 100644
--- a/ui/src/app-navigation.ts
+++ b/ui/src/app-navigation.ts
@@ -62,7 +62,7 @@ export function sidebarMoreRoutes(pinned: readonly SidebarNavRoute[]): SidebarNa
   return SIDEBAR_NAV_ROUTES.filter((routeId) => !pinned.includes(routeId));
 }
 
-export type SettingsNavigationGroup = {
+type SettingsNavigationGroup = {
   /** i18n key for the group heading; null renders the group without a label. */
   labelKey: string | null;
   routes: readonly NavigationRouteId[];
diff --git a/ui/src/app/app-host.test.ts b/ui/src/app/app-host.test.ts
new file mode 100644
index 00000000000..20975036d50
--- /dev/null
+++ b/ui/src/app/app-host.test.ts
@@ -0,0 +1,171 @@
+/* @vitest-environment jsdom */
+
+import { describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../api/gateway.ts";
+import type {
+  ApplicationContext,
+  ApplicationGateway,
+  ApplicationGatewaySnapshot,
+} from "./context.ts";
+import "./app-host.ts";
+
+type AppLifecycleState = {
+  loginToken: string;
+  loginPassword: string;
+  loginShowGatewayToken: boolean;
+  loginShowGatewayPassword: boolean;
+  disconnectedCallback: () => void;
+  synchronizeGateway: (gateway: ApplicationGateway) => void;
+};
+
+type ShellInitializationState = {
+  routeState: { routeId?: string };
+  ensureAgentsList: (
+    snapshot: { client: GatewayBrowserClient | null; connected: boolean },
+    agents: ApplicationContext["agents"],
+  ) => void;
+  ensureRuntimeConfig: (
+    snapshot: { client: GatewayBrowserClient | null; connected: boolean },
+    runtimeConfig: ApplicationContext["runtimeConfig"],
+  ) => void;
+};
+
+type ShellEpochState = {
+  navDrawerOpen: boolean;
+  navDrawerTrigger: HTMLElement | null;
+  lastWorkspaceLocation: { routeId: string; search: string } | null;
+  activeSessionKey: string;
+  agentLabel: string;
+  commandPaletteTarget: unknown;
+  agentsListClient: GatewayBrowserClient | null;
+  agentsListSource: ApplicationContext["agents"] | null;
+  sessionKeyClient: GatewayBrowserClient | null;
+  runtimeConfigClient: GatewayBrowserClient | null;
+  runtimeConfigSource: ApplicationContext["runtimeConfig"] | null;
+  terminalClient: GatewayBrowserClient | null;
+  settingsPreloadTimers: Map<EventTarget, ReturnType<typeof globalThis.setTimeout>>;
+  disconnectedCallback: () => void;
+};
+
+describe("OpenClaw app lifecycle", () => {
+  it("hides revealed login credentials when the app connection epoch ends", () => {
+    const app = document.createElement("openclaw-app") as unknown as AppLifecycleState;
+    app.loginShowGatewayToken = true;
+    app.loginShowGatewayPassword = true;
+
+    app.disconnectedCallback();
+
+    expect(app.loginShowGatewayToken).toBe(false);
+    expect(app.loginShowGatewayPassword).toBe(false);
+  });
+
+  it("hides revealed login credentials when the Gateway source changes", () => {
+    const app = document.createElement("openclaw-app") as unknown as AppLifecycleState;
+    const snapshot = {
+      client: null,
+      connected: false,
+      reconnecting: false,
+      lastError: null,
+      lastErrorCode: null,
+    } as ApplicationGatewaySnapshot;
+    const firstGateway = {
+      snapshot,
+      connection: { gatewayUrl: "ws://first.test", token: "first", password: "first-password" },
+    } as ApplicationGateway;
+    const secondGateway = {
+      snapshot,
+      connection: {
+        gatewayUrl: "ws://second.test",
+        token: "second",
+        password: "second-password",
+      },
+    } as ApplicationGateway;
+    app.synchronizeGateway(firstGateway);
+    app.loginShowGatewayToken = true;
+    app.loginShowGatewayPassword = true;
+
+    app.synchronizeGateway(secondGateway);
+
+    expect(app.loginShowGatewayToken).toBe(false);
+    expect(app.loginShowGatewayPassword).toBe(false);
+    expect(app.loginToken).toBe("second");
+    expect(app.loginPassword).toBe("second-password");
+  });
+});
+
+describe("OpenClaw shell source initialization", () => {
+  it("clears retained presentation and source ownership when its context epoch ends", () => {
+    const shell = document.createElement("openclaw-app-shell") as unknown as ShellEpochState;
+    const client = {} as GatewayBrowserClient;
+    const agents = {} as ApplicationContext["agents"];
+    const runtimeConfig = {} as ApplicationContext["runtimeConfig"];
+    const trigger = document.createElement("button");
+    shell.navDrawerOpen = true;
+    shell.navDrawerTrigger = trigger;
+    shell.lastWorkspaceLocation = { routeId: "overview", search: "?agent=old" };
+    shell.activeSessionKey = "agent:old:main";
+    shell.agentLabel = "Old agent";
+    shell.commandPaletteTarget = {};
+    shell.agentsListClient = client;
+    shell.agentsListSource = agents;
+    shell.sessionKeyClient = client;
+    shell.runtimeConfigClient = client;
+    shell.runtimeConfigSource = runtimeConfig;
+    shell.terminalClient = client;
+    shell.settingsPreloadTimers.set(
+      trigger,
+      globalThis.setTimeout(() => undefined, 60_000),
+    );
+
+    shell.disconnectedCallback();
+
+    expect(shell.navDrawerOpen).toBe(false);
+    expect(shell.navDrawerTrigger).toBeNull();
+    expect(shell.lastWorkspaceLocation).toBeNull();
+    expect(shell.activeSessionKey).toBe("");
+    expect(shell.agentLabel).toBe("");
+    expect(shell.commandPaletteTarget).toBeUndefined();
+    expect(shell.agentsListClient).toBeNull();
+    expect(shell.agentsListSource).toBeNull();
+    expect(shell.sessionKeyClient).toBeNull();
+    expect(shell.runtimeConfigClient).toBeNull();
+    expect(shell.runtimeConfigSource).toBeNull();
+    expect(shell.terminalClient).toBeNull();
+    expect(shell.settingsPreloadTimers.size).toBe(0);
+  });
+
+  it("initializes replacement capabilities even when the Gateway client is unchanged", () => {
+    const shell = document.createElement(
+      "openclaw-app-shell",
+    ) as unknown as ShellInitializationState;
+    shell.routeState = { routeId: "overview" };
+    const client = {} as GatewayBrowserClient;
+    const snapshot = { client, connected: true };
+    const firstAgents = {
+      state: { agentsList: null },
+      ensureList: vi.fn(() => Promise.resolve(null)),
+    } as unknown as ApplicationContext["agents"];
+    const secondAgents = {
+      state: { agentsList: null },
+      ensureList: vi.fn(() => Promise.resolve(null)),
+    } as unknown as ApplicationContext["agents"];
+    const firstRuntimeConfig = {
+      ensureLoaded: vi.fn(() => Promise.resolve()),
+    } as unknown as ApplicationContext["runtimeConfig"];
+    const secondRuntimeConfig = {
+      ensureLoaded: vi.fn(() => Promise.resolve()),
+    } as unknown as ApplicationContext["runtimeConfig"];
+
+    shell.ensureAgentsList(snapshot, firstAgents);
+    shell.ensureAgentsList(snapshot, firstAgents);
+    shell.ensureAgentsList(snapshot, secondAgents);
+    shell.ensureRuntimeConfig(snapshot, firstRuntimeConfig);
+    shell.ensureRuntimeConfig(snapshot, firstRuntimeConfig);
+    shell.ensureRuntimeConfig(snapshot, secondRuntimeConfig);
+
+    expect(firstAgents.ensureList).toHaveBeenCalledOnce();
+    expect(secondAgents.ensureList).toHaveBeenCalledOnce();
+    expect(firstRuntimeConfig.ensureLoaded).toHaveBeenCalledOnce();
+    expect(secondRuntimeConfig.ensureLoaded).toHaveBeenCalledOnce();
+  });
+});
diff --git a/ui/src/app/app-host.ts b/ui/src/app/app-host.ts
index b5e2a200f82..3896d6dbf5b 100644
--- a/ui/src/app/app-host.ts
+++ b/ui/src/app/app-host.ts
@@ -1,6 +1,6 @@
 import { consume, ContextProvider } from "@lit/context";
 import type { RouteLocation, RouterState } from "@openclaw/uirouter";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property, query, state } from "lit/decorators.js";
 import { hasStoredGatewayAuth, type GatewayBrowserClient } from "../api/gateway.ts";
 import type { AgentsListResult } from "../api/types.ts";
@@ -31,6 +31,8 @@ import { isWorkboardEnabledInConfigSnapshot } from "../lib/plugin-activation.ts"
 import { searchForSession } from "../lib/sessions/index.ts";
 import { resolveAgentIdFromSessionKey } from "../lib/sessions/session-key.ts";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../lit/subscriptions-controller.ts";
 import { renderDevicePairSetup } from "../pages/nodes/view-pairing.ts";
 import { pluginTabKey, pluginTabRefFromSearch } from "../pages/plugin/route.ts";
 import { bootstrapApplication, type ApplicationRuntime } from "./bootstrap.ts";
@@ -134,7 +136,7 @@ function isMobileNavLayout(): boolean {
   return globalThis.matchMedia?.("(max-width: 1100px)").matches ?? false;
 }
 
-class OpenClawApp extends LitElement {
+class OpenClawApp extends OpenClawLightDomElement {
   @state() private gatewayConnected = false;
   @state() private gatewayReconnecting = false;
   @state() private gatewayLastError: string | null = null;
@@ -162,58 +164,79 @@ class OpenClawApp extends LitElement {
   private readonly contextProvider = new ContextProvider(this, {
     context: applicationContext,
   });
-  private stopGatewaySubscription: (() => void) | undefined;
-  private stopConfigSubscription: (() => void) | undefined;
+  private readonly subscriptions = new SubscriptionsController(this);
+  private loginGatewaySource: ApplicationContext["gateway"] | null = null;
+  private loginConnectionClient: GatewayBrowserClient | null = null;
 
-  override createRenderRoot() {
-    return this;
+  constructor() {
+    super();
+    this.subscriptions
+      .watch(
+        () => this.context?.gateway,
+        (gateway, notify) => gateway.subscribe(notify),
+        (gateway) => this.synchronizeGateway(gateway),
+      )
+      .watch(
+        () => (this.terminalOnly ? this.context?.config : undefined),
+        (config, notify) => config.subscribe(notify),
+        () => this.updateTerminalSurface(),
+      );
   }
 
   override connectedCallback() {
     super.connectedCallback();
+    this.resetLoginSensitivePresentation();
     this.runtime = bootstrapApplication();
     this.context = this.runtime.context;
     this.initialAuthPresent = hasStoredGatewayAuth(this.context.gateway.connection);
     this.pendingGatewayUrl = this.runtime.pendingGatewayConnection?.gatewayUrl ?? null;
+    // Context identity changes only across a full app-tree connection epoch;
+    // descendants reconnect and rebuild their controller-owned state afterward.
     this.contextProvider.setValue(this.context);
     this.syncLoginConnection();
-    let gatewayClient = this.context.gateway.snapshot.client;
-    this.updateGatewayStatus(this.context.gateway.snapshot);
-    this.stopGatewaySubscription = this.context.gateway.subscribe((snapshot) => {
-      if (snapshot.client !== gatewayClient) {
-        gatewayClient = snapshot.client;
-        this.syncLoginConnection();
-      }
-      this.updateGatewayStatus(snapshot);
-      this.updateTerminalSurface();
-    });
-    if (this.terminalOnly) {
-      // Terminal availability also depends on config.terminalEnabled, which
-      // can arrive after the gateway snapshot; track it for this document mode.
-      this.updateTerminalSurface();
-      this.stopConfigSubscription = this.context.config.subscribe(() => {
-        this.updateTerminalSurface();
-      });
-    }
+    // The runtime is created after controller hostConnected hooks run. Ensure
+    // their lazy source getters bind on both the initial mount and reconnect.
+    this.requestUpdate();
     void this.runtime.start().catch((error: unknown) => {
       console.error("[openclaw] application start failed", error);
     });
   }
 
   override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
+    // Stop reactive subscriptions before disposing their application sources.
+    this.subscriptions.clear();
     this.runtime?.stop();
     this.runtime = undefined;
     this.context = undefined;
+    this.loginGatewaySource = null;
+    this.loginConnectionClient = null;
     this.pendingGatewayUrl = null;
+    this.resetLoginSensitivePresentation();
     super.disconnectedCallback();
   }
 
-  private syncLoginConnection() {
-    const connection = this.context?.gateway.connection;
+  private synchronizeGateway(gateway: ApplicationContext["gateway"]) {
+    const sourceChanged = gateway !== this.loginGatewaySource;
+    if (sourceChanged) {
+      this.loginGatewaySource = gateway;
+      this.loginConnectionClient = null;
+      this.resetLoginSensitivePresentation();
+    }
+    const snapshot = gateway.snapshot;
+    const clientChanged = snapshot.client !== this.loginConnectionClient;
+    if (clientChanged) {
+      this.loginConnectionClient = snapshot.client;
+      this.resetLoginSensitivePresentation();
+    }
+    if (sourceChanged || clientChanged) {
+      this.syncLoginConnection(gateway);
+    }
+    this.updateGatewayStatus(snapshot);
+    this.updateTerminalSurface();
+  }
+
+  private syncLoginConnection(gateway = this.context?.gateway) {
+    const connection = gateway?.connection;
     if (!connection) {
       return;
     }
@@ -222,6 +245,11 @@ class OpenClawApp extends LitElement {
     this.loginPassword = connection.password;
   }
 
+  private resetLoginSensitivePresentation() {
+    this.loginShowGatewayToken = false;
+    this.loginShowGatewayPassword = false;
+  }
+
   private readonly updateGatewayStatus = (snapshot: {
     connected: boolean;
     reconnecting: boolean;
@@ -368,10 +396,10 @@ class OpenClawApp extends LitElement {
   }
 }
 
-class OpenClawShell extends LitElement {
+class OpenClawShell extends OpenClawLightDomElement {
   @property({ attribute: false }) runtime?: ApplicationRuntime;
   @property({ attribute: false }) onboarding = false;
-  @consume({ context: applicationContext, subscribe: false })
+  @consume({ context: applicationContext, subscribe: true })
   private context?: ApplicationContext<RouteId>;
 
   @state() private navCollapsed = false;
@@ -406,125 +434,128 @@ class OpenClawShell extends LitElement {
   // chat (the app default route) when settings was the entry point.
   private lastWorkspaceLocation: { routeId: RouteId; search: string } | null = null;
   private agentsListClient: GatewayBrowserClient | null = null;
+  private agentsListSource: ApplicationContext["agents"] | null = null;
   private sessionKeyClient: GatewayBrowserClient | null = null;
-  private stopAgentsSubscription: (() => void) | undefined;
-  private stopConfigSubscription: (() => void) | undefined;
-  private stopGatewaySubscription: (() => void) | undefined;
-  private stopNavigationSubscription: (() => void) | undefined;
-  private stopRouteSubscription: (() => void) | undefined;
-  private stopOverlaySubscription: (() => void) | undefined;
-  private stopRuntimeConfigSubscription: (() => void) | undefined;
-  private stopThemeSubscription: (() => void) | undefined;
+  private runtimeConfigClient: GatewayBrowserClient | null = null;
+  private runtimeConfigSource: ApplicationContext["runtimeConfig"] | null = null;
+  private readonly settingsPreloadTimers = new Map<
+    EventTarget,
+    ReturnType<typeof globalThis.setTimeout>
+  >();
+  private readonly subscriptions = new SubscriptionsController(this);
 
-  override createRenderRoot() {
-    return this;
+  constructor() {
+    super();
+    this.subscriptions
+      .effect(
+        () => this.context,
+        () => () => this.resetShellEpochState(),
+      )
+      .watch(
+        () => this.context?.navigation,
+        (navigation, notify) => navigation.subscribe(notify),
+        (navigation) => this.updateNavigationPreferences(navigation.snapshot),
+      )
+      .watch(
+        () => this.context?.gateway,
+        (gateway, notify) => gateway.subscribe(notify),
+        (gateway) => this.synchronizeGateway(gateway.snapshot),
+      )
+      .watch(
+        () => this.context?.config,
+        (config, notify) => config.subscribe(notify),
+        () => {
+          const snapshot = this.context?.gateway.snapshot;
+          if (snapshot) {
+            this.updateTerminalSurface(snapshot);
+          }
+        },
+      )
+      .watch(
+        () => this.context?.theme,
+        (theme, notify) => theme.subscribe(notify),
+      )
+      .watch(
+        () => this.context?.agents,
+        (agents, notify) => agents.subscribe(notify),
+        (agents) => {
+          this.updateAgentLabel();
+          const snapshot = this.context?.gateway.snapshot;
+          if (snapshot) {
+            this.ensureAgentsList(snapshot, agents);
+          }
+        },
+      )
+      .effect(
+        () => this.runtime?.router,
+        (router) => {
+          this.updateRouteState(selectShellRouteState(router.getState()));
+          return router.subscribeSelector(
+            selectShellRouteState,
+            (routeState) => this.updateRouteState(routeState),
+            equalShellRouteState,
+          );
+        },
+      )
+      .watch(
+        () => this.context?.overlays,
+        (overlays, notify) => overlays.subscribe(notify),
+        (overlays) => {
+          this.overlaySnapshot = overlays.snapshot;
+        },
+      )
+      .watch(
+        () => this.context?.runtimeConfig,
+        (runtimeConfig, notify) => runtimeConfig.subscribe(notify),
+        (runtimeConfig) => {
+          const snapshot = this.context?.gateway.snapshot;
+          if (snapshot) {
+            this.ensureRuntimeConfig(snapshot, runtimeConfig);
+          }
+        },
+      );
   }
 
   override connectedCallback() {
     super.connectedCallback();
-    this.startSubscriptions();
     this.addEventListener(COMMAND_PALETTE_TARGET_EVENT, this.handleCommandPaletteTarget);
     document.addEventListener("keydown", this.handleDocumentKeydown);
     window.addEventListener("resize", this.handleWindowResize);
   }
 
-  override updated() {
-    this.startSubscriptions();
-  }
-
-  private startSubscriptions() {
-    const runtime = this.runtime;
-    const context = this.context;
-    if (
-      !runtime ||
-      !context ||
-      this.stopAgentsSubscription ||
-      this.stopConfigSubscription ||
-      this.stopGatewaySubscription ||
-      this.stopNavigationSubscription ||
-      this.stopRouteSubscription ||
-      this.stopOverlaySubscription ||
-      this.stopRuntimeConfigSubscription ||
-      this.stopThemeSubscription
-    ) {
-      return;
-    }
-    this.updateNavigationPreferences(context.navigation.snapshot);
-    this.stopNavigationSubscription = context.navigation.subscribe((snapshot) => {
-      this.updateNavigationPreferences(snapshot);
-    });
-    this.updateGatewaySessionKey(context.gateway.snapshot);
-    this.updateGatewayStatus(context.gateway.snapshot);
-    this.updateTerminalSurface(context.gateway.snapshot);
-    this.updateAgentLabel();
-    this.ensureRuntimeConfig(context.gateway.snapshot);
-    this.stopGatewaySubscription = context.gateway.subscribe((snapshot) => {
-      this.updateGatewaySessionKey(snapshot);
-      this.updateGatewayStatus(snapshot);
-      this.updateTerminalSurface(snapshot);
-      this.updateAgentLabel();
-      this.ensureAgentsList(snapshot);
-      this.ensureRuntimeConfig(snapshot);
-    });
-    this.stopConfigSubscription = context.config.subscribe(() => {
-      this.updateTerminalSurface(context.gateway.snapshot);
-    });
-    this.stopThemeSubscription = context.theme.subscribe(() => this.requestUpdate());
-    this.stopAgentsSubscription = context.agents.subscribe(() => {
-      this.updateAgentLabel();
-    });
-    this.updateRouteState(selectShellRouteState(runtime.router.getState()));
-    this.stopRouteSubscription = runtime.router.subscribeSelector(
-      selectShellRouteState,
-      (routeState) => {
-        this.updateRouteState(routeState);
-      },
-      equalShellRouteState,
-    );
-    this.overlaySnapshot = context.overlays.snapshot;
-    this.stopOverlaySubscription = context.overlays.subscribe((snapshot) => {
-      this.overlaySnapshot = snapshot;
-    });
-    this.stopRuntimeConfigSubscription = context.runtimeConfig.subscribe(() => {
-      // Route enablement (e.g. Workboard) derives from the config snapshot.
-      this.requestUpdate();
-    });
-  }
-
   override disconnectedCallback() {
     this.removeEventListener(COMMAND_PALETTE_TARGET_EVENT, this.handleCommandPaletteTarget);
     document.removeEventListener("keydown", this.handleDocumentKeydown);
     window.removeEventListener("resize", this.handleWindowResize);
-    this.stopAgentsSubscription?.();
-    this.stopAgentsSubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopNavigationSubscription?.();
-    this.stopNavigationSubscription = undefined;
-    this.stopRouteSubscription?.();
-    this.stopRouteSubscription = undefined;
-    this.stopOverlaySubscription?.();
-    this.stopOverlaySubscription = undefined;
-    this.stopRuntimeConfigSubscription?.();
-    this.stopRuntimeConfigSubscription = undefined;
-    this.stopThemeSubscription?.();
-    this.stopThemeSubscription = undefined;
-    this.agentsListClient = null;
-    this.sessionKeyClient = null;
-    this.terminalClient = null;
-    this.navDrawerTrigger = null;
+    this.resetShellEpochState();
     super.disconnectedCallback();
   }
 
+  private resetShellEpochState() {
+    this.navDrawerOpen = false;
+    this.navDrawerTrigger = null;
+    this.lastWorkspaceLocation = null;
+    this.activeSessionKey = "";
+    this.agentLabel = "";
+    this.commandPaletteTarget = undefined;
+    this.agentsListClient = null;
+    this.agentsListSource = null;
+    this.sessionKeyClient = null;
+    this.runtimeConfigClient = null;
+    this.runtimeConfigSource = null;
+    this.terminalClient = null;
+    for (const timer of this.settingsPreloadTimers.values()) {
+      globalThis.clearTimeout(timer);
+    }
+    this.settingsPreloadTimers.clear();
+  }
+
   private readonly handleThemeChange = (event: CustomEvent<ThemeModeChangeDetail>) => {
     const context = this.context;
     if (!context) {
       return;
     }
     context.theme.setMode(event.detail.mode, event.detail.element);
-    this.requestUpdate();
   };
 
   private chatNavigationOptions(options?: ApplicationNavigationOptions) {
@@ -709,6 +740,15 @@ class OpenClawShell extends LitElement {
     this.requestUpdate();
   };
 
+  private synchronizeGateway(snapshot: ApplicationContext["gateway"]["snapshot"]) {
+    this.updateGatewaySessionKey(snapshot);
+    this.updateGatewayStatus(snapshot);
+    this.updateTerminalSurface(snapshot);
+    this.updateAgentLabel();
+    this.ensureAgentsList(snapshot);
+    this.ensureRuntimeConfig(snapshot);
+  }
+
   private readonly updateGatewayStatus = (snapshot: {
     connected: boolean;
     lastError: string | null;
@@ -731,15 +771,28 @@ class OpenClawShell extends LitElement {
     );
   }
 
-  private ensureRuntimeConfig(snapshot: {
-    client: GatewayBrowserClient | null;
-    connected: boolean;
-  }) {
+  private ensureRuntimeConfig(
+    snapshot: {
+      client: GatewayBrowserClient | null;
+      connected: boolean;
+    },
+    runtimeConfig = this.context?.runtimeConfig,
+  ) {
     // The sidebar hides config-gated routes (Workboard), so the snapshot must
     // load eagerly instead of waiting for a page that happens to fetch it.
-    if (snapshot.connected && snapshot.client) {
-      void this.context?.runtimeConfig.ensureLoaded();
+    if (!snapshot.connected || !snapshot.client || !runtimeConfig) {
+      this.runtimeConfigClient = null;
+      return;
     }
+    if (
+      this.runtimeConfigClient === snapshot.client &&
+      this.runtimeConfigSource === runtimeConfig
+    ) {
+      return;
+    }
+    this.runtimeConfigClient = snapshot.client;
+    this.runtimeConfigSource = runtimeConfig;
+    void runtimeConfig.ensureLoaded();
   }
 
   private enabledRouteIds(): readonly RouteId[] {
@@ -748,20 +801,24 @@ class OpenClawShell extends LitElement {
       : ROUTE_IDS_WITHOUT_WORKBOARD;
   }
 
-  private ensureAgentsList(snapshot: { client: GatewayBrowserClient | null; connected: boolean }) {
+  private ensureAgentsList(
+    snapshot: { client: GatewayBrowserClient | null; connected: boolean },
+    agents = this.context?.agents,
+  ) {
     if (!snapshot.connected || !snapshot.client) {
       this.agentsListClient = null;
       return;
     }
     const routeId = this.routeState.routeId;
-    if (!routeId || routeId === "chat" || this.context?.agents.state.agentsList) {
+    if (!agents || !routeId || routeId === "chat" || agents.state.agentsList) {
       return;
     }
-    if (this.agentsListClient === snapshot.client) {
+    if (this.agentsListClient === snapshot.client && this.agentsListSource === agents) {
       return;
     }
     this.agentsListClient = snapshot.client;
-    void this.context?.agents.ensureList();
+    this.agentsListSource = agents;
+    void agents.ensureList();
   }
 
   private updateGatewaySessionKey(snapshot: {
@@ -891,6 +948,7 @@ class OpenClawShell extends LitElement {
                 onExit: () => this.exitSettings(),
                 onNavigate: (routeId) => this.navigate(routeId),
                 onPreload: (routeId) => context.preload(routeId),
+                preloadTimers: this.settingsPreloadTimers,
               })
             : html`<openclaw-app-sidebar
                 .basePath=${context.basePath}
diff --git a/ui/src/app/bootstrap.ts b/ui/src/app/bootstrap.ts
index 853131d263c..3efc3659410 100644
--- a/ui/src/app/bootstrap.ts
+++ b/ui/src/app/bootstrap.ts
@@ -29,6 +29,7 @@ import type {
 import { syncCustomThemeStyleTag } from "./custom-theme.ts";
 import { createApplicationGateway } from "./gateway-store.ts";
 import { createNativeChatDrafts } from "./native-bridge.ts";
+import { startNativeLinkRouting } from "./native-link-routing.ts";
 import { createApplicationOverlays } from "./overlays.ts";
 import {
   loadSettings,
@@ -273,6 +274,7 @@ export function bootstrapApplication(): ApplicationRuntime {
   const navigation = createApplicationNavigationPreferences(settings);
   const theme = createApplicationTheme(settings);
   const nativeChatDrafts = createNativeChatDrafts();
+  const nativeLinkRouting = startNativeLinkRouting();
   const webPush = createWebPushCapability(gateway);
   const skillWorkshopRevision = createSkillWorkshopRevisionHandoff();
   applyStartupPresentation(settings);
@@ -386,6 +388,7 @@ export function bootstrapApplication(): ApplicationRuntime {
       overlays.dispose();
       theme.dispose();
       nativeChatDrafts.dispose();
+      nativeLinkRouting.dispose();
       webPush.dispose();
       skillWorkshopRevision.clear();
     },
diff --git a/ui/src/app/context.test.ts b/ui/src/app/context.test.ts
new file mode 100644
index 00000000000..e2256ee5c76
--- /dev/null
+++ b/ui/src/app/context.test.ts
@@ -0,0 +1,60 @@
+import { consume, ContextProvider } from "@lit/context";
+import { LitElement } from "lit";
+import { afterEach, describe, expect, it } from "vitest";
+import type { RouteId } from "../app-route-paths.ts";
+import { applicationContext, type ApplicationContext } from "./context.ts";
+
+const PROVIDER_ELEMENT_NAME = "test-application-context-provider";
+const CONSUMER_ELEMENT_NAME = "test-application-context-consumer";
+
+class TestApplicationContextProvider extends LitElement {
+  private readonly contextProvider = new ContextProvider(this, {
+    context: applicationContext,
+  });
+
+  setContext(context: ApplicationContext<RouteId>) {
+    this.contextProvider.setValue(context);
+  }
+}
+
+class TestApplicationContextConsumer extends LitElement {
+  @consume({ context: applicationContext, subscribe: true })
+  context?: ApplicationContext<RouteId>;
+}
+
+if (!customElements.get(PROVIDER_ELEMENT_NAME)) {
+  customElements.define(PROVIDER_ELEMENT_NAME, TestApplicationContextProvider);
+}
+if (!customElements.get(CONSUMER_ELEMENT_NAME)) {
+  customElements.define(CONSUMER_ELEMENT_NAME, TestApplicationContextConsumer);
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+});
+
+describe("application context consumption", () => {
+  it("rebinds a retained consumer after its provider value changes while disconnected", async () => {
+    const initialContext = { basePath: "/initial" } as ApplicationContext<RouteId>;
+    const replacementContext = { basePath: "/replacement" } as ApplicationContext<RouteId>;
+    const provider = document.createElement(
+      PROVIDER_ELEMENT_NAME,
+    ) as TestApplicationContextProvider;
+    const consumer = document.createElement(
+      CONSUMER_ELEMENT_NAME,
+    ) as TestApplicationContextConsumer;
+
+    document.body.append(provider);
+    provider.setContext(initialContext);
+    provider.append(consumer);
+    await consumer.updateComplete;
+    expect(consumer.context).toBe(initialContext);
+
+    consumer.remove();
+    provider.setContext(replacementContext);
+    provider.append(consumer);
+    await consumer.updateComplete;
+
+    expect(consumer.context).toBe(replacementContext);
+  });
+});
diff --git a/ui/src/app/native-link-routing.test.ts b/ui/src/app/native-link-routing.test.ts
new file mode 100644
index 00000000000..bcd0799d3c6
--- /dev/null
+++ b/ui/src/app/native-link-routing.test.ts
@@ -0,0 +1,245 @@
+/* @vitest-environment jsdom */
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../api/gateway.ts";
+import "../components/github-link-hovercard.ts";
+import type { GitHubLinkHovercardProvider } from "../components/github-link-hovercard.ts";
+import "../components/modal-dialog.ts";
+import { startNativeLinkRouting, type NativeLinkRouting } from "./native-link-routing.ts";
+
+type NativeMessage = { type: string; url: string; target: string };
+
+let routing: NativeLinkRouting | undefined;
+
+afterEach(() => {
+  routing?.dispose();
+  routing = undefined;
+  document.body.replaceChildren();
+  vi.unstubAllGlobals();
+});
+
+function installBridge() {
+  const messages: NativeMessage[] = [];
+  const postMessage = vi.fn((message: NativeMessage) => messages.push(message));
+  vi.stubGlobal("webkit", { messageHandlers: { openclawLink: { postMessage } } });
+  return { messages, postMessage };
+}
+
+function appendLink(href: string, attributes: Record<string, string> = {}) {
+  const anchor = document.createElement("a");
+  anchor.href = href;
+  anchor.textContent = href;
+  for (const [name, value] of Object.entries(attributes)) {
+    anchor.setAttribute(name, value);
+  }
+  document.body.append(anchor);
+  return anchor;
+}
+
+function click(anchor: HTMLAnchorElement, init: MouseEventInit = {}) {
+  const event = new MouseEvent("click", {
+    bubbles: true,
+    cancelable: true,
+    composed: true,
+    button: 0,
+    ...init,
+  });
+  anchor.dispatchEvent(event);
+  return event;
+}
+
+function contextMenu(anchor: HTMLAnchorElement) {
+  const event = new MouseEvent("contextmenu", {
+    bubbles: true,
+    cancelable: true,
+    composed: true,
+    button: 2,
+    clientX: 120,
+    clientY: 140,
+  });
+  anchor.dispatchEvent(event);
+  return event;
+}
+
+function menuItem(label: string): HTMLButtonElement {
+  const item = [...document.querySelectorAll<HTMLButtonElement>('[role="menuitem"]')].find(
+    (candidate) => candidate.textContent?.trim() === label,
+  );
+  if (!item) {
+    throw new Error(`Expected menu item: ${label}`);
+  }
+  return item;
+}
+
+describe("native link routing", () => {
+  it("does not install native behavior without the WebKit bridge", () => {
+    routing = startNativeLinkRouting();
+    const anchor = appendLink("https://example.com/report");
+
+    const event = contextMenu(anchor);
+
+    expect(event.defaultPrevented).toBe(false);
+    expect(document.querySelector("openclaw-native-link-menu")).toBeNull();
+  });
+
+  it("routes an unmodified external click inline and preserves page-level cleanup", () => {
+    const bridge = installBridge();
+    routing = startNativeLinkRouting();
+    const anchor = appendLink("https://example.com/report");
+    const bubbleHandler = vi.fn();
+    anchor.addEventListener("click", bubbleHandler);
+
+    const event = click(anchor);
+
+    expect(event.defaultPrevented).toBe(true);
+    expect(bubbleHandler).toHaveBeenCalledOnce();
+    expect(bridge.messages).toEqual([
+      { type: "open-link", url: "https://example.com/report", target: "inline" },
+    ]);
+  });
+
+  it("closes an active GitHub hovercard after routing its link", async () => {
+    const bridge = installBridge();
+    routing = startNativeLinkRouting();
+    const provider = document.createElement(
+      "openclaw-github-link-hovercard-provider",
+    ) as GitHubLinkHovercardProvider;
+    provider.client = {
+      request: vi.fn().mockResolvedValue({
+        comments: 1,
+        createdAt: "2026-07-09T10:00:00Z",
+        kind: "issue",
+        login: "octocat",
+        number: 102691,
+        owner: "openclaw",
+        repo: "openclaw",
+        state: "open",
+        title: "Open links in a sidebar browser",
+        updatedAt: "2026-07-09T10:00:00Z",
+      }),
+    } as unknown as GatewayBrowserClient;
+    const anchor = document.createElement("a");
+    anchor.href = "https://github.com/openclaw/openclaw/issues/102691";
+    anchor.textContent = "#102691";
+    provider.append(anchor);
+    document.body.append(provider);
+    anchor.dispatchEvent(new FocusEvent("focusin", { bubbles: true, composed: true }));
+    await vi.waitFor(() => expect(document.querySelector(".github-link-hovercard")).not.toBeNull());
+
+    click(anchor);
+
+    expect(document.querySelector(".github-link-hovercard")).toBeNull();
+    expect(anchor.hasAttribute("aria-describedby")).toBe(false);
+    expect(bridge.messages).toEqual([
+      {
+        type: "open-link",
+        url: "https://github.com/openclaw/openclaw/issues/102691",
+        target: "inline",
+      },
+    ]);
+  });
+
+  it("preserves modifiers, local/file/download links, and non-web schemes", () => {
+    const bridge = installBridge();
+    routing = startNativeLinkRouting();
+    const links = [
+      appendLink(`${location.origin}/usage`),
+      appendLink("https://example.com/file", { "data-file-path": "README.md" }),
+      appendLink("https://example.com/archive.zip", { download: "archive.zip" }),
+      appendLink("mailto:hello@example.com"),
+    ];
+    for (const anchor of links) {
+      anchor.addEventListener("click", (event) => event.preventDefault());
+      click(anchor);
+    }
+    const modified = appendLink("https://example.com/modified");
+    const bubbleHandler = vi.fn((event: Event) => event.preventDefault());
+    modified.addEventListener("click", bubbleHandler);
+    click(modified, { metaKey: true });
+
+    expect(bubbleHandler).toHaveBeenCalledOnce();
+    expect(bridge.messages).toEqual([]);
+  });
+
+  it("offers inline, external, and copy actions for an external link", async () => {
+    const bridge = installBridge();
+    const writeText = vi.fn().mockResolvedValue(undefined);
+    vi.stubGlobal("navigator", { clipboard: { writeText } } as unknown as Navigator);
+    routing = startNativeLinkRouting();
+    const anchor = appendLink("https://example.com/report?q=1");
+
+    expect(contextMenu(anchor).defaultPrevented).toBe(true);
+    const firstMenu = document.querySelector("openclaw-native-link-menu");
+    await (firstMenu as HTMLElement & { updateComplete: Promise<boolean> }).updateComplete;
+    expect(
+      [...firstMenu!.querySelectorAll('[role="menuitem"]')].map((item) => item.textContent?.trim()),
+    ).toEqual(["Open in Sidebar", "Open in Default Browser", "Copy Link"]);
+    menuItem("Open in Default Browser").click();
+    expect(bridge.messages.at(-1)).toEqual({
+      type: "open-link",
+      url: "https://example.com/report?q=1",
+      target: "external",
+    });
+
+    contextMenu(anchor);
+    const secondMenu = document.querySelector("openclaw-native-link-menu");
+    await (secondMenu as HTMLElement & { updateComplete: Promise<boolean> }).updateComplete;
+    menuItem("Copy Link").click();
+    await vi.waitFor(() =>
+      expect(writeText).toHaveBeenCalledWith("https://example.com/report?q=1"),
+    );
+  });
+
+  it("mounts a fallback menu inside an active dialog", async () => {
+    installBridge();
+    routing = startNativeLinkRouting();
+    const dialog = document.createElement("dialog");
+    dialog.setAttribute("open", "");
+    const anchor = document.createElement("a");
+    anchor.href = "https://example.com/dialog-link";
+    dialog.append(anchor);
+    document.body.append(dialog);
+
+    contextMenu(anchor);
+
+    const menu = dialog.querySelector("openclaw-native-link-menu");
+    expect(menu).not.toBeNull();
+    await (menu as HTMLElement & { updateComplete: Promise<boolean> }).updateComplete;
+    expect(menuItem("Open in Sidebar")).not.toBeNull();
+  });
+
+  it("keeps modal menus in the styled light-DOM slot", async () => {
+    installBridge();
+    routing = startNativeLinkRouting();
+    const modal = document.createElement("openclaw-modal-dialog");
+    const anchor = document.createElement("a");
+    anchor.href = "https://example.com/modal-link";
+    modal.append(anchor);
+    document.body.append(modal);
+    await (modal as HTMLElement & { updateComplete: Promise<boolean> }).updateComplete;
+
+    contextMenu(anchor);
+
+    const menu = modal.querySelector("openclaw-native-link-menu");
+    expect(menu).not.toBeNull();
+    expect(menu?.getRootNode()).toBe(document);
+    await (menu as HTMLElement & { updateComplete: Promise<boolean> }).updateComplete;
+    expect(menuItem("Open in Sidebar")).not.toBeNull();
+  });
+
+  it("removes listeners and an open menu on dispose", async () => {
+    const bridge = installBridge();
+    routing = startNativeLinkRouting();
+    const anchor = appendLink("https://example.com/report");
+    contextMenu(anchor);
+    expect(document.querySelector("openclaw-native-link-menu")).not.toBeNull();
+
+    routing.dispose();
+    routing = undefined;
+    anchor.addEventListener("click", (event) => event.preventDefault());
+    click(anchor);
+
+    expect(document.querySelector("openclaw-native-link-menu")).toBeNull();
+    expect(bridge.messages).toEqual([]);
+  });
+});
diff --git a/ui/src/app/native-link-routing.ts b/ui/src/app/native-link-routing.ts
new file mode 100644
index 00000000000..47dacc84a69
--- /dev/null
+++ b/ui/src/app/native-link-routing.ts
@@ -0,0 +1,176 @@
+import { NativeLinkMenu, type NativeLinkMenuAction } from "../components/native-link-menu.ts";
+import { copyToClipboard } from "../lib/clipboard.ts";
+
+type NativeLinkTarget = "inline" | "external";
+
+type NativeLinkMessage = {
+  type: "open-link";
+  url: string;
+  target: NativeLinkTarget;
+};
+
+type WebKitMessageHandler = {
+  postMessage(message: NativeLinkMessage): void;
+};
+
+export type NativeLinkRouting = {
+  dispose(): void;
+};
+
+function getNativeLinkPoster(): WebKitMessageHandler["postMessage"] | undefined {
+  // Native hosts install this handler before navigation; its absence preserves browser behavior.
+  const handler = (
+    window as unknown as {
+      webkit?: { messageHandlers?: { openclawLink?: WebKitMessageHandler } };
+    }
+  ).webkit?.messageHandlers?.openclawLink;
+  return handler?.postMessage.bind(handler);
+}
+
+function anchorFromEvent(event: Event): HTMLAnchorElement | null {
+  for (const target of event.composedPath()) {
+    if (target instanceof HTMLAnchorElement) {
+      return target;
+    }
+  }
+  return event.target instanceof Element ? event.target.closest("a") : null;
+}
+
+function externalHttpUrl(event: Event): { anchor: HTMLAnchorElement; url: URL } | null {
+  const anchor = anchorFromEvent(event);
+  if (!anchor || anchor.hasAttribute("download") || anchor.hasAttribute("data-file-path")) {
+    return null;
+  }
+  let url: URL;
+  try {
+    url = new URL(anchor.href, window.location.href);
+  } catch {
+    return null;
+  }
+  if ((url.protocol !== "http:" && url.protocol !== "https:") || url.origin === location.origin) {
+    return null;
+  }
+  return { anchor, url };
+}
+
+function menuContainer(event: Event): HTMLElement {
+  const path = event.composedPath();
+  const modalHost = path.find(
+    (target) => target instanceof HTMLElement && target.localName === "openclaw-modal-dialog",
+  );
+  if (modalHost instanceof HTMLElement) {
+    // Keep the menu in the modal's light-DOM slot so global menu styles still apply.
+    return modalHost;
+  }
+  for (const target of path) {
+    if (target instanceof HTMLDialogElement && target.open && target.getRootNode() === document) {
+      return target;
+    }
+  }
+  return document.body;
+}
+
+function postNativeLink(
+  postMessage: WebKitMessageHandler["postMessage"],
+  url: URL,
+  target: NativeLinkTarget,
+): boolean {
+  try {
+    postMessage({ type: "open-link", url: url.href, target });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function startNativeLinkRouting(): NativeLinkRouting {
+  if (typeof window === "undefined" || typeof document === "undefined") {
+    return { dispose() {} };
+  }
+  const postMessage = getNativeLinkPoster();
+  if (!postMessage) {
+    return { dispose() {} };
+  }
+
+  let menu: NativeLinkMenu | null = null;
+  const closeMenu = () => {
+    menu?.remove();
+    menu = null;
+  };
+  const showMenu = (
+    anchor: HTMLAnchorElement,
+    url: URL,
+    x: number,
+    y: number,
+    container: HTMLElement,
+  ) => {
+    closeMenu();
+    const nextMenu = document.createElement("openclaw-native-link-menu") as NativeLinkMenu;
+    nextMenu.x = x;
+    nextMenu.y = y;
+    nextMenu.trigger = anchor;
+    nextMenu.onClose = closeMenu;
+    nextMenu.onAction = (action: NativeLinkMenuAction) => {
+      if (action === "copy") {
+        void copyToClipboard(url.href);
+        return;
+      }
+      postNativeLink(postMessage, url, action);
+    };
+    menu = nextMenu;
+    nextMenu.setAttribute("popover", "manual");
+    container.append(nextMenu);
+    if (typeof nextMenu.showPopover === "function") {
+      try {
+        nextMenu.showPopover();
+        return;
+      } catch {
+        // Fall through to an in-dialog element when the top-layer API is unavailable.
+      }
+    }
+    nextMenu.removeAttribute("popover");
+  };
+
+  const handleClick = (event: MouseEvent) => {
+    if (
+      event.defaultPrevented ||
+      event.button !== 0 ||
+      event.metaKey ||
+      event.ctrlKey ||
+      event.shiftKey ||
+      event.altKey
+    ) {
+      return;
+    }
+    const link = externalHttpUrl(event);
+    if (!link || !postNativeLink(postMessage, link.url, "inline")) {
+      return;
+    }
+    closeMenu();
+    event.preventDefault();
+  };
+  const handleContextMenu = (event: MouseEvent) => {
+    if (event.defaultPrevented) {
+      return;
+    }
+    const link = externalHttpUrl(event);
+    if (!link) {
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    showMenu(link.anchor, link.url, event.clientX, event.clientY, menuContainer(event));
+  };
+
+  document.addEventListener("click", handleClick, true);
+  // Capture keeps message-level context menus from replacing native link actions.
+  document.addEventListener("contextmenu", handleContextMenu, true);
+
+  return {
+    dispose() {
+      document.removeEventListener("click", handleClick, true);
+      document.removeEventListener("contextmenu", handleContextMenu, true);
+      closeMenu();
+    },
+  };
+}
diff --git a/ui/src/app/overlays.test.ts b/ui/src/app/overlays.test.ts
index b5ba79f81fc..1d440a4f2d5 100644
--- a/ui/src/app/overlays.test.ts
+++ b/ui/src/app/overlays.test.ts
@@ -5,6 +5,7 @@ import type { ApplicationGateway, ApplicationGatewaySnapshot } from "./gateway.t
 import { createApplicationOverlays } from "./overlays.ts";
 
 type RequestFn = (method: string, params?: unknown) => Promise<unknown>;
+const VERIFICATION_POLL_MS = 250;
 
 function deferred<T = unknown>() {
   let resolve!: (value: T | PromiseLike<T>) => void;
@@ -25,11 +26,14 @@ function approval(id: string, createdAtMs: number) {
   };
 }
 
-function createGatewayHarness(initialClient: GatewayBrowserClient) {
+function createGatewayHarness(
+  initialClient: GatewayBrowserClient | null,
+  initialConnected = initialClient !== null,
+) {
   let snapshot: ApplicationGatewaySnapshot = {
     assistantAgentId: "main",
     client: initialClient,
-    connected: true,
+    connected: initialConnected,
     reconnecting: false,
     hello: null,
     lastError: null,
@@ -85,7 +89,59 @@ function client(request: RequestFn): GatewayBrowserClient {
   return { request } as unknown as GatewayBrowserClient;
 }
 
+async function flushMicrotasks() {
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
 describe("application approval overlays", () => {
+  it("reloads pending approvals for each connected epoch", async () => {
+    const firstList = deferred();
+    const reconnectedList = deferred();
+    let execListRequests = 0;
+    const request = vi.fn<RequestFn>((method) => {
+      if (method !== "exec.approval.list") {
+        return Promise.resolve([]);
+      }
+      execListRequests += 1;
+      return execListRequests === 1 ? firstList.promise : reconnectedList.promise;
+    });
+    const gatewayClient = client(request);
+    const harness = createGatewayHarness(null, false);
+    const overlays = createApplicationOverlays(harness.gateway);
+
+    harness.update({ client: gatewayClient, connected: false });
+    await flushMicrotasks();
+    expect(request).not.toHaveBeenCalled();
+
+    harness.update({ connected: true });
+    await flushMicrotasks();
+    expect(execListRequests).toBe(1);
+    expect(request).toHaveBeenCalledWith("exec.approval.list", {});
+    expect(request).toHaveBeenCalledWith("plugin.approval.list", {});
+
+    harness.update({ connected: false });
+    expect(overlays.snapshot.approvalQueue).toEqual([]);
+    harness.update({ connected: true });
+    await flushMicrotasks();
+    expect(execListRequests).toBe(2);
+
+    reconnectedList.resolve([approval("approval-reconnected", 2_000)]);
+    await vi.waitFor(() => {
+      expect(overlays.snapshot.approvalQueue.map((entry) => entry.id)).toEqual([
+        "approval-reconnected",
+      ]);
+    });
+
+    firstList.resolve([approval("approval-stale", 1_000)]);
+    await flushMicrotasks();
+    expect(overlays.snapshot.approvalQueue.map((entry) => entry.id)).toEqual([
+      "approval-reconnected",
+    ]);
+    overlays.dispose();
+  });
+
   it("does not attach an older resolve failure to a newer approval", async () => {
     const resolveAttempt = deferred();
     const request = vi.fn<RequestFn>((method) =>
@@ -142,6 +198,47 @@ describe("application approval overlays", () => {
     expect(overlays.snapshot.approvalQueue).toEqual([]);
     overlays.dispose();
   });
+
+  it("does not dismiss a new approval when an old same-client decision settles", async () => {
+    const oldResolve = deferred();
+    const request = vi.fn<RequestFn>((method) =>
+      method.endsWith(".list") ? Promise.resolve([]) : oldResolve.promise,
+    );
+    const gatewayClient = client(request);
+    const harness = createGatewayHarness(gatewayClient);
+    const overlays = createApplicationOverlays(harness.gateway);
+
+    harness.emitApproval("approval-old", 1_000);
+    const oldDecision = overlays.decideApproval("allow-once");
+    harness.update({ connected: false });
+    harness.update({ connected: true });
+    await flushMicrotasks();
+    harness.emitApproval("approval-new", 2_000);
+
+    oldResolve.resolve({ ok: true });
+    await oldDecision;
+
+    expect(overlays.snapshot.approvalQueue.map((entry) => entry.id)).toEqual(["approval-new"]);
+    expect(overlays.snapshot.approvalBusy).toBe(false);
+    overlays.dispose();
+  });
+
+  it("ignores a decision that settles after disposal", async () => {
+    const resolveAttempt = deferred();
+    const request = vi.fn<RequestFn>((method) =>
+      method.endsWith(".list") ? Promise.resolve([]) : resolveAttempt.promise,
+    );
+    const harness = createGatewayHarness(client(request));
+    const overlays = createApplicationOverlays(harness.gateway);
+
+    harness.emitApproval("approval-active", 1_000);
+    const decision = overlays.decideApproval("allow-once");
+    overlays.dispose();
+    resolveAttempt.reject(new Error("disposed"));
+    await decision;
+
+    expect(overlays.snapshot.approvalError).toBeNull();
+  });
 });
 
 describe("application update overlays", () => {
@@ -164,4 +261,62 @@ describe("application update overlays", () => {
     expect(overlays.snapshot.updateRunning).toBe(false);
     overlays.dispose();
   });
+
+  it("verifies on reconnect and survives updates within the connected epoch", async () => {
+    vi.useFakeTimers();
+    let statusRequests = 0;
+    const request = vi.fn<RequestFn>((method) => {
+      if (method.endsWith(".list")) {
+        return Promise.resolve([]);
+      }
+      if (method === "update.run") {
+        return Promise.resolve({
+          ok: true,
+          result: { status: "ok", after: { version: "2.0.0" } },
+        });
+      }
+      if (method === "update.status") {
+        statusRequests += 1;
+        return Promise.resolve(
+          statusRequests === 1
+            ? {
+                sentinel: {
+                  kind: "update",
+                  status: "skipped",
+                  stats: { reason: "restart-health-pending" },
+                },
+              }
+            : {
+                sentinel: {
+                  kind: "update",
+                  status: "ok",
+                  stats: { after: { version: "2.0.0" } },
+                },
+              },
+        );
+      }
+      return Promise.resolve({});
+    });
+    const gatewayClient = client(request);
+    const harness = createGatewayHarness(gatewayClient);
+    const overlays = createApplicationOverlays(harness.gateway);
+
+    try {
+      await overlays.runUpdate();
+      harness.update({ connected: false });
+      harness.update({ connected: true });
+      await flushMicrotasks();
+      expect(statusRequests).toBe(1);
+
+      harness.update({ sessionKey: "agent:main:next" });
+      await vi.advanceTimersByTimeAsync(VERIFICATION_POLL_MS);
+      await flushMicrotasks();
+
+      expect(statusRequests).toBe(2);
+      expect(overlays.snapshot.updateStatusBanner).toBeNull();
+    } finally {
+      overlays.dispose();
+      vi.useRealTimers();
+    }
+  });
 });
diff --git a/ui/src/app/overlays.ts b/ui/src/app/overlays.ts
index 2e264b36384..9cfe7d56b9d 100644
--- a/ui/src/app/overlays.ts
+++ b/ui/src/app/overlays.ts
@@ -194,6 +194,11 @@ type UpdateRunResponse = {
   restart?: { coalesced?: boolean } | null;
 };
 
+type UpdateVerificationWait = {
+  timer: ReturnType<typeof globalThis.setTimeout>;
+  resolve: (active: boolean) => void;
+};
+
 export function createApplicationOverlays(gateway: ApplicationGateway): ApplicationOverlays {
   let snapshot: ApplicationOverlaySnapshot = {
     updateAvailable: null,
@@ -211,13 +216,21 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
   const listeners = new Set<(next: ApplicationOverlaySnapshot) => void>();
   let disposed = false;
   let activeClient = gateway.snapshot.client;
+  // A Gateway client survives transport retries; the disconnected boundary
+  // still starts a new source epoch whose pending server state must be replayed.
+  let connectedSource: NonNullable<typeof activeClient> | null = null;
+  let connectedEpoch = 0;
   let pendingUpdateExpectedVersion: string | null = null;
   let pendingUpdateHandoff = false;
   let updateRunGeneration = 0;
   let updateVerificationGeneration = 0;
-  let updateVerificationTimer: ReturnType<typeof globalThis.setTimeout> | null = null;
+  let updateVerificationWait: UpdateVerificationWait | null = null;
   let devicePairPendingCountGeneration = 0;
-  let approvalDecision: { client: NonNullable<typeof activeClient>; id: string } | null = null;
+  let approvalDecision: {
+    client: NonNullable<typeof activeClient>;
+    epoch: number;
+    id: string;
+  } | null = null;
   const devicePairSetupState: DevicePairSetupState & { pendingCount: number } = {
     client: gateway.snapshot.client,
     connected: gateway.snapshot.connected,
@@ -291,9 +304,13 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
     publish();
   };
 
-  const refreshApprovals = async (client: NonNullable<typeof activeClient>) => {
+  const refreshApprovals = async (
+    client: NonNullable<typeof activeClient>,
+    epoch = connectedEpoch,
+  ) => {
     const applied = await refreshPendingApprovalQueue(promptState, {
-      isCurrentClient: (requestClient) => requestClient === client && isCurrentClient(client),
+      isCurrentClient: (requestClient) =>
+        requestClient === client && epoch === connectedEpoch && isCurrentClient(client),
     });
     if (applied && !disposed) {
       publish();
@@ -305,26 +322,40 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
     publish();
   };
 
+  const settleUpdateVerificationWait = (active: boolean) => {
+    const wait = updateVerificationWait;
+    if (!wait) {
+      return;
+    }
+    updateVerificationWait = null;
+    globalThis.clearTimeout(wait.timer);
+    wait.resolve(active);
+  };
+
   const cancelUpdateVerification = () => {
     updateVerificationGeneration += 1;
-    if (updateVerificationTimer !== null) {
-      globalThis.clearTimeout(updateVerificationTimer);
-      updateVerificationTimer = null;
-    }
+    settleUpdateVerificationWait(false);
   };
 
   const waitForUpdateVerification = (delayMs: number, generation: number) =>
     new Promise<boolean>((resolve) => {
+      // Verification loops are serialized, but settling a prior wait keeps a
+      // future refactor from stranding its continuation behind a replaced timer.
+      settleUpdateVerificationWait(false);
       const timer = globalThis.setTimeout(() => {
-        if (updateVerificationTimer === timer) {
-          updateVerificationTimer = null;
+        if (updateVerificationWait?.timer !== timer) {
+          return;
         }
+        updateVerificationWait = null;
         resolve(generation === updateVerificationGeneration && !disposed);
       }, delayMs);
-      updateVerificationTimer = timer;
+      updateVerificationWait = { timer, resolve };
     });
 
-  const verifyPendingUpdateVersion = async (client: NonNullable<typeof activeClient>) => {
+  const verifyPendingUpdateVersion = async (
+    client: NonNullable<typeof activeClient>,
+    epoch: number,
+  ) => {
     const generation = updateVerificationGeneration;
     const expectedVersion = pendingUpdateExpectedVersion?.trim() || null;
     const pendingHandoff = pendingUpdateHandoff;
@@ -333,6 +364,7 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
     }
     const isCurrentVerification = () =>
       generation === updateVerificationGeneration &&
+      epoch === connectedEpoch &&
       !disposed &&
       activeClient === client &&
       gateway.snapshot.client === client &&
@@ -405,14 +437,20 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
     );
   };
 
-  const stopGateway = gateway.subscribe((next) => {
-    updateRunGeneration += 1;
-    cancelUpdateVerification();
+  const synchronizeGateway = (next: ApplicationGateway["snapshot"]) => {
     const previousClient = activeClient;
+    const previousConnectedSource = connectedSource;
+    const nextConnectedSource = next.connected ? next.client : null;
+    const connectedSourceChanged = previousConnectedSource !== nextConnectedSource;
     activeClient = next.client;
+    connectedSource = nextConnectedSource;
     promptState.client = next.client;
     devicePairSetupState.client = next.client;
     devicePairSetupState.connected = next.connected;
+    if (connectedSourceChanged) {
+      updateRunGeneration += 1;
+      cancelUpdateVerification();
+    }
     if (previousClient !== next.client || !next.connected) {
       approvalDecision = null;
       devicePairPendingCountGeneration += 1;
@@ -432,15 +470,15 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
       return;
     }
     snapshot = { ...snapshot, updateAvailable: readUpdateAvailable(next.hello) };
-    if (previousClient !== next.client) {
-      void refreshApprovals(next.client);
-      if (next.client) {
-        void verifyPendingUpdateVersion(next.client);
-      }
-    } else {
-      publish();
+    publish();
+    if (connectedSourceChanged) {
+      connectedEpoch += 1;
+      const epoch = connectedEpoch;
+      void refreshApprovals(next.client, epoch);
+      void verifyPendingUpdateVersion(next.client, epoch);
     }
-  });
+  };
+  const stopGateway = gateway.subscribe(synchronizeGateway);
 
   const stopEvents = gateway.subscribeEvents((event) => {
     if (disposed || !isGatewayEvent(event)) {
@@ -480,6 +518,7 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
       }
     }
   });
+  synchronizeGateway(gateway.snapshot);
 
   return {
     get snapshot() {
@@ -584,30 +623,35 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
       }
       promptState.execApprovalBusy = true;
       promptState.execApprovalError = null;
-      const operation = { client, id: active.id };
+      const operation = { client, epoch: connectedEpoch, id: active.id };
       approvalDecision = operation;
+      const isCurrentOperation = () =>
+        approvalDecision === operation &&
+        operation.epoch === connectedEpoch &&
+        isCurrentClient(operation.client);
       publish();
       try {
         const method =
           active.kind === "plugin" ? "plugin.approval.resolve" : "exec.approval.resolve";
         await client.request(method, { id: active.id, decision });
-        if (!isCurrentClient(client)) {
+        if (!isCurrentOperation()) {
           return;
         }
         dismissExecApprovalPrompt(promptState, active.id);
       } catch (error) {
         if (isStaleApprovalResolutionError(error)) {
-          if (!isCurrentClient(client)) {
+          if (!isCurrentOperation()) {
             return;
           }
           dismissExecApprovalPrompt(promptState, active.id);
           const currentClient = activeClient;
-          if (currentClient && isCurrentClient(currentClient)) {
-            await refreshApprovals(currentClient);
+          const epoch = connectedEpoch;
+          if (currentClient && isCurrentOperation()) {
+            await refreshApprovals(currentClient, epoch);
           }
           return;
         }
-        if (isCurrentClient(client) && promptState.execApprovalQueue[0]?.id === active.id) {
+        if (isCurrentOperation() && promptState.execApprovalQueue[0]?.id === active.id) {
           promptState.execApprovalError = `Approval failed: ${error instanceof Error ? error.message : String(error)}`;
         }
       } finally {
@@ -653,6 +697,7 @@ export function createApplicationOverlays(gateway: ApplicationGateway): Applicat
     },
     dispose() {
       disposed = true;
+      approvalDecision = null;
       updateRunGeneration += 1;
       devicePairPendingCountGeneration += 1;
       cancelUpdateVerification();
diff --git a/ui/src/app/router-outlet-controller.test.ts b/ui/src/app/router-outlet-controller.test.ts
new file mode 100644
index 00000000000..3d0d1b668b6
--- /dev/null
+++ b/ui/src/app/router-outlet-controller.test.ts
@@ -0,0 +1,239 @@
+import { createRouter, definePage, type RouteLocation } from "@openclaw/uirouter";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { RouterOutletController, selectRenderedRouteMatch } from "./router-outlet-controller.ts";
+
+type RouteId = "first" | "second";
+type TestContext = { label: string };
+type TestModule = { render: (data: TestData | undefined) => unknown };
+type TestData = { label: string };
+
+type Deferred<T> = {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+};
+
+function deferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((promiseResolve) => {
+    resolve = promiseResolve;
+  });
+  return { promise, resolve };
+}
+
+function location(pathname: string): RouteLocation {
+  return { pathname, search: "", hash: "" };
+}
+
+function module(label: string): TestModule {
+  return { render: () => label };
+}
+
+async function flushPromises(): Promise<void> {
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe("RouterOutletController pending presentation", () => {
+  it("delays a cold-start fallback until the route has been pending for one second", async () => {
+    vi.useFakeTimers();
+    const routeModule = deferred<TestModule>();
+    const routeData = deferred<TestData>();
+    const router = createRouter<RouteId, TestContext, TestModule, TestData>({
+      routes: [
+        definePage({
+          id: "first",
+          path: "/first",
+          component: () => routeModule.promise,
+          loader: () => routeData.promise,
+        }),
+      ],
+    });
+    const controller = new RouterOutletController<RouteId, TestContext, TestModule, TestData>(
+      vi.fn(),
+    );
+    controller.setInputs({ router });
+    controller.connect();
+
+    const navigation = router.navigate("first", { label: "test" });
+    expect(controller.snapshot.pending?.routeId).toBe("first");
+    expect(controller.snapshot.showPending).toBe(false);
+
+    await vi.advanceTimersByTimeAsync(999);
+    expect(controller.snapshot.showPending).toBe(false);
+    await vi.advanceTimersByTimeAsync(1);
+    expect(controller.snapshot.showPending).toBe(true);
+
+    routeModule.resolve(module("first"));
+    routeData.resolve({ label: "loaded" });
+    await navigation;
+    expect(controller.snapshot.showPending).toBe(false);
+    controller.disconnect();
+    router.stop();
+  });
+
+  it("keeps active content while the next route module is cold", async () => {
+    vi.useFakeTimers();
+    const secondModule = deferred<TestModule>();
+    const secondData = deferred<TestData>();
+    const router = createRouter<RouteId, TestContext, TestModule, TestData>({
+      routes: [
+        definePage({
+          id: "first",
+          path: "/first",
+          component: () => module("first"),
+          loader: () => ({ label: "first" }),
+        }),
+        definePage({
+          id: "second",
+          path: "/second",
+          component: () => secondModule.promise,
+          loader: () => secondData.promise,
+        }),
+      ],
+    });
+    const controller = new RouterOutletController<RouteId, TestContext, TestModule, TestData>(
+      vi.fn(),
+    );
+    controller.setInputs({ router });
+    controller.connect();
+    await router.navigate("first", { label: "test" });
+
+    const navigation = router.navigate("second", { label: "test" });
+    expect(
+      selectRenderedRouteMatch(controller.snapshot.active, controller.snapshot.pending)?.routeId,
+    ).toBe("first");
+    await vi.advanceTimersByTimeAsync(2_000);
+    expect(controller.snapshot.showPending).toBe(false);
+
+    secondModule.resolve(module("second"));
+    await flushPromises();
+    expect(
+      selectRenderedRouteMatch(controller.snapshot.active, controller.snapshot.pending)?.routeId,
+    ).toBe("second");
+    expect(controller.snapshot.active?.data).toBeUndefined();
+
+    secondData.resolve({ label: "second" });
+    await navigation;
+    controller.disconnect();
+    router.stop();
+  });
+
+  it("restarts a canceled pending delay after reconnect", async () => {
+    vi.useFakeTimers();
+    const routeModule = deferred<TestModule>();
+    const routeData = deferred<TestData>();
+    const router = createRouter<RouteId, TestContext, TestModule, TestData>({
+      routes: [
+        definePage({
+          id: "first",
+          path: "/first",
+          component: () => routeModule.promise,
+          loader: () => routeData.promise,
+        }),
+      ],
+    });
+    const controller = new RouterOutletController<RouteId, TestContext, TestModule, TestData>(
+      vi.fn(),
+    );
+    controller.setInputs({ router });
+    controller.connect();
+    const navigation = router.navigate("first", { label: "test" });
+
+    await vi.advanceTimersByTimeAsync(500);
+    controller.disconnect();
+    await vi.advanceTimersByTimeAsync(1_000);
+    expect(controller.snapshot.showPending).toBe(false);
+
+    controller.connect();
+    await vi.advanceTimersByTimeAsync(999);
+    expect(controller.snapshot.showPending).toBe(false);
+    await vi.advanceTimersByTimeAsync(1);
+    expect(controller.snapshot.showPending).toBe(true);
+
+    routeModule.resolve(module("first"));
+    routeData.resolve({ label: "loaded" });
+    await navigation;
+    controller.disconnect();
+    router.stop();
+  });
+});
+
+describe("RouterOutletController not-found boundary", () => {
+  function createTestRouter() {
+    return createRouter<RouteId, TestContext, TestModule, TestData>({
+      routes: [
+        definePage({
+          id: "first",
+          path: "/first",
+          component: () => module("first"),
+          loader: () => ({ label: "first" }),
+        }),
+      ],
+    });
+  }
+
+  it("notifies once for an unmatched location", async () => {
+    const router = createTestRouter();
+    const onNotFound = vi.fn();
+    const controller = new RouterOutletController<RouteId, TestContext, TestModule, TestData>(
+      vi.fn(),
+    );
+    controller.setInputs({ router, onNotFound });
+    controller.connect();
+
+    await router.navigateLocation(location("/missing"), { label: "test" });
+    await flushPromises();
+    expect(onNotFound).toHaveBeenCalledTimes(1);
+
+    controller.setInputs({ router, onNotFound });
+    await flushPromises();
+    expect(onNotFound).toHaveBeenCalledTimes(1);
+    controller.disconnect();
+    router.stop();
+  });
+
+  it("suppresses a queued fallback after the router recovers", async () => {
+    const router = createTestRouter();
+    const onNotFound = vi.fn();
+    const controller = new RouterOutletController<RouteId, TestContext, TestModule, TestData>(
+      vi.fn(),
+    );
+    controller.setInputs({ router, onNotFound });
+    controller.connect();
+
+    const missing = router.navigateLocation(location("/missing"), { label: "test" });
+    const recovery = router.navigate("first", { label: "test" });
+    await Promise.all([missing, recovery]);
+    await flushPromises();
+    expect(onNotFound).not.toHaveBeenCalled();
+    controller.disconnect();
+    router.stop();
+  });
+
+  it("cancels the queued fallback on disconnect and re-evaluates it on reconnect", async () => {
+    const router = createTestRouter();
+    const onNotFound = vi.fn();
+    const controller = new RouterOutletController<RouteId, TestContext, TestModule, TestData>(
+      vi.fn(),
+    );
+    controller.setInputs({ router, onNotFound });
+    controller.connect();
+
+    const missing = router.navigateLocation(location("/missing"), { label: "test" });
+    controller.disconnect();
+    await missing;
+    await flushPromises();
+    expect(onNotFound).not.toHaveBeenCalled();
+
+    controller.connect();
+    await flushPromises();
+    expect(onNotFound).toHaveBeenCalledTimes(1);
+    controller.disconnect();
+    router.stop();
+  });
+});
diff --git a/ui/src/app/router-outlet-controller.ts b/ui/src/app/router-outlet-controller.ts
new file mode 100644
index 00000000000..398cbb7f08b
--- /dev/null
+++ b/ui/src/app/router-outlet-controller.ts
@@ -0,0 +1,273 @@
+import type { RouteMatch, Router, RouterState } from "@openclaw/uirouter";
+
+const DEFAULT_PENDING_DELAY_MS = 1_000;
+
+type RouterOutletStateSlice<
+  TRouteId extends string = string,
+  TModule = unknown,
+  TData = unknown,
+> = {
+  status: RouterState<TRouteId, TModule, TData>["status"];
+  active: RouteMatch<TRouteId, TModule, TData> | undefined;
+  pending: RouteMatch<TRouteId, TModule, TData> | undefined;
+};
+
+export type RouterOutletSnapshot<
+  TRouteId extends string = string,
+  TModule = unknown,
+  TData = unknown,
+> = RouterOutletStateSlice<TRouteId, TModule, TData> & {
+  showPending: boolean;
+};
+
+type RouterOutletInputs<TRouteId extends string, TLoadContext, TModule, TData> = {
+  router?: Router<TRouteId, TLoadContext, TModule, TData>;
+  onNotFound?: () => void;
+};
+
+type RouterOutletControllerOptions = {
+  pendingDelayMs?: number;
+};
+
+export function selectRenderedRouteMatch<TRouteId extends string, TModule, TData>(
+  active: RouteMatch<TRouteId, TModule, TData> | undefined,
+  pending: RouteMatch<TRouteId, TModule, TData> | undefined,
+): RouteMatch<TRouteId, TModule, TData> | undefined {
+  const coldPending =
+    pending?.status === "pending" && pending.module === undefined && pending.error === undefined;
+  return coldPending && active ? active : (pending ?? active);
+}
+
+function selectRouterOutletState<TRouteId extends string, TModule, TData>(
+  state: RouterState<TRouteId, TModule, TData>,
+): RouterOutletStateSlice<TRouteId, TModule, TData> {
+  return {
+    status: state.status,
+    active: state.matches[0],
+    pending: state.pendingMatches[0],
+  };
+}
+
+function equalRouterOutletState(
+  previous: RouterOutletStateSlice,
+  next: RouterOutletStateSlice,
+): boolean {
+  return (
+    previous.status === next.status &&
+    previous.active === next.active &&
+    previous.pending === next.pending
+  );
+}
+
+function idleSnapshot<TRouteId extends string, TModule, TData>(): RouterOutletSnapshot<
+  TRouteId,
+  TModule,
+  TData
+> {
+  return {
+    status: "idle",
+    active: undefined,
+    pending: undefined,
+    showPending: false,
+  };
+}
+
+/**
+ * Owns route-presentation timing and effects without depending on a renderer.
+ * Render adapters provide invalidation and bind the controller to their own
+ * connection lifecycle.
+ */
+export class RouterOutletController<
+  TRouteId extends string = string,
+  TLoadContext = unknown,
+  TModule = unknown,
+  TData = unknown,
+> {
+  private router?: Router<TRouteId, TLoadContext, TModule, TData>;
+  private onNotFound?: () => void;
+  private connected = false;
+  private unsubscribe?: () => void;
+  private selection: RouterOutletStateSlice<TRouteId, TModule, TData> = idleSnapshot();
+  private snapshotValue: RouterOutletSnapshot<TRouteId, TModule, TData> = idleSnapshot();
+  private pendingMatchId?: string;
+  private pendingTimer?: ReturnType<typeof globalThis.setTimeout>;
+  private showPending = false;
+  private notFoundActive = false;
+  private notFoundQueued = false;
+  private notFoundGeneration = 0;
+  private readonly pendingDelayMs: number;
+
+  constructor(
+    private readonly invalidate: () => void,
+    options: RouterOutletControllerOptions = {},
+  ) {
+    this.pendingDelayMs = options.pendingDelayMs ?? DEFAULT_PENDING_DELAY_MS;
+  }
+
+  get snapshot(): RouterOutletSnapshot<TRouteId, TModule, TData> {
+    return this.snapshotValue;
+  }
+
+  setInputs(inputs: RouterOutletInputs<TRouteId, TLoadContext, TModule, TData>): void {
+    this.onNotFound = inputs.onNotFound;
+    if (this.router === inputs.router) {
+      return;
+    }
+
+    this.detachSource();
+    this.router = inputs.router;
+    if (this.connected) {
+      this.attachSource();
+      return;
+    }
+    const selection = inputs.router
+      ? selectRouterOutletState(inputs.router.getState())
+      : idleSnapshot<TRouteId, TModule, TData>();
+    this.selection = selection;
+    this.publish({ ...selection, showPending: false });
+  }
+
+  connect(): void {
+    if (this.connected) {
+      return;
+    }
+    this.connected = true;
+    this.attachSource(false);
+    // A disconnected host may have retained DOM for an older snapshot. Always
+    // reconcile once on reconnect, even when the router state stayed stable.
+    this.invalidate();
+  }
+
+  disconnect(): void {
+    if (!this.connected) {
+      return;
+    }
+    this.connected = false;
+    this.detachSource();
+  }
+
+  private attachSource(notify = true): void {
+    const router = this.router;
+    if (!router || this.unsubscribe) {
+      return;
+    }
+    this.applySelection(selectRouterOutletState(router.getState()), notify);
+    this.unsubscribe = router.subscribeSelector(
+      selectRouterOutletState,
+      (selection) => this.applySelection(selection),
+      equalRouterOutletState,
+    );
+  }
+
+  private detachSource(): void {
+    this.unsubscribe?.();
+    this.unsubscribe = undefined;
+    this.clearPendingTimer();
+    this.pendingMatchId = undefined;
+    this.showPending = false;
+    this.cancelNotFoundEffect();
+  }
+
+  private applySelection(
+    selection: RouterOutletStateSlice<TRouteId, TModule, TData>,
+    notify = true,
+  ): void {
+    this.selection = selection;
+    const pending = selection.pending;
+    const coldPending =
+      pending?.status === "pending" && pending.module === undefined && pending.error === undefined;
+    const needsPendingFallback = coldPending && !selection.active;
+    if (!needsPendingFallback) {
+      this.clearPendingTimer();
+      this.pendingMatchId = undefined;
+      this.showPending = false;
+    } else if (this.pendingMatchId !== pending.id) {
+      this.clearPendingTimer();
+      this.pendingMatchId = pending.id;
+      this.showPending = false;
+      this.schedulePendingFallback(pending.id);
+    } else if (this.connected && !this.showPending && this.pendingTimer === undefined) {
+      this.schedulePendingFallback(pending.id);
+    }
+
+    this.publish({ ...selection, showPending: this.showPending }, notify);
+    this.updateNotFoundEffect(selection.status);
+  }
+
+  private schedulePendingFallback(matchId: string): void {
+    if (!this.connected) {
+      return;
+    }
+    this.pendingTimer = globalThis.setTimeout(() => {
+      this.pendingTimer = undefined;
+      const pending = this.selection.pending;
+      const stillCold =
+        pending?.id === matchId &&
+        pending.status === "pending" &&
+        pending.module === undefined &&
+        pending.error === undefined &&
+        !this.selection.active;
+      if (!this.connected || this.pendingMatchId !== matchId || !stillCold) {
+        return;
+      }
+      this.showPending = true;
+      this.publish({ ...this.selection, showPending: true });
+    }, this.pendingDelayMs);
+  }
+
+  private updateNotFoundEffect(status: RouterOutletStateSlice["status"]): void {
+    if (status !== "notFound") {
+      if (this.notFoundActive || this.notFoundQueued) {
+        this.cancelNotFoundEffect();
+      }
+      return;
+    }
+    if (!this.connected || this.notFoundActive) {
+      return;
+    }
+
+    this.notFoundActive = true;
+    this.notFoundQueued = true;
+    const generation = ++this.notFoundGeneration;
+    queueMicrotask(() => {
+      if (
+        !this.connected ||
+        generation !== this.notFoundGeneration ||
+        this.selection.status !== "notFound"
+      ) {
+        return;
+      }
+      this.notFoundQueued = false;
+      this.onNotFound?.();
+    });
+  }
+
+  private cancelNotFoundEffect(): void {
+    this.notFoundGeneration += 1;
+    this.notFoundActive = false;
+    this.notFoundQueued = false;
+  }
+
+  private publish(snapshot: RouterOutletSnapshot<TRouteId, TModule, TData>, notify = true): void {
+    const previous = this.snapshotValue;
+    if (
+      previous.status === snapshot.status &&
+      previous.active === snapshot.active &&
+      previous.pending === snapshot.pending &&
+      previous.showPending === snapshot.showPending
+    ) {
+      return;
+    }
+    this.snapshotValue = snapshot;
+    if (notify && this.connected) {
+      this.invalidate();
+    }
+  }
+
+  private clearPendingTimer(): void {
+    if (this.pendingTimer !== undefined) {
+      globalThis.clearTimeout(this.pendingTimer);
+      this.pendingTimer = undefined;
+    }
+  }
+}
diff --git a/ui/src/app/router-outlet.test.ts b/ui/src/app/router-outlet.test.ts
new file mode 100644
index 00000000000..dee222ba1a0
--- /dev/null
+++ b/ui/src/app/router-outlet.test.ts
@@ -0,0 +1,120 @@
+import { createRouter, definePage, type Router } from "@openclaw/uirouter";
+import { html, type LitElement } from "lit";
+import { afterEach, describe, expect, it } from "vitest";
+import "./router-outlet.ts";
+
+type RouteId = "page";
+type TestContext = { label: string };
+type TestData = { label: string };
+type TestModule = { render: (data: TestData | undefined) => unknown };
+type TestRouter = Router<RouteId, TestContext, TestModule, TestData>;
+type RouterOutletElement = LitElement & {
+  router?: TestRouter;
+  retryContext?: TestContext;
+  onNotFound?: () => void;
+};
+
+type Deferred<T> = {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+  reject: (error: unknown) => void;
+};
+
+function deferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((promiseResolve, promiseReject) => {
+    resolve = promiseResolve;
+    reject = promiseReject;
+  });
+  return { promise, resolve, reject };
+}
+
+function createOutlet(router: TestRouter, context: TestContext): RouterOutletElement {
+  const outlet = document.createElement("openclaw-router-outlet") as RouterOutletElement;
+  outlet.router = router;
+  outlet.retryContext = context;
+  document.body.append(outlet);
+  return outlet;
+}
+
+async function settleOutlet(outlet: RouterOutletElement): Promise<void> {
+  for (let attempt = 0; attempt < 5; attempt += 1) {
+    await Promise.resolve();
+    await outlet.updateComplete;
+  }
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+});
+
+describe("openclaw-router-outlet", () => {
+  it("renders route data through the public custom-element boundary", async () => {
+    const context = { label: "loaded" };
+    const router = createRouter<RouteId, TestContext, TestModule, TestData>({
+      routes: [
+        definePage({
+          id: "page",
+          path: "/page",
+          component: () => ({
+            render: (data: TestData | undefined) =>
+              html`<div data-testid="route-page">${data?.label}</div>`,
+          }),
+          loader: (loadContext) => ({ label: loadContext.label }),
+        }),
+      ],
+    });
+    const outlet = createOutlet(router, context);
+
+    await router.navigate("page", context);
+    await settleOutlet(outlet);
+
+    expect(outlet.querySelector('[data-testid="route-page"]')?.textContent).toBe("loaded");
+    outlet.remove();
+    router.stop();
+  });
+
+  it("keeps a loaded route visible with an error and retries through the latest context", async () => {
+    const firstLoad = deferred<TestData>();
+    let loadCount = 0;
+    const router = createRouter<RouteId, TestContext, TestModule, TestData>({
+      routes: [
+        definePage({
+          id: "page",
+          path: "/page",
+          component: () => ({
+            render: (data: TestData | undefined) =>
+              html`<div data-testid="route-page">${data?.label ?? "pending"}</div>`,
+          }),
+          loader: (context) => {
+            loadCount += 1;
+            return loadCount === 1 ? firstLoad.promise : { label: context.label };
+          },
+        }),
+      ],
+    });
+    const initialContext = { label: "initial" };
+    const retryContext = { label: "retried" };
+    const outlet = createOutlet(router, initialContext);
+    const navigation = router.navigate("page", initialContext);
+    await settleOutlet(outlet);
+    firstLoad.reject(new Error("load failed"));
+    await expect(navigation).rejects.toThrow("load failed");
+    await settleOutlet(outlet);
+
+    expect(outlet.querySelector('[data-testid="route-page"]')?.textContent).toBe("pending");
+    expect(outlet.querySelector('[role="alert"]')?.textContent).toContain("load failed");
+
+    outlet.retryContext = retryContext;
+    await outlet.updateComplete;
+    outlet.querySelector<HTMLButtonElement>("button")?.click();
+    await settleOutlet(outlet);
+
+    expect(loadCount).toBe(2);
+    expect(outlet.querySelector('[data-testid="route-page"]')?.textContent).toBe("retried");
+    expect(outlet.querySelector('[role="alert"]')).toBeNull();
+    outlet.remove();
+    router.stop();
+  });
+});
diff --git a/ui/src/app/router-outlet.ts b/ui/src/app/router-outlet.ts
index 326cccb92ef..0bbc2153367 100644
--- a/ui/src/app/router-outlet.ts
+++ b/ui/src/app/router-outlet.ts
@@ -1,11 +1,16 @@
-import type { RouteMatch, Router, RouterState } from "@openclaw/uirouter";
-import { html, LitElement, nothing } from "lit";
-import { AsyncDirective } from "lit/async-directive.js";
+import type { Router } from "@openclaw/uirouter";
+import { html, nothing } from "lit";
+import type { ReactiveController, ReactiveControllerHost } from "lit";
 import { property } from "lit/decorators.js";
-import { directive } from "lit/directive.js";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
+import {
+  RouterOutletController,
+  selectRenderedRouteMatch,
+  type RouterOutletSnapshot,
+} from "./router-outlet-controller.ts";
 
-const PENDING_UI_DELAY_MS = 1_000;
+export { selectRenderedRouteMatch } from "./router-outlet-controller.ts";
 
 type RenderableModule<TData> = {
   render: (data: TData | undefined) => unknown;
@@ -15,48 +20,6 @@ type RouterOutletOptions<TLoadContext = unknown> = {
   retryContext?: TLoadContext;
 };
 
-type RouterOutletBoundaryOptions = {
-  onNotFound?: () => void;
-};
-
-type RouterOutletSelection<TRouteId extends string = string, TModule = unknown, TData = unknown> = {
-  status: RouterState<TRouteId, TModule, TData>["status"];
-  active: RouteMatch<TRouteId, TModule, TData> | undefined;
-  pending: RouteMatch<TRouteId, TModule, TData> | undefined;
-  showPending: boolean;
-};
-
-export function selectRenderedRouteMatch<TRouteId extends string, TModule, TData>(
-  active: RouteMatch<TRouteId, TModule, TData> | undefined,
-  pending: RouteMatch<TRouteId, TModule, TData> | undefined,
-): RouteMatch<TRouteId, TModule, TData> | undefined {
-  const coldPending =
-    pending?.status === "pending" && pending.module === undefined && pending.error === undefined;
-  return coldPending && active ? active : (pending ?? active);
-}
-
-function selectRouterOutletState<TRouteId extends string, TModule, TData>(
-  state: RouterState<TRouteId, TModule, TData>,
-): RouterOutletSelection<TRouteId, TModule, TData> {
-  return {
-    status: state.status,
-    active: state.matches[0],
-    pending: state.pendingMatches[0],
-    showPending: false,
-  };
-}
-
-function equalRouterOutletState(
-  previous: RouterOutletSelection,
-  next: RouterOutletSelection,
-): boolean {
-  return (
-    previous.status === next.status &&
-    previous.active === next.active &&
-    previous.pending === next.pending
-  );
-}
-
 function isRenderableModule<TData>(module: unknown): module is RenderableModule<TData> {
   return (
     typeof module === "object" &&
@@ -113,7 +76,7 @@ function renderError<TRouteId extends string, TLoadContext, TModule, TData>(
 
 function renderRouterOutlet<TRouteId extends string, TLoadContext, TModule, TData = unknown>(
   router: Router<TRouteId, TLoadContext, TModule, TData>,
-  selection: RouterOutletSelection<TRouteId, TModule, TData>,
+  selection: RouterOutletSnapshot<TRouteId, TModule, TData>,
   options: RouterOutletOptions<TLoadContext> = {},
 ): unknown {
   const pending = selection.pending;
@@ -165,126 +128,43 @@ function renderRouterOutlet<TRouteId extends string, TLoadContext, TModule, TDat
     : renderedPage();
 }
 
-class RouterOutletDirective extends AsyncDirective {
-  private router?: Router<string, unknown, unknown, unknown>;
-  private retryContext: unknown;
-  private unsubscribe?: () => void;
-  private boundaryOptions?: RouterOutletBoundaryOptions;
-  private notFoundScheduled = false;
-  private pendingMatchId?: string;
-  private pendingTimer?: ReturnType<typeof globalThis.setTimeout>;
-  private pendingSelection?: RouterOutletSelection;
-  private showPending = false;
+type RouterOutletInputs<TRouteId extends string, TLoadContext, TModule, TData> = {
+  router?: Router<TRouteId, TLoadContext, TModule, TData>;
+  onNotFound?: () => void;
+};
 
-  override render(
-    router: unknown,
-    retryContext: unknown,
-    boundaryOptions: RouterOutletBoundaryOptions,
+class LitRouterOutletController<
+  TRouteId extends string,
+  TLoadContext,
+  TModule,
+  TData,
+> implements ReactiveController {
+  private readonly controller: RouterOutletController<TRouteId, TLoadContext, TModule, TData>;
+
+  constructor(
+    host: ReactiveControllerHost,
+    private readonly inputs: () => RouterOutletInputs<TRouteId, TLoadContext, TModule, TData>,
   ) {
-    const nextRouter = router as Router<string, unknown, unknown, unknown>;
-    this.updateSubscription(nextRouter);
-    this.router = nextRouter;
-    this.retryContext = retryContext;
-    this.boundaryOptions = boundaryOptions;
-    return this.renderSelection(selectRouterOutletState(nextRouter.getState()));
+    this.controller = new RouterOutletController(() => host.requestUpdate());
+    host.addController(this);
   }
 
-  override disconnected() {
-    this.unsubscribe?.();
-    this.unsubscribe = undefined;
-    this.clearPendingTimer();
-    this.pendingSelection = undefined;
-    this.boundaryOptions = undefined;
-    this.retryContext = undefined;
-    this.notFoundScheduled = false;
+  get snapshot(): RouterOutletSnapshot<TRouteId, TModule, TData> {
+    return this.controller.snapshot;
   }
 
-  override reconnected() {
-    if (this.router) {
-      this.updateSubscription(this.router);
-    }
+  hostConnected(): void {
+    this.controller.setInputs(this.inputs());
+    this.controller.connect();
   }
 
-  private updateSubscription(router: Router<string, unknown, unknown, unknown>) {
-    if (this.router === router && this.unsubscribe) {
-      return;
-    }
-    this.unsubscribe?.();
-    this.unsubscribe = router.subscribeSelector(
-      selectRouterOutletState,
-      (selection) => {
-        if (this.isConnected) {
-          this.setValue(this.renderSelection(selection));
-        }
-      },
-      equalRouterOutletState,
-    );
+  hostUpdate(): void {
+    this.controller.setInputs(this.inputs());
   }
 
-  private renderSelection(selection: RouterOutletSelection) {
-    this.pendingSelection = selection;
-    const pending = selection.pending;
-    const coldPending =
-      pending?.status === "pending" && pending.module === undefined && pending.error === undefined;
-    const needsPendingFallback = coldPending && !selection.active;
-    if (!needsPendingFallback) {
-      this.clearPendingTimer();
-      this.pendingMatchId = undefined;
-      this.showPending = false;
-    } else if (this.pendingMatchId !== pending.id) {
-      this.clearPendingTimer();
-      this.pendingMatchId = pending.id;
-      this.showPending = false;
-      this.pendingTimer = globalThis.setTimeout(() => {
-        this.pendingTimer = undefined;
-        const pendingSelection = this.pendingSelection;
-        if (!pendingSelection || pendingSelection.pending?.id !== this.pendingMatchId) {
-          return;
-        }
-        this.showPending = true;
-        this.setValue(this.renderSelection(pendingSelection));
-      }, PENDING_UI_DELAY_MS);
-    }
-    if (selection.status === "notFound") {
-      if (!this.notFoundScheduled) {
-        this.notFoundScheduled = true;
-        queueMicrotask(() => {
-          this.notFoundScheduled = false;
-          this.boundaryOptions?.onNotFound?.();
-        });
-      }
-    } else {
-      this.notFoundScheduled = false;
-    }
-    const router = this.router;
-    if (!router) {
-      return nothing;
-    }
-    return renderRouterOutlet(
-      router,
-      { ...selection, showPending: this.showPending },
-      {
-        retryContext: this.retryContext,
-      },
-    );
+  hostDisconnected(): void {
+    this.controller.disconnect();
   }
-
-  private clearPendingTimer() {
-    if (this.pendingTimer !== undefined) {
-      globalThis.clearTimeout(this.pendingTimer);
-      this.pendingTimer = undefined;
-    }
-  }
-}
-
-const routerOutletDirective = directive(RouterOutletDirective);
-
-function routerOutlet<TRouteId extends string, TModule, TData, TContext>(
-  router: Router<TRouteId, TContext, TModule, TData>,
-  boundaryOptions: RouterOutletBoundaryOptions,
-  options: RouterOutletOptions<TContext> = {},
-): unknown {
-  return routerOutletDirective(router, options.retryContext, boundaryOptions);
 }
 
 class OpenClawRouterOutlet<
@@ -292,26 +172,22 @@ class OpenClawRouterOutlet<
   TLoadContext = unknown,
   TModule = unknown,
   TData = unknown,
-> extends LitElement {
+> extends OpenClawLightDomElement {
   @property({ attribute: false }) router?: Router<TRouteId, TLoadContext, TModule, TData>;
   @property({ attribute: false }) retryContext?: TLoadContext;
   @property({ attribute: false }) onNotFound?: () => void;
-
-  override createRenderRoot() {
-    return this;
-  }
+  private readonly outlet = new LitRouterOutletController(this, () => ({
+    router: this.router,
+    onNotFound: this.onNotFound,
+  }));
 
   override render() {
     if (!this.router) {
       return nothing;
     }
-    return routerOutlet(
-      this.router,
-      { onNotFound: this.onNotFound },
-      {
-        retryContext: this.retryContext,
-      },
-    );
+    return renderRouterOutlet(this.router, this.outlet.snapshot, {
+      retryContext: this.retryContext,
+    });
   }
 }
 
diff --git a/ui/src/components/app-sidebar.test.ts b/ui/src/components/app-sidebar.test.ts
new file mode 100644
index 00000000000..2e8bafdb197
--- /dev/null
+++ b/ui/src/components/app-sidebar.test.ts
@@ -0,0 +1,137 @@
+/* @vitest-environment jsdom */
+
+import { ContextProvider } from "@lit/context";
+import { LitElement } from "lit";
+import { afterEach, describe, expect, it } from "vitest";
+import type { GatewayBrowserClient } from "../api/gateway.ts";
+import type { SessionsListResult } from "../api/types.ts";
+import type { RouteId } from "../app-route-paths.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGateway,
+} from "../app/context.ts";
+import type { SessionCapability } from "../lib/sessions/index.ts";
+import "./app-sidebar.ts";
+
+const PROVIDER_ELEMENT_NAME = "test-app-sidebar-context-provider";
+
+class AppSidebarContextProvider extends LitElement {
+  private readonly contextProvider = new ContextProvider(this, {
+    context: applicationContext,
+  });
+
+  setContext(context: ApplicationContext<RouteId>) {
+    this.contextProvider.setValue(context);
+  }
+}
+
+if (!customElements.get(PROVIDER_ELEMENT_NAME)) {
+  customElements.define(PROVIDER_ELEMENT_NAME, AppSidebarContextProvider);
+}
+
+type SidebarLifecycleState = HTMLElement & {
+  sessionRowsByAgent: Record<string, SessionsListResult["sessions"]>;
+  sessionCreatedOrder: Map<string, number>;
+  updateComplete: Promise<boolean>;
+};
+
+function createGateway(client: GatewayBrowserClient): ApplicationGateway {
+  return {
+    snapshot: {
+      client,
+      connected: true,
+      reconnecting: false,
+      hello: null,
+      assistantAgentId: "main",
+      sessionKey: "agent:main:main",
+      lastError: null,
+      lastErrorCode: null,
+    },
+    subscribe: () => () => undefined,
+  } as unknown as ApplicationGateway;
+}
+
+function createSessions(agentId: string, keys: string[]): SessionCapability {
+  const result = {
+    ts: 1,
+    path: "",
+    count: keys.length,
+    defaults: {
+      modelProvider: null,
+      model: null,
+      contextTokens: null,
+    },
+    sessions: keys.map((key, index) => ({
+      key,
+      kind: "direct" as const,
+      updatedAt: index + 1,
+    })),
+  } satisfies SessionsListResult;
+  return {
+    state: {
+      result,
+      agentId,
+      modelOverrides: {},
+      loading: false,
+      error: null,
+      deletedSessions: [],
+    },
+    subscribe: () => () => undefined,
+    subscribeCreated: () => () => undefined,
+  } as unknown as SessionCapability;
+}
+
+function createContext(
+  gateway: ApplicationGateway,
+  sessions: SessionCapability,
+): ApplicationContext<RouteId> {
+  return {
+    gateway,
+    sessions,
+    agents: {
+      state: { agentsList: null },
+      subscribe: () => () => undefined,
+    },
+    agentSelection: {
+      state: { selectedId: "main" },
+      set: () => undefined,
+      subscribe: () => () => undefined,
+    },
+  } as unknown as ApplicationContext<RouteId>;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+});
+
+describe("AppSidebar session source lifecycle", () => {
+  it("resets cached rows and creation order when the sessions source changes", async () => {
+    const client = {} as GatewayBrowserClient;
+    const gateway = createGateway(client);
+    const provider = document.createElement(PROVIDER_ELEMENT_NAME) as AppSidebarContextProvider;
+    const sidebar = document.createElement(
+      "openclaw-app-sidebar",
+    ) as unknown as SidebarLifecycleState;
+    provider.setContext(createContext(gateway, createSessions("first", ["first-a", "first-b"])));
+    provider.append(sidebar);
+    document.body.append(provider);
+    await sidebar.updateComplete;
+
+    expect(Object.keys(sidebar.sessionRowsByAgent)).toEqual(["first"]);
+    expect([...sidebar.sessionCreatedOrder]).toEqual([
+      ["first-a", 0],
+      ["first-b", 1],
+    ]);
+
+    // The Gateway and its client stay unchanged while the sessions capability is replaced.
+    provider.setContext(createContext(gateway, createSessions("second", ["second-b", "second-a"])));
+    await sidebar.updateComplete;
+
+    expect(Object.keys(sidebar.sessionRowsByAgent)).toEqual(["second"]);
+    expect([...sidebar.sessionCreatedOrder]).toEqual([
+      ["second-b", 0],
+      ["second-a", 1],
+    ]);
+  });
+});
diff --git a/ui/src/components/app-sidebar.ts b/ui/src/components/app-sidebar.ts
index 19f4aa9b732..f401bd84bfd 100644
--- a/ui/src/components/app-sidebar.ts
+++ b/ui/src/components/app-sidebar.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property, state } from "lit/decorators.js";
 import { keyed } from "lit/directives/keyed.js";
 import type { GatewayBrowserClient, GatewayControlUiPluginTab } from "../api/gateway.ts";
@@ -56,6 +56,7 @@ import {
   compareSessionRowsByUpdatedAt,
   resolveSessionNavigation,
   searchForSession,
+  type SessionCapability,
 } from "../lib/sessions/index.ts";
 import {
   buildAgentMainSessionKey,
@@ -69,9 +70,12 @@ import {
   resolveSessionAgentFilterOptions,
 } from "../lib/sessions/session-options.ts";
 import { normalizeOptionalString } from "../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../lit/subscriptions-controller.ts";
 import { getSafeLocalStorage } from "../local-storage.ts";
 import { pluginTabKey, pluginTabSearch } from "../pages/plugin/route.ts";
 import { icons, type IconName } from "./icons.ts";
+import { lobsterPetSeed, resolveLobsterPetMode } from "./lobster-pet.ts";
 import type { SessionMenuAction } from "./session-menu.ts";
 
 type SidebarRecentSession = {
@@ -161,11 +165,7 @@ function shouldHandleNavigationClick(event: MouseEvent): boolean {
   );
 }
 
-class AppSidebar extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class AppSidebar extends OpenClawLightDomElement {
   @property({ attribute: false }) basePath = "";
   @property({ attribute: false }) activeRouteId?: NavigationRouteId;
   @property({ attribute: false }) activePluginTabId = "";
@@ -187,7 +187,7 @@ class AppSidebar extends LitElement {
   onNavigate?: (routeId: NavigationRouteId, options?: ApplicationNavigationOptions) => void;
   @property({ attribute: false }) onPreloadRoute?: (routeId: NavigationRouteId) => Promise<void>;
 
-  @consume({ context: applicationContext, subscribe: false })
+  @consume({ context: applicationContext, subscribe: true })
   private context?: ApplicationContext<RouteId>;
   @state() private customizeMenuPosition: { x: number; y: number } | null = null;
   @state() private sessionMenu: SidebarSessionMenuState | null = null;
@@ -204,27 +204,50 @@ class AppSidebar extends LitElement {
   @state() private sessionsAgentId: string | null = null;
   @state() private sessionsLoading = false;
 
-  private stopSessionsSubscription: (() => void) | undefined;
-  private stopSessionCreatedSubscription: (() => void) | undefined;
-  private stopAgentsSubscription: (() => void) | undefined;
-  private stopAgentSelectionSubscription: (() => void) | undefined;
-  private stopGatewaySubscription: (() => void) | undefined;
+  private readonly subscriptions = new SubscriptionsController(this);
   private customizeMenuTrigger: HTMLElement | null = null;
   private sessionMenuTrigger: HTMLElement | null = null;
   private sessionGroupMenuTrigger: HTMLElement | null = null;
   private sessionSortMenuTrigger: HTMLElement | null = null;
   private sessionRowsByAgent: Record<string, SessionsListResult["sessions"]> = {};
   private sessionCreatedOrder = new Map<string, number>();
+  private sessionsSource: SessionCapability | null = null;
   private gatewayClient: GatewayBrowserClient | null = null;
   private readonly routePreloadTimers = new Map<
     EventTarget,
     ReturnType<typeof globalThis.setTimeout>
   >();
 
+  constructor() {
+    super();
+    this.subscriptions
+      .watch(
+        () => this.context?.gateway,
+        (gateway, notify) => gateway.subscribe(notify),
+        (gateway) => this.updateGatewayClient(gateway.snapshot),
+      )
+      .watch(
+        () => this.context?.sessions,
+        (sessions, notify) => sessions.subscribe(notify),
+        (sessions) => this.synchronizeSessions(sessions),
+      )
+      .effect(
+        () => this.context?.sessions,
+        (sessions) => sessions.subscribeCreated((key) => this.promoteCreatedSession(key)),
+      )
+      .watch(
+        () => this.context?.agents,
+        (agents, notify) => agents.subscribe(notify),
+      )
+      .watch(
+        () => this.context?.agentSelection,
+        (agentSelection, notify) => agentSelection.subscribe(notify),
+      );
+  }
+
   override connectedCallback() {
     super.connectedCallback();
     this.style.display = "contents";
-    this.startSubscriptions();
   }
 
   override disconnectedCallback() {
@@ -232,16 +255,6 @@ class AppSidebar extends LitElement {
     this.closeSessionMenu();
     this.closeSessionGroupMenu();
     this.closeSessionSortMenu();
-    this.stopSessionsSubscription?.();
-    this.stopSessionsSubscription = undefined;
-    this.stopSessionCreatedSubscription?.();
-    this.stopSessionCreatedSubscription = undefined;
-    this.stopAgentsSubscription?.();
-    this.stopAgentsSubscription = undefined;
-    this.stopAgentSelectionSubscription?.();
-    this.stopAgentSelectionSubscription = undefined;
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
     this.gatewayClient = null;
     for (const timer of this.routePreloadTimers.values()) {
       globalThis.clearTimeout(timer);
@@ -250,42 +263,6 @@ class AppSidebar extends LitElement {
     super.disconnectedCallback();
   }
 
-  private startSubscriptions() {
-    const context = this.context;
-    if (
-      !context ||
-      this.stopSessionsSubscription ||
-      this.stopSessionCreatedSubscription ||
-      this.stopAgentsSubscription ||
-      this.stopAgentSelectionSubscription ||
-      this.stopGatewaySubscription
-    ) {
-      return;
-    }
-    this.updateGatewayClient(context.gateway.snapshot);
-    this.updateSessions(context.sessions.state);
-    this.stopSessionsSubscription = context.sessions.subscribe((snapshot) => {
-      this.updateSessions(snapshot);
-    });
-    this.stopSessionCreatedSubscription = context.sessions.subscribeCreated((key) => {
-      this.promoteCreatedSession(key);
-    });
-    this.stopAgentsSubscription = context.agents.subscribe(() => {
-      this.requestUpdate();
-    });
-    this.stopAgentSelectionSubscription = context.agentSelection.subscribe(() => {
-      this.requestUpdate();
-    });
-    this.stopGatewaySubscription = context.gateway.subscribe((snapshot) => {
-      this.updateGatewayClient(snapshot);
-      this.requestUpdate();
-    });
-  }
-
-  override updated() {
-    this.startSubscriptions();
-  }
-
   private readonly updateSessions = (snapshot: {
     result: SessionsListResult | null;
     agentId: string | null;
@@ -306,6 +283,15 @@ class AppSidebar extends LitElement {
     }
   };
 
+  private synchronizeSessions(sessions: SessionCapability) {
+    if (sessions !== this.sessionsSource) {
+      this.sessionRowsByAgent = {};
+      this.sessionCreatedOrder.clear();
+      this.sessionsSource = sessions;
+    }
+    this.updateSessions(sessions.state);
+  }
+
   private updateGatewayClient(snapshot: {
     client: GatewayBrowserClient | null;
     connected: boolean;
@@ -1724,6 +1710,10 @@ class AppSidebar extends LitElement {
             ${this.renderSessions()}
           </div>
           <div class="sidebar-shell__footer">
+            <openclaw-lobster-pet
+              .seed=${lobsterPetSeed(this.sessionKey)}
+              .mode=${resolveLobsterPetMode(this.connected, this.sessionsResult?.sessions)}
+            ></openclaw-lobster-pet>
             <div class="sidebar-footer-bar">
               <openclaw-tooltip .content=${gatewayStatus}>
                 <span
diff --git a/ui/src/components/app-topbar.ts b/ui/src/components/app-topbar.ts
index 790244061b3..a552de19128 100644
--- a/ui/src/components/app-topbar.ts
+++ b/ui/src/components/app-topbar.ts
@@ -1,17 +1,14 @@
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import type { NavigationRouteId } from "../app-navigation.ts";
 import { controlUiPublicAssetPath } from "../app/public-assets.ts";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import { icons } from "./icons.ts";
 import "./dashboard-header.ts";
 import "./tooltip.ts";
 
-class AppTopbar extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class AppTopbar extends OpenClawLightDomElement {
   @property({ attribute: false }) routeId?: NavigationRouteId;
   @property({ attribute: false }) navDrawerOpen = false;
   @property({ attribute: false }) onboarding = false;
diff --git a/ui/src/components/command-palette.test.ts b/ui/src/components/command-palette.test.ts
new file mode 100644
index 00000000000..b56b46e5400
--- /dev/null
+++ b/ui/src/components/command-palette.test.ts
@@ -0,0 +1,224 @@
+/* @vitest-environment jsdom */
+
+import { ContextProvider } from "@lit/context";
+import { LitElement } from "lit";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../api/gateway.ts";
+import type { SessionsListResult } from "../api/types.ts";
+import type { RouteId } from "../app-route-paths.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGateway,
+  type ApplicationGatewaySnapshot,
+} from "../app/context.ts";
+import { installDialogPolyfill } from "../test-helpers/modal-dialog.ts";
+import { CommandPalette } from "./command-palette.ts";
+
+const PROVIDER_ELEMENT_NAME = "test-command-palette-context-provider";
+
+class CommandPaletteContextProvider extends LitElement {
+  private readonly contextProvider = new ContextProvider(this, {
+    context: applicationContext,
+  });
+
+  setContext(context: ApplicationContext<RouteId>) {
+    this.contextProvider.setValue(context);
+  }
+}
+
+if (!customElements.get(PROVIDER_ELEMENT_NAME)) {
+  customElements.define(PROVIDER_ELEMENT_NAME, CommandPaletteContextProvider);
+}
+
+type GatewayHarness = {
+  gateway: ApplicationGateway;
+  setConnected: (connected: boolean) => void;
+};
+
+function createGateway(connected: boolean): GatewayHarness {
+  const client = {} as GatewayBrowserClient;
+  let snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected,
+    reconnecting: !connected,
+    hello: null,
+    assistantAgentId: "main",
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const listeners = new Set<(next: ApplicationGatewaySnapshot) => void>();
+  const gateway = {
+    get snapshot() {
+      return snapshot;
+    },
+    connection: { gatewayUrl: "ws://localhost", token: "", password: "" },
+    eventLog: [],
+    connect: () => undefined,
+    setSessionKey: () => undefined,
+    start: () => undefined,
+    stop: () => undefined,
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    subscribeEventLog: () => () => undefined,
+    subscribeEvents: () => () => undefined,
+  } satisfies ApplicationGateway;
+  return {
+    gateway,
+    setConnected(nextConnected) {
+      snapshot = {
+        ...snapshot,
+        connected: nextConnected,
+        reconnecting: !nextConnected,
+      };
+      for (const listener of listeners) {
+        listener(snapshot);
+      }
+    },
+  };
+}
+
+function createContext(
+  gateway: ApplicationGateway,
+  list: ApplicationContext<RouteId>["sessions"]["list"],
+): ApplicationContext<RouteId> {
+  return {
+    gateway,
+    sessions: {
+      list,
+    },
+  } as unknown as ApplicationContext<RouteId>;
+}
+
+function createSessionResult(key: string, displayName: string): SessionsListResult {
+  return {
+    ts: 1,
+    path: "",
+    count: 1,
+    defaults: {},
+    sessions: [{ key, kind: "direct", displayName, updatedAt: 1 }],
+  } as SessionsListResult;
+}
+
+function createDeferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((nextResolve) => {
+    resolve = nextResolve;
+  });
+  return { promise, resolve };
+}
+
+async function mountPalette(context: ApplicationContext<RouteId>) {
+  const provider = document.createElement(PROVIDER_ELEMENT_NAME) as CommandPaletteContextProvider;
+  const palette = document.createElement("openclaw-command-palette") as CommandPalette;
+  palette.onNavigate = vi.fn();
+  palette.onSelectSession = vi.fn();
+  provider.setContext(context);
+  provider.append(palette);
+  document.body.append(provider);
+  await palette.updateComplete;
+  return { palette, provider };
+}
+
+async function enterQuery(palette: CommandPalette, query: string) {
+  palette.openPalette();
+  await palette.updateComplete;
+  const input = palette.querySelector<HTMLInputElement>(".cmd-palette__input");
+  if (!input) {
+    throw new Error("Expected command palette input");
+  }
+  input.value = query;
+  input.dispatchEvent(new Event("input", { bubbles: true, composed: true }));
+  await palette.updateComplete;
+}
+
+describe("CommandPalette lifecycle", () => {
+  let restoreDialogPolyfill: () => void;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+    restoreDialogPolyfill = installDialogPolyfill();
+  });
+
+  afterEach(() => {
+    document.body.replaceChildren();
+    restoreDialogPolyfill();
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+  });
+
+  it("closes and clears its query before a retained element reconnects", async () => {
+    const { gateway } = createGateway(true);
+    const list = vi.fn(async () => createSessionResult("agent:main:old", "Old chat"));
+    const { palette, provider } = await mountPalette(createContext(gateway, list));
+    await enterQuery(palette, "old");
+    await vi.advanceTimersByTimeAsync(250);
+    await palette.updateComplete;
+    expect(palette.textContent).toContain("Old chat");
+
+    palette.remove();
+    provider.append(palette);
+    expect(palette.querySelector("dialog")?.open).toBe(false);
+    await palette.updateComplete;
+
+    expect(palette.querySelector("dialog")).toBeNull();
+    palette.openPalette();
+    await palette.updateComplete;
+    expect(palette.querySelector<HTMLInputElement>(".cmd-palette__input")?.value).toBe("");
+    expect(palette.textContent).not.toContain("Old chat");
+  });
+
+  it("retries the pending query after the gateway reconnects", async () => {
+    const harness = createGateway(true);
+    const stale = createDeferred<SessionsListResult | null>();
+    const list = vi
+      .fn<ApplicationContext<RouteId>["sessions"]["list"]>()
+      .mockImplementationOnce(() => stale.promise)
+      .mockResolvedValueOnce(createSessionResult("agent:main:retry", "Retry chat"));
+    const { palette } = await mountPalette(createContext(harness.gateway, list));
+    await enterQuery(palette, "retry");
+    await vi.advanceTimersByTimeAsync(250);
+    expect(list).toHaveBeenCalledOnce();
+
+    harness.setConnected(false);
+    stale.resolve(createSessionResult("agent:main:stale", "Stale chat"));
+    await Promise.resolve();
+    expect(palette.textContent).not.toContain("Stale chat");
+
+    harness.setConnected(true);
+    await palette.updateComplete;
+    await vi.advanceTimersByTimeAsync(250);
+    await palette.updateComplete;
+
+    expect(list).toHaveBeenCalledTimes(2);
+    expect(list).toHaveBeenLastCalledWith(expect.objectContaining({ search: "retry" }));
+    expect(palette.textContent).toContain("Retry chat");
+  });
+
+  it("drops an old provider response and searches the replacement context", async () => {
+    const initial = createGateway(true);
+    const replacement = createGateway(true);
+    const stale = createDeferred<SessionsListResult | null>();
+    const initialList = vi.fn(() => stale.promise);
+    const replacementList = vi.fn(async () =>
+      createSessionResult("agent:main:fresh", "Fresh chat"),
+    );
+    const { palette, provider } = await mountPalette(createContext(initial.gateway, initialList));
+    await enterQuery(palette, "chat");
+    await vi.advanceTimersByTimeAsync(250);
+    expect(initialList).toHaveBeenCalledOnce();
+
+    stale.resolve(createSessionResult("agent:main:stale", "Stale chat"));
+    provider.setContext(createContext(replacement.gateway, replacementList));
+    await palette.updateComplete;
+    await vi.advanceTimersByTimeAsync(250);
+    await palette.updateComplete;
+
+    expect(replacementList).toHaveBeenCalledOnce();
+    expect(palette.textContent).toContain("Fresh chat");
+    expect(palette.textContent).not.toContain("Stale chat");
+  });
+});
diff --git a/ui/src/components/command-palette.ts b/ui/src/components/command-palette.ts
index 862c57e5912..1705246d35f 100644
--- a/ui/src/components/command-palette.ts
+++ b/ui/src/components/command-palette.ts
@@ -1,6 +1,6 @@
 // Control UI component renders the command palette.
 import { consume } from "@lit/context";
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property, state } from "lit/decorators.js";
 import { ref } from "lit/directives/ref.js";
 import type { RouteId } from "../app-route-paths.ts";
@@ -10,6 +10,8 @@ import { formatRelativeTimestamp } from "../lib/format.ts";
 import { resolveSessionDisplayName } from "../lib/session-display.ts";
 import { getVisibleSessionRows } from "../lib/sessions/index.ts";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../lit/subscriptions-controller.ts";
 import { icons, type IconName } from "./icons.ts";
 
 type PaletteItem = {
@@ -104,6 +106,8 @@ type CommandPaletteProps = {
   onNavigate: (routeId: RouteId) => void;
   onSelectSession?: (sessionKey: string) => void;
   onSlashCommand?: (command: string) => void;
+  onDialogRef: (element: Element | undefined) => void;
+  onInputRef: (element: Element | undefined) => void;
 };
 
 function filteredItems(
@@ -334,7 +338,7 @@ function renderCommandPalette(props: CommandPaletteProps) {
 
   return html`
     <dialog
-      ${ref(syncDialog)}
+      ${ref(props.onDialogRef)}
       class="cmd-palette-overlay"
       aria-labelledby=${paletteDialogLabelId}
       @cancel=${(e: Event) => {
@@ -356,7 +360,7 @@ function renderCommandPalette(props: CommandPaletteProps) {
           >${paletteLabel}</label
         >
         <input
-          ${ref(focusInput)}
+          ${ref(props.onInputRef)}
           id=${paletteInputId}
           class="cmd-palette__input"
           role="combobox"
@@ -420,23 +424,34 @@ function renderCommandPalette(props: CommandPaletteProps) {
   `;
 }
 
-export class CommandPalette extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+export class CommandPalette extends OpenClawLightDomElement {
   @property({ attribute: false }) onNavigate?: (routeId: RouteId) => void;
   @property({ attribute: false }) onSelectSession?: (sessionKey: string) => void;
   @property({ attribute: false }) onSlashCommand?: (command: string) => void;
-  @consume({ context: applicationContext, subscribe: false })
+  @consume({ context: applicationContext, subscribe: true })
   private context?: ApplicationContext<RouteId>;
   @state() private open = false;
   @state() private query = "";
   @state() private activeIndex = 0;
   @state() private sessionItems: readonly PaletteItem[] = [];
 
+  private readonly subscriptions = new SubscriptionsController(this);
   private sessionSearchTimer: ReturnType<typeof globalThis.setTimeout> | null = null;
   private sessionSearchId = 0;
+  private sessionSearchSource?: {
+    gateway: ApplicationContext<RouteId>["gateway"];
+    client: ApplicationContext<RouteId>["gateway"]["snapshot"]["client"];
+    connected: boolean;
+  };
+
+  constructor() {
+    super();
+    this.subscriptions.watch(
+      () => this.context?.gateway,
+      (gateway, notify) => gateway.subscribe(notify),
+      (gateway) => this.synchronizeGateway(gateway),
+    );
+  }
 
   override connectedCallback() {
     super.connectedCallback();
@@ -446,7 +461,11 @@ export class CommandPalette extends LitElement {
 
   override disconnectedCallback() {
     document.removeEventListener("keydown", this.handleGlobalKeydown);
+    this.open = false;
+    this.query = "";
+    this.activeIndex = 0;
     this.clearSessionSearch();
+    this.sessionSearchSource = undefined;
     if (activeDialog) {
       activeDialog.close();
       restoreFocus();
@@ -475,6 +494,42 @@ export class CommandPalette extends LitElement {
     this.openPalette();
   };
 
+  private readonly handleDialogRef = (element: Element | undefined) => {
+    if (!this.open) {
+      syncDialog(undefined);
+      return;
+    }
+    syncDialog(element);
+  };
+
+  private readonly handleInputRef = (element: Element | undefined) => {
+    if (this.open) {
+      focusInput(element);
+    }
+  };
+
+  private synchronizeGateway(gateway: ApplicationContext<RouteId>["gateway"]) {
+    const snapshot = gateway.snapshot;
+    const previous = this.sessionSearchSource;
+    const sourceChanged = previous?.gateway !== gateway;
+    const clientChanged = previous?.client !== snapshot.client;
+    const reconnected = previous?.connected === false && snapshot.connected;
+    this.sessionSearchSource = {
+      gateway,
+      client: snapshot.client,
+      connected: snapshot.connected,
+    };
+
+    if (sourceChanged || clientChanged || !snapshot.connected) {
+      // Query results belong to one runtime/client connection. Discard them as
+      // soon as that owner changes so detached or reconnecting rows stay inert.
+      this.clearSessionSearch();
+    }
+    if (snapshot.connected && (sourceChanged || clientChanged || reconnected)) {
+      this.scheduleSessionSearch(this.query);
+    }
+  }
+
   private clearSessionSearch() {
     if (this.sessionSearchTimer !== null) {
       globalThis.clearTimeout(this.sessionSearchTimer);
@@ -494,7 +549,7 @@ export class CommandPalette extends LitElement {
     this.sessionSearchId += 1;
     this.sessionItems = [];
     const search = normalizeOptionalString(query);
-    if (!search || !this.onSelectSession) {
+    if (!this.open || !search || !this.onSelectSession) {
       return;
     }
     this.sessionSearchTimer = globalThis.setTimeout(() => {
@@ -504,8 +559,11 @@ export class CommandPalette extends LitElement {
   }
 
   private async searchSessions(search: string) {
-    const sessions = this.context?.sessions;
-    if (!sessions || !this.context?.gateway.snapshot.connected) {
+    const context = this.context;
+    const sessions = context?.sessions;
+    const gateway = context?.gateway;
+    const client = gateway?.snapshot.client;
+    if (!sessions || !gateway?.snapshot.connected || !client) {
       return;
     }
     const requestId = ++this.sessionSearchId;
@@ -524,7 +582,15 @@ export class CommandPalette extends LitElement {
           includeUnknown: false,
         });
         pagesLoaded += 1;
-        if (requestId !== this.sessionSearchId || !this.open || !result) {
+        if (
+          requestId !== this.sessionSearchId ||
+          !this.open ||
+          this.context?.sessions !== sessions ||
+          this.context?.gateway !== gateway ||
+          gateway.snapshot.client !== client ||
+          !gateway.snapshot.connected ||
+          !result
+        ) {
           return;
         }
         const pageRows = getVisibleSessionRows(result, {
@@ -598,6 +664,8 @@ export class CommandPalette extends LitElement {
       onNavigate: (routeId) => this.onNavigate?.(routeId),
       onSelectSession: this.onSelectSession,
       onSlashCommand: this.onSlashCommand,
+      onDialogRef: this.handleDialogRef,
+      onInputRef: this.handleInputRef,
     });
   }
 }
diff --git a/ui/src/components/connection-banner.ts b/ui/src/components/connection-banner.ts
index ecc0e4a3b6e..0f4402b1dd2 100644
--- a/ui/src/components/connection-banner.ts
+++ b/ui/src/components/connection-banner.ts
@@ -1,8 +1,9 @@
 // Control UI component renders the offline/reconnecting banner shown while
 // the gateway connection is interrupted but the dashboard stays mounted.
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import { redactLoginFailureError } from "./login-gate.ts";
 
 type ConnectionBannerProps = {
@@ -28,11 +29,7 @@ function renderConnectionBanner(props: ConnectionBannerProps) {
   `;
 }
 
-class ConnectionBanner extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class ConnectionBanner extends OpenClawLightDomElement {
   @property({ attribute: false }) props?: ConnectionBannerProps;
 
   override connectedCallback() {
diff --git a/ui/src/components/dashboard-header.ts b/ui/src/components/dashboard-header.ts
index 5126f0b59fe..d07116eaae3 100644
--- a/ui/src/components/dashboard-header.ts
+++ b/ui/src/components/dashboard-header.ts
@@ -1,13 +1,10 @@
 // Control UI component implements the dashboard header element.
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import { titleForRoute, type NavigationRouteId } from "../app-navigation.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 
-class DashboardHeader extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class DashboardHeader extends OpenClawLightDomElement {
   @property() routeId?: NavigationRouteId;
   @property() basePath = "";
   @property() agentLabel = "";
diff --git a/ui/src/components/exec-approval.ts b/ui/src/components/exec-approval.ts
index 8c69ded9679..b84e6ee3581 100644
--- a/ui/src/components/exec-approval.ts
+++ b/ui/src/components/exec-approval.ts
@@ -1,5 +1,5 @@
 // Control UI component renders exec approval.
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import { formatApprovalDisplayPath } from "../../../src/infra/approval-display-paths.ts";
 import type {
@@ -9,6 +9,7 @@ import type {
 } from "../app/exec-approval.ts";
 import "./modal-dialog.ts";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 
 const DEFAULT_EXEC_APPROVAL_DECISIONS = [
   "allow-once",
@@ -224,11 +225,7 @@ function renderExecApprovalPrompt(props: ExecApprovalProps) {
   `;
 }
 
-class ExecApproval extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class ExecApproval extends OpenClawLightDomElement {
   @property({ attribute: false }) props?: ExecApprovalProps;
 
   override connectedCallback() {
diff --git a/ui/src/components/file-preview-modal.test.ts b/ui/src/components/file-preview-modal.test.ts
index 761b705ff87..0863c3cba1b 100644
--- a/ui/src/components/file-preview-modal.test.ts
+++ b/ui/src/components/file-preview-modal.test.ts
@@ -139,6 +139,26 @@ describe("openclaw-file-preview-modal", () => {
     expect(onSelect.mock.lastCall?.[0].detail).toBe("filters/auto-senders.txt");
   });
 
+  it("restores modal focus when the same element reconnects", async () => {
+    const modal = await renderPreview();
+    const outside = document.createElement("button");
+    document.body.append(outside);
+
+    try {
+      container.remove();
+      outside.focus();
+      expect(document.activeElement).toBe(outside);
+      document.body.append(container);
+      await modal.updateComplete;
+
+      const input = modal.shadowRoot?.querySelector<HTMLInputElement>(".search");
+      expect(input).toBeInstanceOf(HTMLInputElement);
+      expect(modal.shadowRoot?.activeElement).toBe(input);
+    } finally {
+      outside.remove();
+    }
+  });
+
   it("blocks background arrow-key scrolling even when no files match", async () => {
     const modal = await renderPreview({ query: "missing" });
     const onDocumentKeydown = vi.fn();
diff --git a/ui/src/components/file-preview-modal.ts b/ui/src/components/file-preview-modal.ts
index a89ca4d46c7..a71d908163d 100644
--- a/ui/src/components/file-preview-modal.ts
+++ b/ui/src/components/file-preview-modal.ts
@@ -1,6 +1,7 @@
 // Control UI component implements the file preview modal element.
-import { LitElement, css, html, type PropertyValues } from "lit";
+import { css, html, type PropertyValues } from "lit";
 import { property, query } from "lit/decorators.js";
+import { OpenClawLitElement } from "../lit/openclaw-element.ts";
 import { renderCopyButton } from "./copy-button.ts";
 import { icons } from "./icons.ts";
 
@@ -10,7 +11,7 @@ type FilePreviewModalFile = {
   contents: string;
 };
 
-export class OpenClawFilePreviewModal extends LitElement {
+export class OpenClawFilePreviewModal extends OpenClawLitElement {
   @property({ attribute: false }) files: FilePreviewModalFile[] = [];
   @property() activePath = "";
   @property() query = "";
@@ -31,6 +32,8 @@ export class OpenClawFilePreviewModal extends LitElement {
   private codeSource?: string;
   private codeChunks: string[] = [];
   private resetScrollAfterUpdate = true;
+  // Reconnection does not rerun firstUpdated; defer focus until shadow DOM is ready.
+  private focusAfterUpdate = false;
 
   static override styles = css`
     :host {
@@ -607,13 +610,10 @@ export class OpenClawFilePreviewModal extends LitElement {
     return files.find((file) => file.path === this.activePath) ?? files[0];
   }
 
-  protected override firstUpdated() {
-    this.focusModal();
-  }
-
   override connectedCallback() {
     super.connectedCallback();
     this.resetScrollAfterUpdate = true;
+    this.focusAfterUpdate = true;
     this.requestUpdate();
   }
 
@@ -629,6 +629,10 @@ export class OpenClawFilePreviewModal extends LitElement {
     if (changed.has("activePath") || changed.has("query") || changed.has("files")) {
       this.scrollActiveFileIntoView();
     }
+    if (this.focusAfterUpdate && this.isConnected) {
+      this.focusAfterUpdate = false;
+      this.focusModal();
+    }
   }
 
   private handleQueryInput = (event: Event) => {
diff --git a/ui/src/components/gateway-url-confirmation.ts b/ui/src/components/gateway-url-confirmation.ts
index ab4d13fe11f..f406471da72 100644
--- a/ui/src/components/gateway-url-confirmation.ts
+++ b/ui/src/components/gateway-url-confirmation.ts
@@ -1,7 +1,8 @@
 // Control UI component renders gateway URL confirmation.
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import "./modal-dialog.ts";
 
 type GatewayUrlConfirmationProps = {
@@ -45,11 +46,7 @@ function renderGatewayUrlConfirmation(props: GatewayUrlConfirmationProps) {
   `;
 }
 
-class GatewayUrlConfirmation extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class GatewayUrlConfirmation extends OpenClawLightDomElement {
   @property({ attribute: false }) props?: GatewayUrlConfirmationProps;
 
   override connectedCallback() {
diff --git a/ui/src/components/lobster-pet.test.ts b/ui/src/components/lobster-pet.test.ts
new file mode 100644
index 00000000000..59357b9d329
--- /dev/null
+++ b/ui/src/components/lobster-pet.test.ts
@@ -0,0 +1,182 @@
+/* @vitest-environment jsdom */
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import {
+  LOBSTER_PET_ACT_DURATION_MS,
+  LOBSTER_PET_MODE_ACTS,
+  createLobsterPetLook,
+  lobsterPetSeed,
+  resolveLobsterPetMode,
+  type LobsterPet,
+  type LobsterPetMode,
+} from "./lobster-pet.ts";
+
+const SPOT_ZONES = { left: [12, 38], right: [60, 84] } as const;
+
+type LobsterPetElement = LobsterPet & HTMLElement;
+
+function createPet(seed: number, mode: LobsterPetMode = "idle"): LobsterPetElement {
+  const element = document.createElement("openclaw-lobster-pet") as LobsterPetElement;
+  element.seed = seed;
+  element.mode = mode;
+  document.body.append(element);
+  return element;
+}
+
+function spriteClasses(element: LobsterPetElement): string {
+  return element.querySelector(".lobster-pet")?.className ?? "";
+}
+
+async function advanceUntilAct(element: LobsterPetElement, maxMs: number): Promise<string | null> {
+  let elapsed = 0;
+  while (elapsed < maxMs) {
+    await vi.advanceTimersByTimeAsync(200);
+    elapsed += 200;
+    await element.updateComplete;
+    const match = /lobster-pet--act-([a-z]+)/.exec(spriteClasses(element));
+    if (match) {
+      return match[1];
+    }
+  }
+  return null;
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+  vi.unstubAllGlobals();
+  document.body.innerHTML = "";
+});
+
+describe("lobster pet look", () => {
+  it("is deterministic per seed", () => {
+    expect(createLobsterPetLook(1234)).toEqual(createLobsterPetLook(1234));
+  });
+
+  it("stays within the variant catalog for many seeds", () => {
+    const palettes = new Set<string>();
+    const personalities = new Set<string>();
+    for (let seed = 0; seed < 300; seed++) {
+      const look = createLobsterPetLook(seed);
+      palettes.add(look.palette.id);
+      personalities.add(look.personality);
+      expect(["crimson", "coral", "teal", "violet", "ink", "gold"]).toContain(look.palette.id);
+      expect([1.7, 2, 2.5]).toContain(look.scale);
+      expect(["none", "crown", "sprout", "patch"]).toContain(look.accessory);
+      expect(["perky", "droopy"]).toContain(look.antennae);
+      const zone = SPOT_ZONES[look.side];
+      expect(look.spotPct).toBeGreaterThanOrEqual(zone[0]);
+      expect(look.spotPct).toBeLessThanOrEqual(zone[1]);
+    }
+    // Sessions should feel different: many seeds must not collapse onto one look.
+    expect(palettes.size).toBeGreaterThan(2);
+    expect(personalities.size).toBeGreaterThan(2);
+  });
+
+  it("derives distinct salted seeds per session key, stable within a load", () => {
+    expect(lobsterPetSeed("agent:a:main")).toBe(lobsterPetSeed("agent:a:main"));
+    expect(lobsterPetSeed("agent:a:main")).not.toBe(lobsterPetSeed("agent:b:other"));
+  });
+});
+
+describe("resolveLobsterPetMode", () => {
+  it("maps connection and run state to modes", () => {
+    expect(resolveLobsterPetMode(false, [{ hasActiveRun: true }])).toBe("offline");
+    expect(resolveLobsterPetMode(true, null)).toBe("idle");
+    expect(resolveLobsterPetMode(true, [{ hasActiveRun: false }, {}])).toBe("idle");
+    expect(resolveLobsterPetMode(true, [{ hasActiveRun: false }, { hasActiveRun: true }])).toBe(
+      "busy",
+    );
+  });
+});
+
+describe("lobster pet element", () => {
+  it("renders the sprite and schedules acts", async () => {
+    vi.useFakeTimers();
+    const element = createPet(42);
+    await element.updateComplete;
+
+    expect(element.querySelector(".lobster-pet__svg")).not.toBeNull();
+    expect(spriteClasses(element)).toContain("lobster-pet--idle");
+
+    const act = await advanceUntilAct(element, 20_000);
+    expect(act).not.toBeNull();
+    expect(Object.keys(LOBSTER_PET_ACT_DURATION_MS)).toContain(act);
+
+    // The act window closes and the pet returns to idle.
+    await vi.advanceTimersByTimeAsync(
+      LOBSTER_PET_ACT_DURATION_MS[act as keyof typeof LOBSTER_PET_ACT_DURATION_MS],
+    );
+    await element.updateComplete;
+    expect(spriteClasses(element)).not.toContain("lobster-pet--act-");
+  });
+
+  it("startles on mode changes and then draws from the new mode's pool", async () => {
+    vi.useFakeTimers();
+    const element = createPet(42);
+    await element.updateComplete;
+
+    element.mode = "busy";
+    await element.updateComplete;
+    expect(spriteClasses(element)).toContain("lobster-pet--act-startle");
+    expect(spriteClasses(element)).toContain("lobster-pet--busy");
+
+    await vi.advanceTimersByTimeAsync(LOBSTER_PET_ACT_DURATION_MS.startle);
+    const busyActs = LOBSTER_PET_MODE_ACTS.busy.acts.map(([act]) => act);
+    for (let i = 0; i < 3; i++) {
+      const act = await advanceUntilAct(element, 10_000);
+      expect(busyActs).toContain(act);
+      await vi.advanceTimersByTimeAsync(
+        LOBSTER_PET_ACT_DURATION_MS[act as keyof typeof LOBSTER_PET_ACT_DURATION_MS],
+      );
+    }
+  });
+
+  it("paces from the offline pool while disconnected", async () => {
+    vi.useFakeTimers();
+    const element = createPet(7, "offline");
+    await element.updateComplete;
+    expect(spriteClasses(element)).toContain("lobster-pet--offline");
+
+    const offlineActs = LOBSTER_PET_MODE_ACTS.offline.acts.map(([act]) => act);
+    const act = await advanceUntilAct(element, 10_000);
+    expect(offlineActs).toContain(act);
+  });
+
+  it("startles when poked", async () => {
+    vi.useFakeTimers();
+    const element = createPet(7);
+    await element.updateComplete;
+
+    element.querySelector(".lobster-pet")?.dispatchEvent(new Event("pointerdown"));
+    await element.updateComplete;
+    expect(spriteClasses(element)).toContain("lobster-pet--act-startle");
+  });
+
+  it("stops timers on disconnect", async () => {
+    vi.useFakeTimers();
+    const element = createPet(42);
+    await element.updateComplete;
+
+    element.remove();
+    expect(vi.getTimerCount()).toBe(0);
+  });
+
+  it("stays static when reduced motion is preferred, including visibility resumes", async () => {
+    vi.useFakeTimers();
+    vi.stubGlobal(
+      "matchMedia",
+      vi.fn(() => ({ matches: true }) as MediaQueryList),
+    );
+    const element = createPet(42);
+    await element.updateComplete;
+
+    expect(element.querySelector(".lobster-pet__svg")).not.toBeNull();
+    // Tab switches re-enter through the visibilitychange resume path, which
+    // must stay inert under reduced motion too. Mode flips must not startle.
+    document.dispatchEvent(new Event("visibilitychange"));
+    element.mode = "busy";
+    await element.updateComplete;
+    const act = await advanceUntilAct(element, 30_000);
+    expect(act).toBeNull();
+  });
+});
diff --git a/ui/src/components/lobster-pet.ts b/ui/src/components/lobster-pet.ts
new file mode 100644
index 00000000000..659ba2c4255
--- /dev/null
+++ b/ui/src/components/lobster-pet.ts
@@ -0,0 +1,522 @@
+// Decorative lobster pet that perches on the sidebar footer and mirrors
+// gateway status: it idles (naps, waves, wanders) when nothing is running,
+// scurries while runs are active, and paces worriedly while disconnected.
+// Drawn in the smooth OpenClaw lobster style (see the dreams scene and
+// icons.lobster). Look and personality are seeded per session + page load so
+// every new session hatches a slightly different lobster.
+import { html, LitElement, nothing, svg, type TemplateResult } from "lit";
+import { property, state } from "lit/decorators.js";
+
+export type LobsterPetAct =
+  | "wave"
+  | "snip"
+  | "hop"
+  | "spin"
+  | "peek"
+  | "nap"
+  | "bubble"
+  | "scuttle"
+  | "startle";
+
+export type LobsterPetMode = "idle" | "busy" | "offline";
+
+export type LobsterPetPersonalityId = "sleepy" | "zoomy" | "friendly" | "showoff";
+
+export type LobsterPetPalette = {
+  id: "crimson" | "coral" | "teal" | "violet" | "ink" | "gold";
+  shell: string;
+  claw: string;
+};
+
+export type LobsterPetAccessory = "none" | "crown" | "sprout" | "patch";
+
+export type LobsterPetAntennae = "perky" | "droopy";
+
+export type LobsterPetLook = {
+  palette: LobsterPetPalette;
+  scale: number;
+  accessory: LobsterPetAccessory;
+  antennae: LobsterPetAntennae;
+  side: "left" | "right";
+  spotPct: number;
+  facing: 1 | -1;
+  personality: LobsterPetPersonalityId;
+  blinkDelayS: number;
+};
+
+type ActProfile = {
+  // [min, max] delay before the next act.
+  delayMs: [number, number];
+  acts: Array<[LobsterPetAct, number]>;
+};
+
+// Act windows mirror the CSS animation durations in lobster-pet.css so jsdom
+// tests and browsers clear acts on the same clock without animationend.
+export const LOBSTER_PET_ACT_DURATION_MS: Record<LobsterPetAct, number> = {
+  wave: 1400,
+  snip: 1000,
+  hop: 750,
+  spin: 950,
+  peek: 1700,
+  nap: 4400,
+  bubble: 2600,
+  scuttle: 1250,
+  startle: 750,
+};
+
+const PERSONALITIES: Record<LobsterPetPersonalityId, ActProfile> = {
+  sleepy: {
+    delayMs: [6000, 12000],
+    acts: [
+      ["nap", 40],
+      ["bubble", 20],
+      ["wave", 12],
+      ["scuttle", 12],
+      ["peek", 10],
+      ["hop", 6],
+    ],
+  },
+  zoomy: {
+    delayMs: [2800, 6000],
+    acts: [
+      ["scuttle", 42],
+      ["hop", 22],
+      ["spin", 12],
+      ["peek", 12],
+      ["wave", 12],
+    ],
+  },
+  friendly: {
+    delayMs: [3600, 7500],
+    acts: [
+      ["wave", 32],
+      ["snip", 22],
+      ["scuttle", 18],
+      ["hop", 14],
+      ["bubble", 14],
+    ],
+  },
+  showoff: {
+    delayMs: [3600, 7500],
+    acts: [
+      ["spin", 24],
+      ["snip", 22],
+      ["peek", 20],
+      ["hop", 18],
+      ["wave", 16],
+    ],
+  },
+};
+
+// Busy and offline override the personality: the pet is a status indicator
+// first. Busy scurries (no naps mid-run); offline paces and peeks.
+export const LOBSTER_PET_MODE_ACTS: Record<Exclude<LobsterPetMode, "idle">, ActProfile> = {
+  busy: {
+    delayMs: [2200, 4500],
+    acts: [
+      ["scuttle", 40],
+      ["hop", 20],
+      ["snip", 20],
+      ["wave", 12],
+      ["spin", 8],
+    ],
+  },
+  offline: {
+    delayMs: [2800, 5600],
+    acts: [
+      ["scuttle", 55],
+      ["peek", 30],
+      ["hop", 15],
+    ],
+  },
+};
+
+const PALETTES: Array<[LobsterPetPalette, number]> = [
+  [{ id: "crimson", shell: "#ff4f40", claw: "#ff775f" }, 30],
+  [{ id: "coral", shell: "#d0836a", claw: "#de9b80" }, 30],
+  [{ id: "teal", shell: "#2fbfa7", claw: "#5cd9c4" }, 12],
+  [{ id: "violet", shell: "#9f7dfa", claw: "#bba4fd" }, 12],
+  [{ id: "ink", shell: "#5e6b7a", claw: "#7b8996" }, 11],
+  [{ id: "gold", shell: "#f4b840", claw: "#f9d47a" }, 5],
+];
+
+const ACCESSORIES: Array<[LobsterPetAccessory, number]> = [
+  ["none", 62],
+  ["sprout", 14],
+  ["patch", 14],
+  ["crown", 10],
+];
+
+const PERSONALITY_IDS: Array<[LobsterPetPersonalityId, number]> = [
+  ["sleepy", 25],
+  ["zoomy", 25],
+  ["friendly", 25],
+  ["showoff", 25],
+];
+
+const SCALES: Array<[number, number]> = [
+  [1.7, 25],
+  [2, 55],
+  [2.5, 20],
+];
+
+// Keep the perch off the footer center so tooltips and the theme toggle
+// never sit under the sprite.
+const SPOT_ZONES = { left: [12, 38], right: [60, 84] } as const;
+const ENTER_MS = 450;
+
+function fnv1a(value: string): number {
+  let hash = 0x811c9dc5;
+  for (let i = 0; i < value.length; i++) {
+    hash ^= value.charCodeAt(i);
+    hash = Math.imul(hash, 0x01000193);
+  }
+  return hash >>> 0;
+}
+
+function mulberry32(seed: number): () => number {
+  let a = seed >>> 0;
+  return () => {
+    a = (a + 0x6d2b79f5) | 0;
+    let t = Math.imul(a ^ (a >>> 15), 1 | a);
+    t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t;
+    return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
+  };
+}
+
+function pickWeighted<T>(rng: () => number, entries: Array<[T, number]>): T {
+  const total = entries.reduce((sum, [, weight]) => sum + weight, 0);
+  let roll = rng() * total;
+  for (const [value, weight] of entries) {
+    roll -= weight;
+    if (roll <= 0) {
+      return value;
+    }
+  }
+  return entries[entries.length - 1][0];
+}
+
+function randomBetween(rng: () => number, min: number, max: number): number {
+  return min + rng() * (max - min);
+}
+
+// One salt per page load: revisiting the UI re-rolls every session's lobster,
+// while re-renders within a load stay stable for a given session key.
+const LOAD_SALT = Math.trunc(Math.random() * 0xffffffff);
+
+export function lobsterPetSeed(sessionKey: string): number {
+  return (fnv1a(sessionKey) ^ LOAD_SALT) >>> 0;
+}
+
+export function createLobsterPetLook(seed: number): LobsterPetLook {
+  const rng = mulberry32(seed);
+  const palette = pickWeighted(rng, PALETTES);
+  const scale = pickWeighted(rng, SCALES);
+  const accessory = pickWeighted(rng, ACCESSORIES);
+  const antennae: LobsterPetAntennae = rng() < 0.6 ? "perky" : "droopy";
+  const side = rng() < 0.5 ? "left" : "right";
+  const zone = SPOT_ZONES[side];
+  const spotPct = Math.round(randomBetween(rng, zone[0], zone[1]));
+  const facing = rng() < 0.5 ? 1 : -1;
+  const personality = pickWeighted(rng, PERSONALITY_IDS);
+  const blinkDelayS = Math.round(randomBetween(rng, 0, 4) * 10) / 10;
+  return { palette, scale, accessory, antennae, side, spotPct, facing, personality, blinkDelayS };
+}
+
+export function resolveLobsterPetMode(
+  connected: boolean,
+  sessions: ReadonlyArray<{ hasActiveRun?: boolean | null }> | null | undefined,
+): LobsterPetMode {
+  if (!connected) {
+    return "offline";
+  }
+  return sessions?.some((row) => row.hasActiveRun === true) ? "busy" : "idle";
+}
+
+function prefersReducedMotion(): boolean {
+  return (
+    typeof window !== "undefined" &&
+    typeof window.matchMedia === "function" &&
+    window.matchMedia("(prefers-reduced-motion: reduce)").matches
+  );
+}
+
+const ACCESSORY_SPRITES: Record<Exclude<LobsterPetAccessory, "none">, TemplateResult> = {
+  crown: svg`
+    <path
+      d="M46 12 L46 2 L53 8 L60 0 L67 8 L74 2 L74 12 Q60 8 46 12 Z"
+      fill="#f6c945"
+    />
+  `,
+  sprout: svg`
+    <g>
+      <path d="M60 12 Q58 4 63 1" stroke="#3f9d63" stroke-width="3" stroke-linecap="round" fill="none" />
+      <ellipse cx="67" cy="3" rx="5" ry="3" fill="#57c785" transform="rotate(-24 67 3)" />
+    </g>
+  `,
+  patch: svg`
+    <g>
+      <path d="M28 27 Q60 14 92 22" stroke="#101820" stroke-width="4" stroke-linecap="round" fill="none" />
+      <circle cx="75" cy="32" r="9" fill="#101820" />
+    </g>
+  `,
+};
+
+const ANTENNAE_SPRITES: Record<LobsterPetAntennae, TemplateResult> = {
+  perky: svg`
+    <g class="lob-antennae" stroke="var(--lob-shell)" stroke-width="4" stroke-linecap="round" fill="none">
+      <path d="M46 14 Q38 4 31 7" />
+      <path d="M74 14 Q82 4 89 7" />
+    </g>
+  `,
+  droopy: svg`
+    <g class="lob-antennae" stroke="var(--lob-shell)" stroke-width="4" stroke-linecap="round" fill="none">
+      <path d="M46 14 Q36 8 34 18" />
+      <path d="M74 14 Q84 8 86 18" />
+    </g>
+  `,
+};
+
+// Same species as icons.lobster / the dreams-scene sleeper: smooth dome body
+// with stubby legs, side claws, antennae, and teal-glint eyes.
+function renderLobsterSvg(look: LobsterPetLook) {
+  return svg`
+    <svg
+      class="lobster-pet__svg"
+      viewBox="0 0 120 105"
+      preserveAspectRatio="xMidYMax meet"
+      aria-hidden="true"
+    >
+      ${ANTENNAE_SPRITES[look.antennae]}
+      <g class="lob-claw lob-claw--l">
+        <path
+          d="M20 42 C5 37 0 47 5 57 C10 67 20 62 25 52 C28 45 25 42 20 42 Z"
+          fill="var(--lob-claw)"
+        />
+      </g>
+      <g class="lob-claw lob-claw--r">
+        <path
+          d="M100 42 C115 37 120 47 115 57 C110 67 100 62 95 52 C92 45 95 42 100 42 Z"
+          fill="var(--lob-claw)"
+        />
+      </g>
+      <path
+        d="M60 8 C32 8 16 32 16 52 C16 72 30 90 44 95 L44 104 L54 104 L54 96 C58 97.5 62 97.5 66 96 L66 104 L76 104 L76 95 C90 90 104 72 104 52 C104 32 88 8 60 8 Z"
+        fill="var(--lob-shell)"
+      />
+      <ellipse cx="48" cy="28" rx="20" ry="11" fill="#ffffff" opacity="0.1" />
+      <g class="lob-eye-open">
+        <circle cx="45" cy="32" r="5.5" fill="#0a1014" />
+        <circle cx="75" cy="32" r="5.5" fill="#0a1014" />
+        <circle cx="46.5" cy="30.5" r="2.2" fill="var(--lob-glint, #00e5cc)" />
+        <circle cx="76.5" cy="30.5" r="2.2" fill="var(--lob-glint, #00e5cc)" />
+      </g>
+      <g
+        class="lob-eye-closed"
+        stroke="#0a1014"
+        stroke-width="3"
+        stroke-linecap="round"
+        fill="none"
+      >
+        <path d="M39 33 Q45 28 51 33" />
+        <path d="M69 33 Q75 28 81 33" />
+      </g>
+      ${look.accessory === "none" ? nothing : ACCESSORY_SPRITES[look.accessory]}
+    </svg>
+  `;
+}
+
+export class LobsterPet extends LitElement {
+  override createRenderRoot() {
+    return this;
+  }
+
+  @property({ attribute: false }) seed = 0;
+  @property({ attribute: false }) mode: LobsterPetMode = "idle";
+
+  @state() private act: LobsterPetAct | null = null;
+  @state() private spotPct = 80;
+  @state() private facing: 1 | -1 = 1;
+  @state() private entering = false;
+
+  private look: LobsterPetLook | null = null;
+  private rng: () => number = mulberry32(0);
+  private idleTimer: number | null = null;
+  private actEndTimer: number | null = null;
+  private enterTimer: number | null = null;
+  private restartPending = false;
+
+  override connectedCallback() {
+    super.connectedCallback();
+    document.addEventListener("visibilitychange", this.handleVisibilityChange);
+  }
+
+  override disconnectedCallback() {
+    document.removeEventListener("visibilitychange", this.handleVisibilityChange);
+    this.clearTimers();
+    super.disconnectedCallback();
+  }
+
+  override willUpdate(changed: Map<PropertyKey, unknown>) {
+    const seedChanged = this.look === null || changed.has("seed");
+    if (seedChanged) {
+      this.look = createLobsterPetLook(this.seed);
+      this.rng = mulberry32(this.seed ^ 0x9e3779b9);
+      this.spotPct = this.look.spotPct;
+      this.facing = this.look.facing;
+      // Reset the act loop inside the update pass; deferring state flips to
+      // updated() would chain a second update and trip lit's change-in-update
+      // warning.
+      this.clearTimers();
+      this.act = null;
+      this.entering = !prefersReducedMotion();
+      this.restartPending = this.entering;
+    } else if (changed.has("mode") && !prefersReducedMotion()) {
+      // Status flips get an immediate reaction; the act-end timer then
+      // reschedules from the new mode's pool.
+      this.performAct("startle");
+    }
+  }
+
+  override updated() {
+    if (!this.restartPending) {
+      return;
+    }
+    this.restartPending = false;
+    this.enterTimer = window.setTimeout(() => {
+      this.enterTimer = null;
+      this.entering = false;
+    }, ENTER_MS);
+    this.scheduleNextAct();
+  }
+
+  private readonly handleVisibilityChange = () => {
+    if (document.hidden) {
+      this.clearTimers();
+      this.act = null;
+    } else {
+      this.scheduleNextAct();
+    }
+  };
+
+  private readonly handlePoke = () => {
+    if (prefersReducedMotion()) {
+      return;
+    }
+    this.performAct("startle");
+  };
+
+  private clearTimers() {
+    for (const timer of [this.idleTimer, this.actEndTimer, this.enterTimer]) {
+      if (timer !== null) {
+        window.clearTimeout(timer);
+      }
+    }
+    this.idleTimer = null;
+    this.actEndTimer = null;
+    this.enterTimer = null;
+  }
+
+  private actProfile(): ActProfile | null {
+    if (this.mode === "busy" || this.mode === "offline") {
+      return LOBSTER_PET_MODE_ACTS[this.mode];
+    }
+    return this.look ? PERSONALITIES[this.look.personality] : null;
+  }
+
+  private scheduleNextAct() {
+    // Guard here, not just at activation: the visibilitychange resume path
+    // must also stay inert for reduced-motion users.
+    if (
+      !this.look ||
+      this.idleTimer !== null ||
+      this.actEndTimer !== null ||
+      prefersReducedMotion()
+    ) {
+      return;
+    }
+    const profile = this.actProfile();
+    if (!profile) {
+      return;
+    }
+    const delay = randomBetween(this.rng, profile.delayMs[0], profile.delayMs[1]);
+    this.idleTimer = window.setTimeout(() => {
+      this.idleTimer = null;
+      const nextProfile = this.actProfile();
+      if (!nextProfile || document.hidden) {
+        return;
+      }
+      this.performAct(pickWeighted(this.rng, nextProfile.acts));
+    }, delay);
+  }
+
+  private performAct(act: LobsterPetAct) {
+    this.clearTimers();
+    this.entering = false;
+    if (act === "scuttle") {
+      this.startScuttle();
+    }
+    this.act = act;
+    this.actEndTimer = window.setTimeout(() => {
+      this.actEndTimer = null;
+      this.act = null;
+      this.scheduleNextAct();
+    }, LOBSTER_PET_ACT_DURATION_MS[act]);
+  }
+
+  private startScuttle() {
+    if (!this.look) {
+      return;
+    }
+    const zone = SPOT_ZONES[this.look.side];
+    let target = Math.round(randomBetween(this.rng, zone[0], zone[1]));
+    // A same-spot walk reads as a glitch; nudge to the other zone edge.
+    if (Math.abs(target - this.spotPct) < 4) {
+      target =
+        Math.abs(zone[0] - this.spotPct) > Math.abs(zone[1] - this.spotPct) ? zone[0] : zone[1];
+    }
+    this.facing = target < this.spotPct ? -1 : 1;
+    this.spotPct = target;
+  }
+
+  override render() {
+    const look = this.look;
+    if (!look) {
+      return nothing;
+    }
+    const classes = [
+      "lobster-pet",
+      `lobster-pet--${this.mode}`,
+      this.entering ? "lobster-pet--entering" : "",
+      this.act ? `lobster-pet--act-${this.act}` : "",
+    ]
+      .filter(Boolean)
+      .join(" ");
+    const style = [
+      `--lob-shell:${look.palette.shell}`,
+      `--lob-claw:${look.palette.claw}`,
+      `--lob-dim:color-mix(in srgb, ${look.palette.shell} 72%, #10181f)`,
+      `--lob-scale:${look.scale}`,
+      `--lob-x:${this.spotPct}%`,
+      `--lob-face:${this.facing}`,
+      `--lob-blink-delay:${look.blinkDelayS}s`,
+    ].join(";");
+    return html`
+      <div class=${classes} style=${style} aria-hidden="true" @pointerdown=${this.handlePoke}>
+        <div class="lobster-pet__body">
+          ${renderLobsterSvg(look)}
+          <span class="lobster-pet__z" style="--i:0">z</span>
+          <span class="lobster-pet__z" style="--i:1">z</span>
+          <span class="lobster-pet__z" style="--i:2">Z</span>
+          <span class="lobster-pet__bubble" style="--i:0"></span>
+          <span class="lobster-pet__bubble" style="--i:1"></span>
+          <span class="lobster-pet__bubble" style="--i:2"></span>
+        </div>
+      </div>
+    `;
+  }
+}
+
+if (!customElements.get("openclaw-lobster-pet")) {
+  customElements.define("openclaw-lobster-pet", LobsterPet);
+}
diff --git a/ui/src/components/login-gate.ts b/ui/src/components/login-gate.ts
index c9261aba51a..13bacd5f023 100644
--- a/ui/src/components/login-gate.ts
+++ b/ui/src/components/login-gate.ts
@@ -1,5 +1,5 @@
 // Control UI component renders the login gate.
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import { ConnectErrorDetailCodes } from "../../../packages/gateway-protocol/src/connect-error-details.js";
 import { normalizeBasePath } from "../app-route-paths.ts";
@@ -12,6 +12,7 @@ import {
   shouldShowInsecureContextHint,
 } from "../lib/overview-hints.ts";
 import { normalizeLowercaseStringOrEmpty } from "../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import { renderConnectCommand } from "./connect-command.ts";
 import { icons } from "./icons.ts";
 
@@ -431,11 +432,7 @@ function renderLoginGate(props: LoginGateProps) {
   `;
 }
 
-class LoginGate extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class LoginGate extends OpenClawLightDomElement {
   @property({ attribute: false }) props?: LoginGateProps;
 
   override connectedCallback() {
diff --git a/ui/src/components/modal-dialog.test.ts b/ui/src/components/modal-dialog.test.ts
index 386c1f57fa7..532996db7e7 100644
--- a/ui/src/components/modal-dialog.test.ts
+++ b/ui/src/components/modal-dialog.test.ts
@@ -149,4 +149,18 @@ describe("openclaw-modal-dialog", () => {
     expect(document.activeElement).toBe(returnTarget);
     returnTarget.remove();
   });
+
+  it("reopens the same dialog element after reconnect", async () => {
+    const { modal, dialog } = await renderModal();
+
+    modal.remove();
+    expect(dialog.open).toBe(false);
+
+    container.append(modal);
+    await modal.updateComplete;
+    await nextFrame();
+
+    expect(dialog.open).toBe(true);
+    expect(modal.shadowRoot?.activeElement).toBe(dialog);
+  });
 });
diff --git a/ui/src/components/modal-dialog.ts b/ui/src/components/modal-dialog.ts
index f84dfa6e90b..ab9ee631bd7 100644
--- a/ui/src/components/modal-dialog.ts
+++ b/ui/src/components/modal-dialog.ts
@@ -1,7 +1,8 @@
 // Control UI component implements the modal dialog element.
-import { LitElement, css, html, nothing } from "lit";
+import { css, html, nothing } from "lit";
 import { property, query } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
+import { OpenClawLitElement } from "../lit/openclaw-element.ts";
 
 const FOCUSABLE_SELECTOR = [
   "a[href]",
@@ -13,7 +14,7 @@ const FOCUSABLE_SELECTOR = [
   "[tabindex]:not([tabindex='-1'])",
 ].join(",");
 
-export class OpenClawModalDialog extends LitElement {
+export class OpenClawModalDialog extends OpenClawLitElement {
   @property() label = "";
   @property() description = "";
 
@@ -85,6 +86,10 @@ export class OpenClawModalDialog extends LitElement {
   override connectedCallback() {
     super.connectedCallback();
     this.previouslyFocused = this.ownerDocument.activeElement;
+    // firstUpdated only runs once; retained dialogs must reopen on later connection epochs.
+    if (this.hasUpdated) {
+      this.openDialog();
+    }
   }
 
   override firstUpdated() {
@@ -152,6 +157,7 @@ export class OpenClawModalDialog extends LitElement {
   }
 
   private closeDialog() {
+    this.opened = false;
     const dialog = this.dialogElement;
     if (!dialog?.open) {
       return;
diff --git a/ui/src/components/native-link-menu.test.ts b/ui/src/components/native-link-menu.test.ts
new file mode 100644
index 00000000000..83a145dfb7b
--- /dev/null
+++ b/ui/src/components/native-link-menu.test.ts
@@ -0,0 +1,88 @@
+/* @vitest-environment jsdom */
+
+import { html, render } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { NativeLinkMenu, type NativeLinkMenuAction } from "./native-link-menu.ts";
+
+const containers: HTMLElement[] = [];
+
+afterEach(() => {
+  for (const container of containers.splice(0)) {
+    container.remove();
+  }
+});
+
+async function mountMenu(options: {
+  trigger?: HTMLAnchorElement;
+  onAction?: (action: NativeLinkMenuAction) => void;
+  onClose?: () => void;
+}): Promise<NativeLinkMenu> {
+  const container = document.createElement("div");
+  containers.push(container);
+  document.body.append(container);
+  render(
+    html`<openclaw-native-link-menu
+      .x=${100}
+      .y=${100}
+      .trigger=${options.trigger ?? null}
+      .onAction=${options.onAction ?? (() => {})}
+      .onClose=${options.onClose ?? (() => {})}
+    ></openclaw-native-link-menu>`,
+    container,
+  );
+  const menu = container.querySelector("openclaw-native-link-menu");
+  if (!(menu instanceof NativeLinkMenu)) {
+    throw new Error("Expected native link menu");
+  }
+  await menu.updateComplete;
+  return menu;
+}
+
+function menuItems(menu: ParentNode): HTMLButtonElement[] {
+  return [...menu.querySelectorAll<HTMLButtonElement>('[role="menuitem"]')];
+}
+
+describe("native link menu", () => {
+  it("renders the native link actions in order and closes before dispatch", async () => {
+    const calls: string[] = [];
+    const menu = await mountMenu({
+      onClose: () => calls.push("close"),
+      onAction: (action) => calls.push(action),
+    });
+    const items = menuItems(menu);
+
+    expect(items.map((item) => item.textContent?.trim())).toEqual([
+      "Open in Sidebar",
+      "Open in Default Browser",
+      "Copy Link",
+    ]);
+
+    items[0]?.click();
+    expect(calls).toEqual(["close", "inline"]);
+  });
+
+  it("closes on Escape and outside pointerdown while preserving trigger clicks", async () => {
+    const trigger = document.createElement("a");
+    trigger.href = "https://example.com";
+    document.body.append(trigger);
+    containers.push(trigger);
+    const onClose = vi.fn();
+    await mountMenu({ trigger, onClose });
+
+    const escape = new KeyboardEvent("keydown", {
+      key: "Escape",
+      bubbles: true,
+      cancelable: true,
+    });
+    document.dispatchEvent(escape);
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(escape.defaultPrevented).toBe(true);
+    expect(document.activeElement).toBe(trigger);
+
+    document.body.dispatchEvent(new Event("pointerdown", { bubbles: true, composed: true }));
+    expect(onClose).toHaveBeenCalledTimes(2);
+
+    trigger.dispatchEvent(new Event("pointerdown", { bubbles: true, composed: true }));
+    expect(onClose).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/ui/src/components/native-link-menu.ts b/ui/src/components/native-link-menu.ts
new file mode 100644
index 00000000000..50e645d6c7e
--- /dev/null
+++ b/ui/src/components/native-link-menu.ts
@@ -0,0 +1,106 @@
+import { LitElement, html } from "lit";
+import { property } from "lit/decorators.js";
+import { t } from "../i18n/index.ts";
+import { icons } from "./icons.ts";
+
+export type NativeLinkMenuAction = "inline" | "external" | "copy";
+
+export class NativeLinkMenu extends LitElement {
+  override createRenderRoot() {
+    return this;
+  }
+
+  @property({ attribute: false }) x = 0;
+  @property({ attribute: false }) y = 0;
+  @property({ attribute: false }) trigger: HTMLAnchorElement | null = null;
+  @property({ attribute: false }) onAction: (action: NativeLinkMenuAction) => void = () => {};
+  @property({ attribute: false }) onClose: () => void = () => {};
+
+  override connectedCallback() {
+    super.connectedCallback();
+    document.addEventListener("pointerdown", this.handleDocumentPointerDown, true);
+    document.addEventListener("keydown", this.handleDocumentKeydown, true);
+  }
+
+  override disconnectedCallback() {
+    document.removeEventListener("pointerdown", this.handleDocumentPointerDown, true);
+    document.removeEventListener("keydown", this.handleDocumentKeydown, true);
+    super.disconnectedCallback();
+  }
+
+  protected override firstUpdated() {
+    this.querySelector<HTMLElement>('[role="menuitem"]')?.focus();
+  }
+
+  private readonly handleDocumentPointerDown = (event: PointerEvent) => {
+    const path = event.composedPath();
+    const menu = this.querySelector(".native-link-menu");
+    if ((menu && path.includes(menu)) || (this.trigger && path.includes(this.trigger))) {
+      return;
+    }
+    this.onClose();
+  };
+
+  private readonly handleDocumentKeydown = (event: KeyboardEvent) => {
+    if (event.key !== "Escape") {
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    this.trigger?.focus();
+    this.onClose();
+  };
+
+  private runAction(action: NativeLinkMenuAction) {
+    this.onClose();
+    this.onAction(action);
+  }
+
+  override render() {
+    const menuWidth = 264;
+    const menuMaxHeight = 136;
+    const clampedX = Math.max(8, Math.min(this.x, window.innerWidth - menuWidth - 8));
+    const clampedY = Math.max(8, Math.min(this.y, window.innerHeight - menuMaxHeight - 8));
+    return html`
+      <div
+        class="session-menu native-link-menu"
+        role="menu"
+        aria-label=${t("nativeLinkMenu.label")}
+        style="left: ${clampedX}px; top: ${clampedY}px;"
+      >
+        <button
+          type="button"
+          class="session-menu__item"
+          role="menuitem"
+          @click=${() => this.runAction("inline")}
+        >
+          <span class="session-menu__icon" aria-hidden="true">${icons.panelRightOpen}</span>
+          <span class="session-menu__text">${t("nativeLinkMenu.openInline")}</span>
+        </button>
+        <button
+          type="button"
+          class="session-menu__item"
+          role="menuitem"
+          @click=${() => this.runAction("external")}
+        >
+          <span class="session-menu__icon" aria-hidden="true">${icons.externalLink}</span>
+          <span class="session-menu__text">${t("nativeLinkMenu.openExternal")}</span>
+        </button>
+        <div class="session-menu__separator" role="separator"></div>
+        <button
+          type="button"
+          class="session-menu__item"
+          role="menuitem"
+          @click=${() => this.runAction("copy")}
+        >
+          <span class="session-menu__icon" aria-hidden="true">${icons.copy}</span>
+          <span class="session-menu__text">${t("nativeLinkMenu.copy")}</span>
+        </button>
+      </div>
+    `;
+  }
+}
+
+if (!customElements.get("openclaw-native-link-menu")) {
+  customElements.define("openclaw-native-link-menu", NativeLinkMenu);
+}
diff --git a/ui/src/components/resizable-divider.ts b/ui/src/components/resizable-divider.ts
index e2f4461c375..80088bd2a1e 100644
--- a/ui/src/components/resizable-divider.ts
+++ b/ui/src/components/resizable-divider.ts
@@ -1,12 +1,13 @@
 // Control UI component implements the resizable divider element.
-import { LitElement, css, nothing } from "lit";
+import { css, nothing } from "lit";
 import { property } from "lit/decorators.js";
+import { OpenClawLitElement } from "../lit/openclaw-element.ts";
 
 /**
  * An accessible draggable divider for resizable split views.
  * Dispatches 'resize' events with { splitRatio: number } detail.
  */
-export class ResizableDivider extends LitElement {
+export class ResizableDivider extends OpenClawLitElement {
   @property({ type: Number }) splitRatio = 0.6;
   @property({ type: Number }) minRatio = 0.4;
   @property({ type: Number }) maxRatio = 0.7;
diff --git a/ui/src/components/session-menu.ts b/ui/src/components/session-menu.ts
index 4be037f7b40..3ae937b18ea 100644
--- a/ui/src/components/session-menu.ts
+++ b/ui/src/components/session-menu.ts
@@ -1,6 +1,7 @@
-import { LitElement, html, nothing, type PropertyValues } from "lit";
+import { html, nothing, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import { icons } from "./icons.ts";
 
 export type SessionMenuData = {
@@ -33,11 +34,7 @@ const EMPTY_SESSION: SessionMenuData = {
   category: null,
 };
 
-class SessionMenu extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class SessionMenu extends OpenClawLightDomElement {
   @property({ attribute: false }) session: SessionMenuData = EMPTY_SESSION;
   @property({ attribute: false }) x = 0;
   @property({ attribute: false }) y = 0;
diff --git a/ui/src/components/settings-sidebar.ts b/ui/src/components/settings-sidebar.ts
index f532ac225a3..372f7c3b14e 100644
--- a/ui/src/components/settings-sidebar.ts
+++ b/ui/src/components/settings-sidebar.ts
@@ -11,7 +11,7 @@ import { pathForRoute, type RouteId } from "../app-route-paths.ts";
 import { t } from "../i18n/index.ts";
 import { icons } from "./icons.ts";
 
-export type SettingsSidebarProps = {
+type SettingsSidebarProps = {
   basePath: string;
   activeRouteId: RouteId;
   connected: boolean;
@@ -19,10 +19,9 @@ export type SettingsSidebarProps = {
   onExit: () => void;
   onNavigate: (routeId: RouteId) => void;
   onPreload?: (routeId: RouteId) => Promise<void> | void;
+  preloadTimers: Map<EventTarget, ReturnType<typeof globalThis.setTimeout>>;
 };
 
-const preloadTimers = new Map<EventTarget, ReturnType<typeof globalThis.setTimeout>>();
-
 function renderItem(props: SettingsSidebarProps, routeId: RouteId) {
   const active = props.activeRouteId === routeId;
   return html`
@@ -31,13 +30,13 @@ function renderItem(props: SettingsSidebarProps, routeId: RouteId) {
       class="settings-sidebar__item ${active ? "settings-sidebar__item--active" : ""}"
       aria-current=${active ? "page" : nothing}
       @focus=${(event: Event) =>
-        scheduleRoutePreload(preloadTimers, routeId, event, props.onPreload, active)}
-      @blur=${(event: Event) => cancelRoutePreload(preloadTimers, event)}
+        scheduleRoutePreload(props.preloadTimers, routeId, event, props.onPreload, active)}
+      @blur=${(event: Event) => cancelRoutePreload(props.preloadTimers, event)}
       @pointerenter=${(event: Event) =>
-        scheduleRoutePreload(preloadTimers, routeId, event, props.onPreload, active)}
-      @pointerleave=${(event: Event) => cancelRoutePreload(preloadTimers, event)}
+        scheduleRoutePreload(props.preloadTimers, routeId, event, props.onPreload, active)}
+      @pointerleave=${(event: Event) => cancelRoutePreload(props.preloadTimers, event)}
       @touchstart=${(event: TouchEvent) =>
-        scheduleRoutePreload(preloadTimers, routeId, event, props.onPreload, active, true)}
+        scheduleRoutePreload(props.preloadTimers, routeId, event, props.onPreload, active, true)}
       @click=${(event: MouseEvent) => {
         if (
           event.defaultPrevented ||
diff --git a/ui/src/components/terminal/terminal-panel.test.ts b/ui/src/components/terminal/terminal-panel.test.ts
index 0d85c7edd71..6f643ff7bd4 100644
--- a/ui/src/components/terminal/terminal-panel.test.ts
+++ b/ui/src/components/terminal/terminal-panel.test.ts
@@ -1,6 +1,7 @@
 /* @vitest-environment jsdom */
 
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { i18n } from "../../i18n/index.ts";
 import type { TerminalGatewayClient } from "./terminal-connection.ts";
 
 type CreateOptions = {
@@ -12,6 +13,39 @@ type CreateOptions = {
 
 const createGhosttyTerminalMock = vi.hoisted(() => vi.fn());
 
+function createTerminalController(dispose: () => void = vi.fn()) {
+  return {
+    terminal: {
+      cols: 100,
+      rows: 30,
+      viewportY: 0,
+      write: vi.fn(),
+      focus: vi.fn(),
+    },
+    write: vi.fn(),
+    fit: vi.fn(),
+    dispose,
+  };
+}
+
+function terminalOpenResult(sessionId: string) {
+  return {
+    sessionId,
+    agentId: "ops",
+    shell: "/bin/zsh",
+    cwd: "/work/ops",
+    confined: false,
+  };
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((next) => {
+    resolve = next;
+  });
+  return { promise, resolve };
+}
+
 vi.mock("./terminal-runtime.ts", () => {
   return { createIsolatedGhosttyTerminal: createGhosttyTerminalMock };
 });
@@ -19,11 +53,16 @@ vi.mock("./terminal-runtime.ts", () => {
 import { OpenClawTerminalPanel } from "./terminal-panel.ts";
 
 describe("OpenClawTerminalPanel", () => {
-  afterEach(() => {
+  beforeEach(async () => {
+    await i18n.setLocale("en");
+  });
+
+  afterEach(async () => {
     document.body.replaceChildren();
     localStorage.clear();
     sessionStorage.clear();
     createGhosttyTerminalMock.mockReset();
+    await i18n.setLocale("en");
   });
 
   it("opens new sessions for the selected agent", async () => {
@@ -230,4 +269,174 @@ describe("OpenClawTerminalPanel", () => {
     expect(createGhosttyTerminalMock).toHaveBeenCalledTimes(2);
     expect(controllers[1].write).not.toHaveBeenCalled();
   });
+
+  it("rebinds to a replacement client while availability stays true", async () => {
+    const controllers = [createTerminalController(), createTerminalController()];
+    createGhosttyTerminalMock
+      .mockResolvedValueOnce(controllers[0])
+      .mockResolvedValueOnce(controllers[1]);
+
+    const oldRequests: string[] = [];
+    const oldUnsubscribe = vi.fn();
+    const oldClient: TerminalGatewayClient = {
+      request: async <T>(method: string) => {
+        oldRequests.push(method);
+        return (method === "terminal.open" ? terminalOpenResult("old-session") : {}) as T;
+      },
+      addEventListener: () => oldUnsubscribe,
+    };
+    const newRequests: string[] = [];
+    const newClient: TerminalGatewayClient = {
+      request: async <T>(method: string) => {
+        newRequests.push(method);
+        if (method === "terminal.list") {
+          return { sessions: [] } as T;
+        }
+        return (method === "terminal.open" ? terminalOpenResult("new-session") : {}) as T;
+      },
+      addEventListener: () => () => {},
+    };
+    const panel = document.createElement("openclaw-terminal-panel") as OpenClawTerminalPanel;
+    panel.client = oldClient;
+    panel.available = true;
+    document.body.append(panel);
+    panel.toggle();
+
+    await vi.waitFor(() => {
+      expect(sessionStorage.getItem("openclaw.terminal.sessions.v1")).toContain("old-session");
+    });
+    panel.client = newClient;
+    await panel.updateComplete;
+
+    await vi.waitFor(() => {
+      expect(newRequests).toContain("terminal.open");
+    });
+    expect(oldRequests.filter((method) => method === "terminal.open")).toHaveLength(1);
+    expect(oldUnsubscribe).toHaveBeenCalledOnce();
+    expect(controllers[0].dispose).toHaveBeenCalledOnce();
+    expect(createGhosttyTerminalMock).toHaveBeenCalledTimes(2);
+  });
+
+  it("discards an async boot that finishes after disconnect and reconnect", async () => {
+    const staleController = createTerminalController();
+    const currentController = createTerminalController();
+    const staleBoot = deferred<typeof staleController>();
+    createGhosttyTerminalMock
+      .mockImplementationOnce(async () => staleBoot.promise)
+      .mockResolvedValueOnce(currentController);
+    const requests: string[] = [];
+    const client: TerminalGatewayClient = {
+      request: async <T>(method: string) => {
+        requests.push(method);
+        return (method === "terminal.open" ? terminalOpenResult("current-session") : {}) as T;
+      },
+      addEventListener: () => () => {},
+    };
+    const panel = document.createElement("openclaw-terminal-panel") as OpenClawTerminalPanel;
+    panel.client = client;
+    panel.available = true;
+    document.body.append(panel);
+    panel.toggle();
+
+    await vi.waitFor(() => {
+      expect(createGhosttyTerminalMock).toHaveBeenCalledOnce();
+    });
+    const staleOptions = createGhosttyTerminalMock.mock.calls[0]![0] as CreateOptions;
+    const staleHost = staleOptions.parent;
+    panel.remove();
+    document.body.append(panel);
+
+    await vi.waitFor(() => {
+      expect(createGhosttyTerminalMock).toHaveBeenCalledTimes(2);
+      expect(requests.filter((method) => method === "terminal.open")).toHaveLength(1);
+    });
+    staleBoot.resolve(staleController);
+
+    await vi.waitFor(() => {
+      expect(staleController.dispose).toHaveBeenCalledOnce();
+    });
+    expect(staleHost.isConnected).toBe(false);
+    expect(requests.filter((method) => method === "terminal.open")).toHaveLength(1);
+    expect(currentController.dispose).not.toHaveBeenCalled();
+  });
+
+  it("removes resize listeners when disconnected mid-drag", async () => {
+    createGhosttyTerminalMock.mockResolvedValue(createTerminalController());
+    const client: TerminalGatewayClient = {
+      request: async <T>(method: string) =>
+        (method === "terminal.open" ? terminalOpenResult("session-1") : {}) as T,
+      addEventListener: () => () => {},
+    };
+    const panel = document.createElement("openclaw-terminal-panel") as OpenClawTerminalPanel;
+    panel.client = client;
+    panel.available = true;
+    document.body.append(panel);
+    panel.toggle();
+    await panel.updateComplete;
+
+    panel.renderRoot
+      .querySelector(".tp-resizer")
+      ?.dispatchEvent(new MouseEvent("pointerdown", { bubbles: true, clientX: 20, clientY: 200 }));
+    panel.remove();
+    window.dispatchEvent(new MouseEvent("pointermove", { clientX: 20, clientY: 20 }));
+
+    expect(document.documentElement.style.getPropertyValue("--oc-terminal-reserve-bottom")).toBe(
+      "0px",
+    );
+    expect(document.documentElement.style.getPropertyValue("--oc-terminal-reserve-right")).toBe(
+      "0px",
+    );
+  });
+
+  it("removes a tab host even when controller disposal throws", () => {
+    const panel = document.createElement("openclaw-terminal-panel") as OpenClawTerminalPanel;
+    const host = document.createElement("div");
+    document.body.append(host);
+    const dispose = vi.fn(() => {
+      throw new Error("dispose failed");
+    });
+    const disposeTab = (
+      panel as unknown as {
+        disposeTab(tab: { controller: { dispose(): void }; host: HTMLDivElement }): void;
+      }
+    ).disposeTab.bind(panel);
+
+    expect(() => disposeTab({ controller: { dispose }, host })).not.toThrow();
+    expect(dispose).toHaveBeenCalledOnce();
+    expect(host.isConnected).toBe(false);
+  });
+
+  it("retranslates cached exit state when the locale changes", async () => {
+    createGhosttyTerminalMock.mockResolvedValue(createTerminalController());
+    let listener: ((event: { event: string; payload: unknown }) => void) | undefined;
+    const client: TerminalGatewayClient = {
+      request: async <T>(method: string) =>
+        (method === "terminal.open" ? terminalOpenResult("session-1") : {}) as T,
+      addEventListener: (nextListener) => {
+        listener = nextListener;
+        return () => {
+          listener = undefined;
+        };
+      },
+    };
+    const panel = document.createElement("openclaw-terminal-panel") as OpenClawTerminalPanel;
+    panel.client = client;
+    panel.available = true;
+    document.body.append(panel);
+    panel.toggle();
+    await vi.waitFor(() => {
+      expect(sessionStorage.getItem("openclaw.terminal.sessions.v1")).toContain("session-1");
+    });
+
+    listener?.({
+      event: "terminal.exit",
+      payload: { sessionId: "session-1", exitCode: null, reason: "detached" },
+    });
+    await panel.updateComplete;
+    expect(panel.renderRoot.querySelector(".tp-tab__status")?.textContent).toBe("detached");
+
+    await i18n.setLocale("de");
+    await panel.updateComplete;
+    expect(panel.renderRoot.querySelector(".tp-tab__status")?.textContent).toBe("getrennt");
+  });
 });
diff --git a/ui/src/components/terminal/terminal-panel.ts b/ui/src/components/terminal/terminal-panel.ts
index 7a6eaeea70e..f7c3108a189 100644
--- a/ui/src/components/terminal/terminal-panel.ts
+++ b/ui/src/components/terminal/terminal-panel.ts
@@ -5,9 +5,10 @@ import type { GhosttyTerminalController } from "@openclaw/libterminal/browser";
 // tabs. Each tab hosts one libterminal Ghostty controller wired to a gateway PTY
 // session. The browser runtime is dynamically imported on first open so it
 // never weighs down the initial Control UI bundle.
-import { LitElement, css, html, nothing, svg } from "lit";
+import { css, html, nothing, svg } from "lit";
 import { property, state } from "lit/decorators.js";
 import { t } from "../../i18n/index.ts";
+import { OpenClawLitElement } from "../../lit/openclaw-element.ts";
 import { TerminalConnection, type TerminalGatewayClient } from "./terminal-connection.ts";
 import { createIsolatedGhosttyTerminal } from "./terminal-runtime.ts";
 import { terminalTheme } from "./terminal-theme.ts";
@@ -34,22 +35,25 @@ type PanelLayout = {
 
 type TerminalTabState = {
   id: string;
+  sequence: number;
   gatewaySessionId: string;
   /** Shell basename shown on the tab, e.g. "zsh". */
-  shellName: string;
-  /** Agent + cwd shown on hover. */
-  hint: string;
+  shellName: string | null;
+  agentId: string | null;
+  cwd: string | null;
   controller: GhosttyTerminalController;
   host: HTMLDivElement;
   status: "live" | "exited";
-  statusLabel?: string;
-  /**
-   * Set when the tab is closed while its terminal.open RPC is still in flight
-   * (gatewaySessionId is empty in that window, so closeTab cannot close the
-   * server session). The open continuation checks this and closes the freshly
-   * created session instead of wiring it to the disposed terminal.
-   */
-  cancelled?: boolean;
+  exitReason?: string;
+  exitCode?: number | null;
+  /** Why an in-flight open/attach must not adopt this disposed terminal. */
+  cancelled?: "close" | "lifecycle";
+};
+
+type TerminalOperation = {
+  generation: number;
+  client: TerminalGatewayClient;
+  signal: AbortSignal;
 };
 
 /** Reduces a shell path to a tab label, e.g. "/bin/zsh" -> "zsh". */
@@ -58,6 +62,29 @@ function shellBasename(shell: string): string {
   return base && base.length > 0 ? base : "shell";
 }
 
+function terminalTabLabel(tab: TerminalTabState): string {
+  return tab.shellName ?? t("terminal.tabLabel", { n: String(tab.sequence) });
+}
+
+function terminalTabHint(tab: TerminalTabState): string | null {
+  if (tab.agentId === null || tab.cwd === null) {
+    return null;
+  }
+  return t("terminal.tabHint", { agent: tab.agentId, cwd: tab.cwd });
+}
+
+function terminalTabStatusLabel(tab: TerminalTabState): string | null {
+  if (tab.status !== "exited") {
+    return null;
+  }
+  if (tab.exitReason === "detached") {
+    return t("terminal.detached");
+  }
+  return tab.exitReason === "process_exit" && typeof tab.exitCode === "number"
+    ? t("terminal.exitedCode", { code: String(tab.exitCode) })
+    : t("terminal.exited");
+}
+
 const LAYOUT_KEY = "openclaw.terminal.panel.v1";
 // Session ids for reattach after a reload/reconnect. Deliberately
 // sessionStorage, not localStorage: attach is take-over, and a shared
@@ -125,7 +152,7 @@ function loadPersistedSessionIds(): string[] {
 }
 
 /** `<openclaw-terminal-panel>` — the dockable Control UI shell surface. */
-export class OpenClawTerminalPanel extends LitElement {
+export class OpenClawTerminalPanel extends OpenClawLitElement {
   /** Gateway client used for terminal.* RPCs; null until connected. */
   @property({ attribute: false }) client: TerminalGatewayClient | null = null;
   /** Agent whose workspace and sandbox policy own newly opened sessions. */
@@ -150,6 +177,12 @@ export class OpenClawTerminalPanel extends LitElement {
   @state() private errorText: string | null = null;
 
   private connection: TerminalConnection | null = null;
+  private activeClient: TerminalGatewayClient | null = null;
+  private activeAvailable = false;
+  private lifecycleGeneration = 0;
+  private lifecycleAbortController = new AbortController();
+  private lifecycleSyncToken = 0;
+  private resizeCleanup: (() => void) | null = null;
   private tabSeq = 0;
   private readonly onGlobalKeyDown = (event: KeyboardEvent) => this.handleGlobalKey(event);
   private readonly onToggleRequest = (event: Event) => this.handleToggleRequest(event);
@@ -169,6 +202,8 @@ export class OpenClawTerminalPanel extends LitElement {
 
   override connectedCallback(): void {
     super.connectedCallback();
+    this.activeClient = this.client;
+    this.activeAvailable = this.available;
     if (!this.fullscreen) {
       const layout = loadLayout();
       this.dock = layout.dock;
@@ -198,27 +233,13 @@ export class OpenClawTerminalPanel extends LitElement {
     document.documentElement.style.setProperty("--oc-terminal-reserve-bottom", "0px");
     document.documentElement.style.setProperty("--oc-terminal-reserve-right", "0px");
     this.disposeAllTabs();
+    this.activeClient = null;
+    this.activeAvailable = false;
   }
 
   override updated(changed: Map<string, unknown>): void {
-    if (changed.has("available")) {
-      if (!this.available) {
-        // The surface disappeared (gateway disconnect/disable). Tear down local
-        // tabs and the connection (disposeAllTabs drops the gateway
-        // subscription too). Server sessions survive a disconnect for the
-        // detach grace period, and their ids stay persisted, so the restore on
-        // reconnect reattaches them instead of opening fresh shells. Hide the
-        // panel WITHOUT persisting: a disconnect must not overwrite the user's
-        // open preference, or the reconnect path would never auto-reopen.
-        this.open = false;
-        this.disposeAllTabs();
-      } else if (!this.open && (this.fullscreen || loadLayout().open)) {
-        // Hello arrived after mount (or a reconnect); restore the persisted
-        // open state (fullscreen documents are always open while available)
-        // and reattach persisted sessions where possible.
-        this.open = true;
-        void this.restoreSessions();
-      }
+    if (changed.has("client") || changed.has("available")) {
+      this.scheduleLifecycleSync();
     }
     if (changed.has("themeMode")) {
       const theme = terminalTheme(this.themeMode);
@@ -251,6 +272,61 @@ export class OpenClawTerminalPanel extends LitElement {
     this.syncLayoutReservation();
   }
 
+  private scheduleLifecycleSync(): void {
+    const token = ++this.lifecycleSyncToken;
+    const generation = this.lifecycleGeneration;
+    // State teardown inside Lit's updated hook schedules a nested update.
+    // Defer it; token + generation reject superseded connection epochs.
+    queueMicrotask(() => {
+      if (
+        token !== this.lifecycleSyncToken ||
+        generation !== this.lifecycleGeneration ||
+        !this.isConnected
+      ) {
+        return;
+      }
+      this.synchronizeLifecycle();
+    });
+  }
+
+  private synchronizeLifecycle(): void {
+    const clientChanged = this.client !== this.activeClient;
+    const availabilityChanged = this.available !== this.activeAvailable;
+    if (!clientChanged && !availabilityChanged) {
+      return;
+    }
+    if (clientChanged) {
+      this.activeClient = this.client;
+    }
+    this.activeAvailable = this.available;
+    const becameUnavailable = availabilityChanged && !this.available;
+    if (clientChanged || becameUnavailable) {
+      this.disposeAllTabs();
+    }
+    let shouldRestore = clientChanged && this.available && this.open;
+    if (availabilityChanged) {
+      if (!this.available) {
+        // The surface disappeared (gateway disconnect/disable). Tear down local
+        // tabs and the connection (disposeAllTabs drops the gateway
+        // subscription too). Server sessions survive a disconnect for the
+        // detach grace period, and their ids stay persisted, so the restore on
+        // reconnect reattaches them instead of opening fresh shells. Hide the
+        // panel WITHOUT persisting: a disconnect must not overwrite the user's
+        // open preference, or the reconnect path would never auto-reopen.
+        this.open = false;
+      } else if (!this.open && (this.fullscreen || loadLayout().open)) {
+        // Hello arrived after mount (or a reconnect); restore the persisted
+        // open state (fullscreen documents are always open while available)
+        // and reattach persisted sessions where possible.
+        this.open = true;
+        shouldRestore = true;
+      }
+    }
+    if (shouldRestore) {
+      void this.restoreSessions();
+    }
+  }
+
   /**
    * Publishes the dock's footprint as CSS variables on the document root so the
    * Control UI shell reserves space for it (via `.content` margins) instead of
@@ -326,27 +402,39 @@ export class OpenClawTerminalPanel extends LitElement {
    * the gateway still has them, otherwise fall back to one fresh session.
    */
   private async restoreSessions(): Promise<void> {
-    if (!this.client || !this.available || this.booting || this.tabs.length > 0) {
-      await this.ensureInitialSession();
+    const operation = this.captureTerminalOperation();
+    if (!operation || this.booting || this.tabs.length > 0) {
       return;
     }
     const persisted = loadPersistedSessionIds();
     if (persisted.length > 0) {
       this.booting = true;
       try {
-        if (!this.connection) {
-          this.connection = new TerminalConnection(this.client);
+        const connection = this.connectionFor(operation);
+        const listed = await connection.list();
+        if (!this.isTerminalOperationCurrent(operation)) {
+          return;
         }
-        const listed = await this.connection.list();
         const known = new Set(listed.map((session) => session.sessionId));
         for (const sessionId of persisted.filter((id) => known.has(id))) {
-          await this.attachSession(sessionId);
+          await this.attachSession(sessionId, operation);
+          if (!this.isTerminalOperationCurrent(operation)) {
+            return;
+          }
         }
       } catch {
+        if (!this.isTerminalOperationCurrent(operation)) {
+          return;
+        }
         // terminal.list failed (older gateway, surface flapping): fall through
         // to a fresh session below.
       } finally {
-        this.booting = false;
+        if (this.isTerminalOperationCurrent(operation)) {
+          this.booting = false;
+        }
+      }
+      if (!this.isTerminalOperationCurrent(operation)) {
+        return;
       }
       // Prune ids the gateway no longer knows (reaped or externally closed).
       this.persistLiveSessions();
@@ -361,27 +449,24 @@ export class OpenClawTerminalPanel extends LitElement {
   }
 
   /** Boots a tab with a libterminal controller, ready for an open or attach RPC. */
-  private async bootTab(): Promise<{
+  private async bootTab(operation: TerminalOperation): Promise<{
     tab: TerminalTabState;
     connection: TerminalConnection;
     cols: number;
     rows: number;
   }> {
-    if (!this.client) {
-      throw new Error("terminal client unavailable");
-    }
-    if (!this.connection) {
-      this.connection = new TerminalConnection(this.client);
-    }
+    const connection = this.connectionFor(operation);
     // Captured so the cancelled-open cleanup can close the session even if a
     // teardown swaps this.connection while the open/attach RPC is in flight.
-    const connection = this.connection;
     const host = document.createElement("div");
     host.className = "tp-host";
     const id = `tab-${++this.tabSeq}`;
     // Wait for the panel (and its .tp-viewport) to render before attaching the
     // ghostty host, so the terminal opens into a laid-out, measurable node.
     await this.updateComplete;
+    if (!this.isTerminalOperationCurrent(operation)) {
+      throw new Error("terminal operation cancelled");
+    }
     const viewport = this.renderRoot.querySelector(".tp-viewport");
     if (!viewport) {
       throw new Error("terminal viewport unavailable");
@@ -400,6 +485,7 @@ export class OpenClawTerminalPanel extends LitElement {
           theme: terminalTheme(this.themeMode),
           scrollback: 5000,
         },
+        signal: operation.signal,
         // The browser controller owns these subscriptions and their teardown.
         // Ignore startup callbacks until the Gateway session is adopted.
         onData: (bytes) => {
@@ -419,11 +505,21 @@ export class OpenClawTerminalPanel extends LitElement {
       host.remove();
       throw error;
     }
+    if (!this.isTerminalOperationCurrent(operation)) {
+      try {
+        controller.dispose();
+      } finally {
+        host.remove();
+      }
+      throw new Error("terminal operation cancelled");
+    }
     const tab: TerminalTabState = {
       id,
+      sequence: this.tabSeq,
       gatewaySessionId: "",
-      shellName: t("terminal.tabLabel", { n: String(this.tabSeq) }),
-      hint: "",
+      shellName: null,
+      agentId: null,
+      cwd: null,
       controller,
       host,
       status: "live",
@@ -456,7 +552,8 @@ export class OpenClawTerminalPanel extends LitElement {
   ): void {
     tab.gatewaySessionId = result.sessionId;
     tab.shellName = shellBasename(result.shell);
-    tab.hint = t("terminal.tabHint", { agent: result.agentId, cwd: result.cwd });
+    tab.agentId = result.agentId;
+    tab.cwd = result.cwd;
     // Libterminal observes layout before the Gateway session exists. Resync the
     // current grid now so a resize during the open/attach RPC is not lost.
     const { cols, rows } = tab.controller.terminal;
@@ -476,7 +573,8 @@ export class OpenClawTerminalPanel extends LitElement {
   }
 
   private async openSession(): Promise<void> {
-    if (!this.client || !this.available || this.booting) {
+    const operation = this.captureTerminalOperation();
+    if (!operation || this.booting) {
       return;
     }
     this.booting = true;
@@ -486,43 +584,60 @@ export class OpenClawTerminalPanel extends LitElement {
     // Tracked outside the try so the catch can dispose a tab whose open failed.
     let createdTab: TerminalTabState | undefined;
     try {
-      const boot = await this.bootTab();
+      const boot = await this.bootTab(operation);
       createdTab = boot.tab;
       const result = await boot.connection.open(
         { agentId, cols: boot.cols, rows: boot.rows },
         this.tabSink(boot.tab),
       );
-      if (boot.tab.cancelled) {
+      if (!this.isTerminalOperationCurrent(operation) || boot.tab.cancelled) {
         // The tab's close button was clicked while the open RPC was in flight.
         // The server session is live and its sink registered; close it now or
         // it survives invisibly (eating the session cap) until disconnect.
         void boot.connection.close(result.sessionId);
+        if (this.tabs.includes(boot.tab)) {
+          boot.tab.cancelled = "lifecycle";
+          this.dropFailedTab(boot.tab);
+        }
         return;
       }
       this.adoptSession(boot.tab, result);
       boot.tab.controller.terminal.focus();
     } catch (err) {
-      this.errorText = err instanceof Error ? err.message : String(err);
       // A failed open (e.g. terminal disabled or a sandboxed agent is refused)
       // must not leave a phantom "live" tab with no server session. Drop it but
       // keep the panel open so the error stays visible.
-      if (createdTab && !createdTab.gatewaySessionId) {
+      if (createdTab && !createdTab.gatewaySessionId && this.tabs.includes(createdTab)) {
         this.dropFailedTab(createdTab);
       }
+      if (!this.isTerminalOperationCurrent(operation)) {
+        return;
+      }
+      this.errorText = err instanceof Error ? err.message : String(err);
     } finally {
-      this.booting = false;
+      if (this.isTerminalOperationCurrent(operation)) {
+        this.booting = false;
+      }
     }
   }
 
   /** Reattaches one persisted session; returns false when it is gone. */
-  private async attachSession(sessionId: string): Promise<boolean> {
+  private async attachSession(sessionId: string, operation: TerminalOperation): Promise<boolean> {
     let createdTab: TerminalTabState | undefined;
     try {
-      const boot = await this.bootTab();
+      const boot = await this.bootTab(operation);
       createdTab = boot.tab;
       const result = await boot.connection.attach(sessionId, this.tabSink(boot.tab));
-      if (boot.tab.cancelled) {
-        void boot.connection.close(result.sessionId);
+      if (!this.isTerminalOperationCurrent(operation) || boot.tab.cancelled) {
+        // A user close is deliberate; lifecycle cancellation leaves the existing
+        // server session available for the next reconnect to reattach.
+        if (boot.tab.cancelled === "close") {
+          void boot.connection.close(result.sessionId);
+        }
+        if (this.tabs.includes(boot.tab)) {
+          boot.tab.cancelled = "lifecycle";
+          this.dropFailedTab(boot.tab);
+        }
         return false;
       }
       this.adoptSession(boot.tab, result);
@@ -531,7 +646,7 @@ export class OpenClawTerminalPanel extends LitElement {
       // Session expired between list and attach (reaper race) or an older
       // gateway: quietly drop the placeholder tab; restore falls back to a
       // fresh session when nothing could be reattached.
-      if (createdTab && !createdTab.gatewaySessionId) {
+      if (createdTab && !createdTab.gatewaySessionId && this.tabs.includes(createdTab)) {
         this.dropFailedTab(createdTab);
       }
       return false;
@@ -544,15 +659,8 @@ export class OpenClawTerminalPanel extends LitElement {
       return;
     }
     tab.status = "exited";
-    if (info.reason === "detached") {
-      // Another connection attached this session away; it is alive elsewhere.
-      tab.statusLabel = t("terminal.detached");
-    } else {
-      tab.statusLabel =
-        info.reason === "process_exit" && info.exitCode !== null
-          ? t("terminal.exitedCode", { code: String(info.exitCode) })
-          : t("terminal.exited");
-    }
+    tab.exitReason = info.reason;
+    tab.exitCode = info.exitCode;
     // The connection drops its own sink on exit delivery, so no release() here —
     // the session id may not be recorded yet when an early exit is replayed.
     this.tabs = [...this.tabs];
@@ -569,7 +677,7 @@ export class OpenClawTerminalPanel extends LitElement {
     } else if (!tab.gatewaySessionId && tab.status === "live") {
       // Open still in flight: no session id to close yet. Flag it so the open
       // continuation closes the server session as soon as the RPC resolves.
-      tab.cancelled = true;
+      tab.cancelled = "close";
     }
     this.disposeTab(tab);
     this.tabs = this.tabs.filter((entry) => entry.id !== tabId);
@@ -595,16 +703,55 @@ export class OpenClawTerminalPanel extends LitElement {
     });
   }
 
+  private captureTerminalOperation(): TerminalOperation | null {
+    const client = this.client;
+    if (!client || client !== this.activeClient || !this.available || !this.isConnected) {
+      return null;
+    }
+    return {
+      generation: this.lifecycleGeneration,
+      client,
+      signal: this.lifecycleAbortController.signal,
+    };
+  }
+
+  private isTerminalOperationCurrent(operation: TerminalOperation): boolean {
+    return (
+      this.isConnected &&
+      this.available &&
+      this.client === operation.client &&
+      this.activeClient === operation.client &&
+      this.lifecycleGeneration === operation.generation &&
+      !operation.signal.aborted
+    );
+  }
+
+  private connectionFor(operation: TerminalOperation): TerminalConnection {
+    if (!this.isTerminalOperationCurrent(operation)) {
+      throw new Error("terminal operation cancelled");
+    }
+    this.connection ??= new TerminalConnection(operation.client);
+    return this.connection;
+  }
+
   private disposeTab(tab: TerminalTabState): void {
     try {
       tab.controller.dispose();
-      tab.host.remove();
     } catch {
       // Best-effort teardown; a partially-initialized tab may throw.
+    } finally {
+      // DOM ownership is independent of controller cleanup; never strand a
+      // Ghostty canvas when dependency disposal fails partway through.
+      tab.host.remove();
     }
   }
 
   private disposeAllTabs(): void {
+    this.lifecycleGeneration += 1;
+    this.lifecycleAbortController.abort();
+    this.lifecycleAbortController = new AbortController();
+    this.booting = false;
+    this.clearResizeListeners();
     for (const tab of this.tabs) {
       // No terminal.close here: this teardown runs for disconnects,
       // availability loss, and element removal — exactly the sessions the
@@ -614,7 +761,7 @@ export class OpenClawTerminalPanel extends LitElement {
       // The cancelled flag covers a tab whose open RPC is still in flight; its
       // continuation closes the fresh session instead of adopting the
       // disposed terminal.
-      tab.cancelled = true;
+      tab.cancelled = "lifecycle";
       this.disposeTab(tab);
     }
     this.tabs = [];
@@ -668,6 +815,7 @@ export class OpenClawTerminalPanel extends LitElement {
 
   private startResize(event: PointerEvent): void {
     event.preventDefault();
+    this.clearResizeListeners();
     const startX = event.clientX;
     const startY = event.clientY;
     const startHeight = this.height;
@@ -685,13 +833,32 @@ export class OpenClawTerminalPanel extends LitElement {
       const active = this.tabs.find((tab) => tab.id === this.activeId);
       active?.controller.fit();
     };
-    const onUp = () => {
+    const cleanup = () => {
       window.removeEventListener("pointermove", onMove);
       window.removeEventListener("pointerup", onUp);
+      window.removeEventListener("pointercancel", onUp);
+      window.removeEventListener("blur", onUp);
+      if (this.resizeCleanup === cleanup) {
+        this.resizeCleanup = null;
+      }
+    };
+    const onUp = () => {
+      cleanup();
+      if (!this.isConnected) {
+        return;
+      }
       this.persistLayout();
     };
+    this.resizeCleanup = cleanup;
     window.addEventListener("pointermove", onMove);
     window.addEventListener("pointerup", onUp);
+    window.addEventListener("pointercancel", onUp);
+    window.addEventListener("blur", onUp);
+  }
+
+  private clearResizeListeners(): void {
+    this.resizeCleanup?.();
+    this.resizeCleanup = null;
   }
 
   override render() {
@@ -716,22 +883,23 @@ export class OpenClawTerminalPanel extends LitElement {
             ></div>`}
         <header class="tp-header">
           <div class="tp-tabs" role="tablist">
-            ${this.tabs.map(
-              (tab) => html`
+            ${this.tabs.map((tab) => {
+              const statusLabel = terminalTabStatusLabel(tab);
+              return html`
                 <div
                   class="tp-tab ${tab.id === this.activeId ? "is-active" : ""} ${tab.status ===
                   "exited"
                     ? "is-exited"
                     : ""}"
                   role="tab"
-                  title=${tab.hint || nothing}
+                  title=${terminalTabHint(tab) || nothing}
                   aria-selected=${tab.id === this.activeId ? "true" : "false"}
                   @click=${() => this.switchTo(tab.id)}
                 >
                   <span class="tp-tab__icon" aria-hidden="true">${TERMINAL_GLYPH}</span>
-                  <span class="tp-tab__label">${tab.shellName}</span>
-                  ${tab.statusLabel
-                    ? html`<span class="tp-tab__status">${tab.statusLabel}</span>`
+                  <span class="tp-tab__label">${terminalTabLabel(tab)}</span>
+                  ${statusLabel
+                    ? html`<span class="tp-tab__status">${statusLabel}</span>`
                     : nothing}
                   <button
                     class="tp-tab__close"
@@ -746,8 +914,8 @@ export class OpenClawTerminalPanel extends LitElement {
                     ${CLOSE_GLYPH}
                   </button>
                 </div>
-              `,
-            )}
+              `;
+            })}
             <button
               class="tp-new"
               type="button"
diff --git a/ui/src/components/theme-mode-toggle.ts b/ui/src/components/theme-mode-toggle.ts
index 322f55a1ac1..32e639a156f 100644
--- a/ui/src/components/theme-mode-toggle.ts
+++ b/ui/src/components/theme-mode-toggle.ts
@@ -1,7 +1,8 @@
-import { LitElement, html } from "lit";
+import { html } from "lit";
 import { property } from "lit/decorators.js";
 import type { ThemeMode } from "../app/theme.ts";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import { icons } from "./icons.ts";
 import "./tooltip.ts";
 
@@ -10,11 +11,7 @@ export type ThemeModeChangeDetail = {
   element: HTMLElement;
 };
 
-class ThemeModeToggle extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class ThemeModeToggle extends OpenClawLightDomElement {
   @property({ attribute: false }) mode: ThemeMode = "system";
 
   override connectedCallback() {
diff --git a/ui/src/components/tooltip.test.ts b/ui/src/components/tooltip.test.ts
new file mode 100644
index 00000000000..ad9d2661cb5
--- /dev/null
+++ b/ui/src/components/tooltip.test.ts
@@ -0,0 +1,133 @@
+/* @vitest-environment jsdom */
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import "./tooltip.ts";
+
+type TooltipElement = HTMLElement & {
+  content: string;
+  readonly updateComplete: Promise<boolean>;
+};
+
+type TooltipProviderElement = HTMLElement & {
+  delay: number;
+  skipDelay: number;
+};
+
+function createTooltip(content: string) {
+  const tooltip = document.createElement("openclaw-tooltip") as TooltipElement;
+  tooltip.content = content;
+  const trigger = document.createElement("button");
+  trigger.textContent = content;
+  tooltip.append(trigger);
+  return { tooltip, trigger };
+}
+
+function createProvider() {
+  return document.createElement("openclaw-tooltip-provider") as TooltipProviderElement;
+}
+
+function focusTrigger(trigger: HTMLElement) {
+  trigger.dispatchEvent(new FocusEvent("focusin", { bubbles: true, composed: true }));
+}
+
+function hoverTrigger(trigger: HTMLElement) {
+  const event = new MouseEvent("pointermove", { bubbles: true, buttons: 0 });
+  Object.defineProperty(event, "pointerType", { value: "mouse" });
+  trigger.dispatchEvent(event);
+}
+
+function expectPortalCount(count: number) {
+  expect(document.body.querySelectorAll(".openclaw-tooltip")).toHaveLength(count);
+}
+
+describe("openclaw-tooltip", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    document.body.replaceChildren();
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+  });
+
+  it("reattaches trigger listeners after reconnect", async () => {
+    const provider = createProvider();
+    const { tooltip, trigger } = createTooltip("Reconnect tooltip");
+    provider.append(tooltip);
+    document.body.append(provider);
+    await tooltip.updateComplete;
+
+    focusTrigger(trigger);
+    expectPortalCount(1);
+
+    provider.remove();
+    expectPortalCount(0);
+    document.body.append(provider);
+    await tooltip.updateComplete;
+
+    focusTrigger(trigger);
+    expectPortalCount(1);
+  });
+
+  it("keeps show reentry idempotent", async () => {
+    const provider = createProvider();
+    const { tooltip, trigger } = createTooltip("Single portal");
+    provider.append(tooltip);
+    document.body.append(provider);
+    await tooltip.updateComplete;
+
+    focusTrigger(trigger);
+    focusTrigger(trigger);
+
+    expectPortalCount(1);
+    expect(document.body.querySelector(".openclaw-tooltip")?.textContent).toBe("Single portal");
+  });
+
+  it("restores the normal hover delay after the provider reconnects", async () => {
+    const provider = createProvider();
+    provider.delay = 40;
+    const { tooltip, trigger } = createTooltip("Delayed after reconnect");
+    provider.append(tooltip);
+    document.body.append(provider);
+    await tooltip.updateComplete;
+
+    focusTrigger(trigger);
+    expectPortalCount(1);
+    provider.remove();
+    expectPortalCount(0);
+
+    document.body.append(provider);
+    await tooltip.updateComplete;
+    hoverTrigger(trigger);
+    vi.advanceTimersByTime(39);
+    expectPortalCount(0);
+    vi.advanceTimersByTime(1);
+    expectPortalCount(1);
+  });
+
+  it("releases the active provider reference when an open tooltip is removed", async () => {
+    const provider = createProvider();
+    provider.delay = 40;
+    provider.skipDelay = 20;
+    const first = createTooltip("First tooltip");
+    provider.append(first.tooltip);
+    document.body.append(provider);
+    await first.tooltip.updateComplete;
+
+    focusTrigger(first.trigger);
+    expectPortalCount(1);
+    first.tooltip.remove();
+    expectPortalCount(0);
+    vi.advanceTimersByTime(20);
+
+    const second = createTooltip("Second tooltip");
+    provider.append(second.tooltip);
+    await second.tooltip.updateComplete;
+    hoverTrigger(second.trigger);
+    vi.advanceTimersByTime(39);
+    expectPortalCount(0);
+    vi.advanceTimersByTime(1);
+    expectPortalCount(1);
+  });
+});
diff --git a/ui/src/components/tooltip.ts b/ui/src/components/tooltip.ts
index 49dbaabddc1..21af0bab20d 100644
--- a/ui/src/components/tooltip.ts
+++ b/ui/src/components/tooltip.ts
@@ -1,5 +1,6 @@
-import { LitElement, html } from "lit";
+import { html } from "lit";
 import { property } from "lit/decorators.js";
+import { OpenClawLitElement } from "../lit/openclaw-element.ts";
 
 const HOVER_DELAY = 150;
 const TOUCH_DELAY = 450;
@@ -16,7 +17,7 @@ function createTooltipId() {
   return `openclaw-tooltip-${nextTooltipId}`;
 }
 
-class TooltipProvider extends LitElement {
+class TooltipProvider extends OpenClawLitElement {
   @property({ type: Number }) delay = HOVER_DELAY;
   @property({ type: Number }) skipDelay = SKIP_DELAY;
   @property({ type: Number }) touchDelay = TOUCH_DELAY;
@@ -34,12 +35,13 @@ class TooltipProvider extends LitElement {
 
   override disconnectedCallback() {
     this.removeEventListener("pointerdown", this.handlePointerDown, true);
-    this.activeTooltip?.closeFromProvider();
+    // Sever ownership first so child teardown cannot start a skip-delay window
+    // on a provider that is no longer available.
+    const activeTooltip = this.activeTooltip;
     this.activeTooltip = null;
-    if (this.skipDelayTimer !== null) {
-      window.clearTimeout(this.skipDelayTimer);
-      this.skipDelayTimer = null;
-    }
+    activeTooltip?.closeFromProvider();
+    this.clearSkipDelayTimer();
+    this.delayed = true;
     this.suppressFocus = false;
     super.disconnectedCallback();
   }
@@ -67,9 +69,7 @@ class TooltipProvider extends LitElement {
     }
     this.activeTooltip = tooltip;
     this.delayed = false;
-    if (this.skipDelayTimer !== null) {
-      window.clearTimeout(this.skipDelayTimer);
-    }
+    this.clearSkipDelayTimer();
   }
 
   closeTooltip(tooltip: Tooltip) {
@@ -77,13 +77,11 @@ class TooltipProvider extends LitElement {
       return;
     }
     this.activeTooltip = null;
+    this.clearSkipDelayTimer();
     if (this.skipDelay <= 0) {
       this.delayed = true;
       return;
     }
-    if (this.skipDelayTimer !== null) {
-      window.clearTimeout(this.skipDelayTimer);
-    }
     this.skipDelayTimer = window.setTimeout(() => {
       this.skipDelayTimer = null;
       this.delayed = true;
@@ -94,12 +92,20 @@ class TooltipProvider extends LitElement {
     return this.delayed;
   }
 
+  private clearSkipDelayTimer() {
+    if (this.skipDelayTimer === null) {
+      return;
+    }
+    window.clearTimeout(this.skipDelayTimer);
+    this.skipDelayTimer = null;
+  }
+
   override render() {
     return html`<slot></slot>`;
   }
 }
 
-class Tooltip extends LitElement {
+class Tooltip extends OpenClawLitElement {
   @property() content = "";
 
   private trigger: HTMLElement | null = null;
@@ -112,6 +118,7 @@ class Tooltip extends LitElement {
   private open = false;
   private pointerDown = false;
   private describedBy: string | null = null;
+  private activeProvider: TooltipProvider | null = null;
   private readonly tooltipId = createTooltipId();
 
   override connectedCallback() {
@@ -119,18 +126,24 @@ class Tooltip extends LitElement {
     this.style.display = "contents";
   }
 
-  protected override firstUpdated() {
-    this.attachTrigger();
+  protected override updated() {
+    if (this.isConnected) {
+      this.attachTrigger();
+    }
   }
 
   override disconnectedCallback() {
     this.close();
     document.removeEventListener("pointerup", this.handleDocumentPointerUp);
+    this.pointerDown = false;
     this.detachTrigger();
     super.disconnectedCallback();
   }
 
   private attachTrigger() {
+    if (!this.isConnected) {
+      return;
+    }
     const slot = this.renderRoot.querySelector("slot");
     const trigger = slot
       ?.assignedElements({ flatten: true })
@@ -298,7 +311,16 @@ class Tooltip extends LitElement {
       return;
     }
     this.clearTimers();
-    this.provider?.openTooltip(this);
+    if (this.open) {
+      if (this.portal) {
+        this.portal.textContent = this.content;
+        this.positionTooltip();
+      }
+      return;
+    }
+    const provider = this.provider;
+    provider?.openTooltip(this);
+    this.activeProvider = provider;
     this.open = true;
     this.describedBy ??= trigger.getAttribute("aria-describedby");
     this.portal = document.createElement("div");
@@ -324,12 +346,14 @@ class Tooltip extends LitElement {
 
   private close() {
     const wasOpen = this.open;
+    const provider = this.activeProvider;
+    this.activeProvider = null;
     this.clearTimers();
     this.touchStart = null;
     this.touchOpened = false;
     this.open = false;
     if (wasOpen) {
-      this.provider?.closeTooltip(this);
+      provider?.closeTooltip(this);
     }
     this.restoreDescription();
     this.portal?.remove();
diff --git a/ui/src/components/update-banner.ts b/ui/src/components/update-banner.ts
index cdd857e3d36..66729519a16 100644
--- a/ui/src/components/update-banner.ts
+++ b/ui/src/components/update-banner.ts
@@ -1,8 +1,9 @@
 // Control UI component renders update status and available-update actions.
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import type { UpdateAvailable } from "../api/types.ts";
 import { t } from "../i18n/index.ts";
+import { OpenClawLightDomElement } from "../lit/openclaw-element.ts";
 import { getSafeLocalStorage } from "../local-storage.ts";
 import { icons } from "./icons.ts";
 
@@ -67,11 +68,7 @@ type UpdateBannerProps = {
   onDismiss: () => void;
 };
 
-class UpdateBanner extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+class UpdateBanner extends OpenClawLightDomElement {
   @property({ attribute: false }) props?: UpdateBannerProps;
 
   override connectedCallback() {
diff --git a/ui/src/e2e/chat-flow.e2e.test.ts b/ui/src/e2e/chat-flow.e2e.test.ts
index 8fc6bdda445..b3a08e93e3b 100644
--- a/ui/src/e2e/chat-flow.e2e.test.ts
+++ b/ui/src/e2e/chat-flow.e2e.test.ts
@@ -85,19 +85,28 @@ async function waitForChatScrollIdle(page: Page): Promise<void> {
   await expect
     .poll(
       () =>
-        page.evaluate(() => {
-          const app = document.querySelector("openclaw-app") as
-            | (Element & {
-                chatIsProgrammaticScroll?: boolean;
-                chatScrollFrame?: number | null;
-                chatScrollTimeout?: number | null;
-              })
-            | null;
-          return Boolean(
-            app &&
-            app.chatScrollFrame == null &&
-            app.chatScrollTimeout == null &&
-            !app.chatIsProgrammaticScroll,
+        page.locator(".chat-thread").evaluate(async (element) => {
+          const thread = element as HTMLElement;
+          const readGeometry = () => ({
+            clientHeight: thread.clientHeight,
+            scrollHeight: thread.scrollHeight,
+            scrollTop: Math.round(thread.scrollTop),
+          });
+          const before = readGeometry();
+          // The chat scroll owner may do one bounded 120/150ms late-size retry.
+          await new Promise<void>((resolve) => {
+            globalThis.setTimeout(resolve, 180);
+          });
+          await new Promise<void>((resolve) => {
+            requestAnimationFrame(() => {
+              requestAnimationFrame(() => resolve());
+            });
+          });
+          const after = readGeometry();
+          return (
+            before.clientHeight === after.clientHeight &&
+            before.scrollHeight === after.scrollHeight &&
+            before.scrollTop === after.scrollTop
           );
         }),
       { timeout: 10_000 },
diff --git a/ui/src/e2e/native-link-routing.e2e.test.ts b/ui/src/e2e/native-link-routing.e2e.test.ts
new file mode 100644
index 00000000000..d969426daf6
--- /dev/null
+++ b/ui/src/e2e/native-link-routing.e2e.test.ts
@@ -0,0 +1,240 @@
+// Real-browser proof for native-host link routing and the bridge-free browser path.
+import fs from "node:fs";
+import path from "node:path";
+import { chromium, type Browser, type BrowserContext } from "playwright";
+import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
+import {
+  canRunPlaywrightChromium,
+  installMockGateway,
+  resolvePlaywrightChromiumExecutablePath,
+  startControlUiE2eServer,
+  type ControlUiE2eServer,
+} from "../test-helpers/control-ui-e2e.ts";
+
+const chromiumExecutablePath = resolvePlaywrightChromiumExecutablePath(chromium.executablePath());
+const chromiumAvailable = canRunPlaywrightChromium(chromiumExecutablePath);
+const allowMissingChromium = process.env.OPENCLAW_UI_E2E_ALLOW_MISSING_CHROMIUM === "1";
+const describeControlUiE2e = chromiumAvailable || !allowMissingChromium ? describe : describe.skip;
+const artifactDir = path.resolve(process.cwd(), ".artifacts/control-ui-e2e/native-link-routing");
+
+let server: ControlUiE2eServer;
+const openBrowsers = new Set<Browser>();
+
+async function newBrowserContext(): Promise<BrowserContext> {
+  const browser = await chromium.launch({ executablePath: chromiumExecutablePath });
+  openBrowsers.add(browser);
+  return browser.newContext({
+    colorScheme: "light",
+    locale: "en-US",
+    serviceWorkers: "block",
+    viewport: { height: 800, width: 1180 },
+  });
+}
+
+async function closeBrowsers(): Promise<void> {
+  await Promise.all([...openBrowsers].map((browser) => browser.close().catch(() => {})));
+  openBrowsers.clear();
+}
+
+describeControlUiE2e("native link routing", () => {
+  beforeAll(async () => {
+    if (!chromiumAvailable) {
+      throw new Error(`Playwright Chromium is unavailable at ${chromiumExecutablePath}`);
+    }
+    fs.mkdirSync(artifactDir, { recursive: true });
+    server = await startControlUiE2eServer();
+  });
+
+  afterAll(async () => {
+    await closeBrowsers();
+    await server?.close();
+  });
+
+  afterEach(closeBrowsers);
+
+  it("shows native actions and posts inline or external targets", async () => {
+    const context = await newBrowserContext();
+    await context.grantPermissions(["clipboard-read", "clipboard-write"], {
+      origin: new URL(server.baseUrl).origin,
+    });
+    await context.route("https://example.com/**", (route) =>
+      route.fulfill({ contentType: "text/html", body: "<!doctype html><title>Report</title>" }),
+    );
+    await context.addInitScript(() => {
+      const messages: unknown[] = [];
+      const host = window as Window & {
+        openclawNativeLinkMessages?: unknown[];
+        webkit?: unknown;
+      };
+      host.openclawNativeLinkMessages = messages;
+      host.webkit = {
+        messageHandlers: {
+          openclawLink: { postMessage: (message: unknown) => messages.push(message) },
+        },
+      };
+    });
+    const page = await context.newPage();
+    await installMockGateway(page, {
+      historyMessages: [
+        {
+          content: [
+            {
+              type: "text",
+              text: [
+                "Read the [report](https://example.com/report),",
+                "open [Usage](/usage), or inspect `README.md:1`.",
+              ].join(" "),
+            },
+          ],
+          role: "assistant",
+          timestamp: Date.now(),
+        },
+      ],
+    });
+    await page.goto(`${server.baseUrl}chat`);
+    const link = page.getByRole("link", { name: "report" });
+
+    await link.click();
+    await expect
+      .poll(() =>
+        page.evaluate(
+          () =>
+            (window as Window & { openclawNativeLinkMessages?: unknown[] })
+              .openclawNativeLinkMessages,
+        ),
+      )
+      .toEqual([{ type: "open-link", url: "https://example.com/report", target: "inline" }]);
+
+    const bubble = page.locator(".chat-bubble");
+    const bubbleBox = await bubble.boundingBox();
+    expect(bubbleBox).not.toBeNull();
+    await bubble.click({
+      button: "right",
+      position: { x: bubbleBox!.width - 8, y: bubbleBox!.height - 8 },
+    });
+    const replyMenu = page.getByRole("menu", { name: "Message actions" });
+    await expect.poll(() => replyMenu.isVisible()).toBe(true);
+    await page.evaluate(() => new Promise(requestAnimationFrame));
+
+    await link.click({ button: "right" });
+    const menu = page.getByRole("menu", { name: "Link actions" });
+    await expect.poll(() => menu.isVisible()).toBe(true);
+    await expect.poll(() => replyMenu.count()).toBe(0);
+    await expect
+      .poll(() => menu.locator(".session-menu__text").allTextContents())
+      .toEqual(["Open in Sidebar", "Open in Default Browser", "Copy Link"]);
+    await page.screenshot({
+      path: path.join(artifactDir, "01-native-link-menu-page.jpg"),
+      type: "jpeg",
+      quality: 60,
+    });
+    await menu.getByRole("menuitem", { name: "Open in Default Browser" }).click();
+    await expect
+      .poll(() =>
+        page.evaluate(
+          () =>
+            (window as Window & { openclawNativeLinkMessages?: unknown[] })
+              .openclawNativeLinkMessages,
+        ),
+      )
+      .toEqual([
+        { type: "open-link", url: "https://example.com/report", target: "inline" },
+        { type: "open-link", url: "https://example.com/report", target: "external" },
+      ]);
+
+    await link.click({ button: "right" });
+    await menu.getByRole("menuitem", { name: "Copy Link" }).click();
+    await expect
+      .poll(() => page.evaluate(() => navigator.clipboard.readText()))
+      .toBe("https://example.com/report");
+
+    const popupPromise = page.waitForEvent("popup");
+    await link.click({ modifiers: ["Meta"] });
+    const popup = await popupPromise;
+    await popup.waitForLoadState("domcontentloaded");
+    expect(popup.url()).toBe("https://example.com/report");
+    await popup.close();
+
+    await page.evaluate(async () => {
+      await customElements.whenDefined("openclaw-modal-dialog");
+      const dialog = document.createElement("openclaw-modal-dialog");
+      dialog.id = "native-link-routing-modal";
+      dialog.setAttribute("label", "Link routing test");
+      const anchor = document.createElement("a");
+      anchor.href = "https://example.com/modal-report";
+      anchor.textContent = "modal report";
+      dialog.append(anchor);
+      document.body.append(dialog);
+    });
+    const modalLink = page.getByRole("link", { name: "modal report" });
+    await modalLink.click({ button: "right" });
+    await expect.poll(() => menu.isVisible()).toBe(true);
+    await page.keyboard.press("Escape");
+    await expect.poll(() => menu.count()).toBe(0);
+    await expect
+      .poll(() =>
+        page.locator("#native-link-routing-modal").evaluate((modal) => {
+          return modal.shadowRoot?.querySelector("dialog")?.open ?? false;
+        }),
+      )
+      .toBe(true);
+    await modalLink.click({ button: "right" });
+    await expect.poll(() => menu.isVisible()).toBe(true);
+    await menu.getByRole("menuitem", { name: "Open in Sidebar" }).click();
+    await expect
+      .poll(() =>
+        page.evaluate(
+          () =>
+            (window as Window & { openclawNativeLinkMessages?: unknown[] })
+              .openclawNativeLinkMessages,
+        ),
+      )
+      .toContainEqual({
+        type: "open-link",
+        url: "https://example.com/modal-report",
+        target: "inline",
+      });
+    await page.evaluate(() => {
+      document.querySelector("#native-link-routing-modal")?.remove();
+    });
+
+    await page.getByRole("link", { name: "Usage" }).click({ button: "right" });
+    expect(await page.locator("openclaw-native-link-menu").count()).toBe(0);
+    const messageMenu = page.getByRole("menu", { name: "Message actions" });
+    await expect.poll(() => messageMenu.isVisible()).toBe(true);
+    await page.evaluate(() => new Promise(requestAnimationFrame));
+    await page.keyboard.press("Escape");
+    await expect.poll(() => messageMenu.count()).toBe(0);
+    await page.locator('a.markdown-file-link[data-file-path="README.md"]').click({
+      button: "right",
+    });
+    expect(await page.locator("openclaw-native-link-menu").count()).toBe(0);
+  });
+
+  it("keeps ordinary browser navigation when the native bridge is absent", async () => {
+    const context = await newBrowserContext();
+    await context.route("https://example.com/**", (route) =>
+      route.fulfill({ contentType: "text/html", body: "<!doctype html><title>Report</title>" }),
+    );
+    const page = await context.newPage();
+    await installMockGateway(page, {
+      historyMessages: [
+        {
+          content: [{ type: "text", text: "Read the [report](https://example.com/report)." }],
+          role: "assistant",
+          timestamp: Date.now(),
+        },
+      ],
+    });
+    await page.goto(`${server.baseUrl}chat`);
+    const link = page.getByRole("link", { name: "report" });
+
+    await link.click({ button: "right" });
+    expect(await page.locator("openclaw-native-link-menu").count()).toBe(0);
+    const popupPromise = page.waitForEvent("popup");
+    await link.click();
+    const popup = await popupPromise;
+    await popup.waitForLoadState("domcontentloaded");
+    expect(popup.url()).toBe("https://example.com/report");
+  });
+});
diff --git a/ui/src/i18n/.i18n/ar.meta.json b/ui/src/i18n/.i18n/ar.meta.json
index 901759168a8..71ea0b45588 100644
--- a/ui/src/i18n/.i18n/ar.meta.json
+++ b/ui/src/i18n/.i18n/ar.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:00.050Z",
+  "generatedAt": "2026-07-09T11:53:06.016Z",
   "locale": "ar",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/ar.tm.jsonl b/ui/src/i18n/.i18n/ar.tm.jsonl
index 70d1510d7be..20a53a40d4c 100644
--- a/ui/src/i18n/.i18n/ar.tm.jsonl
+++ b/ui/src/i18n/.i18n/ar.tm.jsonl
@@ -27,6 +27,7 @@
 {"cache_key":"1e7ea327bf33ad8c6f3b51d23863e11c01e212250d19915511436339f4f46bbb","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dragSessionHint","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Drag to move between groups","text_hash":"3e8692b1cd1c1f9a606a779f1037aa390c885fde224ddb841df9259e8aab03ae","tgt_lang":"ar","translated":"اسحب للنقل بين المجموعات","updated_at":"2026-07-05T14:39:56.977Z"}
 {"cache_key":"20b2e88b33793df99629daf65b657cb666cb9b4a71ea30e2c05f943939c49565","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.commentaryLabel","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Commentary","text_hash":"4a7a75ab79cde05b0b1baa8f7a704c991586ea44d7e7793e57178ef56f778ff8","tgt_lang":"ar","translated":"التعليق","updated_at":"2026-07-01T01:07:19.841Z"}
 {"cache_key":"20f98bac595afb3715bf5acbd1e087d08570280150e8d7e0649e378a98ac0489","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.noSearchResults","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"No matching files.","text_hash":"6ba2ede6c6019b640f63e7e48c5ee8238e701c6e539ce9abb5a7a9d9c71d8a73","tgt_lang":"ar","translated":"لا توجد ملفات مطابقة.","updated_at":"2026-06-16T14:15:41.761Z"}
+{"cache_key":"21e708bf2a649c6c85f13ae73d538beb322a208c4f1d8e61a03e691acd687948","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"ar","translated":"نسخ الرابط","updated_at":"2026-07-09T11:02:53.077Z"}
 {"cache_key":"222a52155c00d9125472c178e688a19fba317aa89a0fabcd3e6a77c0b930f30c","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventProtocolViolation","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Protocol violation","text_hash":"367bb2052963f7d75beb672d3ca0430d7d49ac48a2759d578c7df933178fe564","tgt_lang":"ar","translated":"انتهاك البروتوكول","updated_at":"2026-05-30T15:38:27.116Z"}
 {"cache_key":"240cd908be616bcfb10d98fe41913fa9b82ada7d176dfb173c13031d1ad7d6d2","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkModel","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Model","text_hash":"5e2c614c23f02239bc03c6c04fcb681950f9e72bf8fdff6be79c79841cbb10c0","tgt_lang":"ar","translated":"النموذج","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"25a056bd4b886ccb8f4654ecd699dbf97c57eb061d3a00d912a4ac5394a5f4b0","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.requests","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"{count} requests","text_hash":"1e23ff6956124091cd470f5091cee8108c3766314b69871b3ff792eaf506455f","tgt_lang":"ar","translated":"{count} طلبات","updated_at":"2026-07-06T06:40:15.357Z"}
@@ -63,6 +64,7 @@
 {"cache_key":"4f59bc6df25e2495ede201a5cd831658d42000f5f645df19553afc9be514e0b2","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.archiveSession","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Archive session","text_hash":"740ded37480365eae8bf833ccaaa58350fc9434a77b7bb65b5516eba476fbec3","tgt_lang":"ar","translated":"أرشفة الجلسة","updated_at":"2026-07-02T14:30:22.962Z"}
 {"cache_key":"4f5df68126b4a7506e392871313afb6007b65be723d33e6f1dd1c395d43635c7","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.contextWindow","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Context window","text_hash":"7696d0855331622dc12438057f5509348f9d6f0ec2eb3580e18a99d31eba86db","tgt_lang":"ar","translated":"نافذة السياق","updated_at":"2026-07-05T10:16:14.365Z"}
 {"cache_key":"51c230ab687ba027ff013718b13ce69541910ed472bd5a11f23a58bcc61c3fba","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.dropSplit","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Split","text_hash":"32afaa784333648025e24b162bece7474051bcaaa29e98e19922b400b4ceb04b","tgt_lang":"ar","translated":"تقسيم","updated_at":"2026-07-06T22:56:27.100Z"}
+{"cache_key":"53e198dd40fa26c62fced943845107d4b96229b043fd9f523e571a4b62d77a1f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"ar","translated":"إجراءات الرابط","updated_at":"2026-07-09T11:02:53.077Z"}
 {"cache_key":"541a93bf518e064a9d0a79ea654c4cd71be771dd6471b4ec3c8fd33041577938","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneAccessFailed","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Unable to access microphone inputs.","text_hash":"5125ca209d6d3c763713490ec0de3a44db42aeab03cb21dcf4b047a1a4970669","tgt_lang":"ar","translated":"تعذّر الوصول إلى مدخلات الميكروفون.","updated_at":"2026-07-06T17:56:46.696Z"}
 {"cache_key":"547b89dca9e5b3ebf9c7726b684d138b5efab147428299756e9c884d45a5247b","model":"claude-opus-4-8","provider":"anthropic","segment_id":"codexSessions.status.unknown","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Unknown","text_hash":"b764cdc0eab7137467211272fa539f1260d1bf2e71bcf6ff3bdc960f5c16aa14","tgt_lang":"ar","translated":"غير معروف","updated_at":"2026-06-16T14:15:34.787Z"}
 {"cache_key":"56d2b9f7ed6b2bcefdfae9336946b14a96da27c781baf9d405b7100ab4930169","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailUpdated","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Updated","text_hash":"3a5ecca188c0579c00ee24cf3cab21bd02c15a06f7a70cc8e0a8ff2381dcbbfd","tgt_lang":"ar","translated":"آخر تحديث","updated_at":"2026-06-16T14:15:27.039Z"}
@@ -153,6 +155,7 @@
 {"cache_key":"a02637acc571f1e2f867f37f9ac97ef2f7133c3b5928dc78cddbeab639b4acef","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkModelAuto","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Auto","text_hash":"0286249762f7c94349cdc0ba3bb2255baf9a80036e2193ead1d77696f888582f","tgt_lang":"ar","translated":"تلقائي","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"a0d5e8eab5f576324a3d449acee6832c4bab1577fa40cb282a83b2d9a8ae2b7c","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateThisWeek","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"This week","text_hash":"8c4eef5ab2532515ef24a662db70f6e5b8063c7f924342b2a463f763f1091634","tgt_lang":"ar","translated":"هذا الأسبوع","updated_at":"2026-07-05T14:39:56.977Z"}
 {"cache_key":"a102c927a75fe299419ff82c1897ac1cd059802dc84366a6019901c4094d6208","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh60s","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"60s","text_hash":"f79f071ab5b033ca8fb42c077f39708930d194b18f4608eb26ac1d9665a8836f","tgt_lang":"ar","translated":"60 ث","updated_at":"2026-06-17T14:15:04.326Z"}
+{"cache_key":"a1885dbab8aa55629dea7d25ca4906cf03a391c02d4a2b094bced8f6b4df111f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"ar","translated":"فتح في الشريط الجانبي","updated_at":"2026-07-09T11:02:53.077Z"}
 {"cache_key":"a45d50099a270e5883cad841617d2f1ad135bb8b5abbf5f156bccee521e25c2b","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupBy","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Group by","text_hash":"956a51f6b098a41b7c3108015f0790bb24af7693717b07cee39d5df6a5da1826","tgt_lang":"ar","translated":"تجميع حسب","updated_at":"2026-07-05T14:39:56.977Z"}
 {"cache_key":"a4d2c83b7e32f2e369ffa4480f4fcbdf5787eca9b705f756734944e8d87810d2","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.summary","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Session context usage: {used} of {limit} ({pct}%)","text_hash":"a62b97af0e5d02b8722725e2be0a936dd3d317a1f506ea15c766e87413b66a0d","tgt_lang":"ar","translated":"استخدام سياق الجلسة: {used} من {limit} ({pct}%)","updated_at":"2026-07-05T10:16:14.365Z"}
 {"cache_key":"a5363bd580f1134d91755567157bb206180cbac872649544b61363ff9cf28f66","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.dailyCost","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Daily provider cost","text_hash":"0d03078a4d1fba12122e32e9abbc929ea64b948445810cf1e0d29cbdfd5cb18d","tgt_lang":"ar","translated":"التكلفة اليومية لمزوّد الخدمة","updated_at":"2026-07-06T06:40:15.357Z"}
@@ -214,6 +217,7 @@
 {"cache_key":"cc8abbe8cced621195e97149d20613a755345a1b2f1e54922dc44771aff0ba68","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkSensitivity","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Sensitivity","text_hash":"ebb57a260d58207c3cce2e12e8663ecdc0c74147d138655d6714bc577a0768f6","tgt_lang":"ar","translated":"الحساسية","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"ccea217988ec699f307d9cdbe67d67522db5a55bf260f86e0a38776211177a55","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.name","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Name","text_hash":"dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50","tgt_lang":"ar","translated":"الاسم","updated_at":"2026-07-05T21:01:06.223Z"}
 {"cache_key":"cd084b20fe0560e5862e27aa436cc30d8cb8921f7dddf7931263cf0dc2156f4e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.agentFilterConfiguredDefault","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"{agent} (default)","text_hash":"7e996234f0fa55605720f9dc954a58411795bd882e948c87c739d43bd02137c3","tgt_lang":"ar","translated":"{agent} (افتراضي)","updated_at":"2026-06-17T14:14:58.728Z"}
+{"cache_key":"cd8eaebe82bca366a33579ca710ac5697ad6e9d443f6b88151aed6d76eaf572e","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"ar","translated":"فتح في المتصفح الافتراضي","updated_at":"2026-07-09T11:02:53.077Z"}
 {"cache_key":"cdbbd4457bcc9e07450a6d7e0d7e3ad6957776bb7a2b3ba4623d522dd556523e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthFailedAttempts","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"failed attempts","text_hash":"fd9023af0795825a458100ddbe894a7a8f603324a2b7ad2305d4c9d2334cbd26","tgt_lang":"ar","translated":"محاولات فاشلة","updated_at":"2026-06-17T14:15:04.326Z"}
 {"cache_key":"ce4f953ca30562add25d39724fbd5b7265cff565e2f1919602bbcf28c4cb2c7f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthBlocked","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"blocked","text_hash":"6973dddd3ef9cb6a2932702f31777faad9c9bf3124d147a84f31aadb6d139546","tgt_lang":"ar","translated":"محظور","updated_at":"2026-06-17T14:15:04.326Z"}
 {"cache_key":"d16acabba16394e70e0cf025699227a9d237b67aaee2d60af30b738af02be8b3","model":"gpt-5","provider":"openai","segment_id":"codexSessions.title","source_path":"ui/src/i18n/locales/ar.ts","src_lang":"en","text":"Sessions across your computers","text_hash":"23b30c777a12daeb3e5471cd51530189b621db9fdec4e6ea976e5a97516fac22","tgt_lang":"ar","translated":"الجلسات على جميع أجهزتك","updated_at":"2026-07-09T10:01:43.759Z"}
diff --git a/ui/src/i18n/.i18n/de.meta.json b/ui/src/i18n/.i18n/de.meta.json
index a77f0c88637..ad66108ef0c 100644
--- a/ui/src/i18n/.i18n/de.meta.json
+++ b/ui/src/i18n/.i18n/de.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:58.584Z",
+  "generatedAt": "2026-07-09T11:53:04.522Z",
   "locale": "de",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/de.tm.jsonl b/ui/src/i18n/.i18n/de.tm.jsonl
index 3e2da579601..20e81b85af7 100644
--- a/ui/src/i18n/.i18n/de.tm.jsonl
+++ b/ui/src/i18n/.i18n/de.tm.jsonl
@@ -41,6 +41,7 @@
 {"cache_key":"23a98d848479c9a7a6f4f006588ce8b12b77ba405961be20416a2b9365a8c4a2","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewMissingProof","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Missing proof","text_hash":"b46debe888e32eec183dc5936c79d22ea43bec580c410c2b3c1aa24aaa75d677","tgt_lang":"de","translated":"Fehlender Nachweis","updated_at":"2026-06-17T14:13:07.391Z"}
 {"cache_key":"23e7748c690ef6f54d24a63928923ad99a041a8aa3a9113a6ae2de11697405de","model":"gpt-5.5","provider":"openai","segment_id":"tabs.worktrees","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Worktrees","text_hash":"aec2f93d67b7c4c5fd9b94042f33299f7a0e55cdcb7e8e35feb9d0f6da697f3d","tgt_lang":"de","translated":"Worktrees","updated_at":"2026-07-05T21:00:37.724Z"}
 {"cache_key":"259584b0bcce88cc9e550fdc4cea7bee7a0f53743696c01f05cc94c64fdc6bfe","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.restore","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Restore","text_hash":"a76e13b9839270eb73ed11417f7d8acca55df0ad52065799361631d0fff74f27","tgt_lang":"de","translated":"Wiederherstellen","updated_at":"2026-07-05T21:00:37.724Z"}
+{"cache_key":"25c9c907c49759296c85732c239fdd0ec26e5887ab4bd3ce67b7bfe4de5dca70","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"de","translated":"Link-Aktionen","updated_at":"2026-07-09T11:02:41.562Z"}
 {"cache_key":"2788a3df115c76bcb8d9f0a0bd36f52a28c827de34fdedda81344e9f5fc3fbdd","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.newGroup","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"New group…","text_hash":"ce58c189f2045434c28a50c9875a7362d28c79fb34d4b365c09f59180ca2712a","tgt_lang":"de","translated":"Neue Gruppe…","updated_at":"2026-07-05T14:39:38.809Z"}
 {"cache_key":"28152bb7d38ab154772a8512ce05f83f873bfc2de448f5b28887b04c41637176","model":"gpt-5","provider":"openai","segment_id":"codexSessions.empty.archived","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"No archived sessions on this host.","text_hash":"5de6bb0c0036228e8732a675c33ab05843952419ef985706e349bb761da87c40","tgt_lang":"de","translated":"Keine archivierten Sitzungen auf diesem Host.","updated_at":"2026-07-09T10:01:43.726Z"}
 {"cache_key":"2900527ff2d4abaeeec053f1f95ffb1428b549fa05462f4238d7eb31c0b01f3d","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupBy","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Group by","text_hash":"956a51f6b098a41b7c3108015f0790bb24af7693717b07cee39d5df6a5da1826","tgt_lang":"de","translated":"Gruppieren nach","updated_at":"2026-07-05T14:39:38.809Z"}
@@ -61,6 +62,7 @@
 {"cache_key":"3312a3da58a3994073e34abe289964c51799f686300758745775e22da3f5aa70","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkSensitivityLow","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Low","text_hash":"f793de205ead5ac302c4a1627829dea41f176b1068b993a32373fc869918374b","tgt_lang":"de","translated":"Niedrig","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"3370e1d00f22cfdaceffac5de196a27c9b29c7819554bd695abdf03e239885cc","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependenciesBlockedTitle","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Waiting on dependencies: {parents}.","text_hash":"50fb8f9b1326b69bd67d25583ddb4f70b9d75ae6e3ff8a9056a9361daa4b7d8b","tgt_lang":"de","translated":"Warten auf Abhängigkeiten: {parents}.","updated_at":"2026-06-16T14:12:59.821Z"}
 {"cache_key":"33e8316ed3f105834e2d783ab819b39a6937433244142b909de5f196b173e223","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browserCount","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"{count} shown","text_hash":"e57b4adfe868fd74a183650103d820176d4960bd0bdb677d9985db09f9752867","tgt_lang":"de","translated":"{count} angezeigt","updated_at":"2026-06-16T14:13:06.672Z"}
+{"cache_key":"36b416be4647f168bf4eb02f72dc439a31a5d1366b5bd97cfde6bcb9e9fc8bdb","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"de","translated":"In der Seitenleiste öffnen","updated_at":"2026-07-09T11:02:41.562Z"}
 {"cache_key":"37e2f81c18e65f78cd2588a49884ceb7ac3fed308edfe5c557d42a371baccbb0","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateOlder","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Older","text_hash":"03281c889c2869e091390f9ad5dd13f0f0e46b42c9c4698f857902451deb3450","tgt_lang":"de","translated":"Älter","updated_at":"2026-07-05T14:39:38.809Z"}
 {"cache_key":"38e90629c5ab653eb98c51b46a96cd32b666c4df22f51e52491b54bf55937b4f","model":"gpt-5.5","provider":"openai","segment_id":"languages.hi","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"हिन्दी (Hindi)","text_hash":"fab2abfce45382f3031c59477017700a8cb5dfaf8d15379dc24304809b97c7d5","tgt_lang":"de","translated":"हिन्दी (Hindi)","updated_at":"2026-06-26T21:43:23.990Z"}
 {"cache_key":"393e05f4f87ff8aeec1f5c0e35dc15c59806036ff7ce7e5f37b6c2719851ca74","model":"gpt-5","provider":"openai","segment_id":"codexSessions.scope.archived","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Archived","text_hash":"bdb86505f8062d15f152cef71dd4ca89609d5bf8e98771dcd2c9f70d247403da","tgt_lang":"de","translated":"Archiviert","updated_at":"2026-07-09T10:01:43.726Z"}
@@ -229,11 +231,13 @@
 {"cache_key":"c2eb49eb497f366bb3d993de133466265379108d6ff88af6d3c8b0c677c32d58","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailAutomationTenant","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Tenant: {tenant}","text_hash":"e896dc96a6847d7aaa593069e890e7a712fd60d7be60280ee24e1942e10411b0","tgt_lang":"de","translated":"Mandant: {tenant}","updated_at":"2026-06-16T14:12:53.111Z"}
 {"cache_key":"c3fcfc1198249c461371ad0216f2af28c6ad24d8673ff1a26cfe45840dc298ea","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneNoneFound","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"No microphone inputs were found.","text_hash":"3aa0952aa2a5987227a12656a28131c7e153b5efe3fca4043c742fb289eeb37c","tgt_lang":"de","translated":"Es wurden keine Mikrofoneingänge gefunden.","updated_at":"2026-07-06T17:56:14.727Z"}
 {"cache_key":"c4771eae6a73503a6758ad3debd186ec31fe571e991dbc8e8879f5309ab1251e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.search","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Search files","text_hash":"179fed85ec50a433bb23932745d18f1ade2f84a6ebe145b0025ed3ce5f89fd5a","tgt_lang":"de","translated":"Dateien suchen","updated_at":"2026-06-16T14:13:06.672Z"}
+{"cache_key":"c4940a10947bb78fff341ab048bb96bf98e7cd36c6b4eddbab51d6fcfb5b7794","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"de","translated":"Im Standardbrowser öffnen","updated_at":"2026-07-09T11:02:41.562Z"}
 {"cache_key":"c511a99db2a97a7a98a7456283e579a7d7fe86373037245135d067956d836256","model":"gpt-5","provider":"openai","segment_id":"codexSessions.host.connected","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Connected","text_hash":"22965568d22a14ee17af055d2870b50afcfe9fd94a83eec3196e266932297bb2","tgt_lang":"de","translated":"Verbunden","updated_at":"2026-07-09T10:01:43.726Z"}
 {"cache_key":"c7b88aa5f716c66c2c3dc9fc0548bedc76927bdc6d852c3d46ac5a70917c9e37","model":"gpt-5","provider":"openai","segment_id":"codexSessions.untitled","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Untitled Codex session","text_hash":"c70b89c47992206d82993f9d295c9d3368a993fbc0899eef1bafb25277e5c88d","tgt_lang":"de","translated":"Unbenannte Codex-Sitzung","updated_at":"2026-07-09T10:01:43.726Z"}
 {"cache_key":"c84f86a0b8675180e16418548abbda8f36c4922c617d39d7ae963080fec64861","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateYesterday","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Yesterday","text_hash":"566181254b293aa66653e43313be9e39c12d44f9ac4fcd3236ef1e9c50a2903f","tgt_lang":"de","translated":"Gestern","updated_at":"2026-07-05T14:39:38.809Z"}
 {"cache_key":"cafa119af399a0e8b9358cebcaa01e5cc19552b7e3dc9c7e6bb3893be2873750","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.splitRight","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Split right","text_hash":"aa9997bb1d8c23d0b88521c4093fc8c3ee01b187f78635ae4d3e16d27e8a8475","tgt_lang":"de","translated":"Nach rechts teilen","updated_at":"2026-07-06T07:23:18.013Z"}
 {"cache_key":"ccee1cdfcc7c2115b14c65277a37a4dbd6b49d3ae4cfa37db23c9ed30377df95","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Auto-refresh","text_hash":"9ea4d7fd1550f0866089d18b1344546bfed91502b41c0484d6023ceb0fdeb75c","tgt_lang":"de","translated":"Automatische Aktualisierung","updated_at":"2026-06-17T14:13:07.391Z"}
+{"cache_key":"cd0e42a1f5b5ef1951137cf3f1b125981d2e9ab95224f80d638498997be1797e","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"de","translated":"Link kopieren","updated_at":"2026-07-09T11:02:41.562Z"}
 {"cache_key":"cf544ad257528ed8ef226bb2b2fead2aa5218522d0abd70f7f894e97fc72997f","model":"gpt-5","provider":"openai","segment_id":"usage.daily.compressedScaleHint","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Square-root scale keeps low-usage days visible.","text_hash":"9515e7c6db149c32b64dba95a43e31a61d53dce8f11fe98683b234fb1cfd1920","tgt_lang":"de","translated":"Die Quadratwurzelskala hält Tage mit geringer Nutzung sichtbar.","updated_at":"2026-07-05T20:24:32.108Z"}
 {"cache_key":"d03fb625bb64bb537044a2169d6c1eafeacfd46687a7acfb3db01f251d541e5e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewRecentlyDone","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Recently done","text_hash":"46b889592a2f5e79197f62b5f96c76993545626bf207740ea58632ceed9623be","tgt_lang":"de","translated":"Kürzlich erledigt","updated_at":"2026-06-17T14:13:07.391Z"}
 {"cache_key":"d2ff09ce79f560c110ed1230473dd3ee64d764938a5691ef7d5d305e580c77ca","model":"gpt-5","provider":"openai","segment_id":"codexSessions.title","source_path":"ui/src/i18n/locales/de.ts","src_lang":"en","text":"Sessions across your computers","text_hash":"23b30c777a12daeb3e5471cd51530189b621db9fdec4e6ea976e5a97516fac22","tgt_lang":"de","translated":"Sitzungen auf allen deinen Computern","updated_at":"2026-07-09T10:01:43.726Z"}
diff --git a/ui/src/i18n/.i18n/es.meta.json b/ui/src/i18n/.i18n/es.meta.json
index 709b2b6160c..4eb334e7255 100644
--- a/ui/src/i18n/.i18n/es.meta.json
+++ b/ui/src/i18n/.i18n/es.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:58.839Z",
+  "generatedAt": "2026-07-09T11:53:04.789Z",
   "locale": "es",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/es.tm.jsonl b/ui/src/i18n/.i18n/es.tm.jsonl
index 5778ab5a5bb..3de14c4008c 100644
--- a/ui/src/i18n/.i18n/es.tm.jsonl
+++ b/ui/src/i18n/.i18n/es.tm.jsonl
@@ -45,6 +45,7 @@
 {"cache_key":"22fd3e5a68268e14c9117dbbf5d867648ae27a962b2ccfef631549625894b085","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.actions","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Actions","text_hash":"ff8059dc6752afdd30d275932b1d5031a2ec854b387a8c57ecc6689915293a43","tgt_lang":"es","translated":"Acciones","updated_at":"2026-07-05T21:00:41.074Z"}
 {"cache_key":"24a6de859b0956a90013999bf3dba224d13e795496ea46fae64faed2a199e17a","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.refresh","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Refresh session workspace","text_hash":"c7a97b20a3a3ce348239c4893c99f1902d44877567cb32f752c30cdfbc9a2468","tgt_lang":"es","translated":"Actualizar espacio de trabajo de la sesión","updated_at":"2026-06-16T14:14:17.778Z"}
 {"cache_key":"27fa89c61adc150babc3ded34fdb5864d9ae99d19226958fe7ea11b563e69377","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.summary","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Session workspace summary","text_hash":"1ed422c34dc1802d4c7366164ae810c496e206fe82e8e6565cefc38230b56bb4","tgt_lang":"es","translated":"Resumen del espacio de trabajo de la sesión","updated_at":"2026-06-16T14:14:23.912Z"}
+{"cache_key":"281de1f08f7ffcc6bc6630d03ef286c0cf2829948a543784a777fb04b7bbbf32","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"es","translated":"Abrir en el navegador predeterminado","updated_at":"2026-07-09T11:02:44.131Z"}
 {"cache_key":"281e153d782e5cddfb08ab96830e0df2c057cac4b6ed26c0240247b35b39e675","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailRun","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Run","text_hash":"00d60e31a4e6b8344d4201f25a6a7dee770713107f6d097abb01559d32b17f26","tgt_lang":"es","translated":"Ejecución","updated_at":"2026-06-16T14:14:11.214Z"}
 {"cache_key":"28efd5a5c5097dcce4c549ae1e7442aa3876a4e8d3aa1874ce8755424ea9ce29","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkVoice","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Voice","text_hash":"87bf2bc08589f0bd4a078db145c34ad5e14b8fda53c3ae65b78601294913df95","tgt_lang":"es","translated":"Voz","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"29df215094fc34f10c62e91a760ce0257d4d83a7ab52fc0e2b36ab8d172efcea","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkSensitivityLow","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Low","text_hash":"f793de205ead5ac302c4a1627829dea41f176b1068b993a32373fc869918374b","tgt_lang":"es","translated":"Baja","updated_at":"2026-07-06T20:20:02.809Z"}
@@ -59,6 +60,7 @@
 {"cache_key":"345358e0962f203fa5c2148974e39697ea65be312eb2bff156c93da1298914b7","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.loading","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Loading session workspace…","text_hash":"bc6b2400fad20ee1d95d8de4ec6eef9ff1818ab080f86513384029519eaf4f4e","tgt_lang":"es","translated":"Cargando espacio de trabajo de la sesión…","updated_at":"2026-06-16T14:14:17.778Z"}
 {"cache_key":"3458a965443880c3ec6ce5cec1587d67743132e671babad60d93ac4dc8d1f8af","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateToday","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Today","text_hash":"2b065c7c9ce466e5ebcad757987d5d660ee4c9ea708bc62c43444b53334738ba","tgt_lang":"es","translated":"Hoy","updated_at":"2026-07-05T14:39:41.363Z"}
 {"cache_key":"35228e3b8dbb2adea8538a82d3ac77df66528dac552b0ad98d1fac14dea3f7ec","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependencyMissing","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"{parent} (missing)","text_hash":"8daa419059727391c01e3b7021e05d8d70b4da67f9c57cd2d80f302af77aac53","tgt_lang":"es","translated":"{parent} (faltante)","updated_at":"2026-06-16T14:14:17.778Z"}
+{"cache_key":"35829851417569b0f52b1faa168d56f9819e1a29ea64250480c2cf5d2770bd34","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"es","translated":"Abrir en la barra lateral","updated_at":"2026-07-09T11:02:44.131Z"}
 {"cache_key":"35e16ca9765010a0c640e81bfa001ed199028283a4470cf2c9225204d969b0e1","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.ageHours","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"{count}h","text_hash":"5828ef1c1e95e0bae1c98548d1795a2482cc8e14a8b161b183960a06018ce10d","tgt_lang":"es","translated":"{count}h","updated_at":"2026-06-17T14:14:13.986Z"}
 {"cache_key":"3619dd405efa98f6ed255b69d2279c4fdc0c195e745a506595417e22b9ad1c2a","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.archived","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Archived","text_hash":"bdb86505f8062d15f152cef71dd4ca89609d5bf8e98771dcd2c9f70d247403da","tgt_lang":"es","translated":"Archivada","updated_at":"2026-07-09T10:01:43.721Z"}
 {"cache_key":"363ef018abed6976a78d031b2449f29d082aae2cc338a86617e712f6f0fc7c0f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.lastRefreshed","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Updated {time}","text_hash":"2f87419441e6111b4d62893d3c4ef5ddeb2c8e1af82fabab6132856faf77f907","tgt_lang":"es","translated":"Actualizado {time}","updated_at":"2026-06-17T14:14:13.986Z"}
@@ -66,6 +68,7 @@
 {"cache_key":"379f129fa0265e870df00181ff9ada6682d2e603f4c21ff31b5fabd984d4c5c4","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh15s","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"15s","text_hash":"21b5f52ded33ab19c16a680c4e280b8f9992395b514290163abf272f06394a6f","tgt_lang":"es","translated":"15s","updated_at":"2026-06-17T14:14:13.986Z"}
 {"cache_key":"37c0e1fbbd646ebfc1a08eae342e6c97f8c16302bb7086a7f12956246a9849bc","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.subtitle","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Isolated repository checkouts owned by OpenClaw.","text_hash":"6a3984ca864c9188fa8c05e732f6831b501b4caed6bd61b60e48e9b0cf74bd0c","tgt_lang":"es","translated":"Checkouts de repositorios aislados propiedad de OpenClaw.","updated_at":"2026-07-05T21:00:41.074Z"}
 {"cache_key":"37cf0df35a3bdb11995ed17569da7e4fbc15caf8cafd126935ffa037b426d25f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.pairingQrExpired.reason","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Run /pair qr again to generate a fresh setup code.","text_hash":"876a304827f54ae5996c4e804aa72953f43568d31e8a15dd2a5b5a40d91c13d3","tgt_lang":"es","translated":"Ejecuta /pair qr de nuevo para generar un código de configuración nuevo.","updated_at":"2026-07-01T10:31:44.118Z"}
+{"cache_key":"381dcb78d63ba4cae255fbe68c51eaa17858be9312c29efcfa388417673f96b9","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"es","translated":"Acciones del enlace","updated_at":"2026-07-09T11:02:44.131Z"}
 {"cache_key":"399e7686725b4e7b36f51a078df765ee251cd0a5308624d8345b1337ce07e5df","model":"gpt-5","provider":"openai","segment_id":"codexSessions.loading","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Loading Codex sessions…","text_hash":"18a71c76786db89f928536e164096422e68e86db86fa3684bc3644f36df70300","tgt_lang":"es","translated":"Cargando sesiones de Codex…","updated_at":"2026-07-09T10:01:43.721Z"}
 {"cache_key":"3a1660cddd64db2ad0b071bf8b4ab6eafe91db10fbefb185e7e73377b5057c07","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailTask","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Gateway task","text_hash":"6696e7c592238747dd39d7ba000db600a92f843add73ee90b028c72a2dfd37dd","tgt_lang":"es","translated":"Tarea de Gateway","updated_at":"2026-06-16T14:14:11.214Z"}
 {"cache_key":"3af2820713cf1dbb5574caf424b787f2c6a5aa06960cc8751f8f54fd3b6f5bd4","model":"gpt-5.5","provider":"openai","segment_id":"workboard.badgeAttachments","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"{count} attachments","text_hash":"7bb1847693bc91e6e4624d996a96840396a71052786ab143ccb47fbdaa77cf41","tgt_lang":"es","translated":"{count} adjuntos","updated_at":"2026-05-30T15:38:14.082Z"}
@@ -95,6 +98,7 @@
 {"cache_key":"593e5d5658cf1f4ac2f5b0f961ae394e4f1a6027b3b83ba9182ee28b320bc63e","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.group","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Group","text_hash":"34ca0e76608842ff3e7d924a455a396a82f471052c15e3f2ed7f090ac702e5c1","tgt_lang":"es","translated":"Grupo","updated_at":"2026-07-05T14:39:41.363Z"}
 {"cache_key":"5a799524714067d8ca884d671a6618c268ecc1054cc3e362557cc7a9a7668b95","model":"claude-opus-4-6","provider":"anthropic","segment_id":"chat.composer.realtimeTalkRequiresMicrophone","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Realtime voice input requires browser microphone access.","text_hash":"a70d86265802e30aac70647cde33c62c5386741941d2ea9f54636a0242109dcd","tgt_lang":"es","translated":"La entrada de voz en tiempo real requiere acceso al micrófono del navegador.","updated_at":"2026-07-06T22:41:58.888Z"}
 {"cache_key":"5b84b909827f179e73a5b5c4684712492c397bdc35d50482ce1e2b270c5a7892","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.lastDays","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"{count} days","text_hash":"e9f0a85930cc6fa61b7ac01763893020adc4c712d1b8e8897bdd13971637d529","tgt_lang":"es","translated":"{count} días","updated_at":"2026-07-06T06:40:15.357Z"}
+{"cache_key":"5c9c0c4d6b02004b5062fee3e6f30ef48fb7a52f2c04c39a0338662a62e8acbb","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"es","translated":"Copiar enlace","updated_at":"2026-07-09T11:02:44.131Z"}
 {"cache_key":"5d3b656957833268e13752ae570040470f719d92fc1d45948503ac0bf86e3eef","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthFailedAttempts","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"failed attempts","text_hash":"fd9023af0795825a458100ddbe894a7a8f603324a2b7ad2305d4c9d2334cbd26","tgt_lang":"es","translated":"intentos fallidos","updated_at":"2026-06-17T14:14:13.986Z"}
 {"cache_key":"5d964babaa27481505821df551bcaf5932e299b3b31235eeaecf692d6e67f776","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.ungrouped","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Ungrouped","text_hash":"674b38cae72bb0c8be97cea114f7ce84a6ad4ae3c7f3ceb0c869d62db8e53fa2","tgt_lang":"es","translated":"Sin agrupar","updated_at":"2026-07-05T14:39:41.363Z"}
 {"cache_key":"5dca5fa9990e4ff6485c657fcf79d3f98e896854c281835664ed91bb6698f46b","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.dropSplit","source_path":"ui/src/i18n/locales/es.ts","src_lang":"en","text":"Split","text_hash":"32afaa784333648025e24b162bece7474051bcaaa29e98e19922b400b4ceb04b","tgt_lang":"es","translated":"Dividir","updated_at":"2026-07-06T22:56:19.249Z"}
diff --git a/ui/src/i18n/.i18n/fa.meta.json b/ui/src/i18n/.i18n/fa.meta.json
index 168f9c76775..03bbaa07f3a 100644
--- a/ui/src/i18n/.i18n/fa.meta.json
+++ b/ui/src/i18n/.i18n/fa.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:02.615Z",
+  "generatedAt": "2026-07-09T11:53:08.202Z",
   "locale": "fa",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/fa.tm.jsonl b/ui/src/i18n/.i18n/fa.tm.jsonl
index 3bdf7add6f7..9da971253ac 100644
--- a/ui/src/i18n/.i18n/fa.tm.jsonl
+++ b/ui/src/i18n/.i18n/fa.tm.jsonl
@@ -98,6 +98,7 @@
 {"cache_key":"5c5720ff11bdaa3f9435166a4cd86421f113055880f4adfc7d3d8baaefcaf1d8","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependenciesBlocked","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"{count} blocked","text_hash":"fb39869b0fb3b8933126014e5c3739d7d67a620b8369781ca27e7395c595bde8","tgt_lang":"fa","translated":"{count} مسدود","updated_at":"2026-06-16T14:18:40.803Z"}
 {"cache_key":"5cfc6c543779ba2ab7dd243ef6285305b91e7d3aba3d5ac1ab4d873a3bbfe17b","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailAutomationBoard","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Board: {board}","text_hash":"96d7493589e40e17803b3bf643dff1b891a4ebf57f5d2b36af0a7ddd09e64b84","tgt_lang":"fa","translated":"تخته: {board}","updated_at":"2026-06-16T14:18:33.052Z"}
 {"cache_key":"5d02685e42721e341cd168e7cbcdf95c471ead0c80e8d5ef243a55160d016743","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByChannel","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Channel","text_hash":"ce4683e7013a18cdf3d224bfcb4e9594ea8f559e946a837c633defe7d3c32172","tgt_lang":"fa","translated":"کانال","updated_at":"2026-07-05T14:40:24.519Z"}
+{"cache_key":"5efe077a47da32377d03bbfc99eff19de42c5b5947317df410c0b5c81b7760c5","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"fa","translated":"اقدامات پیوند","updated_at":"2026-07-09T11:03:16.390Z"}
 {"cache_key":"604759b69ecb40fc0facc317775f0798f0ded8d565e07bbb0422fe9641380aba","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependencyStatusMissing","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Missing","text_hash":"6be36ca49ee85210c5d1ad9c377d90a9859c66d889110a2a5b0dccd390d12e20","tgt_lang":"fa","translated":"موجود نیست","updated_at":"2026-06-16T14:18:40.803Z"}
 {"cache_key":"6166886b96a12220c55e021fe5dfbcb01cb33f734b66131661b4d60f5f5a9366","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthMissingProof","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"missing proof","text_hash":"748797f5ab1c31c8aeeaf7f76bce76064b175a1d1f530849ec683cacbe6555eb","tgt_lang":"fa","translated":"بدون اثبات","updated_at":"2026-06-17T14:17:52.321Z"}
 {"cache_key":"62bf97a37d8fce155de13dcc7ef7f77c4ed9748f4edf876ddcc4dac7caff6f08","model":"gpt-5.5","provider":"openai","segment_id":"tabs.worktrees","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Worktrees","text_hash":"aec2f93d67b7c4c5fd9b94042f33299f7a0e55cdcb7e8e35feb9d0f6da697f3d","tgt_lang":"fa","translated":"Worktreeها","updated_at":"2026-07-05T21:01:42.282Z"}
@@ -136,6 +137,7 @@
 {"cache_key":"829336738f114506e9161589c371766c8a989bccc8a030aad50842ebb8d869d4","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphonePermissionBlocked","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Microphone access is blocked. Allow it in browser site settings to list inputs.","text_hash":"707f9594b092cf816d6d7a74381665a74acfecbe32d859d0a4adac9e9c9ff77b","tgt_lang":"fa","translated":"دسترسی به میکروفون مسدود شده است. برای فهرست‌کردن ورودی‌ها، آن را در تنظیمات سایتِ مرورگر مجاز کنید.","updated_at":"2026-07-06T17:57:28.025Z"}
 {"cache_key":"8431d4c742e8cf81dee3b4bb2157e6852cdfbe755214a105e576dc62fb9cb5c0","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthStale","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"stale","text_hash":"a03f2386ae06b21109577020844df367857b72c2fcce384c1896fed98a89c82b","tgt_lang":"fa","translated":"کهنه","updated_at":"2026-06-17T14:17:52.321Z"}
 {"cache_key":"8585275df437a56d0abe0bf952bbaa666ddc1f7a329cccf0ee172b2a3d279656","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.unknownStatus","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Unknown","text_hash":"b764cdc0eab7137467211272fa539f1260d1bf2e71bcf6ff3bdc960f5c16aa14","tgt_lang":"fa","translated":"نامشخص","updated_at":"2026-06-16T14:18:40.803Z"}
+{"cache_key":"85fd7c01913ffba06d86c3d997cb2349053597a03bc866c1f8599a8d19c79fb0","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"fa","translated":"باز کردن در نوار کناری","updated_at":"2026-07-09T11:03:16.390Z"}
 {"cache_key":"86f85ee22a9b66b7e19a07b1c41c0253e6291a94753b7d8dbbb081dc119b9a44","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.dismissTalkError","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Dismiss Talk error","text_hash":"72f032a5a37e7197cc94ea95f5da0829abb2262396cdcc35229bd8ce9a52de1e","tgt_lang":"fa","translated":"نادیده گرفتن خطای Talk","updated_at":"2026-06-16T14:18:40.803Z"}
 {"cache_key":"87b864f0721b126633c697725d1e2eb6fdf088305b3827700a8cd3e2eaaa8a91","model":"gpt-5.5","provider":"openai","segment_id":"nav.settingsGroupConnections","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Connections","text_hash":"dc273117482b4429ada500ecd2e0c75532454194892cb901ca64cc7df369fdf6","tgt_lang":"fa","translated":"اتصال‌ها","updated_at":"2026-07-09T08:08:16.435Z"}
 {"cache_key":"886aa3172c24ccc1ce072bf0b89c96d5fbd84af1fdff32f577e519f6afcdcb0e","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.dailyCost","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Daily provider cost","text_hash":"0d03078a4d1fba12122e32e9abbc929ea64b948445810cf1e0d29cbdfd5cb18d","tgt_lang":"fa","translated":"هزینه روزانه ارائه‌دهنده","updated_at":"2026-07-06T06:40:15.357Z"}
@@ -154,6 +156,7 @@
 {"cache_key":"8f1706ee6f352f5790e8b9a888275e29c43a0182b19a853cd845bdc60ce95d4d","model":"gpt-5","provider":"openai","segment_id":"codexSessions.host.unavailable","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Session catalog unavailable","text_hash":"7214837a3c6e83c01215e8128a4f7ac095be446b09dc0bd464178c9d1f03a039","tgt_lang":"fa","translated":"فهرست نشست‌ها در دسترس نیست","updated_at":"2026-07-09T10:01:43.762Z"}
 {"cache_key":"8f622969bafe02f08b68f61ebcad8e6b2e9462319cb8f9536911daf90e1c9c7d","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortUpdated","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Last updated","text_hash":"382ac5f308f76c24b2c981e2041943bc2be2229cbd285ad362b9af1cfc386ef8","tgt_lang":"fa","translated":"آخرین به‌روزرسانی","updated_at":"2026-07-06T15:07:02.499Z"}
 {"cache_key":"8f70696ad0476d167470173bd080c6c529308134cb0531a58ac486ad86a01f62","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateNoActivity","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"No activity","text_hash":"0cf9505f9f97c8359cc143ba3e88bedaba3a4ae92c2794ffd1b097270732ed18","tgt_lang":"fa","translated":"بدون فعالیت","updated_at":"2026-07-05T14:40:24.519Z"}
+{"cache_key":"8faf13df52a1eddf748218c6c1d730240dbd2498621b04ca78a4b6782d097412","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"fa","translated":"کپی کردن پیوند","updated_at":"2026-07-09T11:03:16.390Z"}
 {"cache_key":"9245e3e8f688cff515289783fd346715d7efb9b2eae9562702ca7cec97a698e6","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphonePageInactive","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Microphone inputs are unavailable while this page is inactive.","text_hash":"775110f07819e48dc96203ed710c4df3546892e5672d7c469dedeb1e0e163882","tgt_lang":"fa","translated":"وقتی این صفحه غیرفعال است، ورودی‌های میکروفون در دسترس نیستند.","updated_at":"2026-07-06T17:57:28.025Z"}
 {"cache_key":"93894b24135f09080aee2181a74abe8e11c85717b9abe161c9cad95bae917505","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.outputTokens","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"{count} output","text_hash":"e433f6601aaa1a1cce63c5ca6b15fddd247bf53697d09171d25592f70f2e949a","tgt_lang":"fa","translated":"{count} توکن خروجی","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"961fc3770dacf55a06d1f9e7a8fb4f5a40376fea71ed76c63ef85d52de671068","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.inputTokens","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"{count} input","text_hash":"f24231cff78fed82d155712973ede6f9369e96b015acc30d5de2b740677edce9","tgt_lang":"fa","translated":"{count} توکن ورودی","updated_at":"2026-07-06T06:40:15.357Z"}
@@ -174,6 +177,7 @@
 {"cache_key":"a63186f92f68ab0571da7caa5a0159ccbeaf3794f99747ffd98edb15c6e03995","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthLabel","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Workboard health","text_hash":"85416c4a6d64e35611bdd9747b82815936c38b41d820796ba1fbfbb7539d906b","tgt_lang":"fa","translated":"سلامت Workboard","updated_at":"2026-06-17T14:17:52.321Z"}
 {"cache_key":"a715e45b3d4c07d3a7f83ab54dbba87397ef021877c3856534acb1266f6fb365","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.refresh","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Refresh session workspace","text_hash":"c7a97b20a3a3ce348239c4893c99f1902d44877567cb32f752c30cdfbc9a2468","tgt_lang":"fa","translated":"تازه‌سازی فضای کاری نشست","updated_at":"2026-06-16T14:18:40.803Z"}
 {"cache_key":"a7f004e699cd5b5a439714aa9f39c8105a645d799881c109bba1c97e55b48075","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.pinSession","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Pin session","text_hash":"813273b54d2df112a0fa1903110e9386779f8848ae288142d3f91d7a5891c8ff","tgt_lang":"fa","translated":"سنجاق کردن نشست","updated_at":"2026-07-02T14:31:11.668Z"}
+{"cache_key":"aa95c57b527308c5730869c0383834a15baf0754c44542818cdb3d87e536ad4f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"fa","translated":"باز کردن در مرورگر پیش‌فرض","updated_at":"2026-07-09T11:03:16.390Z"}
 {"cache_key":"ab9069ecc55b3613fbd48b397463825b9fd6c3ceb3a5972e91d5cf5b5c938386","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.branch","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Branch","text_hash":"52656e8104eef3fddd3d4546903fa0de93c0625abf47b3dd8130f7705d6a513e","tgt_lang":"fa","translated":"شاخه","updated_at":"2026-07-05T21:01:42.282Z"}
 {"cache_key":"ae54e355fe6c4cc168f39ee6e26bbee2155ac840e12add1da8959f445a0306c2","model":"gpt-5","provider":"openai","segment_id":"codexSessions.partial","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"Unavailable hosts: {count}. Other hosts remain available.","text_hash":"00ca17db32e78382e78e5877fd167f21e6baf40783b4cf581f34be5ffd1bd05b","tgt_lang":"fa","translated":"میزبان‌های غیرقابل‌دسترسی: {count}. سایر میزبان‌ها همچنان در دسترس‌اند.","updated_at":"2026-07-09T10:01:43.762Z"}
 {"cache_key":"aea3a5d2d77e337ec74a4bf8499f5b3b1a694bd7a857db53bd49628421f652c7","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.requests","source_path":"ui/src/i18n/locales/fa.ts","src_lang":"en","text":"{count} requests","text_hash":"1e23ff6956124091cd470f5091cee8108c3766314b69871b3ff792eaf506455f","tgt_lang":"fa","translated":"{count} درخواست","updated_at":"2026-07-06T06:40:15.357Z"}
diff --git a/ui/src/i18n/.i18n/fr.meta.json b/ui/src/i18n/.i18n/fr.meta.json
index 34f74836b77..51b2f1f6e9d 100644
--- a/ui/src/i18n/.i18n/fr.meta.json
+++ b/ui/src/i18n/.i18n/fr.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:59.519Z",
+  "generatedAt": "2026-07-09T11:53:05.575Z",
   "locale": "fr",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/fr.tm.jsonl b/ui/src/i18n/.i18n/fr.tm.jsonl
index 1d98a992d53..ce545883b31 100644
--- a/ui/src/i18n/.i18n/fr.tm.jsonl
+++ b/ui/src/i18n/.i18n/fr.tm.jsonl
@@ -52,6 +52,7 @@
 {"cache_key":"36516569da22cb699e4e4cf9c2bcc57ef4ecd897559292191e79b6b5f23c4f51","model":"gpt-5","provider":"openai","segment_id":"codexSessions.subtitle","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"A read-only view of Codex sessions on this gateway and every connected computer that shares them.","text_hash":"ea7ea85488243bacdbe28edb2fba0617ec90ebcf587f8ecce6f62858ca85aed4","tgt_lang":"fr","translated":"Vue en lecture seule des sessions Codex sur ce Gateway et chaque ordinateur connecté qui les partage.","updated_at":"2026-07-09T10:01:43.739Z"}
 {"cache_key":"366d97e5504f39bb1cb1e1fa656024a34801377ef5fa7356b07b80cd48f480b7","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.summary","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Session context usage: {used} of {limit} ({pct}%)","text_hash":"a62b97af0e5d02b8722725e2be0a936dd3d317a1f506ea15c766e87413b66a0d","tgt_lang":"fr","translated":"Utilisation du contexte de session : {used} sur {limit} ({pct} %)","updated_at":"2026-07-05T10:16:09.189Z"}
 {"cache_key":"3a1b658e2766ee33c4a8154d7d81cc7fcaefff6a4118e2e08ce5d29f41434b66","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.restoreSession","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Restore session","text_hash":"35e4dc9befd3b3a29b50938839af0efb41b08051988dde53e1c1e73d1c2a039f","tgt_lang":"fr","translated":"Restaurer la session","updated_at":"2026-07-02T14:30:13.470Z"}
+{"cache_key":"3b48c583025003c0cb0d4c3cf5855b3e8b958dc256f51b97d55fe50d4f377679","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"fr","translated":"Ouvrir dans le navigateur par défaut","updated_at":"2026-07-09T11:02:48.820Z"}
 {"cache_key":"3bc46432de64f9d82a3e78b6cbc8170448add64ef00783823c1f0266d24ad3b8","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.agentFilterConfiguredDefaultHelp","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Cards explicitly assigned to the configured default agent.","text_hash":"9bb80530da1dfd473936d94642b83cc668b7362cb65675a565f17569937af92f","tgt_lang":"fr","translated":"Cartes explicitement assignées à l'agent par défaut configuré.","updated_at":"2026-06-17T14:14:32.183Z"}
 {"cache_key":"3c0184dd360912c8947b9a78652bf0b39064c358953f3403ff700329ef79a36f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthLabel","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Workboard health","text_hash":"85416c4a6d64e35611bdd9747b82815936c38b41d820796ba1fbfbb7539d906b","tgt_lang":"fr","translated":"État du tableau de travail","updated_at":"2026-06-17T14:14:37.466Z"}
 {"cache_key":"3c8df1c3cf1b9b89ac7d771171aacde57dbfb30b1f92314aafd9e33e54db0812","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkAdvancedSettingsRequiresAdmin","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Advanced settings require admin","text_hash":"021f44198c7c7935a112e55150d2daaebe388ac9e529460d64c2f8f3ba3b9d82","tgt_lang":"fr","translated":"Les paramètres avancés nécessitent un accès administrateur","updated_at":"2026-07-06T20:20:02.809Z"}
@@ -63,6 +64,7 @@
 {"cache_key":"424f9b28aaa8357013433e8caad46c51ad5141083f8de91f9215824cad9d34e3","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventOrchestration","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Orchestration","text_hash":"ed4fdd1721677737cffb2862fe34d5b63901c7cc76b8c67c51e92a467b31a5e7","tgt_lang":"fr","translated":"Orchestration","updated_at":"2026-05-30T15:38:23.998Z"}
 {"cache_key":"4255a719f4f69f4be7edecc3dbdc5279ceb09478ea0e2d4f428d4b10b5dd6740","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.parentFolder","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Parent folder","text_hash":"158f5a01ef8cfb1e6d91f8c321dd3a63f5e457f9650eecd662857701762bd31d","tgt_lang":"fr","translated":"Dossier parent","updated_at":"2026-06-16T14:14:38.496Z"}
 {"cache_key":"4348d8b8b481e750f43855decc77578211c8b11edff0aab7474256f612664206","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.runtime.subagent","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Subagent","text_hash":"d6cb4188b8fa57aae3e4ca3a1210c9afe7ca995375c2fb36d90a1fa73529a44e","tgt_lang":"fr","translated":"Sous-agent","updated_at":"2026-07-06T08:42:32.187Z"}
+{"cache_key":"445667ee63b3998cda03cc9f148048d488fa2a70a04e052be534e751f9b86cc3","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"fr","translated":"Ouvrir dans la barre latérale","updated_at":"2026-07-09T11:02:48.820Z"}
 {"cache_key":"44af3c13b3d3654d758b55ff2be9d8ad98ef796691eaab42a796a2434baa2c7d","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByDate","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Date","text_hash":"99c40ab405926cb5ad1def9cff4d7ce624f8f8abfff4e85f655347fcb949d08e","tgt_lang":"fr","translated":"Date","updated_at":"2026-07-05T14:39:49.624Z"}
 {"cache_key":"45f77c4535f74f1e1b676ac2ecc391404f91a9c8b4c84ffc37d34273717001c8","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.emptyFilteredHint","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Change the view, search, priority, agent, or archive filter.","text_hash":"049dfae940263ace9707334af06b298c1223c38a449b1cec5a712553badebbd0","tgt_lang":"fr","translated":"Modifiez la vue, la recherche, la priorité, l'agent ou le filtre d'archive.","updated_at":"2026-06-17T14:14:37.466Z"}
 {"cache_key":"4667b37b6fd6426af22fc905b46caad8f5b3f36ea33cf521c3e3ea151c9e0aeb","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventProtocolViolation","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Protocol violation","text_hash":"367bb2052963f7d75beb672d3ca0430d7d49ac48a2759d578c7df933178fe564","tgt_lang":"fr","translated":"Violation du protocole","updated_at":"2026-05-30T15:38:23.998Z"}
@@ -121,6 +123,7 @@
 {"cache_key":"7002d22e03ddb1e5bcc6c8e00a5f82751bdaa35003b2f337f8e71a1ab891e77b","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.taskCountOne","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"1 task","text_hash":"cba293c13f302204af2ae5b202d80ea840fdf1cf7904d59e1a62efbadf1e5256","tgt_lang":"fr","translated":"1 tâche","updated_at":"2026-07-06T08:42:28.842Z"}
 {"cache_key":"70ffd7a78b610cc2643444d10e4aa03c2e553a1166ecc02d6b54c9a309df2ab3","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.agentFilterUnassignedHelp","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Cards without an explicit agent.","text_hash":"f716a36252b33511df056fe7d1092be598eca17ea76bedc5d6d3532ec6b0ffea","tgt_lang":"fr","translated":"Cartes sans agent explicite.","updated_at":"2026-06-17T14:14:32.183Z"}
 {"cache_key":"71f0a585503d91582dcde4674c25037bbaac82732490db87e5bd912739f04454","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortSessions","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Sort sessions","text_hash":"6680f07d3df817d60180acbbc6e207689d28caaa27ac23749f93261b8111a38d","tgt_lang":"fr","translated":"Trier les sessions","updated_at":"2026-07-06T15:07:02.499Z"}
+{"cache_key":"7234248cfbec5b77523f43e81b72e3e2a0ebea267e12e5771d704c10f6498a1d","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"fr","translated":"Actions de lien","updated_at":"2026-07-09T11:02:48.820Z"}
 {"cache_key":"7326bfc1b896e188b85434fa1b3660fc59c02c85b1cc1d814063eb0c84bd71be","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.newGroupPrompt","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"New group name","text_hash":"cee9e709525c90b1a97dff72c62082602b199b54036ed573926d1b11c6d54ec7","tgt_lang":"fr","translated":"Nom du nouveau groupe","updated_at":"2026-07-05T14:39:49.624Z"}
 {"cache_key":"739924a29500b99f0e7cdb1448e7b51daa1907699dbe46686a6e116e9a5f32f5","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneFallback","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Microphone {number}","text_hash":"357eae20db9739dfdbb59ec21db70200f6ca9ee257c28ed637712f147af419ec","tgt_lang":"fr","translated":"Microphone {number}","updated_at":"2026-07-06T17:56:30.924Z"}
 {"cache_key":"7495390a09799ce1841fa41dc6a9daca111dcde994af650fde947b06baa46445","model":"gpt-5","provider":"openai","segment_id":"codexSessions.disconnected","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Reconnect to the gateway to refresh Codex sessions.","text_hash":"e5f80a33fab5ee6ffa4d7e3c58e7deb8e078e04b7a12cb9a007913904cbdb0c5","tgt_lang":"fr","translated":"Reconnectez-vous au Gateway pour actualiser les sessions Codex.","updated_at":"2026-07-09T10:01:43.739Z"}
@@ -255,6 +258,7 @@
 {"cache_key":"d8b82816b2447f9cdf8c1f6e790726787cc313c2e9369bee4b5573e70acc0dad","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh30s","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"30s","text_hash":"d3382a4f0e03f8b14cf99424376886c236f1503d4b332137667484fc96d58fc4","tgt_lang":"fr","translated":"30s","updated_at":"2026-06-17T14:14:37.466Z"}
 {"cache_key":"dba4de5b395e649c53c56af6e8683b3ec249196ff14953ec51d61e7dd68914e7","model":"gpt-5","provider":"openai","segment_id":"usage.costWindows.lastDays","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Last {count} days","text_hash":"4aa456a0fa9b73dcc14766740b19fc52c452950ccb7bc892499c3c29a4122162","tgt_lang":"fr","translated":"{count} derniers jours","updated_at":"2026-07-05T20:24:32.108Z"}
 {"cache_key":"dbcc1e6ff0588e27c2292f68df4039426a50b65b151a4cd043db53a9476c8090","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.runtime.unknown","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Task","text_hash":"4bc74b21357c6cf5cca8f66b4d4ee948be64d0396feb434c9645e168ad61ceaf","tgt_lang":"fr","translated":"Tâche","updated_at":"2026-07-06T08:42:32.187Z"}
+{"cache_key":"dc0cde6fbb2257f11c231f7bc2f1d44e21fb2e2e475249d41f4353ce177c6d58","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"fr","translated":"Copier le lien","updated_at":"2026-07-09T11:02:48.820Z"}
 {"cache_key":"dcb48055b5aafa2813da3820617d5c5653945c57dfbf0d6cb81d4c7f74049b43","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.noBrowserFiles","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"No files in this folder.","text_hash":"3847020c79b1c74e28aa550f0ae53838b764e87f1daf1480dd6aae45ae0529d6","tgt_lang":"fr","translated":"Aucun fichier dans ce dossier.","updated_at":"2026-06-16T14:14:38.496Z"}
 {"cache_key":"dee70ec60c911896eff244b9424d125be13ed5078065ad7ad11270460cad9168","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.label","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Session workspace","text_hash":"c0e8ea0cf983d14e8ba3f8fc28976954d637fd50f807c69e9695715fd2384b78","tgt_lang":"fr","translated":"Espace de travail de session","updated_at":"2026-06-16T14:14:33.243Z"}
 {"cache_key":"def903c07d7e651f99d9b009d9e1b6ed6984186c0bec8ff5314a8341032a6609","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh","source_path":"ui/src/i18n/locales/fr.ts","src_lang":"en","text":"Auto-refresh","text_hash":"9ea4d7fd1550f0866089d18b1344546bfed91502b41c0484d6023ceb0fdeb75c","tgt_lang":"fr","translated":"Actualisation automatique","updated_at":"2026-06-17T14:14:32.183Z"}
diff --git a/ui/src/i18n/.i18n/hi.meta.json b/ui/src/i18n/.i18n/hi.meta.json
index 7f34002a72e..4a9eb76fb08 100644
--- a/ui/src/i18n/.i18n/hi.meta.json
+++ b/ui/src/i18n/.i18n/hi.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:59.750Z",
+  "generatedAt": "2026-07-09T11:53:05.817Z",
   "locale": "hi",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/hi.tm.jsonl b/ui/src/i18n/.i18n/hi.tm.jsonl
index a5476c7ef89..52251c6e227 100644
--- a/ui/src/i18n/.i18n/hi.tm.jsonl
+++ b/ui/src/i18n/.i18n/hi.tm.jsonl
@@ -181,6 +181,7 @@
 {"cache_key":"1baa776363d1dc7398cf2a105b4f9ffcbe4efcd3fcd706782e6025b01d3942d1","model":"gpt-5.5","provider":"openai","segment_id":"chat.workspaceFiles.preview","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Preview","text_hash":"324b134f57c70c729ae3dc4d298bb451656717d70523e942c1ce667b8024ea07","tgt_lang":"hi","translated":"पूर्वावलोकन","updated_at":"2026-06-26T21:36:47.054Z"}
 {"cache_key":"1baef85011942433fa2027143da1fa05f716e844612b0823ba00042100077d5a","model":"gpt-5.5","provider":"openai","segment_id":"dreaming.phrases.connectingDots","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"connecting distant dots…","text_hash":"167c47f1f6e5d7399326f6a72572cef9ab8cf655c4e17f4bf250e25f76478812","tgt_lang":"hi","translated":"दूरस्थ बिंदुओं को जोड़ा जा रहा है…","updated_at":"2026-06-26T21:34:24.815Z"}
 {"cache_key":"1bc048cce5132db20b07f88770ed9bf4d9daa52c2a48276f2a4a07b34a6aedd9","model":"gpt-5.5","provider":"openai","segment_id":"usage.overview.throughputHint","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Throughput shows tokens per minute over active time. Higher is better.","text_hash":"25aa92e440598aef332a7addc6d14989f1f7562c8fa83110304de0ecd228d8a1","tgt_lang":"hi","translated":"थ्रूपुट सक्रिय समय में प्रति मिनट टोकन दिखाता है। अधिक बेहतर है।","updated_at":"2026-06-26T21:35:07.144Z"}
+{"cache_key":"1c1a34bc0eaa5841fc38c929bf8179c4ae2600e446c28696aff1e07711088787","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"hi","translated":"Sidebar में खोलें","updated_at":"2026-07-09T11:02:50.954Z"}
 {"cache_key":"1c36d6c33e3563e667e11b3d029f25e55b9cc31b7253af4d09abc0f49a1b976b","model":"gpt-5.5","provider":"openai","segment_id":"cron.form.cantAddYet","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Can't add job yet","text_hash":"4044d5877dcb5b01039cb98c32106f3f3b91348355bbd0d784829e7fec115e61","tgt_lang":"hi","translated":"अभी जॉब नहीं जोड़ी जा सकती","updated_at":"2026-06-26T21:38:06.735Z"}
 {"cache_key":"1c47711db7428961947bb21c68557fd977c8f74c3e1de062f1df66e5916151ae","model":"gpt-5.5","provider":"openai","segment_id":"agents.files.preview","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Preview","text_hash":"324b134f57c70c729ae3dc4d298bb451656717d70523e942c1ce667b8024ea07","tgt_lang":"hi","translated":"पूर्वावलोकन","updated_at":"2026-06-26T21:30:58.804Z"}
 {"cache_key":"1c7c454c2da650208a35fea96bb84db3111e51031d199be049d35b4c5b17705a","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.searchPlaceholder","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Filter by key, agent, label, kind…","text_hash":"6ab8a2ab4c3ba1260b191f83561320e465410e60ec054c4ffe55714412acb496","tgt_lang":"hi","translated":"की, एजेंट, लेबल, प्रकार के आधार पर फ़िल्टर करें…","updated_at":"2026-06-26T21:30:15.460Z"}
@@ -520,6 +521,7 @@
 {"cache_key":"4dab71a80b1110fe0f061de6fea8552c0e5bd636be75daf04562e91f5fab669a","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.splitDown","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Split down","text_hash":"8730b89df7caaf5b5090f9b7365a0a03e0a13d9682dc6418f556b8a676d9e98f","tgt_lang":"hi","translated":"नीचे विभाजित करें","updated_at":"2026-07-06T07:23:39.104Z"}
 {"cache_key":"4dc1b1175e646c5eb2884bda79ca7415fe2e4798d9ff003a3a8e4230368d7f15","model":"gpt-5.5","provider":"openai","segment_id":"usage.details.ofInput","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"of input","text_hash":"475574dee216ac12f860bf64f68223a82c7538b30eb25cc28bc7d1fddd65f0f5","tgt_lang":"hi","translated":"इनपुट का","updated_at":"2026-06-26T21:35:26.182Z"}
 {"cache_key":"4dcccdb37e39251fca023337038a84d0c71fd933aa3b829fa7102a3c8ab26201","model":"gpt-5.5","provider":"openai","segment_id":"workboard.template.release","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Release","text_hash":"e020e3c67bd0c31227720bd8eb2c3a777d162e0987e8fd8438b007c170266476","tgt_lang":"hi","translated":"रिलीज़","updated_at":"2026-06-26T21:32:39.899Z"}
+{"cache_key":"4ddcc474b699ccce2fe0278c7ec2e93d40cfff5078c6c450413b3fbd459a05e3","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"hi","translated":"लिंक कार्रवाइयाँ","updated_at":"2026-07-09T11:02:50.954Z"}
 {"cache_key":"4e007bda34ca2c1ae144badc8eb4c8d23df2f6f603382a0120241152a6435437","model":"gpt-5.5","provider":"openai","segment_id":"codexSessions.status.unknown","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Unknown","text_hash":"b764cdc0eab7137467211272fa539f1260d1bf2e71bcf6ff3bdc960f5c16aa14","tgt_lang":"hi","translated":"अज्ञात","updated_at":"2026-06-26T21:30:08.627Z"}
 {"cache_key":"4e0ed45f4146d754e39e4ea35036a8cfcfa9653ed169216ab8d955d18086f1d5","model":"gpt-5.5","provider":"openai","segment_id":"overview.palette.descriptions.debugMode","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Toggle debug","text_hash":"3a3694c533cf3e15af8f2186a5750ab5919ca21b64e82c5dce5abd1ce4bdc406","tgt_lang":"hi","translated":"डीबग टॉगल करें","updated_at":"2026-06-26T21:33:46.154Z"}
 {"cache_key":"4e16d063012829703d1a0e0cbd7064a86a582b8a173f644609a6d5a41a789bb7","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.statusIdle","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Idle","text_hash":"ab0171ca0494d441cb6fe96e2efbe1c2a129f1d87cd6c17f03613cfd111149dd","tgt_lang":"hi","translated":"निष्क्रिय","updated_at":"2026-06-26T21:30:26.471Z"}
@@ -1054,6 +1056,7 @@
 {"cache_key":"abe33e6aef824f513e1f75eec10f53a9ff6bc640ebb558fe7e3ae9190a70d1ab","model":"gpt-5.5","provider":"openai","segment_id":"tabs.channels","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Channels","text_hash":"4c8906cf76f5740ab8792aef9f0033fe21a92045e90b357816064e9f6860a03e","tgt_lang":"hi","translated":"चैनल","updated_at":"2026-06-26T21:31:23.820Z"}
 {"cache_key":"abe8883fba3cce7165a9a5efc1ff331b6825572e97b37053f92a39d3ecf2714a","model":"gpt-5.5","provider":"openai","segment_id":"common.credential","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Credential","text_hash":"b1c42b3ce118093bc656bf16e7b87e069403a18246d2ea36d3c667850cb5bda1","tgt_lang":"hi","translated":"क्रेडेंशियल","updated_at":"2026-06-26T21:29:32.270Z"}
 {"cache_key":"abf4d2339f200457118aab8594573fcf532028695460941e640c6c4e7ab77101","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.talkModel","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Model","text_hash":"5e2c614c23f02239bc03c6c04fcb681950f9e72bf8fdff6be79c79841cbb10c0","tgt_lang":"hi","translated":"मॉडल","updated_at":"2026-06-26T21:38:06.735Z"}
+{"cache_key":"ac08fa7374d053625435ece3e09aabbb74f5db4dc76dc57457423732fa82025f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"hi","translated":"Default Browser में खोलें","updated_at":"2026-07-09T11:02:50.954Z"}
 {"cache_key":"ac09c25cc94307c82cff72526abbe55c4612a221d87423c060cc77793756fff9","model":"gpt-5.5","provider":"openai","segment_id":"usage.filters.clear","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Clear","text_hash":"83b12c2216efb4fdc924e1deb5182e905e4926ed0c1c324d467107f46d5a26a9","tgt_lang":"hi","translated":"साफ़ करें","updated_at":"2026-06-26T21:34:37.383Z"}
 {"cache_key":"ac5fa40298cb7f77c985d7c8ba466c24d4833c2509cb538b9fcbdba38d17016d","model":"gpt-5.5","provider":"openai","segment_id":"common.enabled","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Enabled","text_hash":"92c1cdfdf4cb9cf6fcca962f206de36fd5d60db1178bc9461052f8de703a0e06","tgt_lang":"hi","translated":"सक्षम","updated_at":"2026-06-26T21:29:24.057Z"}
 {"cache_key":"ac892afebcc1e7c7f76c06d995433bda6f8eeecff6adbc4e7099a282c8b37862","model":"gpt-5.5","provider":"openai","segment_id":"cron.jobList.enabled","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"enabled","text_hash":"fb9cf75606b4070dd6a9705810906bba28d0e2ea74ff301b999a91dbb68c7d98","tgt_lang":"hi","translated":"सक्षम","updated_at":"2026-06-26T21:38:06.735Z"}
@@ -1475,6 +1478,7 @@
 {"cache_key":"ef196cef5346a32545e024561276c0866f5f1b9ed89324e93465426a74e9b752","model":"gpt-5.5","provider":"openai","segment_id":"usage.sessions.clearSelection","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Clear Selection","text_hash":"c52ff5ea803d577544a8224d1404ecefa836b803f029d87cd7450af6c18a70ef","tgt_lang":"hi","translated":"चयन साफ़ करें","updated_at":"2026-06-26T21:35:13.036Z"}
 {"cache_key":"f00c046c6916fc3b5b4677c58ab7de0547954445126c4a534a38dc18f53d509e","model":"gpt-5.5","provider":"openai","segment_id":"common.saving","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Saving…","text_hash":"23e39291d6135814ed7c936e278974544b0df5fbf0eb0427b6700979b7472a93","tgt_lang":"hi","translated":"सहेजा जा रहा है…","updated_at":"2026-06-26T21:29:38.612Z"}
 {"cache_key":"f07eb656dabc20642993860990948fd5f1ddaf860962b122a1e0d6e6fc7f265c","model":"gpt-5.5","provider":"openai","segment_id":"overview.cards.modelAuth","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Model Auth","text_hash":"15e5d3b038456d28fe3c7255935a490892a1517c8d316170e5776009bc9dc9bd","tgt_lang":"hi","translated":"मॉडल प्रमाणीकरण","updated_at":"2026-06-26T21:33:34.535Z"}
+{"cache_key":"f07fc3f37ed84c3a976b88616d1836e96faf8b509a3624a2513c531c519e4d57","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"hi","translated":"लिंक कॉपी करें","updated_at":"2026-07-09T11:02:50.954Z"}
 {"cache_key":"f094d194efe0d4b81d8d819e14af6e719dcd7954198442f21850c67785b1632e","model":"gpt-5.5","provider":"openai","segment_id":"nodes.binding.defaultBinding","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Default binding","text_hash":"ce2cc6f09a11b7087293c651a72a308715d38aee5875150ff00907b9443bad4e","tgt_lang":"hi","translated":"डिफ़ॉल्ट बाइंडिंग","updated_at":"2026-06-26T21:29:59.416Z"}
 {"cache_key":"f0a2d4b6e86bc86da28d7e86a04605098a5424342a0dc78ae3c54d65270ad51d","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.systemDefaultMicrophone","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"System default","text_hash":"b0459211f9f76871059135050a2afd9a01e7e41dc32ea58006c51483b9ceab6d","tgt_lang":"hi","translated":"सिस्टम डिफ़ॉल्ट","updated_at":"2026-07-06T17:33:48.459Z"}
 {"cache_key":"f0d9ddebe62004ba4775acf66cd53f5ac13e46ed28d03a24a477ca8c718fc552","model":"gpt-5.5","provider":"openai","segment_id":"usage.filters.hours","source_path":"ui/src/i18n/locales/hi.ts","src_lang":"en","text":"Hours","text_hash":"21e8492938abc179410c21f3598f141c4c59a8bf2d3b4e475b7d83e10adfc00f","tgt_lang":"hi","translated":"घंटे","updated_at":"2026-06-26T21:34:37.383Z"}
diff --git a/ui/src/i18n/.i18n/id.meta.json b/ui/src/i18n/.i18n/id.meta.json
index e8b87122ceb..91c1df69c59 100644
--- a/ui/src/i18n/.i18n/id.meta.json
+++ b/ui/src/i18n/.i18n/id.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:01.245Z",
+  "generatedAt": "2026-07-09T11:53:07.057Z",
   "locale": "id",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/id.tm.jsonl b/ui/src/i18n/.i18n/id.tm.jsonl
index a53e8809f2c..023c65d6b26 100644
--- a/ui/src/i18n/.i18n/id.tm.jsonl
+++ b/ui/src/i18n/.i18n/id.tm.jsonl
@@ -126,6 +126,7 @@
 {"cache_key":"745086d636a1096431106dae8ec2cbfb4b1be11011f2b0d213d0f7c78a6babc3","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.moveToGroup","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Move session to a group","text_hash":"7db4b663aebb86158b454c49ad05115941c0411cb8ed6182bdc8fd5840f32dff","tgt_lang":"id","translated":"Pindahkan sesi ke grup","updated_at":"2026-07-05T14:40:07.941Z"}
 {"cache_key":"74bc9eb04180a5bc305e471d65e62d07c7851e103391d914ad9a44fce756bbfb","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthReadyUnassigned","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"ready unassigned","text_hash":"1e1a31a02e9da6ffa99a459bfd82e5af723794c2175405a5a0d6a32afa955167","tgt_lang":"id","translated":"siap tanpa penugasan","updated_at":"2026-06-17T14:16:03.086Z"}
 {"cache_key":"74f845ba10229ece62e6dac3af6300e5ba8e55fe444680147c75aea36198cf59","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupRowCount","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"{count} sessions","text_hash":"27de9b3be346a2abd2cb67f9f93abfe8100d7ce996e1204b75fc84670c7818e6","tgt_lang":"id","translated":"{count} sesi","updated_at":"2026-07-05T14:40:07.941Z"}
+{"cache_key":"761cb8c9982041a5009b31bbad1eb26be73929628802afd311aa611444aea480","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"id","translated":"Buka di Bilah Sisi","updated_at":"2026-07-09T11:03:03.655Z"}
 {"cache_key":"776e5d47dafca6fff53ca0704172af9fb625974d132e755792a55ab12b5c17d0","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browserCount","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"{count} shown","text_hash":"e57b4adfe868fd74a183650103d820176d4960bd0bdb677d9985db09f9752867","tgt_lang":"id","translated":"{count} ditampilkan","updated_at":"2026-06-16T14:16:57.267Z"}
 {"cache_key":"777df2e1c1ef6f414ca35b67574821e6766085948881b9458bc2453cdb750404","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.name","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Name","text_hash":"dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50","tgt_lang":"id","translated":"Nama","updated_at":"2026-07-05T21:01:23.086Z"}
 {"cache_key":"7781d543931e105b5b122201b4f1913e29c028cc7b6e0695c5a91ec2d84dce0c","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.goal","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Goal","text_hash":"cdbf6975e8a35b0d03558be6822dfae166482c24fb86b0433f60e8167f5c91e4","tgt_lang":"id","translated":"Tujuan","updated_at":"2026-05-29T21:01:43.511Z"}
@@ -139,8 +140,10 @@
 {"cache_key":"7dc3d097aaac4bbd9588cde2efaf65c4d73b17ee0fd71a43fd2d77d3167c4c2f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkSensitivityHigh","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"High","text_hash":"c4ebc6d4a5832cd9415f906ad03661110c705a72381c8b8b145761d02e2dd23a","tgt_lang":"id","translated":"Tinggi","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"7fc90d6555dfff8342099d2cf2bf92cee1d57a5d52c8a139233a9335e5b629b5","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.contextUsage","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"{percent}% of context used ({used} / {context} tokens)","text_hash":"f626ed78b8aca81f039ef64637bbdd4cffe0a289b402fd0c6039e977040aba72","tgt_lang":"id","translated":"{percent}% konteks digunakan ({used} / {context} token)","updated_at":"2026-07-09T07:06:29.950Z"}
 {"cache_key":"8013fce2e44ac76d5f3d1250031b386d22ddd7b761fd9f1da253a256a1ee1444","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.read","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Read","text_hash":"9b9a8d05a7ec353bda84f9c1bb3178c299de3001b5e970508ddc889c487f92ca","tgt_lang":"id","translated":"Dibaca","updated_at":"2026-06-16T14:16:57.267Z"}
+{"cache_key":"80c16723b9493e771f4ea550e11e149989014c6af810342aab9d0cf5f7dfcf06","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"id","translated":"Buka di Peramban Default","updated_at":"2026-07-09T11:03:03.655Z"}
 {"cache_key":"8125570da6e44802016771b98d5813455cd9c760065ba06f46f6a8d83ed8aa63","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupMenu","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Group options for {group}","text_hash":"29456bfd0f10cfa1b3b0c005e2202221ff66aafe6b72ee05f7cfc93ce9e79af7","tgt_lang":"id","translated":"Opsi grup untuk {group}","updated_at":"2026-07-06T23:41:12.290Z"}
 {"cache_key":"82335a79758d012cc71569cd356d68ed8d220749afe5f38b659989e09a6b85b7","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailNoNotes","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"No operator notes yet.","text_hash":"497e07f47e33851483b6fb1254e88dc640d9fb25525c51f89934a7d39d7b2b9c","tgt_lang":"id","translated":"Belum ada catatan operator.","updated_at":"2026-06-16T14:16:50.406Z"}
+{"cache_key":"828e83436a397a326e5cc220c83cacd44ae71c34c6a4794fedaac2db8df31d29","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"id","translated":"Tindakan tautan","updated_at":"2026-07-09T11:03:03.655Z"}
 {"cache_key":"83279b9347999113353e3329acd5681eabb3c3bca3c2229fbb5322c59a7bfa1f","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.unpinSession","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Unpin session","text_hash":"f4c582ee4d7a87bf069d05a49bb0211759d3db8366daab4ba7024425961af5dc","tgt_lang":"id","translated":"Lepas sematan sesi","updated_at":"2026-07-02T14:30:35.554Z"}
 {"cache_key":"83c5760dbb67987691e4fc4f45359c36906186ae798f1cfb1eabbd97f52c469f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browser","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Project files","text_hash":"2a3d9a240c9206964ee7237a1d99fda05ed501a485262e18f33c446c9f735d1c","tgt_lang":"id","translated":"File proyek","updated_at":"2026-06-16T14:16:57.267Z"}
 {"cache_key":"83d4864f0ad0c51bb802f8ba5db662911ce59b702c41da0006a340ea1389a768","model":"gpt-5.5","provider":"openai","segment_id":"nav.settingsGeneral","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"General","text_hash":"c910d474dcd724bff83ddedeb06bf1eceaf9fb3af7c76bb282be057f36e6dffa","tgt_lang":"id","translated":"Umum","updated_at":"2026-07-09T08:08:07.402Z"}
@@ -285,6 +288,7 @@
 {"cache_key":"fa65d2992bc93c13c05e79fbec6565a3f70213d30c09b899a733844bb2091c33","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthFailedAttempts","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"failed attempts","text_hash":"fd9023af0795825a458100ddbe894a7a8f603324a2b7ad2305d4c9d2334cbd26","tgt_lang":"id","translated":"upaya gagal","updated_at":"2026-06-17T14:16:03.086Z"}
 {"cache_key":"faf68dc5af548a4e09ba710d9b13da9921839a75e7fc637c3d607f691e8f7a2e","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.contextWindow","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Context window","text_hash":"7696d0855331622dc12438057f5509348f9d6f0ec2eb3580e18a99d31eba86db","tgt_lang":"id","translated":"Jendela konteks","updated_at":"2026-07-05T10:16:23.978Z"}
 {"cache_key":"fb4a92811817189a6165cfa989b50f49b1db8e206535ab1f70b6c2fcbffb6430","model":"gpt-5.5","provider":"openai","segment_id":"nav.settingsGroupSystem","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"System","text_hash":"6725e7bbcd28f3a8a586fa34bf191fd72dde8b61756932cd3237c17a6f196f1a","tgt_lang":"id","translated":"Sistem","updated_at":"2026-07-09T08:08:07.402Z"}
+{"cache_key":"fb663cf7de8138e9585d262c48880fa2843da1ef75be7cbf9750c51905b04c70","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"id","translated":"Salin Tautan","updated_at":"2026-07-09T11:03:03.655Z"}
 {"cache_key":"fcd928fd054b0eee35d6b577464d4736092ee8651319be0d8cfdebfe71bc5efb","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateThisWeek","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"This week","text_hash":"8c4eef5ab2532515ef24a662db70f6e5b8063c7f924342b2a463f763f1091634","tgt_lang":"id","translated":"Minggu ini","updated_at":"2026-07-05T14:40:07.941Z"}
 {"cache_key":"fd92e2a789288a3c451c5e575c10558faf23237805ef9ef230e94d4922234ef7","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkAdvancedSettingsRequiresAdminTitle","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Advanced Talk settings require operator.admin access.","text_hash":"fa933a90d7dde5f8f1a324bd13a5daceb0ad9e04bd77f3aae07c8348edfe4dd7","tgt_lang":"id","translated":"Pengaturan Talk lanjutan memerlukan akses operator.admin.","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"fe3b8bb7f385af7d09f13c2993c0909423c87c583a628cac4af12bdb62f94132","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.collapse","source_path":"ui/src/i18n/locales/id.ts","src_lang":"en","text":"Collapse session workspace","text_hash":"b6174b882c37a98e640339d728652a0c1fa70d28ed53d8ccfb6e99363e86973b","tgt_lang":"id","translated":"Ciutkan workspace sesi","updated_at":"2026-06-16T14:16:50.406Z"}
diff --git a/ui/src/i18n/.i18n/it.meta.json b/ui/src/i18n/.i18n/it.meta.json
index 4400fa1e5bf..857df3f0a92 100644
--- a/ui/src/i18n/.i18n/it.meta.json
+++ b/ui/src/i18n/.i18n/it.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:00.396Z",
+  "generatedAt": "2026-07-09T11:53:06.385Z",
   "locale": "it",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/it.tm.jsonl b/ui/src/i18n/.i18n/it.tm.jsonl
index 47951d4645d..820e8b4da6b 100644
--- a/ui/src/i18n/.i18n/it.tm.jsonl
+++ b/ui/src/i18n/.i18n/it.tm.jsonl
@@ -67,6 +67,7 @@
 {"cache_key":"37422243d0eb94fff9e401158ee263567e94d694b8422472c33c6b87b0c25b03","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewAll","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"All cards","text_hash":"2306120917506b5998ec702f3661068b102dac538ba4c9e4634d65fe33eea98a","tgt_lang":"it","translated":"Tutte le schede","updated_at":"2026-06-17T14:19:01.168Z"}
 {"cache_key":"376d8bc71134b338c7d5701640f516299078c0f1206e65e4e9857589e082a73d","model":"gpt-5.5","provider":"openai","segment_id":"workboard.badgeAttachments","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"{count} attachments","text_hash":"7bb1847693bc91e6e4624d996a96840396a71052786ab143ccb47fbdaa77cf41","tgt_lang":"it","translated":"{count} allegati","updated_at":"2026-05-30T15:38:31.723Z"}
 {"cache_key":"3804ebbe0f359a86a4cdb243a3448bf293c8b22d35afd6e33223cf6ac4688eda","model":"gpt-5.5","provider":"openai","segment_id":"subtitles.worktrees","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Isolated agent task checkouts and recovery snapshots.","text_hash":"bc794dc846493e3c5f88964268af19b7dd818eae942c596002ef4067ba5a3d0c","tgt_lang":"it","translated":"Checkout isolati delle attività degli agenti e snapshot di ripristino.","updated_at":"2026-07-05T21:01:11.441Z"}
+{"cache_key":"381189ab10b76c9dbfb3777d402b7d77e965c6803bb2828e994962abe1a3a874","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"it","translated":"Copia link","updated_at":"2026-07-09T11:02:55.325Z"}
 {"cache_key":"38b73b55e0e54885508225249705edb8752340d685679d501b7729c24492359f","model":"gpt-5.5","provider":"openai","segment_id":"workboard.badgeWorkerProtocol","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"worker {state}","text_hash":"f16b9e04d42182b421ce4f4e982b2ef75fab9bd581bdc8b87e62899ba28de11c","tgt_lang":"it","translated":"worker {state}","updated_at":"2026-05-30T15:38:31.723Z"}
 {"cache_key":"39da36e39b4cb6c5631fdd767bfaf384b23e2617c235a20673db5b01cd367949","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupMenu","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Group options for {group}","text_hash":"29456bfd0f10cfa1b3b0c005e2202221ff66aafe6b72ee05f7cfc93ce9e79af7","tgt_lang":"it","translated":"Opzioni del gruppo per {group}","updated_at":"2026-07-06T23:41:05.438Z"}
 {"cache_key":"3cec7f61410edbc952139da9adb2a14497f2d131b6b4de67c23ba17535d11bd2","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browserCount","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"{count} shown","text_hash":"e57b4adfe868fd74a183650103d820176d4960bd0bdb677d9985db09f9752867","tgt_lang":"it","translated":"{count} mostrati","updated_at":"2026-06-16T14:15:52.376Z"}
@@ -206,6 +207,7 @@
 {"cache_key":"ac43f66b78edb2a5311d467054cb0898fe7d684a69641a052556462e85258b3e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.agentFilterUnassigned","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Unassigned (uses {agent})","text_hash":"2700af0c4ab5e86726f72a723ecdf50370b87690db35f00b83723d6457879c8e","tgt_lang":"it","translated":"Non assegnati (usa {agent})","updated_at":"2026-06-17T14:19:01.168Z"}
 {"cache_key":"ad884beb84385a4dd7c425a0d8bc1fff65acf6d69f66d39ac9e80805996ede7d","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneAccessFailed","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Unable to access microphone inputs.","text_hash":"5125ca209d6d3c763713490ec0de3a44db42aeab03cb21dcf4b047a1a4970669","tgt_lang":"it","translated":"Impossibile accedere agli ingressi del microfono.","updated_at":"2026-07-06T17:56:50.224Z"}
 {"cache_key":"aeea8ab05f5c94cb9860e6c53afeb55fd19bcf5ab4298c49d7e3feefa65d2f84","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChat","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Use current chat","text_hash":"fbc1ffd63daa506e927c7a85f6e43acd11e0b8c9f52a3951fc782b236ce9a787","tgt_lang":"it","translated":"Usa la chat corrente","updated_at":"2026-06-16T14:15:39.914Z"}
+{"cache_key":"af5aa92002b18fbd083a3da97b6e2abc9ffbee56d45189b8ae15181ea5036a88","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"it","translated":"Azioni del link","updated_at":"2026-07-09T11:02:55.325Z"}
 {"cache_key":"b10aad109b725b3bba5fff3b1cae99563db014dbe5a830f8823ec93cb8a6c28a","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByDate","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Date","text_hash":"99c40ab405926cb5ad1def9cff4d7ce624f8f8abfff4e85f655347fcb949d08e","tgt_lang":"it","translated":"Data","updated_at":"2026-07-05T14:39:59.770Z"}
 {"cache_key":"b15d21ee9f86e6d4001ff17b5329d03ef25466f2479f15670577965fb7cbf9b7","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.allSessions","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"All sessions","text_hash":"78648d4d66499d8dc19049a4e3bad87b404f99ea7a7f125ced52546e2d92bb79","tgt_lang":"it","translated":"Tutte le sessioni","updated_at":"2026-07-03T07:39:07.530Z"}
 {"cache_key":"b617446daa9c532d87c9d204dd9d7397f8f28a6d2408218f9de0878fcb897534","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.expand","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Expand session workspace","text_hash":"ac1d210db40c5026879774849ad74a9e1247523192a795ac33965b3ee72691c2","tgt_lang":"it","translated":"Espandi workspace sessione","updated_at":"2026-06-16T14:15:46.111Z"}
@@ -245,6 +247,7 @@
 {"cache_key":"d77da3b821794cd290567494746273d099c6360e24e203840ee755a457ab0968","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewReady","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Ready","text_hash":"5fa7aac5375c5815787fba3f49559f9b45b14023147ce0652803387974144e5f","tgt_lang":"it","translated":"Pronte","updated_at":"2026-06-17T14:19:01.168Z"}
 {"cache_key":"d9b74fbcf17a75111abe9952885e0c2fc128b6ad2cb16007b6025983c9b1a018","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupBy","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Group by","text_hash":"956a51f6b098a41b7c3108015f0790bb24af7693717b07cee39d5df6a5da1826","tgt_lang":"it","translated":"Raggruppa per","updated_at":"2026-07-05T14:39:59.770Z"}
 {"cache_key":"d9c07c3d5ff247ce284aeee81a2dcc7e6bab1d8f1f6b806f38d018d050a2797d","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.cleanNow","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Clean up now","text_hash":"da367b57478fe6da969f5ff3a78717074d7fca77a312ac2c8f77dc2f56032578","tgt_lang":"it","translated":"Pulisci ora","updated_at":"2026-07-05T21:01:11.440Z"}
+{"cache_key":"da35aa58ede928d42536eab52c68aeb85a71d3f764a4f7f6b651b8891f73c731","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"it","translated":"Apri nella barra laterale","updated_at":"2026-07-09T11:02:55.325Z"}
 {"cache_key":"db1e5463f95e00564af990dd0038ca490c7876d98c37d2fd2e65dba136ccc0e5","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewPreset","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Workboard view","text_hash":"cc2b05179ad742029156bb45578e880c46599fd28e1c2ab66f5a6f9e7f8fa08e","tgt_lang":"it","translated":"Vista workboard","updated_at":"2026-06-17T14:19:01.168Z"}
 {"cache_key":"dbfd2e7bdbdc950a5052cc3efa12ff7d5c6320e0738554fdf47a7d14804b7146","model":"gpt-5","provider":"openai","segment_id":"codexSessions.summary.sessions","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"sessions","text_hash":"1225ae6c1ae69dcb4ee4781b703e12206f3b549cd3ca151070a8d8d8f371dd71","tgt_lang":"it","translated":"sessioni","updated_at":"2026-07-09T10:01:43.724Z"}
 {"cache_key":"dc619a178b37c615cb2a867131dc82941d84b28d386646d7c8fa88ce207c3ec6","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateNoActivity","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"No activity","text_hash":"0cf9505f9f97c8359cc143ba3e88bedaba3a4ae92c2794ffd1b097270732ed18","tgt_lang":"it","translated":"Nessuna attività","updated_at":"2026-07-05T14:39:59.771Z"}
@@ -272,6 +275,7 @@
 {"cache_key":"f6402d540f1617b8defeb52e5cf84ff42fecf44331334ec4010eef7544474ef8","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.idle","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Idle","text_hash":"ab0171ca0494d441cb6fe96e2efbe1c2a129f1d87cd6c17f03613cfd111149dd","tgt_lang":"it","translated":"Inattiva","updated_at":"2026-07-09T10:01:43.724Z"}
 {"cache_key":"f7eafb8ff2741c1c4b8b96872e5f58bdd454a1765cff0f31d0a1614c64aa135f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailOperatorNotes","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Operator notes","text_hash":"7d2a121620cebfb9c4f6c0f82b693b75d65a4210b8232d77ef87e45fce334347","tgt_lang":"it","translated":"Note dell'operatore","updated_at":"2026-06-16T14:15:39.914Z"}
 {"cache_key":"f89df9b85d49891bd2d5e2edd082f0b0ce8e9c35216140ac1bc99d006ed99cd5","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.session","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Session","text_hash":"6959b4159575d8dd76d9f3bbe2c6437904f861e7860c35abd18deffb1c3425a0","tgt_lang":"it","translated":"Sessione","updated_at":"2026-06-16T14:15:52.376Z"}
+{"cache_key":"f8ac0cc8b58b8529a5ad9d3769976a6ac01c4d2b8f36377a3ecbf1b7ba542659","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"it","translated":"Apri nel browser predefinito","updated_at":"2026-07-09T11:02:55.325Z"}
 {"cache_key":"fb474c3c2a2658545c16301ebe03ce16e2c9db7fecb442c181f7e242b675a581","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.restorable","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Restorable","text_hash":"bc97d2ddd2dba3ab2391f21314316556111065c4b870bc05679fadd60a754c01","tgt_lang":"it","translated":"Ripristinabile","updated_at":"2026-07-05T21:01:11.440Z"}
 {"cache_key":"fcafabad29d1a8ae49fe07c445b2c75b200fb43fa5571bba42d3af098c2ae46c","model":"gpt-5","provider":"openai","segment_id":"codexSessions.empty.active","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"No active sessions on this host.","text_hash":"27d1aa12b4e3732d0bceff36b848ab16fb1bad91386e509cd2a7eeecbf1551ca","tgt_lang":"it","translated":"Nessuna sessione attiva su questo host.","updated_at":"2026-07-09T10:01:43.724Z"}
 {"cache_key":"fd90ff517fe38f8f425f638c15307c2e4e1a23a0915baa0f8e3396e74ef2fc41","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewRecentlyDone","source_path":"ui/src/i18n/locales/it.ts","src_lang":"en","text":"Recently done","text_hash":"46b889592a2f5e79197f62b5f96c76993545626bf207740ea58632ceed9623be","tgt_lang":"it","translated":"Completate di recente","updated_at":"2026-06-17T14:19:01.168Z"}
diff --git a/ui/src/i18n/.i18n/ja-JP.meta.json b/ui/src/i18n/.i18n/ja-JP.meta.json
index 143191ad7ce..4e76eb0e322 100644
--- a/ui/src/i18n/.i18n/ja-JP.meta.json
+++ b/ui/src/i18n/.i18n/ja-JP.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:59.068Z",
+  "generatedAt": "2026-07-09T11:53:05.117Z",
   "locale": "ja-JP",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/ja-JP.tm.jsonl b/ui/src/i18n/.i18n/ja-JP.tm.jsonl
index eba28c0b3c0..d429f4fd45a 100644
--- a/ui/src/i18n/.i18n/ja-JP.tm.jsonl
+++ b/ui/src/i18n/.i18n/ja-JP.tm.jsonl
@@ -7,6 +7,7 @@
 {"cache_key":"021ef74a883eb57eee66395b69faa99471af46b59970a74cea7b03948f6e4312","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChatAria","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Use current chat for revision requests","text_hash":"9c551a423ae74aedaaa90e4df9899dbdc02f846d6ee058bf2576a812e2c52119","tgt_lang":"ja-JP","translated":"修正リクエストに現在のチャットを使用","updated_at":"2026-06-16T14:14:04.101Z"}
 {"cache_key":"026b0c38529e0d7f9f3c4fb0015cf447d0f61d583dac4d372a3380e7e15107fc","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.lastActive","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Last active","text_hash":"bcdf701c4dfbaee3a2162f9b9affd87a23a13426c391f95e964d983851b58a05","tgt_lang":"ja-JP","translated":"最終アクティブ","updated_at":"2026-07-05T21:00:44.514Z"}
 {"cache_key":"03dc64fe4c4fb6ae4a995e426d62fc9e2e60a602d38bf78197b154a34baa22eb","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.contextUsageApprox","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"~{percent}% of context used ({used} / {context} tokens, approximate)","text_hash":"54007077673048ad26ff220971d2598fde53a34c33da9e1eaca0927ce80b2708","tgt_lang":"ja-JP","translated":"コンテキストの約{percent}%を使用（{used} / {context} トークン、概算）","updated_at":"2026-07-09T07:40:34.132Z"}
+{"cache_key":"03e59a190bbdb7e9c06ee25888caac0bc7cf35323703f384ff0f1304b07b76d4","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"ja-JP","translated":"デフォルトブラウザで開く","updated_at":"2026-07-09T11:02:45.719Z"}
 {"cache_key":"048a3f6be3460115f38a014e6b0836da436a9bfcc7dc2c5ca45af4a50f620535","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthFailedAttempts","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"failed attempts","text_hash":"fd9023af0795825a458100ddbe894a7a8f603324a2b7ad2305d4c9d2334cbd26","tgt_lang":"ja-JP","translated":"失敗した試行","updated_at":"2026-06-17T14:14:09.255Z"}
 {"cache_key":"058aec00682d1490bbde5eb00424fcc20ca0eedac9ae8132fa615b1d0f9bb0bb","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateToday","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Today","text_hash":"2b065c7c9ce466e5ebcad757987d5d660ee4c9ea708bc62c43444b53334738ba","tgt_lang":"ja-JP","translated":"今日","updated_at":"2026-07-05T14:39:44.116Z"}
 {"cache_key":"06e8bce15cd73bea68d1502512f1c838bd658a7e3bdf0698cab0613673a1f70b","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dragSessionHint","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Drag to move between groups","text_hash":"3e8692b1cd1c1f9a606a779f1037aa390c885fde224ddb841df9259e8aab03ae","tgt_lang":"ja-JP","translated":"ドラッグしてグループ間を移動","updated_at":"2026-07-05T14:39:44.116Z"}
@@ -17,6 +18,7 @@
 {"cache_key":"0a8a9cdabf5314038b163d124dc468e64c3a1a4e9adeb004acc9c134be364cae","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.emptyFilteredTitle","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"No cards match this view","text_hash":"a272617e183ba1dff3f7f140d0851b64baf95f4827ff729d23dfeb05c2069875","tgt_lang":"ja-JP","translated":"このビューに一致するカードはありません","updated_at":"2026-06-17T14:14:09.255Z"}
 {"cache_key":"0aa7fc44541de1472246b7f1e236c59f0e559974384100d432785c05809371a7","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.restoreSession","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Restore session","text_hash":"35e4dc9befd3b3a29b50938839af0efb41b08051988dde53e1c1e73d1c2a039f","tgt_lang":"ja-JP","translated":"セッションを復元","updated_at":"2026-07-02T14:30:08.823Z"}
 {"cache_key":"0b186c6ce4e7be3cef7a0a7aa338fe0a5f68a091cfbd24eeb2b359a59177c907","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Auto-refresh","text_hash":"9ea4d7fd1550f0866089d18b1344546bfed91502b41c0484d6023ceb0fdeb75c","tgt_lang":"ja-JP","translated":"自動更新","updated_at":"2026-06-17T14:14:04.173Z"}
+{"cache_key":"0c339bfc53e689eed40156901e72fc95dbb4d18778ff3dd6202e330ede914479","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"ja-JP","translated":"サイドバーで開く","updated_at":"2026-07-09T11:02:45.719Z"}
 {"cache_key":"110a4c6f11a42e9bb51c50516642278b92107efe4f71868f8b93e790b1eb3665","model":"gpt-5","provider":"openai","segment_id":"codexSessions.loadMore","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Load more","text_hash":"ac8991ef01019cf55a2426194a05959e0cb886333f1a332ff4f442320d165400","tgt_lang":"ja-JP","translated":"さらに読み込む","updated_at":"2026-07-09T10:01:43.715Z"}
 {"cache_key":"11a891277b97903cbca169aebb523895b61151412e09a88cc5530ffb1dbf0d67","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewRunning","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Running","text_hash":"f4ccae29e1bb0c20a124570a1b43f4347ea94bba9f84ffdfddd9c7445b126128","tgt_lang":"ja-JP","translated":"実行中","updated_at":"2026-06-17T14:14:04.173Z"}
 {"cache_key":"11bb6a13a8975fe1d7f54eb10b28f1b7aa70f087395b5d1d02ae40bebede8dd0","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByCategory","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Custom groups","text_hash":"9636b3c175d0e2a9fb982785a84275d191a8b4ef28e4d842a9e35a38e3c12f10","tgt_lang":"ja-JP","translated":"カスタムグループ","updated_at":"2026-07-05T14:39:44.116Z"}
@@ -78,6 +80,7 @@
 {"cache_key":"4745bf360c0f2318649511e1494cf0ca801f76d5d9a71ee906325170c1466598","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneInput","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Microphone input","text_hash":"5c8a6025b9d96fb0c090d33c9def15ee64aa520a83cf5d64c784b4f0699bb15e","tgt_lang":"ja-JP","translated":"マイク入力","updated_at":"2026-07-06T17:33:41.956Z"}
 {"cache_key":"47ae58fcddc0a2dadf4cfb8d7718eb8c885feb72f446ea1b3e07c4e1a967448a","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventProtocolViolation","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Protocol violation","text_hash":"367bb2052963f7d75beb672d3ca0430d7d49ac48a2759d578c7df933178fe564","tgt_lang":"ja-JP","translated":"プロトコル違反","updated_at":"2026-05-30T15:38:16.645Z"}
 {"cache_key":"47b55ba247e43bf3c162efd857495c0021a77ad2d5bac9bd7e75b7c3fd024516","model":"gpt-5","provider":"openai","segment_id":"codexSessions.refresh","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Refresh","text_hash":"0e91610117029a62a478b7fa7df0b8598bebe3ab1e192d4b1882e310719c9671","tgt_lang":"ja-JP","translated":"更新","updated_at":"2026-07-09T10:01:43.715Z"}
+{"cache_key":"48c020b55ea4a311056b41a6535bc5bd84adfed938e8c638cd585722547aa37d","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"ja-JP","translated":"リンクをコピー","updated_at":"2026-07-09T11:02:45.719Z"}
 {"cache_key":"4931bdeb7f39a459dd823de674faaceda40791e33990faae16742d666065e7bb","model":"gpt-5","provider":"openai","segment_id":"codexSessions.host.node","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Node","text_hash":"e93372533f323b2f12783aa3a586135cf421486439c2cdcde47411b78f9839ec","tgt_lang":"ja-JP","translated":"ノード","updated_at":"2026-07-09T10:01:43.715Z"}
 {"cache_key":"4a3eed0709b06b5adad40b032d763c5347ad0af5627f1ee8c60b127876305373","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.deleteGroupMenu","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Delete group…","text_hash":"996ee6f0d878196a0b88da2c0c3dc44c65428e3ffb7097d0ecae054154654675","tgt_lang":"ja-JP","translated":"グループを削除…","updated_at":"2026-07-06T23:40:52.793Z"}
 {"cache_key":"4b1454c6f3271b60bdda9bde85991bdf46cd987024c7f45364ec57f9052290e1","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkAdvancedSettingsRequiresAdmin","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Advanced settings require admin","text_hash":"021f44198c7c7935a112e55150d2daaebe388ac9e529460d64c2f8f3ba3b9d82","tgt_lang":"ja-JP","translated":"詳細設定には管理者権限が必要です","updated_at":"2026-07-06T20:20:02.809Z"}
@@ -227,6 +230,7 @@
 {"cache_key":"cce97507d9460ccf77f8f5aec55537a8eb97e8176cab912f98ed694cf142ec9d","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefreshOff","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Off","text_hash":"ca7981b46ecf2c1787b6d76d81d9fd7fa0ca95842e2fcc2a452869891a9334d1","tgt_lang":"ja-JP","translated":"オフ","updated_at":"2026-06-17T14:14:04.173Z"}
 {"cache_key":"ccea54fe13bd4c7bef2c59e4cdf45cc5cabc9f68e0c96309a6068b6c4fcf15ca","model":"gpt-5.5","provider":"openai","segment_id":"subtitles.worktrees","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Isolated agent task checkouts and recovery snapshots.","text_hash":"bc794dc846493e3c5f88964268af19b7dd818eae942c596002ef4067ba5a3d0c","tgt_lang":"ja-JP","translated":"分離されたエージェントタスクのチェックアウトと復旧スナップショット。","updated_at":"2026-07-05T21:00:44.514Z"}
 {"cache_key":"cd0d813d43d7b61d13e0ccf95ad3a2ae3b80f3f80964596324d5e5b86fac360e","model":"gpt-5.5","provider":"openai","segment_id":"workboard.badgeAttachments","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"{count} attachments","text_hash":"7bb1847693bc91e6e4624d996a96840396a71052786ab143ccb47fbdaa77cf41","tgt_lang":"ja-JP","translated":"{count} 件の添付ファイル","updated_at":"2026-05-30T15:38:16.645Z"}
+{"cache_key":"cd6caa1e1b37847f1a6d0faa44f6f60821d2a451b66077f335c4bf6e7601481b","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"ja-JP","translated":"リンクのアクション","updated_at":"2026-07-09T11:02:45.719Z"}
 {"cache_key":"d0b56050176fa6d32b3e216097f41856a87dd23aedce798f0ece4013f3dfb26e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.search","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Search files","text_hash":"179fed85ec50a433bb23932745d18f1ade2f84a6ebe145b0025ed3ce5f89fd5a","tgt_lang":"ja-JP","translated":"ファイルを検索","updated_at":"2026-06-16T14:14:19.257Z"}
 {"cache_key":"d18570791fe4a33cac91265fb875e2e15cb4c0172d17e4ba14bd8208a1df3401","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.goalNote","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Goal note","text_hash":"1afb7855a394ef7078728de1c804d6b995413db4eafe7d74190076cb9ed2c9f5","tgt_lang":"ja-JP","translated":"目標メモ","updated_at":"2026-05-29T21:00:25.945Z"}
 {"cache_key":"d3f51a005ad211f5ed6854805c9f3c353fc594a7627978897fa93914be8319b4","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.realtimeTalkRequiresMicrophone","source_path":"ui/src/i18n/locales/ja-JP.ts","src_lang":"en","text":"Realtime Talk requires browser microphone access.","text_hash":"e082e85327dc5d2905a34ca4ca60e76836f9b4d7e3b1834b821c81a9c456b39d","tgt_lang":"ja-JP","translated":"Realtime Talk にはブラウザのマイクアクセスが必要です。","updated_at":"2026-07-06T17:56:23.525Z"}
diff --git a/ui/src/i18n/.i18n/ko.meta.json b/ui/src/i18n/.i18n/ko.meta.json
index f0cd3bbe7d2..8885cf66147 100644
--- a/ui/src/i18n/.i18n/ko.meta.json
+++ b/ui/src/i18n/.i18n/ko.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:59.306Z",
+  "generatedAt": "2026-07-09T11:53:05.363Z",
   "locale": "ko",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/ko.tm.jsonl b/ui/src/i18n/.i18n/ko.tm.jsonl
index fa5b41c7390..9d031d2d872 100644
--- a/ui/src/i18n/.i18n/ko.tm.jsonl
+++ b/ui/src/i18n/.i18n/ko.tm.jsonl
@@ -120,6 +120,7 @@
 {"cache_key":"664ee92833935c67dae14470a23ae2f97714bab6e7d17f224b1facad3fe10d6b","model":"gpt-5","provider":"openai","segment_id":"codexSessions.empty.archived","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"No archived sessions on this host.","text_hash":"5de6bb0c0036228e8732a675c33ab05843952419ef985706e349bb761da87c40","tgt_lang":"ko","translated":"이 호스트에 보관된 세션이 없습니다.","updated_at":"2026-07-09T10:01:43.732Z"}
 {"cache_key":"6661a8580f033e530995fca7fa9a21141d4c43f499c3bac4b5bcde8e4f085a50","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.goalNote","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Goal note","text_hash":"1afb7855a394ef7078728de1c804d6b995413db4eafe7d74190076cb9ed2c9f5","tgt_lang":"ko","translated":"목표 메모","updated_at":"2026-05-29T21:00:36.520Z"}
 {"cache_key":"6719ecb96c12dc8c13a5d1ca977c7d5cb5d5951617052df9c9d6e5197fc95ad1","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.dropOpenHere","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Open here","text_hash":"b08e2fd2e872adcb575b305187b9db8482369325806953ce80190fc2dc1ab9fb","tgt_lang":"ko","translated":"여기에서 열기","updated_at":"2026-07-06T22:56:22.479Z"}
+{"cache_key":"674d4a8c53b674add3ec037f25599f1f6d9447de20dae0ad5c46309f2bb1d801","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"ko","translated":"사이드바에서 열기","updated_at":"2026-07-09T11:02:47.260Z"}
 {"cache_key":"696d861bfac8358a9de4a213c457761ac32ab99f42e6f44dd1b2f40f6390174a","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewDetails","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"View details","text_hash":"d1bf045bb524dae5b02c471c230958bcd1bf232d7a49367b1cdf977855a06b41","tgt_lang":"ko","translated":"세부 정보 보기","updated_at":"2026-06-16T14:14:21.259Z"}
 {"cache_key":"6a193ce4ec600f885129c71387c5f620191e131ec3538e642cfc954cfe9ba867","model":"gpt-5","provider":"openai","segment_id":"codexSessions.searchPlaceholder","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Search session titles","text_hash":"9a6bdede84234fa08d6294e1636a34d26cbdd8eca425248f8d3c6cf8844a0cf9","tgt_lang":"ko","translated":"세션 제목 검색","updated_at":"2026-07-09T10:01:43.732Z"}
 {"cache_key":"6a3e291885d700c68ed23e57b1d77a80ebe7034566fc083eec30668c58a69f23","model":"gpt-5","provider":"openai","segment_id":"codexSessions.host.offline","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Offline","text_hash":"a1794783aab72d205dc532b1170d1be63ebdce8816b57c21acb451c15dab969a","tgt_lang":"ko","translated":"오프라인","updated_at":"2026-07-09T10:01:43.732Z"}
@@ -161,8 +162,10 @@
 {"cache_key":"9290ac83e3ae6b6883d885401124314445aed79569372502b0709eca77fe154c","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthFailedAttempts","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"failed attempts","text_hash":"fd9023af0795825a458100ddbe894a7a8f603324a2b7ad2305d4c9d2334cbd26","tgt_lang":"ko","translated":"실패한 시도","updated_at":"2026-06-17T14:14:20.553Z"}
 {"cache_key":"92fe7680f04605729befec53bcb0bb922063f313065346abf29080a0f10e11b0","model":"gpt-5","provider":"openai","segment_id":"codexSessions.summary.onlineHosts","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"online","text_hash":"f6fc84c9f21c24907d6bee6eec38cabab5fa9a7be8c4a7827fe9e56f245bd2d5","tgt_lang":"ko","translated":"온라인","updated_at":"2026-07-09T10:01:43.732Z"}
 {"cache_key":"9552a0d9383ae97c90224059d0e2b19e843bdaee8a3b64bd045eff238a5e3593","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateYesterday","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Yesterday","text_hash":"566181254b293aa66653e43313be9e39c12d44f9ac4fcd3236ef1e9c50a2903f","tgt_lang":"ko","translated":"어제","updated_at":"2026-07-05T14:39:46.951Z"}
+{"cache_key":"95cf281d9e2591cc5f9814d30b202b44b81c1b30a554b9d30b70fcb75b39d190","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"ko","translated":"링크 복사","updated_at":"2026-07-09T11:02:47.260Z"}
 {"cache_key":"96548f5481114d8529b125e0ac5f199e247a3666d202ffae60212ee7cd490eb6","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailWorkerLogs","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Worker logs","text_hash":"67766b9f222a7ccdae6beb7d6e7877d1a13abb8a346a8c5c803a4380bdf851b1","tgt_lang":"ko","translated":"워커 로그","updated_at":"2026-06-16T14:14:21.259Z"}
 {"cache_key":"9825bc0134df5ab13edfaf2d38c1f866da7a97400dfcd3ea8c4eeaa8359b018b","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortUpdated","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Last updated","text_hash":"382ac5f308f76c24b2c981e2041943bc2be2229cbd285ad362b9af1cfc386ef8","tgt_lang":"ko","translated":"마지막 업데이트","updated_at":"2026-07-06T15:07:02.499Z"}
+{"cache_key":"983f7834646732092782041cf2cb5dd9f285eb5fd461e60c5979a41592cad637","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"ko","translated":"링크 작업","updated_at":"2026-07-09T11:02:47.260Z"}
 {"cache_key":"98dcc03b3bdc8ec5d1a9e45f9a45183edcd7405cbd9e7de3bd2863168f0113a7","model":"gpt-5","provider":"openai","segment_id":"codexSessions.empty.active","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"No active sessions on this host.","text_hash":"27d1aa12b4e3732d0bceff36b848ab16fb1bad91386e509cd2a7eeecbf1551ca","tgt_lang":"ko","translated":"이 호스트에 활성 세션이 없습니다.","updated_at":"2026-07-09T10:01:43.732Z"}
 {"cache_key":"9987b8273f7aeb4082b39d15139cb16c0719a8908419e9c51a8e50db237cc252","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChatAria","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Use current chat for revision requests","text_hash":"9c551a423ae74aedaaa90e4df9899dbdc02f846d6ee058bf2576a812e2c52119","tgt_lang":"ko","translated":"수정 요청에 현재 채팅 사용","updated_at":"2026-06-16T14:14:21.259Z"}
 {"cache_key":"9a1d9909fe9457fb1acb69d7103e817a94b55a55014364e75225bf4298bae5a9","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.emptyFilteredHint","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Change the view, search, priority, agent, or archive filter.","text_hash":"049dfae940263ace9707334af06b298c1223c38a449b1cec5a712553badebbd0","tgt_lang":"ko","translated":"보기, 검색, 우선순위, 에이전트 또는 보관 필터를 변경하세요.","updated_at":"2026-06-17T14:14:20.553Z"}
@@ -240,6 +243,7 @@
 {"cache_key":"d4cb41d397a2456ff7824d9b06bc6e862461d3e990625f1c2f11b53a9d179004","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.title","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Context usage details","text_hash":"0e04e44654b5a2abf769dcd2f82a32e0501a41689d6635d7f718978c160958f0","tgt_lang":"ko","translated":"컨텍스트 사용량 세부 정보","updated_at":"2026-07-05T10:16:07.195Z"}
 {"cache_key":"d91dc8464fb4262c365012b6f6ec17aed24ad81353ce925f6e4d0df1fb12d7dc","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh15s","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"15s","text_hash":"21b5f52ded33ab19c16a680c4e280b8f9992395b514290163abf272f06394a6f","tgt_lang":"ko","translated":"15초","updated_at":"2026-06-17T14:14:20.553Z"}
 {"cache_key":"dafc28e1442dde0a2caaf9facb5e67afaaa8b15802ff842e08d868f45f0c2aca","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.pairingQrExpired.reason","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Run /pair qr again to generate a fresh setup code.","text_hash":"876a304827f54ae5996c4e804aa72953f43568d31e8a15dd2a5b5a40d91c13d3","tgt_lang":"ko","translated":"새 설정 코드를 생성하려면 /pair qr을 다시 실행하세요.","updated_at":"2026-07-01T10:32:01.566Z"}
+{"cache_key":"ddb4f2d68335d1e594a6d3c4be1420e0a49c3747ecbd416e9dcf1bf0cbcc2534","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"ko","translated":"기본 브라우저에서 열기","updated_at":"2026-07-09T11:02:47.260Z"}
 {"cache_key":"df3adf225f949a3ef292b7cc0b639dafa50fd44fe85658504ccdd8960e42d5e3","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.pairingQrExpired.title","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Pairing QR expired","text_hash":"74e09eafc1d35cad5b62b7a9c321a4d090bb8fefdfa8b33913d6194186eadda6","tgt_lang":"ko","translated":"페어링 QR 만료됨","updated_at":"2026-07-01T10:32:01.566Z"}
 {"cache_key":"e0433ca6df957aa6f87825cc7e48478e9be2f975b00ceed3c735c1afe0b32ad3","model":"gpt-5","provider":"openai","segment_id":"codexSessions.threadId","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Thread","text_hash":"5373c7f8a5a69019e959540ef127be3302afdd5e2313244e6d08cbd5e975d06d","tgt_lang":"ko","translated":"스레드","updated_at":"2026-07-09T10:01:43.732Z"}
 {"cache_key":"e0a110e41d940986d18fc8bd881d6054a6173671341503a673781cf944b10513","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByKind","source_path":"ui/src/i18n/locales/ko.ts","src_lang":"en","text":"Kind","text_hash":"f5387f9bb6ed70315a77fdcb9335facc27a9bf241f35955bd2755c55e0c016c7","tgt_lang":"ko","translated":"종류","updated_at":"2026-07-05T14:39:46.951Z"}
diff --git a/ui/src/i18n/.i18n/nl.meta.json b/ui/src/i18n/.i18n/nl.meta.json
index 389c6072e58..0fb627089ac 100644
--- a/ui/src/i18n/.i18n/nl.meta.json
+++ b/ui/src/i18n/.i18n/nl.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:02.367Z",
+  "generatedAt": "2026-07-09T11:53:07.951Z",
   "locale": "nl",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/nl.tm.jsonl b/ui/src/i18n/.i18n/nl.tm.jsonl
index ffd07e26688..b463a380a46 100644
--- a/ui/src/i18n/.i18n/nl.tm.jsonl
+++ b/ui/src/i18n/.i18n/nl.tm.jsonl
@@ -24,6 +24,8 @@
 {"cache_key":"19e2791d9f9649d4ca944f2858a4bd3efdc8c0ca6ed4481aed37bea60e8e24df","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependenciesBlocked","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"{count} blocked","text_hash":"fb39869b0fb3b8933126014e5c3739d7d67a620b8369781ca27e7395c595bde8","tgt_lang":"nl","translated":"{count} geblokkeerd","updated_at":"2026-06-16T14:18:17.492Z"}
 {"cache_key":"1a2639adabeacd4106d6af3e7c3a01e48572ee0a4c35f53fa23c841bbf155d9c","model":"gpt-5","provider":"openai","segment_id":"codexSessions.subtitle","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"A read-only view of Codex sessions on this gateway and every connected computer that shares them.","text_hash":"ea7ea85488243bacdbe28edb2fba0617ec90ebcf587f8ecce6f62858ca85aed4","tgt_lang":"nl","translated":"Een alleen-lezen weergave van Codex-sessies op deze Gateway en elke verbonden computer die ze deelt.","updated_at":"2026-07-09T10:01:43.729Z"}
 {"cache_key":"1aa8274ab05f073b830fa57e0addbbb5d72c424fd554bea0d49b12fcc0ec61aa","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.missing","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Missing","text_hash":"6be36ca49ee85210c5d1ad9c377d90a9859c66d889110a2a5b0dccd390d12e20","tgt_lang":"nl","translated":"Ontbreekt","updated_at":"2026-06-16T14:18:24.009Z"}
+{"cache_key":"1df2965b5fab67b92f806575df6ec386a29e623b010fe8d10acf9a1635ca6e4d","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"nl","translated":"Openen in standaardbrowser","updated_at":"2026-07-09T11:03:13.658Z"}
+{"cache_key":"1f0dc822e93f4f44f65ff416c1a438e55f413bf60569fc681e8e324832acceee","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"nl","translated":"Openen in zijbalk","updated_at":"2026-07-09T11:03:13.658Z"}
 {"cache_key":"20b4d9eb5bb6215ac4007cf7636b59e328fa5916c443b175e6c8221d2122d611","model":"gpt-5","provider":"openai","segment_id":"codexSessions.title","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Sessions across your computers","text_hash":"23b30c777a12daeb3e5471cd51530189b621db9fdec4e6ea976e5a97516fac22","tgt_lang":"nl","translated":"Sessies op al je computers","updated_at":"2026-07-09T10:01:43.729Z"}
 {"cache_key":"210ce9b5dcd0bdc6dbbc58dfbe062314af1bc024e87395688473674b46b68922","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.inputTokens","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"{count} input","text_hash":"f24231cff78fed82d155712973ede6f9369e96b015acc30d5de2b740677edce9","tgt_lang":"nl","translated":"{count} invoertokens","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"231ccce169faa26a414b57965244968fa63b768da99151dc8fe4c8d7f0583110","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefreshOff","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Off","text_hash":"ca7981b46ecf2c1787b6d76d81d9fd7fa0ca95842e2fcc2a452869891a9334d1","tgt_lang":"nl","translated":"Uit","updated_at":"2026-06-17T14:17:30.702Z"}
@@ -50,6 +52,7 @@
 {"cache_key":"364641279de5e2180df2e1e5d38dd3d90b8594ac9a5cfaf23f09d51912688a74","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.copyPath","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Copy path","text_hash":"720ff4160412b943370afdb8fc1c082ff057d54713d5fb4b4b7a9634bfabf5fe","tgt_lang":"nl","translated":"Pad kopiëren","updated_at":"2026-06-16T14:18:26.226Z"}
 {"cache_key":"37ada188e1ceedee4ae4ede7bf108e3b26178f47608f528ef4c5ad1f80c8b582","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.cleanNow","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Clean up now","text_hash":"da367b57478fe6da969f5ff3a78717074d7fca77a312ac2c8f77dc2f56032578","tgt_lang":"nl","translated":"Nu opschonen","updated_at":"2026-07-05T21:01:37.071Z"}
 {"cache_key":"37aff0195fa8c655447f3d1df9383740ee8f6d603cfd8ea251495e9e3b3c806f","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneNoneFound","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"No microphone inputs were found.","text_hash":"3aa0952aa2a5987227a12656a28131c7e153b5efe3fca4043c742fb289eeb37c","tgt_lang":"nl","translated":"Er zijn geen microfooningangen gevonden.","updated_at":"2026-07-06T17:57:20.999Z"}
+{"cache_key":"37c974c866d54eeeebd4b8fb3a29d5ceef7556f55f26919ef3eb2546942f2d59","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"nl","translated":"Link kopiëren","updated_at":"2026-07-09T11:03:13.658Z"}
 {"cache_key":"38a68daa8bf8d789ae46ce8ada766e4c043992bf73434b0306b958a749247a92","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.lastDays","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"{count} days","text_hash":"e9f0a85930cc6fa61b7ac01763893020adc4c712d1b8e8897bdd13971637d529","tgt_lang":"nl","translated":"{count} dagen","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"3973453f74ecdf399ca3550b05c66d8601ce1d9c1d8b1e058f3dfdbb3f78aa73","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.outputTokens","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"{count} output","text_hash":"e433f6601aaa1a1cce63c5ca6b15fddd247bf53697d09171d25592f70f2e949a","tgt_lang":"nl","translated":"{count} uitvoertokens","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"3a8f90934c613ad55413822bdb50730ee26508bd08db306bced987dbf47191d0","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventProtocolViolation","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Protocol violation","text_hash":"367bb2052963f7d75beb672d3ca0430d7d49ac48a2759d578c7df933178fe564","tgt_lang":"nl","translated":"Protocolschending","updated_at":"2026-05-30T15:38:50.257Z"}
@@ -166,6 +169,7 @@
 {"cache_key":"a217f770a3c18a40cdbc28d79bbf71b88f226ac2fe2918f08bb23b87cb4c3c7f","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneFallback","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Microphone {number}","text_hash":"357eae20db9739dfdbb59ec21db70200f6ca9ee257c28ed637712f147af419ec","tgt_lang":"nl","translated":"Microfoon {number}","updated_at":"2026-07-06T17:57:20.999Z"}
 {"cache_key":"a2f00687aea314d88d3f36ea3a01559d55da3328a8881c407914020fad526436","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.changed","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Changed","text_hash":"2a6141e43be0c2125e3b5d9f74b4ff1261a0b320ff927c83d4d9b1b65585bad7","tgt_lang":"nl","translated":"Gewijzigd","updated_at":"2026-06-16T14:18:24.009Z"}
 {"cache_key":"a350026fb850801e9c56985be37811d9e1ef6643fb99a309fd4db919706ada7f","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.confirmForceDelete","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Snapshot failed: {error}\n\nDelete without a snapshot?","text_hash":"200ce9b8fb04659df79e1d26e69ec1014631ad5a85a92130dbdb9fcb550ba34f","tgt_lang":"nl","translated":"Snapshot mislukt: {error}\n\nVerwijderen zonder snapshot?","updated_at":"2026-07-05T21:01:37.071Z"}
+{"cache_key":"a4b4c8d738f0b5b466950074f9df4a63ce23cdcc1d034a71acbd6471ebeda298","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"nl","translated":"Linkacties","updated_at":"2026-07-09T11:03:13.658Z"}
 {"cache_key":"a4e238ea645ef82dc00ffa7fdf82e7435eca5fe9a7abef763c0a26aaa1529c4a","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.requests","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"{count} requests","text_hash":"1e23ff6956124091cd470f5091cee8108c3766314b69871b3ff792eaf506455f","tgt_lang":"nl","translated":"{count} aanvragen","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"a4e2c20feefcfecabbac97c766a0d8e469841737d603757efc5176841eb77a50","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browserCount","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"{count} shown","text_hash":"e57b4adfe868fd74a183650103d820176d4960bd0bdb677d9985db09f9752867","tgt_lang":"nl","translated":"{count} getoond","updated_at":"2026-06-16T14:18:24.009Z"}
 {"cache_key":"a508d76a7831be5b78c7c9386ac541cde3bb6b5c82432e975c285c430b58fcc4","model":"gpt-5","provider":"openai","segment_id":"codexSessions.empty.subtitle","source_path":"ui/src/i18n/locales/nl.ts","src_lang":"en","text":"Enable Codex session sharing on the gateway or a paired computer, then refresh this view.","text_hash":"608ae8a39625a0da1b6804480e57835af5a1e566af2095d11cca8bf0a6e421a9","tgt_lang":"nl","translated":"Schakel het delen van Codex-sessies in op de Gateway of een gekoppelde computer en vernieuw daarna deze weergave.","updated_at":"2026-07-09T10:01:43.729Z"}
diff --git a/ui/src/i18n/.i18n/pl.meta.json b/ui/src/i18n/.i18n/pl.meta.json
index 88794495683..82779091bf7 100644
--- a/ui/src/i18n/.i18n/pl.meta.json
+++ b/ui/src/i18n/.i18n/pl.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:01.507Z",
+  "generatedAt": "2026-07-09T11:53:07.264Z",
   "locale": "pl",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/pl.tm.jsonl b/ui/src/i18n/.i18n/pl.tm.jsonl
index 3ac4a291fb9..babb575fbbb 100644
--- a/ui/src/i18n/.i18n/pl.tm.jsonl
+++ b/ui/src/i18n/.i18n/pl.tm.jsonl
@@ -9,6 +9,7 @@
 {"cache_key":"086c863c12458f16120fd4a26afc24dc2f2bdef8e0eb79d93023e5825f63b3de","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventOrchestration","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Orchestration","text_hash":"ed4fdd1721677737cffb2862fe34d5b63901c7cc76b8c67c51e92a467b31a5e7","tgt_lang":"pl","translated":"Orkiestracja","updated_at":"2026-05-30T15:38:42.049Z"}
 {"cache_key":"0a851cea32d108958a79ffaa0a9aa19eacdae272c8cd042d5278a3b6995d8ea2","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthLabel","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Workboard health","text_hash":"85416c4a6d64e35611bdd9747b82815936c38b41d820796ba1fbfbb7539d906b","tgt_lang":"pl","translated":"Kondycja tablicy","updated_at":"2026-06-17T14:16:37.628Z"}
 {"cache_key":"0b2a029b4ad96465db0709b10570effc3cb6ba3d5c311413838fb199d6f61072","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.open","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Open context usage details","text_hash":"8765adde14aebe600e7c9c69196c5b4a9ccc654802a94626d0391d9eaed725b1","tgt_lang":"pl","translated":"Otwórz szczegóły użycia kontekstu","updated_at":"2026-07-05T10:16:26.554Z"}
+{"cache_key":"0c46c00a92e5aea7da40906d6f3ee6f7785917de8ba4cc46b9a84d054ee731db","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"pl","translated":"Otwórz na pasku bocznym","updated_at":"2026-07-09T11:03:05.340Z"}
 {"cache_key":"0c942ede663f623b0ad156011592e4ca0928be9ee09722434f8f1836d853874b","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.title","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Context usage details","text_hash":"0e04e44654b5a2abf769dcd2f82a32e0501a41689d6635d7f718978c160958f0","tgt_lang":"pl","translated":"Szczegóły użycia kontekstu","updated_at":"2026-07-05T10:16:26.554Z"}
 {"cache_key":"0c9c9299905f7e7c7df89c1fcedba15ad5dbb2f93ea4f85aefc0f10825447e45","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailUpdatedValue","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Updated: {time}","text_hash":"5e72d5445f018c9d08aa34ae0178fb9aa49eea6a0afd0c8d379f20b7af3e8aa0","tgt_lang":"pl","translated":"Zaktualizowano: {time}","updated_at":"2026-06-16T14:17:07.423Z"}
 {"cache_key":"0d5bb8bdcc33a37bb6f39f067ca91a222a21fc50ec3dae4ef18467521b4dbef7","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneInput","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Microphone input","text_hash":"5c8a6025b9d96fb0c090d33c9def15ee64aa520a83cf5d64c784b4f0699bb15e","tgt_lang":"pl","translated":"Wejście mikrofonu","updated_at":"2026-07-06T17:34:00.024Z"}
@@ -48,6 +49,7 @@
 {"cache_key":"310ca125971db4ad98ec05d3ce9f17e0ce1a753b444158c0b54053c033b8b94d","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.title","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Managed Worktrees","text_hash":"dde32010185098a47e873fb25dd99446b0cb1a75614068587f7cd0bffb5aed18","tgt_lang":"pl","translated":"Zarządzane worktree","updated_at":"2026-07-05T21:01:26.445Z"}
 {"cache_key":"312a0a855e3bbe8e216cf56d3594e3c7a240a9ab38a538a31a1892251f9ea01d","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChatTooltip","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Send revision requests to the current chat session instead of the proposal's workshop session.","text_hash":"9db782d40e88750d4faed33c8a73c24552070f101483881c60af8cf446c674a6","tgt_lang":"pl","translated":"Wysyłaj prośby o poprawki do bieżącej sesji czatu zamiast do sesji warsztatu propozycji.","updated_at":"2026-06-16T14:17:07.423Z"}
 {"cache_key":"31846f6d8556f16595b033832ec457215066e9446e660ba9d40341eea4a2e1c0","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.latestRunTokens","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Latest run tokens","text_hash":"969b6403862b70df744bc747c801663034a7837cd04b55973b7ee6c051e2e5ca","tgt_lang":"pl","translated":"Tokeny ostatniego uruchomienia","updated_at":"2026-07-05T10:16:26.554Z"}
+{"cache_key":"3213615ad3fe7f82ede506c073954c3d08aedae6a5d34d2fed8e183917bc2877","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"pl","translated":"Kopiuj link","updated_at":"2026-07-09T11:03:05.340Z"}
 {"cache_key":"32fbfa17034cfbd525bebd16a18cb23cd76ce38eba518db4f3d86215761fbf51","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkSensitivityMedium","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Medium","text_hash":"8e588cd187741f1cd76f5fab77b7208782a8c21d764ce7d7a4cf3ac4e0968873","tgt_lang":"pl","translated":"Średnia","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"3399c955450c7bae2a2aaf193b9236f45ca2c93b1a18caf59c5cff74319836db","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.layoutCompact","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Compact card density","text_hash":"2f532993d5a6ccda4d758c7ecdda8bebaa857218045a3d4a011fec73d9728785","tgt_lang":"pl","translated":"Kompaktowa gęstość kart","updated_at":"2026-06-17T14:16:32.528Z"}
 {"cache_key":"340c598b19bf09015b6c6bb15614b2b08f38f7abedd0a6994953aeff8316dca3","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthStale","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"stale","text_hash":"a03f2386ae06b21109577020844df367857b72c2fcce384c1896fed98a89c82b","tgt_lang":"pl","translated":"nieaktualne","updated_at":"2026-06-17T14:16:37.628Z"}
@@ -211,6 +213,7 @@
 {"cache_key":"b7849d3b3c0060127e12587889942bf2e94f292b11427ecd5339f01815901ce8","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailWorkerLogs","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Worker logs","text_hash":"67766b9f222a7ccdae6beb7d6e7877d1a13abb8a346a8c5c803a4380bdf851b1","tgt_lang":"pl","translated":"Logi workera","updated_at":"2026-06-16T14:17:07.423Z"}
 {"cache_key":"b79e3b0dbc6fea862d54c69a0bc21bd0fc19da1e926840a1c2776b4a3ca3d3a3","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.deleteGroupMenu","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Delete group…","text_hash":"996ee6f0d878196a0b88da2c0c3dc44c65428e3ffb7097d0ecae054154654675","tgt_lang":"pl","translated":"Usuń grupę…","updated_at":"2026-07-06T23:41:14.105Z"}
 {"cache_key":"ba853a8ee00a503478191bcf613947a52bf3dac3d53ae805c181dfefd0b67a41","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthBlocked","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"blocked","text_hash":"6973dddd3ef9cb6a2932702f31777faad9c9bf3124d147a84f31aadb6d139546","tgt_lang":"pl","translated":"zablokowane","updated_at":"2026-06-17T14:16:37.628Z"}
+{"cache_key":"bc7b9aced9436ea5ca3f3d2531c2d49da0412d52babca4a40ce8686f39449732","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"pl","translated":"Otwórz w domyślnej przeglądarce","updated_at":"2026-07-09T11:03:05.340Z"}
 {"cache_key":"bd0b90ae68a715f6eebd19a54c68ce39d7aa44e0c2bf6f52b12469c5d60d4927","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortBy","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Sort by","text_hash":"c9129025bd3ff6522a7eeebc1abf1481f36e4ac9d74524a473ac1c3be1c6fc2f","tgt_lang":"pl","translated":"Sortuj według","updated_at":"2026-07-06T23:41:14.105Z"}
 {"cache_key":"bf1fe541e18dbb5476e102031349c8f93606cdd991c3cd249ffaa0ca6b35a649","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.summary","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Session context usage: {used} of {limit} ({pct}%)","text_hash":"a62b97af0e5d02b8722725e2be0a936dd3d317a1f506ea15c766e87413b66a0d","tgt_lang":"pl","translated":"Użycie kontekstu sesji: {used} z {limit} ({pct}%)","updated_at":"2026-07-05T10:16:26.554Z"}
 {"cache_key":"c214af0c0f6ccb20c9e5c6cf812d6902514e0955727f76a4ce88d60b18d2710a","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.confirmForceDelete","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Snapshot failed: {error}\n\nDelete without a snapshot?","text_hash":"200ce9b8fb04659df79e1d26e69ec1014631ad5a85a92130dbdb9fcb550ba34f","tgt_lang":"pl","translated":"Tworzenie migawki nie powiodło się: {error}\n\nUsunąć bez migawki?","updated_at":"2026-07-05T21:01:26.445Z"}
@@ -234,6 +237,7 @@
 {"cache_key":"d05741fa45849f85fdd8e8002569393ae8df7762d0f409d3ed17c5646e7f8001","model":"gpt-5.5","provider":"openai","segment_id":"tabs.mcp","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"MCP","text_hash":"53f13ae99ed53bd346eb8e1c8cefb7ef8260683b50401caf101360967ea052aa","tgt_lang":"pl","translated":"MCP","updated_at":"2026-05-31T05:36:51.459Z"}
 {"cache_key":"d0c9de8dc0c6459107953c844d76684182f562771ce5c7fea5a603ba7e226eab","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewReview","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Review","text_hash":"aff0766a5290e117b8433c351bae7b7b23bed682b2369bd822d88a647cc58512","tgt_lang":"pl","translated":"Do przeglądu","updated_at":"2026-06-17T14:16:32.528Z"}
 {"cache_key":"d0d7b8e08873037b55cb835745cf3330464e575a66a892aead4fc4000461c017","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.noBrowserFiles","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"No files in this folder.","text_hash":"3847020c79b1c74e28aa550f0ae53838b764e87f1daf1480dd6aae45ae0529d6","tgt_lang":"pl","translated":"Brak plików w tym folderze.","updated_at":"2026-06-16T14:17:21.494Z"}
+{"cache_key":"d20bc6fa0a77de3ef31365185ed2ff8daa1b66dc076ccbf588a3ecdfbfe14c4c","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"pl","translated":"Działania linku","updated_at":"2026-07-09T11:03:05.340Z"}
 {"cache_key":"d2e57280ffff210cca5ff1c1f454e99f8c1cd2ea9f0bf3a14ec9bcfc03aa72a9","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkAdvancedSettingsRequiresAdminTitle","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Advanced Talk settings require operator.admin access.","text_hash":"fa933a90d7dde5f8f1a324bd13a5daceb0ad9e04bd77f3aae07c8348edfe4dd7","tgt_lang":"pl","translated":"Zaawansowane ustawienia Talk wymagają dostępu operator.admin.","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"d38336ad413141b2e4dfd09c86b1e1a48aa6cad1356cc58ab93595996e607bbf","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.missing","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"Missing","text_hash":"6be36ca49ee85210c5d1ad9c377d90a9859c66d889110a2a5b0dccd390d12e20","tgt_lang":"pl","translated":"Brakujące","updated_at":"2026-06-16T14:17:21.494Z"}
 {"cache_key":"d4a886a6cccae4278ec57dcbee7c175d3e511359e2147393c7b7bb440a390b57","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.systemError","source_path":"ui/src/i18n/locales/pl.ts","src_lang":"en","text":"System error","text_hash":"b9564eaf21a9356d06f7f3c67a5b9cb7e6538687c33bebbf1e1b64715018f310","tgt_lang":"pl","translated":"Błąd systemu","updated_at":"2026-07-09T10:01:43.766Z"}
diff --git a/ui/src/i18n/.i18n/pt-BR.meta.json b/ui/src/i18n/.i18n/pt-BR.meta.json
index f15876b70af..7ba60d9ed8d 100644
--- a/ui/src/i18n/.i18n/pt-BR.meta.json
+++ b/ui/src/i18n/.i18n/pt-BR.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:58.356Z",
+  "generatedAt": "2026-07-09T11:53:04.231Z",
   "locale": "pt-BR",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/pt-BR.tm.jsonl b/ui/src/i18n/.i18n/pt-BR.tm.jsonl
index c5be66ec2cc..e763704bc03 100644
--- a/ui/src/i18n/.i18n/pt-BR.tm.jsonl
+++ b/ui/src/i18n/.i18n/pt-BR.tm.jsonl
@@ -141,8 +141,10 @@
 {"cache_key":"7247c1882cad266a33da0f6d10e2b04a959861305ab416298d243e51c6f3f4e8","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.archived","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Archived","text_hash":"bdb86505f8062d15f152cef71dd4ca89609d5bf8e98771dcd2c9f70d247403da","tgt_lang":"pt-BR","translated":"Arquivada","updated_at":"2026-07-09T10:01:43.718Z"}
 {"cache_key":"74fcd9889d4c41ccf8ef32728b424f1c0b71c6848579bb9e6cdab0bfb8a1c358","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.summary","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Session workspace summary","text_hash":"1ed422c34dc1802d4c7366164ae810c496e206fe82e8e6565cefc38230b56bb4","tgt_lang":"pt-BR","translated":"Resumo do workspace da sessão","updated_at":"2026-06-16T14:13:25.058Z"}
 {"cache_key":"750a9377c380348c88a5facec2d5229e09860286605a8f67be549f6c5f9143d4","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkModel","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Model","text_hash":"5e2c614c23f02239bc03c6c04fcb681950f9e72bf8fdff6be79c79841cbb10c0","tgt_lang":"pt-BR","translated":"Modelo","updated_at":"2026-07-06T20:20:02.809Z"}
+{"cache_key":"752de2364dd74aa322d65999e1c50f09f62a8225b63a9696969c8362e629bfb6","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"pt-BR","translated":"Abrir na barra lateral","updated_at":"2026-07-09T11:02:40.000Z"}
 {"cache_key":"77c5918867d611b7c15e4cee328340eb9be4902695bddcaf58f63ae632883aad","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.actions","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Workspace file actions","text_hash":"461817d921bc7672e95fe4a3b23f4ac2a4a20e35b3d6eef3f02e8f5ba4201050","tgt_lang":"pt-BR","translated":"Ações de arquivos do workspace","updated_at":"2026-06-16T14:13:25.058Z"}
 {"cache_key":"791282826039ef4afd4ea2b7282eb45b466139b0387e16bc08f4fae0b4dc4ca0","model":"gpt-5.5","provider":"openai","segment_id":"languages.hi","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"हिन्दी (Hindi)","text_hash":"fab2abfce45382f3031c59477017700a8cb5dfaf8d15379dc24304809b97c7d5","tgt_lang":"pt-BR","translated":"हिन्दी (híndi)","updated_at":"2026-06-26T21:43:22.390Z"}
+{"cache_key":"799a398aba7661758e2f79394e89c5e68b9a277e680ad0c76d14ce486c5c1f38","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"pt-BR","translated":"Ações de link","updated_at":"2026-07-09T11:02:40.000Z"}
 {"cache_key":"7a36b55390955775cbe56f1e822100787337feba448d4eb94c87fb403a9fa655","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChatAria","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Use current chat for revision requests","text_hash":"9c551a423ae74aedaaa90e4df9899dbdc02f846d6ee058bf2576a812e2c52119","tgt_lang":"pt-BR","translated":"Usar conversa atual para solicitações de revisão","updated_at":"2026-06-16T14:13:11.260Z"}
 {"cache_key":"7ae00e46fd77f41d7bfdfd1025f499aa9b26e7dcb946846f1052602284786190","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.runDuration","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Run duration","text_hash":"b5e9698b25697ec71f0947df28e6b08438033fe73b1b87ac7362766d77b45b97","tgt_lang":"pt-BR","translated":"Duração da execução","updated_at":"2026-07-09T10:13:14.097Z"}
 {"cache_key":"7d064865e923b7dbc2f3e296e6ab3c5bfe569890aa63dce5dadb8232c49e2ee5","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewBlocked","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Blocked","text_hash":"18f2a0947f9d6523991b29b450307f22773f57d65f7efb98d48a167df04d6b1d","tgt_lang":"pt-BR","translated":"Bloqueado","updated_at":"2026-06-17T14:13:15.046Z"}
@@ -208,6 +210,7 @@
 {"cache_key":"bdd521107afdb42db676e8e0da464a5ae9712339b762fc357cefb8f1c2e53028","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.renameSession","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Rename session","text_hash":"2cad0766accc2d3f70f007068524cea983e0d53f54543e9e82a4e73b2a07987f","tgt_lang":"pt-BR","translated":"Renomear sessão","updated_at":"2026-07-02T14:30:01.256Z"}
 {"cache_key":"be9470e1af78556298cff727b8c6d819efa5ae7addfce81bc309e5b9eed5b955","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.topModels","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Top models","text_hash":"79489561d9efe32b89add781323318355ae49e3d71f9c5a45a34c21825778663","tgt_lang":"pt-BR","translated":"Principais modelos","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"bf5d0d78c050f9e4e5347bf603a69da4e5799d7204beb7a36c67fb884b7aa61c","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.pairingQrExpired.title","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Pairing QR expired","text_hash":"74e09eafc1d35cad5b62b7a9c321a4d090bb8fefdfa8b33913d6194186eadda6","tgt_lang":"pt-BR","translated":"QR de pareamento expirado","updated_at":"2026-07-01T10:31:00.782Z"}
+{"cache_key":"c185def9ac253d6c864073cd7d693adadd004b902bbad271d7c20b9c4a23882d","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"pt-BR","translated":"Abrir no navegador padrão","updated_at":"2026-07-09T11:02:40.000Z"}
 {"cache_key":"c434861697e533c8617971120993836b4c551e540f42b36a6a8d0d5658a77009","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewDefaultAgent","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Default agent","text_hash":"94da52ecd6c5c3b77b89b8427f4bcaf11a40ddf68f5b00171977349fb2e6abc9","tgt_lang":"pt-BR","translated":"Agente padrão","updated_at":"2026-06-17T14:13:15.046Z"}
 {"cache_key":"c47a8164a46a7bcf752fb340b07a59ed6f0b18f404897a04a74ee0bb69714236","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.layoutComfortable","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Comfortable card density","text_hash":"bfaaf4553fd254bf24431ebabf62faebfd862685e9e7a52f5e799b11488dc7fe","tgt_lang":"pt-BR","translated":"Densidade de card confortável","updated_at":"2026-06-17T14:13:15.046Z"}
 {"cache_key":"c57769d62c377e80d924d00cd4c5cc639615dc3b2ecb28082be44fc48d3e8e44","model":"gpt-5.5","provider":"openai","segment_id":"chat.toolCards.toolError","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Tool error","text_hash":"a6c64c286a8795034ac5030b74633d3b476b5375e094485698b982879b0bb617","tgt_lang":"pt-BR","translated":"Erro da ferramenta","updated_at":"2026-05-31T06:43:47.543Z"}
@@ -225,6 +228,7 @@
 {"cache_key":"d7a74137ca8557480101f8f3916e6d3f5f24e7d3ef8e6ada5bf46f7568a70cf4","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventAttachmentAdded","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Attachment added","text_hash":"f39a309fb0054d8e6c512733d6f3a4791c6b63157a388d72f635574d98b49b3e","tgt_lang":"pt-BR","translated":"Anexo adicionado","updated_at":"2026-05-30T15:38:08.357Z"}
 {"cache_key":"d8d4b4e03ca6780c2ce6d5c3970a5a7a142706dbbfcf5de42a4f472ed8024ae6","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.last7Days","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"7 days","text_hash":"7f920bb639c9307589b65e5f639391d65dcb86b0611ac47f58f7c769215326ee","tgt_lang":"pt-BR","translated":"7 dias","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"d93f9231ce6cb8c62276a8c9a91dd6961908cf4e2bd9bc60e575cb200ba85432","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.changedCount","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"{count} changed","text_hash":"db3cb1c116f0a410592fe8556a43513156ce84faa3b69de7e68635474b2f6a10","tgt_lang":"pt-BR","translated":"{count} alterado(s)","updated_at":"2026-06-16T14:13:25.058Z"}
+{"cache_key":"db48f07538d69fd9d7010c1b412bbe64f2fce27f90ef2a5675789b4b14087b9c","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"pt-BR","translated":"Copiar link","updated_at":"2026-07-09T11:02:40.000Z"}
 {"cache_key":"db992d749b49e0f493f8d00d795f9f58a3a2400ccb8730f62fa323a820883870","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.today","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Today","text_hash":"2b065c7c9ce466e5ebcad757987d5d660ee4c9ea708bc62c43444b53334738ba","tgt_lang":"pt-BR","translated":"Hoje","updated_at":"2026-07-05T14:39:34.196Z"}
 {"cache_key":"dbf9d1bd653cf75877ad3e71c8987b6622c15dac41b6a1ad029b9aa59c78e7ed","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefreshOff","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Off","text_hash":"ca7981b46ecf2c1787b6d76d81d9fd7fa0ca95842e2fcc2a452869891a9334d1","tgt_lang":"pt-BR","translated":"Desativada","updated_at":"2026-06-17T14:13:15.046Z"}
 {"cache_key":"dbfea518b48e98b1d9e8cbe8e504db8864bcbaf8e17f4d5a2ad85ef74f7a46a7","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.title","source_path":"ui/src/i18n/locales/pt-BR.ts","src_lang":"en","text":"Managed Worktrees","text_hash":"dde32010185098a47e873fb25dd99446b0cb1a75614068587f7cd0bffb5aed18","tgt_lang":"pt-BR","translated":"Worktrees gerenciadas","updated_at":"2026-07-05T21:00:34.411Z"}
diff --git a/ui/src/i18n/.i18n/raw-copy-baseline.json b/ui/src/i18n/.i18n/raw-copy-baseline.json
index 3eae98a935a..e7e3860afe4 100644
--- a/ui/src/i18n/.i18n/raw-copy-baseline.json
+++ b/ui/src/i18n/.i18n/raw-copy-baseline.json
@@ -2472,62 +2472,6 @@
       "path": "ui/src/pages/config/mcp.ts",
       "text": "tool filter"
     },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "description",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Balanced default for daily use."
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "description",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Highest context budget for repo work."
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "description",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Lean follow-ups for shared bots."
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "description",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Smallest context budget and lowest cost."
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "label",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Code Agent"
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "label",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Minimal"
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "label",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Personal Assistant"
-    },
-    {
-      "count": 1,
-      "kind": "object-property",
-      "name": "label",
-      "path": "ui/src/pages/config/presets.ts",
-      "text": "Team Bot"
-    },
     {
       "count": 1,
       "kind": "html-attribute",
@@ -2570,13 +2514,6 @@
       "path": "ui/src/pages/config/quick.ts",
       "text": "Browse →"
     },
-    {
-      "count": 1,
-      "kind": "html-text",
-      "name": "text",
-      "path": "ui/src/pages/config/quick.ts",
-      "text": "Choose how much workspace context OpenClaw injects into each run. Profiles only change bootstrap size and follow-up reinjection — never your model, tools, channels, or theme."
-    },
     {
       "count": 1,
       "kind": "html-text",
@@ -2612,20 +2549,6 @@
       "path": "ui/src/pages/config/quick.ts",
       "text": "Connect →"
     },
-    {
-      "count": 1,
-      "kind": "html-text",
-      "name": "text",
-      "path": "ui/src/pages/config/quick.ts",
-      "text": "Current"
-    },
-    {
-      "count": 1,
-      "kind": "html-text",
-      "name": "text",
-      "path": "ui/src/pages/config/quick.ts",
-      "text": "Custom"
-    },
     {
       "count": 1,
       "kind": "html-text",
@@ -2694,21 +2617,7 @@
       "kind": "html-text",
       "name": "text",
       "path": "ui/src/pages/config/quick.ts",
-      "text": "Pending"
-    },
-    {
-      "count": 1,
-      "kind": "html-text",
-      "name": "text",
-      "path": "ui/src/pages/config/quick.ts",
-      "text": "Saved"
-    },
-    {
-      "count": 1,
-      "kind": "html-text",
-      "name": "text",
-      "path": "ui/src/pages/config/quick.ts",
-      "text": "Selected"
+      "text": "Save stores your changes. Apply Now also reloads the current session."
     },
     {
       "count": 1,
@@ -2745,6 +2654,13 @@
       "path": "ui/src/pages/config/quick.ts",
       "text": "Thinking"
     },
+    {
+      "count": 1,
+      "kind": "html-text",
+      "name": "text",
+      "path": "ui/src/pages/config/quick.ts",
+      "text": "Unsaved changes"
+    },
     {
       "count": 1,
       "kind": "html-text",
@@ -2759,6 +2675,13 @@
       "path": "ui/src/pages/config/quick.ts",
       "text": "Claw"
     },
+    {
+      "count": 3,
+      "kind": "object-property",
+      "name": "label",
+      "path": "ui/src/pages/config/quick.ts",
+      "text": "CPU"
+    },
     {
       "count": 1,
       "kind": "object-property",
@@ -2766,6 +2689,13 @@
       "path": "ui/src/pages/config/quick.ts",
       "text": "Dash"
     },
+    {
+      "count": 2,
+      "kind": "object-property",
+      "name": "label",
+      "path": "ui/src/pages/config/quick.ts",
+      "text": "Disk"
+    },
     {
       "count": 1,
       "kind": "object-property",
@@ -2787,6 +2717,13 @@
       "path": "ui/src/pages/config/quick.ts",
       "text": "M"
     },
+    {
+      "count": 2,
+      "kind": "object-property",
+      "name": "label",
+      "path": "ui/src/pages/config/quick.ts",
+      "text": "Memory"
+    },
     {
       "count": 1,
       "kind": "object-property",
diff --git a/ui/src/i18n/.i18n/ru.meta.json b/ui/src/i18n/.i18n/ru.meta.json
index 90e631fdc0b..ddf28d64cde 100644
--- a/ui/src/i18n/.i18n/ru.meta.json
+++ b/ui/src/i18n/.i18n/ru.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:02.874Z",
+  "generatedAt": "2026-07-09T11:53:08.525Z",
   "locale": "ru",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/ru.tm.jsonl b/ui/src/i18n/.i18n/ru.tm.jsonl
index 12a0bef5379..a28441507f7 100644
--- a/ui/src/i18n/.i18n/ru.tm.jsonl
+++ b/ui/src/i18n/.i18n/ru.tm.jsonl
@@ -860,12 +860,14 @@
 {"cache_key":"84e3b9cdf6d1adc07ca18bd471185c0e78518dfac889661e5734ba9f958ba3b2","model":"gpt-5.5","provider":"openai","segment_id":"workboard.detailTitle","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Card details","text_hash":"93985f84673405070ffdf7e6f64175caff0f2c489c10e40627718525e79af631","tgt_lang":"ru","translated":"Сведения о карточке","updated_at":"2026-06-26T21:39:43.912Z"}
 {"cache_key":"84e7113df9ac50d70a37406941c946d32153032c54900470348b3e43d64d7e65","model":"gpt-5.5","provider":"openai","segment_id":"common.lastMessage","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Last message","text_hash":"ee5c88bf416d1e2fba390dbfa3643f063ff8c82ea2d69c79e9051f9a961b818a","tgt_lang":"ru","translated":"Последнее сообщение","updated_at":"2026-06-26T21:38:30.975Z"}
 {"cache_key":"85606f5c78ae1f65479cc2a263ea91fa49561e09398f48706cad43e2b363d378","model":"gpt-5.5","provider":"openai","segment_id":"logbook.ask.submit","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Ask","text_hash":"b8c209cdead61a095ec097b7a13c4fc9264c04b3e3bd0fca42ec8dbaeebeeafe","tgt_lang":"ru","translated":"Запрос","updated_at":"2026-06-26T21:39:20.621Z"}
+{"cache_key":"8584f9c82b19e61380ddb06b60b1a9368b4dbe8ca1b2f067bea5cada9cbb292e","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"ru","translated":"Действия со ссылкой","updated_at":"2026-07-09T11:03:16.153Z"}
 {"cache_key":"85886eff312f2c1897a79a68b352d51ea365f5cde8b2878d843065904598ce7d","model":"gpt-5.5","provider":"openai","segment_id":"cron.errors.systemTextRequired","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"System text is required.","text_hash":"7b13b35a0dabfa257fada59d07a81a0559c20e8a5049419e4969e2c538f110e5","tgt_lang":"ru","translated":"Требуется системный текст.","updated_at":"2026-06-26T21:42:51.343Z"}
 {"cache_key":"85a7139e419d82956224395e04fd008357df6e3a5d0c8fe6f966e04717998b96","model":"gpt-5.5","provider":"openai","segment_id":"subtitles.skills","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Skills and API keys.","text_hash":"6ade4da6eeb01dafee4a8d0882ebc1d9e84abd09c1ed699b1ccbcda0a28700a2","tgt_lang":"ru","translated":"Навыки и ключи API.","updated_at":"2026-06-26T21:39:27.659Z"}
 {"cache_key":"85affb1112af1b19a7663285b3b461b2a481b14def7f68535ce5735480f71988","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneInput","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Microphone input","text_hash":"5c8a6025b9d96fb0c090d33c9def15ee64aa520a83cf5d64c784b4f0699bb15e","tgt_lang":"ru","translated":"Вход микрофона","updated_at":"2026-07-06T17:34:09.324Z"}
 {"cache_key":"85b3b2995f49587ebabe1e1ba536f3965bcb8ea0fe97421d994f996f985fa7e4","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventProtocolViolation","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Protocol violation","text_hash":"367bb2052963f7d75beb672d3ca0430d7d49ac48a2759d578c7df933178fe564","tgt_lang":"ru","translated":"Нарушение протокола","updated_at":"2026-06-26T21:40:14.690Z"}
 {"cache_key":"85efd572fdd20e6c6860cde7a1c146347efa6fdd0bbb2745e4f2f1a1f8e466fd","model":"gpt-5.5","provider":"openai","segment_id":"workboard.detailNotePlaceholder","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Add a decision, blocker, or proof note...","text_hash":"0e40ea8371be2fcbd8379458b0da541ca0dce5dc86357dea64a4d8fac1c742dc","tgt_lang":"ru","translated":"Добавьте заметку о решении, блокере или подтверждении...","updated_at":"2026-06-26T21:39:47.132Z"}
 {"cache_key":"8615a8ab84c21eb5a00160885ba647c367062689cf96887522d707389c90ba25","model":"gpt-5.5","provider":"openai","segment_id":"cron.jobs.enabled","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Enabled","text_hash":"92c1cdfdf4cb9cf6fcca962f206de36fd5d60db1178bc9461052f8de703a0e06","tgt_lang":"ru","translated":"Включено","updated_at":"2026-06-26T21:42:18.092Z"}
+{"cache_key":"8616e475f9582e571ca46f2b4f0baeee16d301dace9f8b3c81404ea71312fe83","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"ru","translated":"Открыть в браузере по умолчанию","updated_at":"2026-07-09T11:03:16.154Z"}
 {"cache_key":"86341b56a75b37c40fb12433c15fea3dd5106315b961039d6b03003ece83cc49","model":"gpt-5.5","provider":"openai","segment_id":"subtitles.instances","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Connected clients and nodes.","text_hash":"a835fb9c31658a6a1076d66cdfd547029c0e859eb79cf1da08ea364cb8a1cd08","tgt_lang":"ru","translated":"Подключенные клиенты и узлы.","updated_at":"2026-06-26T21:39:27.659Z"}
 {"cache_key":"8642a67a9dde0ceda8131b0c53bc71ce898b9e901bc9a048bf4dc6d862156de3","model":"gpt-5.5","provider":"openai","segment_id":"cron.form.staggerPlaceholder","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"30","text_hash":"624b60c58c9d8bfb6ff1886c2fd605d2adeb6ea4da576068201b6c6958ce93f4","tgt_lang":"ru","translated":"30","updated_at":"2026-06-26T21:42:41.136Z"}
 {"cache_key":"86521fd58de460d7a9a78b2ac858e4bd76080b57bb574c138404ead21c952ec4","model":"gpt-5.5","provider":"openai","segment_id":"overview.cards.recentSessions","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Recent Sessions","text_hash":"f59b46c265d8d38fe5a10d81ea3b800931d2dc2c8a0ee180c5d8247ba7545cb7","tgt_lang":"ru","translated":"Недавние сеансы","updated_at":"2026-06-26T21:40:28.260Z"}
@@ -930,6 +932,7 @@
 {"cache_key":"8e7d5f231595975403e7819d5187ba27ac1ddeee1fa5f3837cb97d99bda75fbc","model":"gpt-5","provider":"openai","segment_id":"codexSessions.scopeLabel","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Session archive filter","text_hash":"9b7ab0c41b678c43f34c5e4d5b27428141588466c5d14b68bd19bcc93d7b6c38","tgt_lang":"ru","translated":"Фильтр архива сеансов","updated_at":"2026-07-09T10:01:43.745Z"}
 {"cache_key":"8e8f10fabb3346d025cbc57d2c90a2bdba29dfe304e4e17bc27671a52303641a","model":"gpt-5","provider":"openai","segment_id":"usage.costWindows.perDay","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"/ day","text_hash":"122faff7033fbaa4fac55b95788a16f370e13ab272d734f33bfcf15021170fe7","tgt_lang":"ru","translated":"/ день","updated_at":"2026-07-05T20:24:32.108Z"}
 {"cache_key":"8e98a6cef1f65a17c80d66c7022fd5dca21fdb755f9e9f2d4fada9a15e039aa7","model":"gpt-5.5","provider":"openai","segment_id":"cron.form.scheduleSub","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Control when this job runs.","text_hash":"3f706ce5406a786b764e79024a07de24c744012a2b92ada149860bb76aadc198","tgt_lang":"ru","translated":"Укажите, когда запускать это задание.","updated_at":"2026-06-26T21:42:28.070Z"}
+{"cache_key":"8eaddd3f3b9888a21f41600f7284c90880829c0b0e504c3ede82895e9a56c2d8","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"ru","translated":"Открыть в боковой панели","updated_at":"2026-07-09T11:03:16.153Z"}
 {"cache_key":"8ed4ab57587c5c5b8377af6b75a22c969cd55c70c627e1c7026a7f3c62855a0d","model":"gpt-5.5","provider":"openai","segment_id":"debug.noEvents","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"No events yet.","text_hash":"80c652c4eeecf7a1ad0ba8f6fdabb39a23c31906e1882cc8580002e6e0c74c14","tgt_lang":"ru","translated":"Событий пока нет.","updated_at":"2026-06-26T21:39:17.817Z"}
 {"cache_key":"8eeb99a81640199ea8223809a95cc4bf1797ed149939fa0f1db8ea65c976b7e4","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.realtimeTalkRequiresMicrophone","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Realtime Talk requires browser microphone access.","text_hash":"e082e85327dc5d2905a34ca4ca60e76836f9b4d7e3b1834b821c81a9c456b39d","tgt_lang":"ru","translated":"Для Realtime Talk требуется доступ браузера к микрофону.","updated_at":"2026-07-06T17:57:33.379Z"}
 {"cache_key":"8ef0ceb2bbd19b2aeebf47623b29bc35407a1a707f71fe469c16b174d49ba707","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.ungrouped","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Ungrouped","text_hash":"674b38cae72bb0c8be97cea114f7ce84a6ad4ae3c7f3ceb0c869d62db8e53fa2","tgt_lang":"ru","translated":"Без группы","updated_at":"2026-07-05T14:40:26.836Z"}
@@ -1364,6 +1367,7 @@
 {"cache_key":"d91166561784b128412703eb261885fdc06396c9dd938dbf49ca9b558cfd2bcd","model":"gpt-5.5","provider":"openai","segment_id":"usage.overview.sessionsHint","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Distinct sessions in the range.","text_hash":"03ac814eb939f3f67105d4862c3c3b47a36dc5906b2fa1fbf50c8e2ff2ec1255","tgt_lang":"ru","translated":"Уникальные сеансы в диапазоне.","updated_at":"2026-06-26T21:41:16.422Z"}
 {"cache_key":"d9203be2ca4719b07a537b735039cd53001922fca44427b45572cce6acef0965","model":"gpt-5.5","provider":"openai","segment_id":"workboard.template.pr_review","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"PR review","text_hash":"98616dec600b137ebffe5410ffa7c05b92e691782cb8b6971ea95e0ef52a32d6","tgt_lang":"ru","translated":"Ревью PR","updated_at":"2026-06-26T21:40:00.644Z"}
 {"cache_key":"d92ae596715d6ad4902b03494b224a91a5ba8471676b70a60488af209680f546","model":"gpt-5.5","provider":"openai","segment_id":"workboard.lifecycleUnlinked","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"No session","text_hash":"64f06c9698cd0e17a303ad674d436c04ca60f5d0b358989e7369bb7ce5556b88","tgt_lang":"ru","translated":"Нет сеанса","updated_at":"2026-06-26T21:40:07.529Z"}
+{"cache_key":"d970077396222efe8d57596eef07ffc2834533bff23e1dd0869e9c11abbbde78","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"ru","translated":"Копировать ссылку","updated_at":"2026-07-09T11:03:16.154Z"}
 {"cache_key":"d99b66420aa7c01e9798dc53fff1b9d35123d4e6046f37713514b1e2fc0139a3","model":"gpt-5.5","provider":"openai","segment_id":"dreaming.phrases.tidyingKnowledgeGraph","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"tidying the knowledge graph…","text_hash":"2928067f27c7db405c7c8409ce078b92342a579c30fdc08d9932ea271b1d1c51","tgt_lang":"ru","translated":"приведение графа знаний в порядок…","updated_at":"2026-06-26T21:40:53.979Z"}
 {"cache_key":"d99fdfe54633ff3a449960d1cbe5d064307499a05cbe74a5937d3fb6b99fea97","model":"gpt-5.5","provider":"openai","segment_id":"workboard.autoRefresh30s","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"30s","text_hash":"d3382a4f0e03f8b14cf99424376886c236f1503d4b332137667484fc96d58fc4","tgt_lang":"ru","translated":"30 с","updated_at":"2026-06-26T21:39:57.757Z"}
 {"cache_key":"d9aa65daadd43edad6d567adba17473c265675824f61696a61ec2d2fc41c176c","model":"gpt-5.5","provider":"openai","segment_id":"chat.workspaceFiles.actions","source_path":"ui/src/i18n/locales/ru.ts","src_lang":"en","text":"Workspace file actions","text_hash":"461817d921bc7672e95fe4a3b23f4ac2a4a20e35b3d6eef3f02e8f5ba4201050","tgt_lang":"ru","translated":"Действия с файлами рабочей области","updated_at":"2026-06-26T21:42:06.902Z"}
diff --git a/ui/src/i18n/.i18n/th.meta.json b/ui/src/i18n/.i18n/th.meta.json
index 7b62e9199cf..5ce09cee7b0 100644
--- a/ui/src/i18n/.i18n/th.meta.json
+++ b/ui/src/i18n/.i18n/th.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:01.838Z",
+  "generatedAt": "2026-07-09T11:53:07.477Z",
   "locale": "th",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/th.tm.jsonl b/ui/src/i18n/.i18n/th.tm.jsonl
index 2a51e6e9350..f63dcc79356 100644
--- a/ui/src/i18n/.i18n/th.tm.jsonl
+++ b/ui/src/i18n/.i18n/th.tm.jsonl
@@ -36,6 +36,7 @@
 {"cache_key":"1cd3d73ad1006ec120593d5dad00bbaa3ea771f8b56256ceb62e11d137860c77","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupRowCountOne","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"{count} session","text_hash":"c0975b42c84d7da963f4c962d1e2c1ee78eb18efc7ebec75fb3ce761ce9a40db","tgt_lang":"th","translated":"{count} เซสชัน","updated_at":"2026-07-05T14:40:13.915Z"}
 {"cache_key":"1d2a2fcee818cb09c7b8c325434d35a4851219cf0ef2e9659cb77a86e28a971a","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.summary","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Session workspace summary","text_hash":"1ed422c34dc1802d4c7366164ae810c496e206fe82e8e6565cefc38230b56bb4","tgt_lang":"th","translated":"สรุป Workspace ของเซสชัน","updated_at":"2026-06-16T14:17:36.173Z"}
 {"cache_key":"1d80b5c3c9eac6916db70db7d7f4d43f46bf607858398c830d672b8736d36e3a","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.renameGroupPrompt","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Rename group","text_hash":"98d254a311d0e820bb8739eb28d4e1eb5fc1cfc34f755167759864cd15504b4c","tgt_lang":"th","translated":"เปลี่ยนชื่อกลุ่ม","updated_at":"2026-07-06T23:41:15.864Z"}
+{"cache_key":"1e3a3e798e9ce09165639487a738db2bb3d1c9757ffde5e197f1b98ce1c9d475","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"th","translated":"เปิดในแถบด้านข้าง","updated_at":"2026-07-09T11:03:08.210Z"}
 {"cache_key":"1f04af6023e1c5ca0d1e9fffc97416e36fb02e4841bed6139db707a14e6c22f0","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependencyStatusMissing","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Missing","text_hash":"6be36ca49ee85210c5d1ad9c377d90a9859c66d889110a2a5b0dccd390d12e20","tgt_lang":"th","translated":"หายไป","updated_at":"2026-06-16T14:17:26.503Z"}
 {"cache_key":"1f37b82f8013f1f47df13bc77e3bdc7702a356be7e7b46eebb908d76baea50bc","model":"gpt-5","provider":"openai","segment_id":"codexSessions.untitled","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Untitled Codex session","text_hash":"c70b89c47992206d82993f9d295c9d3368a993fbc0899eef1bafb25277e5c88d","tgt_lang":"th","translated":"เซสชัน Codex ที่ไม่มีชื่อ","updated_at":"2026-07-09T10:01:43.768Z"}
 {"cache_key":"20daaa602df28eaa16a929d1e0bf54406dd0b45361cebc0c024763ab76841ccf","model":"gpt-5.5","provider":"openai","segment_id":"nav.settingsGroupConnections","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Connections","text_hash":"dc273117482b4429ada500ecd2e0c75532454194892cb901ca64cc7df369fdf6","tgt_lang":"th","translated":"การเชื่อมต่อ","updated_at":"2026-07-09T08:08:10.509Z"}
@@ -44,6 +45,7 @@
 {"cache_key":"22475c5af907bb4fab16061745b99113975455655f1acc72d4deb78504d5e7bd","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.actions","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Workspace file actions","text_hash":"461817d921bc7672e95fe4a3b23f4ac2a4a20e35b3d6eef3f02e8f5ba4201050","tgt_lang":"th","translated":"การกระทำกับไฟล์ Workspace","updated_at":"2026-06-16T14:17:36.173Z"}
 {"cache_key":"23b537cf8227ffa9ffe816aa0a107c0fb46b8a169044b95085645c0e80a7af9d","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChat","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Use current chat","text_hash":"fbc1ffd63daa506e927c7a85f6e43acd11e0b8c9f52a3951fc782b236ce9a787","tgt_lang":"th","translated":"ใช้แชทปัจจุบัน","updated_at":"2026-06-16T14:17:16.747Z"}
 {"cache_key":"23d24fab8877e6661a15c2e697264a27c822cb584ce6744b6a92cc36cdc984a2","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browserCount","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"{count} shown","text_hash":"e57b4adfe868fd74a183650103d820176d4960bd0bdb677d9985db09f9752867","tgt_lang":"th","translated":"แสดง {count}","updated_at":"2026-06-16T14:17:36.173Z"}
+{"cache_key":"2653b0830b0ba95a2fe990659f88ae158b5b0aeb02cb6a59096f2899a4da56f8","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"th","translated":"คัดลอกลิงก์","updated_at":"2026-07-09T11:03:08.210Z"}
 {"cache_key":"26f0ebad149505f0c4c7c68572f873cbd989b31ed436f563c7615185e2f91ca6","model":"gpt-5.5","provider":"openai","segment_id":"workboard.dispatch","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Nudge dispatcher","text_hash":"c3d20147447cc75f5e1e8cc895af0bc287a4a720372aec4795c5dfbfa9eeda67","tgt_lang":"th","translated":"กระตุ้น dispatcher","updated_at":"2026-05-30T15:38:44.763Z"}
 {"cache_key":"277f8ed7df4cb8a16a9f6901a7973f8ebcd463b18d1562a53433c86d7cbcbaf5","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh30s","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"30s","text_hash":"d3382a4f0e03f8b14cf99424376886c236f1503d4b332137667484fc96d58fc4","tgt_lang":"th","translated":"30 วินาที","updated_at":"2026-06-17T14:16:55.187Z"}
 {"cache_key":"28c53d38b8d1d8fd0d527e685ba8d5a256cbcf97daa3d963fad0118af0be6345","model":"gpt-5.5","provider":"openai","segment_id":"nav.settingsGeneral","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"General","text_hash":"c910d474dcd724bff83ddedeb06bf1eceaf9fb3af7c76bb282be057f36e6dffa","tgt_lang":"th","translated":"ทั่วไป","updated_at":"2026-07-09T08:08:10.509Z"}
@@ -77,6 +79,7 @@
 {"cache_key":"40b4dcea005f6f61d07fb943ba70904821dcc72fccea5b00ecd6e86bdc26cb73","model":"gpt-5.5","provider":"openai","segment_id":"nodes.pairing.showSetupCode","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Show setup code","text_hash":"dc4fa0026fedf726e622f08eafb87102dfe74b6f27a47c5bc3e78df69498296b","tgt_lang":"th","translated":"แสดงรหัสตั้งค่า","updated_at":"2026-07-04T16:48:49.478Z"}
 {"cache_key":"42589e427cf6d03dffac4a1bc56074e4134e27c2261cdc2df9dec24220b90b63","model":"gpt-5.5","provider":"openai","segment_id":"tabs.mcp","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"MCP","text_hash":"53f13ae99ed53bd346eb8e1c8cefb7ef8260683b50401caf101360967ea052aa","tgt_lang":"th","translated":"MCP","updated_at":"2026-05-31T05:36:53.074Z"}
 {"cache_key":"4292409a2003f4067eb24ba4a8815ac103316ba61ba50aad59967feacd1a40b3","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortSessions","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Sort sessions","text_hash":"6680f07d3df817d60180acbbc6e207689d28caaa27ac23749f93261b8111a38d","tgt_lang":"th","translated":"จัดเรียงเซสชัน","updated_at":"2026-07-06T15:07:02.499Z"}
+{"cache_key":"42b238926bc9a902b51c0bda06595659730c013d7c844d38c14c7de86bd36faa","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"th","translated":"การดำเนินการลิงก์","updated_at":"2026-07-09T11:03:08.210Z"}
 {"cache_key":"42c8715173ad98b9e3d2785565de2d832a0016a5478b0456c2c9404e6526a124","model":"gpt-5","provider":"openai","segment_id":"codexSessions.subtitle","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"A read-only view of Codex sessions on this gateway and every connected computer that shares them.","text_hash":"ea7ea85488243bacdbe28edb2fba0617ec90ebcf587f8ecce6f62858ca85aed4","tgt_lang":"th","translated":"มุมมองแบบอ่านอย่างเดียวของเซสชัน Codex บน Gateway นี้และคอมพิวเตอร์ที่เชื่อมต่อทุกเครื่องซึ่งแชร์เซสชัน","updated_at":"2026-07-09T10:01:43.768Z"}
 {"cache_key":"451cd83bc7e5fcbe75dbe1de41cc142349a0ad03d767073242f7bebd7d4b9a7c","model":"gpt-5.5","provider":"openai","segment_id":"subtitles.worktrees","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Isolated agent task checkouts and recovery snapshots.","text_hash":"bc794dc846493e3c5f88964268af19b7dd818eae942c596002ef4067ba5a3d0c","tgt_lang":"th","translated":"การ checkout งานของเอเจนต์แบบแยก และสแนปช็อตสำหรับการกู้คืน","updated_at":"2026-07-05T21:01:30.011Z"}
 {"cache_key":"458d5f79ca3c3a42dc4f3ff021a62bf5596e20dbfd565d92d5ff44c0ace06b97","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.missing","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Missing","text_hash":"6be36ca49ee85210c5d1ad9c377d90a9859c66d889110a2a5b0dccd390d12e20","tgt_lang":"th","translated":"ขาดหายไป","updated_at":"2026-06-16T14:17:36.173Z"}
@@ -108,6 +111,7 @@
 {"cache_key":"67c8f2722b191bfe4a94b551928010898ac97461ae27e00ab82afd0b6f78bbc7","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByAgent","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Agent","text_hash":"11b39c93777e8f1f3983bdba7c72b22fe68cfea20c677e9de53e17cb7dbfb19f","tgt_lang":"th","translated":"Agent","updated_at":"2026-07-05T14:40:13.915Z"}
 {"cache_key":"69697ca507a7c1e06a7506278a9ef16d7f4d0eb99bdeb78463b2487960e16fe7","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.path","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Workspace path","text_hash":"1fddb73e40f0f5cc6fbf747930a11f857b7a37991caeb4d8677433bbc50a2a38","tgt_lang":"th","translated":"เส้นทาง Workspace","updated_at":"2026-06-16T14:17:36.173Z"}
 {"cache_key":"6c8ceb96a45ec0e05508a8b8fa22ec9588297ad862d44eb22ff0fb557840c441","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dragSessionHint","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Drag to move between groups","text_hash":"3e8692b1cd1c1f9a606a779f1037aa390c885fde224ddb841df9259e8aab03ae","tgt_lang":"th","translated":"ลากเพื่อย้ายระหว่างกลุ่ม","updated_at":"2026-07-05T14:40:13.915Z"}
+{"cache_key":"6c97bf393ff6d7a62cc371902acaf8596f384c10b596916eb9aaf7c7c15c21cd","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"th","translated":"เปิดในเบราว์เซอร์เริ่มต้น","updated_at":"2026-07-09T11:03:08.210Z"}
 {"cache_key":"6d49f61e8daf29818cae027ae36136a2ebff9dc4e819e22d841c22f70ffae4cf","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.goal","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Goal","text_hash":"cdbf6975e8a35b0d03558be6822dfae166482c24fb86b0433f60e8167f5c91e4","tgt_lang":"th","translated":"เป้าหมาย","updated_at":"2026-05-29T21:02:14.030Z"}
 {"cache_key":"6d5f3bb7d2b885270a7256579ad859a29c02462ae2f7a08cf8100b2902f07f2d","model":"gpt-5.5","provider":"openai","segment_id":"workboard.eventProtocolViolation","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Protocol violation","text_hash":"367bb2052963f7d75beb672d3ca0430d7d49ac48a2759d578c7df933178fe564","tgt_lang":"th","translated":"การละเมิดโปรโตคอล","updated_at":"2026-05-30T15:38:44.763Z"}
 {"cache_key":"6e29e91effb60554142d13abcbeb406fc720b094154bf69901f5cf9e0033ecdf","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.unpinSession","source_path":"ui/src/i18n/locales/th.ts","src_lang":"en","text":"Unpin session","text_hash":"f4c582ee4d7a87bf069d05a49bb0211759d3db8366daab4ba7024425961af5dc","tgt_lang":"th","translated":"เลิกปักหมุดเซสชัน","updated_at":"2026-07-02T14:30:49.122Z"}
diff --git a/ui/src/i18n/.i18n/tr.meta.json b/ui/src/i18n/.i18n/tr.meta.json
index 2702ccb9fff..aa8c5f633af 100644
--- a/ui/src/i18n/.i18n/tr.meta.json
+++ b/ui/src/i18n/.i18n/tr.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:00.694Z",
+  "generatedAt": "2026-07-09T11:53:06.585Z",
   "locale": "tr",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/tr.tm.jsonl b/ui/src/i18n/.i18n/tr.tm.jsonl
index ec6a3003497..c345f4f3aa7 100644
--- a/ui/src/i18n/.i18n/tr.tm.jsonl
+++ b/ui/src/i18n/.i18n/tr.tm.jsonl
@@ -175,10 +175,12 @@
 {"cache_key":"9860a243fd38c67d4bb47442de834dc41f3945dfec81dd928302f06f95b2aa1f","model":"gpt-5.5","provider":"openai","segment_id":"workboard.dispatch","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Nudge dispatcher","text_hash":"c3d20147447cc75f5e1e8cc895af0bc287a4a720372aec4795c5dfbfa9eeda67","tgt_lang":"tr","translated":"Dağıtıcıyı dürt","updated_at":"2026-05-30T15:38:34.866Z"}
 {"cache_key":"9c767b9135cc85609fd74808e0cc9445fe2cfd990d9443058661d92dcd06bac4","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthFailedAttempts","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"failed attempts","text_hash":"fd9023af0795825a458100ddbe894a7a8f603324a2b7ad2305d4c9d2334cbd26","tgt_lang":"tr","translated":"başarısız denemeler","updated_at":"2026-06-17T14:15:40.711Z"}
 {"cache_key":"9d289d734d6a8556a00bfdfec95caeb3c45c42ef0859045e10882836edd2e118","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewPresetCount","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"{count} cards","text_hash":"4b3e5442ebd2f839d45fddf95b2c2a18427dbd6ac06c8b57f9d9e996dcb73607","tgt_lang":"tr","translated":"{count} kart","updated_at":"2026-06-17T14:15:34.754Z"}
+{"cache_key":"9d4a25c59e40b583196e890c42eb1bb95d3a6f434b7beb333cbcbdc3aeaa552e","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"tr","translated":"Bağlantı eylemleri","updated_at":"2026-07-09T11:02:57.343Z"}
 {"cache_key":"9d716a0744760d4f1b9c10f33b35dcd56ff4f45f652ed615b12e4c408f76e28e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.session","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Session","text_hash":"6959b4159575d8dd76d9f3bbe2c6437904f861e7860c35abd18deffb1c3425a0","tgt_lang":"tr","translated":"Oturum","updated_at":"2026-06-16T14:15:55.679Z"}
 {"cache_key":"9dac74b483c171a47f6b3cc0d3c9572a5d9d5dd2771bf15a3013f7cf49b5093e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.pairingQrExpired.title","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Pairing QR expired","text_hash":"74e09eafc1d35cad5b62b7a9c321a4d090bb8fefdfa8b33913d6194186eadda6","tgt_lang":"tr","translated":"Eşleştirme QR kodunun süresi doldu","updated_at":"2026-07-01T10:32:46.731Z"}
 {"cache_key":"9ed64673e78da6b8b194fca6945ce32f5c14d39673e4dff2422002fb347b477c","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.notLoaded","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Stored","text_hash":"91da9626894c82dd4d5ed7ab48ed4ed4b1fc57ff98858cde93945254e36c4198","tgt_lang":"tr","translated":"Depolanmış","updated_at":"2026-07-09T10:01:43.764Z"}
 {"cache_key":"9ee768d5e90aa74e8beb4d7b399b8de97525853a430c93e4cf5bf36960e9cf40","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailAddNote","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Add note","text_hash":"63565c0485fec4f743719849734553a5d7947f5962ec9e831e3bce131b3c47fb","tgt_lang":"tr","translated":"Not ekle","updated_at":"2026-06-16T14:15:44.904Z"}
+{"cache_key":"9f1e9bbf7356db37362e4bc64f675f28fb1b3041f0ab3f29238f5c850118766f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"tr","translated":"Varsayılan Tarayıcıda Aç","updated_at":"2026-07-09T11:02:57.343Z"}
 {"cache_key":"9f1f0beaf4f9d8999decd8047ef0597033c7daeeb99ad32a86ab656d7af7a3f6","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.collapse","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Collapse session workspace","text_hash":"b6174b882c37a98e640339d728652a0c1fa70d28ed53d8ccfb6e99363e86973b","tgt_lang":"tr","translated":"Oturum çalışma alanını daralt","updated_at":"2026-06-16T14:15:44.904Z"}
 {"cache_key":"9f847ecee5e41f279fd926038ccb49982c5d9fe06d2da89e4f9e50385a13f9a5","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.runDuration","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Run duration","text_hash":"b5e9698b25697ec71f0947df28e6b08438033fe73b1b87ac7362766d77b45b97","tgt_lang":"tr","translated":"Çalışma süresi","updated_at":"2026-07-09T10:13:25.518Z"}
 {"cache_key":"9fb2a05d8d4dad99ab977056be175db524e6c7d79720ee898fe0167351a8b4a1","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewReview","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Review","text_hash":"aff0766a5290e117b8433c351bae7b7b23bed682b2369bd822d88a647cc58512","tgt_lang":"tr","translated":"İnceleme","updated_at":"2026-06-17T14:15:34.754Z"}
@@ -193,6 +195,7 @@
 {"cache_key":"ab2830fe755f6834fb328183627a3f1005f663258f788e5c9f6444235eda1e42","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.summary","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Session workspace summary","text_hash":"1ed422c34dc1802d4c7366164ae810c496e206fe82e8e6565cefc38230b56bb4","tgt_lang":"tr","translated":"Oturum çalışma alanı özeti","updated_at":"2026-06-16T14:15:55.679Z"}
 {"cache_key":"ac4d586a485e0daa2f9f81350504b00c3ebff7558e928e325b0b8efb5a12f440","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependenciesReadyTitle","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"{count} dependencies are done.","text_hash":"559fe92cd5fe39b4f511a146fc7ce6b51e7f528e1d388bbfde1d85dddb60604d","tgt_lang":"tr","translated":"{count} bağımlılık tamamlandı.","updated_at":"2026-06-16T14:15:44.904Z"}
 {"cache_key":"acbf184463004227b7de6c67f48946333ed4de213cd5c6908fe9686210d2921e","model":"gpt-5","provider":"openai","segment_id":"codexSessions.searchPlaceholder","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Search session titles","text_hash":"9a6bdede84234fa08d6294e1636a34d26cbdd8eca425248f8d3c6cf8844a0cf9","tgt_lang":"tr","translated":"Oturum başlıklarında ara","updated_at":"2026-07-09T10:01:43.764Z"}
+{"cache_key":"adc499ce22912c3e76e50f2c0b07c1dd96ab35c7c4b305e0886504bfb7cbc620","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"tr","translated":"Kenar Çubuğunda Aç","updated_at":"2026-07-09T11:02:57.343Z"}
 {"cache_key":"addf38e908bc55b22a68fa78197055daae4b43a60eb90f2b3a53f292e337eccf","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortBy","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Sort by","text_hash":"c9129025bd3ff6522a7eeebc1abf1481f36e4ac9d74524a473ac1c3be1c6fc2f","tgt_lang":"tr","translated":"Sıralama ölçütü","updated_at":"2026-07-06T23:41:07.084Z"}
 {"cache_key":"ae545453391754dc2f91e3c268f968cefab7d19c63288164fc90ba9b203f8919","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.actions","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Workspace file actions","text_hash":"461817d921bc7672e95fe4a3b23f4ac2a4a20e35b3d6eef3f02e8f5ba4201050","tgt_lang":"tr","translated":"Çalışma alanı dosya işlemleri","updated_at":"2026-06-16T14:15:55.679Z"}
 {"cache_key":"b00d79eaaaa8b82211090344f727f51a2ad50847519b800fdafd5c63f86a5310","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.contextUsage","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"{percent}% of context used ({used} / {context} tokens)","text_hash":"f626ed78b8aca81f039ef64637bbdd4cffe0a289b402fd0c6039e977040aba72","tgt_lang":"tr","translated":"Bağlamın %{percent} kadarı kullanıldı ({used} / {context} token)","updated_at":"2026-07-09T07:06:27.135Z"}
@@ -221,6 +224,7 @@
 {"cache_key":"cb2062ad7c2713d59eb363a12521239e5267a72516c896509d017cb537b6daef","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.pinSession","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Pin session","text_hash":"813273b54d2df112a0fa1903110e9386779f8848ae288142d3f91d7a5891c8ff","tgt_lang":"tr","translated":"Oturumu sabitle","updated_at":"2026-07-02T14:30:28.149Z"}
 {"cache_key":"cb393ab35f81444b9d33f8d6182a2fa053238e75a179a5d540c113774e694cd4","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh15s","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"15s","text_hash":"21b5f52ded33ab19c16a680c4e280b8f9992395b514290163abf272f06394a6f","tgt_lang":"tr","translated":"15sn","updated_at":"2026-06-17T14:15:40.711Z"}
 {"cache_key":"cb8098bc575ec3cb3804ac943e22bc642e6d49309d932a2b2bd84c3c91b9f645","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailNoNotes","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"No operator notes yet.","text_hash":"497e07f47e33851483b6fb1254e88dc640d9fb25525c51f89934a7d39d7b2b9c","tgt_lang":"tr","translated":"Henüz operatör notu yok.","updated_at":"2026-06-16T14:15:44.904Z"}
+{"cache_key":"cdf91727cea6fee69a8d6d1cbc78ef14157a243ca56c078d16a70c76115abe4d","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"tr","translated":"Bağlantıyı Kopyala","updated_at":"2026-07-09T11:02:57.343Z"}
 {"cache_key":"ce0dea84f06e4f6f33c5895862388d4ab8c97b794ac8a1ea9b5bedefe45b84da","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneInput","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Microphone input","text_hash":"5c8a6025b9d96fb0c090d33c9def15ee64aa520a83cf5d64c784b4f0699bb15e","tgt_lang":"tr","translated":"Mikrofon girişi","updated_at":"2026-07-06T17:33:54.041Z"}
 {"cache_key":"ce0fee74eb15e48d1a90ac3db4907e6cb39b62575daa408cb2c9d4fe2051533e","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByChannel","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Channel","text_hash":"ce4683e7013a18cdf3d224bfcb4e9594ea8f559e946a837c633defe7d3c32172","tgt_lang":"tr","translated":"Kanal","updated_at":"2026-07-05T14:40:02.505Z"}
 {"cache_key":"cf945f44bc75097cc776c137e5fc965a5be2dc89367ea8d2af1eb2fae637162c","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.actions","source_path":"ui/src/i18n/locales/tr.ts","src_lang":"en","text":"Actions","text_hash":"ff8059dc6752afdd30d275932b1d5031a2ec854b387a8c57ecc6689915293a43","tgt_lang":"tr","translated":"Eylemler","updated_at":"2026-07-05T21:01:15.459Z"}
diff --git a/ui/src/i18n/.i18n/uk.meta.json b/ui/src/i18n/.i18n/uk.meta.json
index a95ae4e4f36..1c43d2ba10b 100644
--- a/ui/src/i18n/.i18n/uk.meta.json
+++ b/ui/src/i18n/.i18n/uk.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:00.980Z",
+  "generatedAt": "2026-07-09T11:53:06.835Z",
   "locale": "uk",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/uk.tm.jsonl b/ui/src/i18n/.i18n/uk.tm.jsonl
index 874852ad4b7..c14f26cfc44 100644
--- a/ui/src/i18n/.i18n/uk.tm.jsonl
+++ b/ui/src/i18n/.i18n/uk.tm.jsonl
@@ -33,6 +33,7 @@
 {"cache_key":"1f1325799e384377a690852443ab4d6ebe40e5507b76ad4cd664867bee0f906f","model":"gpt-5.5","provider":"openai","segment_id":"tabs.skillWorkshop","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Skill Workshop","text_hash":"3912c65bdd0a43563438762a43ecbd4b14637844a18decbf9249df73d21152a0","tgt_lang":"uk","translated":"Майстерня Skills","updated_at":"2026-05-31T21:48:33.167Z"}
 {"cache_key":"1f6758e3333cb43656fdfb200ff7eb7555842f613ec2530fb0ae12cbdd578a73","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupBy","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Group by","text_hash":"956a51f6b098a41b7c3108015f0790bb24af7693717b07cee39d5df6a5da1826","tgt_lang":"uk","translated":"Групувати за","updated_at":"2026-07-05T14:40:05.415Z"}
 {"cache_key":"1fbfa017306461870a2476170bdf24b0fbcdd900f4b4bb1e7cf72bcc4b1e75ce","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.status","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Status","text_hash":"920e413c7d411b61ef3e8c63b1cb6ad058d5f95f8b481dbafe60248387d8c355","tgt_lang":"uk","translated":"Статус","updated_at":"2026-07-05T21:01:19.646Z"}
+{"cache_key":"20014c09ee4d9ceef2315bcab49cfae1f07e7bacb9f5716625a2a83cd3e7566c","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"uk","translated":"Дії з посиланням","updated_at":"2026-07-09T11:02:59.094Z"}
 {"cache_key":"20246255ee6a141cb3d3c4307639bf1ef0b3e5869f54927d24b82268a27de44e","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.open","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Open split view","text_hash":"51e50f7be73433216ae62f58fdbc586372f5a6063ee9978cec96793ef75fa554","tgt_lang":"uk","translated":"Відкрити розділений перегляд","updated_at":"2026-07-06T07:23:57.922Z"}
 {"cache_key":"20696fa9a8f677c6074e29f890cb6453202720d5210f666ce0f00b4fed1c3f7f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependencyMissing","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"{parent} (missing)","text_hash":"8daa419059727391c01e3b7021e05d8d70b4da67f9c57cd2d80f302af77aac53","tgt_lang":"uk","translated":"{parent} (відсутня)","updated_at":"2026-06-16T14:15:46.702Z"}
 {"cache_key":"20ca1c9d9f6087c562e62ca9482bcd389c9fdb75e8354992ede846966427982e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh30s","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"30s","text_hash":"d3382a4f0e03f8b14cf99424376886c236f1503d4b332137667484fc96d58fc4","tgt_lang":"uk","translated":"30 с","updated_at":"2026-06-17T14:15:34.049Z"}
@@ -42,12 +43,14 @@
 {"cache_key":"2519012c0cea071166893e4c6a972adf3275520ef6a57663eda83c311e650952","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependenciesReady","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"{count} ready","text_hash":"f5f5fd424d7c18f19a51ee147857efddc320a0ec6e1eeb4354be129425632f05","tgt_lang":"uk","translated":"{count} готово","updated_at":"2026-06-16T14:15:46.702Z"}
 {"cache_key":"260d72e8528bd863bd5a8a6939ca1162f744d843846172ee2fa2d9eb2e6520a8","model":"gpt-5.5","provider":"openai","segment_id":"terminal.detached","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"detached","text_hash":"88e34e4cdbb5c6066cb1b0d0abe74714bd72f86259433bc8287614e4ae052605","tgt_lang":"uk","translated":"відʼєднано","updated_at":"2026-07-04T21:24:00.535Z"}
 {"cache_key":"26364b28c15045251ecb4aa93946b1174aba69a68ab2c26059c62e1f584112ad","model":"gpt-5.5","provider":"openai","segment_id":"connection.lostTitle","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Gateway connection lost","text_hash":"ec6cd265976239ff6fc4f227bb25e8e6286fe38c3d1c64326dcdbb76c28b515e","tgt_lang":"uk","translated":"З’єднання з Gateway втрачено","updated_at":"2026-07-05T21:55:42.631Z"}
+{"cache_key":"272a1e10deff6d954fc51055a33a3ecce2b3722c0df7378c1359f16a9732b2ca","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"uk","translated":"Копіювати посилання","updated_at":"2026-07-09T11:02:59.094Z"}
 {"cache_key":"27e10e346e943b7426ee7ffd41d8fb351336bbe77546ebfaed88c94ef9dacf79","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailTask","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Gateway task","text_hash":"6696e7c592238747dd39d7ba000db600a92f843add73ee90b028c72a2dfd37dd","tgt_lang":"uk","translated":"Завдання Gateway","updated_at":"2026-06-16T14:15:40.204Z"}
 {"cache_key":"28d3b2dca887a72ef38765db37d00b8f657acb490d9bebf81cd915eb6f94fe16","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailNotePlaceholder","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Add a decision, blocker, or proof note...","text_hash":"0e40ea8371be2fcbd8379458b0da541ca0dce5dc86357dea64a4d8fac1c742dc","tgt_lang":"uk","translated":"Додайте рішення, перешкоду або нотатку-доказ...","updated_at":"2026-06-16T14:15:46.702Z"}
 {"cache_key":"28e58806f9285d77eaeeb420bc366f8645c0ad65fc8634330dd38e8a07b94536","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.moveToGroup","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Move session to a group","text_hash":"7db4b663aebb86158b454c49ad05115941c0411cb8ed6182bdc8fd5840f32dff","tgt_lang":"uk","translated":"Перемістити сеанс до групи","updated_at":"2026-07-05T14:40:05.415Z"}
 {"cache_key":"2a20e90dae2c33054affee9ab4d3c7f57af448195aef2c3150d0e4305c947e09","model":"gpt-5.5","provider":"openai","segment_id":"connection.reconnecting","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Reconnecting…","text_hash":"27b80374e1151af6df7824a358606c77502548bff4d467e4ae2e146801f601ce","tgt_lang":"uk","translated":"Повторне підключення…","updated_at":"2026-07-05T21:55:42.631Z"}
 {"cache_key":"2a64a67355d3b55752bc3391b1669cb51d4e4fd2be99da9ad911de7d0d12eb1c","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailAutomation","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Automation","text_hash":"d909750b1bbb71a39b6330ba8f81f4f8f6e889ed96d7ab366e74857909750c64","tgt_lang":"uk","translated":"Автоматизація","updated_at":"2026-06-16T14:15:40.204Z"}
 {"cache_key":"2a90d3e31e0c3febb2ef62202807f1bc84c73ce0e36ccc81f899b3d92dad37cf","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.pinSession","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Pin session","text_hash":"813273b54d2df112a0fa1903110e9386779f8848ae288142d3f91d7a5891c8ff","tgt_lang":"uk","translated":"Закріпити сеанс","updated_at":"2026-07-02T14:30:30.852Z"}
+{"cache_key":"2ad1d6b474a6b4f2f781ad7c4d143bd6945744c3d9c7e567115725207f9415cb","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"uk","translated":"Відкрити на бічній панелі","updated_at":"2026-07-09T11:02:59.094Z"}
 {"cache_key":"2d3e2199f7d61bd472b4e492a183d91e6318d33d0cf57ba16854237db4058669","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.active","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Active","text_hash":"92340695899bd2d86223e4a007620e0d6502fc0e08809773634c7e0743764a9c","tgt_lang":"uk","translated":"Активний","updated_at":"2026-07-09T10:01:43.750Z"}
 {"cache_key":"2d7406c2df89c36b38884f459eec6fa58c4ffca86a0b98344a592e4d39991791","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChatTooltip","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Send revision requests to the current chat session instead of the proposal's workshop session.","text_hash":"9db782d40e88750d4faed33c8a73c24552070f101483881c60af8cf446c674a6","tgt_lang":"uk","translated":"Надсилати запити на перегляд до поточної сесії чату замість сесії воркшопу пропозиції.","updated_at":"2026-06-16T14:15:40.204Z"}
 {"cache_key":"2db75831425c5fa5c029ea9a0faae90e8c3257d8716e16fdc4edaafbd3d0f0f0","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.pairingQrExpired.badge","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Expired","text_hash":"424a2551d356754c882d04ac16c63e6b50b80b159549d23231001f629455756e","tgt_lang":"uk","translated":"Застарів","updated_at":"2026-07-01T10:32:49.580Z"}
@@ -128,6 +131,7 @@
 {"cache_key":"7244fa211e75153821b796f18200426d60a930f9ace8558d300ddbd3e3bc6895","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.browser","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Project files","text_hash":"2a3d9a240c9206964ee7237a1d99fda05ed501a485262e18f33c446c9f735d1c","tgt_lang":"uk","translated":"Файли проєкту","updated_at":"2026-06-16T14:16:00.845Z"}
 {"cache_key":"725a64f4ee6bce0f9a75159ddf9335f2ccbb78c7868fe68c048016d95cebef67","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.path","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Workspace path","text_hash":"1fddb73e40f0f5cc6fbf747930a11f857b7a37991caeb4d8677433bbc50a2a38","tgt_lang":"uk","translated":"Шлях до робочого простору","updated_at":"2026-06-16T14:16:00.845Z"}
 {"cache_key":"737aabdb5c0440c77409f986ef3d3b8e74f09859d54330a3b65338d0ef39c6b3","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByDate","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Date","text_hash":"99c40ab405926cb5ad1def9cff4d7ce624f8f8abfff4e85f655347fcb949d08e","tgt_lang":"uk","translated":"Дата","updated_at":"2026-07-05T14:40:05.415Z"}
+{"cache_key":"73feda41fcdab37c4006a8e83456de817a15d908af0d4a5cfc54e44930b2fb8e","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"uk","translated":"Відкрити у браузері за замовчуванням","updated_at":"2026-07-09T11:02:59.094Z"}
 {"cache_key":"741b7e70ba8f39fd43e769b8970e8507c2a6c4d87f68de536e336eddc6654025","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.searchResults","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"Search results","text_hash":"e978b00de465a271a13bf2f6b9d74d67fdfaa7d973a37378fa32f988c3280599","tgt_lang":"uk","translated":"Результати пошуку","updated_at":"2026-06-16T14:16:00.845Z"}
 {"cache_key":"749323720dfa55de96dd4579c8681bf005cc3b1edeb39cc15e7435ddf8d5f273","model":"gpt-5.5","provider":"openai","segment_id":"subtitles.mcp","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"MCP servers, auth, tools, and diagnostics.","text_hash":"3eb7bf08a81e00ed41da1b60096320c5b90ff4d4e78b3f84ecd9ce45a62eaea1","tgt_lang":"uk","translated":"MCP-сервери, автентифікація, інструменти та діагностика.","updated_at":"2026-05-31T05:36:47.622Z"}
 {"cache_key":"753ab725b9a36435a5c40dd67658203ce5fc685a847f5c63ad4f7b56a60446bb","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.requests","source_path":"ui/src/i18n/locales/uk.ts","src_lang":"en","text":"{count} requests","text_hash":"1e23ff6956124091cd470f5091cee8108c3766314b69871b3ff792eaf506455f","tgt_lang":"uk","translated":"{count} запитів","updated_at":"2026-07-06T06:40:15.357Z"}
diff --git a/ui/src/i18n/.i18n/vi.meta.json b/ui/src/i18n/.i18n/vi.meta.json
index ef1a0c7bafd..976036e9ca9 100644
--- a/ui/src/i18n/.i18n/vi.meta.json
+++ b/ui/src/i18n/.i18n/vi.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:44:02.092Z",
+  "generatedAt": "2026-07-09T11:53:07.727Z",
   "locale": "vi",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/vi.tm.jsonl b/ui/src/i18n/.i18n/vi.tm.jsonl
index ae1e733093b..eac874c6b82 100644
--- a/ui/src/i18n/.i18n/vi.tm.jsonl
+++ b/ui/src/i18n/.i18n/vi.tm.jsonl
@@ -134,10 +134,12 @@
 {"cache_key":"6c827d0ce71b8d9f382a3d6c1c4d451166fe39cac96f51f8a9484132faebe573","model":"gpt-5","provider":"openai","segment_id":"codexSessions.untitled","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Untitled Codex session","text_hash":"c70b89c47992206d82993f9d295c9d3368a993fbc0899eef1bafb25277e5c88d","tgt_lang":"vi","translated":"Phiên Codex chưa có tiêu đề","updated_at":"2026-07-09T10:01:43.734Z"}
 {"cache_key":"6d3fdf6b70d9a942725b1fafee6aedfc48ac8733030bff3e3acf4aa28d6567b1","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.confirmForceDelete","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Snapshot failed: {error}\n\nDelete without a snapshot?","text_hash":"200ce9b8fb04659df79e1d26e69ec1014631ad5a85a92130dbdb9fcb550ba34f","tgt_lang":"vi","translated":"Tạo snapshot thất bại: {error}\n\nXóa mà không có snapshot?","updated_at":"2026-07-05T21:01:34.014Z"}
 {"cache_key":"6e9175f527cd906481e840e8273c2324c84e13e497ebd0323df6e928d639d87e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.workspace","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Session","text_hash":"6959b4159575d8dd76d9f3bbe2c6437904f861e7860c35abd18deffb1c3425a0","tgt_lang":"vi","translated":"Phiên","updated_at":"2026-06-16T14:17:17.661Z"}
+{"cache_key":"6f5e3e6e0eb7c1bcbe1032effc6f94744ca43e32f4f08e3a431e66a90545cad7","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"vi","translated":"Hành động liên kết","updated_at":"2026-07-09T11:03:10.148Z"}
 {"cache_key":"6f78e5ecf196e5d888afd53dd1e1283eba16d77aab50e8dbe95aec42bf4f8beb","model":"claude-opus-4-8","provider":"anthropic","segment_id":"cron.jobDetail.cwd","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"CWD","text_hash":"0217f1cb7725737f15a6710df3bcfa3bc10a239f0f7801ec3d7168e675f5ebd6","tgt_lang":"vi","translated":"CWD","updated_at":"2026-06-16T14:17:27.580Z"}
 {"cache_key":"73cc4f3f4488b18e47190ab6385266a126216db5f51f57cd15356582d5bd6973","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.open","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Open split view","text_hash":"51e50f7be73433216ae62f58fdbc586372f5a6063ee9978cec96793ef75fa554","tgt_lang":"vi","translated":"Mở chế độ xem chia đôi","updated_at":"2026-07-06T07:24:19.509Z"}
 {"cache_key":"7489da649d88812f0cb8d046c9ba88655edbcddce508e0a8c695b771df4da8bb","model":"claude-opus-4-8","provider":"anthropic","segment_id":"skillWorkshop.header.useCurrentChatAria","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Use current chat for revision requests","text_hash":"9c551a423ae74aedaaa90e4df9899dbdc02f846d6ee058bf2576a812e2c52119","tgt_lang":"vi","translated":"Dùng cuộc trò chuyện hiện tại cho yêu cầu chỉnh sửa","updated_at":"2026-06-16T14:17:10.180Z"}
 {"cache_key":"74ed2dff5f91e2e915cf0aa816b80cd8ffe70ce8f90db90a218e30e2385116ce","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkAdvancedSettingsRequiresAdmin","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Advanced settings require admin","text_hash":"021f44198c7c7935a112e55150d2daaebe388ac9e529460d64c2f8f3ba3b9d82","tgt_lang":"vi","translated":"Cài đặt nâng cao yêu cầu quyền quản trị viên","updated_at":"2026-07-06T20:20:02.809Z"}
+{"cache_key":"7591901517ce8889e25ad2b69411b8145d3dbbb654ef5eb850408bb50c4dfabc","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"vi","translated":"Mở trong Thanh bên","updated_at":"2026-07-09T11:03:10.148Z"}
 {"cache_key":"75c917107a825f09925f41de47e9ddc7478b64978b2b98ad8772dd63cbee5a2e","model":"gpt-5","provider":"openai","segment_id":"codexSessions.threadId","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Thread","text_hash":"5373c7f8a5a69019e959540ef127be3302afdd5e2313244e6d08cbd5e975d06d","tgt_lang":"vi","translated":"Mã luồng","updated_at":"2026-07-09T10:01:43.734Z"}
 {"cache_key":"761cd159fca651bd58f97de7fc19cf26793e2a54cd4511c9d35d328eaf76f0d5","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.archivedOnly","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Archived only","text_hash":"da7ebd8c482f38dc2a5b693a0ec25aaa04ea7b5fa3713cce9fa41a28f2201a6b","tgt_lang":"vi","translated":"Chỉ đã lưu trữ","updated_at":"2026-07-02T14:31:04.850Z"}
 {"cache_key":"769364f96de69375a4d3a4165b813900e469996e05af6a60bb526cbaf6ef0b46","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneInput","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Microphone input","text_hash":"5c8a6025b9d96fb0c090d33c9def15ee64aa520a83cf5d64c784b4f0699bb15e","tgt_lang":"vi","translated":"Đầu vào micrô","updated_at":"2026-07-06T17:34:03.620Z"}
@@ -190,6 +192,7 @@
 {"cache_key":"a2267d51f216d01cc50ecbf6f4f0b7019a8f9ed8ae7d216bf539e0f6b69bad82","model":"gpt-5.5","provider":"openai","segment_id":"usage.providerUsage.lastDays","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"{count} days","text_hash":"e9f0a85930cc6fa61b7ac01763893020adc4c712d1b8e8897bdd13971637d529","tgt_lang":"vi","translated":"{count} ngày","updated_at":"2026-07-06T06:40:15.357Z"}
 {"cache_key":"a2e66bda8ec4f861eb59d58900062c0ecaf16afd1235510078bb2d8457675bf0","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkDefault","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Default","text_hash":"21b111cbfe6e8fca2d181c43f53ad548b22e38aca955b9824706a504b0a07a2d","tgt_lang":"vi","translated":"Mặc định","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"a2e852aad03ab7b43e82a8f92db62e6f93f9f21efd48810927df0e058dfb0c9f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.agentFilterUnassignedHelp","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Cards without an explicit agent.","text_hash":"f716a36252b33511df056fe7d1092be598eca17ea76bedc5d6d3532ec6b0ffea","tgt_lang":"vi","translated":"Thẻ không có agent rõ ràng.","updated_at":"2026-06-17T14:17:26.553Z"}
+{"cache_key":"a5ebce68f3ccdd8aa466d3786bf0e4bdd3799c21ca2613e2f8ef7f257f8e2fb5","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"vi","translated":"Sao chép liên kết","updated_at":"2026-07-09T11:03:10.148Z"}
 {"cache_key":"a61a6b2d9dbe373ed2f566c6b703dd186447b55d92d6fd68e8c645da17c147e9","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.sessionSelect","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Pane session","text_hash":"0deb0759c3643f2659c0838326276513c119e7923672a118c4ed13c012c4b628","tgt_lang":"vi","translated":"Phiên trong khung","updated_at":"2026-07-06T07:24:19.510Z"}
 {"cache_key":"aa6dc09201588e5c3cba2e7432557bc43f59f5e91470b9c746353b8036033ba0","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.open","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Open context usage details","text_hash":"8765adde14aebe600e7c9c69196c5b4a9ccc654802a94626d0391d9eaed725b1","tgt_lang":"vi","translated":"Mở chi tiết mức sử dụng ngữ cảnh","updated_at":"2026-07-05T10:16:30.856Z"}
 {"cache_key":"ac22026f6f1bba59f3db504381a8d2f5058e89102c12bb9eb8d582c919a3d215","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependencyStatusMissing","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Missing","text_hash":"6be36ca49ee85210c5d1ad9c377d90a9859c66d889110a2a5b0dccd390d12e20","tgt_lang":"vi","translated":"Thiếu","updated_at":"2026-06-16T14:17:17.661Z"}
@@ -243,6 +246,7 @@
 {"cache_key":"d05a189c3cb6ffdc2798ba19a42f9f293105421fdf0c78a0a5762c36c5f635c1","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewReview","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Review","text_hash":"aff0766a5290e117b8433c351bae7b7b23bed682b2369bd822d88a647cc58512","tgt_lang":"vi","translated":"Đánh giá","updated_at":"2026-06-17T14:17:26.553Z"}
 {"cache_key":"d08548c9dd040f73eaeacf9dbc3649f923d300846d5b0238a60c2ea81334b99f","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupByAgent","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Agent","text_hash":"11b39c93777e8f1f3983bdba7c72b22fe68cfea20c677e9de53e17cb7dbfb19f","tgt_lang":"vi","translated":"Tác nhân","updated_at":"2026-07-05T14:40:16.834Z"}
 {"cache_key":"d0eb91eaa9a0c9a584fe3c52c65e048d2446fff8698610e2af99a42212dce0a5","model":"gpt-5","provider":"openai","segment_id":"codexSessions.scope.archived","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Archived","text_hash":"bdb86505f8062d15f152cef71dd4ca89609d5bf8e98771dcd2c9f70d247403da","tgt_lang":"vi","translated":"Đã lưu trữ","updated_at":"2026-07-09T10:01:43.734Z"}
+{"cache_key":"d26bd0c3c1d4ee9a5c838bfe3e3f22257a9d24618e2139ea59c0e5984eb28d5f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"vi","translated":"Mở trong Trình duyệt mặc định","updated_at":"2026-07-09T11:03:10.148Z"}
 {"cache_key":"d289a26a1d2313192a4a4f93d8af6b453ef602aef8b1302de6799434ac6921c8","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailOperatorNotes","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Operator notes","text_hash":"7d2a121620cebfb9c4f6c0f82b693b75d65a4210b8232d77ef87e45fce334347","tgt_lang":"vi","translated":"Ghi chú của người vận hành","updated_at":"2026-06-16T14:17:10.180Z"}
 {"cache_key":"d2e8b8a486a9514cdd710f8225a576bd62d77f84f49e4df23358c917bd81d858","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.healthStale","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"stale","text_hash":"a03f2386ae06b21109577020844df367857b72c2fcce384c1896fed98a89c82b","tgt_lang":"vi","translated":"cũ","updated_at":"2026-06-17T14:17:32.599Z"}
 {"cache_key":"d3d7e253ec33863445a32304f4fc90de010551042292e25e9ceccdef70a701c2","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.searchResults","source_path":"ui/src/i18n/locales/vi.ts","src_lang":"en","text":"Search results","text_hash":"e978b00de465a271a13bf2f6b9d74d67fdfaa7d973a37378fa32f988c3280599","tgt_lang":"vi","translated":"Kết quả tìm kiếm","updated_at":"2026-06-16T14:17:25.260Z"}
diff --git a/ui/src/i18n/.i18n/zh-CN.meta.json b/ui/src/i18n/.i18n/zh-CN.meta.json
index 06ca94bf172..861c28f5b4c 100644
--- a/ui/src/i18n/.i18n/zh-CN.meta.json
+++ b/ui/src/i18n/.i18n/zh-CN.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:57.920Z",
+  "generatedAt": "2026-07-09T11:53:03.816Z",
   "locale": "zh-CN",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/zh-CN.tm.jsonl b/ui/src/i18n/.i18n/zh-CN.tm.jsonl
index 3f28bc41d2d..d7493fb4a97 100644
--- a/ui/src/i18n/.i18n/zh-CN.tm.jsonl
+++ b/ui/src/i18n/.i18n/zh-CN.tm.jsonl
@@ -3,6 +3,7 @@
 {"cache_key":"027d9f79927731d6c1fcde09e98adff20cfbae77f05775a849cb79cdbe7982d2","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.pinSession","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Pin session","text_hash":"813273b54d2df112a0fa1903110e9386779f8848ae288142d3f91d7a5891c8ff","tgt_lang":"zh-CN","translated":"置顶会话","updated_at":"2026-07-02T14:29:55.120Z"}
 {"cache_key":"04cb02b359b4b245dd2dc3e8e0a782fd170066c7caeabbe2a6cda230e191c765","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependenciesReadyTitle","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"{count} dependencies are done.","text_hash":"559fe92cd5fe39b4f511a146fc7ce6b51e7f528e1d388bbfde1d85dddb60604d","tgt_lang":"zh-CN","translated":"{count} 个依赖项已完成。","updated_at":"2026-06-16T14:13:02.064Z"}
 {"cache_key":"04db3c2ac09c3d41fc3d5dde848ce0528bf14a495802eb9d14c30f72f71d6e5b","model":"gpt-5","provider":"openai","segment_id":"codexSessions.scopeLabel","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Session archive filter","text_hash":"9b7ab0c41b678c43f34c5e4d5b27428141588466c5d14b68bd19bcc93d7b6c38","tgt_lang":"zh-CN","translated":"会话归档筛选","updated_at":"2026-07-09T10:01:43.701Z"}
+{"cache_key":"06550ec898b301f33668478edc4afb84dd0cee63506c9f0ffbd51c99d8f0f897","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"zh-CN","translated":"复制链接","updated_at":"2026-07-09T11:02:24.168Z"}
 {"cache_key":"07c8e0a8adea694a6bc2f3fcaf4643c3c4ccd23339402526f73a4c57a8e63793","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewAll","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"All cards","text_hash":"2306120917506b5998ec702f3661068b102dac538ba4c9e4634d65fe33eea98a","tgt_lang":"zh-CN","translated":"全部卡片","updated_at":"2026-06-17T14:13:12.872Z"}
 {"cache_key":"089266810099fc107c4aeb2ea83e26fe29e3009237e62cda5043c5fc1d727d10","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.workspace","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Session","text_hash":"6959b4159575d8dd76d9f3bbe2c6437904f861e7860c35abd18deffb1c3425a0","tgt_lang":"zh-CN","translated":"会话","updated_at":"2026-06-16T14:13:02.064Z"}
 {"cache_key":"09c30fd3ce83a679533c5bf00b1b2b7a05c19633a4013fd8fd212900a05d5efa","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.repo","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Repository","text_hash":"13d6ff07b8a5d792ec87d5ec83bff2730ee77fa8f4fcd89ca5f1d688f64b4c73","tgt_lang":"zh-CN","translated":"代码库","updated_at":"2026-07-05T21:00:21.876Z"}
@@ -246,7 +247,9 @@
 {"cache_key":"e65b0fbd24ba3241afa211e53f284c5a8446d414fc4d89ea39b97da5825b146c","model":"gpt-5.5","provider":"openai","segment_id":"chat.sidebar.sortSessions","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Sort sessions","text_hash":"6680f07d3df817d60180acbbc6e207689d28caaa27ac23749f93261b8111a38d","tgt_lang":"zh-CN","translated":"排序会话","updated_at":"2026-07-06T15:07:02.499Z"}
 {"cache_key":"e6a98ac4a522259f3561cc7cce39221a255937a191e9a7f171b56e4eaa1c9de5","model":"gpt-5.5","provider":"openai","segment_id":"chat.splitView.dropOpenHere","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Open here","text_hash":"b08e2fd2e872adcb575b305187b9db8482369325806953ce80190fc2dc1ab9fb","tgt_lang":"zh-CN","translated":"在此处打开","updated_at":"2026-07-06T22:56:12.834Z"}
 {"cache_key":"e74cbaca3fb022ecddce09a4ec183689d52341d5aafa49cf9974fd4b3fe480ae","model":"gpt-5.5","provider":"openai","segment_id":"worktrees.branch","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Branch","text_hash":"52656e8104eef3fddd3d4546903fa0de93c0625abf47b3dd8130f7705d6a513e","tgt_lang":"zh-CN","translated":"分支","updated_at":"2026-07-05T21:00:21.876Z"}
+{"cache_key":"e81939c44ed4255c745eea1ed7b8828ee516f2a1797a92f33f42d033bed68505","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"zh-CN","translated":"在默认浏览器中打开","updated_at":"2026-07-09T11:02:24.168Z"}
 {"cache_key":"e8ba2231314380ef7d455617f316fe194b075dd3ed626c1ce41fa62c6ea0753f","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.copyPath","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Copy path","text_hash":"720ff4160412b943370afdb8fc1c082ff057d54713d5fb4b4b7a9634bfabf5fe","tgt_lang":"zh-CN","translated":"复制路径","updated_at":"2026-06-16T14:13:09.659Z"}
+{"cache_key":"e9bc25f088333e039c45a2fd1e94c3803b63bdd396f507c7068d00db24204011","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"zh-CN","translated":"链接操作","updated_at":"2026-07-09T11:02:24.168Z"}
 {"cache_key":"ea0881c4918136b6e80f0904ffd52deb6df20c9bc9d61d132703eda59d7604e9","model":"gpt-5","provider":"openai","segment_id":"codexSessions.status.systemError","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"System error","text_hash":"b9564eaf21a9356d06f7f3c67a5b9cb7e6538687c33bebbf1e1b64715018f310","tgt_lang":"zh-CN","translated":"系统错误","updated_at":"2026-07-09T10:01:43.701Z"}
 {"cache_key":"eac61937cea7a2fe57800d170b6ab7197de171e9e8ee3d6183cdf0e46a9b3b32","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.read","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Read","text_hash":"9b9a8d05a7ec353bda84f9c1bb3178c299de3001b5e970508ddc889c487f92ca","tgt_lang":"zh-CN","translated":"已读取","updated_at":"2026-06-16T14:13:07.632Z"}
 {"cache_key":"ed08a02a402e8e1f570a992bde8bd293686695c31f2fc5e809e04c83c752a74f","model":"gpt-5.5","provider":"openai","segment_id":"terminal.detached","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"detached","text_hash":"88e34e4cdbb5c6066cb1b0d0abe74714bd72f86259433bc8287614e4ae052605","tgt_lang":"zh-CN","translated":"已分离","updated_at":"2026-07-04T21:23:46.285Z"}
@@ -259,6 +262,7 @@
 {"cache_key":"f25fc84e3c6221a3ae051ed96508d750003607ea5fb1988315024cd6f6ea48dc","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.changed","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Changed","text_hash":"2a6141e43be0c2125e3b5d9f74b4ff1261a0b320ff927c83d4d9b1b65585bad7","tgt_lang":"zh-CN","translated":"已更改","updated_at":"2026-06-16T14:13:07.632Z"}
 {"cache_key":"f318c1548973587a0e98abf82aebb70929aa11141206f346b9dd5bfe7b6453fa","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.dateNoActivity","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"No activity","text_hash":"0cf9505f9f97c8359cc143ba3e88bedaba3a4ae92c2794ffd1b097270732ed18","tgt_lang":"zh-CN","translated":"无活动","updated_at":"2026-07-05T14:39:29.129Z"}
 {"cache_key":"f3b89fd1435a423eef3ebc5293a4144439c54b739f78094c5e600e53eaba8433","model":"gpt-5.5","provider":"openai","segment_id":"workboard.badgeAttachments","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"{count} attachments","text_hash":"7bb1847693bc91e6e4624d996a96840396a71052786ab143ccb47fbdaa77cf41","tgt_lang":"zh-CN","translated":"{count} 个附件","updated_at":"2026-05-30T15:38:03.150Z"}
+{"cache_key":"f3e2350de6e160675bcc9622aabeb49160e5631a1357a328449248740b05b11a","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"zh-CN","translated":"在边栏中打开","updated_at":"2026-07-09T11:02:24.168Z"}
 {"cache_key":"f546087198af9c84715102ff9387620795f6b9ee46f90889cf2f7f325ed80b72","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.groupMenu","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Group options for {group}","text_hash":"29456bfd0f10cfa1b3b0c005e2202221ff66aafe6b72ee05f7cfc93ce9e79af7","tgt_lang":"zh-CN","translated":"{group} 的分组选项","updated_at":"2026-07-06T23:40:42.206Z"}
 {"cache_key":"f55792d9125c9ab212c8517108777fcc318232651d166537b2c23c9dbe99338d","model":"gpt-5.5","provider":"openai","segment_id":"workboard.dispatch","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Nudge dispatcher","text_hash":"c3d20147447cc75f5e1e8cc895af0bc287a4a720372aec4795c5dfbfa9eeda67","tgt_lang":"zh-CN","translated":"提醒调度器","updated_at":"2026-05-30T15:38:03.149Z"}
 {"cache_key":"f62f4b4d9b2bf1fd1ba005cead9446cc7d53503516f349f7454892a7dd76634e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.parentFolder","source_path":"ui/src/i18n/locales/zh-CN.ts","src_lang":"en","text":"Parent folder","text_hash":"158f5a01ef8cfb1e6d91f8c321dd3a63f5e457f9650eecd662857701762bd31d","tgt_lang":"zh-CN","translated":"上级文件夹","updated_at":"2026-06-16T14:13:07.632Z"}
diff --git a/ui/src/i18n/.i18n/zh-TW.meta.json b/ui/src/i18n/.i18n/zh-TW.meta.json
index 8390005037b..fb7017f549a 100644
--- a/ui/src/i18n/.i18n/zh-TW.meta.json
+++ b/ui/src/i18n/.i18n/zh-TW.meta.json
@@ -1,11 +1,11 @@
 {
   "fallbackKeys": [],
-  "generatedAt": "2026-07-09T10:43:58.137Z",
+  "generatedAt": "2026-07-09T11:53:03.987Z",
   "locale": "zh-TW",
   "model": "gpt-5.5",
   "provider": "openai",
-  "sourceHash": "2b62550dfba3bb11dd6858d0bfe4e8e814f14d3d201c3282e8ceb900466abd6c",
-  "totalKeys": 1721,
-  "translatedKeys": 1721,
+  "sourceHash": "cb44516d9415dddd66b50bf4320c01915a3cd1cb4e0bd533609653f234b2fded",
+  "totalKeys": 1725,
+  "translatedKeys": 1725,
   "workflow": 1
 }
diff --git a/ui/src/i18n/.i18n/zh-TW.tm.jsonl b/ui/src/i18n/.i18n/zh-TW.tm.jsonl
index 6ccadb21f56..9d2738b60b1 100644
--- a/ui/src/i18n/.i18n/zh-TW.tm.jsonl
+++ b/ui/src/i18n/.i18n/zh-TW.tm.jsonl
@@ -1,5 +1,6 @@
 {"cache_key":"0058dd63eb3fb24da56f4bdc46818c272c7219177e42c8da79de612edbc78e2d","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.expand","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Expand session workspace","text_hash":"ac1d210db40c5026879774849ad74a9e1247523192a795ac33965b3ee72691c2","tgt_lang":"zh-TW","translated":"展開工作階段工作區","updated_at":"2026-06-16T14:13:10.175Z"}
 {"cache_key":"012977636af17cc98fbb838f759468a7702dfb011da0f37e3a27fb6e1294a291","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.noMicrophones","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"No additional microphones found","text_hash":"a6e4a20dda44dead8daa06da30fca7e7d90fa5aa4c15cbada30af1f52874d347","tgt_lang":"zh-TW","translated":"找不到其他麥克風","updated_at":"2026-07-06T17:33:33.517Z"}
+{"cache_key":"03bfdb648f4b090f353e419b4e66ec6939f140af7d3e0c560b2b5b00cb43879f","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openExternal","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Open in Default Browser","text_hash":"fc4fd2b1f38c03d1a8bffe8ad5baf4d19e414bc2f0b8c319b3990d513de2aa05","tgt_lang":"zh-TW","translated":"在預設瀏覽器中開啟","updated_at":"2026-07-09T11:02:38.494Z"}
 {"cache_key":"04fc76d25faad9f51b570fb4f1f7306b7ff547836da07e12a23bfc61b65b2b33","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.root","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Root","text_hash":"44cb005ee2e65d9cc817b0a083579369fb6c24a4be728cb43fd9d4c3ca7f4c2e","tgt_lang":"zh-TW","translated":"根目錄","updated_at":"2026-06-16T14:13:16.738Z"}
 {"cache_key":"04fddb9a7a47d22563be18e53f515c705f50c0c584d97a7e6e0db25d4d4f62a3","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkVoice","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Voice","text_hash":"87bf2bc08589f0bd4a078db145c34ad5e14b8fda53c3ae65b78601294913df95","tgt_lang":"zh-TW","translated":"語音","updated_at":"2026-07-06T20:20:02.809Z"}
 {"cache_key":"055a682eaf869d24f02cb651f6c57b56a60eec647fe40f6fb3ad55b458a8e39a","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.loading","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Loading tasks…","text_hash":"9ae9f7d835d95a2cf1362c130da3a0ebacae4331dbb431e60e1735477591bf7b","tgt_lang":"zh-TW","translated":"正在載入任務…","updated_at":"2026-07-06T08:41:46.878Z"}
@@ -69,6 +70,7 @@
 {"cache_key":"39bb76742f8d0a5f7646ad59caaec4ce1d3c1786c38fa5bb1e47f086f77de188","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.workspaceFiles.copyPath","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Copy path","text_hash":"720ff4160412b943370afdb8fc1c082ff057d54713d5fb4b4b7a9634bfabf5fe","tgt_lang":"zh-TW","translated":"複製路徑","updated_at":"2026-06-16T14:13:18.599Z"}
 {"cache_key":"3a12fb18b9756570ff22152940da62a3f15e237246a783b872d5255be34a6f85","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.openSession","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Open session","text_hash":"b205bb47f81a30968789eac28cefb848c4b849245d4d12f9311557c5f56ce770","tgt_lang":"zh-TW","translated":"開啟工作階段","updated_at":"2026-07-06T08:41:46.878Z"}
 {"cache_key":"3bd00b55cdb2ad5aad20be9a9398d7294767493f0b82a641d6f0c865a9f4d6d5","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.viewPreset","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Workboard view","text_hash":"cc2b05179ad742029156bb45578e880c46599fd28e1c2ab66f5a6f9e7f8fa08e","tgt_lang":"zh-TW","translated":"工作看板檢視","updated_at":"2026-06-17T14:13:17.815Z"}
+{"cache_key":"3c8876ee1b28223bbfa9d8f00b634a4d6d40bf0157a1d1af84df67d225a437e9","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.label","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Link actions","text_hash":"bffef58c5284b351b41a353b723845cca19cf29bf817f7b74c2e77e74d282a20","tgt_lang":"zh-TW","translated":"連結動作","updated_at":"2026-07-09T11:02:38.494Z"}
 {"cache_key":"3d15ac3f052fbff7d1c77ce6984f27550f2d6f9930e8309562031cd638b60d3f","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.microphoneNoneFound","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"No microphone inputs were found.","text_hash":"3aa0952aa2a5987227a12656a28131c7e153b5efe3fca4043c742fb289eeb37c","tgt_lang":"zh-TW","translated":"找不到麥克風輸入。","updated_at":"2026-07-06T17:56:07.837Z"}
 {"cache_key":"3d7411fc0b32025b16c7ee937d9e11495fabf99314b355c35410f7380b7b09db","model":"gpt-5","provider":"openai","segment_id":"codexSessions.summaryLabel","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Codex session summary","text_hash":"667dedf7bd0ebc80d4e312cc52f824e6a5307c1c6210f2e72e5b93da824da502","tgt_lang":"zh-TW","translated":"Codex 工作階段摘要","updated_at":"2026-07-09T10:01:43.713Z"}
 {"cache_key":"3da9d91aff622941e54302adeab34cbd23a245a81ece197573272b19b58e161c","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkModelAuto","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Auto","text_hash":"0286249762f7c94349cdc0ba3bb2255baf9a80036e2193ead1d77696f888582f","tgt_lang":"zh-TW","translated":"自動","updated_at":"2026-07-06T20:20:02.809Z"}
@@ -169,6 +171,7 @@
 {"cache_key":"9453b56e509d26313c25cf74cec0e9bcbbbc9c0163f9e933e9eb0d382d81530e","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.dependencies","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Dependencies","text_hash":"2e41b118eb209c139f2bcbf690486f6e1509ab978aa96feb053877a70a1a5a09","tgt_lang":"zh-TW","translated":"相依項目","updated_at":"2026-06-16T14:13:10.175Z"}
 {"cache_key":"949d22edb0aec22c16ffdc84039184e55b037559a9d316c9f8a33ec3e71b105b","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.autoRefresh30s","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"30s","text_hash":"d3382a4f0e03f8b14cf99424376886c236f1503d4b332137667484fc96d58fc4","tgt_lang":"zh-TW","translated":"30秒","updated_at":"2026-06-17T14:13:23.259Z"}
 {"cache_key":"95abc5d183d59c72e7ea7d36560c44180828aa85866bd9602e9600e6e4f6fdde","model":"gpt-5.5","provider":"openai","segment_id":"chat.runControls.newSessionWorktree","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"New chat in worktree","text_hash":"4ce7f69c42b6b0fc700718d8e69101c9f04953b7be65044dc6d40f3975cd3cee","tgt_lang":"zh-TW","translated":"在 worktree 中新增聊天","updated_at":"2026-07-06T04:55:46.191Z"}
+{"cache_key":"96ad0f185af324a32149f91259382d31650fd814bc371788227dfd0f0ad80a38","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.openInline","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Open in Sidebar","text_hash":"ee39dc2999ce3acefff3c4c5440266e6a044feb3fb0a405a754f3ee4f697b201","tgt_lang":"zh-TW","translated":"在側邊欄開啟","updated_at":"2026-07-09T11:02:38.494Z"}
 {"cache_key":"96c905bd13add9b967968ffb872acaa82316a2ebe6d958a6c606ba67f7c87d83","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.archivedOnlyTooltip","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Show only archived sessions.","text_hash":"de4c6803e169c7f2d3116da6fa5b95417d952edf88f69b0b279d5d17e9e34e87","tgt_lang":"zh-TW","translated":"僅顯示已封存的工作階段。","updated_at":"2026-07-02T14:29:59.019Z"}
 {"cache_key":"971f9cdf8108eb62348e40417fd50f4b6e10b9a0d2090ca408506693b0f6a66e","model":"gpt-5.5","provider":"openai","segment_id":"sessionsView.renameSession","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Rename session","text_hash":"2cad0766accc2d3f70f007068524cea983e0d53f54543e9e82a4e73b2a07987f","tgt_lang":"zh-TW","translated":"重新命名工作階段","updated_at":"2026-07-02T14:29:59.020Z"}
 {"cache_key":"97d8d4ba305f4779d5497b6f599003a9b8d6b4fe38f3330f146043bcefc5e8fb","model":"claude-opus-4-8","provider":"anthropic","segment_id":"chat.composer.talkSensitivityHigh","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"High","text_hash":"c4ebc6d4a5832cd9415f906ad03661110c705a72381c8b8b145761d02e2dd23a","tgt_lang":"zh-TW","translated":"高","updated_at":"2026-07-06T20:20:02.809Z"}
@@ -186,6 +189,7 @@
 {"cache_key":"9fef17754bf65f1dc47ebe02a1b4ed804fcdfa45de89d9ee7e2b645cc5c7e586","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.badgeHeartbeat","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"heartbeat {age}","text_hash":"000637b3800ae069edbbe207cfad0a3f5037f06e9661ee89d70a1dfe6f404485","tgt_lang":"zh-TW","translated":"心跳 {age}","updated_at":"2026-06-17T14:13:23.259Z"}
 {"cache_key":"a111f4b4990f470fab42a780c89cd24f606ed4b24326e7f406dd7104845173a8","model":"claude-opus-4-8","provider":"anthropic","segment_id":"workboard.detailAutomation","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Automation","text_hash":"d909750b1bbb71a39b6330ba8f81f4f8f6e889ed96d7ab366e74857909750c64","tgt_lang":"zh-TW","translated":"自動化","updated_at":"2026-06-16T14:12:59.400Z"}
 {"cache_key":"a51869c24096afe415b4608bcdb55b4908d163564f906e9a298c74d3de3cec45","model":"gpt-5.5","provider":"openai","segment_id":"tabs.tasks","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Tasks","text_hash":"b3a60e61a5233d0506ac737405a2a45280349683cac68722f18d0b73eb495ef4","tgt_lang":"zh-TW","translated":"任務","updated_at":"2026-07-06T08:41:46.878Z"}
+{"cache_key":"a61bd515e99db9340d14bb547b496ef99da2c517ec872dfbb6fec0a3d01f93df","model":"gpt-5.5","provider":"openai","segment_id":"nativeLinkMenu.copy","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Copy Link","text_hash":"724e78a3254c899d16ef6324a7abc9a8f5240ffce8bff74976df397c68ce9d78","tgt_lang":"zh-TW","translated":"複製連結","updated_at":"2026-07-09T11:02:38.494Z"}
 {"cache_key":"a70fe70333817727bf583e057b19b3426ee1950056aeb0e5bf410132ea48a5a3","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.taskCountOne","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"1 task","text_hash":"cba293c13f302204af2ae5b202d80ea840fdf1cf7904d59e1a62efbadf1e5256","tgt_lang":"zh-TW","translated":"1 個任務","updated_at":"2026-07-06T08:41:46.878Z"}
 {"cache_key":"a82f5cd6a688c601e757b2a30520941a0c2c8f173a224ed6ab3ee881f2a2e3db","model":"gpt-5.5","provider":"openai","segment_id":"chat.composer.contextUsage.latestRunTokens","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Latest run tokens","text_hash":"969b6403862b70df744bc747c801663034a7837cd04b55973b7ee6c051e2e5ca","tgt_lang":"zh-TW","translated":"最新執行權杖","updated_at":"2026-07-05T10:15:56.105Z"}
 {"cache_key":"a8f31af41e19ba668eb7707a51e9b607c155a60ff6b5a153057762771d8e2f60","model":"gpt-5.5","provider":"openai","segment_id":"tasksPage.cancelling","source_path":"ui/src/i18n/locales/zh-TW.ts","src_lang":"en","text":"Cancelling…","text_hash":"91b104db05da1b2d48c57a5aa60128f660e6572f89835ec858f6eb25b8f4af0f","tgt_lang":"zh-TW","translated":"正在取消…","updated_at":"2026-07-06T08:41:46.878Z"}
diff --git a/ui/src/i18n/lib/lit-controller.test.ts b/ui/src/i18n/lib/lit-controller.test.ts
new file mode 100644
index 00000000000..0cafa30b6de
--- /dev/null
+++ b/ui/src/i18n/lib/lit-controller.test.ts
@@ -0,0 +1,82 @@
+// @vitest-environment node
+import type { ReactiveController, ReactiveControllerHost } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { I18nController } from "./lit-controller.ts";
+import { i18n } from "./translate.ts";
+
+class TestHost implements ReactiveControllerHost {
+  readonly controllers: ReactiveController[] = [];
+  readonly requestUpdate = vi.fn();
+  readonly updateComplete = Promise.resolve(true);
+
+  addController(controller: ReactiveController): void {
+    this.controllers.push(controller);
+  }
+
+  removeController(controller: ReactiveController): void {
+    const index = this.controllers.indexOf(controller);
+    if (index !== -1) {
+      this.controllers.splice(index, 1);
+    }
+  }
+
+  connect(): void {
+    for (const controller of this.controllers) {
+      controller.hostConnected?.();
+    }
+  }
+
+  disconnect(): void {
+    for (const controller of this.controllers) {
+      controller.hostDisconnected?.();
+    }
+  }
+}
+
+describe("I18nController", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it("replaces stale subscriptions and cleans up idempotently", () => {
+    const firstCleanup = vi.fn();
+    const secondCleanup = vi.fn();
+    const subscribe = vi
+      .spyOn(i18n, "subscribe")
+      .mockReturnValueOnce(firstCleanup)
+      .mockReturnValueOnce(secondCleanup);
+    const host = new TestHost();
+    const controller = new I18nController(host);
+    expect(host.controllers).toContain(controller);
+
+    host.connect();
+    host.connect();
+    expect(subscribe).toHaveBeenCalledTimes(2);
+    expect(firstCleanup).toHaveBeenCalledOnce();
+
+    host.disconnect();
+    host.disconnect();
+    expect(secondCleanup).toHaveBeenCalledOnce();
+  });
+
+  it("requests updates on connect and locale notifications", () => {
+    const cleanup = vi.fn();
+    let notify: (() => void) | undefined;
+    vi.spyOn(i18n, "subscribe").mockImplementation((subscriber) => {
+      notify = () => subscriber("en");
+      return cleanup;
+    });
+    const host = new TestHost();
+    const controller = new I18nController(host);
+    expect(host.controllers).toContain(controller);
+
+    host.connect();
+    expect(host.requestUpdate).toHaveBeenCalledOnce();
+
+    notify?.();
+    expect(host.requestUpdate).toHaveBeenCalledTimes(2);
+
+    host.disconnect();
+    expect(cleanup).toHaveBeenCalledOnce();
+  });
+});
diff --git a/ui/src/i18n/lib/lit-controller.ts b/ui/src/i18n/lib/lit-controller.ts
index dfe7646a1e5..bb60c629c6d 100644
--- a/ui/src/i18n/lib/lit-controller.ts
+++ b/ui/src/i18n/lib/lit-controller.ts
@@ -12,12 +12,16 @@ export class I18nController implements ReactiveController {
   }
 
   hostConnected() {
+    this.unsubscribe?.();
     this.unsubscribe = i18n.subscribe(() => {
       this.host.requestUpdate();
     });
+    // The locale may have changed while the host was disconnected.
+    this.host.requestUpdate();
   }
 
   hostDisconnected() {
     this.unsubscribe?.();
+    this.unsubscribe = undefined;
   }
 }
diff --git a/ui/src/i18n/locales/ar.ts b/ui/src/i18n/locales/ar.ts
index d33019905b5..d6d200c57b6 100644
--- a/ui/src/i18n/locales/ar.ts
+++ b/ui/src/i18n/locales/ar.ts
@@ -81,6 +81,12 @@ export const ar: TranslationMap = {
     waitForScan: "انتظار المسح",
     logout: "تسجيل الخروج",
   },
+  nativeLinkMenu: {
+    label: "إجراءات الرابط",
+    openInline: "فتح في الشريط الجانبي",
+    openExternal: "فتح في المتصفح الافتراضي",
+    copy: "نسخ الرابط",
+  },
   channels: {
     health: {
       title: "صحة القنوات",
diff --git a/ui/src/i18n/locales/de.ts b/ui/src/i18n/locales/de.ts
index 28b295eb681..0f0abf58173 100644
--- a/ui/src/i18n/locales/de.ts
+++ b/ui/src/i18n/locales/de.ts
@@ -81,6 +81,12 @@ export const de: TranslationMap = {
     waitForScan: "Auf Scan warten",
     logout: "Abmelden",
   },
+  nativeLinkMenu: {
+    label: "Link-Aktionen",
+    openInline: "In der Seitenleiste öffnen",
+    openExternal: "Im Standardbrowser öffnen",
+    copy: "Link kopieren",
+  },
   channels: {
     health: {
       title: "Channel-Zustand",
diff --git a/ui/src/i18n/locales/en.ts b/ui/src/i18n/locales/en.ts
index 900323af018..1931df3e72c 100644
--- a/ui/src/i18n/locales/en.ts
+++ b/ui/src/i18n/locales/en.ts
@@ -80,6 +80,12 @@ export const en: TranslationMap = {
     waitForScan: "Wait for scan",
     logout: "Logout",
   },
+  nativeLinkMenu: {
+    label: "Link actions",
+    openInline: "Open in Sidebar",
+    openExternal: "Open in Default Browser",
+    copy: "Copy Link",
+  },
   channels: {
     health: {
       title: "Channel health",
diff --git a/ui/src/i18n/locales/es.ts b/ui/src/i18n/locales/es.ts
index fe981893e4c..77aec986ea6 100644
--- a/ui/src/i18n/locales/es.ts
+++ b/ui/src/i18n/locales/es.ts
@@ -81,6 +81,12 @@ export const es: TranslationMap = {
     waitForScan: "Esperar escaneo",
     logout: "Cerrar sesión",
   },
+  nativeLinkMenu: {
+    label: "Acciones del enlace",
+    openInline: "Abrir en la barra lateral",
+    openExternal: "Abrir en el navegador predeterminado",
+    copy: "Copiar enlace",
+  },
   channels: {
     health: {
       title: "Estado del canal",
diff --git a/ui/src/i18n/locales/fa.ts b/ui/src/i18n/locales/fa.ts
index 9eeb6e40078..a6a669f44d0 100644
--- a/ui/src/i18n/locales/fa.ts
+++ b/ui/src/i18n/locales/fa.ts
@@ -81,6 +81,12 @@ export const fa: TranslationMap = {
     waitForScan: "انتظار برای اسکن",
     logout: "خروج",
   },
+  nativeLinkMenu: {
+    label: "اقدامات پیوند",
+    openInline: "باز کردن در نوار کناری",
+    openExternal: "باز کردن در مرورگر پیش‌فرض",
+    copy: "کپی کردن پیوند",
+  },
   channels: {
     health: {
       title: "سلامت کانال",
diff --git a/ui/src/i18n/locales/fr.ts b/ui/src/i18n/locales/fr.ts
index 393c84e4e02..2d89e198cdd 100644
--- a/ui/src/i18n/locales/fr.ts
+++ b/ui/src/i18n/locales/fr.ts
@@ -81,6 +81,12 @@ export const fr: TranslationMap = {
     waitForScan: "Attendre le scan",
     logout: "Se déconnecter",
   },
+  nativeLinkMenu: {
+    label: "Actions de lien",
+    openInline: "Ouvrir dans la barre latérale",
+    openExternal: "Ouvrir dans le navigateur par défaut",
+    copy: "Copier le lien",
+  },
   channels: {
     health: {
       title: "Santé du canal",
diff --git a/ui/src/i18n/locales/hi.ts b/ui/src/i18n/locales/hi.ts
index c5cc1c7c998..d0f99e93c46 100644
--- a/ui/src/i18n/locales/hi.ts
+++ b/ui/src/i18n/locales/hi.ts
@@ -81,6 +81,12 @@ export const hi: TranslationMap = {
     waitForScan: "स्कैन की प्रतीक्षा करें",
     logout: "लॉग आउट",
   },
+  nativeLinkMenu: {
+    label: "लिंक कार्रवाइयाँ",
+    openInline: "Sidebar में खोलें",
+    openExternal: "Default Browser में खोलें",
+    copy: "लिंक कॉपी करें",
+  },
   channels: {
     health: {
       title: "चैनल स्वास्थ्य",
diff --git a/ui/src/i18n/locales/id.ts b/ui/src/i18n/locales/id.ts
index f0412e17cdf..6c6be99326d 100644
--- a/ui/src/i18n/locales/id.ts
+++ b/ui/src/i18n/locales/id.ts
@@ -81,6 +81,12 @@ export const id: TranslationMap = {
     waitForScan: "Tunggu pemindaian",
     logout: "Keluar",
   },
+  nativeLinkMenu: {
+    label: "Tindakan tautan",
+    openInline: "Buka di Bilah Sisi",
+    openExternal: "Buka di Peramban Default",
+    copy: "Salin Tautan",
+  },
   channels: {
     health: {
       title: "Kesehatan saluran",
diff --git a/ui/src/i18n/locales/it.ts b/ui/src/i18n/locales/it.ts
index ff9fdf2760d..b083bcbe9a7 100644
--- a/ui/src/i18n/locales/it.ts
+++ b/ui/src/i18n/locales/it.ts
@@ -81,6 +81,12 @@ export const it: TranslationMap = {
     waitForScan: "Attendi la scansione",
     logout: "Esci",
   },
+  nativeLinkMenu: {
+    label: "Azioni del link",
+    openInline: "Apri nella barra laterale",
+    openExternal: "Apri nel browser predefinito",
+    copy: "Copia link",
+  },
   channels: {
     health: {
       title: "Integrità canali",
diff --git a/ui/src/i18n/locales/ja-JP.ts b/ui/src/i18n/locales/ja-JP.ts
index 5d7e6b5f4e7..adf9030e63a 100644
--- a/ui/src/i18n/locales/ja-JP.ts
+++ b/ui/src/i18n/locales/ja-JP.ts
@@ -81,6 +81,12 @@ export const ja_JP: TranslationMap = {
     waitForScan: "スキャンを待機",
     logout: "ログアウト",
   },
+  nativeLinkMenu: {
+    label: "リンクのアクション",
+    openInline: "サイドバーで開く",
+    openExternal: "デフォルトブラウザで開く",
+    copy: "リンクをコピー",
+  },
   channels: {
     health: {
       title: "チャネルの状態",
diff --git a/ui/src/i18n/locales/ko.ts b/ui/src/i18n/locales/ko.ts
index 265b87b9095..a37117b0eaf 100644
--- a/ui/src/i18n/locales/ko.ts
+++ b/ui/src/i18n/locales/ko.ts
@@ -81,6 +81,12 @@ export const ko: TranslationMap = {
     waitForScan: "스캔 대기",
     logout: "로그아웃",
   },
+  nativeLinkMenu: {
+    label: "링크 작업",
+    openInline: "사이드바에서 열기",
+    openExternal: "기본 브라우저에서 열기",
+    copy: "링크 복사",
+  },
   channels: {
     health: {
       title: "채널 상태",
diff --git a/ui/src/i18n/locales/nl.ts b/ui/src/i18n/locales/nl.ts
index 26be1abb8ae..2a5652208b5 100644
--- a/ui/src/i18n/locales/nl.ts
+++ b/ui/src/i18n/locales/nl.ts
@@ -81,6 +81,12 @@ export const nl: TranslationMap = {
     waitForScan: "Wachten op scan",
     logout: "Uitloggen",
   },
+  nativeLinkMenu: {
+    label: "Linkacties",
+    openInline: "Openen in zijbalk",
+    openExternal: "Openen in standaardbrowser",
+    copy: "Link kopiëren",
+  },
   channels: {
     health: {
       title: "Kanaalstatus",
diff --git a/ui/src/i18n/locales/pl.ts b/ui/src/i18n/locales/pl.ts
index 7e02d1787f9..a9997d9f44b 100644
--- a/ui/src/i18n/locales/pl.ts
+++ b/ui/src/i18n/locales/pl.ts
@@ -81,6 +81,12 @@ export const pl: TranslationMap = {
     waitForScan: "Czekaj na zeskanowanie",
     logout: "Wyloguj",
   },
+  nativeLinkMenu: {
+    label: "Działania linku",
+    openInline: "Otwórz na pasku bocznym",
+    openExternal: "Otwórz w domyślnej przeglądarce",
+    copy: "Kopiuj link",
+  },
   channels: {
     health: {
       title: "Stan kanału",
diff --git a/ui/src/i18n/locales/pt-BR.ts b/ui/src/i18n/locales/pt-BR.ts
index ee31dee3c21..662176a590d 100644
--- a/ui/src/i18n/locales/pt-BR.ts
+++ b/ui/src/i18n/locales/pt-BR.ts
@@ -81,6 +81,12 @@ export const pt_BR: TranslationMap = {
     waitForScan: "Aguardar leitura",
     logout: "Sair",
   },
+  nativeLinkMenu: {
+    label: "Ações de link",
+    openInline: "Abrir na barra lateral",
+    openExternal: "Abrir no navegador padrão",
+    copy: "Copiar link",
+  },
   channels: {
     health: {
       title: "Saúde do canal",
diff --git a/ui/src/i18n/locales/ru.ts b/ui/src/i18n/locales/ru.ts
index 6b0d6a1319a..b1755b272fb 100644
--- a/ui/src/i18n/locales/ru.ts
+++ b/ui/src/i18n/locales/ru.ts
@@ -81,6 +81,12 @@ export const ru: TranslationMap = {
     waitForScan: "Ожидание сканирования",
     logout: "Выйти",
   },
+  nativeLinkMenu: {
+    label: "Действия со ссылкой",
+    openInline: "Открыть в боковой панели",
+    openExternal: "Открыть в браузере по умолчанию",
+    copy: "Копировать ссылку",
+  },
   channels: {
     health: {
       title: "Состояние канала",
diff --git a/ui/src/i18n/locales/th.ts b/ui/src/i18n/locales/th.ts
index eae406b6831..f180f63415e 100644
--- a/ui/src/i18n/locales/th.ts
+++ b/ui/src/i18n/locales/th.ts
@@ -81,6 +81,12 @@ export const th: TranslationMap = {
     waitForScan: "รอการสแกน",
     logout: "ออกจากระบบ",
   },
+  nativeLinkMenu: {
+    label: "การดำเนินการลิงก์",
+    openInline: "เปิดในแถบด้านข้าง",
+    openExternal: "เปิดในเบราว์เซอร์เริ่มต้น",
+    copy: "คัดลอกลิงก์",
+  },
   channels: {
     health: {
       title: "สถานะช่องทาง",
diff --git a/ui/src/i18n/locales/tr.ts b/ui/src/i18n/locales/tr.ts
index eb922585437..e2de38c5a7c 100644
--- a/ui/src/i18n/locales/tr.ts
+++ b/ui/src/i18n/locales/tr.ts
@@ -81,6 +81,12 @@ export const tr: TranslationMap = {
     waitForScan: "Tarama için bekle",
     logout: "Çıkış yap",
   },
+  nativeLinkMenu: {
+    label: "Bağlantı eylemleri",
+    openInline: "Kenar Çubuğunda Aç",
+    openExternal: "Varsayılan Tarayıcıda Aç",
+    copy: "Bağlantıyı Kopyala",
+  },
   channels: {
     health: {
       title: "Kanal durumu",
diff --git a/ui/src/i18n/locales/uk.ts b/ui/src/i18n/locales/uk.ts
index 1a5ef362765..0ac77625466 100644
--- a/ui/src/i18n/locales/uk.ts
+++ b/ui/src/i18n/locales/uk.ts
@@ -81,6 +81,12 @@ export const uk: TranslationMap = {
     waitForScan: "Очікування сканування",
     logout: "Вийти",
   },
+  nativeLinkMenu: {
+    label: "Дії з посиланням",
+    openInline: "Відкрити на бічній панелі",
+    openExternal: "Відкрити у браузері за замовчуванням",
+    copy: "Копіювати посилання",
+  },
   channels: {
     health: {
       title: "Стан каналу",
diff --git a/ui/src/i18n/locales/vi.ts b/ui/src/i18n/locales/vi.ts
index 87148d0daf6..e9780552761 100644
--- a/ui/src/i18n/locales/vi.ts
+++ b/ui/src/i18n/locales/vi.ts
@@ -81,6 +81,12 @@ export const vi: TranslationMap = {
     waitForScan: "Chờ quét",
     logout: "Đăng xuất",
   },
+  nativeLinkMenu: {
+    label: "Hành động liên kết",
+    openInline: "Mở trong Thanh bên",
+    openExternal: "Mở trong Trình duyệt mặc định",
+    copy: "Sao chép liên kết",
+  },
   channels: {
     health: {
       title: "Tình trạng kênh",
diff --git a/ui/src/i18n/locales/zh-CN.ts b/ui/src/i18n/locales/zh-CN.ts
index ffd4e943e2e..917957ea59d 100644
--- a/ui/src/i18n/locales/zh-CN.ts
+++ b/ui/src/i18n/locales/zh-CN.ts
@@ -81,6 +81,12 @@ export const zh_CN: TranslationMap = {
     waitForScan: "等待扫描",
     logout: "退出登录",
   },
+  nativeLinkMenu: {
+    label: "链接操作",
+    openInline: "在边栏中打开",
+    openExternal: "在默认浏览器中打开",
+    copy: "复制链接",
+  },
   channels: {
     health: {
       title: "频道健康状态",
diff --git a/ui/src/i18n/locales/zh-TW.ts b/ui/src/i18n/locales/zh-TW.ts
index bf8663bcaf2..674e89aa284 100644
--- a/ui/src/i18n/locales/zh-TW.ts
+++ b/ui/src/i18n/locales/zh-TW.ts
@@ -81,6 +81,12 @@ export const zh_TW: TranslationMap = {
     waitForScan: "等待掃描",
     logout: "登出",
   },
+  nativeLinkMenu: {
+    label: "連結動作",
+    openInline: "在側邊欄開啟",
+    openExternal: "在預設瀏覽器中開啟",
+    copy: "複製連結",
+  },
   channels: {
     health: {
       title: "頻道健康狀態",
diff --git a/ui/src/lib/agents/identity.test.ts b/ui/src/lib/agents/identity.test.ts
new file mode 100644
index 00000000000..e3b9e4f4c9f
--- /dev/null
+++ b/ui/src/lib/agents/identity.test.ts
@@ -0,0 +1,52 @@
+import { expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { AgentIdentityResult } from "../../api/types.ts";
+import { createAgentIdentityCapability } from "./identity.ts";
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+it("rejects stale identities after reconnecting the same client", async () => {
+  const oldRequest = deferred<AgentIdentityResult>();
+  const currentRequest = deferred<AgentIdentityResult>();
+  const request = vi
+    .fn()
+    .mockImplementationOnce(() => oldRequest.promise)
+    .mockImplementationOnce(() => currentRequest.promise);
+  const client = { request } as unknown as GatewayBrowserClient;
+  let snapshot = { client, connected: true };
+  const listeners = new Set<(next: typeof snapshot) => void>();
+  const capability = createAgentIdentityCapability({
+    get snapshot() {
+      return snapshot;
+    },
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+  });
+  const publish = (connected: boolean) => {
+    snapshot = { client, connected };
+    for (const listener of listeners) {
+      listener(snapshot);
+    }
+  };
+
+  const stale = capability.ensure(["main"]);
+  publish(false);
+  publish(true);
+  const current = capability.ensure(["main"]);
+
+  oldRequest.resolve({ agentId: "main", name: "Stale" } as AgentIdentityResult);
+  await stale;
+  expect(capability.entries()).toEqual([]);
+
+  currentRequest.resolve({ agentId: "main", name: "Current" } as AgentIdentityResult);
+  await current;
+  expect(capability.get("main")?.name).toBe("Current");
+});
diff --git a/ui/src/lib/agents/identity.ts b/ui/src/lib/agents/identity.ts
index db03e0b62bf..4d671eda0e3 100644
--- a/ui/src/lib/agents/identity.ts
+++ b/ui/src/lib/agents/identity.ts
@@ -22,6 +22,8 @@ export function createAgentIdentityCapability(
   gateway: AgentIdentityGateway,
 ): AgentIdentityCapability {
   let cachedClient: GatewayBrowserClient | null = gateway.snapshot.client;
+  let cachedConnected = gateway.snapshot.connected;
+  let connectionGeneration = 0;
   const identities = new Map<string, AgentIdentityResult>();
   const inFlight = new Map<string, Promise<AgentIdentityResult | null>>();
   const listeners = new Set<() => void>();
@@ -32,12 +34,14 @@ export function createAgentIdentityCapability(
     }
   };
 
-  const resetForClient = (client: GatewayBrowserClient | null) => {
-    if (client === cachedClient) {
+  const resetForGateway = (snapshot: AgentIdentityGatewaySnapshot) => {
+    if (snapshot.client === cachedClient && snapshot.connected === cachedConnected) {
       return;
     }
     const hadIdentities = identities.size > 0;
-    cachedClient = client;
+    cachedClient = snapshot.client;
+    cachedConnected = snapshot.connected;
+    connectionGeneration += 1;
     identities.clear();
     inFlight.clear();
     if (hadIdentities) {
@@ -45,7 +49,7 @@ export function createAgentIdentityCapability(
     }
   };
 
-  gateway.subscribe((snapshot) => resetForClient(snapshot.client));
+  gateway.subscribe(resetForGateway);
 
   const normalizeIds = (agentIds: readonly (string | null | undefined)[]) => [
     ...new Set(
@@ -84,11 +88,13 @@ export function createAgentIdentityCapability(
       return [...identities.values()];
     },
     async ensure(agentIds) {
-      const client = gateway.snapshot.client;
-      if (!client || !gateway.snapshot.connected) {
+      const snapshot = gateway.snapshot;
+      resetForGateway(snapshot);
+      const client = snapshot.client;
+      if (!client || !snapshot.connected) {
         return;
       }
-      resetForClient(client);
+      const generation = connectionGeneration;
       const missing = normalizeIds(agentIds).filter((agentId) => !identities.has(agentId));
       if (missing.length === 0) {
         return;
@@ -96,7 +102,11 @@ export function createAgentIdentityCapability(
       const results = await Promise.all(
         missing.map(async (agentId) => [agentId, await fetchIdentity(client, agentId)] as const),
       );
-      if (gateway.snapshot.client !== client) {
+      if (
+        connectionGeneration !== generation ||
+        gateway.snapshot.client !== client ||
+        !gateway.snapshot.connected
+      ) {
         return;
       }
       let changed = false;
diff --git a/ui/src/lib/agents/index.test.ts b/ui/src/lib/agents/index.test.ts
index 04a23f0080d..94d4123c7af 100644
--- a/ui/src/lib/agents/index.test.ts
+++ b/ui/src/lib/agents/index.test.ts
@@ -1,10 +1,47 @@
 // Control UI tests cover agents behavior.
 import { describe, expect, it, vi } from "vitest";
-import { loadAgents, loadToolsCatalog, loadToolsEffective, setDefaultAgent } from "./index.ts";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import {
+  createAgentCapability,
+  loadAgents,
+  loadToolsCatalog,
+  loadToolsEffective,
+  setDefaultAgent,
+} from "./index.ts";
 import type { AgentsConfigCapability, AgentsState } from "./index.ts";
 
 type TestRequest = (method: string, payload?: unknown) => Promise<unknown>;
 
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function createGatewayHarness(client: GatewayBrowserClient) {
+  let snapshot = { client, connected: true };
+  const listeners = new Set<(next: typeof snapshot) => void>();
+  return {
+    gateway: {
+      get snapshot() {
+        return snapshot;
+      },
+      subscribe(listener: (next: typeof snapshot) => void) {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+      },
+    },
+    publish(connected: boolean) {
+      snapshot = { client, connected };
+      for (const listener of listeners) {
+        listener(snapshot);
+      }
+    },
+  };
+}
+
 function createState(): { state: AgentsState; request: ReturnType<typeof vi.fn<TestRequest>> } {
   const request = vi.fn<TestRequest>();
   const state: AgentsState = {
@@ -12,6 +49,7 @@ function createState(): { state: AgentsState; request: ReturnType<typeof vi.fn<T
       request,
     } as unknown as AgentsState["client"],
     connected: true,
+    requestGeneration: 0,
     agentsLoading: false,
     agentsError: null,
     agentsList: null,
@@ -141,6 +179,82 @@ describe("loadAgents", () => {
   });
 });
 
+describe("createAgentCapability lifecycle", () => {
+  it("starts a fresh list request after a same-client reconnect", async () => {
+    const first = deferred<unknown>();
+    const second = deferred<unknown>();
+    const request = vi
+      .fn<TestRequest>()
+      .mockReturnValueOnce(first.promise)
+      .mockReturnValueOnce(second.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const harness = createGatewayHarness(client);
+    const agents = createAgentCapability(harness.gateway);
+
+    const staleLoad = agents.refreshList();
+    harness.publish(false);
+    harness.publish(true);
+    const currentLoad = agents.refreshList();
+
+    first.resolve({ defaultId: "old", agents: [{ id: "old" }] });
+    await staleLoad;
+    expect(agents.state.agentsList).toBeNull();
+    expect(agents.state.agentsLoading).toBe(true);
+
+    const current = { defaultId: "main", agents: [{ id: "main" }] };
+    second.resolve(current);
+    await currentLoad;
+    expect(agents.state.agentsList).toEqual(current);
+    expect(agents.state.agentsLoading).toBe(false);
+    agents.dispose();
+  });
+
+  it("isolates file requests across a same-client reconnect", async () => {
+    const first = deferred<unknown>();
+    const second = deferred<unknown>();
+    const request = vi
+      .fn<TestRequest>()
+      .mockReturnValueOnce(first.promise)
+      .mockReturnValueOnce(second.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const harness = createGatewayHarness(client);
+    const agents = createAgentCapability(harness.gateway);
+
+    const staleLoad = agents.refreshFiles("main");
+    harness.publish(false);
+    harness.publish(true);
+    const currentLoad = agents.refreshFiles("main");
+
+    first.resolve({ agentId: "main", workspace: "old", files: [] });
+    await staleLoad;
+    expect(agents.files("main").list).toBeNull();
+    expect(agents.files("main").loading).toBe(true);
+
+    const current = { agentId: "main", workspace: "new", files: [] };
+    second.resolve(current);
+    await currentLoad;
+    expect(agents.files("main").list).toEqual(current);
+    expect(agents.files("main").loading).toBe(false);
+    agents.dispose();
+  });
+
+  it("does not commit a list request after disposal", async () => {
+    const pending = deferred<unknown>();
+    const request = vi.fn<TestRequest>().mockReturnValue(pending.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const harness = createGatewayHarness(client);
+    const agents = createAgentCapability(harness.gateway);
+
+    const load = agents.refreshList();
+    agents.dispose();
+    pending.resolve({ defaultId: "stale", agents: [{ id: "stale" }] });
+    await load;
+
+    expect(agents.state.agentsList).toBeNull();
+    expect(agents.state.agentsLoading).toBe(false);
+  });
+});
+
 describe("loadToolsCatalog", () => {
   it("loads catalog and stores result", async () => {
     const { state, request } = createState();
@@ -203,6 +317,39 @@ describe("loadToolsCatalog", () => {
     expect(state.toolsCatalogError).toBeNull();
     expect(state.toolsCatalogLoading).toBe(false);
   });
+
+  it("keeps a replacement-client catalog load isolated from the old request", async () => {
+    const { state, request: oldRequest } = createState();
+    let resolveOld!: (value: unknown) => void;
+    let resolveNext!: (value: unknown) => void;
+    oldRequest.mockReturnValue(
+      new Promise((resolve) => {
+        resolveOld = resolve;
+      }),
+    );
+    const nextRequest = vi.fn<TestRequest>().mockReturnValue(
+      new Promise((resolve) => {
+        resolveNext = resolve;
+      }),
+    );
+
+    const oldLoad = loadToolsCatalog(state, "main");
+    state.client = { request: nextRequest } as unknown as AgentsState["client"];
+    state.requestGeneration += 1;
+    state.toolsCatalogLoading = false;
+    state.toolsCatalogLoadingAgentId = null;
+    const nextLoad = loadToolsCatalog(state, "main");
+
+    resolveOld({ agentId: "main", profiles: [], groups: [{ id: "old" }] });
+    await oldLoad;
+    expect(state.toolsCatalogResult).toBeNull();
+    expect(state.toolsCatalogLoading).toBe(true);
+
+    resolveNext({ agentId: "main", profiles: [], groups: [{ id: "new" }] });
+    await nextLoad;
+    expect(state.toolsCatalogResult?.groups).toEqual([{ id: "new" }]);
+    expect(state.toolsCatalogLoading).toBe(false);
+  });
 });
 
 describe("loadToolsEffective", () => {
@@ -279,6 +426,39 @@ describe("loadToolsEffective", () => {
     expect(state.toolsEffectiveLoading).toBe(false);
   });
 
+  it("keeps a replacement-client effective-tools load isolated from the old request", async () => {
+    const { state, request: oldRequest } = createState();
+    let resolveOld!: (value: unknown) => void;
+    let resolveNext!: (value: unknown) => void;
+    oldRequest.mockReturnValue(
+      new Promise((resolve) => {
+        resolveOld = resolve;
+      }),
+    );
+    const nextRequest = vi.fn<TestRequest>().mockReturnValue(
+      new Promise((resolve) => {
+        resolveNext = resolve;
+      }),
+    );
+
+    const oldLoad = loadToolsEffective(state, { agentId: "main", sessionKey: "main" });
+    state.client = { request: nextRequest } as unknown as AgentsState["client"];
+    state.requestGeneration += 1;
+    state.toolsEffectiveLoading = false;
+    state.toolsEffectiveLoadingKey = null;
+    const nextLoad = loadToolsEffective(state, { agentId: "main", sessionKey: "main" });
+
+    resolveOld({ agentId: "main", profile: "old", groups: [] });
+    await oldLoad;
+    expect(state.toolsEffectiveResult).toBeNull();
+    expect(state.toolsEffectiveLoading).toBe(true);
+
+    resolveNext({ agentId: "main", profile: "new", groups: [] });
+    await nextLoad;
+    expect(state.toolsEffectiveResult?.profile).toBe("new");
+    expect(state.toolsEffectiveLoading).toBe(false);
+  });
+
   it("uses the catalog provider when the active session reports a stale provider", async () => {
     const { state, request } = createState();
     const sessionsResult = state.sessionsResult!;
diff --git a/ui/src/lib/agents/index.ts b/ui/src/lib/agents/index.ts
index cdf9f5bd2da..1a561aac5e9 100644
--- a/ui/src/lib/agents/index.ts
+++ b/ui/src/lib/agents/index.ts
@@ -24,6 +24,7 @@ export type AgentsPanel = "overview" | "files" | "tools" | "skills" | "channels"
 export type AgentsState = {
   client: GatewayBrowserClient | null;
   connected: boolean;
+  requestGeneration: number;
   agentsLoading: boolean;
   agentsError: string | null;
   agentsList: AgentsListResult | null;
@@ -111,19 +112,29 @@ function resolveToolsErrorMessage(
 }
 
 export async function loadAgents(state: AgentsState) {
-  if (!state.client || !state.connected || state.agentsLoading) {
+  const client = state.client;
+  if (!client || !state.connected || state.agentsLoading) {
     return;
   }
+  const generation = state.requestGeneration;
+  const isCurrent = () =>
+    state.client === client && state.connected && state.requestGeneration === generation;
   state.agentsLoading = true;
   state.agentsError = null;
   try {
-    const res = await loadAgentsList(state.client);
+    const res = await loadAgentsList(client);
+    if (!isCurrent()) {
+      return;
+    }
     state.agentsList = res;
     const selected = state.agentsSelectedId;
     if (!selected || !res.agents.some((entry) => entry.id === selected)) {
       state.agentsSelectedId = res.defaultId ?? res.agents[0]?.id ?? null;
     }
   } catch (err) {
+    if (!isCurrent()) {
+      return;
+    }
     if (isMissingOperatorReadScopeError(err)) {
       state.agentsList = null;
       state.agentsError = formatMissingOperatorReadScopeMessage("agent list");
@@ -131,21 +142,27 @@ export async function loadAgents(state: AgentsState) {
       state.agentsError = String(err);
     }
   } finally {
-    state.agentsLoading = false;
+    if (isCurrent()) {
+      state.agentsLoading = false;
+    }
   }
 }
 
 export async function loadToolsCatalog(state: AgentsState, agentId: string) {
   const resolvedAgentId = agentId.trim();
+  const client = state.client;
   if (
-    !state.client ||
+    !client ||
     !state.connected ||
     !resolvedAgentId ||
     (state.toolsCatalogLoading && state.toolsCatalogLoadingAgentId === resolvedAgentId)
   ) {
     return;
   }
+  const generation = state.requestGeneration;
   const shouldIgnoreResponse = () =>
+    state.client !== client ||
+    state.requestGeneration !== generation ||
     state.toolsCatalogLoadingAgentId !== resolvedAgentId ||
     hasSelectedAgentMismatch(state, resolvedAgentId);
   state.toolsCatalogLoading = true;
@@ -153,7 +170,7 @@ export async function loadToolsCatalog(state: AgentsState, agentId: string) {
   state.toolsCatalogError = null;
   state.toolsCatalogResult = null;
   try {
-    const res = await state.client.request<ToolsCatalogResult>("tools.catalog", {
+    const res = await client.request<ToolsCatalogResult>("tools.catalog", {
       agentId: resolvedAgentId,
       includePlugins: true,
     });
@@ -167,7 +184,11 @@ export async function loadToolsCatalog(state: AgentsState, agentId: string) {
     }
     state.toolsCatalogError = resolveToolsErrorMessage(err, "tools catalog");
   } finally {
-    if (state.toolsCatalogLoadingAgentId === resolvedAgentId) {
+    if (
+      state.client === client &&
+      state.requestGeneration === generation &&
+      state.toolsCatalogLoadingAgentId === resolvedAgentId
+    ) {
       state.toolsCatalogLoadingAgentId = null;
       state.toolsCatalogLoading = false;
     }
@@ -184,7 +205,11 @@ export async function loadToolsEffective(
   state: AgentsState,
   params: { agentId: string; sessionKey: string },
 ) {
+  const client = state.client;
+  const generation = state.requestGeneration;
   await loadToolsEffectiveShared(state, params, {
+    isCurrent: () =>
+      state.client === client && state.connected && state.requestGeneration === generation,
     ignoreResponse: (agentId, requestKey) =>
       state.toolsEffectiveLoadingKey !== requestKey || hasSelectedAgentMismatch(state, agentId),
     onError: (err) => resolveToolsErrorMessage(err, "effective tools"),
@@ -226,9 +251,14 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
   };
   const files = new Map<string, AgentFilesStatus>();
   const fileRequests = new Map<string, Promise<AgentsFilesListResult | null>>();
+  const fileRequestOwners = new Map<string, symbol>();
   const listeners = new Set<(state: AgentCapabilityState) => void>();
   let disposed = false;
+  // Transport reconnects reuse the client object, so identity alone cannot
+  // stop pre-disconnect completions from repopulating capability state.
+  let requestGeneration = 0;
   let agentsRequest: Promise<AgentsListResult | null> | null = null;
+  let agentsRequestOwner: symbol | null = null;
 
   const publish = () => {
     if (disposed) {
@@ -238,6 +268,8 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
       listener(state);
     }
   };
+  const isCurrentRequest = (client: GatewayBrowserClient, generation: number) =>
+    !disposed && state.connected && state.client === client && requestGeneration === generation;
 
   const fileStatus = (agentId: string): AgentFilesStatus => {
     const existing = files.get(agentId);
@@ -260,16 +292,20 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
     state.agentsLoading = true;
     state.agentsError = null;
     publish();
+    const generation = requestGeneration;
+    const owner = Symbol();
+    agentsRequestOwner = owner;
     const request = loadAgentsList(client)
       .then((result) => {
-        if (state.client === client) {
+        const current = isCurrentRequest(client, generation) && agentsRequestOwner === owner;
+        if (current) {
           state.agentsList = result;
           state.agentsError = null;
         }
-        return state.client === client ? result : state.agentsList;
+        return current ? result : null;
       })
       .catch((err: unknown) => {
-        if (state.client === client) {
+        if (isCurrentRequest(client, generation) && agentsRequestOwner === owner) {
           state.agentsError = isMissingOperatorReadScopeError(err)
             ? formatMissingOperatorReadScopeMessage("agent list")
             : String(err);
@@ -277,10 +313,12 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
         return null;
       })
       .finally(() => {
-        if (agentsRequest === request) {
+        const currentRequest = agentsRequestOwner === owner;
+        if (currentRequest) {
           agentsRequest = null;
+          agentsRequestOwner = null;
         }
-        if (state.client === client) {
+        if (currentRequest && isCurrentRequest(client, generation)) {
           state.agentsLoading = false;
           publish();
         }
@@ -309,25 +347,32 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
     status.loading = true;
     status.error = null;
     publish();
+    const generation = requestGeneration;
+    const owner = Symbol();
+    fileRequestOwners.set(agentId, owner);
     const request = loadAgentFilesList(client, agentId)
       .then((result) => {
-        if (state.client === client && result) {
+        const current =
+          isCurrentRequest(client, generation) && fileRequestOwners.get(agentId) === owner;
+        if (current && result) {
           status.list = result;
           status.error = null;
         }
-        return state.client === client ? status.list : null;
+        return current ? status.list : null;
       })
       .catch((err: unknown) => {
-        if (state.client === client) {
+        if (isCurrentRequest(client, generation) && fileRequestOwners.get(agentId) === owner) {
           status.error = String(err);
         }
         return null;
       })
       .finally(() => {
-        if (fileRequests.get(agentId) === request) {
+        const currentRequest = fileRequestOwners.get(agentId) === owner;
+        if (currentRequest) {
           fileRequests.delete(agentId);
+          fileRequestOwners.delete(agentId);
         }
-        if (state.client === client) {
+        if (currentRequest && isCurrentRequest(client, generation)) {
           status.loading = false;
           publish();
         }
@@ -340,9 +385,14 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
     const clientChanged = state.client !== snapshot.client;
     state.client = snapshot.client;
     state.connected = snapshot.connected;
-    if (clientChanged) {
+    if (clientChanged || !snapshot.connected) {
+      requestGeneration += 1;
       agentsRequest = null;
+      agentsRequestOwner = null;
       fileRequests.clear();
+      fileRequestOwners.clear();
+    }
+    if (clientChanged || !snapshot.connected) {
       files.clear();
       state.agentsList = null;
       state.agentsError = null;
@@ -384,11 +434,15 @@ export function createAgentCapability(gateway: AgentGateway): AgentCapability {
     },
     dispose() {
       disposed = true;
+      requestGeneration += 1;
       stopGateway();
       listeners.clear();
       fileRequests.clear();
+      fileRequestOwners.clear();
       files.clear();
       agentsRequest = null;
+      agentsRequestOwner = null;
+      state.agentsLoading = false;
     },
   };
 }
diff --git a/ui/src/lib/agents/tools-effective.ts b/ui/src/lib/agents/tools-effective.ts
index 6d536518128..a36ed201dde 100644
--- a/ui/src/lib/agents/tools-effective.ts
+++ b/ui/src/lib/agents/tools-effective.ts
@@ -41,6 +41,7 @@ export async function loadToolsEffective(
   state: ToolsEffectiveState,
   params: { agentId: string; sessionKey: string },
   options: {
+    isCurrent?: () => boolean;
     ignoreResponse?: (agentId: string, requestKey: string) => boolean;
     onError?: (error: unknown) => string;
   } = {},
@@ -60,7 +61,9 @@ export async function loadToolsEffective(
   ) {
     return;
   }
-  const shouldIgnoreResponse = () => options.ignoreResponse?.(resolvedAgentId, requestKey) ?? false;
+  const isCurrentRequest = () => options.isCurrent?.() ?? true;
+  const shouldIgnoreResponse = () =>
+    !isCurrentRequest() || (options.ignoreResponse?.(resolvedAgentId, requestKey) ?? false);
   state.toolsEffectiveLoading = true;
   state.toolsEffectiveLoadingKey = requestKey;
   state.toolsEffectiveResultKey = null;
@@ -82,7 +85,7 @@ export async function loadToolsEffective(
     }
     state.toolsEffectiveError = options.onError?.(error) ?? String(error);
   } finally {
-    if (state.toolsEffectiveLoadingKey === requestKey) {
+    if (isCurrentRequest() && state.toolsEffectiveLoadingKey === requestKey) {
       state.toolsEffectiveLoadingKey = null;
       state.toolsEffectiveLoading = false;
     }
diff --git a/ui/src/lib/channels/index.test.ts b/ui/src/lib/channels/index.test.ts
index cf5f6a09668..039992e96d7 100644
--- a/ui/src/lib/channels/index.test.ts
+++ b/ui/src/lib/channels/index.test.ts
@@ -1,7 +1,12 @@
 // Channels domain tests.
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { ChannelsStatusSnapshot } from "../../api/types.ts";
-import { loadChannels, waitWhatsAppLogin, type ChannelsState } from "./index.ts";
+import {
+  createChannelCapability,
+  loadChannels,
+  waitWhatsAppLogin,
+  type ChannelsState,
+} from "./index.ts";
 
 function createDeferred<T>() {
   let resolve: ((value: T) => void) | undefined;
@@ -79,6 +84,104 @@ describe("channels controller WhatsApp wait", () => {
     expect(state.whatsappLoginQrDataUrl).toBe("data:image/png;base64,next-qr");
     expect(state.whatsappBusy).toBe(false);
   });
+
+  it("rejects a stale login result after reconnecting with the same client", async () => {
+    const staleWait = createDeferred<{
+      message: string;
+      connected: boolean;
+      qrDataUrl: string;
+    }>();
+    const freshWait = createDeferred<{
+      message: string;
+      connected: boolean;
+      qrDataUrl: string;
+    }>();
+    let waitCount = 0;
+    const request = vi.fn((method: string) => {
+      if (method === "web.login.wait") {
+        waitCount += 1;
+        return waitCount === 1 ? staleWait.promise : freshWait.promise;
+      }
+      return Promise.resolve(createChannelsSnapshot("fresh"));
+    });
+    const client = { request };
+    let snapshot = { client, connected: true };
+    const listeners = new Set<(next: typeof snapshot) => void>();
+    const gateway = {
+      get snapshot() {
+        return snapshot;
+      },
+      subscribe(listener: (next: typeof snapshot) => void) {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+      },
+    };
+    const channels = createChannelCapability(gateway as never);
+
+    const stale = channels.waitWhatsApp();
+    await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(1));
+    snapshot = { client, connected: false };
+    for (const listener of listeners) {
+      listener(snapshot);
+    }
+    snapshot = { client, connected: true };
+    for (const listener of listeners) {
+      listener(snapshot);
+    }
+
+    const fresh = channels.waitWhatsApp();
+    await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(2));
+    freshWait.resolve({
+      message: "fresh login",
+      connected: false,
+      qrDataUrl: "data:image/png;base64,fresh-qr",
+    });
+    await fresh;
+
+    staleWait.resolve({
+      message: "stale login",
+      connected: true,
+      qrDataUrl: "data:image/png;base64,stale-qr",
+    });
+    await stale;
+
+    expect(channels.state.whatsappLoginMessage).toBe("fresh login");
+    expect(channels.state.whatsappLoginQrDataUrl).toBe("data:image/png;base64,fresh-qr");
+    expect(request.mock.calls.filter(([method]) => method === "channels.status")).toHaveLength(1);
+    channels.dispose();
+  });
+
+  it("does not apply or refresh a login result after its capability is disposed", async () => {
+    const pending = createDeferred<{
+      message: string;
+      connected: boolean;
+      qrDataUrl: string;
+    }>();
+    const request = vi.fn(() => pending.promise);
+    const client = { request };
+    const gateway = {
+      snapshot: { client, connected: true },
+      subscribe: () => () => undefined,
+    };
+    const channels = createChannelCapability(gateway as never);
+
+    const wait = channels.waitWhatsApp();
+    await vi.waitFor(() => expect(request).toHaveBeenCalledOnce());
+    channels.dispose();
+    pending.resolve({
+      message: "stale login",
+      connected: true,
+      qrDataUrl: "data:image/png;base64,stale-qr",
+    });
+    await wait;
+
+    expect(channels.state.whatsappLoginMessage).toBeNull();
+    expect(channels.state.whatsappLoginQrDataUrl).toBeNull();
+    expect(request).toHaveBeenCalledOnce();
+
+    await channels.waitWhatsApp();
+    expect(request).toHaveBeenCalledOnce();
+  });
 });
 
 describe("loadChannels", () => {
diff --git a/ui/src/lib/channels/index.ts b/ui/src/lib/channels/index.ts
index c30edbc8c2f..b5b03e5ec9d 100644
--- a/ui/src/lib/channels/index.ts
+++ b/ui/src/lib/channels/index.ts
@@ -136,13 +136,58 @@ export async function loadChannels(
   await refresh;
 }
 
-async function startWhatsAppLogin(state: ChannelsState, force: boolean) {
-  if (!state.client || !state.connected || state.whatsappBusy) {
-    return;
+type WhatsAppOperation = {
+  client: ChannelGatewayClient;
+  gatewayEpoch: number;
+  operationSeq: number;
+};
+
+type ChannelsLifecycle = {
+  gatewayEpoch: number;
+  whatsappOperationSeq: number;
+};
+
+const channelsLifecycles = new WeakMap<ChannelsState, ChannelsLifecycle>();
+
+function getChannelsLifecycle(state: ChannelsState): ChannelsLifecycle {
+  const existing = channelsLifecycles.get(state);
+  if (existing) {
+    return existing;
   }
+  const created = { gatewayEpoch: 0, whatsappOperationSeq: 0 };
+  channelsLifecycles.set(state, created);
+  return created;
+}
+
+function beginWhatsAppOperation(state: ChannelsState): WhatsAppOperation | null {
+  const client = state.client;
+  if (!client || !state.connected || state.whatsappBusy) {
+    return null;
+  }
+  const lifecycle = getChannelsLifecycle(state);
+  const operationSeq = lifecycle.whatsappOperationSeq + 1;
+  lifecycle.whatsappOperationSeq = operationSeq;
   state.whatsappBusy = true;
+  return { client, gatewayEpoch: lifecycle.gatewayEpoch, operationSeq };
+}
+
+function isCurrentWhatsAppOperation(state: ChannelsState, operation: WhatsAppOperation): boolean {
+  const lifecycle = getChannelsLifecycle(state);
+  return (
+    state.connected &&
+    state.client === operation.client &&
+    lifecycle.gatewayEpoch === operation.gatewayEpoch &&
+    lifecycle.whatsappOperationSeq === operation.operationSeq
+  );
+}
+
+async function startWhatsAppLogin(state: ChannelsState, force: boolean): Promise<boolean> {
+  const operation = beginWhatsAppOperation(state);
+  if (!operation) {
+    return false;
+  }
   try {
-    const res = await state.client.request<{
+    const res = await operation.client.request<{
       message?: string;
       qrDataUrl?: string;
       connected?: boolean;
@@ -150,32 +195,45 @@ async function startWhatsAppLogin(state: ChannelsState, force: boolean) {
       force,
       timeoutMs: 30000,
     });
+    if (!isCurrentWhatsAppOperation(state, operation)) {
+      return false;
+    }
     state.whatsappLoginMessage = res.message ?? null;
     state.whatsappLoginQrDataUrl = res.qrDataUrl ?? null;
     state.whatsappLoginConnected = typeof res.connected === "boolean" ? res.connected : null;
   } catch (err) {
+    if (!isCurrentWhatsAppOperation(state, operation)) {
+      return false;
+    }
     state.whatsappLoginMessage = String(err);
     state.whatsappLoginQrDataUrl = null;
     state.whatsappLoginConnected = null;
   } finally {
-    state.whatsappBusy = false;
+    if (isCurrentWhatsAppOperation(state, operation)) {
+      state.whatsappBusy = false;
+    }
   }
+  return true;
 }
 
-export async function waitWhatsAppLogin(state: ChannelsState) {
-  if (!state.client || !state.connected || state.whatsappBusy) {
-    return;
+export async function waitWhatsAppLogin(state: ChannelsState): Promise<boolean> {
+  const operation = beginWhatsAppOperation(state);
+  if (!operation) {
+    return false;
   }
-  state.whatsappBusy = true;
+  const currentQrDataUrl = state.whatsappLoginQrDataUrl ?? undefined;
   try {
-    const res = await state.client.request<{
+    const res = await operation.client.request<{
       message?: string;
       connected?: boolean;
       qrDataUrl?: string;
     }>("web.login.wait", {
       timeoutMs: 120000,
-      currentQrDataUrl: state.whatsappLoginQrDataUrl ?? undefined,
+      currentQrDataUrl,
     });
+    if (!isCurrentWhatsAppOperation(state, operation)) {
+      return false;
+    }
     state.whatsappLoginMessage = res.message ?? null;
     state.whatsappLoginConnected = res.connected ?? null;
     if (res.qrDataUrl) {
@@ -184,28 +242,43 @@ export async function waitWhatsAppLogin(state: ChannelsState) {
       state.whatsappLoginQrDataUrl = null;
     }
   } catch (err) {
+    if (!isCurrentWhatsAppOperation(state, operation)) {
+      return false;
+    }
     state.whatsappLoginMessage = String(err);
     state.whatsappLoginConnected = null;
   } finally {
-    state.whatsappBusy = false;
+    if (isCurrentWhatsAppOperation(state, operation)) {
+      state.whatsappBusy = false;
+    }
   }
+  return true;
 }
 
-export async function logoutWhatsApp(state: ChannelsState) {
-  if (!state.client || !state.connected || state.whatsappBusy) {
-    return;
+export async function logoutWhatsApp(state: ChannelsState): Promise<boolean> {
+  const operation = beginWhatsAppOperation(state);
+  if (!operation) {
+    return false;
   }
-  state.whatsappBusy = true;
   try {
-    await state.client.request("channels.logout", { channel: "whatsapp" });
+    await operation.client.request("channels.logout", { channel: "whatsapp" });
+    if (!isCurrentWhatsAppOperation(state, operation)) {
+      return false;
+    }
     state.whatsappLoginMessage = "Logged out.";
     state.whatsappLoginQrDataUrl = null;
     state.whatsappLoginConnected = null;
   } catch (err) {
+    if (!isCurrentWhatsAppOperation(state, operation)) {
+      return false;
+    }
     state.whatsappLoginMessage = String(err);
   } finally {
-    state.whatsappBusy = false;
+    if (isCurrentWhatsAppOperation(state, operation)) {
+      state.whatsappBusy = false;
+    }
   }
+  return true;
 }
 
 export function resolveChannelConfigValue(
@@ -271,20 +344,29 @@ export function createChannelCapability(gateway: ChannelGateway): ChannelCapabil
       listener(state);
     }
   };
-  const run = async <T>(task: () => Promise<T>): Promise<T> => {
+  const run = async (task: () => Promise<void>): Promise<void> => {
+    if (disposed) {
+      return;
+    }
     const result = task();
     publish();
     try {
-      return await result;
+      await result;
     } finally {
       publish();
     }
   };
   const stopGateway = gateway.subscribe((snapshot) => {
     const clientChanged = state.client !== snapshot.client;
+    const connectionChanged = state.connected !== snapshot.connected;
     state.client = snapshot.client;
     state.connected = snapshot.connected;
-    if (clientChanged || !snapshot.connected) {
+    if (clientChanged || connectionChanged) {
+      // Every transport epoch invalidates both channel loads and login work.
+      // A reconnect may reuse the same client object, so identity alone is insufficient.
+      const lifecycle = getChannelsLifecycle(state);
+      lifecycle.gatewayEpoch += 1;
+      lifecycle.whatsappOperationSeq += 1;
       state.channelsLoading = false;
       state.channelsLoadingProbe = null;
       state.whatsappBusy = false;
@@ -300,25 +382,35 @@ export function createChannelCapability(gateway: ChannelGateway): ChannelCapabil
     refresh: (probe, options) => run(() => loadChannels(state, probe ?? false, options)),
     startWhatsApp: (force) =>
       run(async () => {
-        await startWhatsAppLogin(state, force);
-        await loadChannels(state, true);
+        if (await startWhatsAppLogin(state, force)) {
+          await loadChannels(state, true);
+        }
       }),
     waitWhatsApp: () =>
       run(async () => {
-        await waitWhatsAppLogin(state);
-        await loadChannels(state, true);
+        if (await waitWhatsAppLogin(state)) {
+          await loadChannels(state, true);
+        }
       }),
     logoutWhatsApp: () =>
       run(async () => {
-        await logoutWhatsApp(state);
-        await loadChannels(state, true);
+        if (await logoutWhatsApp(state)) {
+          await loadChannels(state, true);
+        }
       }),
     subscribe(listener) {
       listeners.add(listener);
       return () => listeners.delete(listener);
     },
     dispose() {
+      if (disposed) {
+        return;
+      }
       disposed = true;
+      const lifecycle = getChannelsLifecycle(state);
+      lifecycle.gatewayEpoch += 1;
+      lifecycle.whatsappOperationSeq += 1;
+      state.whatsappBusy = false;
       stopGateway();
       listeners.clear();
     },
diff --git a/ui/src/lib/config/index.test.ts b/ui/src/lib/config/index.test.ts
index 490e5c6cade..bc66a3f3534 100644
--- a/ui/src/lib/config/index.test.ts
+++ b/ui/src/lib/config/index.test.ts
@@ -1,8 +1,11 @@
 // Control UI tests cover config behavior.
 import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ConfigSchemaResponse, ConfigSnapshot } from "../../api/types.ts";
 import {
   applyConfigSnapshot,
   applyConfig,
+  createRuntimeConfigCapability,
   ensureAgentConfigEntry,
   findAgentConfigEntryIndex,
   loadConfig,
@@ -10,13 +13,44 @@ import {
   resetConfigPendingChanges,
   saveConfig,
   stageDefaultAgentConfigEntry,
-  stageConfigPreset,
   updateMcpServerEnabled,
   updateConfigFormValue,
   updateConfigRawValue,
   type ConfigState,
 } from "./index.ts";
 
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, reject, resolve };
+}
+
+function createGatewayHarness(client: GatewayBrowserClient) {
+  let snapshot = { client, connected: true, sessionKey: "main" };
+  const listeners = new Set<(next: typeof snapshot) => void>();
+  return {
+    gateway: {
+      get snapshot() {
+        return snapshot;
+      },
+      subscribe(listener: (next: typeof snapshot) => void) {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+      },
+    },
+    publish: (connected: boolean) => {
+      snapshot = { client, connected, sessionKey: "main" };
+      for (const listener of listeners) {
+        listener(snapshot);
+      }
+    },
+  };
+}
+
 function createState(): ConfigState {
   return {
     applySessionKey: "main",
@@ -274,6 +308,111 @@ describe("loadConfig", () => {
   });
 });
 
+describe("createRuntimeConfigCapability", () => {
+  it("rejects stale config and schema work after reconnecting the same client", async () => {
+    const firstConfig = deferred<ConfigSnapshot>();
+    const secondConfig = deferred<ConfigSnapshot>();
+    const firstSchema = deferred<ConfigSchemaResponse>();
+    const secondSchema = deferred<ConfigSchemaResponse>();
+    const configRequests = [firstConfig, secondConfig];
+    const schemaRequests = [firstSchema, secondSchema];
+    const request = vi.fn((method: string) => {
+      const pending = method === "config.get" ? configRequests.shift() : schemaRequests.shift();
+      if (!pending) {
+        throw new Error(`unexpected request: ${method}`);
+      }
+      return pending.promise;
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const { gateway, publish } = createGatewayHarness(client);
+    const runtimeConfig = createRuntimeConfigCapability(gateway);
+
+    const staleConfigLoad = runtimeConfig.ensureLoaded();
+    const staleSchemaLoad = runtimeConfig.ensureSchemaLoaded();
+    publish(false);
+    publish(true);
+    const currentConfigLoad = runtimeConfig.ensureLoaded();
+    const currentSchemaLoad = runtimeConfig.ensureSchemaLoaded();
+
+    firstConfig.resolve({ config: { source: "stale" }, valid: true, issues: [], raw: "{}" });
+    firstSchema.reject(new Error("stale schema failure"));
+    await Promise.all([staleConfigLoad, staleSchemaLoad]);
+
+    expect(runtimeConfig.state.configSnapshot).toBeNull();
+    expect(runtimeConfig.state.configSchema).toBeNull();
+    expect(runtimeConfig.state.lastError).toBeNull();
+    expect(runtimeConfig.state.configLoading).toBe(true);
+    expect(runtimeConfig.state.configSchemaLoading).toBe(true);
+
+    secondConfig.resolve({ config: { source: "current" }, valid: true, issues: [], raw: "{}" });
+    secondSchema.resolve({
+      schema: { type: "object" },
+      uiHints: {},
+      version: "current",
+      generatedAt: "2026-07-09T00:00:00.000Z",
+    });
+    await Promise.all([currentConfigLoad, currentSchemaLoad]);
+
+    expect(runtimeConfig.state.configSnapshot?.config).toEqual({ source: "current" });
+    expect(runtimeConfig.state.configSchema).toEqual({ type: "object" });
+    expect(runtimeConfig.state.configSchemaVersion).toBe("current");
+    expect(runtimeConfig.state.configLoading).toBe(false);
+    expect(runtimeConfig.state.configSchemaLoading).toBe(false);
+    runtimeConfig.dispose();
+  });
+
+  it("keeps a replacement save isolated from stale same-client completion", async () => {
+    const staleSave = deferred<void>();
+    const currentSave = deferred<void>();
+    let saveCount = 0;
+    const request = vi.fn(async (method: string) => {
+      if (method === "config.set") {
+        saveCount += 1;
+        await (saveCount === 1 ? staleSave.promise : currentSave.promise);
+        return {};
+      }
+      if (method === "config.get") {
+        return {
+          hash: "current-hash",
+          config: { source: "current" },
+          valid: true,
+          issues: [],
+          raw: '{"source":"current"}',
+        };
+      }
+      throw new Error(`unexpected request: ${method}`);
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const { gateway, publish } = createGatewayHarness(client);
+    const runtimeConfig = createRuntimeConfigCapability(gateway);
+    applyConfigSnapshot(runtimeConfig.state, {
+      hash: "base-hash",
+      config: { source: "base" },
+      valid: true,
+      issues: [],
+      raw: '{"source":"base"}',
+    });
+    updateConfigFormValue(runtimeConfig.state, ["source"], "draft");
+
+    const oldOperation = runtimeConfig.save();
+    publish(false);
+    publish(true);
+    const currentOperation = runtimeConfig.save();
+
+    staleSave.resolve();
+    await expect(oldOperation).resolves.toBe(false);
+    expect(runtimeConfig.state.configSaving).toBe(true);
+    expect(runtimeConfig.state.configFormDirty).toBe(true);
+
+    currentSave.resolve();
+    await expect(currentOperation).resolves.toBe(true);
+    expect(runtimeConfig.state.configSaving).toBe(false);
+    expect(runtimeConfig.state.configFormDirty).toBe(false);
+    expect(runtimeConfig.state.configSnapshot?.config).toEqual({ source: "current" });
+    runtimeConfig.dispose();
+  });
+});
+
 describe("openConfigFile", () => {
   it("surfaces failed open responses and copies the returned config path", async () => {
     const request = vi.fn().mockResolvedValue({
@@ -514,97 +653,6 @@ describe("updateMcpServerEnabled", () => {
   });
 });
 
-describe("stageConfigPreset", () => {
-  it("ignores preset staging before a config snapshot is ready", () => {
-    const state = createState();
-
-    stageConfigPreset(state, {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 50_000,
-          bootstrapTotalMaxChars: 300_000,
-          contextInjection: "always",
-        },
-      },
-    });
-
-    expect(state.configForm).toBeNull();
-    expect(state.configRaw).toBe("");
-    expect(state.configFormDirty).toBe(false);
-  });
-
-  it("stages preset changes without dropping unrelated config", () => {
-    const state = createState();
-    applyConfigSnapshot(state, {
-      config: {
-        agents: {
-          defaults: {
-            bootstrapMaxChars: 12_000,
-            bootstrapTotalMaxChars: 60_000,
-            contextInjection: "always",
-          },
-        },
-        gateway: { mode: "local" },
-      },
-      valid: true,
-      issues: [],
-      raw: '{\n  "agents": {\n    "defaults": {\n      "bootstrapMaxChars": 12000,\n      "bootstrapTotalMaxChars": 60000,\n      "contextInjection": "always"\n    }\n  },\n  "gateway": {\n    "mode": "local"\n  }\n}\n',
-    });
-
-    stageConfigPreset(state, {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 50_000,
-          bootstrapTotalMaxChars: 300_000,
-          contextInjection: "always",
-        },
-      },
-    });
-
-    expect(state.configFormDirty).toBe(true);
-    expect(state.configForm).toEqual({
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 50_000,
-          bootstrapTotalMaxChars: 300_000,
-          contextInjection: "always",
-        },
-      },
-      gateway: { mode: "local" },
-    });
-  });
-
-  it("stays clean when the staged preset already matches the saved config", () => {
-    const state = createState();
-    applyConfigSnapshot(state, {
-      config: {
-        agents: {
-          defaults: {
-            bootstrapMaxChars: 20_000,
-            bootstrapTotalMaxChars: 150_000,
-            contextInjection: "always",
-          },
-        },
-      },
-      valid: true,
-      issues: [],
-      raw: '{\n  "agents": {\n    "defaults": {\n      "bootstrapMaxChars": 20000,\n      "bootstrapTotalMaxChars": 150000,\n      "contextInjection": "always"\n    }\n  }\n}\n',
-    });
-
-    stageConfigPreset(state, {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 20_000,
-          bootstrapTotalMaxChars: 150_000,
-          contextInjection: "always",
-        },
-      },
-    });
-
-    expect(state.configFormDirty).toBe(false);
-  });
-});
-
 describe("resetConfigPendingChanges", () => {
   it("restores the original form and raw config snapshot", () => {
     const state = createState();
diff --git a/ui/src/lib/config/index.ts b/ui/src/lib/config/index.ts
index 676577bcf49..14f946fe72e 100644
--- a/ui/src/lib/config/index.ts
+++ b/ui/src/lib/config/index.ts
@@ -1,5 +1,4 @@
 // Control UI runtime config capability and shared config-domain mutations.
-import { applyMergePatch } from "../../../../src/config/merge-patch.ts";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type { ConfigSchemaResponse, ConfigSnapshot, ConfigUiHints } from "../../api/types.ts";
 import { schemaType, type JsonSchema } from "../../components/config-form.shared.ts";
@@ -41,6 +40,7 @@ export type ConfigState = {
 
 const autoAllowlistedPluginIdsByState = new WeakMap<ConfigState, Set<string>>();
 const requestVersionsByState = new WeakMap<ConfigState, { config: number; schema: number }>();
+const connectionEpochsByState = new WeakMap<object, number>();
 
 type RuntimeConfigGatewaySnapshot = {
   client: GatewayBrowserClient | null;
@@ -63,7 +63,6 @@ export type RuntimeConfigCapability = {
   removeFormValue: (path: Array<string | number>) => void;
   setRaw: (value: string) => void;
   resetDraft: () => void;
-  stagePreset: (patch: Record<string, unknown>) => void;
   save: () => Promise<boolean>;
   apply: () => Promise<boolean>;
   openFile: () => Promise<void>;
@@ -89,6 +88,11 @@ type ConfigGatewayClient = {
   request<T = unknown>(method: string, params?: unknown): Promise<T>;
 };
 
+type ConfigConnectionState = {
+  client: ConfigGatewayClient | null;
+  connected: boolean;
+};
+
 type ConfigGatewayState = Pick<
   ConfigState,
   "connected" | "applySessionKey" | "configSnapshot" | "lastError" | "chatError"
@@ -132,13 +136,37 @@ function nextRequestVersion(state: ConfigState, key: "config" | "schema"): numbe
   return next[key];
 }
 
+function currentConfigConnectionEpoch(state: object): number {
+  return connectionEpochsByState.get(state) ?? 0;
+}
+
+function invalidateConfigConnection(state: object): void {
+  connectionEpochsByState.set(state, currentConfigConnectionEpoch(state) + 1);
+}
+
+function isCurrentConfigConnection(
+  state: ConfigConnectionState,
+  client: ConfigGatewayClient,
+  connectionEpoch: number,
+): boolean {
+  return (
+    state.connected &&
+    state.client === client &&
+    currentConfigConnectionEpoch(state) === connectionEpoch
+  );
+}
+
 function isCurrentRequest(
   state: ConfigState,
   key: "config" | "schema",
   version: number,
   client: GatewayBrowserClient,
+  connectionEpoch: number,
 ): boolean {
-  return state.client === client && requestVersionsByState.get(state)?.[key] === version;
+  return (
+    isCurrentConfigConnection(state, client, connectionEpoch) &&
+    requestVersionsByState.get(state)?.[key] === version
+  );
 }
 
 export async function loadConfig(state: ConfigState, options: LoadConfigOptions = {}) {
@@ -146,22 +174,23 @@ export async function loadConfig(state: ConfigState, options: LoadConfigOptions
   if (!client || !state.connected) {
     return;
   }
+  const connectionEpoch = currentConfigConnectionEpoch(state);
   const version = nextRequestVersion(state, "config");
   state.configLoading = true;
   state.lastError = null;
   state.chatError = null;
   try {
     const res = await client.request<ConfigSnapshot>("config.get", {});
-    if (!isCurrentRequest(state, "config", version, client)) {
+    if (!isCurrentRequest(state, "config", version, client, connectionEpoch)) {
       return;
     }
     applyConfigSnapshot(state, res, options);
   } catch (err) {
-    if (isCurrentRequest(state, "config", version, client)) {
+    if (isCurrentRequest(state, "config", version, client, connectionEpoch)) {
       state.lastError = String(err);
     }
   } finally {
-    if (isCurrentRequest(state, "config", version, client)) {
+    if (isCurrentRequest(state, "config", version, client, connectionEpoch)) {
       state.configLoading = false;
     }
   }
@@ -175,20 +204,21 @@ async function loadConfigSchema(state: ConfigState) {
   if (state.configSchemaLoading) {
     return;
   }
+  const connectionEpoch = currentConfigConnectionEpoch(state);
   const version = nextRequestVersion(state, "schema");
   state.configSchemaLoading = true;
   try {
     const res = await client.request<ConfigSchemaResponse>("config.schema", {});
-    if (!isCurrentRequest(state, "schema", version, client)) {
+    if (!isCurrentRequest(state, "schema", version, client, connectionEpoch)) {
       return;
     }
     applyConfigSchema(state, res);
   } catch (err) {
-    if (isCurrentRequest(state, "schema", version, client)) {
+    if (isCurrentRequest(state, "schema", version, client, connectionEpoch)) {
       state.lastError = String(err);
     }
   } finally {
-    if (isCurrentRequest(state, "schema", version, client)) {
+    if (isCurrentRequest(state, "schema", version, client, connectionEpoch)) {
       state.configSchemaLoading = false;
     }
   }
@@ -444,9 +474,12 @@ async function submitConfigChange(
   busyKey: ConfigSubmitBusyKey,
   extraParams: Record<string, unknown> = {},
 ): Promise<boolean> {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return false;
   }
+  const connectionEpoch = currentConfigConnectionEpoch(state);
+  const isCurrent = () => isCurrentConfigConnection(state, client, connectionEpoch);
   state[busyKey] = true;
   state.lastError = null;
   state.chatError = null;
@@ -457,17 +490,24 @@ async function submitConfigChange(
       state.lastError = "Config hash missing; reload and retry.";
       return false;
     }
-    await state.client.request(method, { raw, baseHash, ...extraParams });
+    await client.request(method, { raw, baseHash, ...extraParams });
+    if (!isCurrent()) {
+      return false;
+    }
     state.configFormDirty = false;
     state.configDraftBaseHash = null;
     autoAllowlistedPluginIdsByState.delete(state);
     await loadConfig(state);
-    return true;
+    return isCurrent();
   } catch (err) {
-    state.lastError = String(err);
+    if (isCurrent()) {
+      state.lastError = String(err);
+    }
     return false;
   } finally {
-    state[busyKey] = false;
+    if (isCurrent()) {
+      state[busyKey] = false;
+    }
   }
 }
 
@@ -500,6 +540,7 @@ async function patchConfig(
   if (!client || !state.connected) {
     return false;
   }
+  const connectionEpoch = currentConfigConnectionEpoch(state);
   const baseHash = state.configSnapshot?.hash;
   if (!baseHash) {
     state.lastError = "Config hash missing; refresh and retry.";
@@ -514,9 +555,11 @@ async function patchConfig(
       sessionKey: state.applySessionKey,
       note: options.note,
     });
-    return true;
+    return isCurrentConfigConnection(state, client, connectionEpoch);
   } catch (err) {
-    state.lastError = String(err);
+    if (isCurrentConfigConnection(state, client, connectionEpoch)) {
+      state.lastError = String(err);
+    }
     return false;
   }
 }
@@ -529,7 +572,16 @@ async function lookupConfigSchemaPath(
   if (!client || !state.connected) {
     return null;
   }
-  return client.request("config.schema.lookup", { path });
+  const connectionEpoch = currentConfigConnectionEpoch(state);
+  try {
+    const result = await client.request("config.schema.lookup", { path });
+    return isCurrentConfigConnection(state, client, connectionEpoch) ? result : null;
+  } catch (error) {
+    if (!isCurrentConfigConnection(state, client, connectionEpoch)) {
+      return null;
+    }
+    throw error;
+  }
 }
 
 function mutateConfigForm(state: ConfigState, mutate: (draft: Record<string, unknown>) => void) {
@@ -634,20 +686,6 @@ export function updateConfigRawValue(state: ConfigState, value: string) {
   }
 }
 
-export function stageConfigPreset(state: ConfigState, patch: Record<string, unknown>) {
-  const snapshotConfig = resolveEditableSnapshotConfig(state.configSnapshot);
-  const baseSource = state.configForm ?? snapshotConfig;
-  if (!baseSource || (!state.configForm && !state.configSnapshot?.hash)) {
-    return;
-  }
-  const base = cloneConfigObject(baseSource);
-  const merged = applyMergePatch(base, patch);
-  if (!merged || typeof merged !== "object" || Array.isArray(merged)) {
-    return;
-  }
-  syncConfigDraft(state, cloneConfigObject(merged as Record<string, unknown>));
-}
-
 export function resetConfigPendingChanges(state: ConfigState) {
   const editableConfig = resolveEditableSnapshotConfig(state.configSnapshot);
   state.configForm = cloneConfigObject(state.configFormOriginal ?? editableConfig ?? {});
@@ -750,30 +788,42 @@ export function stageDefaultAgentConfigEntry(state: ConfigState, agentId: string
 }
 
 export async function openConfigFile(state: ConfigState): Promise<void> {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return;
   }
+  const connectionEpoch = currentConfigConnectionEpoch(state);
+  const isCurrent = () => isCurrentConfigConnection(state, client, connectionEpoch);
   state.lastError = null;
   state.chatError = null;
   try {
-    const res = await state.client.request<{ ok: boolean; path?: string; error?: string }>(
+    const res = await client.request<{ ok: boolean; path?: string; error?: string }>(
       "config.openFile",
       {},
     );
+    if (!isCurrent()) {
+      return;
+    }
     if (!res.ok) {
-      const errorMessage = res.error || "Failed to open config file";
-      state.lastError = errorMessage;
+      let errorMessage = res.error || "Failed to open config file";
       const path = res.path || state.configSnapshot?.path;
       if (path) {
         try {
           await navigator.clipboard.writeText(path);
-          state.lastError += `\n\nFile path copied to clipboard: ${path}`;
+          errorMessage += `\n\nFile path copied to clipboard: ${path}`;
         } catch {
-          state.lastError += `\n\nFile path: ${path}`;
+          errorMessage += `\n\nFile path: ${path}`;
         }
       }
+      if (isCurrent()) {
+        state.lastError = errorMessage;
+      }
     }
   } catch (err) {
+    if (!isCurrent()) {
+      return;
+    }
+    const errorMessage = String(err);
     const path = state.configSnapshot?.path;
     if (path) {
       try {
@@ -782,7 +832,9 @@ export async function openConfigFile(state: ConfigState): Promise<void> {
         // ignore
       }
     }
-    state.lastError = String(err);
+    if (isCurrent()) {
+      state.lastError = errorMessage;
+    }
   }
 }
 
@@ -839,15 +891,20 @@ export function createRuntimeConfigCapability(
     state.configSchema ? Promise.resolve() : loadOnce("schema", () => loadConfigSchema(state));
   const stopGateway = gateway.subscribe((snapshot) => {
     const clientChanged = state.client !== snapshot.client;
+    const connectionChanged = state.connected !== snapshot.connected;
     state.client = snapshot.client;
     state.connected = snapshot.connected;
     state.applySessionKey = snapshot.sessionKey;
-    if (clientChanged) {
+    if (clientChanged || connectionChanged) {
       configLoad = null;
       schemaLoad = null;
-      requestVersionsByState.delete(state);
+      // A reconnect may reuse the client object. Keep generations monotonic so work
+      // from the previous connection cannot commit into the new connection epoch.
+      invalidateConfigConnection(state);
       state.configLoading = false;
       state.configSchemaLoading = false;
+      state.configSaving = false;
+      state.configApplying = false;
     }
     publish();
   });
@@ -872,7 +929,6 @@ export function createRuntimeConfigCapability(
     removeFormValue: (path) => mutate(() => removeConfigFormValue(state, path)),
     setRaw: (value) => mutate(() => updateConfigRawValue(state, value)),
     resetDraft: () => mutate(() => resetConfigPendingChanges(state)),
-    stagePreset: (patch) => mutate(() => stageConfigPreset(state, patch)),
     save: () => run(() => saveConfig(state)),
     apply: () => run(() => applyConfig(state)),
     openFile: () => run(() => openConfigFile(state)),
@@ -896,6 +952,12 @@ export function createRuntimeConfigCapability(
     },
     dispose() {
       disposed = true;
+      invalidateConfigConnection(state);
+      state.connected = false;
+      state.configLoading = false;
+      state.configSchemaLoading = false;
+      state.configSaving = false;
+      state.configApplying = false;
       stopGateway();
       listeners.clear();
       requestVersionsByState.delete(state);
diff --git a/ui/src/lib/nodes/device-token.test.ts b/ui/src/lib/nodes/device-token.test.ts
new file mode 100644
index 00000000000..868d4ca64fb
--- /dev/null
+++ b/ui/src/lib/nodes/device-token.test.ts
@@ -0,0 +1,115 @@
+/* @vitest-environment jsdom */
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createStorageMock } from "../../test-helpers/storage.ts";
+import {
+  loadDeviceAuthToken,
+  revokeDeviceToken,
+  rotateDeviceToken,
+  storeDeviceAuthToken,
+} from "./index.ts";
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((nextResolve) => {
+    resolve = nextResolve;
+  });
+  return { promise, resolve };
+}
+
+function createState(request: (method: string, params?: unknown) => Promise<unknown>) {
+  return {
+    client: {
+      request: request as <T = unknown>(method: string, params?: unknown) => Promise<T>,
+    },
+    connected: true,
+    requestGeneration: 1,
+    devicesLoading: false,
+    devicesError: null,
+    devicesList: null,
+  };
+}
+
+function storeIdentity() {
+  localStorage.setItem(
+    "openclaw-device-identity-v1",
+    JSON.stringify({
+      version: 1,
+      deviceId: "00",
+      publicKey: "AA",
+      privateKey: "AA",
+      createdAtMs: 1,
+    }),
+  );
+}
+
+function deferIdentityFingerprint() {
+  const digest = deferred<ArrayBuffer>();
+  const digestMock = vi.fn(() => digest.promise);
+  vi.stubGlobal("crypto", { subtle: { digest: digestMock } });
+  return { digest, digestMock };
+}
+
+const tokenParams = {
+  deviceId: "00",
+  gatewayUrl: "wss://gateway.test",
+  role: "operator",
+};
+
+beforeEach(() => {
+  vi.stubGlobal("localStorage", createStorageMock());
+});
+
+afterEach(() => {
+  localStorage.clear();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+describe("device token request lifecycle", () => {
+  it("does not reveal or persist a rotate response from a retired request epoch", async () => {
+    const response = deferred<unknown>();
+    const state = createState(() => response.promise);
+    const prompt = vi.spyOn(window, "prompt").mockImplementation(() => null);
+
+    const operation = rotateDeviceToken(state, tokenParams);
+    state.requestGeneration += 1;
+    response.resolve({ token: "stale-token", ...tokenParams });
+    await operation;
+
+    expect(prompt).not.toHaveBeenCalled();
+    expect(loadDeviceAuthToken(tokenParams)).toBeNull();
+  });
+
+  it("rechecks rotate ownership after loading the local identity", async () => {
+    storeIdentity();
+    const { digest, digestMock } = deferIdentityFingerprint();
+    const state = createState(async () => ({ token: "stale-token", ...tokenParams }));
+    const prompt = vi.spyOn(window, "prompt").mockImplementation(() => null);
+
+    const operation = rotateDeviceToken(state, tokenParams);
+    await vi.waitFor(() => expect(digestMock).toHaveBeenCalledOnce());
+    state.requestGeneration += 1;
+    digest.resolve(new Uint8Array([0]).buffer);
+    await operation;
+
+    expect(prompt).not.toHaveBeenCalled();
+    expect(loadDeviceAuthToken(tokenParams)).toBeNull();
+  });
+
+  it("does not clear a current token when a revoke request retires during identity loading", async () => {
+    storeIdentity();
+    storeDeviceAuthToken({ ...tokenParams, token: "current-token", scopes: ["operator.read"] });
+    const { digest, digestMock } = deferIdentityFingerprint();
+    const state = createState(async () => ({}));
+    vi.spyOn(window, "confirm").mockReturnValue(true);
+
+    const operation = revokeDeviceToken(state, tokenParams);
+    await vi.waitFor(() => expect(digestMock).toHaveBeenCalledOnce());
+    state.requestGeneration += 1;
+    digest.resolve(new Uint8Array([0]).buffer);
+    await operation;
+
+    expect(loadDeviceAuthToken(tokenParams)?.token).toBe("current-token");
+  });
+});
diff --git a/ui/src/lib/nodes/exec-approvals.test.ts b/ui/src/lib/nodes/exec-approvals.test.ts
index 49f0d754f8c..38a71ca7df1 100644
--- a/ui/src/lib/nodes/exec-approvals.test.ts
+++ b/ui/src/lib/nodes/exec-approvals.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import {
   createInitialNodesState,
   loadExecApprovals,
@@ -6,6 +7,14 @@ import {
   updateExecApprovalsFormValue,
 } from "./index.ts";
 
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
 describe("host-native exec approvals state", () => {
   it("keeps native snapshots read-only", async () => {
     const request = vi.fn().mockResolvedValue({
@@ -30,4 +39,34 @@ describe("host-native exec approvals state", () => {
     expect(request).toHaveBeenCalledTimes(1);
     expect(state.lastError).toContain("read-only");
   });
+
+  it("isolates approval loads across a same-client reconnect", async () => {
+    const first = deferred<unknown>();
+    const second = deferred<unknown>();
+    const request = vi
+      .fn<(method: string, params?: unknown) => Promise<unknown>>()
+      .mockReturnValueOnce(first.promise)
+      .mockReturnValueOnce(second.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const state = createInitialNodesState({ client, connected: true });
+
+    const staleLoad = loadExecApprovals(state);
+    state.connected = false;
+    state.requestGeneration += 1;
+    state.execApprovalsLoading = false;
+    state.connected = true;
+    state.requestGeneration += 1;
+    const currentLoad = loadExecApprovals(state);
+
+    first.resolve({ path: "/old", exists: true, hash: "old", file: {} });
+    await staleLoad;
+    expect(state.execApprovalsSnapshot).toBeNull();
+    expect(state.execApprovalsLoading).toBe(true);
+
+    const current = { path: "/new", exists: true, hash: "new", file: {} };
+    second.resolve(current);
+    await currentLoad;
+    expect(state.execApprovalsSnapshot).toEqual(current);
+    expect(state.execApprovalsLoading).toBe(false);
+  });
 });
diff --git a/ui/src/lib/nodes/index.ts b/ui/src/lib/nodes/index.ts
index 5175e15ae6e..65c105a75e6 100644
--- a/ui/src/lib/nodes/index.ts
+++ b/ui/src/lib/nodes/index.ts
@@ -118,26 +118,28 @@ export type ExecApprovalsSnapshot = FileExecApprovalsSnapshot | NativeExecApprov
 
 export type ExecApprovalsTarget = { kind: "gateway" } | { kind: "node"; nodeId: string };
 
-type NodesState = {
+type NodesRequestState = {
   client: GatewayRequestClient | null;
   connected: boolean;
+  // Auto-reconnect keeps the same client; the page advances this generation
+  // whenever requests from the previous connection must become inert.
+  requestGeneration: number;
+};
+
+type NodesState = NodesRequestState & {
   nodesLoading: boolean;
   nodes: Array<Record<string, unknown>>;
   lastError: string | null;
   chatError?: string | null;
 };
 
-type DevicesState = {
-  client: GatewayRequestClient | null;
-  connected: boolean;
+type DevicesState = NodesRequestState & {
   devicesLoading: boolean;
   devicesError: string | null;
   devicesList: DevicePairingList | null;
 };
 
-export type ExecApprovalsState = {
-  client: GatewayRequestClient | null;
-  connected: boolean;
+export type ExecApprovalsState = NodesRequestState & {
   execApprovalsLoading: boolean;
   execApprovalsSaving: boolean;
   execApprovalsDirty: boolean;
@@ -174,6 +176,7 @@ export function createInitialNodesState(
   return {
     client: snapshot.client ?? null,
     connected: snapshot.connected ?? false,
+    requestGeneration: 0,
     nodesLoading: false,
     nodes: [],
     lastError: null,
@@ -189,6 +192,14 @@ export function createInitialNodesState(
   };
 }
 
+function isCurrentNodesRequest(
+  state: NodesRequestState,
+  client: GatewayRequestClient,
+  generation: number,
+): boolean {
+  return state.connected && state.client === client && state.requestGeneration === generation;
+}
+
 export async function loadNodes(state: NodesState, opts?: { quiet?: boolean }) {
   const client = state.client;
   if (!client || !state.connected || state.nodesLoading) {
@@ -199,17 +210,18 @@ export async function loadNodes(state: NodesState, opts?: { quiet?: boolean }) {
     state.lastError = null;
     state.chatError = null;
   }
+  const generation = state.requestGeneration;
   try {
     const res = await client.request<{ nodes?: unknown }>("node.list", {});
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.nodes = Array.isArray(res.nodes) ? (res.nodes as Array<Record<string, unknown>>) : [];
     }
   } catch (err) {
-    if (!opts?.quiet && state.client === client) {
+    if (!opts?.quiet && isCurrentNodesRequest(state, client, generation)) {
       state.lastError = String(err);
     }
   } finally {
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.nodesLoading = false;
     }
   }
@@ -224,53 +236,66 @@ export async function loadDevices(state: DevicesState, opts?: { quiet?: boolean
   if (!opts?.quiet) {
     state.devicesError = null;
   }
+  const generation = state.requestGeneration;
   try {
     const res = await client.request<{
       pending?: Array<PendingDevice>;
       paired?: Array<PairedDevice>;
     }>("device.pair.list", {});
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.devicesList = {
         pending: Array.isArray(res?.pending) ? res.pending : [],
         paired: Array.isArray(res?.paired) ? res.paired : [],
       };
     }
   } catch (err) {
-    if (!opts?.quiet && state.client === client) {
+    if (!opts?.quiet && isCurrentNodesRequest(state, client, generation)) {
       state.devicesError = String(err);
     }
   } finally {
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.devicesLoading = false;
     }
   }
 }
 
 export async function approveDevicePairing(state: DevicesState, requestId: string) {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return;
   }
+  const generation = state.requestGeneration;
   try {
-    await state.client.request("device.pair.approve", { requestId });
-    await loadDevices(state);
+    await client.request("device.pair.approve", { requestId });
+    if (isCurrentNodesRequest(state, client, generation)) {
+      await loadDevices(state);
+    }
   } catch (err) {
-    state.devicesError = String(err);
+    if (isCurrentNodesRequest(state, client, generation)) {
+      state.devicesError = String(err);
+    }
   }
 }
 
 export async function rejectDevicePairing(state: DevicesState, requestId: string) {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return;
   }
   const confirmed = window.confirm("Reject this device pairing request?");
   if (!confirmed) {
     return;
   }
+  const generation = state.requestGeneration;
   try {
-    await state.client.request("device.pair.reject", { requestId });
-    await loadDevices(state);
+    await client.request("device.pair.reject", { requestId });
+    if (isCurrentNodesRequest(state, client, generation)) {
+      await loadDevices(state);
+    }
   } catch (err) {
-    state.devicesError = String(err);
+    if (isCurrentNodesRequest(state, client, generation)) {
+      state.devicesError = String(err);
+    }
   }
 }
 
@@ -278,19 +303,27 @@ export async function rotateDeviceToken(
   state: DevicesState,
   params: { deviceId: string; gatewayUrl: string; role: string; scopes?: string[] },
 ) {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return;
   }
+  const generation = state.requestGeneration;
   try {
     const { gatewayUrl, ...requestParams } = params;
-    const res = await state.client.request<{
+    const res = await client.request<{
       token?: string;
       role?: string;
       deviceId?: string;
       scopes?: Array<string>;
     }>("device.token.rotate", requestParams);
+    if (!isCurrentNodesRequest(state, client, generation)) {
+      return;
+    }
     if (res?.token) {
       const identity = await loadOrCreateDeviceIdentity();
+      if (!isCurrentNodesRequest(state, client, generation)) {
+        return;
+      }
       const role = res.role ?? params.role;
       if (res.deviceId === identity.deviceId || params.deviceId === identity.deviceId) {
         storeDeviceAuthToken({
@@ -303,9 +336,13 @@ export async function rotateDeviceToken(
       }
       window.prompt("New device token (copy and store securely):", res.token);
     }
-    await loadDevices(state);
+    if (isCurrentNodesRequest(state, client, generation)) {
+      await loadDevices(state);
+    }
   } catch (err) {
-    state.devicesError = String(err);
+    if (isCurrentNodesRequest(state, client, generation)) {
+      state.devicesError = String(err);
+    }
   }
 }
 
@@ -313,17 +350,25 @@ export async function revokeDeviceToken(
   state: DevicesState,
   params: { deviceId: string; gatewayUrl: string; role: string },
 ) {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return;
   }
   const confirmed = window.confirm(`Revoke token for ${params.deviceId} (${params.role})?`);
   if (!confirmed) {
     return;
   }
+  const generation = state.requestGeneration;
   try {
     const { gatewayUrl, ...requestParams } = params;
-    await state.client.request("device.token.revoke", requestParams);
+    await client.request("device.token.revoke", requestParams);
+    if (!isCurrentNodesRequest(state, client, generation)) {
+      return;
+    }
     const identity = await loadOrCreateDeviceIdentity();
+    if (!isCurrentNodesRequest(state, client, generation)) {
+      return;
+    }
     if (params.deviceId === identity.deviceId) {
       clearDeviceAuthToken({
         deviceId: identity.deviceId,
@@ -331,9 +376,13 @@ export async function revokeDeviceToken(
         role: params.role,
       });
     }
-    await loadDevices(state);
+    if (isCurrentNodesRequest(state, client, generation)) {
+      await loadDevices(state);
+    }
   } catch (err) {
-    state.devicesError = String(err);
+    if (isCurrentNodesRequest(state, client, generation)) {
+      state.devicesError = String(err);
+    }
   }
 }
 
@@ -370,6 +419,7 @@ export async function loadExecApprovals(
   state.execApprovalsLoading = true;
   state.lastError = null;
   state.chatError = null;
+  const generation = state.requestGeneration;
   try {
     const rpc = resolveExecApprovalsRpc(target);
     if (!rpc) {
@@ -377,15 +427,15 @@ export async function loadExecApprovals(
       return;
     }
     const res = await client.request<ExecApprovalsSnapshot>(rpc.method, rpc.params);
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       applyExecApprovalsSnapshot(state, res);
     }
   } catch (err) {
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.lastError = String(err);
     }
   } finally {
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.execApprovalsLoading = false;
     }
   }
@@ -420,6 +470,7 @@ export async function saveExecApprovals(
   state.execApprovalsSaving = true;
   state.lastError = null;
   state.chatError = null;
+  const generation = state.requestGeneration;
   try {
     if (isNativeExecApprovalsSnapshot(state.execApprovalsSnapshot)) {
       state.lastError =
@@ -438,17 +489,17 @@ export async function saveExecApprovals(
       return;
     }
     await client.request(rpc.method, rpc.params);
-    if (state.client !== client) {
+    if (!isCurrentNodesRequest(state, client, generation)) {
       return;
     }
     state.execApprovalsDirty = false;
     await loadExecApprovals(state, target);
   } catch (err) {
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.lastError = String(err);
     }
   } finally {
-    if (state.client === client) {
+    if (isCurrentNodesRequest(state, client, generation)) {
       state.execApprovalsSaving = false;
     }
   }
diff --git a/ui/src/lib/sessions/drag.ts b/ui/src/lib/sessions/drag.ts
index c6455f93d74..d4e44538314 100644
--- a/ui/src/lib/sessions/drag.ts
+++ b/ui/src/lib/sessions/drag.ts
@@ -1,6 +1,6 @@
 // Private MIME keeps stray text and file drags from becoming session actions.
 export const SESSION_DRAG_MIME = "application/x-openclaw-session-key";
-export const SESSION_GROUP_DRAG_MIME = "application/x-openclaw-session-group";
+const SESSION_GROUP_DRAG_MIME = "application/x-openclaw-session-group";
 
 export function writeSessionDragData(dataTransfer: DataTransfer, sessionKey: string): void {
   dataTransfer.setData(SESSION_DRAG_MIME, sessionKey);
diff --git a/ui/src/lib/sessions/index.test.ts b/ui/src/lib/sessions/index.test.ts
index 6486cb25bf6..17a72d076c7 100644
--- a/ui/src/lib/sessions/index.test.ts
+++ b/ui/src/lib/sessions/index.test.ts
@@ -1,6 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import type { GatewayBrowserClient } from "../../api/gateway.ts";
-import type { GatewayEventFrame } from "../../api/gateway.ts";
+import type { GatewayBrowserClient, GatewayEventFrame, GatewayHelloOk } from "../../api/gateway.ts";
 import type { SessionsListResult } from "../../api/types.ts";
 import { createSessionCapability, reconcileSessionRunTerminal } from "./index.ts";
 
@@ -22,7 +21,137 @@ function deferred<T>() {
   return { promise, resolve };
 }
 
+function createGatewayHarness(client: GatewayBrowserClient) {
+  let snapshot: {
+    client: GatewayBrowserClient | null;
+    connected: boolean;
+    sessionKey: string;
+    assistantAgentId: string | null;
+    hello: GatewayHelloOk | null;
+  } = {
+    client,
+    connected: true,
+    sessionKey: "agent:main:main",
+    assistantAgentId: "main",
+    hello: null,
+  };
+  const listeners = new Set<(next: typeof snapshot) => void>();
+  return {
+    gateway: {
+      get snapshot() {
+        return snapshot;
+      },
+      subscribe(listener: (next: typeof snapshot) => void) {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+      },
+      subscribeEvents: () => () => undefined,
+    },
+    publish: (connected: boolean) => {
+      snapshot = { ...snapshot, connected };
+      for (const listener of listeners) {
+        listener(snapshot);
+      }
+    },
+  };
+}
+
 describe("createSessionCapability", () => {
+  it("starts a fresh list epoch when the same client reconnects", async () => {
+    const staleList = deferred<SessionsListResult>();
+    const currentList = deferred<SessionsListResult>();
+    let listCalls = 0;
+    const request = vi.fn(async (method: string) => {
+      if (method === "sessions.subscribe") {
+        return {};
+      }
+      if (method === "sessions.list") {
+        listCalls += 1;
+        return await (listCalls === 1 ? staleList.promise : currentList.promise);
+      }
+      throw new Error(`Unexpected request: ${method}`);
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const { gateway, publish } = createGatewayHarness(client);
+    const sessions = createSessionCapability(gateway);
+
+    const staleRefresh = sessions.refresh({ force: true });
+    publish(false);
+    publish(true);
+    await vi.waitFor(() => expect(listCalls).toBe(2));
+
+    staleList.resolve(sessionsResult([{ key: "stale", kind: "direct", updatedAt: 1 }], 1));
+    await staleRefresh;
+    expect(sessions.state.result).toBeNull();
+
+    currentList.resolve(sessionsResult([{ key: "current", kind: "direct", updatedAt: 2 }], 2));
+    await vi.waitFor(() => expect(sessions.state.result?.sessions[0]?.key).toBe("current"));
+    sessions.dispose();
+  });
+
+  it("does not publish a created session from a retired same-client epoch", async () => {
+    const staleCreate = deferred<{ key: string }>();
+    const request = vi.fn(async (method: string) => {
+      if (method === "sessions.create") {
+        return await staleCreate.promise;
+      }
+      if (method === "sessions.subscribe") {
+        return {};
+      }
+      if (method === "sessions.list") {
+        return sessionsResult([], 2);
+      }
+      throw new Error(`Unexpected request: ${method}`);
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const { gateway, publish } = createGatewayHarness(client);
+    const sessions = createSessionCapability(gateway);
+    const created = vi.fn();
+    sessions.subscribeCreated(created);
+
+    const operation = sessions.create({ agentId: "main" });
+    publish(false);
+    publish(true);
+    staleCreate.resolve({ key: "agent:main:stale" });
+
+    await expect(operation).resolves.toBeNull();
+    expect(created).not.toHaveBeenCalled();
+    sessions.dispose();
+  });
+
+  it("rolls back an optimistic model patch when its connection epoch retires", async () => {
+    const stalePatch = deferred<unknown>();
+    const request = vi.fn(async (method: string) => {
+      if (method === "sessions.patch") {
+        return await stalePatch.promise;
+      }
+      if (method === "sessions.subscribe") {
+        return {};
+      }
+      if (method === "sessions.list") {
+        return sessionsResult([], 2);
+      }
+      throw new Error(`Unexpected request: ${method}`);
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const { gateway, publish } = createGatewayHarness(client);
+    const sessions = createSessionCapability(gateway);
+    const key = "agent:main:main";
+    sessions.setModelOverride(key, "openai/gpt-old");
+
+    const operation = sessions.patch(key, { model: "openai/gpt-new" });
+    expect(sessions.state.modelOverrides[key]).toBe("openai/gpt-new");
+
+    publish(false);
+    expect(sessions.state.modelOverrides[key]).toBe("openai/gpt-old");
+    publish(true);
+    stalePatch.resolve({});
+
+    await expect(operation).resolves.toBeNull();
+    expect(sessions.state.modelOverrides[key]).toBe("openai/gpt-old");
+    sessions.dispose();
+  });
+
   it("passes transcript fork parameters to sessions.create", async () => {
     const request = vi.fn(async (method: string) => {
       if (method === "sessions.create") {
diff --git a/ui/src/lib/sessions/index.ts b/ui/src/lib/sessions/index.ts
index 1a66730751e..5a8c7df6be0 100644
--- a/ui/src/lib/sessions/index.ts
+++ b/ui/src/lib/sessions/index.ts
@@ -134,6 +134,11 @@ type SessionGateway = {
 
 type SessionRequestClient = Pick<GatewayBrowserClient, "request">;
 
+type SessionConnectionScope = {
+  client: GatewayBrowserClient;
+  epoch: number;
+};
+
 type SessionMessageSubscription = {
   key: string;
   agentId?: string | null;
@@ -565,20 +570,44 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
   let inFlight: Promise<void> | null = null;
   let queuedRefresh: SessionRefreshOptions | null = null;
   let disposed = false;
+  let connectionEpoch = 0;
+  let connectionClient = gateway.snapshot.client;
+  let connectionConnected = gateway.snapshot.connected;
+  const pendingModelPatches = new Map<
+    string,
+    { token: symbol; previous: string | null | undefined }
+  >();
   let subscribedClient: GatewayBrowserClient | null = null;
   let lastListOptions: SessionListOptions = {};
   const listeners = new Set<(next: SessionState) => void>();
   const createdListeners = new Set<(key: string) => void>();
 
+  const captureConnection = (): SessionConnectionScope | null => {
+    const snapshot = gateway.snapshot;
+    return !disposed && snapshot.connected && snapshot.client
+      ? { client: snapshot.client, epoch: connectionEpoch }
+      : null;
+  };
+
+  const isCurrentConnection = (scope: SessionConnectionScope): boolean => {
+    const snapshot = gateway.snapshot;
+    return (
+      !disposed &&
+      connectionEpoch === scope.epoch &&
+      snapshot.connected &&
+      snapshot.client === scope.client
+    );
+  };
+
   const requestList = async (
     options: SessionListOptions = {},
   ): Promise<SessionsListResult | null> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return null;
     }
-    const result = await requestSessionList(client, options);
-    return disposed || gateway.snapshot.client !== client ? null : (result ?? null);
+    const result = await requestSessionList(scope.client, options);
+    return isCurrentConnection(scope) ? (result ?? null) : null;
   };
 
   const publish = (next: SessionState) => {
@@ -612,9 +641,17 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     publish({ ...state, modelOverrides });
   };
 
+  const rollbackPendingModelPatches = () => {
+    const pending = [...pendingModelPatches];
+    pendingModelPatches.clear();
+    for (const [key, operation] of pending) {
+      setModelOverride(key, operation.previous);
+    }
+  };
+
   const load = async (options: SessionRefreshOptions) => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return;
     }
     const { append = false, force: _force, backgroundHydrate = false, ...requestOptions } = options;
@@ -623,8 +660,8 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
       publish({ ...state, loading: true, error: null, deletedSessions: [] });
     }
     try {
-      const result = await requestList(requestOptions);
-      if (disposed || gateway.snapshot.client !== client) {
+      const result = await requestSessionList(scope.client, requestOptions);
+      if (!isCurrentConnection(scope)) {
         return;
       }
       let nextResult =
@@ -665,7 +702,7 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
         deletedSessions: [],
       });
     } catch (error) {
-      if (!disposed && gateway.snapshot.client === client) {
+      if (isCurrentConnection(scope)) {
         publish({
           ...state,
           loading: backgroundHydrate ? state.loading : false,
@@ -677,9 +714,13 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
   };
 
   const drainRefreshQueue = async (options: SessionRefreshOptions) => {
+    const epoch = connectionEpoch;
     let next: SessionRefreshOptions | null = options;
     while (next) {
       await load(next);
+      if (disposed || connectionEpoch !== epoch) {
+        return;
+      }
       next = queuedRefresh;
       queuedRefresh = null;
     }
@@ -700,27 +741,32 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
       return Promise.resolve();
     }
     const request = drainRefreshQueue(options).finally(() => {
-      inFlight = null;
+      if (inFlight === request) {
+        inFlight = null;
+      }
     });
     inFlight = request;
     return request;
   };
 
   const create = async (params: SessionCreateParams = {}) => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || state.loading || disposed) {
+    const scope = captureConnection();
+    if (!scope || state.loading) {
       return null;
     }
     try {
       const { currentSessionKey, ...requestParams } = params;
-      const key = await requestSessionCreate(client, {
+      const key = await requestSessionCreate(scope.client, {
         ...requestParams,
         ...resolveSessionCreateParams(currentSessionKey, params.agentId),
       });
-      if (disposed || gateway.snapshot.client !== client) {
+      if (!isCurrentConnection(scope)) {
         return null;
       }
       await refresh({ agentId: params.agentId, force: true });
+      if (!isCurrentConnection(scope)) {
+        return null;
+      }
       // Creation can originate outside the sidebar. Notify presentation owners
       // after refresh so they can reconcile the new row without guessing from list churn.
       for (const listener of createdListeners) {
@@ -728,7 +774,9 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
       }
       return key;
     } catch (error) {
-      publish({ ...state, error: String(error) });
+      if (isCurrentConnection(scope)) {
+        publish({ ...state, error: String(error) });
+      }
       return null;
     }
   };
@@ -738,31 +786,51 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     patchParams: SessionPatch,
     options: { agentId?: string } = {},
   ): Promise<SessionsPatchResult | null> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return null;
     }
     const hasModelPatch = Object.hasOwn(patchParams, "model");
-    const previousModelOverride = state.modelOverrides[key.trim()];
+    const normalizedKey = key.trim();
+    const pendingModelPatch = pendingModelPatches.get(normalizedKey);
+    const previousModelOverride = pendingModelPatch
+      ? pendingModelPatch.previous
+      : state.modelOverrides[normalizedKey];
+    const modelPatchToken = Symbol();
     if (hasModelPatch) {
+      pendingModelPatches.set(normalizedKey, {
+        token: modelPatchToken,
+        previous: previousModelOverride,
+      });
       setModelOverride(key, patchParams.model);
     }
+    const restoreModelOverride = () => {
+      if (pendingModelPatches.get(normalizedKey)?.token !== modelPatchToken) {
+        return;
+      }
+      pendingModelPatches.delete(normalizedKey);
+      setModelOverride(key, previousModelOverride);
+    };
     try {
-      const result = await requestSessionPatch(client, key, patchParams, options);
-      if (disposed || gateway.snapshot.client !== client) {
-        if (hasModelPatch) {
-          setModelOverride(key, previousModelOverride);
-        }
+      const result = await requestSessionPatch(scope.client, key, patchParams, options);
+      if (!isCurrentConnection(scope)) {
+        restoreModelOverride();
         return null;
       }
       await refresh({ agentId: options.agentId, force: true });
-      if (hasModelPatch) {
+      if (!isCurrentConnection(scope)) {
+        restoreModelOverride();
+        return null;
+      }
+      if (pendingModelPatches.get(normalizedKey)?.token === modelPatchToken) {
+        pendingModelPatches.delete(normalizedKey);
         setModelOverride(key, patchParams.model);
       }
       return result;
     } catch (error) {
-      if (hasModelPatch) {
-        setModelOverride(key, previousModelOverride);
+      restoreModelOverride();
+      if (!isCurrentConnection(scope)) {
+        return null;
       }
       publish({ ...state, error: String(error) });
       throw error;
@@ -819,20 +887,23 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
   };
 
   const remove = async (key: string, options: SessionDeleteOptions = {}): Promise<boolean> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return false;
     }
     try {
-      await requestSessionDelete(client, key, options);
-      if (disposed || gateway.snapshot.client !== client) {
+      await requestSessionDelete(scope.client, key, options);
+      if (!isCurrentConnection(scope)) {
         return false;
       }
       publish({ ...state, deletedSessions: [{ key, agentId: options.agentId }] });
       setModelOverride(key, undefined);
       await refresh({ agentId: options.agentId, force: true });
-      return true;
+      return isCurrentConnection(scope);
     } catch (error) {
+      if (!isCurrentConnection(scope)) {
+        return false;
+      }
       publish({ ...state, error: String(error) });
       throw error;
     }
@@ -841,19 +912,19 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
   const removeMany = async (
     targets: readonly SessionDeleteTarget[],
   ): Promise<SessionDeleteBatchResult> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed || targets.length === 0) {
+    const scope = captureConnection();
+    if (!scope || targets.length === 0) {
       return { deleted: [], errors: [] };
     }
     const deleted: string[] = [];
     const errors: string[] = [];
     for (const target of targets) {
-      if (disposed || gateway.snapshot.client !== client) {
+      if (!isCurrentConnection(scope)) {
         break;
       }
       try {
-        await requestSessionDelete(client, target.key, target);
-        if (disposed || gateway.snapshot.client !== client) {
+        await requestSessionDelete(scope.client, target.key, target);
+        if (!isCurrentConnection(scope)) {
           break;
         }
         deleted.push(target.key);
@@ -861,7 +932,7 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
         errors.push(String(error));
       }
     }
-    if (deleted.length > 0 && !disposed && gateway.snapshot.client === client) {
+    if (deleted.length > 0 && isCurrentConnection(scope)) {
       publish({
         ...state,
         deletedSessions: targets.filter((target) => deleted.includes(target.key)),
@@ -871,17 +942,20 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
       }
       await refresh({ force: true });
     }
-    return { deleted, errors };
+    return isCurrentConnection(scope) ? { deleted, errors } : { deleted: [], errors: [] };
   };
 
   const reset = async (key: string, options: SessionResetOptions = {}): Promise<void> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return;
     }
     try {
-      await requestSessionReset(client, key, options);
+      await requestSessionReset(scope.client, key, options);
     } catch (error) {
+      if (!isCurrentConnection(scope)) {
+        return;
+      }
       publish({ ...state, error: String(error) });
       throw error;
     }
@@ -891,13 +965,13 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     key: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionCompactResult> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       throw new Error("Session compaction requires an active Gateway connection");
     }
-    const result = await requestSessionCompact(client, key, options);
-    if (disposed || gateway.snapshot.client !== client) {
-      throw new Error("Session compaction completed on a replaced Gateway client");
+    const result = await requestSessionCompact(scope.client, key, options);
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session compaction completed on a replaced Gateway connection");
     }
     return result;
   };
@@ -907,13 +981,13 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     message: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionSteerResult> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       throw new Error("Session steering requires an active Gateway connection");
     }
-    const result = await requestSessionSteer(client, key, message, options);
-    if (disposed || gateway.snapshot.client !== client) {
-      throw new Error("Session steering completed on a replaced Gateway client");
+    const result = await requestSessionSteer(scope.client, key, message, options);
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session steering completed on a replaced Gateway connection");
     }
     return result;
   };
@@ -922,12 +996,12 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     key: string,
     options: { agentId?: string | null; path?: string; search?: string } = {},
   ): Promise<SessionWorkspaceListResult | null> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return null;
     }
-    const result = await requestSessionFilesList(client, key, options);
-    return disposed || gateway.snapshot.client !== client ? null : result;
+    const result = await requestSessionFilesList(scope.client, key, options);
+    return isCurrentConnection(scope) ? result : null;
   };
 
   const getFile = async (
@@ -935,47 +1009,47 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     path: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionWorkspaceGetResult | null> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return null;
     }
-    const result = await requestSessionFile(client, key, path, options);
-    return disposed || gateway.snapshot.client !== client ? null : result;
+    const result = await requestSessionFile(scope.client, key, path, options);
+    return isCurrentConnection(scope) ? result : null;
   };
 
   const subscribeMessages = async (
     key: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionMessageSubscription> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       throw new Error("Session message subscription requires an active Gateway connection");
     }
-    const subscription = await subscribeSessionMessages(client, key, options);
-    if (disposed || gateway.snapshot.client !== client) {
-      throw new Error("Session message subscription completed on a replaced Gateway client");
+    const subscription = await subscribeSessionMessages(scope.client, key, options);
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session message subscription completed on a replaced Gateway connection");
     }
     return subscription;
   };
 
   const unsubscribeMessages = async (subscription: SessionMessageSubscription) => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return;
     }
-    await unsubscribeSessionMessages(client, subscription);
+    await unsubscribeSessionMessages(scope.client, subscription);
   };
 
   const listCheckpoints = async (
     key: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionCompactionCheckpoint[]> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       return [];
     }
-    const result = await listSessionCheckpoints(client, key, options);
-    return disposed || gateway.snapshot.client !== client ? [] : (result.checkpoints ?? []);
+    const result = await listSessionCheckpoints(scope.client, key, options);
+    return isCurrentConnection(scope) ? (result.checkpoints ?? []) : [];
   };
 
   const branchCheckpoint = async (
@@ -983,18 +1057,21 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     checkpointId: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionsCompactionBranchResult> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       throw new Error("Session checkpoint operation requires an active Gateway connection");
     }
-    const result = await branchSessionCheckpoint(client, key, checkpointId, options);
-    if (disposed || gateway.snapshot.client !== client) {
-      throw new Error("Session checkpoint operation completed on a replaced Gateway client");
+    const result = await branchSessionCheckpoint(scope.client, key, checkpointId, options);
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session checkpoint operation completed on a replaced Gateway connection");
     }
     await refresh({
       agentId: options.agentId ?? state.agentId ?? undefined,
       force: true,
     });
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session checkpoint operation completed on a replaced Gateway connection");
+    }
     return result;
   };
 
@@ -1003,22 +1080,35 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     checkpointId: string,
     options: { agentId?: string | null } = {},
   ): Promise<SessionsCompactionRestoreResult> => {
-    const client = gateway.snapshot.client;
-    if (!client || !gateway.snapshot.connected || disposed) {
+    const scope = captureConnection();
+    if (!scope) {
       throw new Error("Session checkpoint operation requires an active Gateway connection");
     }
-    const result = await restoreSessionCheckpoint(client, key, checkpointId, options);
-    if (disposed || gateway.snapshot.client !== client) {
-      throw new Error("Session checkpoint operation completed on a replaced Gateway client");
+    const result = await restoreSessionCheckpoint(scope.client, key, checkpointId, options);
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session checkpoint operation completed on a replaced Gateway connection");
     }
     await refresh({
       agentId: options.agentId ?? state.agentId ?? undefined,
       force: true,
     });
+    if (!isCurrentConnection(scope)) {
+      throw new Error("Session checkpoint operation completed on a replaced Gateway connection");
+    }
     return result;
   };
 
   const stopGateway = gateway.subscribe((next) => {
+    const connectionChanged =
+      next.client !== connectionClient || next.connected !== connectionConnected;
+    connectionClient = next.client;
+    connectionConnected = next.connected;
+    if (connectionChanged) {
+      connectionEpoch += 1;
+      inFlight = null;
+      queuedRefresh = null;
+      rollbackPendingModelPatches();
+    }
     if (!next.connected || !next.client) {
       subscribedClient = null;
       publish({
@@ -1032,17 +1122,20 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
       return;
     }
     if (subscribedClient !== next.client) {
-      const client = next.client;
-      subscribedClient = client;
+      const scope = captureConnection();
+      if (!scope) {
+        return;
+      }
+      subscribedClient = scope.client;
       void (async () => {
         try {
-          await subscribeSessionGateway(client);
+          await subscribeSessionGateway(scope.client);
         } catch (error) {
-          if (!disposed && gateway.snapshot.client === client) {
+          if (isCurrentConnection(scope)) {
             publish({ ...state, error: String(error) });
           }
         } finally {
-          if (!disposed && gateway.snapshot.client === client) {
+          if (isCurrentConnection(scope)) {
             const sessionKey = gateway.snapshot.sessionKey?.trim();
             await refresh({
               ...(sessionKey ? scopedAgentListParamsForSession(gateway.snapshot, sessionKey) : {}),
@@ -1137,12 +1230,16 @@ export function createSessionCapability(gateway: SessionGateway): SessionCapabil
     },
     dispose() {
       disposed = true;
+      connectionEpoch += 1;
+      connectionConnected = false;
+      inFlight = null;
+      queuedRefresh = null;
+      subscribedClient = null;
+      pendingModelPatches.clear();
       stopGateway();
       stopEvents();
       createdListeners.clear();
       listeners.clear();
-      inFlight = null;
-      queuedRefresh = null;
     },
   };
 }
diff --git a/ui/src/lib/skills/index.test.ts b/ui/src/lib/skills/index.test.ts
index 62dc22afb34..e51d6950724 100644
--- a/ui/src/lib/skills/index.test.ts
+++ b/ui/src/lib/skills/index.test.ts
@@ -599,6 +599,24 @@ describe("searchClawHub", () => {
     expect(state.clawhubSearchError).toBeNull();
     expect(state.clawhubSearchLoading).toBe(false);
   });
+
+  it("ignores a same-client search response from an older connection epoch", async () => {
+    const { state, request } = createState();
+    const queue = createDeferredRequestQueue(request);
+
+    const pending = searchClawHub(state, "github");
+    state.connected = false;
+    state.skillsAgentRevision++;
+    state.clawhubSearchLoading = false;
+    state.connected = true;
+    queue.resolveNext({
+      results: [{ score: 1, slug: "stale", displayName: "Stale" }],
+    });
+    await pending;
+
+    expect(state.clawhubSearchResults).toBeNull();
+    expect(state.clawhubSearchLoading).toBe(false);
+  });
 });
 
 describe("loadClawHubDetail", () => {
@@ -622,6 +640,24 @@ describe("loadClawHubDetail", () => {
     expect(state.clawhubDetailLoading).toBe(false);
     expect(state.clawhubDetail?.skill?.slug).toBe("gitlab");
   });
+
+  it("ignores a same-client detail response from an older connection epoch", async () => {
+    const { state, request } = createState();
+    const queue = createDeferredRequestQueue(request);
+
+    const pending = loadClawHubDetail(state, "github");
+    state.connected = false;
+    state.skillsAgentRevision++;
+    state.clawhubDetailLoading = false;
+    state.connected = true;
+    queue.resolveNext({
+      skill: { slug: "stale", displayName: "Stale", createdAt: 1, updatedAt: 2 },
+    });
+    await pending;
+
+    expect(state.clawhubDetail).toBeNull();
+    expect(state.clawhubDetailLoading).toBe(false);
+  });
 });
 
 describe("skill mutations", () => {
diff --git a/ui/src/lib/skills/index.ts b/ui/src/lib/skills/index.ts
index e4bfe0c9d34..157552c9283 100644
--- a/ui/src/lib/skills/index.ts
+++ b/ui/src/lib/skills/index.ts
@@ -537,13 +537,18 @@ export async function searchClawHub(state: SkillsState, query: string) {
     return;
   }
   const client = state.client;
+  const agentScope = captureSkillsAgentScope(state);
   // Clear stale entries as soon as a new search begins so the UI cannot act on
   // results that no longer match the current query while the next request is in flight.
   state.clawhubSearchResults = null;
   state.clawhubSearchLoading = true;
   state.clawhubSearchError = null;
   await runStaleAwareRequest(
-    () => query === state.clawhubSearchQuery,
+    () =>
+      state.connected &&
+      state.client === client &&
+      query === state.clawhubSearchQuery &&
+      isSkillsAgentScopeCurrent(state, agentScope),
     () =>
       client.request<{ results: ClawHubSearchResult[] }>("skills.search", {
         query,
@@ -566,12 +571,17 @@ export async function loadClawHubDetail(state: SkillsState, slug: string) {
     return;
   }
   const client = state.client;
+  const agentScope = captureSkillsAgentScope(state);
   state.clawhubDetailSlug = slug;
   state.clawhubDetailLoading = true;
   state.clawhubDetailError = null;
   state.clawhubDetail = null;
   await runStaleAwareRequest(
-    () => slug === state.clawhubDetailSlug,
+    () =>
+      state.connected &&
+      state.client === client &&
+      slug === state.clawhubDetailSlug &&
+      isSkillsAgentScopeCurrent(state, agentScope),
     () => client.request<ClawHubSkillDetail>("skills.detail", { slug }),
     (res) => {
       state.clawhubDetail = res ?? null;
diff --git a/ui/src/lit/openclaw-element.test.ts b/ui/src/lit/openclaw-element.test.ts
new file mode 100644
index 00000000000..c41f9a50874
--- /dev/null
+++ b/ui/src/lit/openclaw-element.test.ts
@@ -0,0 +1,74 @@
+import { html } from "lit";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { i18n, t } from "../i18n/index.ts";
+import { OpenClawLightDomElement, OpenClawLitElement } from "./openclaw-element.ts";
+
+const LIGHT_ELEMENT_NAME = "test-openclaw-light-dom-element";
+const SHADOW_ELEMENT_NAME = "test-openclaw-shadow-dom-element";
+
+class TestLightDomElement extends OpenClawLightDomElement {
+  renderCount = 0;
+
+  override render() {
+    this.renderCount += 1;
+    return html`<span>${t("common.refresh")}</span>`;
+  }
+}
+
+class TestShadowDomElement extends OpenClawLitElement {
+  override render() {
+    return html`<span>shadow content</span>`;
+  }
+}
+
+if (!customElements.get(LIGHT_ELEMENT_NAME)) {
+  customElements.define(LIGHT_ELEMENT_NAME, TestLightDomElement);
+}
+if (!customElements.get(SHADOW_ELEMENT_NAME)) {
+  customElements.define(SHADOW_ELEMENT_NAME, TestShadowDomElement);
+}
+
+describe("OpenClaw Lit elements", () => {
+  beforeEach(async () => {
+    await i18n.setLocale("en");
+  });
+
+  afterEach(async () => {
+    document.body.replaceChildren();
+    await i18n.setLocale("en");
+  });
+
+  it("provides explicit light- and shadow-DOM bases", async () => {
+    const light = document.createElement(LIGHT_ELEMENT_NAME) as TestLightDomElement;
+    const shadow = document.createElement(SHADOW_ELEMENT_NAME) as TestShadowDomElement;
+    document.body.append(light, shadow);
+
+    await Promise.all([light.updateComplete, shadow.updateComplete]);
+
+    expect(light.shadowRoot).toBeNull();
+    expect(light.textContent).toContain("Refresh");
+    expect(shadow.shadowRoot?.textContent).toContain("shadow content");
+  });
+
+  it("tracks locale changes across disconnect and reconnect", async () => {
+    const element = document.createElement(LIGHT_ELEMENT_NAME) as TestLightDomElement;
+    document.body.append(element);
+    await element.updateComplete;
+
+    const initialRenderCount = element.renderCount;
+    await i18n.setLocale("zh-CN");
+    await element.updateComplete;
+    expect(element.textContent).toContain("刷新");
+    expect(element.renderCount).toBe(initialRenderCount + 1);
+
+    element.remove();
+    const disconnectedRenderCount = element.renderCount;
+    await i18n.setLocale("en");
+    expect(element.renderCount).toBe(disconnectedRenderCount);
+
+    document.body.append(element);
+    await element.updateComplete;
+    expect(element.textContent).toContain("Refresh");
+    expect(element.renderCount).toBe(disconnectedRenderCount + 1);
+  });
+});
diff --git a/ui/src/lit/openclaw-element.ts b/ui/src/lit/openclaw-element.ts
new file mode 100644
index 00000000000..dea691bd2cc
--- /dev/null
+++ b/ui/src/lit/openclaw-element.ts
@@ -0,0 +1,14 @@
+import { LitElement } from "lit";
+import { I18nController } from "../i18n/lib/lit-controller.ts";
+
+/** Lit base that refreshes the element when the active locale changes. */
+export abstract class OpenClawLitElement extends LitElement {
+  protected readonly i18nController = new I18nController(this);
+}
+
+/** OpenClaw Lit base for components styled by the shared light-DOM stylesheet. */
+export abstract class OpenClawLightDomElement extends OpenClawLitElement {
+  override createRenderRoot() {
+    return this;
+  }
+}
diff --git a/ui/src/lit/subscriptions-controller.test.ts b/ui/src/lit/subscriptions-controller.test.ts
new file mode 100644
index 00000000000..aca9c75c73f
--- /dev/null
+++ b/ui/src/lit/subscriptions-controller.test.ts
@@ -0,0 +1,214 @@
+// @vitest-environment node
+import type { ReactiveController, ReactiveControllerHost } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { SubscriptionsController } from "./subscriptions-controller.ts";
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+class TestHost implements ReactiveControllerHost {
+  readonly controllers: ReactiveController[] = [];
+  readonly requestUpdate = vi.fn();
+  readonly updateComplete = Promise.resolve(true);
+
+  addController(controller: ReactiveController): void {
+    this.controllers.push(controller);
+  }
+
+  removeController(controller: ReactiveController): void {
+    const index = this.controllers.indexOf(controller);
+    if (index !== -1) {
+      this.controllers.splice(index, 1);
+    }
+  }
+
+  connect(): void {
+    for (const controller of this.controllers) {
+      controller.hostConnected?.();
+    }
+  }
+
+  update(): void {
+    for (const controller of this.controllers) {
+      controller.hostUpdate?.();
+    }
+  }
+
+  disconnect(): void {
+    for (const controller of this.controllers) {
+      controller.hostDisconnected?.();
+    }
+  }
+}
+
+class TestSource {
+  private listeners = new Set<() => void>();
+  readonly cleanups = vi.fn();
+
+  subscribe(listener: () => void): () => void {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+      this.cleanups();
+    };
+  }
+
+  notify(): void {
+    for (const listener of this.listeners) {
+      listener();
+    }
+  }
+}
+
+describe("SubscriptionsController", () => {
+  it("waits for a source, synchronizes once, and does not subscribe twice", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const synchronize = vi.fn<(source: TestSource) => void>();
+    const source: { current?: TestSource } = {};
+    controller.watch(
+      () => source.current,
+      (next, notify) => next.subscribe(notify),
+      synchronize,
+    );
+
+    host.connect();
+    host.update();
+    expect(synchronize).not.toHaveBeenCalled();
+
+    source.current = new TestSource();
+    host.update();
+    host.update();
+    expect(synchronize).toHaveBeenCalledTimes(1);
+
+    host.requestUpdate.mockClear();
+    source.current.notify();
+    expect(synchronize).toHaveBeenCalledTimes(2);
+    expect(host.requestUpdate).toHaveBeenCalledOnce();
+  });
+
+  it("replaces sources and ignores notifications from a stale subscription", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const first = new TestSource();
+    const second = new TestSource();
+    let source = first;
+    let staleNotify: (() => void) | undefined;
+    const synchronize = vi.fn<(source: TestSource) => void>();
+    controller.watch(
+      () => source,
+      (next, notify) => {
+        if (next === first) {
+          staleNotify = notify;
+        }
+        return next.subscribe(notify);
+      },
+      synchronize,
+    );
+
+    host.connect();
+    source = second;
+    host.update();
+
+    expect(first.cleanups).toHaveBeenCalledOnce();
+    expect(synchronize).toHaveBeenLastCalledWith(second);
+    host.requestUpdate.mockClear();
+    staleNotify?.();
+    expect(host.requestUpdate).not.toHaveBeenCalled();
+  });
+
+  it("cleans up on disconnect and resubscribes once after reconnect", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const source = new TestSource();
+    const subscribe = vi.fn((next: TestSource, notify: () => void) => next.subscribe(notify));
+    controller.watch(() => source, subscribe);
+
+    host.connect();
+    host.disconnect();
+    host.update();
+    host.disconnect();
+    expect(source.cleanups).toHaveBeenCalledOnce();
+    expect(subscribe).toHaveBeenCalledOnce();
+
+    host.connect();
+    host.update();
+    expect(subscribe).toHaveBeenCalledTimes(2);
+  });
+
+  it("clears idempotently and reconnects on the next update", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const source = new TestSource();
+    const subscribe = vi.fn((next: TestSource, notify: () => void) => next.subscribe(notify));
+    controller.watch(() => source, subscribe);
+
+    host.connect();
+    controller.clear();
+    controller.clear();
+    expect(source.cleanups).toHaveBeenCalledOnce();
+
+    host.update();
+    expect(subscribe).toHaveBeenCalledTimes(2);
+  });
+
+  it("leaves effect invalidation under caller control", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const source = new TestSource();
+    const listener = vi.fn();
+    controller.effect(
+      () => source,
+      (next) => next.subscribe(listener),
+    );
+
+    host.connect();
+    expect(host.requestUpdate).not.toHaveBeenCalled();
+    source.notify();
+
+    expect(listener).toHaveBeenCalledOnce();
+    expect(host.requestUpdate).not.toHaveBeenCalled();
+  });
+
+  it("cleans up a listener when initial synchronization throws", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const source = new TestSource();
+    controller.watch(
+      () => source,
+      (next, notify) => next.subscribe(notify),
+      () => {
+        throw new Error("synchronize failed");
+      },
+    );
+
+    expect(() => host.connect()).toThrow("synchronize failed");
+    expect(source.cleanups).toHaveBeenCalledOnce();
+  });
+
+  it("runs later cleanups when an earlier cleanup throws", () => {
+    const host = new TestHost();
+    const controller = new SubscriptionsController(host);
+    const firstCleanup = vi.fn(() => {
+      throw new Error("cleanup failed");
+    });
+    const secondCleanup = vi.fn();
+    const error = vi.spyOn(console, "error").mockImplementation(() => undefined);
+    controller.effect(
+      () => "first",
+      () => firstCleanup,
+    );
+    controller.effect(
+      () => "second",
+      () => secondCleanup,
+    );
+
+    host.connect();
+    controller.clear();
+
+    expect(firstCleanup).toHaveBeenCalledOnce();
+    expect(secondCleanup).toHaveBeenCalledOnce();
+    expect(error).toHaveBeenCalledOnce();
+  });
+});
diff --git a/ui/src/lit/subscriptions-controller.ts b/ui/src/lit/subscriptions-controller.ts
new file mode 100644
index 00000000000..d7ec9610cd2
--- /dev/null
+++ b/ui/src/lit/subscriptions-controller.ts
@@ -0,0 +1,149 @@
+import type { ReactiveController, ReactiveControllerHost } from "lit";
+
+type Cleanup = () => void;
+
+type SourceEntry<T> = {
+  readonly getSource: () => T | null | undefined;
+  readonly connect: (source: T) => Cleanup | undefined;
+  readonly invalidateOnConnect: boolean;
+  source: T | undefined;
+  cleanup: Cleanup | undefined;
+  generation: number;
+};
+
+/**
+ * Owns subscriptions whose sources can arrive or change after connection.
+ * Source identity is checked before every render and all cleanup follows the
+ * host lifecycle, so consumers do not need connected/updated retry loops.
+ */
+export class SubscriptionsController implements ReactiveController {
+  private readonly entries: SourceEntry<unknown>[] = [];
+  private connected = false;
+
+  constructor(private readonly host: ReactiveControllerHost) {
+    host.addController(this);
+  }
+
+  watch<T>(
+    getSource: () => T | null | undefined,
+    subscribe: (source: T, notify: () => void) => Cleanup,
+    synchronize?: (source: T) => void,
+  ): this {
+    return this.addEntry(
+      getSource,
+      (source, entry) => {
+        const generation = entry.generation;
+        const notify = () => {
+          if (
+            !this.connected ||
+            entry.generation !== generation ||
+            !Object.is(entry.source, source)
+          ) {
+            return;
+          }
+          synchronize?.(source);
+          this.host.requestUpdate();
+        };
+        const cleanup = subscribe(source, notify);
+        // Make cleanup visible before synchronization in case initial state
+        // projection throws after the external listener is already registered.
+        entry.cleanup = cleanup;
+        synchronize?.(source);
+        return cleanup;
+      },
+      true,
+    );
+  }
+
+  effect<T>(
+    getSource: () => T | null | undefined,
+    connect: (source: T) => Cleanup | undefined,
+  ): this {
+    return this.addEntry(getSource, (source) => connect(source), false);
+  }
+
+  hostConnected(): void {
+    this.connected = true;
+    this.refresh(true);
+  }
+
+  hostUpdate(): void {
+    if (this.connected) {
+      this.refresh(false);
+    }
+  }
+
+  clear(): void {
+    for (const entry of this.entries) {
+      this.disconnectEntry(entry);
+    }
+  }
+
+  hostDisconnected(): void {
+    this.connected = false;
+    this.clear();
+  }
+
+  private addEntry<T>(
+    getSource: () => T | null | undefined,
+    connect: (source: T, entry: SourceEntry<T>) => Cleanup | undefined,
+    invalidateOnConnect: boolean,
+  ): this {
+    const entry: SourceEntry<T> = {
+      getSource,
+      connect: (source) => connect(source, entry),
+      invalidateOnConnect,
+      source: undefined,
+      cleanup: undefined,
+      generation: 0,
+    };
+    this.entries.push(entry as SourceEntry<unknown>);
+    if (this.connected) {
+      this.refreshEntry(entry, invalidateOnConnect);
+    }
+    return this;
+  }
+
+  private refresh(requestUpdate: boolean): void {
+    for (const entry of this.entries) {
+      this.refreshEntry(entry, requestUpdate && entry.invalidateOnConnect);
+    }
+  }
+
+  private refreshEntry<T>(entry: SourceEntry<T>, requestUpdate: boolean): void {
+    const source = entry.getSource() ?? undefined;
+    if (Object.is(entry.source, source)) {
+      return;
+    }
+    this.disconnectEntry(entry);
+    if (source === undefined) {
+      return;
+    }
+    entry.source = source;
+    entry.generation += 1;
+    try {
+      entry.cleanup = entry.connect(source);
+    } catch (error) {
+      this.disconnectEntry(entry);
+      throw error;
+    }
+    if (requestUpdate) {
+      this.host.requestUpdate();
+    }
+  }
+
+  private disconnectEntry<T>(entry: SourceEntry<T>): void {
+    entry.generation += 1;
+    entry.source = undefined;
+    const cleanup = entry.cleanup;
+    entry.cleanup = undefined;
+    if (!cleanup) {
+      return;
+    }
+    try {
+      cleanup();
+    } catch (error) {
+      console.error("[openclaw] subscription cleanup failed", error);
+    }
+  }
+}
diff --git a/ui/src/pages/activity/activity-page.test.ts b/ui/src/pages/activity/activity-page.test.ts
new file mode 100644
index 00000000000..50e834b3f11
--- /dev/null
+++ b/ui/src/pages/activity/activity-page.test.ts
@@ -0,0 +1,73 @@
+/* @vitest-environment jsdom */
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import type { ActivityEntry } from "./tool-activity.ts";
+import "./activity-page.ts";
+
+type TestActivityPage = HTMLElement & {
+  context: ApplicationContext;
+  entries: ActivityEntry[];
+  subscriptions: {
+    hostConnected: () => void;
+    hostUpdate: () => void;
+    hostDisconnected: () => void;
+  };
+};
+
+function gateway(): ApplicationContext["gateway"] {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client: null,
+    connected: false,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  return {
+    snapshot,
+    eventLog: [],
+    subscribe: vi.fn(() => () => undefined),
+    subscribeEvents: vi.fn(() => () => undefined),
+  } as unknown as ApplicationContext["gateway"];
+}
+
+function staleEntry(): ActivityEntry {
+  return {
+    id: "stale",
+    toolCallId: "stale",
+    runId: "stale",
+    toolName: "stale",
+    status: "done",
+    startedAt: 0,
+    updatedAt: 0,
+    durationMs: 0,
+    outputTruncated: false,
+    summary: "stale",
+    hiddenArgumentCount: 0,
+  };
+}
+
+afterEach(() => {
+  localStorage.clear();
+});
+
+describe("ActivityPage gateway lifecycle", () => {
+  it("replays the active gateway on initial bind and source replacement", () => {
+    const page = document.createElement("openclaw-activity-page") as TestActivityPage;
+    page.context = { gateway: gateway() } as unknown as ApplicationContext;
+    page.entries = [staleEntry()];
+
+    page.subscriptions.hostConnected();
+    expect(page.entries).toEqual([]);
+
+    page.entries = [staleEntry()];
+    page.context = { gateway: gateway() } as unknown as ApplicationContext;
+    page.subscriptions.hostUpdate();
+    expect(page.entries).toEqual([]);
+
+    page.subscriptions.hostDisconnected();
+  });
+});
diff --git a/ui/src/pages/activity/activity-page.ts b/ui/src/pages/activity/activity-page.ts
index 23823a64b5a..8f20869f18e 100644
--- a/ui/src/pages/activity/activity-page.ts
+++ b/ui/src/pages/activity/activity-page.ts
@@ -1,13 +1,19 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { state } from "lit/decorators.js";
 import type { EventLogEntry } from "../../api/event-log.ts";
 import type { GatewayEventFrame } from "../../api/gateway.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { loadSettings } from "../../app/settings.ts";
 import { resolveSessionKey } from "../../lib/sessions/index.ts";
 import { uiSessionEventMatches } from "../../lib/sessions/session-key.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import {
   parseToolActivityEvent,
   updateToolActivity,
@@ -18,12 +24,8 @@ import { renderActivity } from "./view.ts";
 
 let activityClearBoundary: EventLogEntry | undefined;
 
-class ActivityPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class ActivityPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private entries: ActivityEntry[] = [];
@@ -39,50 +41,32 @@ class ActivityPage extends LitElement {
   @state() private atBottom = true;
 
   private sessionKey = "";
-  private replayFrame: number | null = null;
   private scrollFrame: number | null = null;
-  private stopGatewaySubscription?: () => void;
-  private stopGatewayEvents?: () => void;
+  private readonly subscriptions = new SubscriptionsController(this).effect(
+    () => this.context?.gateway,
+    (gateway) => {
+      this.applyGatewaySnapshot(gateway, gateway.snapshot, true);
+      const stopEvents = gateway.subscribeEvents((event) => {
+        this.applyGatewayEvent(gateway, event, Date.now());
+      });
+      const stopGateway = gateway.subscribe((snapshot) =>
+        this.applyGatewaySnapshot(gateway, snapshot, false),
+      );
+      return () => {
+        stopGateway();
+        stopEvents();
+      };
+    },
+  );
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncSessionKey();
-    this.stopGatewayEvents = this.context.gateway.subscribeEvents((event) => {
-      this.applyGatewayEvent(event, Date.now());
-    });
-    this.stopGatewaySubscription = this.context.gateway.subscribe(() => {
-      const previousSessionKey = this.sessionKey;
-      this.syncSessionKey();
-      if (this.sessionKey !== previousSessionKey) {
-        this.rebuildEntries();
-      }
-    });
-  }
-
-  override firstUpdated() {
-    this.replayFrame = requestAnimationFrame(() => {
-      this.replayFrame = null;
-      if (this.isConnected) {
-        this.rebuildEntries();
-      }
-    });
-  }
-
-  override updated(changed: Map<PropertyKey, unknown>) {
+  override updated(changed: PropertyValues) {
     if (this.autoFollow && this.atBottom && (changed.has("entries") || changed.has("autoFollow"))) {
       this.scheduleScroll(changed.has("autoFollow"));
     }
   }
 
   override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopGatewayEvents?.();
-    this.stopGatewayEvents = undefined;
-    if (this.replayFrame !== null) {
-      cancelAnimationFrame(this.replayFrame);
-      this.replayFrame = null;
-    }
+    this.subscriptions.clear();
     if (this.scrollFrame !== null) {
       cancelAnimationFrame(this.scrollFrame);
       this.scrollFrame = null;
@@ -90,18 +74,28 @@ class ActivityPage extends LitElement {
     super.disconnectedCallback();
   }
 
-  private syncSessionKey() {
-    const snapshot = this.context.gateway.snapshot;
+  private applyGatewaySnapshot(
+    gateway: ApplicationContext["gateway"],
+    snapshot: ApplicationGatewaySnapshot,
+    sourceChanged: boolean,
+  ) {
+    const previousSessionKey = this.sessionKey;
     this.sessionKey = resolveSessionKey(loadSettings().sessionKey, snapshot.hello);
+    if (sourceChanged || this.sessionKey !== previousSessionKey) {
+      this.rebuildEntries(gateway, snapshot);
+    }
   }
 
-  private rebuildEntries() {
+  private rebuildEntries(
+    gateway: ApplicationContext["gateway"],
+    snapshot: ApplicationGatewaySnapshot,
+  ) {
     let entries: ActivityEntry[] = [];
-    const eventLog = this.context.gateway.eventLog;
+    const eventLog = gateway.eventLog;
     const clearIndex = activityClearBoundary ? eventLog.indexOf(activityClearBoundary) : -1;
     const visibleEvents = clearIndex < 0 ? eventLog : eventLog.slice(0, clearIndex);
     for (const event of visibleEvents.toReversed()) {
-      entries = this.reduceGatewayEvent(entries, event.event, event.payload, event.ts);
+      entries = this.reduceGatewayEvent(entries, snapshot, event.event, event.payload, event.ts);
     }
     if (entries.length > 0 || this.entries.length > 0) {
       this.entries = entries;
@@ -112,9 +106,17 @@ class ActivityPage extends LitElement {
     this.atBottom = true;
   }
 
-  private applyGatewayEvent(event: GatewayEventFrame, receivedAt: number) {
+  private applyGatewayEvent(
+    gateway: ApplicationContext["gateway"],
+    event: GatewayEventFrame,
+    receivedAt: number,
+  ) {
+    if (this.context.gateway !== gateway) {
+      return;
+    }
     const nextEntries = this.reduceGatewayEvent(
       this.entries,
+      gateway.snapshot,
       event.event,
       event.payload,
       receivedAt,
@@ -126,6 +128,7 @@ class ActivityPage extends LitElement {
 
   private reduceGatewayEvent(
     entries: ActivityEntry[],
+    gateway: ApplicationGatewaySnapshot,
     eventName: string,
     payload: unknown,
     receivedAt: number,
@@ -137,7 +140,6 @@ class ActivityPage extends LitElement {
     if (!event) {
       return entries;
     }
-    const gateway = this.context.gateway.snapshot;
     if (
       !uiSessionEventMatches(
         {
diff --git a/ui/src/pages/agents/agents-page.test.ts b/ui/src/pages/agents/agents-page.test.ts
new file mode 100644
index 00000000000..90ea076f7f3
--- /dev/null
+++ b/ui/src/pages/agents/agents-page.test.ts
@@ -0,0 +1,415 @@
+/* @vitest-environment jsdom */
+
+import { describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type {
+  AgentsFilesListResult,
+  AgentsListResult,
+  ToolsEffectiveResult,
+} from "../../api/types.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import type { AgentsRouteData } from "./agents-page.ts";
+import "./agents-page.ts";
+
+type TestAgentsPage = HTMLElement & {
+  context: ApplicationContext;
+  client: GatewayBrowserClient | null;
+  connected: boolean;
+  agentsList: unknown;
+  agentsSelectedId: string | null;
+  routeData?: AgentsRouteData;
+  agentFilesLoading: boolean;
+  agentFilesList: AgentsFilesListResult | null;
+  agentFileContents: Record<string, string>;
+  agentIdentityLoading: boolean;
+  agentsPanel: string;
+  toolsEffectiveLoading: boolean;
+  toolsEffectiveResult: ToolsEffectiveResult | null;
+  requestGeneration: number;
+  routeDataInitialized: boolean;
+  subscriptions: {
+    hostConnected: () => void;
+    hostUpdate: () => void;
+    hostDisconnected: () => void;
+  };
+  willUpdate: (changed: Map<PropertyKey, unknown>) => void;
+  applyGatewaySnapshot: (snapshot: ApplicationGatewaySnapshot, sourceChanged: boolean) => void;
+  ensureAgentIdentities: () => void;
+  loadEffectiveToolsForAgent: (agentId: string) => void;
+  loadAgentFiles: (agentId: string, force?: boolean) => Promise<void>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((next) => {
+    resolve = next;
+  });
+  return { promise, resolve };
+}
+
+function snapshot(
+  client: GatewayBrowserClient | null,
+  connected = true,
+): ApplicationGatewaySnapshot {
+  return {
+    client,
+    connected,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+}
+
+function gateway(current: ApplicationGatewaySnapshot): ApplicationContext["gateway"] {
+  return {
+    snapshot: current,
+    subscribe: vi.fn(() => () => undefined),
+  } as unknown as ApplicationContext["gateway"];
+}
+
+function files(agentId: string, workspace: string): AgentsFilesListResult {
+  return { agentId, workspace, files: [] };
+}
+
+const agentsList: AgentsListResult = {
+  defaultId: "main",
+  mainKey: "main",
+  scope: "per-sender",
+  agents: [{ id: "main", name: "Main" }],
+};
+
+function agentsCapability(ensureFiles: () => Promise<AgentsFilesListResult>) {
+  return {
+    state: {
+      client: null,
+      connected: true,
+      agentsLoading: false,
+      agentsError: null,
+      agentsList,
+    },
+    files: () => ({ list: null, loading: false, error: null }),
+    ensureList: vi.fn(async () => agentsList),
+    refreshList: vi.fn(async () => agentsList),
+    ensureFiles,
+    refreshFiles: ensureFiles,
+    subscribe: vi.fn(() => () => undefined),
+  } as unknown as ApplicationContext["agents"];
+}
+
+function pageContext(
+  currentGateway: ApplicationContext["gateway"],
+  agents: ApplicationContext["agents"],
+  options?: {
+    agentIdentity?: ApplicationContext["agentIdentity"];
+    sessions?: ApplicationContext["sessions"];
+  },
+): ApplicationContext {
+  const subscribe = vi.fn(() => () => undefined);
+  return {
+    gateway: currentGateway,
+    agents,
+    agentIdentity:
+      options?.agentIdentity ??
+      ({
+        get: () => ({ agentId: "main" }),
+        entries: () => [],
+        ensure: vi.fn(async () => undefined),
+        subscribe,
+      } as unknown as ApplicationContext["agentIdentity"]),
+    sessions:
+      options?.sessions ??
+      ({
+        state: { result: null, modelOverrides: {} },
+        subscribe,
+      } as unknown as ApplicationContext["sessions"]),
+    channels: { subscribe },
+    runtimeConfig: { subscribe },
+  } as unknown as ApplicationContext;
+}
+
+describe("AgentsPage gateway lifecycle", () => {
+  it("preserves matching initial route data, then resets it on provider replacement", () => {
+    const client = {} as GatewayBrowserClient;
+    const currentGateway = gateway(snapshot(client, false));
+    const preloadedAgents = {
+      defaultId: "main",
+      mainKey: "main",
+      scope: "per-sender",
+      agents: [{ id: "main", name: "Main" }],
+    };
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    page.routeData = {
+      gateway: currentGateway,
+      gatewaySnapshot: currentGateway.snapshot,
+      agentsList: preloadedAgents,
+      selectedAgentId: "main",
+      error: null,
+    };
+    page.context = { gateway: currentGateway } as unknown as ApplicationContext;
+    page.willUpdate(new Map([["routeData", undefined]]));
+
+    page.subscriptions.hostConnected();
+    expect(page.client).toBe(client);
+    expect(page.agentsList).toBe(preloadedAgents);
+    expect(page.agentsSelectedId).toBe("main");
+    expect(page.requestGeneration).toBe(0);
+
+    page.context = { gateway: gateway(snapshot(client, false)) } as unknown as ApplicationContext;
+    page.subscriptions.hostUpdate();
+    expect(page.agentsList).toBeNull();
+    expect(page.agentsSelectedId).toBeNull();
+    expect(page.requestGeneration).toBeGreaterThan(0);
+    page.subscriptions.hostDisconnected();
+  });
+
+  it("rejects preloaded data after a same-client gateway source replacement", async () => {
+    const client = {} as GatewayBrowserClient;
+    const preloadedSnapshot = snapshot(client);
+    const preloadedGateway = gateway(preloadedSnapshot);
+    const currentGateway = gateway(preloadedSnapshot);
+    const ensureList = vi.fn(async () => null);
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    page.client = client;
+    page.connected = true;
+    page.routeData = {
+      gateway: preloadedGateway,
+      gatewaySnapshot: preloadedSnapshot,
+      agentsList,
+      selectedAgentId: "main",
+      error: null,
+    };
+    page.context = {
+      gateway: currentGateway,
+      agents: {
+        state: { agentsLoading: false, agentsError: null, agentsList: null },
+        ensureList,
+        files: () => ({ list: null, loading: false, error: null }),
+      },
+      agentIdentity: { get: () => null },
+      runtimeConfig: { state: { configSnapshot: {}, configLoading: false } },
+    } as unknown as ApplicationContext;
+
+    page.willUpdate(new Map([["routeData", undefined]]));
+    await Promise.resolve();
+
+    expect(page.agentsList).toBeNull();
+    expect(ensureList).toHaveBeenCalledOnce();
+  });
+
+  it("does not let an old-client file load overwrite a replacement load", async () => {
+    let resolveFirst!: (value: AgentsFilesListResult) => void;
+    let resolveSecond!: (value: AgentsFilesListResult) => void;
+    const first = new Promise<AgentsFilesListResult>((resolve) => {
+      resolveFirst = resolve;
+    });
+    const second = new Promise<AgentsFilesListResult>((resolve) => {
+      resolveSecond = resolve;
+    });
+    const ensureFiles = vi.fn().mockReturnValueOnce(first).mockReturnValueOnce(second);
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    const oldClient = {} as GatewayBrowserClient;
+    const nextClient = {} as GatewayBrowserClient;
+    page.client = oldClient;
+    page.connected = true;
+    page.agentsSelectedId = "main";
+    page.context = {
+      agents: {
+        files: () => ({ list: null, loading: false, error: null }),
+        ensureFiles,
+        refreshFiles: ensureFiles,
+      },
+    } as unknown as ApplicationContext;
+
+    const oldLoad = page.loadAgentFiles("main");
+    expect(page.agentFilesLoading).toBe(true);
+
+    page.applyGatewaySnapshot(snapshot(nextClient), false);
+    page.agentsSelectedId = "main";
+    const replacementLoad = page.loadAgentFiles("main");
+    expect(page.agentFilesLoading).toBe(true);
+
+    resolveFirst(files("main", "old"));
+    await oldLoad;
+    expect(page.agentFilesList).toBeNull();
+    expect(page.agentFilesLoading).toBe(true);
+
+    resolveSecond(files("main", "new"));
+    await replacementLoad;
+    expect(page.agentFilesList?.workspace).toBe("new");
+    expect(page.agentFilesLoading).toBe(false);
+  });
+
+  it("retries an in-flight panel load after a same-client disconnect", async () => {
+    let resolveFirst!: (value: AgentsFilesListResult) => void;
+    let resolveSecond!: (value: AgentsFilesListResult) => void;
+    const first = new Promise<AgentsFilesListResult>((resolve) => {
+      resolveFirst = resolve;
+    });
+    const second = new Promise<AgentsFilesListResult>((resolve) => {
+      resolveSecond = resolve;
+    });
+    const ensureFiles = vi.fn().mockReturnValueOnce(first).mockReturnValueOnce(second);
+    const client = {} as GatewayBrowserClient;
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    page.client = client;
+    page.connected = true;
+    page.agentsList = {
+      defaultId: "main",
+      mainKey: "main",
+      scope: "per-sender",
+      agents: [{ id: "main", name: "Main" }],
+    };
+    page.agentsSelectedId = "main";
+    page.agentFileContents = { "cached.md": "keep" };
+    page.routeDataInitialized = true;
+    page.context = {
+      agents: {
+        files: () => ({ list: null, loading: false, error: null }),
+        ensureFiles,
+        refreshFiles: ensureFiles,
+      },
+      agentIdentity: { get: () => ({ agentId: "main" }) },
+      runtimeConfig: { state: { configSnapshot: {}, configLoading: false } },
+    } as unknown as ApplicationContext;
+
+    const oldLoad = page.loadAgentFiles("main");
+    expect(page.agentFilesLoading).toBe(true);
+
+    page.applyGatewaySnapshot(snapshot(client, false), false);
+    expect(page.agentFilesLoading).toBe(false);
+    expect(page.agentFileContents).toEqual({ "cached.md": "keep" });
+
+    page.applyGatewaySnapshot(snapshot(client), false);
+    expect(ensureFiles).toHaveBeenCalledTimes(2);
+    expect(page.agentFilesLoading).toBe(true);
+
+    resolveFirst(files("main", "old"));
+    await oldLoad;
+    expect(page.agentFilesList).toBeNull();
+    expect(page.agentFilesLoading).toBe(true);
+
+    resolveSecond(files("main", "new"));
+    await vi.waitFor(() => expect(page.agentFilesList?.workspace).toBe("new"));
+    expect(page.agentFilesLoading).toBe(false);
+  });
+
+  it("rejects a file result from a replaced agents capability", async () => {
+    const oldFiles = deferred<AgentsFilesListResult>();
+    const nextFiles = deferred<AgentsFilesListResult>();
+    const client = {} as GatewayBrowserClient;
+    const currentGateway = gateway(snapshot(client));
+    const oldAgents = agentsCapability(() => oldFiles.promise);
+    const nextAgents = agentsCapability(() => nextFiles.promise);
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    const context = pageContext(currentGateway, oldAgents);
+    page.context = context;
+    page.subscriptions.hostConnected();
+
+    const oldLoad = page.loadAgentFiles("main");
+    expect(page.agentFilesLoading).toBe(true);
+
+    page.context = { ...context, agents: nextAgents };
+    page.subscriptions.hostUpdate();
+    const nextLoad = page.loadAgentFiles("main");
+    expect(page.agentFilesLoading).toBe(true);
+
+    oldFiles.resolve(files("main", "old"));
+    await oldLoad;
+    expect(page.agentFilesList).toBeNull();
+    expect(page.agentFilesLoading).toBe(true);
+
+    nextFiles.resolve(files("main", "new"));
+    await nextLoad;
+    expect(page.agentFilesList?.workspace).toBe("new");
+    expect(page.agentFilesLoading).toBe(false);
+    page.subscriptions.hostDisconnected();
+  });
+
+  it("keeps replacement identity loading active when the old capability settles", async () => {
+    const oldEnsure = deferred<void>();
+    const nextEnsure = deferred<void>();
+    const client = {} as GatewayBrowserClient;
+    const currentGateway = gateway(snapshot(client));
+    const agents = agentsCapability(async () => files("main", "unused"));
+    const identity = (ensure: () => Promise<void>) =>
+      ({
+        get: () => null,
+        entries: () => [],
+        ensure: vi.fn(ensure),
+        subscribe: vi.fn(() => () => undefined),
+      }) as unknown as ApplicationContext["agentIdentity"];
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    const context = pageContext(currentGateway, agents, {
+      agentIdentity: identity(() => oldEnsure.promise),
+    });
+    page.context = context;
+    page.subscriptions.hostConnected();
+    page.ensureAgentIdentities();
+    expect(page.agentIdentityLoading).toBe(true);
+
+    page.context = {
+      ...context,
+      agentIdentity: identity(() => nextEnsure.promise),
+    };
+    page.subscriptions.hostUpdate();
+    expect(page.agentIdentityLoading).toBe(true);
+
+    oldEnsure.resolve();
+    await oldEnsure.promise;
+    await Promise.resolve();
+    expect(page.agentIdentityLoading).toBe(true);
+
+    nextEnsure.resolve();
+    await nextEnsure.promise;
+    await vi.waitFor(() => expect(page.agentIdentityLoading).toBe(false));
+    page.subscriptions.hostDisconnected();
+  });
+
+  it("rejects effective-tools results from a replaced sessions capability", async () => {
+    const oldResult = deferred<ToolsEffectiveResult>();
+    const nextResult = deferred<ToolsEffectiveResult>();
+    const request = vi
+      .fn()
+      .mockReturnValueOnce(oldResult.promise)
+      .mockReturnValueOnce(nextResult.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const currentGateway = gateway(snapshot(client));
+    const agents = agentsCapability(async () => files("main", "unused"));
+    const oldSessions = {
+      state: { result: null, modelOverrides: {} },
+      subscribe: vi.fn(() => () => undefined),
+    } as unknown as ApplicationContext["sessions"];
+    const nextSessions = {
+      state: { result: null, modelOverrides: {} },
+      subscribe: vi.fn(() => () => undefined),
+    } as unknown as ApplicationContext["sessions"];
+    const page = document.createElement("openclaw-agents-page") as TestAgentsPage;
+    const context = pageContext(currentGateway, agents, { sessions: oldSessions });
+    page.context = context;
+    page.subscriptions.hostConnected();
+    page.agentsPanel = "overview";
+
+    page.loadEffectiveToolsForAgent("main");
+    expect(page.toolsEffectiveLoading).toBe(true);
+
+    page.context = { ...context, sessions: nextSessions };
+    page.subscriptions.hostUpdate();
+    page.loadEffectiveToolsForAgent("main");
+    expect(page.toolsEffectiveLoading).toBe(true);
+
+    oldResult.resolve({ profile: "old" } as ToolsEffectiveResult);
+    await oldResult.promise;
+    await Promise.resolve();
+    expect(page.toolsEffectiveResult).toBeNull();
+    expect(page.toolsEffectiveLoading).toBe(true);
+
+    nextResult.resolve({ profile: "new" } as ToolsEffectiveResult);
+    await nextResult.promise;
+    await vi.waitFor(() => expect(page.toolsEffectiveResult?.profile).toBe("new"));
+    expect(page.toolsEffectiveLoading).toBe(false);
+    page.subscriptions.hostDisconnected();
+  });
+});
diff --git a/ui/src/pages/agents/agents-page.ts b/ui/src/pages/agents/agents-page.ts
index 1565ad1f0f9..66504ce6b8d 100644
--- a/ui/src/pages/agents/agents-page.ts
+++ b/ui/src/pages/agents/agents-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type {
@@ -12,7 +12,11 @@ import type {
   ToolsEffectiveResult,
 } from "../../api/types.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import {
   resolveAgentConfig,
@@ -38,23 +42,27 @@ import {
 } from "../../lib/cron/index.ts";
 import { parseAgentSessionKey } from "../../lib/sessions/session-key.ts";
 import { normalizeStringEntries } from "../../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { loadAgentFileContent, saveAgentFile } from "./files.ts";
 import { loadAgentSkills } from "./skills.ts";
 import { renderAgents } from "./view.ts";
 
 export type AgentsRouteData = {
-  connected: boolean;
+  // Client identity alone cannot distinguish provider replacement or reconnect epochs.
+  gateway: ApplicationContext["gateway"];
+  gatewaySnapshot: ApplicationGatewaySnapshot;
   agentsList: AgentsListResult | null;
   selectedAgentId: string | null;
   error: string | null;
 };
 
-class AgentsPage extends LitElement implements AgentsState {
-  override createRenderRoot() {
-    return this;
-  }
+type AgentsRequestSources = Partial<
+  Pick<ApplicationContext, "agents" | "agentIdentity" | "sessions">
+>;
 
-  @consume({ context: applicationContext, subscribe: false })
+class AgentsPage extends OpenClawLightDomElement implements AgentsState {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @property({ attribute: false }) routeData?: AgentsRouteData;
@@ -92,13 +100,127 @@ class AgentsPage extends LitElement implements AgentsState {
   @state() skillsFilter = "";
   @state() private cron = createInitialCronState();
 
+  requestGeneration = 0;
   private routeDataInitialized = false;
-  private stopGatewaySubscription?: () => void;
-  private stopAgentsSubscription?: () => void;
-  private stopAgentIdentitySubscription?: () => void;
-  private stopChannelsSubscription?: () => void;
-  private stopConfigSubscription?: () => void;
-  private stopSessionsSubscription?: () => void;
+  private hasBoundGateway = false;
+  private gatewaySource: ApplicationContext["gateway"] | null = null;
+  private hasBoundAgents = false;
+  private agentsSource: ApplicationContext["agents"] | null = null;
+  private hasBoundAgentIdentity = false;
+  private agentIdentitySource: ApplicationContext["agentIdentity"] | null = null;
+  private hasBoundSessions = false;
+  private sessionsSource: ApplicationContext["sessions"] | null = null;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.agents,
+      (agents) => {
+        const resetForSourceBind = this.hasBoundAgents;
+        this.hasBoundAgents = true;
+        this.agentsSource = agents;
+        if (resetForSourceBind) {
+          this.resetForAgentsSourceChange();
+        }
+        this.syncAgentState(agents);
+        this.ensureInitialData();
+        const stop = agents.subscribe(() => {
+          if (this.agentsSource !== agents || this.context.agents !== agents) {
+            return;
+          }
+          this.syncAgentState(agents);
+          this.ensureAgentIdentities();
+          this.loadActivePanelData();
+          this.requestUpdate();
+        });
+        return () => {
+          stop();
+          if (this.agentsSource === agents) {
+            this.agentsSource = null;
+          }
+        };
+      },
+    )
+    .effect(
+      () => this.context?.agentIdentity,
+      (agentIdentity) => {
+        const resetForSourceBind = this.hasBoundAgentIdentity;
+        this.hasBoundAgentIdentity = true;
+        this.agentIdentitySource = agentIdentity;
+        if (resetForSourceBind) {
+          this.invalidateTransientRequests();
+          this.agentIdentityError = null;
+        }
+        this.ensureAgentIdentities();
+        this.ensureInitialData();
+        const stop = agentIdentity.subscribe(() => {
+          if (
+            this.agentIdentitySource === agentIdentity &&
+            this.context.agentIdentity === agentIdentity
+          ) {
+            this.requestUpdate();
+          }
+        });
+        return () => {
+          stop();
+          if (this.agentIdentitySource === agentIdentity) {
+            this.agentIdentitySource = null;
+          }
+        };
+      },
+    )
+    .watch(
+      () => this.context?.channels,
+      (channels, notify) => channels.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig, notify) => runtimeConfig.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.sessions,
+      (sessions) => {
+        const resetForSourceBind = this.hasBoundSessions;
+        this.hasBoundSessions = true;
+        this.sessionsSource = sessions;
+        if (resetForSourceBind) {
+          this.invalidateTransientRequests();
+          resetToolsEffectiveState(this);
+          this.loadActivePanelData();
+        }
+        const stop = sessions.subscribe(() => {
+          if (this.sessionsSource !== sessions || this.context.sessions !== sessions) {
+            return;
+          }
+          void refreshVisibleToolsEffectiveForCurrentSession(this);
+          this.requestUpdate();
+        });
+        return () => {
+          stop();
+          if (this.sessionsSource === sessions) {
+            this.sessionsSource = null;
+          }
+        };
+      },
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const initialBind = !this.hasBoundGateway;
+        this.hasBoundGateway = true;
+        this.gatewaySource = gateway;
+        this.applyGatewaySnapshot(gateway.snapshot, !initialBind, initialBind);
+        const stop = gateway.subscribe((snapshot) => {
+          if (this.gatewaySource === gateway && this.context.gateway === gateway) {
+            this.applyGatewaySnapshot(snapshot, false);
+          }
+        });
+        return () => {
+          stop();
+          if (this.gatewaySource === gateway) {
+            this.gatewaySource = null;
+          }
+        };
+      },
+    );
 
   get sessions() {
     return this.context.sessions;
@@ -112,79 +234,56 @@ class AgentsPage extends LitElement implements AgentsState {
     return this.context.gateway.snapshot.sessionKey;
   }
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncGatewayState();
-    this.syncAgentState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe((snapshot) => {
-      const previousClient = this.client;
-      this.syncGatewayState();
-      if (previousClient !== snapshot.client) {
-        this.resetForClientChange();
-      }
-      this.ensureInitialData();
-    });
-    this.stopAgentsSubscription = this.context.agents.subscribe(() => {
-      this.syncAgentState();
-      this.ensureAgentIdentities();
-      this.loadActivePanelData();
-      this.requestUpdate();
-    });
-    this.stopAgentIdentitySubscription = this.context.agentIdentity.subscribe(() =>
-      this.requestUpdate(),
-    );
-    this.stopChannelsSubscription = this.context.channels.subscribe(() => this.requestUpdate());
-    this.stopConfigSubscription = this.context.runtimeConfig.subscribe(() => this.requestUpdate());
-    this.stopSessionsSubscription = this.context.sessions.subscribe(() => {
-      void refreshVisibleToolsEffectiveForCurrentSession(this);
-      this.requestUpdate();
-    });
-    this.ensureInitialData();
+  override disconnectedCallback() {
+    this.subscriptions.clear();
+    this.requestGeneration += 1;
+    this.client = null;
+    this.connected = false;
+    super.disconnectedCallback();
   }
 
-  override willUpdate(changed: Map<PropertyKey, unknown>) {
+  override willUpdate(changed: PropertyValues<this>) {
     if (changed.has("routeData")) {
       this.applyRouteData();
       this.ensureInitialData();
     }
   }
 
-  override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopAgentsSubscription?.();
-    this.stopAgentsSubscription = undefined;
-    this.stopAgentIdentitySubscription?.();
-    this.stopAgentIdentitySubscription = undefined;
-    this.stopChannelsSubscription?.();
-    this.stopChannelsSubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
-    this.stopSessionsSubscription?.();
-    this.stopSessionsSubscription = undefined;
-    super.disconnectedCallback();
+  private applyGatewaySnapshot(
+    snapshot: ApplicationGatewaySnapshot,
+    forceReset: boolean,
+    initialBind = false,
+  ) {
+    const connectionChanged = this.connected !== snapshot.connected;
+    const clientChanged = this.client !== snapshot.client;
+    this.syncGatewayState(snapshot);
+    if (forceReset || (!initialBind && clientChanged)) {
+      this.resetForClientChange();
+    } else if (!initialBind && connectionChanged) {
+      this.invalidateTransientRequests();
+    }
+    this.ensureInitialData();
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    this.client = gateway.client;
-    this.connected = gateway.connected;
+  private syncGatewayState(snapshot: ApplicationGatewaySnapshot) {
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
     this.cron = {
       ...this.cron,
-      client: gateway.client,
-      connected: gateway.connected,
+      client: snapshot.client,
+      connected: snapshot.connected,
     };
   }
 
-  private syncAgentState() {
-    const agentState = this.context.agents.state;
+  private syncAgentState(agents = this.context.agents) {
+    const agentState = agents.state;
     this.agentsLoading = agentState.agentsLoading;
     this.agentsError = agentState.agentsError;
     this.agentsList = agentState.agentsList;
     if (agentState.agentsList) {
       this.ensureSelectedAgentInList(agentState.agentsList);
     }
-    this.syncCurrentAgentFiles();
+    this.syncCurrentAgentFiles(agents);
   }
 
   private ensureSelectedAgentInList(agentsList: AgentsListResult) {
@@ -194,12 +293,12 @@ class AgentsPage extends LitElement implements AgentsState {
     }
   }
 
-  private syncCurrentAgentFiles() {
+  private syncCurrentAgentFiles(agents = this.context.agents) {
     const agentId = this.resolveSelectedAgentId();
     if (!agentId || this.agentsPanel !== "files") {
       return;
     }
-    const status = this.context.agents.files(agentId);
+    const status = agents.files(agentId);
     if (!status.list) {
       return;
     }
@@ -225,12 +324,46 @@ class AgentsPage extends LitElement implements AgentsState {
     });
   }
 
+  private resetForAgentsSourceChange() {
+    this.agentsLoading = false;
+    this.agentsError = null;
+    this.agentsList = null;
+    this.agentsSelectedId = null;
+    this.resetSelectionState();
+  }
+
+  private invalidateTransientRequests() {
+    this.requestGeneration += 1;
+    this.agentsLoading = false;
+    this.agentFilesLoading = false;
+    this.agentFileSaving = false;
+    this.agentIdentityLoading = false;
+    this.agentSkillsLoading = false;
+    this.toolsCatalogLoading = false;
+    this.toolsCatalogLoadingAgentId = null;
+    this.toolsEffectiveLoading = false;
+    this.toolsEffectiveLoadingKey = null;
+    this.cron = {
+      ...this.cron,
+      cronLoading: false,
+      cronJobsLoadingMore: false,
+      cronJobsReloadPending: false,
+      cronJobsReloadPendingTableFilters: false,
+      cronRunsLoadingMore: false,
+      cronBusy: false,
+    };
+  }
+
   private applyRouteData() {
     const data = this.routeData;
     if (!data) {
       return;
     }
     this.routeDataInitialized = true;
+    const gateway = this.context.gateway;
+    if (data.gateway !== gateway || data.gatewaySnapshot !== gateway.snapshot) {
+      return;
+    }
     this.agentsLoading = false;
     this.agentsError = data.error;
     if (data.agentsList) {
@@ -281,23 +414,45 @@ class AgentsPage extends LitElement implements AgentsState {
     this.loadActivePanelData();
   }
 
+  private isCurrentRequest(
+    client: GatewayBrowserClient,
+    generation: number,
+    agentId?: string,
+    sources: AgentsRequestSources = {},
+  ): boolean {
+    return (
+      this.client === client &&
+      this.connected &&
+      this.requestGeneration === generation &&
+      (!sources.agents || this.context.agents === sources.agents) &&
+      (!sources.agentIdentity || this.context.agentIdentity === sources.agentIdentity) &&
+      (!sources.sessions || this.context.sessions === sources.sessions) &&
+      (!agentId || this.resolveSelectedAgentId() === agentId)
+    );
+  }
+
   private ensureAgentIdentities() {
+    const client = this.client;
+    const agentIdentity = this.context.agentIdentity;
     const ids =
-      this.agentsList?.agents
-        .map((entry) => entry.id)
-        .filter((id) => !this.context.agentIdentity.get(id)) ?? [];
-    if (ids.length === 0 || this.agentIdentityLoading) {
+      this.agentsList?.agents.map((entry) => entry.id).filter((id) => !agentIdentity.get(id)) ?? [];
+    if (!client || !this.connected || ids.length === 0 || this.agentIdentityLoading) {
       return;
     }
+    const generation = this.requestGeneration;
     this.agentIdentityLoading = true;
     this.agentIdentityError = null;
-    void this.context.agentIdentity
+    void agentIdentity
       .ensure(ids)
       .catch((err: unknown) => {
-        this.agentIdentityError = String(err);
+        if (this.isCurrentRequest(client, generation, undefined, { agentIdentity })) {
+          this.agentIdentityError = String(err);
+        }
       })
       .finally(() => {
-        this.agentIdentityLoading = false;
+        if (this.isCurrentRequest(client, generation, undefined, { agentIdentity })) {
+          this.agentIdentityLoading = false;
+        }
       });
   }
 
@@ -331,32 +486,42 @@ class AgentsPage extends LitElement implements AgentsState {
   }
 
   private async loadAgentsAndCommit() {
-    await this.context.agents.ensureList();
-    this.syncAgentState();
+    const client = this.client;
+    const generation = this.requestGeneration;
+    const agents = this.context.agents;
+    if (!client) {
+      return;
+    }
+    await agents.ensureList();
+    if (!this.isCurrentRequest(client, generation, undefined, { agents })) {
+      return;
+    }
+    this.syncAgentState(agents);
     this.ensureAgentIdentities();
     this.loadActivePanelData();
   }
 
   private async loadAgentFiles(agentId: string, force = false) {
-    if (!this.client || !this.connected || this.agentFilesLoading) {
+    const client = this.client;
+    const agents = this.context.agents;
+    if (!client || !this.connected || this.agentFilesLoading) {
       return;
     }
-    const cached = this.context.agents.files(agentId);
+    const cached = agents.files(agentId);
     if (cached.list && !force) {
-      this.syncCurrentAgentFiles();
+      this.syncCurrentAgentFiles(agents);
       return;
     }
+    const generation = this.requestGeneration;
     this.agentFilesLoading = true;
     this.agentFilesError = null;
     try {
-      const list = force
-        ? await this.context.agents.refreshFiles(agentId)
-        : await this.context.agents.ensureFiles(agentId);
-      if (this.resolveSelectedAgentId() !== agentId) {
+      const list = force ? await agents.refreshFiles(agentId) : await agents.ensureFiles(agentId);
+      if (!this.isCurrentRequest(client, generation, agentId, { agents })) {
         return;
       }
-      this.agentFilesList = list ?? this.context.agents.files(agentId).list;
-      this.agentFilesError = this.context.agents.files(agentId).error;
+      this.agentFilesList = list ?? agents.files(agentId).list;
+      this.agentFilesError = agents.files(agentId).error;
       if (
         this.agentFileActive &&
         !this.agentFilesList?.files.some((file) => file.name === this.agentFileActive)
@@ -364,7 +529,7 @@ class AgentsPage extends LitElement implements AgentsState {
         this.agentFileActive = null;
       }
     } finally {
-      if (this.resolveSelectedAgentId() === agentId) {
+      if (this.isCurrentRequest(client, generation, agentId, { agents })) {
         this.agentFilesLoading = false;
       }
     }
@@ -385,18 +550,24 @@ class AgentsPage extends LitElement implements AgentsState {
   }
 
   private resetSelectionState() {
+    this.requestGeneration += 1;
     this.agentFilesList = null;
     this.agentFilesError = null;
     this.agentFileActive = null;
     this.agentFileContents = {};
     this.agentFileDrafts = {};
     this.agentFilesLoading = false;
+    this.agentFileSaving = false;
     this.agentSkillsReport = null;
+    this.agentSkillsLoading = false;
     this.agentSkillsError = null;
     this.agentSkillsAgentId = null;
+    this.agentIdentityLoading = false;
+    this.agentIdentityError = null;
     this.toolsCatalogResult = null;
     this.toolsCatalogError = null;
     this.toolsCatalogLoading = false;
+    this.toolsCatalogLoadingAgentId = null;
     resetToolsEffectiveState(this);
   }
 
@@ -459,19 +630,37 @@ class AgentsPage extends LitElement implements AgentsState {
   }
 
   private refreshAgents() {
+    const client = this.client;
+    const generation = this.requestGeneration;
+    const agents = this.context.agents;
+    if (!client) {
+      return;
+    }
     void (async () => {
-      await this.context.agents.refreshList();
-      this.syncAgentState();
+      await agents.refreshList();
+      if (!this.isCurrentRequest(client, generation, undefined, { agents })) {
+        return;
+      }
+      this.syncAgentState(agents);
       this.loadActivePanelData();
     })();
   }
 
   private saveAgentConfig() {
+    const client = this.client;
+    const generation = this.requestGeneration;
+    const agents = this.context.agents;
+    if (!client) {
+      return;
+    }
     const selectedBefore = this.agentsSelectedId;
     void (async () => {
       await this.context.runtimeConfig.save();
-      await this.context.agents.refreshList();
-      this.syncAgentState();
+      await agents.refreshList();
+      if (!this.isCurrentRequest(client, generation, undefined, { agents })) {
+        return;
+      }
+      this.syncAgentState(agents);
       if (selectedBefore && this.agentsList?.agents.some((entry) => entry.id === selectedBefore)) {
         this.agentsSelectedId = selectedBefore;
       }
@@ -480,6 +669,20 @@ class AgentsPage extends LitElement implements AgentsState {
     })();
   }
 
+  private saveSelectedAgentFile(agentId: string, name: string, content: string) {
+    const client = this.client;
+    const generation = this.requestGeneration;
+    const agents = this.context.agents;
+    if (!client) {
+      return;
+    }
+    void saveAgentFile(this, agentId, name, content).then(() => {
+      if (this.isCurrentRequest(client, generation, agentId, { agents })) {
+        void this.loadAgentFiles(agentId, true);
+      }
+    });
+  }
+
   private reloadConfig() {
     void this.context.runtimeConfig.refresh({ discardPendingChanges: true });
   }
@@ -584,12 +787,11 @@ class AgentsPage extends LitElement implements AgentsState {
           },
           onFileSave: (name) => {
             if (selectedAgentId) {
-              void saveAgentFile(
-                this,
+              this.saveSelectedAgentFile(
                 selectedAgentId,
                 name,
                 this.agentFileDrafts[name] ?? this.agentFileContents[name] ?? "",
-              ).then(() => this.loadAgentFiles(selectedAgentId, true));
+              );
             }
           },
           onToolsProfileChange: (agentId, profile, clearAllow) => {
diff --git a/ui/src/pages/agents/files.test.ts b/ui/src/pages/agents/files.test.ts
new file mode 100644
index 00000000000..31d52bde539
--- /dev/null
+++ b/ui/src/pages/agents/files.test.ts
@@ -0,0 +1,92 @@
+import { describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { AgentsFilesGetResult, AgentsFilesSetResult } from "../../api/types.ts";
+import { loadAgentFileContent, saveAgentFile } from "./files.ts";
+
+type FilesState = Parameters<typeof loadAgentFileContent>[0];
+
+function createState(client: GatewayBrowserClient): FilesState {
+  return {
+    client,
+    connected: true,
+    requestGeneration: 0,
+    agentFilesLoading: false,
+    agentFilesError: null,
+    agentFilesList: { agentId: "main", workspace: "workspace", files: [] },
+    agentFileContents: {},
+    agentFileDrafts: {},
+    agentFileActive: null,
+    agentFileSaving: false,
+  };
+}
+
+function fileResult(content: string): AgentsFilesGetResult {
+  return {
+    agentId: "main",
+    workspace: "workspace",
+    file: { name: "AGENTS.md", path: "AGENTS.md", missing: false, content },
+  };
+}
+
+describe("agent file requests", () => {
+  it("does not let an old-client read overwrite or finish a replacement read", async () => {
+    let resolveOld!: (value: AgentsFilesGetResult) => void;
+    let resolveNext!: (value: AgentsFilesGetResult) => void;
+    const oldClient = {
+      request: vi.fn(
+        () =>
+          new Promise<AgentsFilesGetResult>((resolve) => {
+            resolveOld = resolve;
+          }),
+      ),
+    } as unknown as GatewayBrowserClient;
+    const nextClient = {
+      request: vi.fn(
+        () =>
+          new Promise<AgentsFilesGetResult>((resolve) => {
+            resolveNext = resolve;
+          }),
+      ),
+    } as unknown as GatewayBrowserClient;
+    const state = createState(oldClient);
+
+    const oldLoad = loadAgentFileContent(state, "main", "AGENTS.md");
+    state.client = nextClient;
+    state.requestGeneration += 1;
+    state.agentFilesLoading = false;
+    const nextLoad = loadAgentFileContent(state, "main", "AGENTS.md");
+
+    resolveOld(fileResult("old"));
+    await oldLoad;
+    expect(state.agentFileContents).toEqual({});
+    expect(state.agentFilesLoading).toBe(true);
+
+    resolveNext(fileResult("new"));
+    await nextLoad;
+    expect(state.agentFileContents).toEqual({ "AGENTS.md": "new" });
+    expect(state.agentFilesLoading).toBe(false);
+  });
+
+  it("ignores an old-client save completion", async () => {
+    let resolveSave!: (value: AgentsFilesSetResult) => void;
+    const oldClient = {
+      request: vi.fn(
+        () =>
+          new Promise<AgentsFilesSetResult>((resolve) => {
+            resolveSave = resolve;
+          }),
+      ),
+    } as unknown as GatewayBrowserClient;
+    const state = createState(oldClient);
+    const save = saveAgentFile(state, "main", "AGENTS.md", "old");
+
+    state.client = { request: vi.fn() } as unknown as GatewayBrowserClient;
+    state.requestGeneration += 1;
+    state.agentFileSaving = false;
+    resolveSave({ ok: true, ...fileResult("old") });
+    await save;
+
+    expect(state.agentFileContents).toEqual({});
+    expect(state.agentFileSaving).toBe(false);
+  });
+});
diff --git a/ui/src/pages/agents/files.ts b/ui/src/pages/agents/files.ts
index c299544d99f..be3a31c0b56 100644
--- a/ui/src/pages/agents/files.ts
+++ b/ui/src/pages/agents/files.ts
@@ -10,6 +10,7 @@ import type {
 type AgentFilesState = {
   client: GatewayBrowserClient | null;
   connected: boolean;
+  requestGeneration: number;
   agentFilesLoading: boolean;
   agentFilesError: string | null;
   agentFilesList: AgentsFilesListResult | null;
@@ -39,20 +40,24 @@ export async function loadAgentFileContent(
   name: string,
   opts?: { force?: boolean; preserveDraft?: boolean },
 ): Promise<boolean> {
-  if (!state.client || !state.connected || state.agentFilesLoading) {
+  const client = state.client;
+  if (!client || !state.connected || state.agentFilesLoading) {
     return false;
   }
   if (!opts?.force && Object.hasOwn(state.agentFileContents, name)) {
     return true;
   }
+  const generation = state.requestGeneration;
+  const isCurrent = () =>
+    state.client === client && state.connected && state.requestGeneration === generation;
   state.agentFilesLoading = true;
   state.agentFilesError = null;
   try {
-    const res = await state.client.request<AgentsFilesGetResult | null>("agents.files.get", {
+    const res = await client.request<AgentsFilesGetResult | null>("agents.files.get", {
       agentId,
       name,
     });
-    if (res?.file) {
+    if (res?.file && isCurrent()) {
       const content = res.file.content ?? "";
       const previousBase = state.agentFileContents[name] ?? "";
       const currentDraft = state.agentFileDrafts[name];
@@ -69,10 +74,14 @@ export async function loadAgentFileContent(
       return true;
     }
   } catch (err) {
-    state.agentFilesError = String(err);
+    if (isCurrent()) {
+      state.agentFilesError = String(err);
+    }
     return false;
   } finally {
-    state.agentFilesLoading = false;
+    if (isCurrent()) {
+      state.agentFilesLoading = false;
+    }
   }
   return false;
 }
@@ -83,25 +92,33 @@ export async function saveAgentFile(
   name: string,
   content: string,
 ) {
-  if (!state.client || !state.connected || state.agentFileSaving) {
+  const client = state.client;
+  if (!client || !state.connected || state.agentFileSaving) {
     return;
   }
+  const generation = state.requestGeneration;
+  const isCurrent = () =>
+    state.client === client && state.connected && state.requestGeneration === generation;
   state.agentFileSaving = true;
   state.agentFilesError = null;
   try {
-    const res = await state.client.request<AgentsFilesSetResult | null>("agents.files.set", {
+    const res = await client.request<AgentsFilesSetResult | null>("agents.files.set", {
       agentId,
       name,
       content,
     });
-    if (res?.file) {
+    if (res?.file && isCurrent()) {
       state.agentFilesList = mergeFileEntry(state.agentFilesList, res.file);
       state.agentFileContents = { ...state.agentFileContents, [name]: content };
       state.agentFileDrafts = { ...state.agentFileDrafts, [name]: content };
     }
   } catch (err) {
-    state.agentFilesError = String(err);
+    if (isCurrent()) {
+      state.agentFilesError = String(err);
+    }
   } finally {
-    state.agentFileSaving = false;
+    if (isCurrent()) {
+      state.agentFileSaving = false;
+    }
   }
 }
diff --git a/ui/src/pages/agents/route.ts b/ui/src/pages/agents/route.ts
index 60243f5d756..e6c29ea43f5 100644
--- a/ui/src/pages/agents/route.ts
+++ b/ui/src/pages/agents/route.ts
@@ -4,10 +4,12 @@ import type { ApplicationContext } from "../../app/context.ts";
 import type { AgentsRouteData } from "./agents-page.ts";
 
 async function loadAgentsRouteData(context: ApplicationContext): Promise<AgentsRouteData> {
-  const gateway = context.gateway.snapshot;
+  const gateway = context.gateway;
+  const gatewaySnapshot = gateway.snapshot;
   const agentsList = context.agents.state.agentsList;
   return {
-    connected: gateway.connected,
+    gateway,
+    gatewaySnapshot,
     agentsList,
     selectedAgentId: agentsList?.defaultId ?? agentsList?.agents[0]?.id ?? null,
     error: context.agents.state.agentsError,
diff --git a/ui/src/pages/agents/skills.ts b/ui/src/pages/agents/skills.ts
index 67ee240f09d..431f0279bcb 100644
--- a/ui/src/pages/agents/skills.ts
+++ b/ui/src/pages/agents/skills.ts
@@ -6,6 +6,7 @@ import { loadSkillStatusReport } from "../../lib/skills/index.ts";
 type AgentSkillsState = {
   client: GatewayBrowserClient | null;
   connected: boolean;
+  requestGeneration: number;
   agentSkillsLoading: boolean;
   agentSkillsError: string | null;
   agentSkillsReport: SkillStatusReport | null;
@@ -13,23 +14,31 @@ type AgentSkillsState = {
 };
 
 export async function loadAgentSkills(state: AgentSkillsState, agentId: string) {
-  if (!state.client || !state.connected) {
+  const client = state.client;
+  if (!client || !state.connected) {
     return;
   }
   if (state.agentSkillsLoading) {
     return;
   }
+  const generation = state.requestGeneration;
+  const isCurrent = () =>
+    state.client === client && state.connected && state.requestGeneration === generation;
   state.agentSkillsLoading = true;
   state.agentSkillsError = null;
   try {
-    const res = await loadSkillStatusReport(state.client, agentId);
-    if (res) {
+    const res = await loadSkillStatusReport(client, agentId);
+    if (res && isCurrent()) {
       state.agentSkillsReport = res;
       state.agentSkillsAgentId = agentId;
     }
   } catch (err) {
-    state.agentSkillsError = String(err);
+    if (isCurrent()) {
+      state.agentSkillsError = String(err);
+    }
   } finally {
-    state.agentSkillsLoading = false;
+    if (isCurrent()) {
+      state.agentSkillsLoading = false;
+    }
   }
 }
diff --git a/ui/src/pages/channels/channels-page.test.ts b/ui/src/pages/channels/channels-page.test.ts
new file mode 100644
index 00000000000..78f343e4500
--- /dev/null
+++ b/ui/src/pages/channels/channels-page.test.ts
@@ -0,0 +1,225 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { NostrProfile } from "../../api/types.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import { createChannelCapability } from "../../lib/channels/index.ts";
+import { createRuntimeConfigCapability } from "../../lib/config/index.ts";
+import "./channels-page.ts";
+
+type ChannelsPageTestElement = HTMLElement & {
+  context: ApplicationContext;
+  updateComplete: Promise<boolean>;
+  requestUpdate: () => void;
+};
+
+type NostrTestPage = ChannelsPageTestElement & {
+  nostrProfileFormState: {
+    values: NostrProfile;
+    saving: boolean;
+    importing: boolean;
+  } | null;
+  nostrProfileAccountId: string | null;
+  editNostrProfile: (accountId: string, profile: NostrProfile | null) => void;
+  saveNostrProfile: () => Promise<void>;
+  importNostrProfile: () => Promise<void>;
+};
+
+type TestGateway = ApplicationContext["gateway"] & {
+  emit: (patch: Partial<ApplicationGatewaySnapshot>) => void;
+};
+
+function createDeferred<T>() {
+  let resolve: ((value: T) => void) | undefined;
+  const promise = new Promise<T>((res) => {
+    resolve = res;
+  });
+  if (!resolve) {
+    throw new Error("Expected deferred callback to be initialized");
+  }
+  return { promise, resolve };
+}
+
+function createGateway(): TestGateway {
+  const client = { request: vi.fn(async () => ({})) } as unknown as GatewayBrowserClient;
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected: true,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const listeners = new Set<(next: ApplicationGatewaySnapshot) => void>();
+  return {
+    snapshot,
+    connection: { gatewayUrl: "", token: "", password: "" },
+    subscribe(listener: (next: ApplicationGatewaySnapshot) => void) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    emit(patch: Partial<ApplicationGatewaySnapshot>) {
+      Object.assign(snapshot, patch);
+      for (const listener of listeners) {
+        listener(snapshot);
+      }
+    },
+  } as unknown as TestGateway;
+}
+
+function createContext(gateway: ApplicationContext["gateway"]) {
+  const channels = createChannelCapability(gateway);
+  channels.state.channelsSnapshot = {
+    ts: 0,
+    channelOrder: [],
+    channelLabels: {},
+    channels: {},
+    channelAccounts: {},
+    channelDefaultAccountId: {},
+  };
+  const runtimeConfig = createRuntimeConfigCapability(gateway);
+  runtimeConfig.state.configSnapshot = { config: {}, hash: "test" };
+  const ensureSchemaLoaded = vi.spyOn(runtimeConfig, "ensureSchemaLoaded").mockResolvedValue();
+  const context = {
+    basePath: "",
+    gateway,
+    channels,
+    runtimeConfig,
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+  return { context, ensureSchemaLoaded, runtimeConfig, channels };
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.unstubAllGlobals();
+  vi.restoreAllMocks();
+});
+
+describe("ChannelsPage lifecycle", () => {
+  it("loads schema again when the runtime-config source changes", async () => {
+    const gateway = createGateway();
+    const first = createContext(gateway);
+    const second = createContext(gateway);
+    const page = document.createElement("openclaw-channels-page") as ChannelsPageTestElement;
+    page.context = first.context;
+    document.body.append(page);
+
+    await vi.waitFor(() => expect(first.ensureSchemaLoaded).toHaveBeenCalledOnce());
+
+    page.context = second.context;
+    page.requestUpdate();
+    await page.updateComplete;
+
+    await vi.waitFor(() => expect(second.ensureSchemaLoaded).toHaveBeenCalledOnce());
+
+    first.runtimeConfig.dispose();
+    second.runtimeConfig.dispose();
+    first.channels.dispose();
+    second.channels.dispose();
+  });
+
+  it("drops a profile save when the channel source is replaced", async () => {
+    const gateway = createGateway();
+    const first = createContext(gateway);
+    const second = createContext(gateway);
+    const firstRefresh = vi.spyOn(first.channels, "refresh").mockResolvedValue();
+    const secondRefresh = vi.spyOn(second.channels, "refresh").mockResolvedValue();
+    const response = createDeferred<Response>();
+    const fetchMock = vi.fn(() => response.promise);
+    vi.stubGlobal("fetch", fetchMock);
+    const page = document.createElement("openclaw-channels-page") as NostrTestPage;
+    page.context = first.context;
+    document.body.append(page);
+    await page.updateComplete;
+    page.editNostrProfile("old-account", { name: "old" });
+
+    const save = page.saveNostrProfile();
+    await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledOnce());
+    page.context = second.context;
+    page.requestUpdate();
+    await page.updateComplete;
+    expect(page.nostrProfileFormState).toBeNull();
+
+    response.resolve(
+      new Response(JSON.stringify({ ok: true, persisted: true }), {
+        status: 200,
+        headers: { "Content-Type": "application/json" },
+      }),
+    );
+    await save;
+
+    expect(page.nostrProfileFormState).toBeNull();
+    expect(firstRefresh).not.toHaveBeenCalled();
+    expect(secondRefresh).not.toHaveBeenCalled();
+    first.runtimeConfig.dispose();
+    second.runtimeConfig.dispose();
+    first.channels.dispose();
+    second.channels.dispose();
+  });
+
+  it("drops a profile import when the gateway disconnects", async () => {
+    const gateway = createGateway();
+    const source = createContext(gateway);
+    const refresh = vi.spyOn(source.channels, "refresh").mockResolvedValue();
+    const response = createDeferred<Response>();
+    const fetchMock = vi.fn(() => response.promise);
+    vi.stubGlobal("fetch", fetchMock);
+    const page = document.createElement("openclaw-channels-page") as NostrTestPage;
+    page.context = source.context;
+    document.body.append(page);
+    await page.updateComplete;
+    page.editNostrProfile("old-account", { name: "old" });
+
+    const load = page.importNostrProfile();
+    await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledOnce());
+    gateway.emit({ connected: false });
+    expect(page.nostrProfileFormState).toBeNull();
+
+    response.resolve(
+      new Response(JSON.stringify({ ok: true, saved: true, merged: { name: "stale import" } }), {
+        status: 200,
+        headers: { "Content-Type": "application/json" },
+      }),
+    );
+    await load;
+
+    expect(page.nostrProfileFormState).toBeNull();
+    expect(refresh).not.toHaveBeenCalled();
+    source.runtimeConfig.dispose();
+    source.channels.dispose();
+  });
+
+  it("does not overwrite a replacement profile form", async () => {
+    const gateway = createGateway();
+    const source = createContext(gateway);
+    const refresh = vi.spyOn(source.channels, "refresh").mockResolvedValue();
+    const response = createDeferred<Response>();
+    const fetchMock = vi.fn(() => response.promise);
+    vi.stubGlobal("fetch", fetchMock);
+    const page = document.createElement("openclaw-channels-page") as NostrTestPage;
+    page.context = source.context;
+    document.body.append(page);
+    await page.updateComplete;
+    page.editNostrProfile("old-account", { name: "old" });
+
+    const load = page.importNostrProfile();
+    await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledOnce());
+    page.editNostrProfile("new-account", { name: "fresh" });
+    response.resolve(
+      new Response(JSON.stringify({ ok: true, saved: true, merged: { name: "stale import" } }), {
+        status: 200,
+        headers: { "Content-Type": "application/json" },
+      }),
+    );
+    await load;
+
+    expect(page.nostrProfileAccountId).toBe("new-account");
+    expect(page.nostrProfileFormState?.values.name).toBe("fresh");
+    expect(refresh).not.toHaveBeenCalled();
+    source.runtimeConfig.dispose();
+    source.channels.dispose();
+  });
+});
diff --git a/ui/src/pages/channels/channels-page.ts b/ui/src/pages/channels/channels-page.ts
index aca32f737f4..76bdf760053 100644
--- a/ui/src/pages/channels/channels-page.ts
+++ b/ui/src/pages/channels/channels-page.ts
@@ -1,16 +1,29 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { state } from "lit/decorators.js";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type { NostrProfile } from "../../api/types.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
 import { applicationContext, type ApplicationContext } from "../../app/context.ts";
 import { resolveControlUiAuthHeader } from "../../app/control-ui-auth.ts";
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { createNostrProfileFormState } from "./view.nostr-profile-form.ts";
 import { renderChannels } from "./view.ts";
 
 type NostrProfileFormState = ReturnType<typeof createNostrProfileFormState> | null;
 
+type NostrOperation = {
+  generation: number;
+  gateway: ApplicationContext["gateway"];
+  channels: ApplicationContext["channels"];
+  client: GatewayBrowserClient;
+  formAccountId: string | null;
+  accountId: string;
+  headers: Record<string, string>;
+};
+
 function parseValidationErrors(details: unknown): Record<string, string> {
   if (!Array.isArray(details)) {
     return {};
@@ -37,12 +50,8 @@ function buildNostrProfileUrl(accountId: string, suffix = ""): string {
   return `/api/channels/nostr/${encodeURIComponent(accountId)}/profile${suffix}`;
 }
 
-class ChannelsPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class ChannelsPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state()
@@ -51,36 +60,87 @@ class ChannelsPage extends LitElement {
   @state()
   private nostrProfileAccountId: string | null = null;
 
-  private stopChannelsSubscription?: () => void;
-  private stopConfigSubscription?: () => void;
-  private stopGatewaySubscription?: () => void;
   private schemaLoadStarted = false;
+  private gatewaySource?: ApplicationContext["gateway"];
+  private channelsSource?: ApplicationContext["channels"];
+  private gatewayClient: GatewayBrowserClient | null = null;
+  private gatewayConnected = false;
+  private hasGatewaySnapshot = false;
+  private nostrOperationGeneration = 0;
 
-  private readonly requestPageUpdate = () => this.requestUpdate();
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.ensureSubscriptions();
-    this.ensureInitialData();
-  }
-
-  private ensureSubscriptions() {
-    const context = this.context;
-    if (!context || this.stopChannelsSubscription) {
-      return;
-    }
-    this.stopChannelsSubscription = context.channels.subscribe(this.requestPageUpdate);
-    this.stopConfigSubscription = context.runtimeConfig.subscribe(() => {
-      this.requestPageUpdate();
-      this.ensureInitialData();
-    });
-    this.stopGatewaySubscription = context.gateway.subscribe((snapshot) => {
-      if (snapshot.connected && snapshot.client) {
-        this.ensureInitialData();
-      } else {
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.channels,
+      (channels) => {
+        const sourceChanged = this.channelsSource !== undefined && this.channelsSource !== channels;
+        this.channelsSource = channels;
+        if (sourceChanged) {
+          this.invalidateNostrForm();
+        }
+        const handleChange = () => {
+          if (this.channelsSource === channels) {
+            this.requestUpdate();
+          }
+        };
+        handleChange();
+        return channels.subscribe(handleChange);
+      },
+    )
+    .effect(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig) => {
         this.schemaLoadStarted = false;
-      }
-    });
+        const handleChange = () => {
+          if (this.context.runtimeConfig !== runtimeConfig) {
+            return;
+          }
+          this.requestUpdate();
+          this.ensureInitialData();
+        };
+        handleChange();
+        const unsubscribe = runtimeConfig.subscribe(handleChange);
+        return () => {
+          unsubscribe();
+          this.schemaLoadStarted = false;
+        };
+      },
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const sourceChanged = this.gatewaySource !== undefined && this.gatewaySource !== gateway;
+        this.gatewaySource = gateway;
+        this.applyGatewaySnapshot(gateway.snapshot, sourceChanged);
+        return gateway.subscribe((snapshot) => {
+          if (this.gatewaySource !== gateway) {
+            return;
+          }
+          this.applyGatewaySnapshot(snapshot, false);
+        });
+      },
+    );
+
+  private applyGatewaySnapshot(
+    snapshot: ApplicationContext["gateway"]["snapshot"],
+    sourceChanged: boolean,
+  ) {
+    const clientChanged = this.hasGatewaySnapshot && this.gatewayClient !== snapshot.client;
+    const connectionChanged =
+      this.hasGatewaySnapshot && this.gatewayConnected !== snapshot.connected;
+    if (!this.hasGatewaySnapshot || sourceChanged || clientChanged || connectionChanged) {
+      this.nostrOperationGeneration += 1;
+    }
+    if (sourceChanged || clientChanged || !snapshot.connected) {
+      this.clearNostrForm();
+    }
+    this.hasGatewaySnapshot = true;
+    this.gatewayClient = snapshot.client;
+    this.gatewayConnected = snapshot.connected;
+    if (snapshot.connected && snapshot.client) {
+      this.ensureInitialData();
+    } else {
+      this.schemaLoadStarted = false;
+    }
   }
 
   private ensureInitialData() {
@@ -106,12 +166,13 @@ class ChannelsPage extends LitElement {
   }
 
   override disconnectedCallback() {
-    this.stopChannelsSubscription?.();
-    this.stopChannelsSubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
+    this.gatewaySource = undefined;
+    this.channelsSource = undefined;
+    this.gatewayClient = null;
+    this.gatewayConnected = false;
+    this.hasGatewaySnapshot = false;
+    this.invalidateNostrForm();
+    this.subscriptions.clear();
     this.schemaLoadStarted = false;
     super.disconnectedCallback();
   }
@@ -145,30 +206,79 @@ class ChannelsPage extends LitElement {
 
   private resolveNostrAccountId(): string {
     const accounts = this.context?.channels.state.channelsSnapshot?.channelAccounts?.nostr ?? [];
-    return accounts[0]?.accountId ?? this.nostrProfileAccountId ?? "default";
+    return this.nostrProfileAccountId ?? accounts[0]?.accountId ?? "default";
   }
 
-  private buildGatewayHttpHeaders(): Record<string, string> {
-    const context = this.context;
-    if (!context) {
-      return {};
-    }
+  private buildGatewayHttpHeaders(gateway: ApplicationContext["gateway"]): Record<string, string> {
     const authorization = resolveControlUiAuthHeader({
-      hello: context.gateway.snapshot.hello,
-      settings: { token: context.gateway.connection.token },
-      password: context.gateway.connection.password,
+      hello: gateway.snapshot.hello,
+      settings: { token: gateway.connection.token },
+      password: gateway.connection.password,
     });
     return authorization ? { Authorization: authorization } : {};
   }
 
+  private clearNostrForm() {
+    this.nostrProfileFormState = null;
+    this.nostrProfileAccountId = null;
+  }
+
+  private invalidateNostrForm() {
+    this.nostrOperationGeneration += 1;
+    this.clearNostrForm();
+  }
+
+  private beginNostrOperation(): NostrOperation | null {
+    const gateway = this.context.gateway;
+    const channels = this.context.channels;
+    const client = gateway.snapshot.client;
+    if (
+      !this.isConnected ||
+      this.gatewaySource !== gateway ||
+      this.channelsSource !== channels ||
+      !gateway.snapshot.connected ||
+      !client
+    ) {
+      return null;
+    }
+    const generation = this.nostrOperationGeneration + 1;
+    this.nostrOperationGeneration = generation;
+    return {
+      generation,
+      gateway,
+      channels,
+      client,
+      formAccountId: this.nostrProfileAccountId,
+      accountId: this.resolveNostrAccountId(),
+      headers: this.buildGatewayHttpHeaders(gateway),
+    };
+  }
+
+  private currentNostrForm(operation: NostrOperation): NonNullable<NostrProfileFormState> | null {
+    const form = this.nostrProfileFormState;
+    if (
+      !form ||
+      !this.isConnected ||
+      this.nostrOperationGeneration !== operation.generation ||
+      this.nostrProfileAccountId !== operation.formAccountId ||
+      this.context.gateway !== operation.gateway ||
+      this.context.channels !== operation.channels ||
+      operation.gateway.snapshot.client !== operation.client ||
+      !operation.gateway.snapshot.connected
+    ) {
+      return null;
+    }
+    return form;
+  }
+
   private editNostrProfile(accountId: string, profile: NostrProfile | null) {
+    this.nostrOperationGeneration += 1;
     this.nostrProfileAccountId = accountId;
     this.nostrProfileFormState = createNostrProfileFormState(profile ?? undefined);
   }
 
   private cancelNostrProfile() {
-    this.nostrProfileFormState = null;
-    this.nostrProfileAccountId = null;
+    this.invalidateNostrForm();
   }
 
   private changeNostrProfileField(field: keyof NostrProfile, value: string) {
@@ -193,24 +303,28 @@ class ChannelsPage extends LitElement {
 
   private async saveNostrProfile() {
     const form = this.nostrProfileFormState;
-    if (!form || form.saving) {
+    if (!form || form.saving || form.importing) {
       return;
     }
-    const accountId = this.resolveNostrAccountId();
-    this.nostrProfileFormState = {
+    const operation = this.beginNostrOperation();
+    if (!operation) {
+      return;
+    }
+    const pendingForm = {
       ...form,
       saving: true,
       error: null,
       success: null,
       fieldErrors: {},
     };
+    this.nostrProfileFormState = pendingForm;
 
     try {
-      const response = await fetch(buildNostrProfileUrl(accountId), {
+      const response = await fetch(buildNostrProfileUrl(operation.accountId), {
         method: "PUT",
         headers: {
           "Content-Type": "application/json",
-          ...this.buildGatewayHttpHeaders(),
+          ...operation.headers,
         },
         body: JSON.stringify(form.values),
       });
@@ -221,9 +335,13 @@ class ChannelsPage extends LitElement {
         persisted?: boolean;
       } | null;
 
+      const currentForm = this.currentNostrForm(operation);
+      if (!currentForm) {
+        return;
+      }
       if (!response.ok || data?.ok === false || !data) {
         this.nostrProfileFormState = {
-          ...form,
+          ...currentForm,
           saving: false,
           error: data?.error ?? `Profile update failed (${response.status})`,
           success: null,
@@ -234,7 +352,7 @@ class ChannelsPage extends LitElement {
 
       if (!data.persisted) {
         this.nostrProfileFormState = {
-          ...form,
+          ...currentForm,
           saving: false,
           error: "Profile publish failed on all relays.",
           success: null,
@@ -243,17 +361,21 @@ class ChannelsPage extends LitElement {
       }
 
       this.nostrProfileFormState = {
-        ...form,
+        ...currentForm,
         saving: false,
         error: null,
         success: "Profile published to relays.",
         fieldErrors: {},
         original: { ...form.values },
       };
-      await this.context?.channels.refresh(true);
+      await operation.channels.refresh(true);
     } catch (err) {
+      const currentForm = this.currentNostrForm(operation);
+      if (!currentForm) {
+        return;
+      }
       this.nostrProfileFormState = {
-        ...form,
+        ...currentForm,
         saving: false,
         error: `Profile update failed: ${String(err)}`,
         success: null,
@@ -263,10 +385,13 @@ class ChannelsPage extends LitElement {
 
   private async importNostrProfile() {
     const form = this.nostrProfileFormState;
-    if (!form || form.importing) {
+    if (!form || form.importing || form.saving) {
+      return;
+    }
+    const operation = this.beginNostrOperation();
+    if (!operation) {
       return;
     }
-    const accountId = this.resolveNostrAccountId();
     this.nostrProfileFormState = {
       ...form,
       importing: true,
@@ -275,11 +400,11 @@ class ChannelsPage extends LitElement {
     };
 
     try {
-      const response = await fetch(buildNostrProfileUrl(accountId, "/import"), {
+      const response = await fetch(buildNostrProfileUrl(operation.accountId, "/import"), {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          ...this.buildGatewayHttpHeaders(),
+          ...operation.headers,
         },
         body: JSON.stringify({ autoMerge: true }),
       });
@@ -291,9 +416,13 @@ class ChannelsPage extends LitElement {
         saved?: boolean;
       } | null;
 
+      const currentForm = this.currentNostrForm(operation);
+      if (!currentForm) {
+        return;
+      }
       if (!response.ok || data?.ok === false || !data) {
         this.nostrProfileFormState = {
-          ...form,
+          ...currentForm,
           importing: false,
           error: data?.error ?? `Profile import failed (${response.status})`,
           success: null,
@@ -302,9 +431,9 @@ class ChannelsPage extends LitElement {
       }
 
       const merged = data.merged ?? data.imported ?? null;
-      const values = merged ? { ...form.values, ...merged } : form.values;
+      const values = merged ? { ...currentForm.values, ...merged } : currentForm.values;
       this.nostrProfileFormState = {
-        ...form,
+        ...currentForm,
         importing: false,
         values,
         error: null,
@@ -315,11 +444,15 @@ class ChannelsPage extends LitElement {
       };
 
       if (data.saved) {
-        await this.context?.channels.refresh(true);
+        await operation.channels.refresh(true);
       }
     } catch (err) {
+      const currentForm = this.currentNostrForm(operation);
+      if (!currentForm) {
+        return;
+      }
       this.nostrProfileFormState = {
-        ...form,
+        ...currentForm,
         importing: false,
         error: `Profile import failed: ${String(err)}`,
         success: null,
diff --git a/ui/src/pages/chat/chat-gateway.test.ts b/ui/src/pages/chat/chat-gateway.test.ts
index aabd393ce41..cd9e0b47add 100644
--- a/ui/src/pages/chat/chat-gateway.test.ts
+++ b/ui/src/pages/chat/chat-gateway.test.ts
@@ -36,6 +36,7 @@ function createState(overrides: Partial<ChatState> = {}): ChatState {
     chatVerboseLevel: null,
     client: null,
     connected: true,
+    connectionEpoch: 0,
     hello: null,
     lastError: null,
     sessionKey: "main",
@@ -3607,6 +3608,82 @@ describe("loadChatHistory retry handling", () => {
     ]);
   });
 
+  it("rejects stale success and cleanup after a same-client reconnect", async () => {
+    const staleRequest = createDeferred<{ messages: Array<unknown>; thinkingLevel?: string }>();
+    const freshRequest = createDeferred<{ messages: Array<unknown>; thinkingLevel?: string }>();
+    const request = vi
+      .fn()
+      .mockImplementationOnce(() => staleRequest.promise)
+      .mockImplementationOnce(() => freshRequest.promise);
+    const client = { request } as unknown as NonNullable<ChatState["client"]>;
+    const visibleMessage = {
+      role: "assistant",
+      content: [{ type: "text", text: "visible before reconnect" }],
+    };
+    const state = createState({
+      chatMessages: [visibleMessage],
+      client,
+      connected: true,
+      connectionEpoch: 1,
+    });
+
+    const staleLoad = loadChatHistory(state);
+    state.connected = false;
+    state.connectionEpoch = 2;
+    state.connected = true;
+    state.connectionEpoch = 3;
+    const freshLoad = loadChatHistory(state);
+
+    expect(request).toHaveBeenCalledTimes(2);
+    staleRequest.resolve({
+      messages: [{ role: "assistant", content: [{ type: "text", text: "stale history" }] }],
+      thinkingLevel: "high",
+    });
+    await staleLoad;
+
+    expect(state.chatMessages).toEqual([visibleMessage]);
+    expect(state.chatThinkingLevel).toBeNull();
+    expect(state.chatLoading).toBe(true);
+
+    freshRequest.resolve({
+      messages: [{ role: "assistant", content: [{ type: "text", text: "fresh history" }] }],
+      thinkingLevel: "low",
+    });
+    await freshLoad;
+
+    expect(state.chatMessages).toEqual([
+      { role: "assistant", content: [{ type: "text", text: "fresh history" }] },
+    ]);
+    expect(state.chatThinkingLevel).toBe("low");
+    expect(state.chatLoading).toBe(false);
+  });
+
+  it("rejects stale errors and cleanup after a same-client reconnect", async () => {
+    const staleRequest = createDeferred<{ messages: Array<unknown> }>();
+    const request = vi.fn(() => staleRequest.promise);
+    const client = { request } as unknown as NonNullable<ChatState["client"]>;
+    const state = createState({
+      client,
+      connected: true,
+      connectionEpoch: 1,
+    });
+
+    const staleLoad = loadChatHistory(state);
+    state.connected = false;
+    state.connectionEpoch = 2;
+    state.connected = true;
+    state.connectionEpoch = 3;
+    // The connection owner has already prepared the new epoch. The stale
+    // finalizer must not clear its loading state.
+    state.chatLoading = true;
+    staleRequest.reject(new Error("stale history failure"));
+    await staleLoad;
+
+    expect(state.lastError).toBeNull();
+    expect(state.chatError).toBeNull();
+    expect(state.chatLoading).toBe(true);
+  });
+
   it("ignores stale history responses after switching sessions", async () => {
     const mainRequest = createDeferred<{
       messages: Array<unknown>;
diff --git a/ui/src/pages/chat/chat-history.ts b/ui/src/pages/chat/chat-history.ts
index 4b10644fafd..72ee805d510 100644
--- a/ui/src/pages/chat/chat-history.ts
+++ b/ui/src/pages/chat/chat-history.ts
@@ -79,28 +79,51 @@ const STARTUP_CHAT_HISTORY_MAX_RETRY_MS = 5_000;
 const chatHistoryRequestVersions = new WeakMap<object, number>();
 const selectedSessionMessageSubscriptionGenerations = new WeakMap<object, number>();
 
-function beginChatHistoryRequest(state: ChatState): number {
+type ChatHistoryRequestOwnership = {
+  version: number;
+  client: GatewayBrowserClient;
+  connectionEpoch: number;
+  sessionKey: string;
+  agentId?: string;
+};
+
+function beginChatHistoryRequest(
+  state: ChatState,
+  client: GatewayBrowserClient,
+  connectionEpoch: number,
+  sessionKey: string,
+  agentId?: string,
+): ChatHistoryRequestOwnership {
   const key = state as object;
   const nextVersion = (chatHistoryRequestVersions.get(key) ?? 0) + 1;
   chatHistoryRequestVersions.set(key, nextVersion);
-  return nextVersion;
+  return {
+    version: nextVersion,
+    client,
+    connectionEpoch,
+    sessionKey,
+    agentId,
+  };
 }
 
-function isLatestChatHistoryRequest(state: ChatState, version: number): boolean {
-  return chatHistoryRequestVersions.get(state as object) === version;
+function ownsChatHistoryRequest(state: ChatState, ownership: ChatHistoryRequestOwnership): boolean {
+  return (
+    chatHistoryRequestVersions.get(state as object) === ownership.version &&
+    state.client === ownership.client &&
+    state.connected &&
+    state.connectionEpoch === ownership.connectionEpoch
+  );
 }
 
 function shouldApplyChatHistoryResult(
   state: ChatState,
-  version: number,
-  sessionKey: string,
-  agentId?: string,
+  ownership: ChatHistoryRequestOwnership,
 ): boolean {
-  if (!isLatestChatHistoryRequest(state, version) || state.sessionKey !== sessionKey) {
-    return false;
-  }
   return (
-    !isUiSelectedGlobalSessionKey(sessionKey) || resolveUiSelectedSessionAgentId(state) === agentId
+    ownsChatHistoryRequest(state, ownership) &&
+    state.sessionKey === ownership.sessionKey &&
+    (!isUiSelectedGlobalSessionKey(ownership.sessionKey) ||
+      resolveUiSelectedSessionAgentId(state) === ownership.agentId)
   );
 }
 
@@ -403,6 +426,8 @@ function sleep(ms: number): Promise<void> {
 export type ChatState = {
   client: GatewayBrowserClient | null;
   connected: boolean;
+  /** Monotonic owner epoch; reconnects can reuse the same client object. */
+  connectionEpoch: number;
   sessionKey: string;
   currentSessionId?: string | null;
   reconnectResumeSessionId?: string | null;
@@ -675,6 +700,7 @@ export async function syncSelectedSessionMessageSubscription(
 
 type InFlightChatHistoryRequest = {
   client: NonNullable<ChatState["client"]>;
+  connectionEpoch: number;
   key: string;
   messages: unknown[];
   promise: Promise<ChatHistoryResult | undefined>;
@@ -789,17 +815,21 @@ export async function loadChatHistory(
   const method =
     opts.startup === true && startupAdvertised !== false ? "chat.startup" : "chat.history";
   const requestKey = `${method}\0${sessionKey}\0${requestAgentId ?? ""}`;
+  const client = state.client;
+  const connectionEpoch = state.connectionEpoch;
   const inFlight = inFlightChatHistoryRequests.get(state);
   if (
     inFlight?.key === requestKey &&
-    inFlight.client === state.client &&
+    inFlight.client === client &&
+    inFlight.connectionEpoch === connectionEpoch &&
     inFlight.messages === state.chatMessages
   ) {
     return inFlight.promise;
   }
   const promise = loadChatHistoryUncached(
     state,
-    state.client,
+    client,
+    connectionEpoch,
     sessionKey,
     requestAgentId,
     method,
@@ -809,7 +839,8 @@ export async function loadChatHistory(
     }
   });
   inFlightChatHistoryRequests.set(state, {
-    client: state.client,
+    client,
+    connectionEpoch,
     key: requestKey,
     messages: state.chatMessages,
     promise,
@@ -844,11 +875,18 @@ export function applyChatAgentsList(
 async function loadChatHistoryUncached(
   state: ChatState,
   client: NonNullable<ChatState["client"]>,
+  connectionEpoch: number,
   sessionKey: string,
   requestAgentId: string | undefined,
   method: "chat.history" | "chat.startup",
 ): Promise<ChatHistoryResult | undefined> {
-  const requestVersion = beginChatHistoryRequest(state);
+  const ownership = beginChatHistoryRequest(
+    state,
+    client,
+    connectionEpoch,
+    sessionKey,
+    requestAgentId,
+  );
   const startedAt = Date.now();
   const startedAtMs = controlUiNowMs();
   const previousMessages = state.chatMessages;
@@ -874,7 +912,7 @@ async function loadChatHistoryUncached(
         });
         break;
       } catch (err) {
-        if (!shouldApplyChatHistoryResult(state, requestVersion, sessionKey, requestAgentId)) {
+        if (!shouldApplyChatHistoryResult(state, ownership)) {
           recordChatHistoryTiming(state, "stale", startedAtMs, {
             requestSessionKey: sessionKey,
             requestAgentId,
@@ -895,7 +933,7 @@ async function loadChatHistoryUncached(
         }
         if (withinStartupRetryWindow && isRetryableStartupUnavailable(err, method)) {
           await sleep(resolveStartupRetryDelayMs(err));
-          if (!state.client || !state.connected) {
+          if (!shouldApplyChatHistoryResult(state, ownership)) {
             return undefined;
           }
           continue;
@@ -903,7 +941,7 @@ async function loadChatHistoryUncached(
         throw err;
       }
     }
-    if (!shouldApplyChatHistoryResult(state, requestVersion, sessionKey, requestAgentId)) {
+    if (!shouldApplyChatHistoryResult(state, ownership)) {
       recordChatHistoryTiming(state, "stale", startedAtMs, {
         requestSessionKey: sessionKey,
         requestAgentId,
@@ -1019,7 +1057,7 @@ async function loadChatHistoryUncached(
     });
     return res;
   } catch (err) {
-    if (!shouldApplyChatHistoryResult(state, requestVersion, sessionKey, requestAgentId)) {
+    if (!shouldApplyChatHistoryResult(state, ownership)) {
       recordChatHistoryTiming(state, "stale", startedAtMs, {
         requestSessionKey: sessionKey,
         requestAgentId,
@@ -1042,7 +1080,7 @@ async function loadChatHistoryUncached(
       setChatError(state, String(err));
     }
   } finally {
-    if (isLatestChatHistoryRequest(state, requestVersion)) {
+    if (ownsChatHistoryRequest(state, ownership)) {
       state.chatLoading = false;
     }
   }
diff --git a/ui/src/pages/chat/chat-page.test.ts b/ui/src/pages/chat/chat-page.test.ts
index 3f84cdd5a52..56a5fb23857 100644
--- a/ui/src/pages/chat/chat-page.test.ts
+++ b/ui/src/pages/chat/chat-page.test.ts
@@ -182,6 +182,48 @@ describe("chat page split layout host", () => {
     expect(cleanup).toHaveBeenCalledOnce();
   });
 
+  it("moves session updates to a replacement context source", async () => {
+    const firstCleanup = vi.fn();
+    const secondCleanup = vi.fn();
+    let notifyFirst = () => {};
+    let notifySecond = () => {};
+    const firstSessions = {
+      state: { result: null },
+      subscribe: vi.fn((listener: () => void) => {
+        notifyFirst = listener;
+        return firstCleanup;
+      }),
+    };
+    const secondSessions = {
+      state: { result: null },
+      subscribe: vi.fn((listener: () => void) => {
+        notifySecond = listener;
+        return secondCleanup;
+      }),
+    };
+    const page = new ChatPage();
+    (page as unknown as { context: unknown }).context = { sessions: firstSessions };
+    document.body.append(page);
+    await page.updateComplete;
+
+    expect(firstSessions.subscribe).toHaveBeenCalledOnce();
+    (page as unknown as { context: unknown }).context = { sessions: secondSessions };
+    page.requestUpdate();
+    await page.updateComplete;
+
+    expect(firstCleanup).toHaveBeenCalledOnce();
+    expect(secondSessions.subscribe).toHaveBeenCalledOnce();
+
+    const requestUpdate = vi.spyOn(page, "requestUpdate");
+    notifyFirst();
+    expect(requestUpdate).not.toHaveBeenCalled();
+    notifySecond();
+    expect(requestUpdate).toHaveBeenCalledOnce();
+
+    page.remove();
+    expect(secondCleanup).toHaveBeenCalledOnce();
+  });
+
   it("routes a classic-mode center drop without creating a layout", () => {
     const page = new ChatPage();
     page.data = { sessionKey: "main" };
diff --git a/ui/src/pages/chat/chat-page.ts b/ui/src/pages/chat/chat-page.ts
index 421e0cb0c6f..aaf5081ec4d 100644
--- a/ui/src/pages/chat/chat-page.ts
+++ b/ui/src/pages/chat/chat-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property, state } from "lit/decorators.js";
 import { repeat } from "lit/directives/repeat.js";
 import { applicationContext, type ApplicationContext } from "../../app/context.ts";
@@ -11,6 +11,8 @@ import { t } from "../../i18n/index.ts";
 import { resolveSessionDisplayName } from "../../lib/session-display.ts";
 import { readSessionDragData, sessionDragActive } from "../../lib/sessions/drag.ts";
 import { searchForSession } from "../../lib/sessions/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import "./chat-pane.ts";
 import {
   resolveSplitDropZone,
@@ -43,8 +45,8 @@ const NARROW_SPLIT_QUERY = "(max-width: 1099px)";
 type DropIndicator = { paneId: string; zone: SplitDropZone; rect: SplitDropRect };
 type ChatPaneElement = HTMLElement & { paneId?: string };
 
-export class ChatPage extends LitElement {
-  @consume({ context: applicationContext, subscribe: false })
+export class ChatPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
   @property({ attribute: false }) data!: ChatRouteData;
   @state() private layout: ChatSplitLayout | undefined;
@@ -54,25 +56,23 @@ export class ChatPage extends LitElement {
   // the fixed toolbar track mirrors it so segments stay over their panes.
   @state() private splitScrollLeft = 0;
 
+  private readonly subscriptions = new SubscriptionsController(this).watch(
+    () => this.context?.sessions,
+    (sessions, notify) => sessions.subscribe(notify),
+  );
   private mediaQuery: MediaQueryList | null = null;
-  private sessionsCleanup: (() => void) | null = null;
   // Light-DOM enter/leave events bubble from every nested child, so only clear
   // the shared preview after the whole balanced drag has left the page.
   private dragDepth = 0;
   private dragFrame = 0;
   private pendingDragOver: { pane: ChatPaneElement; x: number; y: number } | null = null;
 
-  override createRenderRoot() {
-    return this;
-  }
-
   override connectedCallback() {
     super.connectedCallback();
     this.layout = loadSettings().chatSplitLayout;
     this.mediaQuery = window.matchMedia(NARROW_SPLIT_QUERY);
     this.narrow = this.mediaQuery.matches;
     this.mediaQuery.addEventListener("change", this.handleViewportChange);
-    this.sessionsCleanup = this.context?.sessions?.subscribe(() => this.requestUpdate()) ?? null;
     this.addEventListener("dragenter", this.handleDragEnter);
     this.addEventListener("dragover", this.handleDragOver);
     this.addEventListener("dragleave", this.handleDragLeave);
@@ -82,10 +82,9 @@ export class ChatPage extends LitElement {
   }
 
   override disconnectedCallback() {
+    this.subscriptions.clear();
     this.mediaQuery?.removeEventListener("change", this.handleViewportChange);
     this.mediaQuery = null;
-    this.sessionsCleanup?.();
-    this.sessionsCleanup = null;
     this.removeEventListener("dragenter", this.handleDragEnter);
     this.removeEventListener("dragover", this.handleDragOver);
     this.removeEventListener("dragleave", this.handleDragLeave);
diff --git a/ui/src/pages/chat/chat-pane.test.ts b/ui/src/pages/chat/chat-pane.test.ts
new file mode 100644
index 00000000000..7d4d9c1855f
--- /dev/null
+++ b/ui/src/pages/chat/chat-pane.test.ts
@@ -0,0 +1,226 @@
+/* @vitest-environment jsdom */
+
+import { describe, expect, it, vi } from "vitest";
+import type {
+  TaskSuggestion,
+  TaskSuggestionEvent,
+  TaskSuggestionsAcceptResult,
+  TaskSuggestionsListResult,
+} from "../../../../packages/gateway-protocol/src/index.js";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext } from "../../app/context.ts";
+import type { SessionCapability } from "../../lib/sessions/index.ts";
+import "./chat-pane.ts";
+import type { ChatPageHost } from "./chat-state.ts";
+
+type TestChatPane = HTMLElement & {
+  context: ApplicationContext;
+  state: ChatPageHost;
+  connectedClient: GatewayBrowserClient | null;
+  connectionGeneration: number;
+  createSession: () => Promise<boolean>;
+  acceptTaskSuggestion: (suggestion: TaskSuggestion) => Promise<void>;
+  handleTaskSuggestionEvent: (event: TaskSuggestionEvent) => void;
+  refreshTaskSuggestions: () => Promise<void>;
+  taskSuggestions: TaskSuggestion[];
+  onPaneSessionChange?: (paneId: string, sessionKey: string) => void;
+};
+
+const suggestion: TaskSuggestion = {
+  id: "task_123",
+  title: "Remove stale adapter",
+  prompt: "Delete the stale adapter and update tests.",
+  tldr: "The adapter is unreachable and adds maintenance cost.",
+  cwd: "/repo",
+  sessionKey: "agent:main:current",
+  agentId: "main",
+  createdAt: 1,
+};
+
+function createDeferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((nextResolve) => {
+    resolve = nextResolve;
+  });
+  return { promise, resolve };
+}
+
+function createSessionContext(
+  client: GatewayBrowserClient,
+  sessions: SessionCapability,
+): ApplicationContext {
+  return {
+    gateway: {
+      snapshot: {
+        client,
+        connected: true,
+        hello: { features: { methods: ["taskSuggestions.list"] } },
+      },
+    },
+    agents: { state: { agentsList: null } },
+    sessions,
+  } as unknown as ApplicationContext;
+}
+
+function createTestChatPane(params: { client: GatewayBrowserClient; sessions: SessionCapability }) {
+  const pane = document.createElement("openclaw-chat-pane") as unknown as TestChatPane;
+  Object.defineProperty(pane, "isConnected", {
+    configurable: true,
+    value: true,
+  });
+  const requestUpdate = vi.fn();
+  const state = {
+    agentsList: null,
+    assistantAgentId: null,
+    chatError: null,
+    chatLoading: false,
+    chatQueue: [],
+    chatRunId: null,
+    chatSending: false,
+    chatStream: null,
+    client: params.client,
+    connected: true,
+    connectionEpoch: 4,
+    hello: null,
+    lastError: null,
+    requestUpdate,
+    sessionKey: "agent:main:current",
+    sessions: params.sessions,
+    sessionsError: null,
+    sessionsLoading: false,
+  } as unknown as ChatPageHost;
+  pane.context = createSessionContext(params.client, params.sessions);
+  pane.state = state;
+  pane.connectedClient = params.client;
+  pane.connectionGeneration = 4;
+  return { pane, requestUpdate, state };
+}
+
+describe("chat pane session creation lifecycle", () => {
+  it("drops a created session after a same-client reconnect", async () => {
+    const created = createDeferred<string | null>();
+    const sessions = {
+      create: vi.fn(() => created.promise),
+    } as unknown as SessionCapability;
+    const client = {} as GatewayBrowserClient;
+    const { pane, state } = createTestChatPane({ client, sessions });
+    const navigate = vi.fn();
+    pane.onPaneSessionChange = navigate;
+
+    const pending = pane.createSession();
+    state.connected = false;
+    pane.connectionGeneration += 1;
+    state.connectionEpoch = pane.connectionGeneration;
+    state.connected = true;
+    pane.connectionGeneration += 1;
+    state.connectionEpoch = pane.connectionGeneration;
+    created.resolve("agent:main:new");
+
+    await expect(pending).resolves.toBe(false);
+    expect(navigate).not.toHaveBeenCalled();
+  });
+
+  it("does not publish a stale creation error after the context is replaced", async () => {
+    const created = createDeferred<string | null>();
+    const sessions = {
+      create: vi.fn(() => created.promise),
+    } as unknown as SessionCapability;
+    const client = {} as GatewayBrowserClient;
+    const { pane, requestUpdate, state } = createTestChatPane({ client, sessions });
+    const replacementSessions = {} as SessionCapability;
+
+    const pending = pane.createSession();
+    state.sessionsError = "stale sessions.create failure";
+    pane.context = createSessionContext(client, replacementSessions);
+    created.resolve(null);
+
+    await expect(pending).resolves.toBe(false);
+    expect(state.lastError).toBeNull();
+    expect(state.chatError).toBeNull();
+    expect(requestUpdate).not.toHaveBeenCalled();
+  });
+
+  it("does not publish a stale creation error after the pane detaches", async () => {
+    const created = createDeferred<string | null>();
+    const sessions = {
+      create: vi.fn(() => created.promise),
+    } as unknown as SessionCapability;
+    const client = {} as GatewayBrowserClient;
+    const { pane, requestUpdate, state } = createTestChatPane({ client, sessions });
+
+    const pending = pane.createSession();
+    state.sessionsError = "stale sessions.create failure";
+    Object.defineProperty(pane, "isConnected", {
+      configurable: true,
+      value: false,
+    });
+    created.resolve(null);
+
+    await expect(pending).resolves.toBe(false);
+    expect(state.lastError).toBeNull();
+    expect(state.chatError).toBeNull();
+    expect(requestUpdate).not.toHaveBeenCalled();
+  });
+});
+
+describe("chat pane task suggestion lifecycle", () => {
+  it("keeps accept ownership when the resolved event arrives before the response", async () => {
+    const accepted = createDeferred<TaskSuggestionsAcceptResult>();
+    const client = {
+      request: vi.fn((method: string) =>
+        method === "taskSuggestions.accept"
+          ? accepted.promise
+          : Promise.resolve({ suggestions: [] } satisfies TaskSuggestionsListResult),
+      ),
+    } as unknown as GatewayBrowserClient;
+    const sessions = {} as SessionCapability;
+    const { pane } = createTestChatPane({ client, sessions });
+    const navigate = vi.fn();
+    pane.onPaneSessionChange = navigate;
+
+    const pending = pane.acceptTaskSuggestion(suggestion);
+    pane.handleTaskSuggestionEvent({
+      action: "resolved",
+      taskId: suggestion.id,
+      resolution: "accepted",
+    });
+    accepted.resolve({ taskId: suggestion.id, key: "agent:main:task" });
+
+    await pending;
+    expect(navigate).toHaveBeenCalledWith("single", "agent:main:task");
+  });
+
+  it("drops an accept response after a same-client reconnect", async () => {
+    const accepted = createDeferred<TaskSuggestionsAcceptResult>();
+    const client = {
+      request: vi.fn(() => accepted.promise),
+    } as unknown as GatewayBrowserClient;
+    const sessions = {} as SessionCapability;
+    const { pane } = createTestChatPane({ client, sessions });
+    const navigate = vi.fn();
+    pane.onPaneSessionChange = navigate;
+
+    const pending = pane.acceptTaskSuggestion(suggestion);
+    pane.connectionGeneration += 1;
+    accepted.resolve({ taskId: suggestion.id, key: "agent:main:stale" });
+
+    await pending;
+    expect(navigate).not.toHaveBeenCalled();
+  });
+
+  it("drops a list response after a same-client reconnect", async () => {
+    const listed = createDeferred<TaskSuggestionsListResult>();
+    const client = {
+      request: vi.fn(() => listed.promise),
+    } as unknown as GatewayBrowserClient;
+    const sessions = {} as SessionCapability;
+    const { pane } = createTestChatPane({ client, sessions });
+
+    const pending = pane.refreshTaskSuggestions();
+    pane.connectionGeneration += 1;
+    listed.resolve({ suggestions: [suggestion] });
+
+    await pending;
+    expect(pane.taskSuggestions).toEqual([]);
+  });
+});
diff --git a/ui/src/pages/chat/chat-pane.ts b/ui/src/pages/chat/chat-pane.ts
index 15959cd528f..688c50b8845 100644
--- a/ui/src/pages/chat/chat-pane.ts
+++ b/ui/src/pages/chat/chat-pane.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { property } from "lit/decorators.js";
 import type {
   TaskSuggestion,
@@ -32,6 +32,7 @@ import {
   uiSessionEventMatches,
 } from "../../lib/sessions/session-key.ts";
 import { SessionUnreadPatchGuard } from "../../lib/sessions/unread.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
 import { refreshChatAvatar } from "./chat-avatar.ts";
 import {
   applyChatAgentsList,
@@ -89,6 +90,13 @@ import { clearChatMessagesFromCache } from "./session-message-cache.ts";
 
 type ChatPageContext = ApplicationContext;
 type PaneSessionChangeOptions = { replace?: boolean };
+type ChatPaneConnectionScope = {
+  context: ChatPageContext;
+  state: ChatPageHost;
+  client: GatewayBrowserClient;
+  generation: number;
+  sessions: ChatPageContext["sessions"];
+};
 
 const CHAT_OPEN_DETAILS_SELECTOR =
   ".chat-controls__inline-select[open], .context-usage details[open], .agent-chat__talk-select[open], .agent-chat__attach-menu[open]";
@@ -112,8 +120,8 @@ function keyboardEventPathMatches(event: KeyboardEvent, selector: string): boole
     .some((target) => target instanceof Element && target.matches(selector));
 }
 
-class ChatPane extends LitElement {
-  @consume({ context: applicationContext, subscribe: false })
+class ChatPane extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ChatPageContext;
   @property({ attribute: false }) paneId = "single";
   // Empty means "no route/layout opinion yet": the pane boots on the page
@@ -138,12 +146,51 @@ class ChatPane extends LitElement {
   private readonly unreadPatchGuard = new SessionUnreadPatchGuard();
   private taskSuggestions: TaskSuggestion[] = [];
   private readonly taskSuggestionBusyIds = new Set<string>();
+  private readonly taskSuggestionOperations = new Map<string, symbol>();
   private taskSuggestionsRequestVersion = 0;
 
+  private captureConnectionScope(): ChatPaneConnectionScope | null {
+    const context = this.context;
+    const state = this.state;
+    const client = state?.client;
+    if (
+      !this.isConnected ||
+      !state?.connected ||
+      !client ||
+      this.connectedClient !== client ||
+      !context.gateway.snapshot.connected ||
+      context.gateway.snapshot.client !== client
+    ) {
+      return null;
+    }
+    return {
+      context,
+      state,
+      client,
+      generation: this.connectionGeneration,
+      sessions: context.sessions,
+    };
+  }
+
+  private isConnectionScopeCurrent(scope: ChatPaneConnectionScope): boolean {
+    return (
+      this.isConnected &&
+      this.context === scope.context &&
+      this.context.sessions === scope.sessions &&
+      this.state === scope.state &&
+      scope.state.connected &&
+      scope.state.client === scope.client &&
+      this.connectedClient === scope.client &&
+      scope.context.gateway.snapshot.connected &&
+      scope.context.gateway.snapshot.client === scope.client &&
+      this.connectionGeneration === scope.generation
+    );
+  }
+
   private taskSuggestionMatchesCurrentSession(suggestion: TaskSuggestion): boolean {
     const state = this.state;
     return Boolean(
-      state &&
+      state?.connected &&
       uiSessionEventMatches(
         {
           agentsList: this.context.agents.state.agentsList,
@@ -157,28 +204,26 @@ class ChatPane extends LitElement {
   }
 
   private async refreshTaskSuggestions(): Promise<void> {
-    const state = this.state;
-    const client = state?.client;
     const requestVersion = ++this.taskSuggestionsRequestVersion;
+    const scope = this.captureConnectionScope();
     if (
-      !state?.connected ||
-      !client ||
-      !isGatewayMethodAdvertised(this.context.gateway.snapshot, "taskSuggestions.list")
+      !scope ||
+      !isGatewayMethodAdvertised(scope.context.gateway.snapshot, "taskSuggestions.list")
     ) {
       this.taskSuggestions = [];
       this.requestUpdate();
       return;
     }
-    const sessionKey = state.sessionKey;
-    const agentId = resolveChatAgentId(state);
+    const sessionKey = scope.state.sessionKey;
+    const agentId = resolveChatAgentId(scope.state);
     try {
-      const result = await client.request<TaskSuggestionsListResult>("taskSuggestions.list", {
+      const result = await scope.client.request<TaskSuggestionsListResult>("taskSuggestions.list", {
         agentId,
       });
       if (
         requestVersion !== this.taskSuggestionsRequestVersion ||
-        client !== this.state?.client ||
-        sessionKey !== this.state?.sessionKey
+        !this.isConnectionScopeCurrent(scope) ||
+        sessionKey !== scope.state.sessionKey
       ) {
         return;
       }
@@ -213,56 +258,88 @@ class ChatPane extends LitElement {
   }
 
   private readonly acceptTaskSuggestion = async (suggestion: TaskSuggestion): Promise<void> => {
-    const state = this.state;
-    const client = state?.client;
+    const scope = this.captureConnectionScope();
     if (
-      !state ||
-      !client ||
+      !scope ||
       !this.taskSuggestionMatchesCurrentSession(suggestion) ||
-      this.taskSuggestionBusyIds.has(suggestion.id)
+      this.taskSuggestionOperations.has(suggestion.id)
     ) {
       return;
     }
-    const sessionKey = state.sessionKey;
+    const sessionKey = scope.state.sessionKey;
+    const operation = Symbol();
+    const isCurrent = () =>
+      this.isConnectionScopeCurrent(scope) &&
+      scope.state.sessionKey === sessionKey &&
+      this.taskSuggestionOperations.get(suggestion.id) === operation;
+    this.taskSuggestionOperations.set(suggestion.id, operation);
     this.taskSuggestionBusyIds.add(suggestion.id);
     this.requestUpdate();
     try {
-      const result = await client.request<TaskSuggestionsAcceptResult>("taskSuggestions.accept", {
-        taskId: suggestion.id,
-      });
-      this.taskSuggestions = this.taskSuggestions.filter((item) => item.id !== suggestion.id);
-      if (this.state?.sessionKey === sessionKey) {
-        this.onPaneSessionChange?.(this.paneId, result.key);
+      const result = await scope.client.request<TaskSuggestionsAcceptResult>(
+        "taskSuggestions.accept",
+        { taskId: suggestion.id },
+      );
+      if (!isCurrent()) {
+        return;
       }
+      this.taskSuggestions = this.taskSuggestions.filter((item) => item.id !== suggestion.id);
+      this.onPaneSessionChange?.(this.paneId, result.key);
     } catch (error) {
-      state.lastError = error instanceof Error ? error.message : String(error);
-      state.chatError = state.lastError;
+      if (!isCurrent()) {
+        return;
+      }
+      scope.state.lastError = error instanceof Error ? error.message : String(error);
+      scope.state.chatError = scope.state.lastError;
     } finally {
-      this.taskSuggestionBusyIds.delete(suggestion.id);
-      this.requestUpdate();
+      if (this.taskSuggestionOperations.get(suggestion.id) === operation) {
+        this.taskSuggestionOperations.delete(suggestion.id);
+        this.taskSuggestionBusyIds.delete(suggestion.id);
+        if (this.isConnectionScopeCurrent(scope) && scope.state.sessionKey === sessionKey) {
+          this.requestUpdate();
+        }
+      }
     }
   };
 
   private readonly dismissTaskSuggestion = async (suggestion: TaskSuggestion): Promise<void> => {
-    const state = this.state;
+    const scope = this.captureConnectionScope();
     if (
-      !state?.client ||
+      !scope ||
       !this.taskSuggestionMatchesCurrentSession(suggestion) ||
-      this.taskSuggestionBusyIds.has(suggestion.id)
+      this.taskSuggestionOperations.has(suggestion.id)
     ) {
       return;
     }
+    const sessionKey = scope.state.sessionKey;
+    const operation = Symbol();
+    const isCurrent = () =>
+      this.isConnectionScopeCurrent(scope) &&
+      scope.state.sessionKey === sessionKey &&
+      this.taskSuggestionOperations.get(suggestion.id) === operation;
+    this.taskSuggestionOperations.set(suggestion.id, operation);
     this.taskSuggestionBusyIds.add(suggestion.id);
     this.requestUpdate();
     try {
-      await state.client.request("taskSuggestions.dismiss", { taskId: suggestion.id });
+      await scope.client.request("taskSuggestions.dismiss", { taskId: suggestion.id });
+      if (!isCurrent()) {
+        return;
+      }
       this.taskSuggestions = this.taskSuggestions.filter((item) => item.id !== suggestion.id);
     } catch (error) {
-      state.lastError = error instanceof Error ? error.message : String(error);
-      state.chatError = state.lastError;
+      if (!isCurrent()) {
+        return;
+      }
+      scope.state.lastError = error instanceof Error ? error.message : String(error);
+      scope.state.chatError = scope.state.lastError;
     } finally {
-      this.taskSuggestionBusyIds.delete(suggestion.id);
-      this.requestUpdate();
+      if (this.taskSuggestionOperations.get(suggestion.id) === operation) {
+        this.taskSuggestionOperations.delete(suggestion.id);
+        this.taskSuggestionBusyIds.delete(suggestion.id);
+        if (this.isConnectionScopeCurrent(scope) && scope.state.sessionKey === sessionKey) {
+          this.requestUpdate();
+        }
+      }
     }
   };
 
@@ -326,6 +403,8 @@ class ChatPane extends LitElement {
     resetChatStateForRouteSession(state, nextSessionKey);
     this.taskSuggestionsRequestVersion += 1;
     this.taskSuggestions = [];
+    this.taskSuggestionBusyIds.clear();
+    this.taskSuggestionOperations.clear();
     this.markSessionRead(nextSessionRow);
     if (previousSessionKey !== nextSessionKey) {
       state.announceSessionSwitch?.(nextSessionKey, nextSessionLabel);
@@ -392,6 +471,21 @@ class ChatPane extends LitElement {
     if (!state || !state.client || !state.connected) {
       return false;
     }
+    const context = this.context;
+    const sessions = context.sessions;
+    const client = state.client;
+    const connectionGeneration = this.connectionGeneration;
+    const isCurrent = () =>
+      this.isConnected &&
+      this.state === state &&
+      this.context === context &&
+      this.context.sessions === sessions &&
+      state.client === client &&
+      state.connected &&
+      this.connectedClient === client &&
+      context.gateway.snapshot.client === client &&
+      context.gateway.snapshot.connected &&
+      this.connectionGeneration === connectionGeneration;
     if (!canCreateChatSession(state)) {
       state.lastError = NEW_SESSION_ACTIVE_RUN_MESSAGE;
       state.chatError = state.lastError;
@@ -408,12 +502,15 @@ class ChatPane extends LitElement {
     state.lastError = null;
     state.chatError = null;
     const previousSessionKey = state.sessionKey;
-    const nextSessionKey = await this.context.sessions.create({
+    const nextSessionKey = await sessions.create({
       currentSessionKey: previousSessionKey,
       agentId:
         scopedAgentParamsForSession(state, previousSessionKey).agentId ??
         resolveAgentIdFromSessionKey(previousSessionKey),
     });
+    if (!isCurrent()) {
+      return false;
+    }
     if (
       !nextSessionKey ||
       state.sessionKey !== previousSessionKey ||
@@ -554,10 +651,6 @@ class ChatPane extends LitElement {
     state.setChatMobileControlsOpen(false);
   };
 
-  override createRenderRoot() {
-    return this;
-  }
-
   override connectedCallback() {
     super.connectedCallback();
     this.addEventListener("pointerdown", this.handlePaneFocus);
@@ -571,7 +664,7 @@ class ChatPane extends LitElement {
       this.removeEventListener("pointerdown", this.handlePaneFocus);
       this.removeEventListener("focusin", this.handlePaneFocus);
     });
-    const pageState = createPageState(this.context, chatState.requestUpdate, this);
+    const pageState = createPageState(this.context, chatState.createRenderLifecycle(), this);
     pageState.createChatSession = async () => {
       await this.createSession();
     };
@@ -659,6 +752,11 @@ class ChatPane extends LitElement {
   }
 
   override disconnectedCallback() {
+    this.connectionGeneration += 1;
+    this.taskSuggestionsRequestVersion += 1;
+    this.taskSuggestions = [];
+    this.taskSuggestionBusyIds.clear();
+    this.taskSuggestionOperations.clear();
     this.nativeDraftCleanup?.();
     this.nativeDraftCleanup = null;
     this.announceCommandPaletteTarget(null);
@@ -759,9 +857,21 @@ class ChatPane extends LitElement {
       return;
     }
     const wasConnected = state.connected;
+    const sourceChanged = state.client !== snapshot.client || wasConnected !== snapshot.connected;
     const clientChanged = this.connectedClient !== snapshot.client;
+    if (sourceChanged) {
+      // A reconnect can retain the browser client. Keep async ownership tied
+      // to the logical connection, not only the transport object identity.
+      this.connectionGeneration += 1;
+      this.taskSuggestionsRequestVersion += 1;
+      this.taskSuggestions = [];
+      this.taskSuggestionBusyIds.clear();
+      this.taskSuggestionOperations.clear();
+      state.chatLoading = false;
+    }
     state.client = snapshot.client;
     state.connected = snapshot.connected;
+    state.connectionEpoch = this.connectionGeneration;
     state.hello = snapshot.hello;
     state.terminalAvailable =
       this.context.config.current.terminalEnabled &&
@@ -785,7 +895,6 @@ class ChatPane extends LitElement {
     state.assistantName = this.context.config.current.assistantIdentity.name;
     if (!snapshot.connected) {
       if (wasConnected) {
-        this.connectionGeneration += 1;
         const currentSessionId =
           typeof state.currentSessionId === "string" ? state.currentSessionId.trim() : "";
         if (currentSessionId) {
@@ -805,7 +914,7 @@ class ChatPane extends LitElement {
     }
     if (clientChanged && snapshot.client) {
       const startupClient = snapshot.client;
-      const startupGeneration = ++this.connectionGeneration;
+      const startupGeneration = this.connectionGeneration;
       const startupSessionKey = state.sessionKey;
       const agentsListBeforeStartup = this.context.agents.state.agentsList;
       const clientIsCurrent = () =>
diff --git a/ui/src/pages/chat/chat-send-timing.ts b/ui/src/pages/chat/chat-send-timing.ts
index ce3f1c09b9a..0f9887ad263 100644
--- a/ui/src/pages/chat/chat-send-timing.ts
+++ b/ui/src/pages/chat/chat-send-timing.ts
@@ -9,6 +9,7 @@ import {
   roundedControlUiDurationMs,
   scheduleControlUiAfterPaint,
 } from "./performance.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
 
 type ChatSendTimingPhase =
   | "pending-visible"
@@ -35,7 +36,7 @@ type ChatSendTimingHost = SessionScopeHost & {
   chatQueueBySession?: Record<string, ChatQueueItem[]>;
   chatSendTimingsByRun?: Map<string, ChatSendTimingEntry>;
   eventLogBuffer?: unknown[];
-  updateComplete?: Promise<unknown>;
+  renderLifecycle?: RenderLifecycle;
 };
 
 type ChatSendServerTimingPhase =
diff --git a/ui/src/pages/chat/chat-send.test.ts b/ui/src/pages/chat/chat-send.test.ts
index 8062ee13eed..d851ebc6fc9 100644
--- a/ui/src/pages/chat/chat-send.test.ts
+++ b/ui/src/pages/chat/chat-send.test.ts
@@ -16,6 +16,7 @@ import type { executeSlashCommand } from "./chat-command-executor.ts";
 import type { ChatHost } from "./chat-send.ts";
 import { buildChatSessionListOptions } from "./chat-session.ts";
 import type { ChatPageHost } from "./chat-state.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
 
 type ExecuteSlashCommand = typeof executeSlashCommand;
 type TestChatHost = Omit<ChatHost, "settings"> & {
@@ -158,6 +159,21 @@ function fetchUrl(source: MockCallSource, callIndex: number) {
 }
 
 function makeHost(overrides?: Partial<TestChatHost>): TestChatHost {
+  const renderLifecycle: RenderLifecycle = {
+    invalidate: vi.fn(),
+    afterCommit: (effect) => {
+      let active = true;
+      renderLifecycle.invalidate();
+      queueMicrotask(() => {
+        if (active) {
+          effect(() => undefined);
+        }
+      });
+      return () => {
+        active = false;
+      };
+    },
+  };
   const host = {
     client: null,
     chatMessages: [],
@@ -199,7 +215,21 @@ function makeHost(overrides?: Partial<TestChatHost>): TestChatHost {
     toolStreamById: new Map(),
     toolStreamOrder: [],
     toolStreamSyncTimer: null,
-    updateComplete: Promise.resolve(),
+    renderLifecycle,
+    querySelector: () => null,
+    chatScrollCommitCleanup: null,
+    chatScrollFrame: null,
+    chatScrollGuardFrame: null,
+    chatScrollTimeout: null,
+    chatScrollGeneration: 0,
+    chatLastScrollTop: 0,
+    chatLastScrollHeight: 0,
+    chatHasAutoScrolled: false,
+    chatUserNearBottom: true,
+    chatFollowLocked: false,
+    chatNewMessagesBelow: false,
+    chatIsProgrammaticScroll: false,
+    chatProgrammaticScrollTarget: 0,
     ...overrides,
   };
   const sessions = createSessionCapability({
diff --git a/ui/src/pages/chat/chat-send.ts b/ui/src/pages/chat/chat-send.ts
index d26fadafcfe..1b5640f7d64 100644
--- a/ui/src/pages/chat/chat-send.ts
+++ b/ui/src/pages/chat/chat-send.ts
@@ -77,6 +77,7 @@ import {
   type ChatInputHistoryState,
 } from "./input-history.ts";
 import { controlUiNowMs, roundedControlUiDurationMs } from "./performance.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
 import {
   handleAbortChat,
   isChatBusy,
@@ -102,7 +103,7 @@ export type ChatHost = ChatInputHistoryState &
     chatError?: string | null;
     hello: GatewayHelloOk | null;
     chatModelSwitchPromises?: Record<string, Promise<boolean>>;
-    updateComplete?: Promise<unknown>;
+    renderLifecycle?: RenderLifecycle;
     requestUpdate?: () => void;
     refreshSessionsAfterChat: Map<string, SessionRefreshTarget>;
     chatSubmitGuards?: Map<string, Promise<void>>;
diff --git a/ui/src/pages/chat/chat-state.test.ts b/ui/src/pages/chat/chat-state.test.ts
index 0677000faee..92f55cb36c3 100644
--- a/ui/src/pages/chat/chat-state.test.ts
+++ b/ui/src/pages/chat/chat-state.test.ts
@@ -1,10 +1,19 @@
+import type { ReactiveController, ReactiveControllerHost } from "lit";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { SLASH_COMMANDS } from "../../lib/chat/commands.ts";
 import {
   applyRemoteSlashCommandsResult,
   resetChatSlashCommandMetadataForTest,
 } from "./chat-commands.ts";
-import { refreshChatMetadata, resolveChatAvatarUrl, type ChatPageHost } from "./chat-state.ts";
+import {
+  ChatStateController,
+  handleChatManualRefresh,
+  refreshChatMetadata,
+  resolveChatAvatarUrl,
+  type ChatPageHost,
+} from "./chat-state.ts";
+import { scheduleControlUiAfterPaint } from "./performance.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
 
 vi.mock("../../app/assistant-identity.ts", async (importOriginal) => ({
   ...(await importOriginal<typeof import("../../app/assistant-identity.ts")>()),
@@ -13,6 +22,236 @@ vi.mock("../../app/assistant-identity.ts", async (importOriginal) => ({
 
 afterEach(() => {
   resetChatSlashCommandMetadataForTest();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+describe("ChatStateController render lifecycle", () => {
+  it("requests a render before selecting the commit promise", async () => {
+    let resolveCommit: (value: boolean) => void = () => {};
+    const nextCommit = new Promise<boolean>((resolve) => {
+      resolveCommit = resolve;
+    });
+    let completion = Promise.resolve(true);
+    const controllers: ReactiveController[] = [];
+    const requestUpdate = vi.fn(() => {
+      completion = nextCommit;
+    });
+    const host = {
+      addController: (controller: ReactiveController) => controllers.push(controller),
+      removeController: () => undefined,
+      requestUpdate,
+      get updateComplete() {
+        return completion;
+      },
+    } satisfies ReactiveControllerHost;
+    const controller = new ChatStateController<ChatPageHost>(host);
+    controller.hostConnected();
+    const renderLifecycle = controller.createRenderLifecycle();
+    const effect = vi.fn();
+
+    renderLifecycle.afterCommit(effect);
+    await Promise.resolve();
+
+    expect(requestUpdate).toHaveBeenCalledOnce();
+    expect(effect).not.toHaveBeenCalled();
+    resolveCommit(true);
+    await nextCommit;
+    expect(effect).toHaveBeenCalledOnce();
+    expect(controllers).toContain(controller);
+  });
+
+  it("cancels pending commit effects on disconnect", async () => {
+    let resolveCommit: (value: boolean) => void = () => {};
+    const completion = new Promise<boolean>((resolve) => {
+      resolveCommit = resolve;
+    });
+    const host = {
+      addController: () => undefined,
+      removeController: () => undefined,
+      requestUpdate: () => undefined,
+      updateComplete: completion,
+    } satisfies ReactiveControllerHost;
+    const controller = new ChatStateController<ChatPageHost>(host);
+    controller.hostConnected();
+    const renderLifecycle = controller.createRenderLifecycle();
+    const effect = vi.fn();
+
+    renderLifecycle.afterCommit(effect);
+    controller.hostDisconnected();
+    resolveCommit(true);
+    await completion;
+
+    expect(effect).not.toHaveBeenCalled();
+  });
+
+  it("rejects lifecycle work from detached and replaced state epochs", async () => {
+    const requestUpdate = vi.fn();
+    const host = {
+      addController: () => undefined,
+      removeController: () => undefined,
+      requestUpdate,
+      updateComplete: Promise.resolve(true),
+    } satisfies ReactiveControllerHost;
+    const controller = new ChatStateController<ChatPageHost>(host);
+    controller.hostConnected();
+    const first = controller.createRenderLifecycle();
+    const replacement = controller.createRenderLifecycle();
+    const staleEffect = vi.fn();
+    const staleCancel = vi.fn();
+
+    first.invalidate();
+    first.afterCommit(staleEffect, staleCancel);
+
+    expect(requestUpdate).not.toHaveBeenCalled();
+    expect(staleEffect).not.toHaveBeenCalled();
+    expect(staleCancel).toHaveBeenCalledOnce();
+
+    controller.hostDisconnected();
+    replacement.invalidate();
+    replacement.afterCommit(staleEffect, staleCancel);
+
+    expect(requestUpdate).not.toHaveBeenCalled();
+    expect(staleEffect).not.toHaveBeenCalled();
+    expect(staleCancel).toHaveBeenCalledTimes(2);
+
+    controller.hostConnected();
+    const current = controller.createRenderLifecycle();
+    const currentEffect = vi.fn();
+    current.afterCommit(currentEffect);
+    await Promise.resolve();
+
+    expect(requestUpdate).toHaveBeenCalledOnce();
+    expect(currentEffect).toHaveBeenCalledOnce();
+  });
+
+  it("cancels post-commit paint frames on disconnect", async () => {
+    let nextFrame = 1;
+    const frames = new Map<number, FrameRequestCallback>();
+    vi.spyOn(window, "requestAnimationFrame").mockImplementation((callback) => {
+      const id = nextFrame++;
+      frames.set(id, callback);
+      return id;
+    });
+    const cancelAnimationFrame = vi
+      .spyOn(window, "cancelAnimationFrame")
+      .mockImplementation((id) => {
+        frames.delete(id);
+      });
+    const host = {
+      addController: () => undefined,
+      removeController: () => undefined,
+      requestUpdate: vi.fn(),
+      updateComplete: Promise.resolve(true),
+    } satisfies ReactiveControllerHost;
+    const controller = new ChatStateController<ChatPageHost>(host);
+    controller.hostConnected();
+    const renderLifecycle = controller.createRenderLifecycle();
+    const painted = vi.fn();
+
+    scheduleControlUiAfterPaint({ renderLifecycle }, painted);
+    await Promise.resolve();
+
+    const firstFrame = frames.get(1);
+    expect(firstFrame).toBeDefined();
+    frames.delete(1);
+    firstFrame?.(0);
+    const secondFrame = frames.get(2);
+    expect(secondFrame).toBeDefined();
+
+    controller.hostDisconnected();
+    secondFrame?.(0);
+
+    expect(cancelAnimationFrame).toHaveBeenCalledWith(2);
+    expect(painted).not.toHaveBeenCalled();
+  });
+
+  it("resolves a canceled commit wait without starting manual refresh RPCs", async () => {
+    const cancelAnimationFrame = vi.fn();
+    vi.stubGlobal("cancelAnimationFrame", cancelAnimationFrame);
+    let cancelCommit = () => {};
+    const invalidate = vi.fn();
+    const renderLifecycle: RenderLifecycle = {
+      invalidate,
+      afterCommit: (_effect, onCancel) => {
+        cancelCommit = () => onCancel?.();
+        return cancelCommit;
+      },
+    };
+    const resetToolStream = vi.fn();
+    const scrollToBottom = vi.fn();
+    const state = {
+      chatManualRefreshFrame: 40,
+      chatManualRefreshGeneration: 0,
+      chatManualRefreshInFlight: false,
+      chatNewMessagesBelow: true,
+      renderLifecycle,
+      resetToolStream,
+      scrollToBottom,
+    } as unknown as ChatPageHost;
+
+    const refresh = handleChatManualRefresh(state);
+    cancelCommit();
+    await refresh;
+
+    expect(state.chatManualRefreshInFlight).toBe(false);
+    expect(cancelAnimationFrame).toHaveBeenCalledWith(40);
+    expect(resetToolStream).not.toHaveBeenCalled();
+    expect(scrollToBottom).not.toHaveBeenCalled();
+    expect(invalidate).not.toHaveBeenCalled();
+  });
+
+  it("cancels pending manual refresh frames when state is replaced or disconnected", () => {
+    const cancelAnimationFrame = vi.fn();
+    vi.stubGlobal("cancelAnimationFrame", cancelAnimationFrame);
+    const host = {
+      addController: () => undefined,
+      removeController: () => undefined,
+      requestUpdate: () => undefined,
+      updateComplete: Promise.resolve(true),
+    } satisfies ReactiveControllerHost;
+    const controller = new ChatStateController<ChatPageHost>(host);
+    controller.hostConnected();
+    const createState = (frame: number, renderLifecycle: RenderLifecycle) =>
+      ({
+        chatLoading: false,
+        chatMessages: [],
+        chatToolMessages: [],
+        chatStream: null,
+        realtimeTalkConversation: [],
+        handleSendChat: async () => undefined,
+        handleChatDraftChange: () => undefined,
+        handleChatInputHistoryKey: () => ({ handled: false }),
+        chatManualRefreshFrame: frame,
+        chatManualRefreshGeneration: 1,
+        chatManualRefreshInFlight: true,
+        renderLifecycle,
+        chatScrollCommitCleanup: null,
+        chatScrollFrame: null,
+        chatScrollGuardFrame: null,
+        chatScrollTimeout: null,
+        chatScrollGeneration: 0,
+        chatIsProgrammaticScroll: false,
+        sessionWorkspaceState: undefined,
+        realtimeTalkSession: null,
+        resetToolStream: vi.fn(),
+      }) as unknown as ChatPageHost;
+    const first = createState(41, controller.createRenderLifecycle());
+
+    controller.attach(first);
+    const second = createState(42, controller.createRenderLifecycle());
+    controller.attach(second);
+
+    expect(cancelAnimationFrame).toHaveBeenCalledWith(41);
+    expect(first.chatManualRefreshFrame).toBeNull();
+    expect(first.chatManualRefreshInFlight).toBe(false);
+
+    controller.hostDisconnected();
+
+    expect(cancelAnimationFrame).toHaveBeenCalledWith(42);
+    expect(second.chatManualRefreshFrame).toBeNull();
+    expect(second.chatManualRefreshInFlight).toBe(false);
+  });
 });
 
 describe("resolveChatAvatarUrl", () => {
diff --git a/ui/src/pages/chat/chat-state.ts b/ui/src/pages/chat/chat-state.ts
index 816d6c1dbf1..678223f205a 100644
--- a/ui/src/pages/chat/chat-state.ts
+++ b/ui/src/pages/chat/chat-state.ts
@@ -78,7 +78,7 @@ import {
 } from "./components/chat-session-workspace.ts";
 import type { SidebarContent } from "./components/chat-sidebar.ts";
 import {
-  ChatComposerPersistenceController,
+  ChatComposerPersistence,
   persistChatComposerState,
   restoreChatComposerState,
 } from "./composer-persistence.ts";
@@ -90,6 +90,8 @@ import {
   type ChatInputHistoryKeyResult,
 } from "./input-history.ts";
 import { applyModelCatalogResult, loadModels } from "./models.ts";
+import type { AfterCommitEffect, RenderLifecycle } from "./render-lifecycle.ts";
+import { waitForCommit } from "./render-lifecycle.ts";
 import {
   handleAbortChat,
   reconcileChatRunFromCurrentSessionRow,
@@ -97,7 +99,13 @@ import {
   reconcileChatRunLifecycle,
   reconcileStaleChatRunAfterSessionStatePublication,
 } from "./run-lifecycle.ts";
-import { scheduleChatScroll, handleChatScroll, resetChatScroll } from "./scroll.ts";
+import {
+  cancelChatScroll,
+  handleChatScroll,
+  resetChatScroll,
+  scheduleChatScroll,
+  scheduleCommittedChatScroll,
+} from "./scroll.ts";
 import { cacheChatMessages, readChatMessagesFromCache } from "./session-message-cache.ts";
 import {
   handleAgentEvent,
@@ -110,7 +118,6 @@ import {
 
 type ChatPageElement = {
   querySelector: (selectors: string) => Element | null;
-  readonly updateComplete: Promise<unknown>;
 };
 
 export type ChatPageHost = ChatHost &
@@ -169,6 +176,8 @@ export type ChatPageHost = ChatHost &
     chatRunStatus: ChatProps["runStatus"];
     chatNewMessagesBelow: boolean;
     chatManualRefreshInFlight: boolean;
+    chatManualRefreshFrame: number | null;
+    chatManualRefreshGeneration: number;
     chatMetadataRequestVersion: number;
     chatModelsLoading: boolean;
     chatMobileControlsOpen: boolean;
@@ -181,21 +190,23 @@ export type ChatPageHost = ChatHost &
     chatInputHistoryItems: string[] | null;
     chatInputHistoryIndex: number;
     chatDraftBeforeHistory: string | null;
+    chatScrollCommitCleanup: (() => void) | null;
     chatScrollFrame: number | null;
+    chatScrollGuardFrame: number | null;
     chatScrollTimeout: number | null;
+    chatScrollGeneration: number;
     chatLastScrollTop: number;
     chatLastScrollHeight: number;
     chatHasAutoScrolled: boolean;
     chatUserNearBottom: boolean;
     chatFollowLocked: boolean;
-    chatHeaderControlsHidden: boolean;
     chatIsProgrammaticScroll: boolean;
     chatProgrammaticScrollTarget: number;
     sidebarOpen: boolean;
     sidebarContent: SidebarContent | null;
     splitRatio: number;
     querySelector: (selectors: string) => Element | null;
-    updateComplete: Promise<unknown>;
+    renderLifecycle: RenderLifecycle;
     requestUpdate: () => void;
     onModelChanged: () => Promise<void> | void;
     resetToolStream: () => void;
@@ -248,25 +259,62 @@ export function canCreateChatSession(
 }
 
 export async function handleChatManualRefresh(state: ChatPageHost): Promise<void> {
+  if (state.chatManualRefreshFrame !== null) {
+    cancelAnimationFrame(state.chatManualRefreshFrame);
+    state.chatManualRefreshFrame = null;
+  }
+  const lifecycle = state.renderLifecycle;
+  const generation = ++state.chatManualRefreshGeneration;
   state.chatManualRefreshInFlight = true;
   state.chatNewMessagesBelow = false;
-  await state.updateComplete;
+  const committed = await waitForCommit(lifecycle);
+  if (!committed || generation !== state.chatManualRefreshGeneration) {
+    if (generation === state.chatManualRefreshGeneration) {
+      state.chatManualRefreshInFlight = false;
+    }
+    return;
+  }
   state.resetToolStream();
   try {
     await Promise.allSettled([
       refreshPageChat(state, { awaitHistory: true, scheduleScroll: false }),
       refreshChatModelAuthStatus(state, { refresh: true }),
     ]);
-    state.scrollToBottom({ smooth: true });
+    if (generation === state.chatManualRefreshGeneration) {
+      state.scrollToBottom({ smooth: true });
+    }
   } finally {
-    requestAnimationFrame(() => {
-      state.chatManualRefreshInFlight = false;
-      state.chatNewMessagesBelow = false;
-      state.requestUpdate();
-    });
+    if (generation === state.chatManualRefreshGeneration) {
+      let finalized = false;
+      const frame = requestAnimationFrame(() => {
+        finalized = true;
+        state.chatManualRefreshFrame = null;
+        if (
+          generation !== state.chatManualRefreshGeneration ||
+          lifecycle !== state.renderLifecycle
+        ) {
+          return;
+        }
+        state.chatManualRefreshInFlight = false;
+        state.chatNewMessagesBelow = false;
+        lifecycle.invalidate();
+      });
+      if (!finalized) {
+        state.chatManualRefreshFrame = frame;
+      }
+    }
   }
 }
 
+function cancelChatManualRefresh(state: ChatPageHost): void {
+  state.chatManualRefreshGeneration += 1;
+  if (state.chatManualRefreshFrame !== null) {
+    cancelAnimationFrame(state.chatManualRefreshFrame);
+    state.chatManualRefreshFrame = null;
+  }
+  state.chatManualRefreshInFlight = false;
+}
+
 export function resolveAssistantAttachmentAuthToken(state: ChatPageHost) {
   return resolveControlUiAuthToken(state);
 }
@@ -954,7 +1002,7 @@ async function loadPageAssistantIdentity(
 
 export function createPageState(
   context: ApplicationContext,
-  requestUpdate: () => void,
+  renderLifecycle: RenderLifecycle,
   page: ChatPageElement,
 ): ChatPageHost {
   const settings = loadSettings();
@@ -979,6 +1027,7 @@ export function createPageState(
     chatMessageMaxWidth: appConfig.chatMessageMaxWidth,
     client: null,
     connected: false,
+    connectionEpoch: 0,
     hello: null,
     terminalAvailable: false,
     assistantAgentId: context.agentSelection.state.selectedId,
@@ -1035,6 +1084,8 @@ export function createPageState(
     basePath: context.basePath,
     chatNewMessagesBelow: false,
     chatManualRefreshInFlight: false,
+    chatManualRefreshFrame: null,
+    chatManualRefreshGeneration: 0,
     chatMobileControlsOpen: false,
     chatMobileControlsTrigger: null,
     sessionsHideCron: true,
@@ -1043,14 +1094,16 @@ export function createPageState(
     chatInputHistoryItems: null,
     chatInputHistoryIndex: -1,
     chatDraftBeforeHistory: null,
+    chatScrollCommitCleanup: null,
     chatScrollFrame: null,
+    chatScrollGuardFrame: null,
     chatScrollTimeout: null,
+    chatScrollGeneration: 0,
     chatLastScrollTop: 0,
     chatLastScrollHeight: 0,
     chatHasAutoScrolled: false,
     chatUserNearBottom: true,
     chatFollowLocked: false,
-    chatHeaderControlsHidden: false,
     chatIsProgrammaticScroll: false,
     chatProgrammaticScrollTarget: 0,
     sidebarOpen: false,
@@ -1060,16 +1113,12 @@ export function createPageState(
     toolStreamOrder: [] as string[],
     toolStreamSyncTimer: null,
     ...createInitialChatRealtimeState(settings.realtimeTalkInputDeviceId),
-    requestUpdate,
+    renderLifecycle,
+    requestUpdate: () => renderLifecycle.invalidate(),
     sessionWorkspaceState: undefined,
     sessionWorkspaceOpenRequest: undefined,
     querySelector: page.querySelector.bind(page),
   } as unknown as ChatPageHost;
-  Object.defineProperty(state, "updateComplete", {
-    configurable: true,
-    enumerable: false,
-    get: () => page.updateComplete,
-  });
 
   state.resetToolStream = () => resetToolStream(state as never);
   state.onModelChanged = () => undefined;
@@ -1092,19 +1141,19 @@ export function createPageState(
       splitRatio: next.splitRatio,
     });
     state.splitRatio = state.settings.splitRatio;
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.setChatMobileControlsOpen = (open, options) => {
     if (open) {
       state.chatMobileControlsTrigger = options?.trigger ?? state.chatMobileControlsTrigger;
       state.chatMobileControlsOpen = true;
-      requestUpdate();
+      renderLifecycle.invalidate();
       return;
     }
     const focusTarget = options?.restoreFocus ? state.chatMobileControlsTrigger : null;
     state.chatMobileControlsOpen = false;
     state.chatMobileControlsTrigger = null;
-    requestUpdate();
+    renderLifecycle.invalidate();
     if (!(focusTarget instanceof HTMLElement) || !focusTarget.isConnected) {
       return;
     }
@@ -1122,28 +1171,28 @@ export function createPageState(
     handleSendChat(state, messageOverride, options as never);
   state.handleAbortChat = async (options) => {
     await handleAbortChat(state, options as never);
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.removeQueuedMessage = (id) => {
     removeQueuedMessage(state, id);
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.retryQueuedChatMessage = async (id) => {
     await retryQueuedChatMessage(state, id);
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.steerQueuedChatMessage = async (id) => {
     await steerQueuedChatMessage(state, id);
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.handleOpenSidebar = (content) => {
     state.sidebarContent = content;
     state.sidebarOpen = true;
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.handleCloseSidebar = () => {
     state.sidebarOpen = false;
-    requestUpdate();
+    renderLifecycle.invalidate();
   };
   state.handleSplitRatioChange = (ratio) => {
     const next = Math.max(0.4, Math.min(0.7, ratio));
@@ -1197,8 +1246,13 @@ function requestPageUpdate(state: ChatPageHost) {
   state.requestUpdate?.();
 }
 
+type ChatRenderLifecycleScope = {
+  connectionEpoch: number;
+  cancellations: Set<() => void>;
+};
+
 export class ChatStateController<TState extends ChatPageHost> implements ReactiveController {
-  private readonly composerPersistence: ChatComposerPersistenceController;
+  private readonly composerPersistence: ChatComposerPersistence;
   private stateValue: TState | undefined;
   private previousChatLoading = false;
   private previousChatMessages: unknown[] = [];
@@ -1217,32 +1271,56 @@ export class ChatStateController<TState extends ChatPageHost> implements Reactiv
     | undefined;
   private pendingCreatedSessionComposer: PendingCreatedSessionComposer | null = null;
   private readonly cleanups: Array<() => void> = [];
+  private renderLifecycleConnected = false;
+  private renderLifecycleConnectionEpoch = 0;
+  private renderLifecycleScope: ChatRenderLifecycleScope | undefined;
 
   constructor(private readonly host: ReactiveControllerHost) {
+    this.composerPersistence = new ChatComposerPersistence(() => this.stateValue);
     host.addController(this);
-    this.composerPersistence = new ChatComposerPersistenceController(host, () => this.stateValue);
   }
 
   get state(): TState | undefined {
     return this.stateValue;
   }
 
+  createRenderLifecycle(): RenderLifecycle {
+    this.cancelRenderLifecycleScope();
+    const scope: ChatRenderLifecycleScope = {
+      connectionEpoch: this.renderLifecycleConnectionEpoch,
+      cancellations: new Set(),
+    };
+    this.renderLifecycleScope = scope;
+    return {
+      invalidate: () => {
+        this.requestUpdateForScope(scope);
+      },
+      afterCommit: (effect, onCancel) => this.afterCommit(scope, effect, onCancel),
+    };
+  }
+
   attach(state: TState) {
+    if (this.stateValue && this.stateValue !== state) {
+      this.composerPersistence.stop();
+      cancelChatManualRefresh(this.stateValue);
+      cancelChatScroll(this.stateValue);
+    }
     this.stateValue = state;
     this.previousChatLoading = state.chatLoading;
     this.previousChatMessages = state.chatMessages;
     this.previousChatToolMessages = state.chatToolMessages;
     this.previousChatStream = state.chatStream;
     this.previousRealtimeConversation = state.realtimeTalkConversation;
-    state.requestUpdate = this.requestUpdate;
+    const renderLifecycle = state.renderLifecycle;
+    state.requestUpdate = () => renderLifecycle.invalidate();
     const sendChat = state.handleSendChat;
     state.handleSendChat = async (messageOverride, options) => {
       const pending = sendChat(messageOverride, options);
-      this.requestUpdate();
+      renderLifecycle.invalidate();
       try {
         await pending;
       } finally {
-        this.requestUpdate();
+        renderLifecycle.invalidate();
       }
     };
     const commitDraftChange = state.handleChatDraftChange;
@@ -1250,17 +1328,118 @@ export class ChatStateController<TState extends ChatPageHost> implements Reactiv
       commitDraftChange(next);
       this.composerPersistence.schedule();
     };
+    const navigateInputHistory = state.handleChatInputHistoryKey;
+    state.handleChatInputHistoryKey = (input) => {
+      const result = navigateInputHistory(input);
+      if (result.handled) {
+        this.composerPersistence.schedule();
+      }
+      return result;
+    };
   }
 
   addCleanup(cleanup: () => void) {
     this.cleanups.push(cleanup);
   }
 
-  readonly requestUpdate = () => {
+  private isRenderLifecycleScopeActive(scope: ChatRenderLifecycleScope): boolean {
+    return (
+      this.renderLifecycleConnected &&
+      this.renderLifecycleScope === scope &&
+      scope.connectionEpoch === this.renderLifecycleConnectionEpoch
+    );
+  }
+
+  private requestUpdateForScope(scope: ChatRenderLifecycleScope): boolean {
+    if (!this.isRenderLifecycleScopeActive(scope)) {
+      return false;
+    }
     this.composerPersistence.persistChangedState();
     this.captureRenderLifecycleChanges();
     this.host.requestUpdate();
-  };
+    return true;
+  }
+
+  private cancelRenderLifecycleScope(): void {
+    const scope = this.renderLifecycleScope;
+    if (!scope) {
+      return;
+    }
+    this.renderLifecycleScope = undefined;
+    for (const cancel of scope.cancellations) {
+      cancel();
+    }
+  }
+
+  private afterCommit(
+    scope: ChatRenderLifecycleScope,
+    effect: AfterCommitEffect,
+    onCancel?: () => void,
+  ): () => void {
+    if (!this.isRenderLifecycleScopeActive(scope)) {
+      onCancel?.();
+      return () => undefined;
+    }
+    let active = true;
+    let committed = false;
+    let cleanup: (() => void) | undefined;
+    const complete = () => {
+      if (!active) {
+        return;
+      }
+      active = false;
+      cleanup = undefined;
+      scope.cancellations.delete(cancel);
+    };
+    const cancel = () => {
+      if (!active) {
+        return;
+      }
+      active = false;
+      scope.cancellations.delete(cancel);
+      try {
+        cleanup?.();
+      } finally {
+        cleanup = undefined;
+        if (!committed) {
+          onCancel?.();
+        }
+      }
+    };
+    scope.cancellations.add(cancel);
+    // Request first so updateComplete represents the render this effect needs.
+    if (!this.requestUpdateForScope(scope)) {
+      cancel();
+      return cancel;
+    }
+    const completion = this.host.updateComplete;
+    void completion.then(() => {
+      if (!active) {
+        return;
+      }
+      if (!this.isRenderLifecycleScopeActive(scope)) {
+        cancel();
+        return;
+      }
+      committed = true;
+      try {
+        const nextCleanup = effect(complete);
+        if (typeof nextCleanup === "function") {
+          if (active && this.isRenderLifecycleScopeActive(scope)) {
+            cleanup = nextCleanup;
+          } else {
+            nextCleanup();
+          }
+        } else {
+          complete();
+        }
+      } catch (error) {
+        complete();
+        throw error;
+      }
+    }, cancel);
+    return cancel;
+  }
 
   private captureRenderLifecycleChanges() {
     const state = this.stateValue;
@@ -1317,13 +1496,20 @@ export class ChatStateController<TState extends ChatPageHost> implements Reactiv
       if (!currentState || currentState.chatManualRefreshInFlight) {
         return;
       }
-      scheduleChatScroll(currentState, false, false, { source: "resize" });
+      scheduleCommittedChatScroll(currentState, false, false, { source: "resize" });
     });
     this.chatThreadResizeObserver.observe(thread);
     this.chatThreadResizeObserver.observe(content);
     this.chatThreadResizeTargets = { thread, content };
   }
 
+  hostConnected() {
+    this.renderLifecycleConnectionEpoch += 1;
+    this.renderLifecycleConnected = true;
+    // A lifecycle created while detached must never become active on reconnect.
+    this.cancelRenderLifecycleScope();
+  }
+
   hostUpdated() {
     const state = this.stateValue;
     if (state) {
@@ -1340,7 +1526,7 @@ export class ChatStateController<TState extends ChatPageHost> implements Reactiv
     if (!state || state.chatManualRefreshInFlight) {
       return;
     }
-    scheduleChatScroll(state, force, false, { contentChanged });
+    scheduleCommittedChatScroll(state, force, false, { contentChanged });
   }
 
   restoreComposer(options: { preserveCurrent?: boolean } = {}) {
@@ -1385,6 +1571,8 @@ export class ChatStateController<TState extends ChatPageHost> implements Reactiv
     }
     const state = this.stateValue;
     if (state) {
+      cancelChatManualRefresh(state);
+      cancelChatScroll(state);
       clearSessionWorkspaceTimers(state);
     }
     state?.realtimeTalkSession?.stop();
@@ -1395,6 +1583,11 @@ export class ChatStateController<TState extends ChatPageHost> implements Reactiv
   }
 
   hostDisconnected() {
+    this.renderLifecycleConnected = false;
+    this.cancelRenderLifecycleScope();
+    // Flush while stateValue still points at the active session. Composer
+    // persistence is owned here so controller registration order cannot lose it.
+    this.composerPersistence.stop();
     this.stopChatEffects();
     this.stateValue = undefined;
     this.scrollAfterUpdate = false;
diff --git a/ui/src/pages/chat/chat-view.test.ts b/ui/src/pages/chat/chat-view.test.ts
index 0acf618dde0..5b66c64c0b1 100644
--- a/ui/src/pages/chat/chat-view.test.ts
+++ b/ui/src/pages/chat/chat-view.test.ts
@@ -2220,6 +2220,38 @@ describe("chat composer IME composition", () => {
     expect(onHistoryKeydown).not.toHaveBeenCalled();
   });
 
+  it("invalidates after handled input history navigation", () => {
+    const onRequestUpdate = vi.fn();
+    const onHistoryKeydown = vi.fn(() => ({
+      handled: true,
+      preventDefault: true,
+      restoreCaret: "up" as const,
+      decision: "handled:history-up" as const,
+      historyNavigationActiveBefore: false,
+      historyNavigationActiveAfter: true,
+      selectionStart: 0,
+      selectionEnd: 0,
+      valueLength: 0,
+    }));
+    const container = renderChatView({ onHistoryKeydown, onRequestUpdate });
+    const textarea = requireElement(
+      container,
+      ".agent-chat__composer-combobox > textarea",
+      "composer textarea",
+    ) as HTMLTextAreaElement;
+    const arrowEvent = new KeyboardEvent("keydown", {
+      key: "ArrowUp",
+      bubbles: true,
+      cancelable: true,
+    });
+
+    textarea.dispatchEvent(arrowEvent);
+
+    expect(arrowEvent.defaultPrevented).toBe(true);
+    expect(onHistoryKeydown).toHaveBeenCalledOnce();
+    expect(onRequestUpdate).toHaveBeenCalledOnce();
+  });
+
   it("does not force textarea resize during IME composition", () => {
     const container = renderChatView({});
     const textarea = requireElement(
@@ -4196,6 +4228,35 @@ describe("right-click Reply", () => {
     expect(document.querySelector(".chat-reply-context-menu")).toBeNull();
   });
 
+  it("dismisses the reply context menu before a later context menu opens", () => {
+    const frameCallbacks: FrameRequestCallback[] = [];
+    vi.stubGlobal(
+      "requestAnimationFrame",
+      vi.fn((callback: FrameRequestCallback) => {
+        frameCallbacks.push(callback);
+        return frameCallbacks.length;
+      }),
+    );
+    const container = renderChatView({ onSetReply: vi.fn() });
+    const section = container.querySelector<HTMLElement>(".card.chat");
+    const group = document.createElement("div");
+    group.className = "chat-group";
+    const bubble = document.createElement("div");
+    bubble.className = "chat-bubble";
+    bubble.dataset.messageText = "hello world";
+    group.appendChild(bubble);
+    section!.querySelector(".chat-thread-inner")!.appendChild(group);
+    bubble.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
+    for (const callback of frameCallbacks.splice(0)) {
+      callback(0);
+    }
+    expect(document.querySelector(".chat-reply-context-menu")).not.toBeNull();
+
+    document.body.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
+
+    expect(document.querySelector(".chat-reply-context-menu")).toBeNull();
+  });
+
   it("renders reply preview bar with quote text and dismiss button", () => {
     const container = renderChatView({
       replyTarget: {
diff --git a/ui/src/pages/chat/components/chat-composer.ts b/ui/src/pages/chat/components/chat-composer.ts
index e7a739f8e63..d28149c50c5 100644
--- a/ui/src/pages/chat/components/chat-composer.ts
+++ b/ui/src/pages/chat/components/chat-composer.ts
@@ -2068,6 +2068,9 @@ export function renderChatComposer(props: ChatComposerProps) {
         if (result.preventDefault) {
           event.preventDefault();
         }
+        // History navigation updates the renderer-owned draft outside a
+        // reactive property; commit it before placing the caret in the DOM.
+        requestUpdate();
         if (result.restoreCaret) {
           restoreHistoryCaret(target, result.restoreCaret);
         }
diff --git a/ui/src/pages/chat/components/chat-sidebar.ts b/ui/src/pages/chat/components/chat-sidebar.ts
index 59e090cfcf3..e3a2f18bb90 100644
--- a/ui/src/pages/chat/components/chat-sidebar.ts
+++ b/ui/src/pages/chat/components/chat-sidebar.ts
@@ -1,5 +1,5 @@
 import DOMPurify from "dompurify";
-import { LitElement, html, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property, state } from "lit/decorators.js";
 import { keyed } from "lit/directives/keyed.js";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
@@ -10,14 +10,15 @@ import {
   markdownFileLinkFromEvent,
   toSanitizedMarkdownHtml,
 } from "../../../components/markdown.ts";
-import "../../../components/tooltip.ts";
 import { extractRawText } from "../../../lib/chat/message-extract.ts";
+import "../../../components/tooltip.ts";
 import {
   resolveCanvasIframeUrl,
   resolveEmbedSandbox,
   type EmbedSandboxMode,
 } from "../../../lib/chat/tool-display.ts";
 import { copyToClipboard } from "../../../lib/clipboard.ts";
+import { OpenClawLightDomElement } from "../../../lit/openclaw-element.ts";
 
 export const CHAT_DETAIL_FULL_MESSAGE_MAX_CHARS = 500_000;
 
@@ -596,7 +597,7 @@ export function renderMarkdownSidebar(props: MarkdownSidebarProps) {
   `;
 }
 
-class ChatDetailPanel extends LitElement {
+class ChatDetailPanel extends OpenClawLightDomElement {
   @property({ attribute: false }) content: SidebarContent | null = null;
   @property({ attribute: false }) loadFullMessage?:
     | ((request: SidebarFullMessageRequest) => Promise<DetailFullMessageResult | null | undefined>)
@@ -621,10 +622,6 @@ class ChatDetailPanel extends LitElement {
   private showingRawText = false;
   private copyFeedbackTimer: ReturnType<typeof globalThis.setTimeout> | null = null;
 
-  override createRenderRoot() {
-    return this;
-  }
-
   override connectedCallback() {
     super.connectedCallback();
     document.addEventListener("pointerdown", this.handleDocumentPointerDown);
diff --git a/ui/src/pages/chat/components/chat-thread.ts b/ui/src/pages/chat/components/chat-thread.ts
index 94e8ca49e2c..9a72e063acf 100644
--- a/ui/src/pages/chat/components/chat-thread.ts
+++ b/ui/src/pages/chat/components/chat-thread.ts
@@ -459,6 +459,7 @@ export function renderChatPinnedMessages(
 let activeReplyContextMenu: HTMLElement | null = null;
 let activeReplyContextMenuPaneId: string | null = null;
 let contextMenuDocumentClickHandler: ((event: MouseEvent) => void) | null = null;
+let contextMenuDocumentContextMenuHandler: ((event: MouseEvent) => void) | null = null;
 let contextMenuKeydownHandler: ((event: KeyboardEvent) => void) | null = null;
 
 function removeReplyContextMenu(paneId?: string) {
@@ -473,6 +474,10 @@ function removeReplyContextMenu(paneId?: string) {
     document.removeEventListener("click", contextMenuDocumentClickHandler);
     contextMenuDocumentClickHandler = null;
   }
+  if (contextMenuDocumentContextMenuHandler) {
+    document.removeEventListener("contextmenu", contextMenuDocumentContextMenuHandler, true);
+    contextMenuDocumentContextMenuHandler = null;
+  }
   if (contextMenuKeydownHandler) {
     document.removeEventListener("keydown", contextMenuKeydownHandler);
     contextMenuKeydownHandler = null;
@@ -578,6 +583,11 @@ function handleChatContextMenu(event: MouseEvent, props: ChatThreadProps) {
         removeReplyContextMenu();
       }
     };
+    contextMenuDocumentContextMenuHandler = (nextEvent: MouseEvent) => {
+      if (!menu.contains(nextEvent.target as Node | null)) {
+        removeReplyContextMenu();
+      }
+    };
     const handleKeydown = (nextEvent: KeyboardEvent) => {
       if (nextEvent.key === "Escape") {
         nextEvent.preventDefault();
@@ -588,6 +598,8 @@ function handleChatContextMenu(event: MouseEvent, props: ChatThreadProps) {
     };
     contextMenuKeydownHandler = handleKeydown;
     document.addEventListener("click", contextMenuDocumentClickHandler);
+    // Capture closes this owner even when the next menu stops event propagation.
+    document.addEventListener("contextmenu", contextMenuDocumentContextMenuHandler, true);
     document.addEventListener("keydown", handleKeydown);
   });
 }
diff --git a/ui/src/pages/chat/composer-persistence.test.ts b/ui/src/pages/chat/composer-persistence.test.ts
index 26e4bcea833..2b72cc26558 100644
--- a/ui/src/pages/chat/composer-persistence.test.ts
+++ b/ui/src/pages/chat/composer-persistence.test.ts
@@ -3,13 +3,16 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { ChatQueueItem } from "../../lib/chat/chat-types.ts";
 import { createStorageMock } from "../../test-helpers/storage.ts";
 import {
+  ChatComposerPersistence,
   loadChatComposerSnapshot,
   persistChatComposerState,
   removeStoredChatComposerQueueItem,
   restoreChatComposerState,
 } from "./composer-persistence.ts";
 
-function createState(overrides: Partial<Parameters<typeof persistChatComposerState>[0]> = {}) {
+function createState(
+  overrides: Partial<Parameters<typeof persistChatComposerState>[0]> = {},
+): Parameters<typeof persistChatComposerState>[0] {
   return {
     settings: { gatewayUrl: "ws://gateway.test/control" },
     sessionKey: "agent:lily:main",
@@ -24,10 +27,38 @@ beforeEach(() => {
 });
 
 afterEach(() => {
+  vi.useRealTimers();
   vi.unstubAllGlobals();
 });
 
 describe("chat composer persistence", () => {
+  it("flushes a debounced draft before its owner releases state", () => {
+    vi.useFakeTimers();
+    const state = createState();
+    const persistence = new ChatComposerPersistence(() => state);
+    persistence.start();
+    state.chatMessage = "persist during disconnect";
+    persistence.schedule();
+
+    persistence.stop();
+
+    expect(loadChatComposerSnapshot(state, state.sessionKey)).toEqual({
+      draft: "persist during disconnect",
+      queue: [],
+    });
+  });
+
+  it("persists queue reference changes immediately", () => {
+    const state = createState();
+    const persistence = new ChatComposerPersistence(() => state);
+    persistence.start();
+    state.chatQueue = [{ id: "queued-now", text: "keep me", createdAt: 1 }];
+
+    persistence.persistChangedState();
+
+    expect(loadChatComposerSnapshot(state, state.sessionKey)?.queue).toEqual(state.chatQueue);
+  });
+
   it("restores draft text and queued messages for the same gateway session", () => {
     const queue: ChatQueueItem[] = [
       {
diff --git a/ui/src/pages/chat/composer-persistence.ts b/ui/src/pages/chat/composer-persistence.ts
index 2982eac201c..dc9fe43deb8 100644
--- a/ui/src/pages/chat/composer-persistence.ts
+++ b/ui/src/pages/chat/composer-persistence.ts
@@ -1,4 +1,3 @@
-import type { ReactiveController, ReactiveControllerHost } from "lit";
 import type {
   ChatAttachment,
   ChatQueueItem,
@@ -489,7 +488,7 @@ export function restoreChatComposerState(
   return true;
 }
 
-export class ChatComposerPersistenceController implements ReactiveController {
+export class ChatComposerPersistence {
   private timer: ReturnType<typeof globalThis.setTimeout> | null = null;
   private ready = false;
   private lastPersisted: {
@@ -498,16 +497,7 @@ export class ChatComposerPersistenceController implements ReactiveController {
     chatQueue: ChatQueueItem[];
   } | null = null;
 
-  constructor(
-    host: ReactiveControllerHost,
-    private readonly getState: () => ChatComposerPersistenceState | undefined,
-  ) {
-    host.addController(this);
-  }
-
-  hostDisconnected() {
-    this.stop();
-  }
+  constructor(private readonly getState: () => ChatComposerPersistenceState | undefined) {}
 
   start() {
     const state = this.getState();
diff --git a/ui/src/pages/chat/performance.ts b/ui/src/pages/chat/performance.ts
index 4c1132ff954..a6988f9aabf 100644
--- a/ui/src/pages/chat/performance.ts
+++ b/ui/src/pages/chat/performance.ts
@@ -1,8 +1,9 @@
 import type { EventLogEntry } from "../../api/event-log.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
 
 type ChatPerformanceHost = {
   eventLogBuffer?: unknown[];
-  updateComplete?: Promise<unknown>;
+  renderLifecycle?: RenderLifecycle;
 };
 
 const EVENT_LOG_LIMIT = 250;
@@ -17,12 +18,59 @@ export function roundedControlUiDurationMs(durationMs: number): number {
   return Math.max(0, Math.round(durationMs));
 }
 
-function runAfterPaint(callback: () => void): void {
+function runAfterPaint(callback: () => void, complete: () => void): () => void {
+  let active = true;
+  let firstFrame: number | null = null;
+  let secondFrame: number | null = null;
+  const run = () => {
+    if (!active) {
+      return;
+    }
+    active = false;
+    try {
+      callback();
+    } finally {
+      complete();
+    }
+  };
   if (typeof window === "undefined" || typeof window.requestAnimationFrame !== "function") {
-    queueMicrotask(callback);
-    return;
+    queueMicrotask(run);
+  } else {
+    let firstFrameCompleted = false;
+    const scheduledFirstFrame = window.requestAnimationFrame(() => {
+      firstFrameCompleted = true;
+      firstFrame = null;
+      if (!active) {
+        return;
+      }
+      let secondFrameCompleted = false;
+      const scheduledSecondFrame = window.requestAnimationFrame(() => {
+        secondFrameCompleted = true;
+        secondFrame = null;
+        run();
+      });
+      if (!secondFrameCompleted) {
+        secondFrame = scheduledSecondFrame;
+      }
+    });
+    if (!firstFrameCompleted) {
+      firstFrame = scheduledFirstFrame;
+    }
   }
-  window.requestAnimationFrame(() => window.requestAnimationFrame(callback));
+  return () => {
+    if (!active) {
+      return;
+    }
+    active = false;
+    if (firstFrame !== null) {
+      window.cancelAnimationFrame(firstFrame);
+      firstFrame = null;
+    }
+    if (secondFrame !== null) {
+      window.cancelAnimationFrame(secondFrame);
+      secondFrame = null;
+    }
+  };
 }
 
 function keepLatestBufferedEventsForType(
@@ -71,10 +119,13 @@ export function recordControlUiPerformanceEvent(
 }
 
 export function scheduleControlUiAfterPaint(
-  host: Pick<ChatPerformanceHost, "updateComplete">,
+  host: Pick<ChatPerformanceHost, "renderLifecycle">,
   callback: () => void,
 ): void {
-  void Promise.resolve(host.updateComplete)
-    .catch(() => undefined)
-    .then(() => runAfterPaint(callback));
+  if (host.renderLifecycle) {
+    host.renderLifecycle.afterCommit((complete) => runAfterPaint(callback, complete));
+    return;
+  }
+  // Renderer-free unit hosts have no DOM commit to await.
+  runAfterPaint(callback, () => undefined);
 }
diff --git a/ui/src/pages/chat/realtime-talk-level.ts b/ui/src/pages/chat/realtime-talk-level.ts
index a722d9f0435..1f5cee655f9 100644
--- a/ui/src/pages/chat/realtime-talk-level.ts
+++ b/ui/src/pages/chat/realtime-talk-level.ts
@@ -1,4 +1,4 @@
-export type RealtimeTalkLevelListener = (level: number) => void;
+type RealtimeTalkLevelListener = (level: number) => void;
 
 export class RealtimeTalkLevelSignal {
   private listeners = new Set<RealtimeTalkLevelListener>();
diff --git a/ui/src/pages/chat/render-lifecycle.ts b/ui/src/pages/chat/render-lifecycle.ts
new file mode 100644
index 00000000000..98dce2bf944
--- /dev/null
+++ b/ui/src/pages/chat/render-lifecycle.ts
@@ -0,0 +1,25 @@
+export type CancelAfterCommit = () => void;
+export type CompleteAfterCommit = () => void;
+export type AfterCommitEffect = (complete: CompleteAfterCommit) => CancelAfterCommit | void;
+
+/**
+ * Renderer-neutral boundary for state invalidation and DOM-dependent effects.
+ * `afterCommit` must request a render before waiting for its commit.
+ */
+export interface RenderLifecycle {
+  invalidate(): void;
+  /**
+   * Run after the next commit. Async follow-up work returns its cleanup and
+   * calls `complete` when done so the lifecycle owns it through teardown.
+   */
+  afterCommit(effect: AfterCommitEffect, onCancel?: () => void): CancelAfterCommit;
+}
+
+export function waitForCommit(renderLifecycle: RenderLifecycle): Promise<boolean> {
+  return new Promise((resolve) => {
+    renderLifecycle.afterCommit(
+      () => resolve(true),
+      () => resolve(false),
+    );
+  });
+}
diff --git a/ui/src/pages/chat/scroll.test.ts b/ui/src/pages/chat/scroll.test.ts
index 2d68fd27b1f..2303745563f 100644
--- a/ui/src/pages/chat/scroll.test.ts
+++ b/ui/src/pages/chat/scroll.test.ts
@@ -1,7 +1,13 @@
 // Control UI tests cover app scroll behavior.
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { ChatAutoScrollMode } from "../../app/settings.ts";
-import { handleChatScroll, scheduleChatScroll, resetChatScroll } from "./scroll.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
+import {
+  cancelChatScroll,
+  handleChatScroll,
+  resetChatScroll,
+  scheduleChatScroll,
+} from "./scroll.ts";
 
 /* ------------------------------------------------------------------ */
 /*  Helpers                                                            */
@@ -42,23 +48,33 @@ function createScrollHost(
     settings.chatAutoScroll = chatAutoScroll;
   }
 
+  const renderLifecycle: RenderLifecycle = {
+    invalidate: vi.fn(),
+    afterCommit: vi.fn((effect) => {
+      renderLifecycle.invalidate();
+      effect(() => undefined);
+      return vi.fn();
+    }),
+  };
   const host = {
+    renderLifecycle,
     updateComplete: Promise.resolve(),
     querySelector: vi.fn().mockReturnValue(container),
     style: { setProperty: vi.fn() } as unknown as CSSStyleDeclaration,
+    chatScrollCommitCleanup: null as (() => void) | null,
     chatScrollFrame: null as number | null,
+    chatScrollGuardFrame: null as number | null,
     chatScrollTimeout: null as number | null,
+    chatScrollGeneration: 0,
     chatLastScrollTop: 0,
     chatLastScrollHeight: 0,
     chatHasAutoScrolled: false,
     chatUserNearBottom: true,
     chatFollowLocked: false,
-    chatHeaderControlsHidden: false,
     chatNewMessagesBelow: false,
     chatIsProgrammaticScroll: false,
     chatProgrammaticScrollTarget: 0,
     settings,
-    topbarObserver: null as ResizeObserver | null,
   };
 
   return { host, container };
@@ -115,36 +131,16 @@ describe("handleChatScroll", () => {
     expect(host.chatUserNearBottom).toBe(false);
   });
 
-  it("hides chat header controls when scrolling down through transcript history", () => {
+  it("publishes the indicator transition when the user returns to bottom", () => {
     const { host } = createScrollHost({});
-    host.chatLastScrollTop = 100;
-    const event = createScrollEvent(3000, 260, 500);
+    host.chatNewMessagesBelow = true;
+    const invalidate = vi.fn();
+    host.renderLifecycle.invalidate = invalidate;
 
-    handleChatScroll(host, event);
+    handleChatScroll(host, createScrollEvent(2000, 1600, 400));
 
-    expect(host.chatHeaderControlsHidden).toBe(true);
-  });
-
-  it("shows chat header controls again when scrolling up", () => {
-    const { host } = createScrollHost({});
-    host.chatLastScrollTop = 800;
-    host.chatHeaderControlsHidden = true;
-    const event = createScrollEvent(3000, 700, 500);
-
-    handleChatScroll(host, event);
-
-    expect(host.chatHeaderControlsHidden).toBe(false);
-  });
-
-  it("keeps chat header controls visible near the bottom", () => {
-    const { host } = createScrollHost({});
-    host.chatLastScrollTop = 1900;
-    host.chatHeaderControlsHidden = true;
-    const event = createScrollEvent(3000, 2500, 500);
-
-    handleChatScroll(host, event);
-
-    expect(host.chatHeaderControlsHidden).toBe(false);
+    expect(host.chatNewMessagesBelow).toBe(false);
+    expect(invalidate).toHaveBeenCalledOnce();
   });
 });
 
@@ -166,6 +162,44 @@ describe("scheduleChatScroll", () => {
     vi.restoreAllMocks();
   });
 
+  it("does not read layout until the requested render commits", () => {
+    const { host, container } = createScrollHost({
+      scrollHeight: 2000,
+      scrollTop: 1600,
+      clientHeight: 400,
+    });
+    let commit: (() => void) | undefined;
+    host.renderLifecycle.afterCommit = vi.fn((effect) => {
+      host.renderLifecycle.invalidate();
+      commit = () => effect(() => undefined);
+      return vi.fn();
+    });
+
+    scheduleChatScroll(host);
+
+    expect(host.querySelector).not.toHaveBeenCalled();
+    expect(container.scrollTop).toBe(1600);
+    commit?.();
+    expect(container.scrollTop).toBe(container.scrollHeight);
+  });
+
+  it("cancels a pending commit before it can touch detached DOM", () => {
+    const { host } = createScrollHost({});
+    let commit: (() => void) | undefined;
+    const cancelCommit = vi.fn();
+    host.renderLifecycle.afterCommit = vi.fn((effect) => {
+      commit = () => effect(() => undefined);
+      return cancelCommit;
+    });
+
+    scheduleChatScroll(host);
+    cancelChatScroll(host);
+    commit?.();
+
+    expect(cancelCommit).toHaveBeenCalledOnce();
+    expect(host.querySelector).not.toHaveBeenCalled();
+  });
+
   it("scrolls to bottom when user is near bottom (no force)", async () => {
     const { host, container } = createScrollHost({
       scrollHeight: 2000,
@@ -469,7 +503,6 @@ describe("resetChatScroll", () => {
     host.chatUserNearBottom = false;
     host.chatFollowLocked = true;
     host.chatLastScrollTop = 300;
-    host.chatHeaderControlsHidden = true;
 
     resetChatScroll(host);
 
@@ -477,10 +510,27 @@ describe("resetChatScroll", () => {
     expect(host.chatUserNearBottom).toBe(true);
     expect(host.chatFollowLocked).toBe(false);
     expect(host.chatLastScrollTop).toBe(0);
-    expect(host.chatHeaderControlsHidden).toBe(false);
     expect(host.chatIsProgrammaticScroll).toBe(false);
     expect(host.chatProgrammaticScrollTarget).toBe(0);
   });
+
+  it("cancels frame id zero and the late-size retry", () => {
+    const { host } = createScrollHost({});
+    const cancelFrame = vi.spyOn(window, "cancelAnimationFrame");
+    const clearTimer = vi.spyOn(window, "clearTimeout");
+    host.chatScrollFrame = 0;
+    host.chatScrollGuardFrame = 7;
+    host.chatScrollTimeout = 9;
+
+    cancelChatScroll(host);
+
+    expect(cancelFrame).toHaveBeenCalledWith(0);
+    expect(cancelFrame).toHaveBeenCalledWith(7);
+    expect(clearTimer).toHaveBeenCalledWith(9);
+    expect(host.chatScrollFrame).toBeNull();
+    expect(host.chatScrollGuardFrame).toBeNull();
+    expect(host.chatScrollTimeout).toBeNull();
+  });
 });
 
 /* ------------------------------------------------------------------ */
@@ -618,7 +668,6 @@ describe("programmatic scroll guard", () => {
   it("suppressed programmatic scroll preserves direction bookkeeping for the next user scroll-up", () => {
     const { host } = createScrollHost({});
     host.chatUserNearBottom = true;
-    host.chatHeaderControlsHidden = true;
     host.chatIsProgrammaticScroll = true;
     host.chatProgrammaticScrollTarget = 3000;
     host.chatLastScrollTop = 0;
@@ -629,7 +678,6 @@ describe("programmatic scroll guard", () => {
     host.chatIsProgrammaticScroll = false;
     handleChatScroll(host, createScrollEvent(3000, 2000, 400));
 
-    expect(host.chatHeaderControlsHidden).toBe(false);
     expect(host.chatUserNearBottom).toBe(false);
   });
 
diff --git a/ui/src/pages/chat/scroll.ts b/ui/src/pages/chat/scroll.ts
index 3f744b0e580..538a0faaea1 100644
--- a/ui/src/pages/chat/scroll.ts
+++ b/ui/src/pages/chat/scroll.ts
@@ -1,23 +1,24 @@
 // Control UI module implements app scroll behavior.
 import { normalizeChatAutoScrollMode, type ChatAutoScrollMode } from "../../app/settings.ts";
+import type { RenderLifecycle } from "./render-lifecycle.ts";
 
 /** Distance (px) from the bottom within which we consider the user "near bottom". */
 const NEAR_BOTTOM_THRESHOLD = 450;
 const FOLLOW_REACQUIRE_THRESHOLD = 8;
-const HEADER_HIDE_SCROLL_DELTA = 12;
-const HEADER_SHOW_TOP_THRESHOLD = 24;
 
 type ChatScrollHost = {
-  updateComplete: Promise<unknown>;
+  renderLifecycle: RenderLifecycle;
   querySelector: (selectors: string) => Element | null;
+  chatScrollCommitCleanup: (() => void) | null;
   chatScrollFrame: number | null;
+  chatScrollGuardFrame: number | null;
   chatScrollTimeout: number | null;
+  chatScrollGeneration: number;
   chatLastScrollTop: number;
   chatLastScrollHeight?: number;
   chatHasAutoScrolled: boolean;
   chatUserNearBottom: boolean;
   chatFollowLocked: boolean;
-  chatHeaderControlsHidden: boolean;
   chatNewMessagesBelow: boolean;
   chatIsProgrammaticScroll: boolean;
   chatProgrammaticScrollTarget: number;
@@ -35,120 +36,183 @@ type ChatScrollOptions = {
   source?: "auto" | "manual" | "resize";
 };
 
-export function scheduleChatScroll(
-  host: ChatScrollHost,
-  force = false,
-  smooth = false,
-  options: ChatScrollOptions = {},
-) {
-  if (host.chatScrollFrame) {
+function cancelCommittedChatScroll(host: ChatScrollHost): void {
+  if (host.chatScrollFrame != null) {
     cancelAnimationFrame(host.chatScrollFrame);
+    host.chatScrollFrame = null;
+  }
+  if (host.chatScrollGuardFrame != null) {
+    cancelAnimationFrame(host.chatScrollGuardFrame);
+    host.chatScrollGuardFrame = null;
   }
   if (host.chatScrollTimeout != null) {
     clearTimeout(host.chatScrollTimeout);
     host.chatScrollTimeout = null;
   }
-  const pickScrollTarget = () => {
-    const container = queryHost(host, ".chat-thread") as HTMLElement | null;
-    if (container) {
-      const overflowY = getComputedStyle(container).overflowY;
-      const canScroll =
-        overflowY === "auto" ||
-        overflowY === "scroll" ||
-        container.scrollHeight - container.clientHeight > 1;
-      if (canScroll) {
-        return container;
-      }
+  host.chatIsProgrammaticScroll = false;
+}
+
+export function cancelChatScroll(host: ChatScrollHost): void {
+  host.chatScrollGeneration += 1;
+  host.chatScrollCommitCleanup?.();
+  host.chatScrollCommitCleanup = null;
+  cancelCommittedChatScroll(host);
+}
+
+function setNewMessagesBelow(host: ChatScrollHost, next: boolean): void {
+  if (host.chatNewMessagesBelow === next) {
+    return;
+  }
+  host.chatNewMessagesBelow = next;
+  // Scroll effects run after the render that caused them. Publish the semantic
+  // state transition so the indicator cannot wait for an unrelated update.
+  host.renderLifecycle.invalidate();
+}
+
+function scheduleProgrammaticScrollGuardClear(host: ChatScrollHost, generation: number): void {
+  if (host.chatScrollGuardFrame != null) {
+    cancelAnimationFrame(host.chatScrollGuardFrame);
+  }
+  host.chatScrollGuardFrame = requestAnimationFrame(() => {
+    host.chatScrollGuardFrame = null;
+    if (generation === host.chatScrollGeneration) {
+      host.chatIsProgrammaticScroll = false;
     }
-    return (document.scrollingElement ?? document.documentElement) as HTMLElement | null;
-  };
-  // Wait for Lit render to complete, then scroll
-  void host.updateComplete.then(() => {
-    host.chatScrollFrame = requestAnimationFrame(() => {
-      host.chatScrollFrame = null;
-      const target = pickScrollTarget();
-      if (!target) {
+  });
+}
+
+function pickScrollTarget(host: ChatScrollHost): HTMLElement | null {
+  const container = queryHost(host, ".chat-thread") as HTMLElement | null;
+  if (container) {
+    const overflowY = getComputedStyle(container).overflowY;
+    const canScroll =
+      overflowY === "auto" ||
+      overflowY === "scroll" ||
+      container.scrollHeight - container.clientHeight > 1;
+    if (canScroll) {
+      return container;
+    }
+  }
+  return (document.scrollingElement ?? document.documentElement) as HTMLElement | null;
+}
+
+/** Schedule layout work when the caller already runs after the DOM commit. */
+export function scheduleCommittedChatScroll(
+  host: ChatScrollHost,
+  force = false,
+  smooth = false,
+  options: ChatScrollOptions = {},
+): void {
+  cancelCommittedChatScroll(host);
+  const generation = host.chatScrollGeneration;
+  host.chatScrollFrame = requestAnimationFrame(() => {
+    host.chatScrollFrame = null;
+    if (generation !== host.chatScrollGeneration) {
+      return;
+    }
+    const target = pickScrollTarget(host);
+    if (!target) {
+      return;
+    }
+    const distanceFromBottom = target.scrollHeight - target.scrollTop - target.clientHeight;
+    const contentGrew = target.scrollHeight > (host.chatLastScrollHeight ?? 0) + 1;
+    host.chatLastScrollHeight = target.scrollHeight;
+    const contentChanged = options.contentChanged ?? options.source !== "resize";
+    const autoScrollMode = normalizeChatAutoScrollMode(host.settings?.chatAutoScroll);
+    const manualScroll = options.source === "manual";
+
+    // force=true only overrides when we haven't auto-scrolled yet (initial load).
+    // After initial load, respect the user's scroll position.
+    const effectiveForce = force && !host.chatHasAutoScrolled;
+    const shouldStick =
+      manualScroll ||
+      autoScrollMode === "always" ||
+      (autoScrollMode === "near-bottom" &&
+        (effectiveForce ||
+          (!host.chatFollowLocked &&
+            (host.chatUserNearBottom || distanceFromBottom < NEAR_BOTTOM_THRESHOLD))));
+
+    if (!shouldStick) {
+      if (contentChanged || (options.source === "resize" && contentGrew)) {
+        setNewMessagesBelow(host, true);
+      }
+      return;
+    }
+    if (effectiveForce) {
+      host.chatHasAutoScrolled = true;
+    }
+    host.chatFollowLocked = false;
+    const smoothEnabled =
+      smooth &&
+      (typeof window === "undefined" ||
+        typeof window.matchMedia !== "function" ||
+        !window.matchMedia("(prefers-reduced-motion: reduce)").matches);
+    const scrollTop = target.scrollHeight;
+    host.chatProgrammaticScrollTarget = scrollTop;
+    host.chatIsProgrammaticScroll = true;
+    if (typeof target.scrollTo === "function") {
+      target.scrollTo({ top: scrollTop, behavior: smoothEnabled ? "smooth" : "auto" });
+    } else {
+      target.scrollTop = scrollTop;
+    }
+    scheduleProgrammaticScrollGuardClear(host, generation);
+    host.chatUserNearBottom = true;
+    setNewMessagesBelow(host, false);
+
+    // Markdown, images, and mobile controls can grow after the first layout.
+    const retryDelay = effectiveForce ? 150 : 120;
+    host.chatScrollTimeout = window.setTimeout(() => {
+      host.chatScrollTimeout = null;
+      if (generation !== host.chatScrollGeneration) {
         return;
       }
-      const distanceFromBottom = target.scrollHeight - target.scrollTop - target.clientHeight;
-      const contentGrew = target.scrollHeight > (host.chatLastScrollHeight ?? 0) + 1;
-      host.chatLastScrollHeight = target.scrollHeight;
-      const contentChanged = options.contentChanged ?? options.source !== "resize";
-      const autoScrollMode = normalizeChatAutoScrollMode(host.settings?.chatAutoScroll);
-      const manualScroll = options.source === "manual";
-
-      // force=true only overrides when we haven't auto-scrolled yet (initial load).
-      // After initial load, respect the user's scroll position.
-      const effectiveForce = force && !host.chatHasAutoScrolled;
-      const shouldStick =
+      const latest = pickScrollTarget(host);
+      if (!latest) {
+        return;
+      }
+      const latestDistanceFromBottom = latest.scrollHeight - latest.scrollTop - latest.clientHeight;
+      const shouldStickRetry =
         manualScroll ||
         autoScrollMode === "always" ||
         (autoScrollMode === "near-bottom" &&
           (effectiveForce ||
             (!host.chatFollowLocked &&
-              (host.chatUserNearBottom || distanceFromBottom < NEAR_BOTTOM_THRESHOLD))));
-
-      if (!shouldStick) {
-        if (contentChanged || (options.source === "resize" && contentGrew)) {
-          host.chatNewMessagesBelow = true;
-        }
+              (host.chatUserNearBottom || latestDistanceFromBottom < NEAR_BOTTOM_THRESHOLD))));
+      if (!shouldStickRetry) {
         return;
       }
-      if (effectiveForce) {
-        host.chatHasAutoScrolled = true;
-      }
-      host.chatFollowLocked = false;
-      const smoothEnabled =
-        smooth &&
-        (typeof window === "undefined" ||
-          typeof window.matchMedia !== "function" ||
-          !window.matchMedia("(prefers-reduced-motion: reduce)").matches);
-      const scrollTop = target.scrollHeight;
-      host.chatProgrammaticScrollTarget = scrollTop;
+      host.chatProgrammaticScrollTarget = latest.scrollHeight;
       host.chatIsProgrammaticScroll = true;
-      if (typeof target.scrollTo === "function") {
-        target.scrollTo({ top: scrollTop, behavior: smoothEnabled ? "smooth" : "auto" });
-      } else {
-        target.scrollTop = scrollTop;
-      }
-      // Clear the flag after the scroll event has fired (sync or next microtask).
-      requestAnimationFrame(() => {
-        host.chatIsProgrammaticScroll = false;
-      });
+      latest.scrollTop = latest.scrollHeight;
+      scheduleProgrammaticScrollGuardClear(host, generation);
       host.chatUserNearBottom = true;
-      host.chatNewMessagesBelow = false;
-      const retryDelay = effectiveForce ? 150 : 120;
-      host.chatScrollTimeout = window.setTimeout(() => {
-        host.chatScrollTimeout = null;
-        const latest = pickScrollTarget();
-        if (!latest) {
-          return;
-        }
-        const latestDistanceFromBottom =
-          latest.scrollHeight - latest.scrollTop - latest.clientHeight;
-        const shouldStickRetry =
-          manualScroll ||
-          autoScrollMode === "always" ||
-          (autoScrollMode === "near-bottom" &&
-            (effectiveForce ||
-              (!host.chatFollowLocked &&
-                (host.chatUserNearBottom || latestDistanceFromBottom < NEAR_BOTTOM_THRESHOLD))));
-        if (!shouldStickRetry) {
-          return;
-        }
-        host.chatProgrammaticScrollTarget = latest.scrollHeight;
-        host.chatIsProgrammaticScroll = true;
-        latest.scrollTop = latest.scrollHeight;
-        requestAnimationFrame(() => {
-          host.chatIsProgrammaticScroll = false;
-        });
-        host.chatUserNearBottom = true;
-      }, retryDelay);
-    });
+    }, retryDelay);
   });
 }
 
-export function handleChatScroll(host: ChatScrollHost, event: Event) {
+export function scheduleChatScroll(
+  host: ChatScrollHost,
+  force = false,
+  smooth = false,
+  options: ChatScrollOptions = {},
+): void {
+  cancelChatScroll(host);
+  const generation = host.chatScrollGeneration;
+  let committed = false;
+  const cancelCommit = host.renderLifecycle.afterCommit(() => {
+    committed = true;
+    if (generation !== host.chatScrollGeneration) {
+      return;
+    }
+    host.chatScrollCommitCleanup = null;
+    scheduleCommittedChatScroll(host, force, smooth, options);
+  });
+  if (!committed) {
+    host.chatScrollCommitCleanup = cancelCommit;
+  }
+}
+
+export function handleChatScroll(host: ChatScrollHost, event: Event): void {
   const container = event.currentTarget as HTMLElement | null;
   if (!container) {
     return;
@@ -163,7 +227,6 @@ export function handleChatScroll(host: ChatScrollHost, event: Event) {
   // if it dropped below, the user scrolled up during the guard window and we must
   // process the event so streaming stops pinning them back to the bottom.
   const isUserScrollUp = delta < 0;
-  const isDeliberateScrollUp = delta < -HEADER_HIDE_SCROLL_DELTA;
   if (
     host.chatIsProgrammaticScroll &&
     !isUserScrollUp &&
@@ -178,29 +241,19 @@ export function handleChatScroll(host: ChatScrollHost, event: Event) {
     host.chatFollowLocked = false;
   }
   host.chatUserNearBottom = !host.chatFollowLocked && distanceFromBottom < NEAR_BOTTOM_THRESHOLD;
-  const hasUsefulScroll = container.scrollHeight - container.clientHeight > NEAR_BOTTOM_THRESHOLD;
 
-  if (!hasUsefulScroll || scrollTop <= HEADER_SHOW_TOP_THRESHOLD || host.chatUserNearBottom) {
-    host.chatHeaderControlsHidden = false;
-  } else if (delta > HEADER_HIDE_SCROLL_DELTA) {
-    host.chatHeaderControlsHidden = true;
-  } else if (isDeliberateScrollUp) {
-    host.chatHeaderControlsHidden = false;
-  }
-
-  // Clear the "new messages below" indicator when user scrolls back to bottom.
   if (host.chatUserNearBottom) {
-    host.chatNewMessagesBelow = false;
+    setNewMessagesBelow(host, false);
   }
 }
 
-export function resetChatScroll(host: ChatScrollHost) {
+export function resetChatScroll(host: ChatScrollHost): void {
+  cancelChatScroll(host);
   host.chatHasAutoScrolled = false;
   host.chatUserNearBottom = true;
   host.chatFollowLocked = false;
   host.chatLastScrollTop = 0;
   host.chatLastScrollHeight = 0;
-  host.chatHeaderControlsHidden = false;
   host.chatNewMessagesBelow = false;
   host.chatIsProgrammaticScroll = false;
   host.chatProgrammaticScrollTarget = 0;
diff --git a/ui/src/pages/config/config-page.test.ts b/ui/src/pages/config/config-page.test.ts
index e70e4b010d4..84aa71497cf 100644
--- a/ui/src/pages/config/config-page.test.ts
+++ b/ui/src/pages/config/config-page.test.ts
@@ -1,10 +1,29 @@
 /* @vitest-environment jsdom */
 
-import { describe, expect, it } from "vitest";
+import type { ReactiveController } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import type { SystemInfoResult } from "../../../../packages/gateway-protocol/src/index.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
-import type { ApplicationGatewaySnapshot } from "../../app/context.ts";
+import type {
+  ApplicationContext,
+  ApplicationGateway,
+  ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { ConfigPage, configSelectionFromSearch, supportsSystemInfo } from "./config-page.ts";
+import type { ConfigViewState } from "./view.ts";
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((next) => {
+    resolve = next;
+  });
+  return { promise, resolve };
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
 
 describe("configSelectionFromSearch", () => {
   it("opens a valid linked Settings section", () => {
@@ -60,4 +79,97 @@ describe("ConfigPage system info", () => {
 
     expect(state.systemInfo).toBeNull();
   });
+
+  it("rejects an old Gateway source response when the replacement reuses its client", async () => {
+    const firstResponse = deferred<SystemInfoResult>();
+    const secondResponse = deferred<SystemInfoResult>();
+    const client = {
+      request: vi
+        .fn()
+        .mockImplementationOnce(() => firstResponse.promise)
+        .mockImplementationOnce(() => secondResponse.promise),
+    } as unknown as GatewayBrowserClient;
+    const snapshot = {
+      client,
+      connected: true,
+      hello: { features: { methods: ["system.info"] } },
+    } as ApplicationGatewaySnapshot;
+    const firstGateway = { snapshot } as ApplicationGateway;
+    const secondGateway = { snapshot } as ApplicationGateway;
+    const page = new ConfigPage();
+    const state = page as unknown as {
+      context: ApplicationContext;
+      subscriptions: ReactiveController;
+      shouldUpdate: () => boolean;
+      syncSystemInfoPolling: () => void;
+      synchronizeSystemInfoGateway: (gateway: ApplicationGateway) => void;
+      loadSystemInfo: () => Promise<void>;
+      systemInfo: SystemInfoResult | null;
+      systemInfoUnavailable: boolean;
+    };
+    page.removeController(state.subscriptions);
+    state.shouldUpdate = () => false;
+    state.syncSystemInfoPolling = () => undefined;
+    state.context = { gateway: firstGateway } as ApplicationContext;
+    document.body.append(page);
+    state.synchronizeSystemInfoGateway(firstGateway);
+
+    const firstLoad = state.loadSystemInfo();
+    state.systemInfo = {} as SystemInfoResult;
+    state.systemInfoUnavailable = true;
+    state.context = { gateway: secondGateway } as ApplicationContext;
+    state.synchronizeSystemInfoGateway(secondGateway);
+    const secondLoad = state.loadSystemInfo();
+
+    const stale = { platform: "stale" } as unknown as SystemInfoResult;
+    firstResponse.resolve(stale);
+    await firstLoad;
+    expect(state.systemInfo).toBeNull();
+    expect(state.systemInfoUnavailable).toBe(false);
+
+    const current = { platform: "current" } as unknown as SystemInfoResult;
+    secondResponse.resolve(current);
+    await secondLoad;
+    expect(state.systemInfo).toBe(current);
+    page.remove();
+  });
+});
+
+describe("ConfigPage runtime config lifecycle", () => {
+  it("loads replacement sources and clears sensitive reveal state", async () => {
+    const page = new ConfigPage();
+    const state = page as unknown as {
+      configViewState: ConfigViewState;
+      synchronizeRuntimeConfig: (runtimeConfig: ApplicationContext["runtimeConfig"]) => void;
+    };
+    const createRuntimeConfig = () =>
+      ({
+        state: {
+          configSnapshot: null,
+          configLoading: false,
+          configSchema: null,
+          configSchemaLoading: false,
+        },
+        ensureLoaded: vi.fn(() => Promise.resolve()),
+        ensureSchemaLoaded: vi.fn(() => Promise.resolve()),
+      }) as unknown as ApplicationContext["runtimeConfig"];
+    const first = createRuntimeConfig();
+    const second = createRuntimeConfig();
+
+    state.synchronizeRuntimeConfig(first);
+    await Promise.resolve();
+    state.configViewState.rawRevealed = true;
+    state.configViewState.envRevealed = true;
+    state.configViewState.revealedSensitivePaths.add("gateway.auth.token");
+    state.synchronizeRuntimeConfig(second);
+    await Promise.resolve();
+
+    expect(first.ensureLoaded).toHaveBeenCalledOnce();
+    expect(first.ensureSchemaLoaded).toHaveBeenCalledOnce();
+    expect(second.ensureLoaded).toHaveBeenCalledOnce();
+    expect(second.ensureSchemaLoaded).toHaveBeenCalledOnce();
+    expect(state.configViewState.rawRevealed).toBe(false);
+    expect(state.configViewState.envRevealed).toBe(false);
+    expect(state.configViewState.revealedSensitivePaths.size).toBe(0);
+  });
 });
diff --git a/ui/src/pages/config/config-page.ts b/ui/src/pages/config/config-page.ts
index 3cd61478613..7e8817c6c71 100644
--- a/ui/src/pages/config/config-page.ts
+++ b/ui/src/pages/config/config-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import type { SystemInfoResult } from "../../../../packages/gateway-protocol/src/index.js";
 import { GatewayRequestError, type GatewayBrowserClient } from "../../api/gateway.ts";
@@ -23,8 +23,9 @@ import { resolveTheme, type ThemeMode, type ThemeName } from "../../app/theme.ts
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import { t } from "../../i18n/index.ts";
 import { isMissingOperatorReadScopeError } from "../../lib/gateway-errors.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderMcp } from "./mcp.ts";
-import { getPresetById } from "./presets.ts";
 import {
   renderQuickSettings,
   type QuickSettingsChannel,
@@ -272,8 +273,8 @@ function applyTextScale(value: unknown) {
   );
 }
 
-export class ConfigPage extends LitElement {
-  @consume({ context: applicationContext, subscribe: false })
+export class ConfigPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @property({ attribute: "page-id" }) pageId: ConfigPageId = "config";
@@ -316,16 +317,43 @@ export class ConfigPage extends LitElement {
   @state() private customThemeImportExpanded = false;
   @state() private customThemeImportFocusToken = 0;
   private customThemeImportSelectOnSuccess = false;
-  private readonly configViewState: ConfigViewState = createConfigViewState();
+  private configViewState: ConfigViewState = createConfigViewState();
+  private runtimeConfigSource: ApplicationContext["runtimeConfig"] | null = null;
+  private systemInfoGatewaySource: ApplicationContext["gateway"] | null = null;
   private systemInfoClient: GatewayBrowserClient | null = null;
   private systemInfoLoading = false;
   private systemInfoRequestId = 0;
   private systemInfoPollInterval: ReturnType<typeof globalThis.setInterval> | null = null;
-  private stops: Array<() => void> = [];
-
-  override createRenderRoot() {
-    return this;
-  }
+  private readonly subscriptions = new SubscriptionsController(this)
+    .watch(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig, notify) => runtimeConfig.subscribe(notify),
+      (runtimeConfig) => this.synchronizeRuntimeConfig(runtimeConfig),
+    )
+    .watch(
+      () => this.context?.overlays,
+      (overlays, notify) => overlays.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.config,
+      (config, notify) => config.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.gateway,
+      (gateway, notify) => gateway.subscribe(notify),
+      (gateway) => this.synchronizeSystemInfoGateway(gateway),
+    )
+    .watch(
+      () => this.context?.webPush,
+      (webPush, notify) => webPush.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.theme,
+      (theme, notify) => theme.subscribe(notify),
+      () => {
+        this.settings = loadSettings();
+      },
+    );
 
   override connectedCallback() {
     super.connectedCallback();
@@ -335,42 +363,20 @@ export class ConfigPage extends LitElement {
       globalThis.location?.search ?? "",
     );
     this.selections = { ...this.selections, [this.pageId]: linkedSelection };
-    this.stops = [
-      this.context.runtimeConfig.subscribe(() => this.requestUpdate()),
-      this.context.overlays.subscribe(() => this.requestUpdate()),
-      this.context.config.subscribe(() => this.requestUpdate()),
-      this.context.gateway.subscribe((snapshot) => {
-        this.handleSystemInfoGatewaySnapshot(snapshot);
-        this.requestUpdate();
-      }),
-      this.context.webPush.subscribe(() => this.requestUpdate()),
-      this.context.theme.subscribe(() => {
-        this.settings = loadSettings();
-      }),
-    ];
-    this.handleSystemInfoGatewaySnapshot(this.context.gateway.snapshot);
-    const config = this.context.runtimeConfig.state;
-    if (!config.configSnapshot && !config.configLoading) {
-      void this.context.runtimeConfig
-        .ensureLoaded()
-        .then(() => this.context.runtimeConfig.ensureSchemaLoaded());
-    } else if (!config.configSchema && !config.configSchemaLoading) {
-      void this.context.runtimeConfig.ensureSchemaLoaded();
-    }
   }
 
   override disconnectedCallback() {
     this.stopSystemInfoPolling();
     this.invalidateSystemInfoRequest();
+    this.runtimeConfigSource = null;
+    this.resetConfigViewState();
+    this.systemInfoGatewaySource = null;
     this.systemInfoClient = null;
-    for (const stop of this.stops) {
-      stop();
-    }
-    this.stops = [];
+    this.subscriptions.clear();
     super.disconnectedCallback();
   }
 
-  override updated(changed: Map<PropertyKey, unknown>) {
+  override updated(changed: PropertyValues) {
     const pageChanged = changed.has("pageId") && changed.get("pageId") !== undefined;
     const modeChanged = changed.has("settingsMode") && changed.get("settingsMode") !== undefined;
     if (pageChanged || modeChanged) {
@@ -383,6 +389,45 @@ export class ConfigPage extends LitElement {
     return this.pageId === "config" && this.settingsMode === "quick";
   }
 
+  private synchronizeRuntimeConfig(runtimeConfig: ApplicationContext["runtimeConfig"]) {
+    if (runtimeConfig !== this.runtimeConfigSource) {
+      this.runtimeConfigSource = runtimeConfig;
+      this.resetConfigViewState();
+    }
+    const config = runtimeConfig.state;
+    if (!config.configSnapshot && !config.configLoading) {
+      void runtimeConfig
+        .ensureLoaded()
+        .then(() =>
+          this.runtimeConfigSource === runtimeConfig
+            ? runtimeConfig.ensureSchemaLoaded()
+            : undefined,
+        );
+      return;
+    }
+    if (!config.configSchema && !config.configSchemaLoading) {
+      void runtimeConfig.ensureSchemaLoaded();
+    }
+  }
+
+  private synchronizeSystemInfoGateway(gateway: ApplicationContext["gateway"]) {
+    if (gateway !== this.systemInfoGatewaySource) {
+      this.stopSystemInfoPolling();
+      this.invalidateSystemInfoRequest();
+      this.systemInfoGatewaySource = gateway;
+      this.resetConfigViewState();
+      this.systemInfoClient = null;
+      this.systemInfo = null;
+      this.systemInfoUnavailable = false;
+    }
+    this.handleSystemInfoGatewaySnapshot(gateway.snapshot);
+  }
+
+  private resetConfigViewState() {
+    // Revealed secrets and raw caches never cross a capability/source epoch.
+    this.configViewState = createConfigViewState();
+  }
+
   private handleSystemInfoGatewaySnapshot(snapshot: ApplicationGatewaySnapshot) {
     const clientChanged = snapshot.client !== this.systemInfoClient;
     const hasSystemInfo = supportsSystemInfo(snapshot.hello);
@@ -440,19 +485,29 @@ export class ConfigPage extends LitElement {
     this.systemInfoLoading = false;
   }
 
-  private isCurrentSystemInfoRequest(requestId: number, client: GatewayBrowserClient): boolean {
-    const gateway = this.context.gateway.snapshot;
+  private isCurrentSystemInfoRequest(
+    requestId: number,
+    client: GatewayBrowserClient,
+    gatewaySource: ApplicationContext["gateway"],
+  ): boolean {
+    const gateway = gatewaySource.snapshot;
     return (
       this.isConnected &&
       this.isSystemInfoVisible() &&
       requestId === this.systemInfoRequestId &&
+      this.systemInfoGatewaySource === gatewaySource &&
+      this.context.gateway === gatewaySource &&
       gateway.connected &&
       gateway.client === client
     );
   }
 
   private async loadSystemInfo() {
-    const gateway = this.context.gateway.snapshot;
+    const gatewaySource = this.systemInfoGatewaySource;
+    if (!gatewaySource || gatewaySource !== this.context.gateway) {
+      return;
+    }
+    const gateway = gatewaySource.snapshot;
     const client = gateway.client;
     if (
       !gateway.connected ||
@@ -468,12 +523,12 @@ export class ConfigPage extends LitElement {
     this.systemInfoLoading = true;
     try {
       const response = await client.request("system.info", {});
-      if (!this.isCurrentSystemInfoRequest(requestId, client)) {
+      if (!this.isCurrentSystemInfoRequest(requestId, client, gatewaySource)) {
         return;
       }
       this.systemInfo = response as SystemInfoResult;
     } catch (error) {
-      if (!this.isCurrentSystemInfoRequest(requestId, client)) {
+      if (!this.isCurrentSystemInfoRequest(requestId, client, gatewaySource)) {
         return;
       }
       if (isMissingOperatorReadScopeError(error) || isUnknownSystemInfoMethodError(error)) {
@@ -482,7 +537,7 @@ export class ConfigPage extends LitElement {
         this.stopSystemInfoPolling();
       }
     } finally {
-      if (this.isCurrentSystemInfoRequest(requestId, client)) {
+      if (this.isCurrentSystemInfoRequest(requestId, client, gatewaySource)) {
         this.systemInfoLoading = false;
       }
     }
@@ -799,21 +854,10 @@ export class ConfigPage extends LitElement {
       assistantName: appConfig.assistantIdentity.name,
       version:
         appConfig.serverVersion ?? this.context.gateway.snapshot.hello?.server?.version ?? "",
-      configObject,
-      savedConfigObject:
-        asConfigRecord(
-          runtimeConfig.state.configFormOriginal ?? runtimeConfig.state.configSnapshot?.config,
-        ) ?? {},
       configDirty: runtimeConfig.state.configFormDirty,
       configSaving: runtimeConfig.state.configSaving,
       configApplying: runtimeConfig.state.configApplying,
       configReady: Boolean(runtimeConfig.state.configSnapshot?.hash),
-      onSelectPreset: (id) => {
-        const preset = getPresetById(id);
-        if (preset) {
-          runtimeConfig.stagePreset(preset.patch);
-        }
-      },
       onResetConfig: () => runtimeConfig.resetDraft(),
       onSaveConfig: () => void runtimeConfig.save(),
       onApplyConfig: () => void runtimeConfig.apply(),
diff --git a/ui/src/pages/config/presets.test.ts b/ui/src/pages/config/presets.test.ts
deleted file mode 100644
index dacbc5ee4a5..00000000000
--- a/ui/src/pages/config/presets.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-// Control UI tests cover config presets behavior.
-import { describe, expect, it } from "vitest";
-import { OpenClawSchema } from "../../../../src/config/zod-schema.js";
-import { CONFIG_PRESETS, detectActivePreset } from "./presets.ts";
-
-describe("detectActivePreset", () => {
-  it("keeps every preset patch valid for the runtime config schema", () => {
-    expect(
-      CONFIG_PRESETS.map((preset) => ({
-        id: preset.id,
-        defaults: preset.patch.agents.defaults,
-      })),
-    ).toStrictEqual([
-      {
-        id: "personal",
-        defaults: {
-          bootstrapMaxChars: 20_000,
-          bootstrapTotalMaxChars: 150_000,
-          contextInjection: "always",
-        },
-      },
-      {
-        id: "codeAgent",
-        defaults: {
-          bootstrapMaxChars: 50_000,
-          bootstrapTotalMaxChars: 300_000,
-          contextInjection: "always",
-        },
-      },
-      {
-        id: "teamBot",
-        defaults: {
-          bootstrapMaxChars: 10_000,
-          bootstrapTotalMaxChars: 80_000,
-          contextInjection: "continuation-skip",
-        },
-      },
-      {
-        id: "minimal",
-        defaults: {
-          bootstrapMaxChars: 5_000,
-          bootstrapTotalMaxChars: 30_000,
-          contextInjection: "continuation-skip",
-        },
-      },
-    ]);
-
-    for (const preset of CONFIG_PRESETS) {
-      expect(OpenClawSchema.safeParse(preset.patch).success, preset.id).toBe(true);
-    }
-  });
-
-  it("returns null when bootstrap defaults are unset", () => {
-    expect(detectActivePreset({})).toBeNull();
-  });
-
-  it("returns the matching preset when all preset fields match", () => {
-    expect(
-      detectActivePreset({
-        agents: {
-          defaults: {
-            bootstrapMaxChars: 50_000,
-            bootstrapTotalMaxChars: 300_000,
-            contextInjection: "always",
-          },
-        },
-      }),
-    ).toBe("codeAgent");
-  });
-
-  it("does not match a preset when context injection differs", () => {
-    expect(
-      detectActivePreset({
-        agents: {
-          defaults: {
-            bootstrapMaxChars: 50_000,
-            bootstrapTotalMaxChars: 300_000,
-            contextInjection: "continuation-skip",
-          },
-        },
-      }),
-    ).toBeNull();
-  });
-});
diff --git a/ui/src/pages/config/presets.ts b/ui/src/pages/config/presets.ts
deleted file mode 100644
index 2671cfff0cd..00000000000
--- a/ui/src/pages/config/presets.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Config presets — opinionated configuration bundles that set multiple
- * settings at once. Applied via config.patch.
- */
-
-export type ConfigPresetId = "personal" | "codeAgent" | "teamBot" | "minimal";
-
-type ConfigPresetPatch = {
-  agents: {
-    defaults: {
-      bootstrapMaxChars: number;
-      bootstrapTotalMaxChars: number;
-      contextInjection: "always" | "continuation-skip";
-    };
-  };
-};
-
-type ConfigPreset = {
-  id: ConfigPresetId;
-  label: string;
-  description: string;
-  icon: string;
-  patch: ConfigPresetPatch;
-};
-
-export const CONFIG_PRESETS: ConfigPreset[] = [
-  {
-    id: "personal",
-    label: "Personal Assistant",
-    description: "Balanced default for daily use.",
-    icon: "✨",
-    patch: {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 20_000,
-          bootstrapTotalMaxChars: 150_000,
-          contextInjection: "always",
-        },
-      },
-    },
-  },
-  {
-    id: "codeAgent",
-    label: "Code Agent",
-    description: "Highest context budget for repo work.",
-    icon: "🛠️",
-    patch: {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 50_000,
-          bootstrapTotalMaxChars: 300_000,
-          contextInjection: "always",
-        },
-      },
-    },
-  },
-  {
-    id: "teamBot",
-    label: "Team Bot",
-    description: "Lean follow-ups for shared bots.",
-    icon: "👥",
-    patch: {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 10_000,
-          bootstrapTotalMaxChars: 80_000,
-          contextInjection: "continuation-skip",
-        },
-      },
-    },
-  },
-  {
-    id: "minimal",
-    label: "Minimal",
-    description: "Smallest context budget and lowest cost.",
-    icon: "⚡",
-    patch: {
-      agents: {
-        defaults: {
-          bootstrapMaxChars: 5_000,
-          bootstrapTotalMaxChars: 30_000,
-          contextInjection: "continuation-skip",
-        },
-      },
-    },
-  },
-];
-
-export function getPresetById(id: ConfigPresetId): ConfigPreset | undefined {
-  return CONFIG_PRESETS.find((p) => p.id === id);
-}
-
-/**
- * Detect which preset (if any) matches the current config values.
- */
-export function detectActivePreset(config: Record<string, unknown>): ConfigPresetId | null {
-  const agents = config.agents as Record<string, unknown> | undefined;
-  const defaults = agents?.defaults as Record<string, unknown> | undefined;
-  if (!defaults) {
-    return null;
-  }
-  const maxChars = defaults.bootstrapMaxChars;
-  const totalMax = defaults.bootstrapTotalMaxChars;
-  const contextInjection = defaults.contextInjection;
-  for (const preset of CONFIG_PRESETS) {
-    const presetDefaults = (preset.patch.agents as Record<string, unknown>)?.defaults as
-      | Record<string, unknown>
-      | undefined;
-    if (!presetDefaults) {
-      continue;
-    }
-    if (
-      maxChars === presetDefaults.bootstrapMaxChars &&
-      totalMax === presetDefaults.bootstrapTotalMaxChars &&
-      contextInjection === presetDefaults.contextInjection
-    ) {
-      return preset.id;
-    }
-  }
-  return null;
-}
diff --git a/ui/src/pages/config/quick.test.ts b/ui/src/pages/config/quick.test.ts
index 32265fb291b..c9e1f689e1e 100644
--- a/ui/src/pages/config/quick.test.ts
+++ b/ui/src/pages/config/quick.test.ts
@@ -82,8 +82,6 @@ function createProps(overrides: Partial<QuickSettingsProps> = {}): QuickSettings
     setTextScale: vi.fn(),
     userAvatar: null,
     onUserAvatarChange: vi.fn(),
-    configObject: {},
-    onSelectPreset: vi.fn(),
     connected: true,
     gatewayUrl: "ws://localhost:18789",
     assistantName: "OpenClaw",
@@ -139,7 +137,7 @@ describe("renderQuickSettings", () => {
       "qs-card--personal",
       "qs-card--automations",
     ]);
-    expect(container.querySelectorAll(".qs-card--span-all")).toHaveLength(1);
+    expect(container.querySelectorAll(".qs-card--span-all")).toHaveLength(0);
   });
 
   it("renders Gateway host identity and resources", () => {
@@ -276,15 +274,57 @@ describe("renderQuickSettings", () => {
     expect(systemCard?.querySelector(".qs-system__address")).toBeNull();
   });
 
-  it("shows the current bootstrap default when config omits the explicit limit", () => {
+  it("hides the pending changes bar when the config is clean", () => {
     const container = document.createElement("div");
 
-    render(renderQuickSettings(createProps({ configObject: {} })), container);
+    render(renderQuickSettings(createProps()), container);
 
-    const summary = container.querySelector(".qs-profiles__summary-values");
-    expect(summary?.textContent?.replace(/\s+/g, " ").trim()).toBe(
-      "20,000 chars per file · 60,000 chars total · Every turn",
+    expect(container.querySelector(".qs-pending")).toBeNull();
+  });
+
+  it("renders pending config actions and calls their handlers", () => {
+    const onResetConfig = vi.fn();
+    const onSaveConfig = vi.fn();
+    const onApplyConfig = vi.fn();
+    const container = document.createElement("div");
+
+    render(
+      renderQuickSettings(
+        createProps({
+          configDirty: true,
+          configReady: true,
+          connected: true,
+          onResetConfig,
+          onSaveConfig,
+          onApplyConfig,
+        }),
+      ),
+      container,
     );
+
+    expect(container.querySelector(".qs-pending")).not.toBeNull();
+    const discardButton = expectButtonByText(container, "Discard");
+    const saveButton = expectButtonByText(container, "Save");
+    const applyButton = expectButtonByText(container, "Apply Now");
+    expect(saveButton.disabled).toBe(false);
+
+    discardButton.click();
+    saveButton.click();
+    applyButton.click();
+
+    expect(onResetConfig).toHaveBeenCalledTimes(1);
+    expect(onSaveConfig).toHaveBeenCalledTimes(1);
+    expect(onApplyConfig).toHaveBeenCalledTimes(1);
+  });
+
+  it("disables commit actions until the config is ready", () => {
+    const container = document.createElement("div");
+
+    render(renderQuickSettings(createProps({ configDirty: true, configReady: false })), container);
+
+    expect(expectButtonByText(container, "Save").disabled).toBe(true);
+    expect(expectButtonByText(container, "Apply Now").disabled).toBe(true);
+    expect(expectButtonByText(container, "Discard").disabled).toBe(false);
   });
 
   it("keeps auto as a first-class quick settings fast mode", () => {
diff --git a/ui/src/pages/config/quick.ts b/ui/src/pages/config/quick.ts
index 358a97cef9d..174f42e8069 100644
--- a/ui/src/pages/config/quick.ts
+++ b/ui/src/pages/config/quick.ts
@@ -24,12 +24,6 @@ import { formatBytes } from "../../lib/agents/display.ts";
 import { resolveAssistantTextAvatar, resolveChatAvatarRenderUrl } from "../../lib/avatar.ts";
 import { formatDurationHuman } from "../../lib/format.ts";
 import { normalizeOptionalString } from "../../lib/string-coerce.ts";
-import {
-  CONFIG_PRESETS,
-  detectActivePreset,
-  getPresetById,
-  type ConfigPresetId,
-} from "./presets.ts";
 
 // ── Types ──
 
@@ -98,14 +92,11 @@ export type QuickSettingsProps = {
   userAvatar?: string | null;
   onUserAvatarChange?: (next: string | null) => void;
 
-  // Presets
-  configObject?: Record<string, unknown>;
-  savedConfigObject?: Record<string, unknown>;
+  // Pending config changes
   configDirty?: boolean;
   configSaving?: boolean;
   configApplying?: boolean;
   configReady?: boolean;
-  onSelectPreset?: (presetId: ConfigPresetId) => void;
   onResetConfig?: () => void;
   onSaveConfig?: () => void;
   onApplyConfig?: () => void;
@@ -315,51 +306,6 @@ function handleAssistantAvatarFileSelect(e: Event, props: QuickSettingsProps) {
   input.value = "";
 }
 
-type ProfileSettings = {
-  bootstrapMaxChars: number;
-  bootstrapTotalMaxChars: number;
-  contextInjection: "always" | "continuation-skip";
-};
-
-const DEFAULT_PROFILE_SETTINGS: ProfileSettings = {
-  bootstrapMaxChars: 20_000,
-  bootstrapTotalMaxChars: 60_000,
-  contextInjection: "always",
-};
-
-function resolveProfileSettings(config?: Record<string, unknown>): ProfileSettings {
-  const agents = config?.agents as Record<string, unknown> | undefined;
-  const defaults = agents?.defaults as Record<string, unknown> | undefined;
-  const bootstrapMaxChars =
-    typeof defaults?.bootstrapMaxChars === "number" && Number.isFinite(defaults.bootstrapMaxChars)
-      ? Math.floor(defaults.bootstrapMaxChars)
-      : DEFAULT_PROFILE_SETTINGS.bootstrapMaxChars;
-  const bootstrapTotalMaxChars =
-    typeof defaults?.bootstrapTotalMaxChars === "number" &&
-    Number.isFinite(defaults.bootstrapTotalMaxChars)
-      ? Math.floor(defaults.bootstrapTotalMaxChars)
-      : DEFAULT_PROFILE_SETTINGS.bootstrapTotalMaxChars;
-  const contextInjection =
-    defaults?.contextInjection === "continuation-skip" ? "continuation-skip" : "always";
-  return { bootstrapMaxChars, bootstrapTotalMaxChars, contextInjection };
-}
-
-function profileSettingsEqual(a: ProfileSettings, b: ProfileSettings): boolean {
-  return (
-    a.bootstrapMaxChars === b.bootstrapMaxChars &&
-    a.bootstrapTotalMaxChars === b.bootstrapTotalMaxChars &&
-    a.contextInjection === b.contextInjection
-  );
-}
-
-function formatCharBudget(value: number): string {
-  return `${value.toLocaleString()} chars`;
-}
-
-function formatContextInjectionLabel(mode: ProfileSettings["contextInjection"]): string {
-  return mode === "always" ? "Every turn" : "Skip safe follow-ups";
-}
-
 // ── Card renderers ──
 
 function renderCardHeader(icon: TemplateResult, title: string, action?: TemplateResult) {
@@ -984,129 +930,38 @@ function renderPersonalCard(props: QuickSettingsProps) {
   `;
 }
 
-function renderPresetsCard(props: QuickSettingsProps) {
-  const draftConfig = props.configObject ?? props.savedConfigObject ?? {};
-  const savedConfig = props.savedConfigObject ?? {};
-  const selectedPresetId = detectActivePreset(draftConfig);
-  const savedPresetId = detectActivePreset(savedConfig);
-  const selectedPreset = selectedPresetId ? getPresetById(selectedPresetId) : undefined;
-  const savedPreset = savedPresetId ? getPresetById(savedPresetId) : undefined;
-  const draftSettings = resolveProfileSettings(draftConfig);
-  const savedSettings = resolveProfileSettings(savedConfig);
-  const hasPendingProfileChange = !profileSettingsEqual(draftSettings, savedSettings);
-  const hasPendingConfigChange = props.configDirty === true;
+function renderPendingChangesBar(props: QuickSettingsProps) {
+  if (props.configDirty !== true) {
+    return nothing;
+  }
   const canCommit =
     props.connected &&
     props.configReady === true &&
     props.configSaving !== true &&
     props.configApplying !== true;
-  const commitHint = hasPendingProfileChange
-    ? "Save writes this profile as the default. Apply Now also reloads the current session."
-    : "Staged config edits are pending. Saving commits all staged changes.";
 
   return html`
-    <div class="qs-card qs-card--span-all">
-      ${renderCardHeader(
-        icons.zap,
-        "Context Profile",
-        hasPendingProfileChange
-          ? html`<span class="qs-badge qs-badge--warn">Pending</span>`
-          : savedPreset
-            ? html`<span class="qs-badge qs-badge--ok">Saved</span>`
-            : html`<span class="qs-badge">Custom</span>`,
-      )}
-      <div class="qs-card__body qs-profiles">
-        <p class="qs-profiles__intro">
-          Choose how much workspace context OpenClaw injects into each run. Profiles only change
-          bootstrap size and follow-up reinjection — never your model, tools, channels, or theme.
-        </p>
-        <div class="qs-presets-grid">
-          ${CONFIG_PRESETS.map((preset) => {
-            const presetDefaults = ((preset.patch.agents as Record<string, unknown> | undefined)
-              ?.defaults ?? {}) as Record<string, unknown>;
-            const presetContext =
-              presetDefaults.contextInjection === "continuation-skip"
-                ? "continuation-skip"
-                : "always";
-            return html`
-              <button
-                type="button"
-                class="qs-preset ${preset.id === selectedPresetId ? "qs-preset--active" : ""}"
-                aria-pressed=${preset.id === selectedPresetId}
-                @click=${() => props.onSelectPreset?.(preset.id)}
-              >
-                <div class="qs-preset__head">
-                  <div class="qs-preset__identity">
-                    <span class="qs-preset__icon">${preset.icon}</span>
-                    <div class="qs-preset__identity-copy">
-                      <span class="qs-preset__label">${preset.label}</span>
-                      <span class="qs-preset__desc muted">${preset.description}</span>
-                    </div>
-                  </div>
-                  <div class="qs-preset__badges">
-                    ${preset.id === savedPresetId
-                      ? html`<span class="qs-badge qs-badge--ok">Current</span>`
-                      : nothing}
-                    ${hasPendingProfileChange && preset.id === selectedPresetId
-                      ? html`<span class="qs-badge qs-badge--warn">Selected</span>`
-                      : nothing}
-                  </div>
-                </div>
-                <div class="qs-preset__meta">
-                  <span
-                    >${formatCharBudget(Number(presetDefaults.bootstrapMaxChars ?? 0))} per
-                    file</span
-                  >
-                  <span
-                    >${formatCharBudget(Number(presetDefaults.bootstrapTotalMaxChars ?? 0))}
-                    total</span
-                  >
-                  <span>${formatContextInjectionLabel(presetContext)}</span>
-                </div>
-              </button>
-            `;
-          })}
-        </div>
-        <div class="qs-profiles__footer" aria-live="polite">
-          <div class="qs-profiles__summary">
-            <span class="qs-profiles__summary-label"
-              >${selectedPreset?.label ?? "Custom values"}</span
-            >
-            <span class="qs-profiles__summary-values"
-              >${formatCharBudget(draftSettings.bootstrapMaxChars)} per file ·
-              ${formatCharBudget(draftSettings.bootstrapTotalMaxChars)} total ·
-              ${formatContextInjectionLabel(draftSettings.contextInjection)}</span
-            >
-          </div>
-          ${hasPendingConfigChange
-            ? html`
-                <div class="qs-profiles__actions">
-                  <span class="qs-profiles__hint muted">${commitHint}</span>
-                  <button
-                    class="btn btn--sm"
-                    ?disabled=${props.configSaving === true || props.configApplying === true}
-                    @click=${props.onResetConfig}
-                  >
-                    Discard
-                  </button>
-                  <button
-                    class="btn btn--sm primary"
-                    ?disabled=${!canCommit}
-                    @click=${props.onSaveConfig}
-                  >
-                    ${props.configSaving === true
-                      ? "Saving…"
-                      : hasPendingProfileChange
-                        ? "Save Profile"
-                        : "Save Changes"}
-                  </button>
-                  <button class="btn btn--sm" ?disabled=${!canCommit} @click=${props.onApplyConfig}>
-                    ${props.configApplying === true ? "Applying…" : "Apply Now"}
-                  </button>
-                </div>
-              `
-            : nothing}
-        </div>
+    <div class="qs-card qs-card--span-all qs-pending" aria-live="polite">
+      <div class="qs-pending__copy">
+        <span class="qs-pending__label">Unsaved changes</span>
+        <span class="qs-pending__hint muted"
+          >Save stores your changes. Apply Now also reloads the current session.</span
+        >
+      </div>
+      <div class="qs-pending__actions">
+        <button
+          class="btn btn--sm"
+          ?disabled=${props.configSaving === true || props.configApplying === true}
+          @click=${props.onResetConfig}
+        >
+          Discard
+        </button>
+        <button class="btn btn--sm primary" ?disabled=${!canCommit} @click=${props.onSaveConfig}>
+          ${props.configSaving === true ? "Saving…" : "Save"}
+        </button>
+        <button class="btn btn--sm" ?disabled=${!canCommit} @click=${props.onApplyConfig}>
+          ${props.configApplying === true ? "Applying…" : "Apply Now"}
+        </button>
       </div>
     </div>
   `;
@@ -1133,7 +988,7 @@ export function renderQuickSettings(props: QuickSettingsProps) {
       <div class="qs-grid">
         ${renderModelCard(props)} ${renderChannelsCard(props)} ${renderSecurityCard(props)}
         ${renderSystemCard(props)} ${renderAppearanceCard(props)} ${renderPersonalCard(props)}
-        ${renderAutomationsCard(props)} ${renderPresetsCard(props)}
+        ${renderAutomationsCard(props)} ${renderPendingChangesBar(props)}
       </div>
 
       ${renderConnectionFooter(props)}
diff --git a/ui/src/pages/cron/cron-page.test.ts b/ui/src/pages/cron/cron-page.test.ts
new file mode 100644
index 00000000000..5573328851e
--- /dev/null
+++ b/ui/src/pages/cron/cron-page.test.ts
@@ -0,0 +1,219 @@
+import { nothing } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient, GatewayEventListener } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import type { CronState } from "../../lib/cron/index.ts";
+import "./cron-page.ts";
+
+type CronTestPage = HTMLElement & {
+  context: ApplicationContext;
+  updateComplete: Promise<boolean>;
+  requestUpdate: () => void;
+  render: () => typeof nothing;
+  cron: CronState;
+  cronModelSuggestions: string[];
+  quickCreateOpen: boolean;
+};
+
+type TestGateway = ApplicationContext["gateway"] & {
+  emitSnapshot: (patch: Partial<ApplicationGatewaySnapshot>) => void;
+  emitRetiredEvent: (event: Parameters<GatewayEventListener>[0]) => void;
+};
+
+function createDeferred<T>() {
+  let resolve: ((value: T) => void) | undefined;
+  const promise = new Promise<T>((res) => {
+    resolve = res;
+  });
+  if (!resolve) {
+    throw new Error("Expected deferred callback to be initialized");
+  }
+  return { promise, resolve };
+}
+
+function createGateway(client: GatewayBrowserClient, connected: boolean): TestGateway {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const snapshotListeners = new Set<(next: ApplicationGatewaySnapshot) => void>();
+  const eventListeners = new Set<GatewayEventListener>();
+  const allEventListeners: GatewayEventListener[] = [];
+  return {
+    snapshot,
+    connection: { gatewayUrl: "", token: "", password: "" },
+    subscribe(listener: (next: ApplicationGatewaySnapshot) => void) {
+      snapshotListeners.add(listener);
+      return () => snapshotListeners.delete(listener);
+    },
+    subscribeEvents(listener: GatewayEventListener) {
+      eventListeners.add(listener);
+      allEventListeners.push(listener);
+      return () => eventListeners.delete(listener);
+    },
+    emitSnapshot(patch: Partial<ApplicationGatewaySnapshot>) {
+      Object.assign(snapshot, patch);
+      for (const listener of snapshotListeners) {
+        listener(snapshot);
+      }
+    },
+    emitRetiredEvent(event: Parameters<GatewayEventListener>[0]) {
+      for (const listener of allEventListeners) {
+        listener(event);
+      }
+    },
+  } as unknown as TestGateway;
+}
+
+function createContext(gateway: TestGateway): ApplicationContext {
+  const subscribe = () => () => undefined;
+  return {
+    basePath: "",
+    gateway,
+    agents: {
+      state: {
+        agentsList: { defaultId: "main", agents: [{ id: "main" }] },
+        agentsLoading: false,
+        agentsError: null,
+      },
+      ensureList: vi.fn(async () => undefined),
+      subscribe,
+    },
+    channels: {
+      state: {
+        channelsSnapshot: null,
+      },
+      refresh: vi.fn(async () => undefined),
+      subscribe,
+    },
+    runtimeConfig: {
+      state: { configSnapshot: null },
+      subscribe,
+    },
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+}
+
+function createPage(context: ApplicationContext): CronTestPage {
+  const page = document.createElement("openclaw-cron-page") as CronTestPage;
+  page.context = context;
+  page.render = () => nothing;
+  document.body.append(page);
+  return page;
+}
+
+function createRequest() {
+  return vi.fn(async (method: string) => {
+    if (method === "cron.list") {
+      return { jobs: [], total: 0, offset: 0, hasMore: false };
+    }
+    if (method === "cron.runs") {
+      return { entries: [], total: 0, offset: 0, hasMore: false };
+    }
+    if (method === "models.list") {
+      return { models: [] };
+    }
+    return {};
+  });
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("CronPage lifecycle", () => {
+  it("replaces all mutable page state on each connection epoch", async () => {
+    const request = createRequest();
+    const client = { request } as unknown as GatewayBrowserClient;
+    const gateway = createGateway(client, true);
+    const page = createPage(createContext(gateway));
+    await page.updateComplete;
+    const connectedState = page.cron;
+    page.cron = {
+      ...connectedState,
+      cronStatus: { enabled: true, jobs: 1 },
+      cronJobs: [{ id: "old" } as never],
+    };
+    page.cronModelSuggestions = ["old/model"];
+    page.quickCreateOpen = true;
+
+    gateway.emitSnapshot({ connected: false });
+    const disconnectedState = page.cron;
+
+    expect(disconnectedState).not.toBe(connectedState);
+    expect(disconnectedState.cronStatus).toBeNull();
+    expect(disconnectedState.cronJobs).toEqual([]);
+    expect(page.cronModelSuggestions).toEqual([]);
+    expect(page.quickCreateOpen).toBe(false);
+
+    gateway.emitSnapshot({ connected: true });
+    expect(page.cron).not.toBe(disconnectedState);
+  });
+
+  it("rejects model suggestions from an earlier connection epoch", async () => {
+    const staleModels = createDeferred<{ models: Array<{ id: string }> }>();
+    let modelRequestCount = 0;
+    const request = vi.fn(async (method: string) => {
+      if (method === "models.list") {
+        modelRequestCount += 1;
+        return modelRequestCount === 1 ? staleModels.promise : { models: [{ id: "fresh/model" }] };
+      }
+      if (method === "cron.list") {
+        return { jobs: [], total: 0, offset: 0, hasMore: false };
+      }
+      if (method === "cron.runs") {
+        return { entries: [], total: 0, offset: 0, hasMore: false };
+      }
+      return {};
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const gateway = createGateway(client, false);
+    const page = createPage(createContext(gateway));
+    await page.updateComplete;
+
+    gateway.emitSnapshot({ connected: true });
+    await vi.waitFor(() => expect(modelRequestCount).toBe(1));
+    gateway.emitSnapshot({ connected: false });
+    gateway.emitSnapshot({ connected: true });
+    await vi.waitFor(() => expect(page.cronModelSuggestions).toEqual(["fresh/model"]));
+
+    staleModels.resolve({ models: [{ id: "stale/model" }] });
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(page.cronModelSuggestions).toEqual(["fresh/model"]);
+  });
+
+  it("ignores a cron event callback retained by a replaced gateway source", async () => {
+    const request = createRequest();
+    const client = { request } as unknown as GatewayBrowserClient;
+    const firstGateway = createGateway(client, true);
+    const secondGateway = createGateway(client, true);
+    const firstContext = createContext(firstGateway);
+    const secondContext = createContext(secondGateway);
+    const page = createPage(firstContext);
+    await vi.waitFor(() => expect(request).toHaveBeenCalled());
+
+    page.context = secondContext;
+    page.requestUpdate();
+    await page.updateComplete;
+    await vi.waitFor(() => expect(page.cron.client).toBe(client));
+    request.mockClear();
+    vi.mocked(secondContext.channels.refresh).mockClear();
+
+    firstGateway.emitRetiredEvent({ event: "cron" } as never);
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(request).not.toHaveBeenCalled();
+    expect(secondContext.channels.refresh).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/src/pages/cron/cron-page.ts b/ui/src/pages/cron/cron-page.ts
index f12d01835af..9f0fffb9995 100644
--- a/ui/src/pages/cron/cron-page.ts
+++ b/ui/src/pages/cron/cron-page.ts
@@ -1,7 +1,6 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { state } from "lit/decorators.js";
-import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type { AgentsListResult, CronJob } from "../../api/types.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
 import { applicationContext, type ApplicationContext } from "../../app/context.ts";
@@ -35,6 +34,8 @@ import {
 } from "../../lib/cron/index.ts";
 import { searchForSession } from "../../lib/sessions/index.ts";
 import { sortUniqueStrings } from "../../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { createDefaultDraft, draftToCronFormPatch, renderCronQuickCreate } from "./quick-create.ts";
 import type { CronQuickCreateDraft, CronQuickCreateStep } from "./quick-create.ts";
 import { renderCron } from "./view.ts";
@@ -55,12 +56,8 @@ function unique(values: string[]): string[] {
   return sortUniqueStrings(values.map((value) => value.trim()).filter(Boolean));
 }
 
-class CronPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class CronPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private cron = createInitialCronState();
@@ -70,62 +67,82 @@ class CronPage extends LitElement {
   @state() private quickCreateStep: CronQuickCreateStep = "what";
   @state() private quickCreateDraft: CronQuickCreateDraft | null = null;
 
-  private stopGatewaySubscription?: () => void;
-  private stopGatewayEvents?: () => void;
-  private stopAgentsSubscription?: () => void;
-  private stopChannelsSubscription?: () => void;
-  private stopConfigSubscription?: () => void;
-  private modelSuggestionsClient: GatewayBrowserClient | null = null;
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncGatewayState();
-    this.syncAgentsState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe(() => {
-      this.syncGatewayState();
-      this.ensureInitialData();
-    });
-    this.stopGatewayEvents = this.context.gateway.subscribeEvents((event) => {
-      if (event.event === "cron") {
-        void this.refreshCron({ tableFilters: true });
-      }
-    });
-    this.stopAgentsSubscription = this.context.agents.subscribe(() => {
-      this.syncAgentsState();
-      this.requestUpdate();
-    });
-    this.stopChannelsSubscription = this.context.channels.subscribe(() => this.requestUpdate());
-    this.stopConfigSubscription = this.context.runtimeConfig.subscribe(() => this.requestUpdate());
-    this.ensureInitialData();
-  }
+  private modelSuggestionsState: CronState | null = null;
+  private gatewaySource?: ApplicationContext["gateway"];
+  private readonly subscriptions = new SubscriptionsController(this)
+    .watch(
+      () => this.context?.agents,
+      (agents, notify) => agents.subscribe(notify),
+      () => this.syncAgentsState(),
+    )
+    .watch(
+      () => this.context?.channels,
+      (channels, notify) => channels.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig, notify) => runtimeConfig.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const sourceChanged = this.gatewaySource !== undefined && this.gatewaySource !== gateway;
+        this.gatewaySource = gateway;
+        this.syncGatewayState(gateway.snapshot, sourceChanged);
+        this.ensureInitialData();
+        return gateway.subscribe((snapshot) => {
+          if (this.gatewaySource === gateway) {
+            this.syncGatewayState(snapshot, false);
+            this.ensureInitialData();
+          }
+        });
+      },
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) =>
+        gateway.subscribeEvents((event) => {
+          if (
+            this.gatewaySource === gateway &&
+            gateway.snapshot.connected &&
+            gateway.snapshot.client &&
+            event.event === "cron"
+          ) {
+            void this.refreshCron({ tableFilters: true });
+          }
+        }),
+    );
 
   override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopGatewayEvents?.();
-    this.stopGatewayEvents = undefined;
-    this.stopAgentsSubscription?.();
-    this.stopAgentsSubscription = undefined;
-    this.stopChannelsSubscription?.();
-    this.stopChannelsSubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
+    this.gatewaySource = undefined;
+    this.resetGatewayState();
+    this.subscriptions.clear();
     super.disconnectedCallback();
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    if (this.cron.client !== gateway.client) {
-      this.cron = createInitialCronState(gateway);
-      this.cronModelSuggestions = [];
-      this.modelSuggestionsClient = null;
-      return;
+  private resetGatewayState(snapshot: Partial<Pick<CronState, "client" | "connected">> = {}) {
+    this.cron = createInitialCronState(snapshot);
+    this.agentsList = snapshot.connected ? this.context.agents.state.agentsList : null;
+    this.cronModelSuggestions = [];
+    this.modelSuggestionsState = null;
+    this.quickCreateOpen = false;
+    this.quickCreateStep = "what";
+    this.quickCreateDraft = null;
+  }
+
+  private syncGatewayState(
+    snapshot: ApplicationContext["gateway"]["snapshot"],
+    sourceChanged: boolean,
+  ) {
+    if (
+      sourceChanged ||
+      this.cron.client !== snapshot.client ||
+      this.cron.connected !== snapshot.connected
+    ) {
+      // Each connection epoch owns a fresh mutable state object. In-flight work
+      // can finish against the old object without leaking into the next session.
+      this.resetGatewayState(snapshot);
     }
-    if (this.cron.connected === gateway.connected) {
-      return;
-    }
-    this.cron.connected = gateway.connected;
-    this.requestUpdate();
   }
 
   private syncAgentsState() {
@@ -144,9 +161,10 @@ class CronPage extends LitElement {
     } else if (!this.cron.cronRuns.length && !this.cron.cronRunsLoadingMore) {
       void this.loadRuns(this.cron.cronRunsScope === "all" ? null : this.cron.cronRunsJobId);
     }
-    if (this.modelSuggestionsClient !== this.cron.client) {
-      this.modelSuggestionsClient = this.cron.client;
-      void this.loadModelSuggestions();
+    if (this.modelSuggestionsState !== this.cron) {
+      const cronState = this.cron;
+      this.modelSuggestionsState = cronState;
+      void this.loadModelSuggestions(cronState);
     }
   }
 
@@ -176,14 +194,20 @@ class CronPage extends LitElement {
     return this.runCronTask((cronState) => loadCronRuns(cronState, jobId));
   }
 
-  private async loadModelSuggestions() {
+  private async loadModelSuggestions(cronState: CronState) {
     const suggestionState: CronModelSuggestionsState = {
-      client: this.cron.client,
-      connected: this.cron.connected,
+      client: cronState.client,
+      connected: cronState.connected,
       cronModelSuggestions: this.cronModelSuggestions,
     };
     await loadCronModelSuggestions(suggestionState);
-    if (suggestionState.client === this.cron.client) {
+    if (
+      this.isConnected &&
+      this.cron === cronState &&
+      this.modelSuggestionsState === cronState &&
+      cronState.connected &&
+      suggestionState.client === cronState.client
+    ) {
       this.cronModelSuggestions = suggestionState.cronModelSuggestions;
     }
   }
@@ -222,8 +246,9 @@ class CronPage extends LitElement {
 
   private async createFromQuickCreate() {
     this.draftToForm();
-    const saved = await this.runCronTask((cronState) => addCronJob(cronState));
-    if (saved) {
+    const cronState = this.cron;
+    const saved = await this.runCronTask((current) => addCronJob(current));
+    if (saved && this.cron === cronState) {
       this.quickCreateOpen = false;
       this.quickCreateStep = "what";
       this.quickCreateDraft = null;
diff --git a/ui/src/pages/debug/debug-page.ts b/ui/src/pages/debug/debug-page.ts
index 66c0cebd042..6a5fcaee886 100644
--- a/ui/src/pages/debug/debug-page.ts
+++ b/ui/src/pages/debug/debug-page.ts
@@ -1,23 +1,31 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { state } from "lit/decorators.js";
 import type { EventLogEntry } from "../../api/event-log.ts";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type { HealthSnapshot, StatusSummary } from "../../api/types.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import { loadGatewayDiagnostics } from "../../lib/gateway-diagnostics.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderDebug } from "./view.ts";
 
 const DEBUG_POLL_INTERVAL_MS = 3000;
 
-class DebugPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
+type DebugRequestScope = {
+  gateway: ApplicationContext["gateway"];
+  client: GatewayBrowserClient;
+  generation: number;
+};
 
-  @consume({ context: applicationContext, subscribe: false })
+class DebugPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private client: GatewayBrowserClient | null = null;
@@ -34,42 +42,58 @@ class DebugPage extends LitElement {
   @state() private eventLog: readonly EventLogEntry[] = [];
 
   private debugPollInterval: ReturnType<typeof globalThis.setInterval> | null = null;
-  private stopGatewaySubscription?: () => void;
-  private stopEventLogSubscription?: () => void;
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.eventLog = this.context.gateway.eventLog;
-    this.syncGatewayState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe((snapshot) => {
-      const previousClient = this.client;
-      this.syncGatewayState();
-      if (previousClient !== snapshot.client) {
-        this.resetServerState();
-      }
-      this.syncPolling();
-      this.ensureInitialDebug();
-    });
-    this.stopEventLogSubscription = this.context.gateway.subscribeEventLog((events) => {
-      this.eventLog = events;
-    });
-    this.syncPolling();
-    this.ensureInitialDebug();
-  }
+  private hasBoundGatewaySource = false;
+  private gatewaySource: ApplicationContext["gateway"] | null = null;
+  private requestGeneration = 0;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const resetForSourceBind = this.hasBoundGatewaySource;
+        this.hasBoundGatewaySource = true;
+        this.gatewaySource = gateway;
+        this.requestGeneration += 1;
+        const cleanup = gateway.subscribe((snapshot) => {
+          if (this.gatewaySource === gateway && this.context.gateway === gateway) {
+            this.applyGatewaySnapshot(snapshot);
+          }
+        });
+        this.applyGatewaySnapshot(gateway.snapshot, resetForSourceBind);
+        return cleanup;
+      },
+    )
+    .watch(
+      () => this.context?.gateway,
+      (gateway, notify) => gateway.subscribeEventLog(notify),
+      (gateway) => {
+        this.eventLog = gateway.eventLog;
+      },
+    );
 
   override disconnectedCallback() {
     this.stopPolling();
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopEventLogSubscription?.();
-    this.stopEventLogSubscription = undefined;
+    this.subscriptions.clear();
+    this.requestGeneration += 1;
+    this.gatewaySource = null;
+    this.debugLoading = false;
     super.disconnectedCallback();
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    this.client = gateway.client;
-    this.connected = gateway.connected;
+  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, resetForSourceBind = false) {
+    const connectionChanged = snapshot.connected !== this.connected;
+    const clientChanged = resetForSourceBind || snapshot.client !== this.client;
+    if (clientChanged || connectionChanged) {
+      this.requestGeneration += 1;
+    }
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
+    if (clientChanged) {
+      this.resetServerState();
+    } else if (connectionChanged) {
+      this.debugLoading = false;
+    }
+    this.syncPolling();
+    this.ensureInitialDebug();
   }
 
   private resetServerState() {
@@ -110,15 +134,41 @@ class DebugPage extends LitElement {
     void this.loadDiagnostics();
   }
 
-  private async loadDiagnostics() {
+  private captureRequestScope(): DebugRequestScope | null {
+    const gateway = this.gatewaySource;
     const client = this.client;
-    if (!client || !this.connected || this.debugLoading) {
+    if (
+      !gateway ||
+      !client ||
+      !this.connected ||
+      !this.isConnected ||
+      this.context.gateway !== gateway
+    ) {
+      return null;
+    }
+    return { gateway, client, generation: this.requestGeneration };
+  }
+
+  private isRequestScopeCurrent(scope: DebugRequestScope): boolean {
+    return (
+      this.isConnected &&
+      this.gatewaySource === scope.gateway &&
+      this.context.gateway === scope.gateway &&
+      this.requestGeneration === scope.generation &&
+      this.client === scope.client &&
+      this.connected
+    );
+  }
+
+  private async loadDiagnostics() {
+    const scope = this.captureRequestScope();
+    if (!scope || this.debugLoading) {
       return;
     }
     this.debugLoading = true;
     try {
-      const result = await loadGatewayDiagnostics(client);
-      if (this.client !== client || !this.connected) {
+      const result = await loadGatewayDiagnostics(scope.client);
+      if (!this.isRequestScopeCurrent(scope)) {
         return;
       }
       this.debugStatus = result.status;
@@ -126,19 +176,19 @@ class DebugPage extends LitElement {
       this.debugModels = result.models;
       this.debugHeartbeat = result.heartbeat;
     } catch (err) {
-      if (this.client === client && this.connected) {
+      if (this.isRequestScopeCurrent(scope)) {
         this.debugCallError = String(err);
       }
     } finally {
-      if (this.client === client) {
+      if (this.isRequestScopeCurrent(scope)) {
         this.debugLoading = false;
       }
     }
   }
 
   private async callDebugMethod() {
-    const client = this.client;
-    if (!client || !this.connected) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
     this.debugCallError = null;
@@ -147,12 +197,12 @@ class DebugPage extends LitElement {
       const params = this.debugCallParams.trim()
         ? (JSON.parse(this.debugCallParams) as unknown)
         : {};
-      const res = await client.request(this.debugCallMethod.trim(), params);
-      if (this.client === client) {
+      const res = await scope.client.request(this.debugCallMethod.trim(), params);
+      if (this.isRequestScopeCurrent(scope)) {
         this.debugCallResult = JSON.stringify(res, null, 2);
       }
     } catch (err) {
-      if (this.client === client) {
+      if (this.isRequestScopeCurrent(scope)) {
         this.debugCallError = String(err);
       }
     }
diff --git a/ui/src/pages/dreams/dreams-page.test.ts b/ui/src/pages/dreams/dreams-page.test.ts
new file mode 100644
index 00000000000..9df278a8164
--- /dev/null
+++ b/ui/src/pages/dreams/dreams-page.test.ts
@@ -0,0 +1,199 @@
+/* @vitest-environment jsdom */
+
+import { nothing } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import { createDreamingState, type DreamingState } from "./dreaming.ts";
+import type { DreamsRouteData } from "./dreams-page.ts";
+import type { DreamingViewState } from "./view.ts";
+import "./dreams-page.ts";
+
+type TestDreamsPage = HTMLElement & {
+  context: ApplicationContext;
+  routeData?: DreamsRouteData;
+  dreaming: DreamingState;
+  viewState: DreamingViewState;
+  restartConfirmOpen: boolean;
+  restartConfirmLoading: boolean;
+  pendingEnabled: boolean | null;
+  applyRouteData: () => void;
+  applyGatewaySnapshot: (snapshot: ApplicationGatewaySnapshot) => void;
+  loadAll: () => Promise<void>;
+  openWikiPage: (lookup: string) => Promise<unknown>;
+  render: () => unknown;
+  requestUpdate: () => void;
+  readonly updateComplete: Promise<boolean>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function contextWithGateway(client: GatewayBrowserClient, connected: boolean): ApplicationContext {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const subscribe = () => () => undefined;
+  return {
+    gateway: { snapshot, subscribe },
+    agents: {
+      state: { agentsList: null },
+      subscribe,
+    },
+    runtimeConfig: {
+      state: { configSnapshot: null },
+      refresh: vi.fn(async () => undefined),
+      subscribe,
+    },
+  } as unknown as ApplicationContext;
+}
+
+function createPage(context: ApplicationContext): TestDreamsPage {
+  const page = document.createElement("openclaw-dreams-page") as TestDreamsPage;
+  page.context = context;
+  page.render = () => nothing;
+  return page;
+}
+
+async function replaceContext(page: TestDreamsPage, context: ApplicationContext) {
+  page.context = context;
+  page.requestUpdate();
+  await page.updateComplete;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("DreamsPage gateway lifecycle", () => {
+  it("preserves matching route data on the first gateway bind", async () => {
+    const request = vi.fn();
+    const client = { request } as unknown as GatewayBrowserClient;
+    const context = contextWithGateway(client, true);
+    const status = { enabled: true } as DreamingState["dreamingStatus"];
+    const state = createDreamingState({ client, connected: true });
+    state.dreamingStatus = status;
+    const page = createPage(context);
+    page.routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: context.gateway.snapshot,
+      state,
+    };
+    page.applyRouteData();
+
+    document.body.append(page);
+    await page.updateComplete;
+
+    expect(page.dreaming.dreamingStatus).toBe(status);
+    expect(request).not.toHaveBeenCalled();
+  });
+
+  it("rejects preloaded data after a same-client gateway epoch change", async () => {
+    const client = {} as GatewayBrowserClient;
+    const context = contextWithGateway(client, true);
+    const staleState = createDreamingState({ client, connected: true });
+    staleState.dreamDiaryContent = "stale";
+    const page = createPage(context);
+    page.loadAll = vi.fn(async () => undefined);
+    page.routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: { ...context.gateway.snapshot },
+      state: staleState,
+    };
+
+    document.body.append(page);
+    await page.updateComplete;
+
+    expect(page.dreaming).not.toBe(staleState);
+    expect(page.dreaming.dreamDiaryContent).toBeNull();
+    expect(page.loadAll).toHaveBeenCalledOnce();
+  });
+
+  it("resets provider and modal state when the gateway source changes", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage(contextWithGateway(client, false));
+    document.body.append(page);
+    await page.updateComplete;
+    const previousState = page.dreaming;
+    previousState.dreamDiaryContent = "old provider";
+    page.viewState.wikiPreviewOpen = true;
+    page.viewState.wikiPreviewLoading = true;
+    page.viewState.wikiPreviewTitle = "Old page";
+    page.viewState.wikiPreviewContent = "old wiki";
+    page.restartConfirmOpen = true;
+    page.restartConfirmLoading = true;
+    page.pendingEnabled = true;
+
+    await replaceContext(page, contextWithGateway(client, false));
+
+    expect(page.dreaming).not.toBe(previousState);
+    expect(page.dreaming.dreamDiaryContent).toBeNull();
+    expect(page.viewState.wikiPreviewOpen).toBe(false);
+    expect(page.viewState.wikiPreviewLoading).toBe(false);
+    expect(page.viewState.wikiPreviewTitle).toBe("");
+    expect(page.viewState.wikiPreviewContent).toBe("");
+    expect(page.restartConfirmOpen).toBe(false);
+    expect(page.restartConfirmLoading).toBe(false);
+    expect(page.pendingEnabled).toBeNull();
+
+    page.viewState.wikiPreviewOpen = true;
+    page.restartConfirmOpen = true;
+    page.restartConfirmLoading = true;
+    page.pendingEnabled = false;
+    page.remove();
+
+    expect(page.viewState.wikiPreviewOpen).toBe(false);
+    expect(page.restartConfirmOpen).toBe(false);
+    expect(page.restartConfirmLoading).toBe(false);
+    expect(page.pendingEnabled).toBeNull();
+  });
+
+  it("discards a wiki response from a replaced gateway source", async () => {
+    const pending = deferred<unknown>();
+    const client = {
+      request: vi.fn(() => pending.promise),
+    } as unknown as GatewayBrowserClient;
+    const page = createPage(contextWithGateway(client, true));
+    document.body.append(page);
+    await page.updateComplete;
+
+    const preview = page.openWikiPage("old.md");
+    await replaceContext(page, contextWithGateway(client, false));
+    pending.resolve({ title: "Old", path: "old.md", content: "stale" });
+
+    await expect(preview).resolves.toBeNull();
+  });
+
+  it("discards a wiki response across a same-client reconnect", async () => {
+    const pending = deferred<unknown>();
+    const client = {
+      request: vi.fn(() => pending.promise),
+    } as unknown as GatewayBrowserClient;
+    const page = createPage(contextWithGateway(client, true));
+    document.body.append(page);
+    await page.updateComplete;
+
+    const previousState = page.dreaming;
+    const preview = page.openWikiPage("old.md");
+    page.applyGatewaySnapshot({ client, connected: false } as ApplicationGatewaySnapshot);
+    page.applyGatewaySnapshot({ client, connected: true } as ApplicationGatewaySnapshot);
+    pending.resolve({ title: "Old", path: "old.md", content: "stale" });
+
+    await expect(preview).resolves.toBeNull();
+    expect(page.dreaming).not.toBe(previousState);
+    expect(page.viewState.wikiPreviewContent).toBe("");
+  });
+});
diff --git a/ui/src/pages/dreams/dreams-page.ts b/ui/src/pages/dreams/dreams-page.ts
index b89cad0cf13..218bc9abc18 100644
--- a/ui/src/pages/dreams/dreams-page.ts
+++ b/ui/src/pages/dreams/dreams-page.ts
@@ -1,10 +1,11 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
 import {
   applicationContext,
   type ApplicationContext,
+  type ApplicationGateway,
   type ApplicationGatewaySnapshot,
 } from "../../app/context.ts";
 import { t } from "../../i18n/index.ts";
@@ -15,6 +16,8 @@ import {
   resolveSessionAgentFilterId,
   resolveSessionAgentFilterOptions,
 } from "../../lib/sessions/session-options.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import {
   backfillDreamDiary,
   copyDreamingArchivePath,
@@ -35,6 +38,9 @@ import { renderDreamingRestartConfirmation } from "./restart-confirmation.ts";
 import { createDreamingViewState, renderDreaming, type DreamingViewState } from "./view.ts";
 
 export type DreamsRouteData = {
+  // Client identity alone cannot distinguish provider replacement or reconnect epochs.
+  gateway: ApplicationGateway;
+  gatewaySnapshot: ApplicationGatewaySnapshot;
   state: DreamingState;
 };
 
@@ -47,6 +53,12 @@ type WikiPagePreview = {
   updatedAt?: string;
 };
 
+type DreamingTaskScope = {
+  gateway: ApplicationGateway;
+  epoch: number;
+  state: DreamingState;
+};
+
 function formatDreamNextCycle(nextRunAtMs: number | undefined): string | null {
   return formatTimeMs(nextRunAtMs, { hour: "numeric", minute: "2-digit" }, "") || null;
 }
@@ -97,12 +109,8 @@ function readWikiPagePreview(value: unknown, lookup: string): WikiPagePreview {
   };
 }
 
-class DreamsPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class DreamsPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @property({ attribute: false }) routeData?: DreamsRouteData;
@@ -115,38 +123,104 @@ class DreamsPage extends LitElement {
 
   private readonly viewState: DreamingViewState = createDreamingViewState();
   private routeDataEnabled = true;
-  private subscriptions: Array<() => void> = [];
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.applyGatewaySnapshot(this.context.gateway.snapshot, true);
-    this.syncConfigSnapshot();
-    this.subscriptions = [
-      this.context.gateway.subscribe((snapshot) => this.applyGatewaySnapshot(snapshot)),
-      this.context.agents.subscribe(() => this.applyAgentsState()),
-      this.context.runtimeConfig.subscribe(() => {
+  private gatewaySource: ApplicationGateway | null = null;
+  private gatewayBindingEpoch = 0;
+  private gatewayEpoch = 0;
+  private hasBoundGatewaySource = false;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const sourceReplaced = this.hasBoundGatewaySource;
+        this.hasBoundGatewaySource = true;
+        this.gatewaySource = gateway;
+        const bindingEpoch = ++this.gatewayBindingEpoch;
+        this.gatewayEpoch += 1;
+        const cleanup = gateway.subscribe((snapshot) => {
+          if (this.isGatewayBindingCurrent(gateway, bindingEpoch)) {
+            this.applyGatewaySnapshot(snapshot);
+          }
+        });
+        this.applyGatewaySnapshot(gateway.snapshot, sourceReplaced ? "replacement" : "initial");
+        return cleanup;
+      },
+    )
+    .effect(
+      () => this.context?.agents,
+      (agents) => agents.subscribe(() => this.applyAgentsState()),
+    )
+    .effect(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig) => {
         this.syncConfigSnapshot();
-        this.requestUpdate();
-      }),
-    ];
-  }
+        return runtimeConfig.subscribe(() => {
+          this.syncConfigSnapshot();
+          this.requestUpdate();
+        });
+      },
+    );
 
-  override willUpdate(changed: Map<PropertyKey, unknown>) {
+  override willUpdate(changed: PropertyValues<this>) {
     if (changed.has("routeData")) {
       this.applyRouteData();
     }
   }
 
   override disconnectedCallback() {
-    for (const unsubscribe of this.subscriptions) {
-      unsubscribe();
-    }
-    this.subscriptions = [];
-    this.viewState.wikiPreviewRequestId += 1;
+    this.subscriptions.clear();
+    this.gatewayBindingEpoch += 1;
+    this.gatewayEpoch += 1;
+    this.gatewaySource = null;
+    this.resetTransientState();
+    this.awaitingRouteData = true;
+    this.routeDataEnabled = true;
     this.dreaming = createDreamingState();
     super.disconnectedCallback();
   }
 
+  private isGatewayBindingCurrent(gateway: ApplicationGateway, bindingEpoch: number): boolean {
+    return (
+      this.isConnected &&
+      this.gatewaySource === gateway &&
+      this.gatewayBindingEpoch === bindingEpoch &&
+      this.context.gateway === gateway
+    );
+  }
+
+  private captureTaskScope(): DreamingTaskScope | null {
+    const gateway = this.gatewaySource;
+    if (!gateway) {
+      return null;
+    }
+    return { gateway, epoch: this.gatewayEpoch, state: this.dreaming };
+  }
+
+  private isTaskScopeCurrent(scope: DreamingTaskScope): boolean {
+    return (
+      this.isConnected &&
+      this.gatewaySource === scope.gateway &&
+      this.gatewayEpoch === scope.epoch &&
+      this.context.gateway === scope.gateway &&
+      this.dreaming === scope.state
+    );
+  }
+
+  private resetTransientState() {
+    this.viewState.wikiPreviewRequestId += 1;
+    this.viewState.wikiPreviewOpen = false;
+    this.viewState.wikiPreviewLoading = false;
+    this.viewState.wikiPreviewTitle = "";
+    this.viewState.wikiPreviewPath = "";
+    this.viewState.wikiPreviewUpdatedAt = null;
+    this.viewState.wikiPreviewContent = "";
+    this.viewState.wikiPreviewTotalLines = null;
+    this.viewState.wikiPreviewTruncated = false;
+    this.viewState.wikiPreviewError = null;
+    this.restartConfirmOpen = false;
+    this.restartConfirmLoading = false;
+    this.pendingEnabled = null;
+  }
+
   private createGatewayState(snapshot = this.context.gateway.snapshot): DreamingState {
     return createDreamingState({
       client: snapshot.client,
@@ -158,21 +232,30 @@ class DreamsPage extends LitElement {
     });
   }
 
-  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, initial = false) {
+  private applyGatewaySnapshot(
+    snapshot: ApplicationGatewaySnapshot,
+    sourceBind?: "initial" | "replacement",
+  ) {
     const clientChanged = this.dreaming.client !== snapshot.client;
+    const connectionChanged = this.dreaming.connected !== snapshot.connected;
     const becameConnected = snapshot.connected && !this.dreaming.connected;
-    if (clientChanged) {
+    const replaceState = sourceBind === "replacement" || clientChanged || connectionChanged;
+    if (connectionChanged) {
+      this.gatewayEpoch += 1;
+    }
+    if (replaceState) {
       this.dreaming = this.createGatewayState(snapshot);
-      if (!initial) {
+      if (sourceBind !== "initial") {
         this.routeDataEnabled = false;
         this.awaitingRouteData = false;
+        this.resetTransientState();
       }
     } else {
       this.dreaming.connected = snapshot.connected;
       this.dreaming.hello = snapshot.hello;
       this.dreaming.applySessionKey = snapshot.sessionKey;
     }
-    if (!this.awaitingRouteData && snapshot.connected && (clientChanged || becameConnected)) {
+    if (!this.awaitingRouteData && snapshot.connected && (replaceState || becameConnected)) {
       void this.loadAll();
     }
     this.requestUpdate();
@@ -200,10 +283,11 @@ class DreamsPage extends LitElement {
     if (!this.routeDataEnabled) {
       return;
     }
-    const gateway = this.context.gateway.snapshot;
-    if (data.state.client !== gateway.client || data.state.connected !== gateway.connected) {
+    const gateway = this.context.gateway;
+    const snapshot = gateway.snapshot;
+    if (data.gateway !== gateway || data.gatewaySnapshot !== snapshot) {
       this.routeDataEnabled = false;
-      this.dreaming = this.createGatewayState(gateway);
+      this.dreaming = this.createGatewayState(snapshot);
       void this.loadAll();
       return;
     }
@@ -236,43 +320,52 @@ class DreamsPage extends LitElement {
     });
   }
 
-  private async runDreamingTask<T>(task: (state: DreamingState) => Promise<T>): Promise<T> {
-    const dreamingState = this.dreaming;
-    const result = task(dreamingState);
+  private async runDreamingTask<T>(
+    task: (state: DreamingState) => Promise<T>,
+    scope = this.captureTaskScope(),
+  ): Promise<T | undefined> {
+    if (!scope || !this.isTaskScopeCurrent(scope)) {
+      return undefined;
+    }
+    const result = task(scope.state);
     this.requestUpdate();
     try {
-      return await result;
+      const value = await result;
+      return this.isTaskScopeCurrent(scope) ? value : undefined;
     } finally {
-      if (this.dreaming === dreamingState) {
+      if (this.isTaskScopeCurrent(scope)) {
         this.requestUpdate();
       }
     }
   }
 
   private async loadAll(refreshConfig = false) {
-    if (!this.dreaming.client || !this.dreaming.connected) {
+    const scope = this.captureTaskScope();
+    if (!scope || !scope.state.client || !scope.state.connected) {
       return;
     }
     this.routeDataEnabled = false;
     if (refreshConfig) {
-      await this.context.runtimeConfig.refresh();
-      if (!this.dreaming.client || !this.dreaming.connected) {
+      const runtimeConfig = this.context.runtimeConfig;
+      await runtimeConfig.refresh();
+      if (!this.isTaskScopeCurrent(scope) || this.context.runtimeConfig !== runtimeConfig) {
         return;
       }
     }
     this.syncConfigSnapshot();
     await Promise.all([
-      this.runDreamingTask(loadDreamingStatus),
-      this.runDreamingTask(loadDreamDiary),
-      this.runDreamingTask(loadWikiImportInsights),
-      this.runDreamingTask(loadWikiMemoryPalace),
+      this.runDreamingTask(loadDreamingStatus, scope),
+      this.runDreamingTask(loadDreamDiary, scope),
+      this.runDreamingTask(loadWikiImportInsights, scope),
+      this.runDreamingTask(loadWikiMemoryPalace, scope),
     ]);
   }
 
   private loadSelectedAgentData() {
+    const scope = this.captureTaskScope();
     void Promise.all([
-      this.runDreamingTask(loadDreamingStatus),
-      this.runDreamingTask(loadDreamDiary),
+      this.runDreamingTask(loadDreamingStatus, scope),
+      this.runDreamingTask(loadDreamDiary, scope),
     ]);
   }
 
@@ -316,27 +409,46 @@ class DreamsPage extends LitElement {
     this.routeDataEnabled = false;
     this.restartConfirmLoading = true;
     this.dreaming.dreamingStatusError = null;
+    const scope = this.captureTaskScope();
+    const runtimeConfig = this.context.runtimeConfig;
+    if (!scope) {
+      this.restartConfirmLoading = false;
+      return;
+    }
     try {
-      const updated = await this.runDreamingTask((dreamingState) =>
-        updateDreamingEnabled(dreamingState, this.context.runtimeConfig, enabled),
+      const updated = await this.runDreamingTask(
+        (dreamingState) => updateDreamingEnabled(dreamingState, runtimeConfig, enabled),
+        scope,
       );
+      if (!this.isTaskScopeCurrent(scope) || this.context.runtimeConfig !== runtimeConfig) {
+        return;
+      }
       if (!updated) {
         this.dreaming.dreamingStatusError ??= t("dreaming.restartConfirmation.failed");
         return;
       }
-      await this.context.runtimeConfig.refresh();
+      await runtimeConfig.refresh();
+      if (!this.isTaskScopeCurrent(scope) || this.context.runtimeConfig !== runtimeConfig) {
+        return;
+      }
       this.syncConfigSnapshot();
-      await this.runDreamingTask(loadDreamingStatus);
+      await this.runDreamingTask(loadDreamingStatus, scope);
+      if (!this.isTaskScopeCurrent(scope)) {
+        return;
+      }
       this.restartConfirmOpen = false;
       this.pendingEnabled = null;
     } finally {
-      this.restartConfirmLoading = false;
+      if (this.isTaskScopeCurrent(scope)) {
+        this.restartConfirmLoading = false;
+      }
     }
   }
 
   private async openWikiPage(lookup: string): Promise<WikiPagePreview | null> {
-    const client = this.dreaming.client;
-    if (!client || !this.dreaming.connected) {
+    const scope = this.captureTaskScope();
+    const client = scope?.state.client;
+    if (!scope || !client || !scope.state.connected) {
       return null;
     }
     const payload = await client.request("wiki.get", {
@@ -344,12 +456,26 @@ class DreamsPage extends LitElement {
       fromLine: 1,
       lineCount: 5000,
     });
-    if (this.dreaming.client !== client || !this.dreaming.connected) {
+    if (!this.isTaskScopeCurrent(scope)) {
       return null;
     }
     return readWikiPagePreview(payload, lookup);
   }
 
+  private async refreshWikiData(task: (state: DreamingState) => Promise<void>) {
+    const scope = this.captureTaskScope();
+    if (!scope) {
+      return;
+    }
+    const runtimeConfig = this.context.runtimeConfig;
+    await runtimeConfig.refresh();
+    if (!this.isTaskScopeCurrent(scope) || this.context.runtimeConfig !== runtimeConfig) {
+      return;
+    }
+    this.syncConfigSnapshot();
+    await this.runDreamingTask(task, scope);
+  }
+
   override render() {
     const dreaming = this.dreaming;
     const configState = this.context.runtimeConfig.state;
@@ -429,16 +555,8 @@ class DreamsPage extends LitElement {
         onRefresh: () => void this.loadAll(true),
         onSelectAgent: (agentId) => this.selectAgent(agentId),
         onRefreshDiary: () => void this.runDreamingTask(loadDreamDiary),
-        onRefreshImports: () =>
-          void this.context.runtimeConfig.refresh().then(() => {
-            this.syncConfigSnapshot();
-            return this.runDreamingTask(loadWikiImportInsights);
-          }),
-        onRefreshMemoryPalace: () =>
-          void this.context.runtimeConfig.refresh().then(() => {
-            this.syncConfigSnapshot();
-            return this.runDreamingTask(loadWikiMemoryPalace);
-          }),
+        onRefreshImports: () => void this.refreshWikiData(loadWikiImportInsights),
+        onRefreshMemoryPalace: () => void this.refreshWikiData(loadWikiMemoryPalace),
         onOpenConfig: () => void this.context.runtimeConfig.openFile(),
         onOpenWikiPage: (lookup) => this.openWikiPage(lookup),
         onBackfillDiary: () => void this.runDreamingTask(backfillDreamDiary),
diff --git a/ui/src/pages/dreams/route.ts b/ui/src/pages/dreams/route.ts
index 11d95907f69..b34b729ea8f 100644
--- a/ui/src/pages/dreams/route.ts
+++ b/ui/src/pages/dreams/route.ts
@@ -12,13 +12,14 @@ import {
 import type { DreamsRouteData } from "./dreams-page.ts";
 
 async function loadDreamsRoute(context: ApplicationContext): Promise<DreamsRouteData> {
+  const gateway = context.gateway;
+  const gatewaySnapshot = gateway.snapshot;
   await Promise.all([context.runtimeConfig.ensureLoaded(), context.agents.ensureList()]);
-  const gateway = context.gateway.snapshot;
-  const sessionKey = gateway.sessionKey;
+  const sessionKey = gatewaySnapshot.sessionKey;
   const state = createDreamingState({
-    client: gateway.client,
-    connected: gateway.connected,
-    hello: gateway.hello,
+    client: gatewaySnapshot.client,
+    connected: gatewaySnapshot.connected,
+    hello: gatewaySnapshot.hello,
     configSnapshot: context.runtimeConfig.state.configSnapshot,
     applySessionKey: sessionKey,
     selectedAgentId: resolveSessionAgentFilterId(
@@ -35,7 +36,7 @@ async function loadDreamsRoute(context: ApplicationContext): Promise<DreamsRoute
     loadWikiImportInsights(state),
     loadWikiMemoryPalace(state),
   ]);
-  return { state };
+  return { gateway, gatewaySnapshot, state };
 }
 
 export const page = definePage({
diff --git a/ui/src/pages/gateway-source-replacement.test.ts b/ui/src/pages/gateway-source-replacement.test.ts
new file mode 100644
index 00000000000..dda023e384b
--- /dev/null
+++ b/ui/src/pages/gateway-source-replacement.test.ts
@@ -0,0 +1,499 @@
+/* @vitest-environment jsdom */
+
+import { nothing } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../app/context.ts";
+import type { SessionsRouteData } from "./sessions/sessions-page.ts";
+import type { SkillsRouteData } from "./skills/skills-page.ts";
+import type { UsageRouteData } from "./usage/usage-page.ts";
+import "./cron/cron-page.ts";
+import "./debug/debug-page.ts";
+import "./instances/instances-page.ts";
+import "./logs/logs-page.ts";
+import "./sessions/sessions-page.ts";
+import "./skills/skills-page.ts";
+import "./tasks/tasks-page.ts";
+import "./usage/usage-page.ts";
+
+type TestPage = HTMLElement & {
+  context: ApplicationContext;
+  render: () => unknown;
+  readonly updateComplete: Promise<boolean>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((nextResolve) => {
+    resolve = nextResolve;
+  });
+  return { promise, resolve };
+}
+
+function gatewayWithClient(
+  client: GatewayBrowserClient,
+  connected: boolean,
+): ApplicationContext["gateway"] {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  return {
+    snapshot,
+    eventLog: [],
+    subscribe: () => () => undefined,
+    subscribeEvents: () => () => undefined,
+    subscribeEventLog: () => () => undefined,
+  } as unknown as ApplicationContext["gateway"];
+}
+
+function contextWithClient(
+  client: GatewayBrowserClient,
+  options: {
+    connected?: boolean;
+    agentsList?: unknown;
+    ensureList?: () => Promise<unknown>;
+  } = {},
+): ApplicationContext {
+  const subscribe = () => () => undefined;
+  const agentsList = options.agentsList ?? null;
+  return {
+    basePath: "",
+    gateway: gatewayWithClient(client, options.connected ?? false),
+    agents: {
+      state: { agentsList, agentsLoading: false, agentsError: null },
+      ensureList: options.ensureList ?? vi.fn(async () => agentsList),
+      subscribe,
+    },
+    agentIdentity: { get: () => undefined, ensure: vi.fn(async () => undefined), subscribe },
+    agentSelection: { subscribe },
+    channels: { subscribe },
+    runtimeConfig: { state: { configSnapshot: null }, subscribe },
+    sessions: {
+      state: { result: null, loading: false },
+      list: vi.fn(async () => null),
+      subscribe,
+    },
+    workboard: { subscribe },
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+}
+
+function createPage(tagName: string, context: ApplicationContext): TestPage {
+  const page = document.createElement(tagName) as TestPage;
+  page.context = context;
+  page.render = () => nothing;
+  return page;
+}
+
+async function replaceContext(
+  page: TestPage,
+  replacementClient: GatewayBrowserClient,
+  options: { connected?: boolean; agentsList?: unknown } = {},
+): Promise<void> {
+  page.remove();
+  page.context = contextWithClient(replacementClient, options);
+  document.body.append(page);
+  await page.updateComplete;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("gateway source replacement across reconnect with a reused client", () => {
+  it("preserves matching sessions route data on the first bind", async () => {
+    const client = {} as GatewayBrowserClient;
+    const context = contextWithClient(client, { connected: true });
+    const routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: context.gateway.snapshot,
+      result: { count: 1, sessions: [{ key: "old" }] },
+      error: null,
+      expandedSessionKey: null,
+      showArchived: false,
+    } as unknown as SessionsRouteData;
+    const page = createPage("openclaw-sessions-page", context) as TestPage & {
+      routeData: SessionsRouteData;
+      result: SessionsRouteData["result"];
+    };
+    page.routeData = routeData;
+
+    document.body.append(page);
+    await page.updateComplete;
+
+    expect(page.result?.sessions.map((session) => session.key)).toEqual(["old"]);
+    expect(context.sessions.list).not.toHaveBeenCalled();
+  });
+
+  it("preserves matching usage route data on the first bind", async () => {
+    const request = vi.fn();
+    const client = { request } as unknown as GatewayBrowserClient;
+    const context = contextWithClient(client, { connected: true });
+    const result = { sessions: [{ key: "old" }] } as unknown as UsageRouteData["result"];
+    const routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: context.gateway.snapshot,
+      query: {
+        startDate: "2026-07-08",
+        endDate: "2026-07-08",
+        scope: "family",
+        timeZone: "local",
+        agentId: null,
+      },
+      result,
+      costSummary: null,
+      providerUsageSummary: null,
+      error: null,
+    } satisfies UsageRouteData;
+    const page = createPage("openclaw-usage-page", context) as TestPage & {
+      routeData: UsageRouteData;
+      usageResult: UsageRouteData["result"];
+    };
+    page.routeData = routeData;
+
+    document.body.append(page);
+    await page.updateComplete;
+
+    expect(page.usageResult).toBe(result);
+    expect(request).not.toHaveBeenCalled();
+  });
+
+  it("rejects usage route data from an earlier same-client gateway epoch", async () => {
+    const freshResult = { sessions: [{ key: "fresh" }] } as unknown as UsageRouteData["result"];
+    const request = vi.fn(async (method: string) => {
+      if (method === "sessions.usage") {
+        return freshResult;
+      }
+      return {};
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const context = contextWithClient(client, { connected: true });
+    const staleResult = { sessions: [{ key: "stale" }] } as unknown as UsageRouteData["result"];
+    const page = createPage("openclaw-usage-page", context) as TestPage & {
+      routeData: UsageRouteData;
+      usageResult: UsageRouteData["result"];
+    };
+    page.routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: { ...context.gateway.snapshot },
+      query: {
+        startDate: "2026-07-08",
+        endDate: "2026-07-08",
+        scope: "family",
+        timeZone: "local",
+        agentId: null,
+      },
+      result: staleResult,
+      costSummary: null,
+      providerUsageSummary: null,
+      error: null,
+    };
+
+    document.body.append(page);
+    await page.updateComplete;
+    await vi.waitFor(() => expect(page.usageResult).toBe(freshResult));
+
+    expect(request).toHaveBeenCalledWith("sessions.usage", expect.any(Object));
+    expect(page.usageResult).not.toBe(staleResult);
+  });
+
+  it("preserves matching skills route data on the first bind", async () => {
+    const request = vi.fn();
+    const client = { request } as unknown as GatewayBrowserClient;
+    const agentsList = { defaultId: "main", agents: [{ id: "main" }] };
+    const context = contextWithClient(client, { connected: true, agentsList });
+    const report = { skills: [{ skillKey: "old" }] } as unknown as SkillsRouteData["report"];
+    const routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: context.gateway.snapshot,
+      agents: context.agents,
+      agentsList,
+      selectedAgentId: "main",
+      report,
+      error: null,
+    } as unknown as SkillsRouteData;
+    const page = createPage("openclaw-skills-page", context) as TestPage & {
+      routeData: SkillsRouteData;
+      skillsReport: SkillsRouteData["report"];
+    };
+    page.routeData = routeData;
+
+    document.body.append(page);
+    await page.updateComplete;
+
+    expect(page.skillsReport).toBe(report);
+    expect(request).not.toHaveBeenCalled();
+  });
+
+  it("rejects skills route data from an earlier same-client gateway epoch", async () => {
+    const freshReport = { skills: [{ skillKey: "fresh" }] } as unknown as SkillsRouteData["report"];
+    const request = vi.fn(async (method: string) =>
+      method === "skills.status" ? freshReport : undefined,
+    );
+    const client = { request } as unknown as GatewayBrowserClient;
+    const agentsList = { defaultId: "main", agents: [{ id: "main" }] };
+    const context = contextWithClient(client, { connected: true, agentsList });
+    const staleReport = { skills: [{ skillKey: "stale" }] } as unknown as SkillsRouteData["report"];
+    const page = createPage("openclaw-skills-page", context) as TestPage & {
+      routeData: SkillsRouteData;
+      skillsReport: SkillsRouteData["report"];
+    };
+    page.routeData = {
+      gateway: context.gateway,
+      gatewaySnapshot: { ...context.gateway.snapshot },
+      agents: context.agents,
+      agentsList,
+      selectedAgentId: "main",
+      report: staleReport,
+      error: null,
+    } as unknown as SkillsRouteData;
+
+    document.body.append(page);
+    await page.updateComplete;
+    await vi.waitFor(() => expect(page.skillsReport).toBe(freshReport));
+
+    expect(page.skillsReport).not.toBe(staleReport);
+  });
+
+  it("clears sessions loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-sessions-page", contextWithClient(client)) as TestPage & {
+      result: unknown;
+      selectedKeys: Set<string>;
+      checkpointItemsByKey: Record<string, unknown>;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.result = { sessions: [{ key: "old" }] };
+    page.selectedKeys = new Set(["old"]);
+    page.checkpointItemsByKey = { old: [{}] };
+
+    await replaceContext(page, client);
+
+    expect(page.result).toBeNull();
+    expect(page.selectedKeys.size).toBe(0);
+    expect(page.checkpointItemsByKey).toEqual({});
+  });
+
+  it("clears usage loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-usage-page", contextWithClient(client)) as TestPage & {
+      usageResult: unknown;
+      providerUsageSummary: unknown;
+      usageSelectedSessions: string[];
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.usageResult = { sessions: [{ key: "old" }] };
+    page.providerUsageSummary = { providers: [{ provider: "old" }] };
+    page.usageSelectedSessions = ["old"];
+
+    await replaceContext(page, client);
+
+    expect(page.usageResult).toBeNull();
+    expect(page.providerUsageSummary).toBeNull();
+    expect(page.usageSelectedSessions).toEqual([]);
+  });
+
+  it("clears skills loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-skills-page", contextWithClient(client)) as TestPage & {
+      agentsList: unknown;
+      skillsReport: unknown;
+      skillCardContents: Record<string, string>;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.agentsList = { agents: [{ id: "old" }] };
+    page.skillsReport = { skills: [{ key: "old" }] };
+    page.skillCardContents = { old: "stale" };
+
+    await replaceContext(page, client);
+
+    expect(page.agentsList).toBeNull();
+    expect(page.skillsReport).toBeNull();
+    expect(page.skillCardContents).toEqual({});
+  });
+
+  it("discards an agent list from a replaced skills source that reuses its client", async () => {
+    const pending = deferred<SkillsRouteData["agentsList"]>();
+    const ensureList = vi.fn(() => pending.promise);
+    const request = vi.fn(async () => ({ skills: [] }));
+    const client = { request } as unknown as GatewayBrowserClient;
+    const context = contextWithClient(client, { ensureList });
+    const page = createPage("openclaw-skills-page", context) as TestPage & {
+      agentsList: SkillsRouteData["agentsList"];
+      connected: boolean;
+      loadAgents: () => Promise<void>;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    (context.gateway.snapshot as ApplicationGatewaySnapshot).connected = true;
+    page.connected = true;
+
+    const load = page.loadAgents();
+    await vi.waitFor(() => expect(ensureList).toHaveBeenCalledOnce());
+    const replacementAgents = {
+      defaultId: "fresh",
+      mainKey: "agent:fresh:main",
+      scope: "all",
+      agents: [{ id: "fresh" }],
+    } as unknown as NonNullable<SkillsRouteData["agentsList"]>;
+    await replaceContext(page, client, { connected: true, agentsList: replacementAgents });
+
+    pending.resolve({
+      defaultId: "stale",
+      mainKey: "agent:stale:main",
+      scope: "all",
+      agents: [{ id: "stale" }],
+    } as unknown as NonNullable<SkillsRouteData["agentsList"]>);
+    await load;
+
+    expect(page.agentsList).toBe(replacementAgents);
+  });
+
+  it("clears logs loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-logs-page", contextWithClient(client)) as TestPage & {
+      logsEntries: unknown[];
+      logsFile: string | null;
+      logsCursor: number | null;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.logsEntries = [{ raw: "old" }];
+    page.logsFile = "/old/provider.log";
+    page.logsCursor = 42;
+
+    await replaceContext(page, client);
+
+    expect(page.logsEntries).toEqual([]);
+    expect(page.logsFile).toBeNull();
+    expect(page.logsCursor).toBeNull();
+  });
+
+  it("clears diagnostics loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-debug-page", contextWithClient(client)) as TestPage & {
+      debugStatus: unknown;
+      debugHealth: unknown;
+      debugModels: unknown[];
+      debugHeartbeat: unknown;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.debugStatus = { version: "old" };
+    page.debugHealth = { ok: true };
+    page.debugModels = [{ id: "old" }];
+    page.debugHeartbeat = { provider: "old" };
+
+    await replaceContext(page, client);
+
+    expect(page.debugStatus).toBeNull();
+    expect(page.debugHealth).toBeNull();
+    expect(page.debugModels).toEqual([]);
+    expect(page.debugHeartbeat).toBeNull();
+  });
+
+  it("discards diagnostics from a replaced provider that reuses its client", async () => {
+    const pending = deferred<unknown>();
+    const request = vi.fn(() => pending.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const context = contextWithClient(client);
+    const page = createPage("openclaw-debug-page", context) as TestPage & {
+      connected: boolean;
+      debugLoading: boolean;
+      debugStatus: unknown;
+      loadDiagnostics: () => Promise<void>;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    (context.gateway.snapshot as ApplicationGatewaySnapshot).connected = true;
+    page.connected = true;
+
+    const load = page.loadDiagnostics();
+    await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(4));
+    await replaceContext(page, client);
+    pending.resolve({ models: [{ id: "stale" }], stale: true });
+    await load;
+
+    expect(page.debugLoading).toBe(false);
+    expect(page.debugStatus).toBeNull();
+  });
+
+  it("clears cron data loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-cron-page", contextWithClient(client)) as TestPage & {
+      cron: {
+        client: GatewayBrowserClient | null;
+        connected: boolean;
+        cronStatus: unknown;
+        cronJobs: unknown[];
+      };
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.cron = {
+      ...page.cron,
+      cronStatus: { enabled: true },
+      cronJobs: [{ id: "old" }],
+    };
+
+    await replaceContext(page, client);
+
+    expect(page.cron.cronStatus).toBeNull();
+    expect(page.cron.cronJobs).toEqual([]);
+  });
+
+  it("clears presence loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-instances-page", contextWithClient(client)) as TestPage & {
+      entries: unknown[];
+      error: string | null;
+      status: string | null;
+      hostsRevealed: boolean;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.entries = [{ instanceId: "old" }];
+    page.error = "old error";
+    page.status = "old status";
+    page.hostsRevealed = true;
+
+    await replaceContext(page, client);
+
+    expect(page.entries).toEqual([]);
+    expect(page.error).toBeNull();
+    expect(page.status).toBeNull();
+    expect(page.hostsRevealed).toBe(false);
+  });
+
+  it("clears tasks loaded by the previous provider", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage("openclaw-tasks-page", contextWithClient(client)) as TestPage & {
+      tasks: unknown[];
+      error: string | null;
+      cancellingTaskIds: Set<string>;
+    };
+    document.body.append(page);
+    await page.updateComplete;
+    page.tasks = [{ taskId: "old" }];
+    page.error = "old error";
+    page.cancellingTaskIds = new Set(["old"]);
+
+    await replaceContext(page, client);
+
+    expect(page.tasks).toEqual([]);
+    expect(page.error).toBeNull();
+    expect(page.cancellingTaskIds.size).toBe(0);
+  });
+});
diff --git a/ui/src/pages/instances/instances-page.ts b/ui/src/pages/instances/instances-page.ts
index 5817c3d828b..3fad986dbb9 100644
--- a/ui/src/pages/instances/instances-page.ts
+++ b/ui/src/pages/instances/instances-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type { PresenceEntry } from "../../api/types.ts";
@@ -13,6 +13,8 @@ import {
   formatMissingOperatorReadScopeMessage,
   isMissingOperatorReadScopeError,
 } from "../../lib/gateway-errors.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderInstances } from "./view.ts";
 
 function readPresence(value: unknown): PresenceEntry[] | null {
@@ -21,12 +23,8 @@ function readPresence(value: unknown): PresenceEntry[] | null {
   return Array.isArray(presence) ? (presence as PresenceEntry[]) : null;
 }
 
-class InstancesPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class InstancesPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private loading = false;
@@ -38,39 +36,53 @@ class InstancesPage extends LitElement {
   private client: GatewayBrowserClient | null = null;
   private connected = false;
   private requestId = 0;
-  private subscriptions: Array<() => void> = [];
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.subscriptions = [
-      this.context.gateway.subscribeEvents((event) => {
+  private gatewaySource?: ApplicationContext["gateway"];
+  private readonly subscriptions = new SubscriptionsController(this).effect(
+    () => this.context?.gateway,
+    (gateway) => {
+      const sourceChanged = this.gatewaySource !== undefined && this.gatewaySource !== gateway;
+      this.gatewaySource = gateway;
+      const stopEvents = gateway.subscribeEvents((event) => {
+        if (this.gatewaySource !== gateway) {
+          return;
+        }
         const presence = event.event === "presence" ? readPresence(event.payload) : null;
         if (presence) {
           this.applyPresence(presence);
         }
-      }),
-      this.context.gateway.subscribe((snapshot) => this.applyGatewaySnapshot(snapshot)),
-    ];
-    this.applyGatewaySnapshot(this.context.gateway.snapshot);
-  }
+      });
+      const stopGateway = gateway.subscribe((snapshot) => {
+        if (this.gatewaySource === gateway) {
+          this.applyGatewaySnapshot(snapshot);
+        }
+      });
+      this.applyGatewaySnapshot(gateway.snapshot, sourceChanged);
+      return () => {
+        stopEvents();
+        stopGateway();
+      };
+    },
+  );
 
   override disconnectedCallback() {
-    for (const unsubscribe of this.subscriptions) {
-      unsubscribe();
-    }
-    this.subscriptions = [];
+    this.subscriptions.clear();
     this.invalidateRequest();
     this.client = null;
     this.connected = false;
+    this.hostsRevealed = false;
     super.disconnectedCallback();
   }
 
-  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot) {
-    const clientChanged = snapshot.client !== this.client;
+  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, sourceChanged = false) {
+    const clientChanged = sourceChanged || snapshot.client !== this.client;
+    const connectionChanged = snapshot.connected !== this.connected;
     const becameConnected = snapshot.connected && !this.connected;
     this.client = snapshot.client;
     this.connected = snapshot.connected;
 
+    if (clientChanged || connectionChanged) {
+      this.hostsRevealed = false;
+    }
     if (clientChanged) {
       this.invalidateRequest();
       this.entries = [];
diff --git a/ui/src/pages/logs/logs-page.test.ts b/ui/src/pages/logs/logs-page.test.ts
new file mode 100644
index 00000000000..a47221965f7
--- /dev/null
+++ b/ui/src/pages/logs/logs-page.test.ts
@@ -0,0 +1,175 @@
+/* @vitest-environment jsdom */
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import "./logs-page.ts";
+
+type TestLogsPage = HTMLElement & {
+  context: ApplicationContext;
+  connected: boolean;
+  logsEntries: unknown[];
+  readonly updateComplete: Promise<boolean>;
+  applyGatewaySnapshot: (snapshot: ApplicationGatewaySnapshot) => void;
+  loadLogs: (opts?: { reset?: boolean; quiet?: boolean }) => Promise<boolean>;
+  requestUpdate: () => void;
+  scheduleScroll: (force?: boolean) => void;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function contextWithClient(client: GatewayBrowserClient): ApplicationContext {
+  return {
+    basePath: "",
+    gateway: {
+      snapshot: { client, connected: false },
+      subscribe: () => () => undefined,
+    },
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+}
+
+describe("LogsPage lifecycle", () => {
+  afterEach(() => {
+    document.body.replaceChildren();
+    vi.restoreAllMocks();
+  });
+
+  it("does not schedule scroll work after disconnect", async () => {
+    const page = document.createElement("openclaw-logs-page") as TestLogsPage;
+    page.context = {
+      basePath: "",
+      gateway: {
+        snapshot: { client: null, connected: false },
+        subscribe: () => () => undefined,
+      },
+      navigate: vi.fn(),
+      preload: vi.fn(async () => undefined),
+    } as unknown as ApplicationContext;
+    const requestFrame = vi.spyOn(window, "requestAnimationFrame").mockReturnValue(1);
+
+    document.body.append(page);
+    await page.updateComplete;
+    await Promise.resolve();
+    requestFrame.mockClear();
+
+    page.scheduleScroll();
+    page.remove();
+    await Promise.resolve();
+
+    expect(requestFrame).not.toHaveBeenCalled();
+  });
+
+  it("discards a log response from a replaced gateway source that reuses its client", async () => {
+    const pending = deferred<{ cursor: number; lines: string[]; reset: boolean }>();
+    const client = {
+      request: vi.fn(() => pending.promise),
+    } as unknown as GatewayBrowserClient;
+    const page = document.createElement("openclaw-logs-page") as TestLogsPage;
+    page.context = contextWithClient(client);
+    document.body.append(page);
+    await page.updateComplete;
+    page.connected = true;
+
+    const load = page.loadLogs({ reset: true });
+    page.context = contextWithClient(client);
+    page.requestUpdate();
+    await page.updateComplete;
+    pending.resolve({ cursor: 1, lines: ["stale"], reset: true });
+    await load;
+
+    expect(page.logsEntries).toEqual([]);
+  });
+
+  it("discards a log response that completes after disconnect", async () => {
+    const pending = deferred<{ cursor: number; lines: string[]; reset: boolean }>();
+    const client = {
+      request: vi.fn(() => pending.promise),
+    } as unknown as GatewayBrowserClient;
+    const page = document.createElement("openclaw-logs-page") as TestLogsPage;
+    page.context = contextWithClient(client);
+    document.body.append(page);
+    await page.updateComplete;
+    page.connected = true;
+
+    const load = page.loadLogs({ reset: true });
+    page.remove();
+    pending.resolve({ cursor: 1, lines: ["stale"], reset: true });
+    await load;
+
+    expect(page.logsEntries).toEqual([]);
+  });
+
+  it("discards a log response when the gateway disconnects with the same client", async () => {
+    const pending = deferred<{ cursor: number; lines: string[]; reset: boolean }>();
+    const client = {
+      request: vi.fn(() => pending.promise),
+    } as unknown as GatewayBrowserClient;
+    const page = document.createElement("openclaw-logs-page") as TestLogsPage;
+    page.context = contextWithClient(client);
+    document.body.append(page);
+    await page.updateComplete;
+    page.connected = true;
+
+    const load = page.loadLogs({ reset: true });
+    page.applyGatewaySnapshot({ client, connected: false } as ApplicationGatewaySnapshot);
+    pending.resolve({ cursor: 1, lines: ["stale"], reset: true });
+    await load;
+
+    expect(page.logsEntries).toEqual([]);
+  });
+
+  it("serializes quiet polls so an older cursor cannot overwrite a newer one", async () => {
+    const pending = deferred<{ cursor: number; lines: string[]; reset: boolean }>();
+    const request = vi.fn(() => pending.promise);
+    const client = {
+      request,
+    } as unknown as GatewayBrowserClient;
+    const page = document.createElement("openclaw-logs-page") as TestLogsPage;
+    page.context = contextWithClient(client);
+    document.body.append(page);
+    await page.updateComplete;
+    page.connected = true;
+
+    const first = page.loadLogs({ quiet: true });
+    const second = page.loadLogs({ quiet: true });
+    expect(request).toHaveBeenCalledTimes(1);
+    expect(await second).toBe(false);
+
+    pending.resolve({ cursor: 2, lines: ["fresh"], reset: true });
+    expect(await first).toBe(true);
+    expect(page.logsEntries).toHaveLength(1);
+  });
+
+  it("drops deferred scroll work after a same-client reconnect", async () => {
+    const client = {
+      request: vi.fn(
+        () =>
+          new Promise(() => {
+            // Keep both connection-epoch requests pending while scroll ownership changes.
+          }),
+      ),
+    } as unknown as GatewayBrowserClient;
+    const page = document.createElement("openclaw-logs-page") as TestLogsPage;
+    page.context = contextWithClient(client);
+    const requestFrame = vi.spyOn(window, "requestAnimationFrame").mockReturnValue(1);
+    document.body.append(page);
+    await page.updateComplete;
+    page.applyGatewaySnapshot({ client, connected: true } as ApplicationGatewaySnapshot);
+    requestFrame.mockClear();
+
+    page.scheduleScroll();
+    page.applyGatewaySnapshot({ client, connected: false } as ApplicationGatewaySnapshot);
+    page.applyGatewaySnapshot({ client, connected: true } as ApplicationGatewaySnapshot);
+    await Promise.resolve();
+
+    expect(requestFrame).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/src/pages/logs/logs-page.ts b/ui/src/pages/logs/logs-page.ts
index 2169884ad84..c20db4651a6 100644
--- a/ui/src/pages/logs/logs-page.ts
+++ b/ui/src/pages/logs/logs-page.ts
@@ -1,14 +1,20 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import {
   formatMissingOperatorReadScopeMessage,
   isMissingOperatorReadScopeError,
 } from "../../lib/gateway-errors.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import {
   DEFAULT_LOG_LEVEL_FILTERS,
   parseLogLine,
@@ -20,12 +26,14 @@ import { renderLogs } from "./view.ts";
 const LOG_BUFFER_LIMIT = 2000;
 const LOGS_POLL_INTERVAL_MS = 2000;
 
-class LogsPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
+type LogsRequestScope = {
+  gateway: ApplicationContext["gateway"];
+  client: GatewayBrowserClient;
+  generation: number;
+};
 
-  @consume({ context: applicationContext, subscribe: false })
+class LogsPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private client: GatewayBrowserClient | null = null;
@@ -46,24 +54,27 @@ class LogsPage extends LitElement {
   private logsPollInterval: ReturnType<typeof globalThis.setInterval> | null = null;
   private logsScrollFrame: number | null = null;
   private contentScrollFrame: number | null = null;
-  private stopGatewaySubscription?: () => void;
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncGatewayState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe((snapshot) => {
-      const previousClient = this.client;
-      this.syncGatewayState();
-      if (previousClient !== snapshot.client) {
-        this.resetServerState();
-      }
-      this.syncPolling();
-      this.ensureInitialLogs();
-    });
-    this.logsAtBottom = true;
-    this.syncPolling();
-    this.ensureInitialLogs();
-  }
+  private hasBoundGatewaySource = false;
+  private gatewaySource: ApplicationContext["gateway"] | null = null;
+  private requestGeneration = 0;
+  private activeRequest: LogsRequestScope | null = null;
+  private readonly subscriptions = new SubscriptionsController(this).effect(
+    () => this.context?.gateway,
+    (gateway) => {
+      const resetForSourceBind = this.hasBoundGatewaySource;
+      this.hasBoundGatewaySource = true;
+      this.gatewaySource = gateway;
+      this.requestGeneration += 1;
+      const cleanup = gateway.subscribe((snapshot) => {
+        if (this.gatewaySource === gateway && this.context.gateway === gateway) {
+          this.applyGatewaySnapshot(snapshot);
+        }
+      });
+      this.applyGatewaySnapshot(gateway.snapshot, resetForSourceBind);
+      this.logsAtBottom = true;
+      return cleanup;
+    },
+  );
 
   override firstUpdated() {
     this.resetContentScroll();
@@ -73,7 +84,7 @@ class LogsPage extends LitElement {
     });
   }
 
-  override updated(changed: Map<PropertyKey, unknown>) {
+  override updated(changed: PropertyValues) {
     if (
       this.logsAutoFollow &&
       this.logsAtBottom &&
@@ -85,8 +96,11 @@ class LogsPage extends LitElement {
 
   override disconnectedCallback() {
     this.stopPolling();
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
+    this.subscriptions.clear();
+    this.requestGeneration += 1;
+    this.activeRequest = null;
+    this.gatewaySource = null;
+    this.logsLoading = false;
     if (this.logsScrollFrame !== null) {
       cancelAnimationFrame(this.logsScrollFrame);
       this.logsScrollFrame = null;
@@ -106,10 +120,22 @@ class LogsPage extends LitElement {
     }
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    this.client = gateway.client;
-    this.connected = gateway.connected;
+  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, resetForSourceBind = false) {
+    const connectionChanged = snapshot.connected !== this.connected;
+    const clientChanged = resetForSourceBind || snapshot.client !== this.client;
+    if (clientChanged || connectionChanged) {
+      this.requestGeneration += 1;
+      this.activeRequest = null;
+    }
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
+    if (clientChanged) {
+      this.resetServerState();
+    } else if (connectionChanged) {
+      this.logsLoading = false;
+    }
+    this.syncPolling();
+    this.ensureInitialLogs();
   }
 
   private resetServerState() {
@@ -147,27 +173,60 @@ class LogsPage extends LitElement {
     if (!this.connected || !this.client || this.logsEntries.length > 0 || this.logsLoading) {
       return;
     }
-    void this.loadLogs({ reset: true }).then(() => this.scheduleScroll(true));
+    void this.loadLogs({ reset: true }).then((current) => {
+      if (current) {
+        this.scheduleScroll(true);
+      }
+    });
   }
 
-  private async loadLogs(opts?: { reset?: boolean; quiet?: boolean }) {
+  private captureRequestScope(): LogsRequestScope | null {
+    const gateway = this.gatewaySource;
     const client = this.client;
-    const quiet = opts?.quiet === true;
-    if (!client || !this.connected || (this.logsLoading && !quiet)) {
-      return;
+    if (
+      !gateway ||
+      !client ||
+      !this.connected ||
+      !this.isConnected ||
+      this.context.gateway !== gateway
+    ) {
+      return null;
     }
+    return { gateway, client, generation: this.requestGeneration };
+  }
+
+  private isRequestScopeCurrent(scope: LogsRequestScope): boolean {
+    return (
+      this.isConnected &&
+      this.gatewaySource === scope.gateway &&
+      this.context.gateway === scope.gateway &&
+      this.requestGeneration === scope.generation &&
+      this.client === scope.client &&
+      this.connected
+    );
+  }
+
+  private async loadLogs(opts?: { reset?: boolean; quiet?: boolean }): Promise<boolean> {
+    const scope = this.captureRequestScope();
+    const quiet = opts?.quiet === true;
+    if (!scope || (this.activeRequest && this.isRequestScopeCurrent(this.activeRequest))) {
+      return false;
+    }
+    this.activeRequest = scope;
+    const isCurrentOperation = () =>
+      this.activeRequest === scope && this.isRequestScopeCurrent(scope);
     if (!quiet) {
       this.logsLoading = true;
     }
     this.logsError = null;
     try {
-      const res = await client.request("logs.tail", {
+      const res = await scope.client.request("logs.tail", {
         cursor: opts?.reset ? undefined : (this.logsCursor ?? undefined),
         limit: this.logsLimit,
         maxBytes: this.logsMaxBytes,
       });
-      if (this.client !== client) {
-        return;
+      if (!isCurrentOperation()) {
+        return false;
       }
       const payload = res as {
         file?: string;
@@ -187,9 +246,10 @@ class LogsPage extends LitElement {
       this.logsCursor = typeof payload.cursor === "number" ? payload.cursor : this.logsCursor;
       this.logsFile = typeof payload.file === "string" ? payload.file : this.logsFile;
       this.logsTruncated = Boolean(payload.truncated);
+      return true;
     } catch (err) {
-      if (this.client !== client) {
-        return;
+      if (!isCurrentOperation()) {
+        return false;
       }
       if (isMissingOperatorReadScopeError(err)) {
         this.logsEntries = [];
@@ -197,9 +257,13 @@ class LogsPage extends LitElement {
       } else {
         this.logsError = String(err);
       }
+      return true;
     } finally {
-      if (this.client === client && !quiet) {
-        this.logsLoading = false;
+      if (this.activeRequest === scope) {
+        this.activeRequest = null;
+        if (this.isRequestScopeCurrent(scope) && !quiet) {
+          this.logsLoading = false;
+        }
       }
     }
   }
@@ -208,9 +272,24 @@ class LogsPage extends LitElement {
     if (this.logsScrollFrame !== null) {
       cancelAnimationFrame(this.logsScrollFrame);
     }
+    const gateway = this.gatewaySource;
+    const generation = this.requestGeneration;
+    const isCurrent = () =>
+      this.isConnected &&
+      this.connected &&
+      gateway !== null &&
+      this.gatewaySource === gateway &&
+      this.context.gateway === gateway &&
+      this.requestGeneration === generation;
     void this.updateComplete.then(() => {
+      if (!isCurrent()) {
+        return;
+      }
       this.logsScrollFrame = requestAnimationFrame(() => {
         this.logsScrollFrame = null;
+        if (!isCurrent()) {
+          return;
+        }
         const container = this.querySelector(".log-stream") as HTMLElement | null;
         if (!container) {
           return;
@@ -263,7 +342,12 @@ class LogsPage extends LitElement {
         this.logsLevelFilters = { ...this.logsLevelFilters, [level]: enabled };
       },
       onToggleAutoFollow: (next) => (this.logsAutoFollow = next),
-      onRefresh: () => void this.loadLogs({ reset: true }).then(() => this.scheduleScroll(true)),
+      onRefresh: () =>
+        void this.loadLogs({ reset: true }).then((current) => {
+          if (current) {
+            this.scheduleScroll(true);
+          }
+        }),
       onExport: (lines, label) => this.exportLogs(lines, label),
       onScroll: (event) => this.handleScroll(event),
     });
@@ -279,4 +363,6 @@ class LogsPage extends LitElement {
   }
 }
 
-customElements.define("openclaw-logs-page", LogsPage);
+if (!customElements.get("openclaw-logs-page")) {
+  customElements.define("openclaw-logs-page", LogsPage);
+}
diff --git a/ui/src/pages/nodes/nodes-page.test.ts b/ui/src/pages/nodes/nodes-page.test.ts
new file mode 100644
index 00000000000..37bee9dda10
--- /dev/null
+++ b/ui/src/pages/nodes/nodes-page.test.ts
@@ -0,0 +1,159 @@
+/* @vitest-environment jsdom */
+
+import { describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import { createInitialNodesState, loadNodes } from "../../lib/nodes/index.ts";
+import type { NodesRouteData } from "./nodes-page.ts";
+import "./nodes-page.ts";
+
+type TestNodesPage = HTMLElement & {
+  context: ApplicationContext;
+  client: GatewayBrowserClient | null;
+  connected: boolean;
+  requestGeneration: number;
+  nodesLoading: boolean;
+  nodes: Array<Record<string, unknown>>;
+  lastError: string | null;
+  chatError: string | null;
+  routeData?: NodesRouteData;
+  subscriptions: {
+    hostConnected: () => void;
+    hostUpdate: () => void;
+    hostDisconnected: () => void;
+  };
+  willUpdate: (changed: Map<PropertyKey, unknown>) => void;
+  applyGatewaySnapshot: (
+    snapshot: ApplicationGatewaySnapshot,
+    forceReset: boolean,
+    initialBind?: boolean,
+  ) => void;
+  ensureInitialData: () => void;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function gatewaySnapshot(
+  client: GatewayBrowserClient | null,
+  connected: boolean,
+): ApplicationGatewaySnapshot {
+  return {
+    client,
+    connected,
+    reconnecting: !connected,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+}
+
+function gateway(client: GatewayBrowserClient | null): ApplicationContext["gateway"] {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected: false,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  return {
+    snapshot,
+    subscribe: vi.fn(() => () => undefined),
+    subscribeEvents: vi.fn(() => () => undefined),
+  } as unknown as ApplicationContext["gateway"];
+}
+
+describe("NodesPage gateway lifecycle", () => {
+  it("preserves matching initial route data, then resets it on provider replacement", () => {
+    const client = null;
+    const currentGateway = gateway(client);
+    const preloadedNodes = [{ id: "preloaded" }];
+    const page = document.createElement("openclaw-nodes-page") as TestNodesPage;
+    page.routeData = {
+      gateway: currentGateway,
+      gatewaySnapshot: currentGateway.snapshot,
+      nodes: {
+        ...createInitialNodesState(currentGateway.snapshot),
+        nodes: preloadedNodes,
+      },
+    };
+    page.context = { gateway: currentGateway } as unknown as ApplicationContext;
+    page.willUpdate(new Map([["routeData", undefined]]));
+
+    page.subscriptions.hostConnected();
+    expect(page.client).toBeNull();
+    expect(page.nodes).toBe(preloadedNodes);
+
+    page.context = { gateway: gateway(client) } as unknown as ApplicationContext;
+    page.subscriptions.hostUpdate();
+    expect(page.nodes).toEqual([]);
+    expect(page.requestGeneration).toBeGreaterThan(0);
+
+    page.subscriptions.hostDisconnected();
+  });
+
+  it("rejects preloaded data after a same-client gateway epoch change", () => {
+    const client = {} as GatewayBrowserClient;
+    const currentGateway = gateway(client);
+    const preloadedNodes = [{ id: "stale" }];
+    const page = document.createElement("openclaw-nodes-page") as TestNodesPage;
+    page.ensureInitialData = vi.fn();
+    page.routeData = {
+      gateway: currentGateway,
+      gatewaySnapshot: gatewaySnapshot(client, false),
+      nodes: {
+        ...createInitialNodesState(gatewaySnapshot(client, true)),
+        nodes: preloadedNodes,
+      },
+    };
+    page.context = { gateway: currentGateway } as unknown as ApplicationContext;
+
+    page.willUpdate(new Map([["routeData", undefined]]));
+
+    expect(page.nodes).toEqual([]);
+    expect(page.ensureInitialData).toHaveBeenCalledOnce();
+  });
+
+  it("retries a node load after a same-client disconnect", async () => {
+    const first = deferred<{ nodes: Array<Record<string, unknown>> }>();
+    const second = deferred<{ nodes: Array<Record<string, unknown>> }>();
+    const request = vi
+      .fn<(method: string, params?: unknown) => Promise<unknown>>()
+      .mockReturnValueOnce(first.promise)
+      .mockReturnValueOnce(second.promise);
+    const client = { request } as unknown as GatewayBrowserClient;
+    const page = document.createElement("openclaw-nodes-page") as TestNodesPage;
+    page.client = client;
+    page.connected = true;
+    page.context = {
+      runtimeConfig: { state: { configSnapshot: null, configLoading: false } },
+    } as unknown as ApplicationContext;
+
+    const staleLoad = loadNodes(page);
+    page.applyGatewaySnapshot(gatewaySnapshot(client, false), false);
+    page.applyGatewaySnapshot(gatewaySnapshot(client, true), false);
+    const currentLoad = loadNodes(page);
+
+    first.resolve({ nodes: [{ id: "old" }] });
+    await staleLoad;
+    expect(page.nodes).toEqual([]);
+    expect(page.nodesLoading).toBe(true);
+
+    second.resolve({ nodes: [{ id: "new" }] });
+    await currentLoad;
+    expect(page.nodes).toEqual([{ id: "new" }]);
+    expect(page.nodesLoading).toBe(false);
+
+    page.applyGatewaySnapshot(gatewaySnapshot(client, false), false);
+  });
+});
diff --git a/ui/src/pages/nodes/nodes-page.ts b/ui/src/pages/nodes/nodes-page.ts
index 8486fbb321d..6480cd36f10 100644
--- a/ui/src/pages/nodes/nodes-page.ts
+++ b/ui/src/pages/nodes/nodes-page.ts
@@ -1,8 +1,12 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import { titleForRoute, subtitleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { hasOperatorAdminAccess } from "../../app/operator-access.ts";
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import { currentConfigObject } from "../../lib/config/index.ts";
@@ -24,26 +28,28 @@ import {
   type ExecApprovalsTarget,
   type NodesPageDataState,
 } from "../../lib/nodes/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderNodes } from "./view.ts";
 
 export type NodesRouteData = {
+  // Client identity alone cannot distinguish provider replacement or reconnect epochs.
+  gateway: ApplicationContext["gateway"];
+  gatewaySnapshot: ApplicationGatewaySnapshot;
   nodes: NodesPageDataState;
 };
 
 const NODES_ACTIVE_POLL_INTERVAL_MS = 30_000;
 
-class NodesPage extends LitElement implements NodesPageDataState {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class NodesPage extends OpenClawLightDomElement implements NodesPageDataState {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @property({ attribute: false }) routeData?: NodesRouteData;
 
   @state() client: NodesPageDataState["client"] = null;
   @state() connected = false;
+  requestGeneration = 0;
   @state() nodesLoading = false;
   @state() nodes: Array<Record<string, unknown>> = [];
   @state() lastError: string | null = null;
@@ -62,40 +68,51 @@ class NodesPage extends LitElement implements NodesPageDataState {
   @state() private execApprovalsTargetNodeId: string | null = null;
 
   private routeDataInitialized = false;
-  private stopGatewaySubscription?: () => void;
-  private stopGatewayEvents?: () => void;
-  private stopConfigSubscription?: () => void;
+  private hasBoundGateway = false;
+  private gatewaySource: ApplicationContext["gateway"] | null = null;
   private nodesPollInterval: ReturnType<typeof globalThis.setInterval> | null = null;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .watch(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig, notify) => runtimeConfig.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const initialBind = !this.hasBoundGateway;
+        this.hasBoundGateway = true;
+        this.gatewaySource = gateway;
+        this.applyGatewaySnapshot(gateway.snapshot, !initialBind, initialBind);
+        const stop = gateway.subscribe((snapshot) => {
+          if (this.gatewaySource === gateway) {
+            this.applyGatewaySnapshot(snapshot, false);
+          }
+        });
+        return () => {
+          stop();
+          if (this.gatewaySource === gateway) {
+            this.gatewaySource = null;
+          }
+        };
+      },
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) =>
+        gateway.subscribeEvents((event) => {
+          if (event.event === "device.pair.requested" || event.event === "device.pair.resolved") {
+            void loadDevices(this, { quiet: true });
+          }
+        }),
+    );
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncGatewayState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe((snapshot) => {
-      const previousClient = this.client;
-      this.syncGatewayState();
-      if (previousClient !== snapshot.client || !snapshot.connected) {
-        this.resetServerState();
-      }
-      this.syncPolling();
-      this.ensureInitialData();
-    });
-    this.stopGatewayEvents = this.context.gateway.subscribeEvents((event) => {
-      if (event.event === "device.pair.requested" || event.event === "device.pair.resolved") {
-        void loadDevices(this, { quiet: true });
-      }
-    });
-    this.stopConfigSubscription = this.context.runtimeConfig.subscribe(() => this.requestUpdate());
-    this.syncPolling();
-    this.ensureInitialData();
-  }
-
-  override willUpdate(changed: Map<PropertyKey, unknown>) {
+  override willUpdate(changed: PropertyValues<this>) {
     if (changed.has("routeData")) {
       this.applyRouteData();
     }
   }
 
-  override updated(changed: Map<PropertyKey, unknown>) {
+  override updated(changed: PropertyValues<this>) {
     if (changed.has("routeData")) {
       this.ensureInitialData();
     }
@@ -103,20 +120,36 @@ class NodesPage extends LitElement implements NodesPageDataState {
 
   override disconnectedCallback() {
     this.stopPolling();
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopGatewayEvents?.();
-    this.stopGatewayEvents = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
+    this.subscriptions.clear();
+    this.requestGeneration += 1;
+    this.client = null;
+    this.connected = false;
+    this.canPairDevice = false;
     super.disconnectedCallback();
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    this.client = gateway.client;
-    this.connected = gateway.connected;
-    this.canPairDevice = gateway.connected && hasOperatorAdminAccess(gateway.hello?.auth ?? null);
+  private applyGatewaySnapshot(
+    snapshot: ApplicationGatewaySnapshot,
+    forceReset: boolean,
+    initialBind = false,
+  ) {
+    const clientChanged = this.client !== snapshot.client;
+    const connectionChanged = this.connected !== snapshot.connected;
+    if (forceReset || clientChanged || connectionChanged || !snapshot.connected) {
+      this.requestGeneration += 1;
+    }
+    this.syncGatewayState(snapshot);
+    if (forceReset || (!initialBind && (clientChanged || !snapshot.connected))) {
+      this.resetServerState(snapshot);
+    }
+    this.syncPolling();
+    this.ensureInitialData();
+  }
+
+  private syncGatewayState(snapshot: ApplicationGatewaySnapshot) {
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
+    this.canPairDevice = snapshot.connected && hasOperatorAdminAccess(snapshot.hello?.auth ?? null);
   }
 
   private applyRouteData() {
@@ -125,13 +158,15 @@ class NodesPage extends LitElement implements NodesPageDataState {
       return;
     }
     this.routeDataInitialized = true;
-    const gateway = this.context.gateway.snapshot;
-    if (data.nodes.client !== gateway.client) {
-      this.syncGatewayState();
+    const gateway = this.context.gateway;
+    const snapshot = gateway.snapshot;
+    if (data.gateway !== gateway || data.gatewaySnapshot !== snapshot) {
+      this.resetServerState(snapshot);
+      this.ensureInitialData();
       return;
     }
-    this.client = gateway.client;
-    this.connected = gateway.connected;
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
     this.nodesLoading = data.nodes.nodesLoading;
     this.nodes = data.nodes.nodes;
     this.lastError = data.nodes.lastError;
@@ -147,8 +182,8 @@ class NodesPage extends LitElement implements NodesPageDataState {
     this.execApprovalsSelectedAgent = data.nodes.execApprovalsSelectedAgent;
   }
 
-  private resetServerState() {
-    const next = createInitialNodesState(this.context.gateway.snapshot);
+  private resetServerState(snapshot: ApplicationGatewaySnapshot) {
+    const next = createInitialNodesState(snapshot);
     this.nodesLoading = next.nodesLoading;
     this.nodes = next.nodes;
     this.lastError = next.lastError;
diff --git a/ui/src/pages/nodes/route.ts b/ui/src/pages/nodes/route.ts
index 37b9f6929a5..66b09e224d7 100644
--- a/ui/src/pages/nodes/route.ts
+++ b/ui/src/pages/nodes/route.ts
@@ -10,10 +10,11 @@ import {
 import type { NodesRouteData } from "./nodes-page.ts";
 
 async function loadNodesRouteData(context: ApplicationContext): Promise<NodesRouteData> {
-  const gateway = context.gateway.snapshot;
-  const nodes = createInitialNodesState(gateway);
-  if (!gateway.connected || !gateway.client) {
-    return { nodes };
+  const gateway = context.gateway;
+  const gatewaySnapshot = gateway.snapshot;
+  const nodes = createInitialNodesState(gatewaySnapshot);
+  if (!gatewaySnapshot.connected || !gatewaySnapshot.client) {
+    return { gateway, gatewaySnapshot, nodes };
   }
   await Promise.all([
     loadNodes(nodes),
@@ -23,7 +24,7 @@ async function loadNodesRouteData(context: ApplicationContext): Promise<NodesRou
       loadExecApprovals(nodes),
     ]),
   ]);
-  return { nodes };
+  return { gateway, gatewaySnapshot, nodes };
 }
 
 export const page = definePage({
diff --git a/ui/src/pages/overview/overview-page.test.ts b/ui/src/pages/overview/overview-page.test.ts
new file mode 100644
index 00000000000..c319a4e500b
--- /dev/null
+++ b/ui/src/pages/overview/overview-page.test.ts
@@ -0,0 +1,175 @@
+/* @vitest-environment jsdom */
+
+import { nothing } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import "./overview-page.ts";
+
+type OverviewRefreshScope = {
+  context: ApplicationContext;
+  gateway: ApplicationContext["gateway"];
+  epoch: number;
+  client: GatewayBrowserClient;
+};
+
+type TestOverviewPage = HTMLElement & {
+  context: ApplicationContext;
+  usageResult: unknown;
+  overviewLogLines: string[];
+  showGatewayToken: boolean;
+  showGatewayPassword: boolean;
+  refreshPromise: Promise<void> | null;
+  captureRefreshScope: () => OverviewRefreshScope | null;
+  loadLogs: (scope: OverviewRefreshScope) => Promise<void>;
+  refreshOverview: (force: boolean) => Promise<void>;
+  render: () => unknown;
+  requestUpdate: () => void;
+  readonly updateComplete: Promise<boolean>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function contextWithGateway(
+  client: GatewayBrowserClient,
+  connected: boolean,
+): { context: ApplicationContext; snapshot: ApplicationGatewaySnapshot } {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const subscribe = () => () => undefined;
+  const context = {
+    gateway: {
+      snapshot,
+      connection: { gatewayUrl: "ws://gateway", token: "token", password: "password" },
+      eventLog: [],
+      subscribe,
+      subscribeEventLog: subscribe,
+    },
+    channels: {
+      state: { channelsSnapshot: null, channelsLastSuccess: null },
+      refresh: vi.fn(async () => undefined),
+      subscribe,
+    },
+    sessions: {
+      state: { result: null },
+      refresh: vi.fn(async () => undefined),
+      subscribe,
+    },
+  } as unknown as ApplicationContext;
+  return { context, snapshot };
+}
+
+function createPage(context: ApplicationContext): TestOverviewPage {
+  const page = document.createElement("openclaw-overview-page") as TestOverviewPage;
+  page.context = context;
+  page.render = () => nothing;
+  return page;
+}
+
+async function replaceContext(page: TestOverviewPage, context: ApplicationContext) {
+  page.context = context;
+  page.requestUpdate();
+  await page.updateComplete;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("OverviewPage gateway lifecycle", () => {
+  it("clears provider data and secret reveals when the gateway source changes", async () => {
+    const client = {} as GatewayBrowserClient;
+    const page = createPage(contextWithGateway(client, false).context);
+    document.body.append(page);
+    await page.updateComplete;
+    page.usageResult = { sessions: [{ key: "old" }] };
+    page.overviewLogLines = ["old provider"];
+    page.showGatewayToken = true;
+    page.showGatewayPassword = true;
+
+    await replaceContext(page, contextWithGateway(client, false).context);
+
+    expect(page.usageResult).toBeNull();
+    expect(page.overviewLogLines).toEqual([]);
+    expect(page.showGatewayToken).toBe(false);
+    expect(page.showGatewayPassword).toBe(false);
+
+    page.showGatewayToken = true;
+    page.showGatewayPassword = true;
+    page.remove();
+
+    expect(page.showGatewayToken).toBe(false);
+    expect(page.showGatewayPassword).toBe(false);
+  });
+
+  it("discards a log response from a replaced gateway source", async () => {
+    const pending = deferred<{ cursor: number; lines: string[]; reset: boolean }>();
+    const client = {
+      request: vi.fn(() => pending.promise),
+    } as unknown as GatewayBrowserClient;
+    const first = contextWithGateway(client, false);
+    const page = createPage(first.context);
+    document.body.append(page);
+    await page.updateComplete;
+    first.snapshot.connected = true;
+    const scope = page.captureRefreshScope();
+    expect(scope).not.toBeNull();
+
+    const load = page.loadLogs(scope as OverviewRefreshScope);
+    await replaceContext(page, contextWithGateway(client, false).context);
+    pending.resolve({ cursor: 10, lines: ["stale"], reset: true });
+    await load;
+
+    expect(page.overviewLogLines).toEqual([]);
+  });
+
+  it("does not let a stale refresh finally clear the replacement refresh", async () => {
+    const logs = deferred<{ cursor: number; lines: string[]; reset: boolean }>();
+    const request = vi.fn((method: string) => {
+      if (method === "logs.tail") {
+        return logs.promise;
+      }
+      if (method === "cron.list") {
+        return Promise.resolve({ jobs: [] });
+      }
+      if (method === "models.authStatus") {
+        return Promise.resolve({ ts: 0, providers: [] });
+      }
+      if (method === "skills.status") {
+        return Promise.resolve({ skills: [] });
+      }
+      return Promise.resolve({});
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const first = contextWithGateway(client, false);
+    const page = createPage(first.context);
+    document.body.append(page);
+    await page.updateComplete;
+    first.snapshot.connected = true;
+
+    const staleRefresh = page.refreshOverview(false);
+    expect(page.refreshPromise).not.toBeNull();
+    await replaceContext(page, contextWithGateway(client, false).context);
+    const replacementRefresh = deferred<void>().promise;
+    page.refreshPromise = replacementRefresh;
+    logs.resolve({ cursor: 10, lines: ["stale"], reset: true });
+    await staleRefresh;
+
+    expect(page.refreshPromise).toBe(replacementRefresh);
+  });
+});
diff --git a/ui/src/pages/overview/overview-page.ts b/ui/src/pages/overview/overview-page.ts
index 11ba056a9ce..d99b1830ba4 100644
--- a/ui/src/pages/overview/overview-page.ts
+++ b/ui/src/pages/overview/overview-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type {
@@ -10,7 +10,11 @@ import type {
 } from "../../api/types.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
 import { isRouteId } from "../../app-route-paths.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGateway,
+} from "../../app/context.ts";
 import { hasOperatorReadAccess } from "../../app/operator-access.ts";
 import {
   loadGatewaySessionSelection,
@@ -18,12 +22,14 @@ import {
   patchSettings,
   type UiSettings,
 } from "../../app/settings.ts";
-import { I18nController, t } from "../../i18n/index.ts";
+import { t } from "../../i18n/index.ts";
 import { isCronJobActiveFailure } from "../../lib/cron-status.ts";
 import { createInitialCronState, loadCronJobsPage, loadCronStatus } from "../../lib/cron/index.ts";
 import { isMonitoredAuthProvider, loadModelAuthStatus } from "../../lib/model-auth.ts";
 import { requestSessionUsage } from "../../lib/sessions/index.ts";
 import { loadSkillStatusReport } from "../../lib/skills/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderOverview } from "./view.ts";
 
 function localDateString(): string {
@@ -56,14 +62,15 @@ function addNamedAttention(
   }
 }
 
-class OverviewPage extends LitElement {
-  readonly i18nController = new I18nController(this);
+type OverviewRefreshScope = {
+  context: ApplicationContext;
+  gateway: ApplicationGateway;
+  epoch: number;
+  client: GatewayBrowserClient;
+};
 
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class OverviewPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private settings: UiSettings = loadSettings();
@@ -78,38 +85,80 @@ class OverviewPage extends LitElement {
 
   private overviewLogCursor: number | null = null;
   private refreshPromise: Promise<void> | null = null;
-  private subscriptions: Array<() => void> = [];
   private sessionKeyDirty = false;
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.resetServerState();
-    this.subscriptions = [
-      this.context.gateway.subscribe((snapshot) => {
-        if (this.cron.client !== snapshot.client) {
-          this.resetServerState();
-        }
-        this.requestUpdate();
+  private gatewaySource: ApplicationGateway | null = null;
+  private gatewayEpoch = 0;
+  private gatewayConnected = false;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        this.gatewaySource = gateway;
+        this.gatewayEpoch += 1;
+        this.gatewayConnected = gateway.snapshot.connected;
+        this.resetServerState(gateway);
+        return gateway.subscribe((snapshot) => {
+          if (!this.isGatewaySourceCurrent(gateway)) {
+            return;
+          }
+          const clientChanged = this.cron.client !== snapshot.client;
+          const connectionChanged = this.gatewayConnected !== snapshot.connected;
+          if (clientChanged || connectionChanged) {
+            this.gatewayEpoch += 1;
+            this.refreshPromise = null;
+          }
+          this.gatewayConnected = snapshot.connected;
+          if (clientChanged) {
+            this.resetServerState(gateway);
+          } else if (!snapshot.connected) {
+            this.resetSensitiveUi();
+          }
+          this.requestUpdate();
+          this.ensureInitialData();
+        });
+      },
+    )
+    .watch(
+      () => this.context?.channels,
+      (channels, notify) => channels.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.sessions,
+      (sessions, notify) => sessions.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const cleanup = gateway.subscribeEventLog(() => {
+          if (this.isGatewaySourceCurrent(gateway)) {
+            this.requestUpdate();
+          }
+        });
         this.ensureInitialData();
-      }),
-      this.context.channels.subscribe(() => this.requestUpdate()),
-      this.context.sessions.subscribe(() => this.requestUpdate()),
-      this.context.gateway.subscribeEventLog(() => this.requestUpdate()),
-    ];
-    this.ensureInitialData();
-  }
+        return cleanup;
+      },
+    );
 
   override disconnectedCallback() {
-    for (const unsubscribe of this.subscriptions) {
-      unsubscribe();
-    }
-    this.subscriptions = [];
+    this.subscriptions.clear();
+    this.gatewayEpoch += 1;
+    this.gatewaySource = null;
+    this.gatewayConnected = false;
     this.refreshPromise = null;
+    this.resetSensitiveUi();
     super.disconnectedCallback();
   }
 
-  private resetServerState() {
-    const gateway = this.context.gateway;
+  private isGatewaySourceCurrent(gateway: ApplicationGateway): boolean {
+    return this.isConnected && this.gatewaySource === gateway && this.context.gateway === gateway;
+  }
+
+  private resetSensitiveUi() {
+    this.showGatewayToken = false;
+    this.showGatewayPassword = false;
+  }
+
+  private resetServerState(gateway = this.context.gateway) {
     const sessionKey = gateway.snapshot.sessionKey;
     this.settings = {
       ...loadSettings(),
@@ -127,38 +176,59 @@ class OverviewPage extends LitElement {
     this.overviewLogCursor = null;
     this.refreshPromise = null;
     this.sessionKeyDirty = false;
+    this.resetSensitiveUi();
   }
 
   private ensureInitialData() {
-    const gateway = this.context.gateway.snapshot;
-    if (!gateway.connected || !gateway.client || this.refreshPromise) {
+    if (!this.captureRefreshScope() || this.refreshPromise) {
       return;
     }
     void this.refreshOverview(false);
   }
 
-  private isCurrentClient(client: GatewayBrowserClient): boolean {
-    const gateway = this.context.gateway.snapshot;
-    return gateway.connected && gateway.client === client && this.isConnected;
+  private captureRefreshScope(): OverviewRefreshScope | null {
+    const context = this.context;
+    const gateway = this.gatewaySource;
+    if (!gateway || context.gateway !== gateway) {
+      return null;
+    }
+    const snapshot = gateway.snapshot;
+    if (!snapshot.connected || !snapshot.client) {
+      return null;
+    }
+    return { context, gateway, epoch: this.gatewayEpoch, client: snapshot.client };
+  }
+
+  private isRefreshScopeCurrent(scope: OverviewRefreshScope): boolean {
+    const snapshot = scope.gateway.snapshot;
+    return (
+      this.isConnected &&
+      this.context === scope.context &&
+      this.gatewaySource === scope.gateway &&
+      this.gatewayEpoch === scope.epoch &&
+      this.context.gateway === scope.gateway &&
+      snapshot.connected &&
+      snapshot.client === scope.client
+    );
   }
 
   private async applyRequest<T>(
-    client: GatewayBrowserClient,
+    scope: OverviewRefreshScope,
     request: Promise<T>,
     apply: (value: T) => void,
   ) {
     const value = await request;
-    if (this.isCurrentClient(client)) {
+    if (this.isRefreshScopeCurrent(scope)) {
       apply(value);
     }
   }
 
   private async refreshOverview(force: boolean) {
-    const context = this.context;
-    const client = context.gateway.snapshot.client;
-    if (!client || !context.gateway.snapshot.connected || this.refreshPromise) {
+    const scope = this.captureRefreshScope();
+    if (!scope || this.refreshPromise) {
       return;
     }
+    const { client, context } = scope;
 
     const channelRefresh =
       force || !context.channels.state.channelsSnapshot
@@ -170,12 +240,12 @@ class OverviewPage extends LitElement {
       channelRefresh,
       context.sessions.refresh(force ? { force: true } : undefined),
       Promise.all([loadCronStatus(cron), loadCronJobsPage(cron)]).then(() => {
-        if (this.isCurrentClient(client)) {
+        if (this.isRefreshScopeCurrent(scope)) {
           this.cron = cron;
         }
       }),
       this.applyRequest(
-        client,
+        scope,
         requestSessionUsage(client, {
           startDate: date,
           endDate: date,
@@ -184,30 +254,31 @@ class OverviewPage extends LitElement {
         }),
         (result) => (this.usageResult = result),
       ),
-      this.applyRequest(client, loadSkillStatusReport(client, null), (report) => {
+      this.applyRequest(scope, loadSkillStatusReport(client, null), (report) => {
         this.skillsReport = report ?? null;
       }),
       this.applyRequest(
-        client,
+        scope,
         loadModelAuthStatus(client, { refresh: force }).catch(() => ({
           ts: 0,
           providers: [],
         })),
         (result) => (this.modelAuthStatus = result),
       ),
-      this.loadLogs(client),
+      this.loadLogs(scope),
     ]).then(() => undefined);
     this.refreshPromise = refresh;
     try {
       await refresh;
     } finally {
-      if (this.refreshPromise === refresh) {
+      if (this.isRefreshScopeCurrent(scope) && this.refreshPromise === refresh) {
         this.refreshPromise = null;
       }
     }
   }
 
-  private async loadLogs(client: GatewayBrowserClient) {
+  private async loadLogs(scope: OverviewRefreshScope) {
+    const { client } = scope;
     try {
       const response = await client.request<{
         cursor?: number;
@@ -218,7 +289,7 @@ class OverviewPage extends LitElement {
         limit: 100,
         maxBytes: 50_000,
       });
-      if (!this.isCurrentClient(client)) {
+      if (!this.isRefreshScopeCurrent(scope)) {
         return;
       }
       const lines = Array.isArray(response.lines)
diff --git a/ui/src/pages/plugin/plugin-page.test.ts b/ui/src/pages/plugin/plugin-page.test.ts
index 5032a96a99c..cd6f41dd62f 100644
--- a/ui/src/pages/plugin/plugin-page.test.ts
+++ b/ui/src/pages/plugin/plugin-page.test.ts
@@ -10,6 +10,10 @@ type TestBundledView = {
   stop: (host: object) => void;
 };
 
+function bundledViewHost(page: PluginPage): object {
+  return (page as unknown as { bundledViewHost: object }).bundledViewHost;
+}
+
 function deferred<T>() {
   let resolve!: (value: T) => void;
   const promise = new Promise<T>((resolvePromise) => {
@@ -19,10 +23,10 @@ function deferred<T>() {
 }
 
 class DeferredPluginPage extends PluginPage {
-  loads = new Map<string, Promise<TestBundledView>>();
+  loads = new Map<string, Promise<TestBundledView>[]>();
 
   protected override loadBundledView(key: string): Promise<TestBundledView> {
-    const load = this.loads.get(key);
+    const load = this.loads.get(key)?.shift();
     if (!load) {
       throw new Error(`Unexpected bundled view load: ${key}`);
     }
@@ -90,21 +94,198 @@ describe("PluginPage", () => {
     document.body.append(page);
     try {
       await vi.waitFor(() => {
-        expect(getLogbookState(page).pollTimer).not.toBeNull();
+        expect(getLogbookState(bundledViewHost(page)).pollTimer).not.toBeNull();
       });
+      const previousHost = bundledViewHost(page);
 
       hello.controlUiTabs = [];
       page.requestUpdate();
       await page.updateComplete;
 
-      expect(getLogbookState(page).pollTimer).toBeNull();
+      expect(bundledViewHost(page)).not.toBe(previousHost);
+      expect(getLogbookState(previousHost).pollTimer).toBeNull();
     } finally {
       page.remove();
     }
   });
 
-  it("does not install a stale bundled view after switching tabs", async () => {
-    const codexLoad = deferred<TestBundledView>();
+  it("drops bundled view state and reloads immediately when the gateway source changes", async () => {
+    const hello: GatewayHelloOk = {
+      type: "hello-ok",
+      protocol: 3,
+      auth: { role: "operator", scopes: ["operator.write"] },
+      controlUiTabs: [{ pluginId: "logbook", id: "logbook", label: "Logbook" }],
+    };
+    const responseFor = (method: string) => {
+      if (method === "logbook.status") {
+        return {
+          captureEnabled: true,
+          capturePaused: false,
+          captureIntervalSeconds: 30,
+          analysisIntervalMinutes: 15,
+          retentionDays: 30,
+          pendingFrames: 0,
+          analysisRunning: false,
+          visionModelSource: "missing",
+          today: "2026-07-05",
+          todayCards: 0,
+          timeZone: "UTC",
+        };
+      }
+      if (method === "logbook.days") {
+        return { days: [] };
+      }
+      return {
+        day: "2026-07-05",
+        cards: [],
+        stats: { trackedMs: 0, distractionMs: 0, categories: [], apps: [] },
+      };
+    };
+    const firstRequest = vi.fn(async (method: string) => responseFor(method));
+    const secondRequest = vi.fn(async (method: string) => responseFor(method));
+    const createContext = (request: typeof firstRequest) => {
+      const snapshot: ApplicationGatewaySnapshot = {
+        client: { request } as unknown as GatewayBrowserClient,
+        connected: true,
+        reconnecting: false,
+        hello,
+        assistantAgentId: null,
+        sessionKey: "main",
+        lastError: null,
+        lastErrorCode: null,
+      };
+      return {
+        gateway: { snapshot, subscribe: () => () => undefined },
+      } as unknown as ApplicationContext<RouteId>;
+    };
+    const page = new PluginPage();
+    page.pluginId = "logbook";
+    page.tabId = "logbook";
+    (page as unknown as { context: ApplicationContext<RouteId> }).context =
+      createContext(firstRequest);
+    document.body.append(page);
+    try {
+      await vi.waitFor(() => expect(firstRequest).toHaveBeenCalled());
+      const firstHost = bundledViewHost(page);
+      expect(getLogbookState(firstHost).pollTimer).not.toBeNull();
+
+      (page as unknown as { context: ApplicationContext<RouteId> }).context =
+        createContext(secondRequest);
+      page.requestUpdate();
+      await page.updateComplete;
+
+      await vi.waitFor(() => expect(secondRequest).toHaveBeenCalledWith("logbook.status", {}));
+      expect(bundledViewHost(page)).not.toBe(firstHost);
+      expect(getLogbookState(firstHost).pollTimer).toBeNull();
+    } finally {
+      page.remove();
+    }
+  });
+
+  it("isolates an in-flight bundled load across a same-client reconnect", async () => {
+    const hello: GatewayHelloOk = {
+      type: "hello-ok",
+      protocol: 3,
+      auth: { role: "operator", scopes: ["operator.write"] },
+      controlUiTabs: [{ pluginId: "logbook", id: "logbook", label: "Logbook" }],
+    };
+    const staleStatus = deferred<unknown>();
+    const staleDays = deferred<unknown>();
+    const staleTimeline = deferred<unknown>();
+    const pending = new Map([
+      ["logbook.status", staleStatus],
+      ["logbook.days", staleDays],
+      ["logbook.timeline", staleTimeline],
+    ]);
+    const responseFor = (method: string) => {
+      if (method === "logbook.status") {
+        return {
+          captureEnabled: true,
+          capturePaused: false,
+          captureIntervalSeconds: 30,
+          analysisIntervalMinutes: 15,
+          retentionDays: 30,
+          pendingFrames: 0,
+          analysisRunning: false,
+          visionModelSource: "missing",
+          today: "2026-07-05",
+          todayCards: 0,
+          timeZone: "UTC",
+        };
+      }
+      if (method === "logbook.days") {
+        return { days: [] };
+      }
+      return {
+        day: "2026-07-05",
+        cards: [],
+        stats: { trackedMs: 0, distractionMs: 0, categories: [], apps: [] },
+      };
+    };
+    const request = vi.fn((method: string) => {
+      const deferredResponse = pending.get(method);
+      return deferredResponse ? deferredResponse.promise : Promise.resolve(responseFor(method));
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const snapshot: ApplicationGatewaySnapshot = {
+      client,
+      connected: true,
+      reconnecting: false,
+      hello,
+      assistantAgentId: null,
+      sessionKey: "main",
+      lastError: null,
+      lastErrorCode: null,
+    };
+    let listener: ((snapshot: ApplicationGatewaySnapshot) => void) | undefined;
+    const gateway = {
+      snapshot,
+      subscribe(next: (snapshot: ApplicationGatewaySnapshot) => void) {
+        listener = next;
+        return () => {
+          if (listener === next) {
+            listener = undefined;
+          }
+        };
+      },
+    } as unknown as ApplicationContext<RouteId>["gateway"];
+    const page = new PluginPage();
+    page.pluginId = "logbook";
+    page.tabId = "logbook";
+    (page as unknown as { context: ApplicationContext<RouteId> }).context = {
+      gateway,
+    } as unknown as ApplicationContext<RouteId>;
+    document.body.append(page);
+    try {
+      await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(3));
+      const staleHost = bundledViewHost(page);
+
+      snapshot.connected = false;
+      listener?.(snapshot);
+      await page.updateComplete;
+      const disconnectedHost = bundledViewHost(page);
+      expect(disconnectedHost).not.toBe(staleHost);
+
+      pending.clear();
+      staleStatus.resolve(responseFor("logbook.status"));
+      staleDays.resolve(responseFor("logbook.days"));
+      staleTimeline.resolve(responseFor("logbook.timeline"));
+      await vi.waitFor(() => expect(getLogbookState(staleHost).timeline).not.toBeNull());
+      expect(getLogbookState(disconnectedHost).timeline).toBeNull();
+
+      snapshot.connected = true;
+      listener?.(snapshot);
+      await page.updateComplete;
+      expect(bundledViewHost(page)).not.toBe(disconnectedHost);
+      await vi.waitFor(() => expect(getLogbookState(bundledViewHost(page)).status).not.toBeNull());
+    } finally {
+      page.remove();
+    }
+  });
+
+  it("does not install an earlier bundled view after switching away and back", async () => {
+    const firstCodexLoad = deferred<TestBundledView>();
+    const currentCodexLoad = deferred<TestBundledView>();
     const logbookLoad = deferred<TestBundledView>();
     const hello: GatewayHelloOk = {
       type: "hello-ok",
@@ -127,8 +308,8 @@ describe("PluginPage", () => {
     };
     const page = document.createElement(deferredPluginPageTag) as DeferredPluginPage;
     page.loads = new Map([
-      ["codex-supervisor/sessions", codexLoad.promise],
-      ["logbook/logbook", logbookLoad.promise],
+      ["codex-supervisor/sessions", [firstCodexLoad.promise, currentCodexLoad.promise]],
+      ["logbook/logbook", [logbookLoad.promise]],
     ]);
     page.pluginId = "codex-supervisor";
     page.tabId = "sessions";
@@ -142,14 +323,19 @@ describe("PluginPage", () => {
       page.pluginId = "logbook";
       page.tabId = "logbook";
       await page.updateComplete;
+      page.pluginId = "codex-supervisor";
+      page.tabId = "sessions";
+      await page.updateComplete;
 
-      codexLoad.resolve({ render: () => "stale Codex view", stop: vi.fn() });
+      currentCodexLoad.resolve({ render: () => "current Codex view", stop: vi.fn() });
+      await vi.waitFor(() => expect(page.textContent).toContain("current Codex view"));
+
+      firstCodexLoad.resolve({ render: () => "stale Codex view", stop: vi.fn() });
       await Promise.resolve();
       await page.updateComplete;
       expect(page.textContent).not.toContain("stale Codex view");
-
-      logbookLoad.resolve({ render: () => "current Logbook view", stop: vi.fn() });
-      await vi.waitFor(() => expect(page.textContent).toContain("current Logbook view"));
+      expect(page.textContent).toContain("current Codex view");
+      logbookLoad.resolve({ render: () => "stale Logbook view", stop: vi.fn() });
     } finally {
       page.remove();
     }
diff --git a/ui/src/pages/plugin/plugin-page.ts b/ui/src/pages/plugin/plugin-page.ts
index 01967d42307..3fc74227052 100644
--- a/ui/src/pages/plugin/plugin-page.ts
+++ b/ui/src/pages/plugin/plugin-page.ts
@@ -1,11 +1,13 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property, state } from "lit/decorators.js";
 import type { GatewayBrowserClient, GatewayControlUiPluginTab } from "../../api/gateway.ts";
 import type { RouteId } from "../../app-route-paths.ts";
 import { applicationContext, type ApplicationContext } from "../../app/context.ts";
 import { t } from "../../i18n/index.ts";
 import { resolveEmbedSandbox } from "../../lib/chat/tool-display.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { pluginTabKey } from "./route.ts";
 
 /**
@@ -41,32 +43,34 @@ const BUNDLED_TAB_VIEWS: Record<string, () => Promise<BundledPluginTabView>> = {
   },
 };
 
-export class PluginPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
+export class PluginPage extends OpenClawLightDomElement {
   @property({ attribute: false }) pluginId = "";
   @property({ attribute: false }) tabId = "";
 
-  @consume({ context: applicationContext, subscribe: false })
+  @consume({ context: applicationContext, subscribe: true })
   private context?: ApplicationContext<RouteId>;
 
   @state() private bundledView: BundledPluginTabView | null = null;
 
   private bundledViewId: string | null = null;
   private bundledViewLoadToken: object | null = null;
-  private stopGatewaySubscription: (() => void) | undefined;
+  private bundledViewHost: object = {};
+  private gatewaySource?: ApplicationContext<RouteId>["gateway"];
+  private gatewayClient: GatewayBrowserClient | null = null;
+  private gatewayConnected = false;
+  private readonly subscriptions = new SubscriptionsController(this).watch(
+    () => this.context?.gateway,
+    (gateway, notify) => gateway.subscribe(notify),
+    (gateway) => this.updateGatewaySource(gateway),
+  );
 
   override connectedCallback() {
     super.connectedCallback();
     this.style.display = "contents";
-    this.stopGatewaySubscription ??= this.context?.gateway.subscribe(() => this.requestUpdate());
   }
 
   override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
+    this.subscriptions.clear();
     this.stopBundledView();
     super.disconnectedCallback();
   }
@@ -80,6 +84,9 @@ export class PluginPage extends LitElement {
   }
 
   override willUpdate() {
+    if (!this.isConnected) {
+      return;
+    }
     const key = this.tabKey();
     const hasBundledDescriptor = this.tabInfo() !== undefined && key in BUNDLED_TAB_VIEWS;
     // Switching between plugin tabs reuses this element; the previous bundled
@@ -105,12 +112,34 @@ export class PluginPage extends LitElement {
   }
 
   private stopBundledView() {
-    this.bundledView?.stop(this);
+    this.replaceBundledViewHost();
     this.bundledView = null;
     this.bundledViewId = null;
     this.bundledViewLoadToken = null;
   }
 
+  private replaceBundledViewHost() {
+    this.bundledView?.stop(this.bundledViewHost);
+    // Async controller work is keyed by host. A new host makes every completion
+    // from the retired connection epoch unreachable without coupling plugins to Lit.
+    this.bundledViewHost = {};
+  }
+
+  private updateGatewaySource(gateway: ApplicationContext<RouteId>["gateway"]) {
+    const { client, connected } = gateway.snapshot;
+    if (
+      this.gatewaySource === gateway &&
+      this.gatewayClient === client &&
+      this.gatewayConnected === connected
+    ) {
+      return;
+    }
+    this.replaceBundledViewHost();
+    this.gatewaySource = gateway;
+    this.gatewayClient = client;
+    this.gatewayConnected = connected;
+  }
+
   private tabInfo(): GatewayControlUiPluginTab | undefined {
     const tabs = this.context?.gateway.snapshot.hello?.controlUiTabs ?? [];
     return tabs.find((tab) => tab.pluginId === this.pluginId && tab.id === this.tabId);
@@ -130,7 +159,7 @@ export class PluginPage extends LitElement {
       }
       const snapshot = context.gateway.snapshot;
       return this.bundledView.render({
-        host: this,
+        host: this.bundledViewHost,
         client: snapshot.client,
         connected: snapshot.connected,
         onRequestUpdate: () => this.requestUpdate(),
diff --git a/ui/src/pages/route-provenance.test.ts b/ui/src/pages/route-provenance.test.ts
new file mode 100644
index 00000000000..b424dec8503
--- /dev/null
+++ b/ui/src/pages/route-provenance.test.ts
@@ -0,0 +1,184 @@
+import type { RouteLoaderOptions } from "@openclaw/uirouter";
+import { describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../app/context.ts";
+import type { AgentsRouteData } from "./agents/agents-page.ts";
+import { page as agentsPage } from "./agents/route.ts";
+import type { DreamsRouteData } from "./dreams/dreams-page.ts";
+import { page as dreamsPage } from "./dreams/route.ts";
+import type { NodesRouteData } from "./nodes/nodes-page.ts";
+import { page as nodesPage } from "./nodes/route.ts";
+import { page as sessionsPage } from "./sessions/route.ts";
+import type { SessionsRouteData } from "./sessions/sessions-page.ts";
+import { page as skillsPage } from "./skills/route.ts";
+import type { SkillsRouteData } from "./skills/skills-page.ts";
+import { page as usagePage } from "./usage/route.ts";
+import type { UsageRouteData } from "./usage/usage-page.ts";
+
+type RouteWithLoader = {
+  loader?: (context: ApplicationContext, options: RouteLoaderOptions) => unknown;
+};
+
+const loaderOptions: RouteLoaderOptions = {
+  signal: new AbortController().signal,
+  shouldRun: () => true,
+  revalidating: false,
+  location: { pathname: "/", search: "", hash: "" },
+  deps: "",
+  cause: "preload",
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function snapshot(
+  client: GatewayBrowserClient | null,
+  connected: boolean,
+): ApplicationGatewaySnapshot {
+  return {
+    client,
+    connected,
+    reconnecting: !connected,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+}
+
+function mutableGateway(initialSnapshot: ApplicationGatewaySnapshot) {
+  let current = initialSnapshot;
+  const gateway = {
+    get snapshot() {
+      return current;
+    },
+  } as unknown as ApplicationContext["gateway"];
+  return {
+    gateway,
+    replaceSnapshot(next: ApplicationGatewaySnapshot) {
+      current = next;
+    },
+  };
+}
+
+async function loadRoute<T>(route: RouteWithLoader, context: ApplicationContext): Promise<T> {
+  if (!route.loader) {
+    throw new Error("route has no loader");
+  }
+  return (await route.loader(context, loaderOptions)) as T;
+}
+
+describe("route preload gateway provenance", () => {
+  it("records the exact gateway source and snapshot for synchronous route state", async () => {
+    const agentsGateway = mutableGateway(snapshot(null, false));
+    const agentsData = await loadRoute<AgentsRouteData>(agentsPage, {
+      gateway: agentsGateway.gateway,
+      agents: { state: { agentsList: null, agentsError: null } },
+    } as unknown as ApplicationContext);
+    expect(agentsData.gateway).toBe(agentsGateway.gateway);
+    expect(agentsData.gatewaySnapshot).toBe(agentsGateway.gateway.snapshot);
+
+    const nodesGateway = mutableGateway(snapshot(null, false));
+    const nodesData = await loadRoute<NodesRouteData>(nodesPage, {
+      gateway: nodesGateway.gateway,
+    } as unknown as ApplicationContext);
+    expect(nodesData.gateway).toBe(nodesGateway.gateway);
+    expect(nodesData.gatewaySnapshot).toBe(nodesGateway.gateway.snapshot);
+  });
+
+  it("keeps sessions provenance from before its async preload", async () => {
+    const client = {} as GatewayBrowserClient;
+    const originalSnapshot = snapshot(client, true);
+    const mutable = mutableGateway(originalSnapshot);
+    const gateway = mutable.gateway;
+    const list = deferred<null>();
+    const request = loadRoute<SessionsRouteData>(sessionsPage, {
+      gateway,
+      sessions: { list: vi.fn(() => list.promise) },
+      runtimeConfig: { ensureLoaded: vi.fn(async () => undefined) },
+    } as unknown as ApplicationContext);
+
+    mutable.replaceSnapshot(snapshot(client, false));
+    list.resolve(null);
+    const data = await request;
+
+    expect(data.gateway).toBe(gateway);
+    expect(data.gatewaySnapshot).toBe(originalSnapshot);
+  });
+
+  it("keeps usage provenance from before its async preload", async () => {
+    const client = {
+      request: vi.fn(async () => ({})),
+    } as unknown as GatewayBrowserClient;
+    const originalSnapshot = snapshot(client, true);
+    const mutable = mutableGateway(originalSnapshot);
+    const gateway = mutable.gateway;
+    const request = loadRoute<UsageRouteData>(usagePage, {
+      gateway,
+    } as unknown as ApplicationContext);
+
+    mutable.replaceSnapshot(snapshot(client, false));
+    const data = await request;
+
+    expect(data.gateway).toBe(gateway);
+    expect(data.gatewaySnapshot).toBe(originalSnapshot);
+  });
+
+  it("keeps skills provenance from before its async preload", async () => {
+    const client = {
+      request: vi.fn(async () => ({ skills: [] })),
+    } as unknown as GatewayBrowserClient;
+    const originalSnapshot = snapshot(client, true);
+    const mutable = mutableGateway(originalSnapshot);
+    const gateway = mutable.gateway;
+    const agentsReady = deferred<null>();
+    const agents = {
+      ensureList: vi.fn(() => agentsReady.promise),
+    } as unknown as ApplicationContext["agents"];
+    const request = loadRoute<SkillsRouteData>(skillsPage, {
+      gateway,
+      agents,
+    } as unknown as ApplicationContext);
+
+    mutable.replaceSnapshot(snapshot(client, false));
+    agentsReady.resolve(null);
+    const data = await request;
+
+    expect(data.gateway).toBe(gateway);
+    expect(data.gatewaySnapshot).toBe(originalSnapshot);
+    expect(data.agents).toBe(agents);
+  });
+
+  it("keeps dreams provenance from before capability warmup", async () => {
+    const client = {} as GatewayBrowserClient;
+    const originalSnapshot = snapshot(client, false);
+    const mutable = mutableGateway(originalSnapshot);
+    const gateway = mutable.gateway;
+    const configReady = deferred<void>();
+    const request = loadRoute<DreamsRouteData>(dreamsPage, {
+      gateway,
+      agents: {
+        state: { agentsList: null },
+        ensureList: vi.fn(async () => null),
+      },
+      runtimeConfig: {
+        state: { configSnapshot: null },
+        ensureLoaded: vi.fn(() => configReady.promise),
+      },
+    } as unknown as ApplicationContext);
+
+    mutable.replaceSnapshot(snapshot(client, true));
+    configReady.resolve();
+    const data = await request;
+
+    expect(data.gateway).toBe(gateway);
+    expect(data.gatewaySnapshot).toBe(originalSnapshot);
+    expect(data.state.connected).toBe(false);
+  });
+});
diff --git a/ui/src/pages/sessions/route.ts b/ui/src/pages/sessions/route.ts
index ed529eea32c..bbb9c556231 100644
--- a/ui/src/pages/sessions/route.ts
+++ b/ui/src/pages/sessions/route.ts
@@ -16,6 +16,8 @@ async function loadSessionsRoute(
   context: ApplicationContext,
   location: RouteLocation,
 ): Promise<SessionsRouteData> {
+  const gateway = context.gateway;
+  const gatewaySnapshot = gateway.snapshot;
   const options = routeOptions(location);
   const checkpointAgentId = parseAgentSessionKey(options.expandedSessionKey)?.agentId;
   const [sessions] = await Promise.all([
@@ -35,10 +37,9 @@ async function loadSessionsRoute(
       ),
     context.runtimeConfig.ensureLoaded().catch(() => undefined),
   ]);
-  const gateway = context.gateway.snapshot;
   return {
-    client: gateway.client,
-    connected: gateway.connected,
+    gateway,
+    gatewaySnapshot,
     result: sessions.result,
     error: sessions.error,
     ...options,
diff --git a/ui/src/pages/sessions/sessions-page.test.ts b/ui/src/pages/sessions/sessions-page.test.ts
new file mode 100644
index 00000000000..328b83263f6
--- /dev/null
+++ b/ui/src/pages/sessions/sessions-page.test.ts
@@ -0,0 +1,379 @@
+/* @vitest-environment jsdom */
+
+import { nothing } from "lit";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type {
+  GatewaySessionRow,
+  SessionCompactionCheckpoint,
+  SessionsListResult,
+} from "../../api/types.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import type { SessionCapability } from "../../lib/sessions/index.ts";
+import { getWorkboardState } from "../../lib/workboard/index.ts";
+import type { SessionsRouteData } from "./sessions-page.ts";
+import "./sessions-page.ts";
+
+type TestSessionsPage = HTMLElement & {
+  context: ApplicationContext;
+  render: () => unknown;
+  requestUpdate: () => void;
+  readonly updateComplete: Promise<boolean>;
+  routeData?: SessionsRouteData;
+  result: SessionsListResult | null;
+  error: string | null;
+  loading: boolean;
+  selectedKeys: Set<string>;
+  sessionMenu: { key: string; x: number; y: number } | null;
+  sessionMenuTrigger: HTMLElement | null;
+  checkpointItemsByKey: Record<string, SessionCompactionCheckpoint[]>;
+  checkpointLoadingKey: string | null;
+  checkpointBusyKey: string | null;
+  sessionMutationPending: boolean;
+  loadSessions: () => Promise<void>;
+  loadCheckpoint: (sessionKey: string) => Promise<void>;
+  deleteSelected: () => Promise<void>;
+  deleteSessionFromMenu: (row: GatewaySessionRow) => Promise<void>;
+  openSessionMenu: (
+    row: GatewaySessionRow,
+    position: { x: number; y: number },
+    trigger: HTMLElement | null,
+  ) => void;
+  patchSession: (key: string, patch: { archived?: boolean }) => Promise<void>;
+  forkSession: (key: string) => Promise<void>;
+  branchCheckpoint: (sessionKey: string, checkpointId: string) => Promise<void>;
+  restoreCheckpoint: (sessionKey: string, checkpointId: string) => Promise<void>;
+  addToWorkboard: (session: GatewaySessionRow) => Promise<void>;
+};
+
+type MutableGateway = {
+  gateway: ApplicationContext["gateway"];
+  emit: (patch: Partial<ApplicationGatewaySnapshot>) => void;
+  setSessionKey: ReturnType<typeof vi.fn>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((nextResolve, nextReject) => {
+    resolve = nextResolve;
+    reject = nextReject;
+  });
+  return { promise, resolve, reject };
+}
+
+function createGateway(client: GatewayBrowserClient): MutableGateway {
+  let snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected: true,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const listeners = new Set<(next: ApplicationGatewaySnapshot) => void>();
+  const setSessionKey = vi.fn();
+  const gateway = {
+    get snapshot() {
+      return snapshot;
+    },
+    eventLog: [],
+    setSessionKey,
+    subscribe(listener: (next: ApplicationGatewaySnapshot) => void) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    },
+    subscribeEvents: () => () => undefined,
+    subscribeEventLog: () => () => undefined,
+  } as unknown as ApplicationContext["gateway"];
+  return {
+    gateway,
+    setSessionKey,
+    emit(patch) {
+      snapshot = { ...snapshot, ...patch };
+      for (const listener of listeners) {
+        listener(snapshot);
+      }
+    },
+  };
+}
+
+function createSessions(overrides: Partial<SessionCapability> = {}): SessionCapability {
+  const subscribe = () => () => undefined;
+  return {
+    state: {
+      result: null,
+      agentId: null,
+      modelOverrides: {},
+      loading: false,
+      error: null,
+      deletedSessions: [],
+    },
+    list: vi.fn(async () => null),
+    listCheckpoints: vi.fn(async () => []),
+    deleteMany: vi.fn(async () => ({ deleted: [], errors: [] })),
+    patch: vi.fn(async () => null),
+    create: vi.fn(async () => null),
+    branchCheckpoint: vi.fn(async () => ({ key: "branch" })),
+    restoreCheckpoint: vi.fn(async () => ({ ok: true })),
+    subscribe,
+    ...overrides,
+  } as unknown as SessionCapability;
+}
+
+function createContext(
+  gateway: ApplicationContext["gateway"],
+  sessions: SessionCapability,
+): ApplicationContext {
+  const subscribe = () => () => undefined;
+  return {
+    basePath: "",
+    gateway,
+    sessions,
+    agents: { state: { agentsList: null }, subscribe },
+    agentIdentity: { get: () => undefined, ensure: vi.fn(), subscribe },
+    agentSelection: { state: { selectedId: "main" }, subscribe },
+    channels: { subscribe },
+    runtimeConfig: { state: { configSnapshot: null }, subscribe },
+    workboard: {
+      state: { cards: [], capturingSessionKeys: new Set() },
+      notify: vi.fn(),
+      subscribe,
+    },
+    navigate: vi.fn(),
+    preload: vi.fn(),
+  } as unknown as ApplicationContext;
+}
+
+async function createPage(context: ApplicationContext): Promise<TestSessionsPage> {
+  const page = document.createElement("openclaw-sessions-page") as TestSessionsPage;
+  page.context = context;
+  page.render = () => nothing;
+  document.body.append(page);
+  await page.updateComplete;
+  return page;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("sessions page lifecycle", () => {
+  it("rejects preloaded data after a same-client reconnect and loads the current epoch", async () => {
+    const client = {} as GatewayBrowserClient;
+    const mutableGateway = createGateway(client);
+    const preloadedSnapshot = mutableGateway.gateway.snapshot;
+    mutableGateway.emit({ connected: false, client });
+    mutableGateway.emit({ connected: true, client });
+    const freshResult = { count: 1, sessions: [{ key: "fresh" }] } as SessionsListResult;
+    const sessions = createSessions({ list: vi.fn(async () => freshResult) });
+    const context = createContext(mutableGateway.gateway, sessions);
+    const page = document.createElement("openclaw-sessions-page") as TestSessionsPage;
+    page.context = context;
+    page.render = () => nothing;
+    page.routeData = {
+      gateway: mutableGateway.gateway,
+      gatewaySnapshot: preloadedSnapshot,
+      result: { count: 1, sessions: [{ key: "stale" }] } as SessionsListResult,
+      error: null,
+      expandedSessionKey: null,
+      showArchived: false,
+    };
+
+    document.body.append(page);
+    await page.updateComplete;
+    await vi.waitFor(() => expect(page.result?.sessions[0]?.key).toBe("fresh"));
+
+    expect(sessions.list).toHaveBeenCalledOnce();
+    expect(page.result?.sessions.map((session) => session.key)).toEqual(["fresh"]);
+  });
+
+  it("rejects session and checkpoint results after the sessions capability changes", async () => {
+    const list = deferred<SessionsListResult | null>();
+    const checkpoints = deferred<SessionCompactionCheckpoint[]>();
+    const sessions = createSessions({
+      list: vi.fn(() => list.promise),
+      listCheckpoints: vi.fn(() => checkpoints.promise),
+    });
+    const { gateway } = createGateway({} as GatewayBrowserClient);
+    const context = createContext(gateway, sessions);
+    const page = await createPage(context);
+
+    const listRequest = page.loadSessions();
+    const checkpointRequest = page.loadCheckpoint("main");
+    await vi.waitFor(() => {
+      expect(sessions.list).toHaveBeenCalledOnce();
+      expect(sessions.listCheckpoints).toHaveBeenCalledOnce();
+    });
+
+    page.context = { ...context, sessions: createSessions() };
+    page.requestUpdate();
+    await page.updateComplete;
+    list.resolve({ count: 1, sessions: [{ key: "stale" }] } as SessionsListResult);
+    checkpoints.resolve([{ checkpointId: "stale" }] as SessionCompactionCheckpoint[]);
+    await Promise.all([listRequest, checkpointRequest]);
+
+    expect(page.result).toBeNull();
+    expect(page.loading).toBe(false);
+    expect(page.checkpointItemsByKey).toEqual({});
+    expect(page.checkpointLoadingKey).toBeNull();
+  });
+
+  it("invalidates checkpoint work and mutation locks on same-client disconnect", async () => {
+    const checkpoints = deferred<SessionCompactionCheckpoint[]>();
+    const sessions = createSessions({
+      listCheckpoints: vi.fn(() => checkpoints.promise),
+    });
+    const client = {} as GatewayBrowserClient;
+    const mutableGateway = createGateway(client);
+    const page = await createPage(createContext(mutableGateway.gateway, sessions));
+    const request = page.loadCheckpoint("main");
+    page.checkpointBusyKey = "busy";
+    page.sessionMutationPending = true;
+
+    mutableGateway.emit({ connected: false, client });
+
+    expect(page.checkpointLoadingKey).toBeNull();
+    expect(page.checkpointBusyKey).toBeNull();
+    expect(page.sessionMutationPending).toBe(false);
+    checkpoints.resolve([{ checkpointId: "stale" }] as SessionCompactionCheckpoint[]);
+    await request;
+    expect(page.checkpointItemsByKey).toEqual({});
+  });
+
+  it("closes an open row menu on a same-client disconnect", async () => {
+    const sessions = createSessions();
+    const client = {} as GatewayBrowserClient;
+    const mutableGateway = createGateway(client);
+    const page = await createPage(createContext(mutableGateway.gateway, sessions));
+    const trigger = document.createElement("button");
+    page.openSessionMenu(
+      { key: "agent:main:work" } as GatewaySessionRow,
+      { x: 10, y: 20 },
+      trigger,
+    );
+
+    mutableGateway.emit({ connected: false, client });
+
+    expect(page.sessionMenu).toBeNull();
+    expect(page.sessionMenuTrigger).toBeNull();
+  });
+
+  it("retargets the Gateway after deleting the current session", async () => {
+    const key = "agent:writer:work";
+    const sessions = createSessions({
+      deleteMany: vi.fn(async () => ({ deleted: [key], errors: [] })),
+    });
+    const mutableGateway = createGateway({} as GatewayBrowserClient);
+    mutableGateway.emit({ sessionKey: key });
+    const page = await createPage(createContext(mutableGateway.gateway, sessions));
+    page.result = { count: 1, sessions: [{ key }] } as SessionsListResult;
+    page.selectedKeys = new Set([key]);
+    vi.spyOn(window, "confirm").mockReturnValue(true);
+
+    await page.deleteSelected();
+
+    expect(sessions.deleteMany).toHaveBeenCalledWith([{ key, agentId: undefined }]);
+    expect(mutableGateway.setSessionKey).toHaveBeenCalledWith("agent:writer:main");
+    expect(page.result?.sessions).toEqual([]);
+    expect(page.selectedKeys).toEqual(new Set());
+  });
+
+  it("routes a confirmed row-menu deletion through the scoped bulk owner", async () => {
+    const key = "agent:main:work";
+    const sessions = createSessions({
+      deleteMany: vi.fn(async () => ({ deleted: [key], errors: [] })),
+    });
+    const { gateway } = createGateway({} as GatewayBrowserClient);
+    const page = await createPage(createContext(gateway, sessions));
+    const row = { key, label: "Work" } as GatewaySessionRow;
+    page.result = { count: 1, sessions: [row] } as SessionsListResult;
+    const confirm = vi.spyOn(window, "confirm").mockReturnValue(true);
+
+    await page.deleteSessionFromMenu(row);
+
+    expect(confirm).toHaveBeenCalledOnce();
+    expect(sessions.deleteMany).toHaveBeenCalledWith([{ key, agentId: undefined }]);
+    expect(page.result?.sessions).toEqual([]);
+  });
+
+  it("drops stale mutation state, errors, and navigation after disconnect", async () => {
+    const deleted = deferred<{ deleted: string[]; errors: string[] }>();
+    const patched = deferred<unknown>();
+    const forked = deferred<string | null>();
+    const branched = deferred<{ key: string }>();
+    const restored = deferred<unknown>();
+    const captured = deferred<unknown>();
+    const sessions = createSessions({
+      deleteMany: vi.fn(() => deleted.promise),
+      patch: vi.fn(() => patched.promise as never),
+      create: vi.fn(() => forked.promise),
+      branchCheckpoint: vi.fn(() => branched.promise as never),
+      restoreCheckpoint: vi.fn(() => restored.promise as never),
+    });
+    const request = vi.fn((method: string) => {
+      if (method === "chat.history") {
+        return Promise.resolve({ messages: [] });
+      }
+      if (method === "workboard.cards.create") {
+        return captured.promise;
+      }
+      return Promise.resolve({});
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const mutableGateway = createGateway(client);
+    const context = createContext(mutableGateway.gateway, sessions);
+    getWorkboardState(context.workboard).loaded = true;
+    const page = await createPage(context);
+    page.result = { count: 1, sessions: [{ key: "main" }] } as SessionsListResult;
+    page.selectedKeys = new Set(["main"]);
+    vi.spyOn(window, "confirm").mockReturnValue(true);
+
+    const requests = [
+      page.deleteSelected(),
+      page.patchSession("main", { archived: true }),
+      page.forkSession("main"),
+      page.branchCheckpoint("main", "branch-checkpoint"),
+      page.restoreCheckpoint("main", "restore-checkpoint"),
+      page.addToWorkboard({ key: "main" } as GatewaySessionRow),
+    ];
+    await vi.waitFor(() =>
+      expect(request).toHaveBeenCalledWith("workboard.cards.create", expect.any(Object)),
+    );
+
+    mutableGateway.emit({ connected: false, client });
+    deleted.resolve({ deleted: ["main"], errors: ["stale delete error"] });
+    patched.resolve({ ok: true });
+    forked.resolve("forked");
+    branched.resolve({ key: "branched" });
+    restored.reject(new Error("stale restore error"));
+    captured.reject(new Error("stale capture error"));
+    await Promise.all(requests);
+
+    expect(page.result?.sessions.map((row) => row.key)).toEqual(["main"]);
+    expect(page.selectedKeys).toEqual(new Set(["main"]));
+    expect(page.error).toBeNull();
+    expect(page.sessionMutationPending).toBe(false);
+    expect(page.checkpointBusyKey).toBeNull();
+    expect(mutableGateway.setSessionKey).not.toHaveBeenCalled();
+    expect(context.navigate).not.toHaveBeenCalled();
+  });
+
+  it("does not navigate when a mutation completes after the page detaches", async () => {
+    const forked = deferred<string | null>();
+    const sessions = createSessions({ create: vi.fn(() => forked.promise) });
+    const { gateway } = createGateway({} as GatewayBrowserClient);
+    const context = createContext(gateway, sessions);
+    const page = await createPage(context);
+
+    const request = page.forkSession("main");
+    page.remove();
+    forked.resolve("detached-fork");
+    await request;
+
+    expect(context.navigate).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/src/pages/sessions/sessions-page.ts b/ui/src/pages/sessions/sessions-page.ts
index 779a909ebb9..ac49d77c339 100644
--- a/ui/src/pages/sessions/sessions-page.ts
+++ b/ui/src/pages/sessions/sessions-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type {
@@ -34,6 +34,8 @@ import {
 } from "../../lib/sessions/session-key.ts";
 import { normalizeOptionalString } from "../../lib/string-coerce.ts";
 import { captureSessionToWorkboard } from "../../lib/workboard/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { getSafeLocalStorage } from "../../local-storage.ts";
 import { renderSessions, type SessionsProps } from "./view.ts";
 
@@ -44,21 +46,31 @@ function loadStoredGroupBy(): SessionsGroupBy {
 }
 
 export type SessionsRouteData = {
-  client: GatewayBrowserClient | null;
-  connected: boolean;
+  // Client identity alone cannot distinguish provider replacement or reconnect epochs.
+  gateway: ApplicationContext["gateway"];
+  gatewaySnapshot: ApplicationContext["gateway"]["snapshot"];
   result: SessionsListResult | null;
   error: string | null;
   expandedSessionKey: string | null;
   showArchived: boolean;
 };
 
+type SessionsPageRequestScope = {
+  epoch: number;
+  context: ApplicationContext;
+  gateway: ApplicationContext["gateway"];
+  sessions: ApplicationContext["sessions"];
+  workboard: ApplicationContext["workboard"];
+  client: GatewayBrowserClient;
+};
+
 function parseFilterInteger(value: string): number | undefined {
   const parsed = Number.parseInt(value, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
 }
 
-class SessionsPage extends LitElement {
-  @consume({ context: applicationContext, subscribe: false })
+class SessionsPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context?: ApplicationContext;
 
   @property({ attribute: false }) routeData?: SessionsRouteData;
@@ -89,14 +101,11 @@ class SessionsPage extends LitElement {
   @state() private checkpointBusyKey: string | null = null;
   @state() private checkpointErrorByKey: Record<string, string> = {};
 
-  private stopSessionSubscription?: () => void;
-  private stopAgentIdentitySubscription?: () => void;
-  private stopAgentSelectionSubscription?: () => void;
-  private stopGatewaySubscription?: () => void;
-  private stopRuntimeConfigSubscription?: () => void;
-  private stopWorkboardSubscription?: () => void;
   private sessionRequestId = 0;
   private checkpointRequestId = 0;
+  // Async completions belong to one context/capability/connection epoch. Bump
+  // before releasing locks so stale finally blocks cannot clear newer work.
+  private pageEpoch = 0;
   private routeDataInitialized = false;
   private routeDataEnabled = true;
   private appliedRouteData?: SessionsRouteData;
@@ -108,130 +117,110 @@ class SessionsPage extends LitElement {
   private gatewayClient: GatewayBrowserClient | null = null;
   private gatewayConnected = false;
   private sessionMenuTrigger: HTMLElement | null = null;
+  private hasBoundGatewaySource = false;
+  private sessionsSource?: ApplicationContext["sessions"];
+  private hasBoundSessionsSource = false;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.sessions,
+      (sessions) => {
+        const sourceChanged =
+          this.hasBoundSessionsSource && !Object.is(this.sessionsSource, sessions);
+        this.hasBoundSessionsSource = true;
+        this.sessionsSource = sessions;
+        if (sourceChanged) {
+          this.invalidatePageWork();
+          this.resetProviderState();
+        }
+        this.sharedSessionsResult = sessions.state.result;
+        this.sharedSessionsLoading = sessions.state.loading;
+        const cleanup = sessions.subscribe((snapshot) => {
+          if (!Object.is(this.context?.sessions, sessions)) {
+            return;
+          }
+          const resultChanged = snapshot.result !== this.sharedSessionsResult;
+          const refreshCompleted = this.sharedSessionsLoading && !snapshot.loading;
+          this.sharedSessionsResult = snapshot.result;
+          this.sharedSessionsLoading = snapshot.loading;
+          if (snapshot.loading || !this.routeDataInitialized || this.sessionMutationPending) {
+            return;
+          }
+          if (this.ignorePendingSharedRefresh && refreshCompleted) {
+            this.ignorePendingSharedRefresh = false;
+            return;
+          }
+          if (resultChanged) {
+            this.scheduleSessionReload();
+          }
+        });
+        if (sourceChanged && this.routeDataInitialized) {
+          this.scheduleSessionReload();
+        }
+        return cleanup;
+      },
+    )
+    .watch(
+      () => this.context?.agentIdentity,
+      (agentIdentity, notify) => agentIdentity.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.agentSelection,
+      (agentSelection, notify) => agentSelection.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const resetForSourceBind = this.hasBoundGatewaySource;
+        this.hasBoundGatewaySource = true;
+        const cleanup = gateway.subscribe((snapshot) => {
+          if (Object.is(this.context?.gateway, gateway)) {
+            this.applyGatewaySnapshot(snapshot);
+          }
+        });
+        this.applyGatewaySnapshot(gateway.snapshot, resetForSourceBind);
+        return cleanup;
+      },
+    )
+    .watch(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig, notify) => runtimeConfig.subscribe(notify),
+    )
+    .watch(
+      () => this.context?.workboard,
+      (workboard, notify) => workboard.subscribe(notify),
+    );
 
-  override createRenderRoot() {
-    return this;
-  }
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.startSessionState();
-    this.startAgentIdentityState();
-  }
-
-  override willUpdate(changed: Map<PropertyKey, unknown>) {
+  override willUpdate(changed: PropertyValues) {
     if (changed.has("routeData") || changed.has("context")) {
       this.applyRouteData();
     }
   }
 
-  override updated() {
-    this.startSessionState();
-    this.startAgentIdentityState();
-    this.startApplicationState();
-  }
-
   override disconnectedCallback() {
-    this.stopSessionSubscription?.();
-    this.stopSessionSubscription = undefined;
-    this.stopAgentIdentitySubscription?.();
-    this.stopAgentIdentitySubscription = undefined;
-    this.stopAgentSelectionSubscription?.();
-    this.stopAgentSelectionSubscription = undefined;
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopRuntimeConfigSubscription?.();
-    this.stopRuntimeConfigSubscription = undefined;
-    this.stopWorkboardSubscription?.();
-    this.stopWorkboardSubscription = undefined;
-    this.sessionRequestId += 1;
-    this.checkpointRequestId += 1;
-    this.sessionReloadQueued = false;
+    this.subscriptions.clear();
+    this.invalidatePageWork();
     this.gatewayClient = null;
     this.gatewayConnected = false;
     super.disconnectedCallback();
   }
 
-  private startSessionState() {
-    const context = this.context;
-    if (!context || this.stopSessionSubscription) {
-      return;
-    }
-    this.sharedSessionsResult = context.sessions.state.result;
-    this.sharedSessionsLoading = context.sessions.state.loading;
-    this.stopSessionSubscription = context.sessions.subscribe((snapshot) => {
-      const resultChanged = snapshot.result !== this.sharedSessionsResult;
-      const refreshCompleted = this.sharedSessionsLoading && !snapshot.loading;
-      this.sharedSessionsResult = snapshot.result;
-      this.sharedSessionsLoading = snapshot.loading;
-      if (snapshot.loading || !this.routeDataInitialized || this.sessionMutationPending) {
-        return;
-      }
-      if (this.ignorePendingSharedRefresh && refreshCompleted) {
-        this.ignorePendingSharedRefresh = false;
-        return;
-      }
-      if (resultChanged) {
-        this.scheduleSessionReload();
-      }
-    });
-  }
-
-  private startAgentIdentityState() {
-    const context = this.context;
-    if (!context || this.stopAgentIdentitySubscription) {
-      return;
-    }
-    this.stopAgentIdentitySubscription = context.agentIdentity.subscribe(() =>
-      this.requestUpdate(),
-    );
-  }
-
-  private startApplicationState() {
-    const context = this.context;
-    if (!context || this.stopGatewaySubscription) {
-      return;
-    }
-    this.stopAgentSelectionSubscription = context.agentSelection.subscribe(() =>
-      this.requestUpdate(),
-    );
-    const gateway = context.gateway.snapshot;
-    this.gatewayClient = gateway.client;
-    this.gatewayConnected = gateway.connected;
-    this.stopGatewaySubscription = context.gateway.subscribe((snapshot) =>
-      this.applyGatewaySnapshot(snapshot),
-    );
-    this.stopRuntimeConfigSubscription = context.runtimeConfig.subscribe(() =>
-      this.requestUpdate(),
-    );
-    this.stopWorkboardSubscription = context.workboard.subscribe(() => this.requestUpdate());
-  }
-
-  private applyGatewaySnapshot(snapshot: ApplicationContext["gateway"]["snapshot"]) {
-    const clientChanged = snapshot.client !== this.gatewayClient;
+  private applyGatewaySnapshot(
+    snapshot: ApplicationContext["gateway"]["snapshot"],
+    resetForSourceBind = false,
+  ) {
+    const clientChanged = resetForSourceBind || snapshot.client !== this.gatewayClient;
+    const connectionChanged = snapshot.connected !== this.gatewayConnected;
     const becameConnected = snapshot.connected && !this.gatewayConnected;
     this.gatewayClient = snapshot.client;
     this.gatewayConnected = snapshot.connected;
-    if (clientChanged) {
+    if (clientChanged || connectionChanged) {
+      this.invalidatePageWork();
       this.ignorePendingSharedRefresh = false;
-      this.sessionRequestId += 1;
-      this.checkpointRequestId += 1;
-      this.result = null;
-      this.error = null;
-      this.loading = false;
-      this.selectedKeys = new Set();
-      this.sessionMenu = null;
-      this.sessionMenuTrigger = null;
-      this.expandedSessionKey = null;
-      this.deepLinkSessionKey = null;
-      this.checkpointItemsByKey = {};
-      this.checkpointLoadingKey = null;
-      this.checkpointBusyKey = null;
-      this.checkpointErrorByKey = {};
+    }
+    if (clientChanged) {
+      this.resetProviderState();
     }
     if (!snapshot.connected || !snapshot.client) {
-      this.sessionRequestId += 1;
-      this.loading = false;
       this.requestUpdate();
       return;
     }
@@ -242,6 +231,67 @@ class SessionsPage extends LitElement {
     this.requestUpdate();
   }
 
+  private invalidatePageWork() {
+    this.pageEpoch += 1;
+    this.sessionRequestId += 1;
+    this.checkpointRequestId += 1;
+    this.sessionReloadQueued = false;
+    this.loading = false;
+    this.checkpointLoadingKey = null;
+    this.checkpointBusyKey = null;
+    this.sessionMutationPending = false;
+    this.sessionMenu = null;
+    this.sessionMenuTrigger = null;
+  }
+
+  private resetProviderState() {
+    this.result = null;
+    this.error = null;
+    this.loading = false;
+    this.selectedKeys = new Set();
+    this.expandedSessionKey = null;
+    this.deepLinkSessionKey = null;
+    this.checkpointItemsByKey = {};
+    this.checkpointLoadingKey = null;
+    this.checkpointBusyKey = null;
+    this.checkpointErrorByKey = {};
+  }
+
+  private captureRequestScope(): SessionsPageRequestScope | null {
+    const context = this.context;
+    if (!this.isConnected || !context) {
+      return null;
+    }
+    const gateway = context.gateway;
+    const client = gateway.snapshot.client;
+    if (!gateway.snapshot.connected || !client) {
+      return null;
+    }
+    return {
+      epoch: this.pageEpoch,
+      context,
+      gateway,
+      sessions: context.sessions,
+      workboard: context.workboard,
+      client,
+    };
+  }
+
+  private isRequestScopeCurrent(scope: SessionsPageRequestScope): boolean {
+    const context = this.context;
+    const gateway = context?.gateway;
+    return (
+      this.isConnected &&
+      this.pageEpoch === scope.epoch &&
+      context === scope.context &&
+      gateway === scope.gateway &&
+      context.sessions === scope.sessions &&
+      context.workboard === scope.workboard &&
+      gateway.snapshot.connected &&
+      gateway.snapshot.client === scope.client
+    );
+  }
+
   private applyRouteData() {
     const data = this.routeData;
     const context = this.context;
@@ -275,8 +325,11 @@ class SessionsPage extends LitElement {
     // Only route-driven expansion narrows the list query; interactive drawer
     // opens must keep loading the full roster (see sessionListOptions).
     this.deepLinkSessionKey = data.expandedSessionKey;
-    const gateway = context.gateway.snapshot;
-    if (data.client !== gateway.client || data.connected !== gateway.connected) {
+    const gateway = context.gateway;
+    const snapshot = gateway.snapshot;
+    this.gatewayClient = snapshot.client;
+    this.gatewayConnected = snapshot.connected;
+    if (data.gateway !== gateway || data.gatewaySnapshot !== snapshot) {
       this.routeDataEnabled = false;
       void this.loadSessions();
       if (data.expandedSessionKey) {
@@ -302,7 +355,11 @@ class SessionsPage extends LitElement {
       return;
     }
     this.sessionReloadQueued = true;
+    const epoch = this.pageEpoch;
     queueMicrotask(() => {
+      if (epoch !== this.pageEpoch) {
+        return;
+      }
       this.sessionReloadQueued = false;
       const context = this.context;
       const gateway = context?.gateway.snapshot;
@@ -318,8 +375,10 @@ class SessionsPage extends LitElement {
     });
   }
 
-  private sessionAgentId(key: string): string | undefined {
-    const context = this.context;
+  private sessionAgentId(
+    key: string,
+    context: ApplicationContext | undefined = this.context,
+  ): string | undefined {
     if (!context) {
       return undefined;
     }
@@ -349,8 +408,8 @@ class SessionsPage extends LitElement {
   }
 
   private async loadSessions() {
-    const context = this.context;
-    if (!context) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
     const requestId = ++this.sessionRequestId;
@@ -359,8 +418,8 @@ class SessionsPage extends LitElement {
     this.loading = true;
     this.error = null;
     try {
-      const result = await context.sessions.list(this.sessionListOptions());
-      if (requestId !== this.sessionRequestId) {
+      const result = await scope.sessions.list(this.sessionListOptions());
+      if (requestId !== this.sessionRequestId || !this.isRequestScopeCurrent(scope)) {
         return;
       }
       this.result = result ? filterSessionRows(result, { showArchived: this.showArchived }) : null;
@@ -370,11 +429,11 @@ class SessionsPage extends LitElement {
         void this.loadCheckpoint(checkpointKey);
       }
     } catch (error) {
-      if (requestId === this.sessionRequestId) {
+      if (requestId === this.sessionRequestId && this.isRequestScopeCurrent(scope)) {
         this.error = String(error);
       }
     } finally {
-      if (requestId === this.sessionRequestId) {
+      if (requestId === this.sessionRequestId && this.isRequestScopeCurrent(scope)) {
         this.loading = false;
       }
     }
@@ -470,7 +529,7 @@ class SessionsPage extends LitElement {
 
   private async deleteSelected() {
     const keys = [...this.selectedKeys];
-    if (keys.length === 0 || this.loading) {
+    if (keys.length === 0 || this.loading || this.sessionMutationPending) {
       return;
     }
     if (
@@ -484,65 +543,74 @@ class SessionsPage extends LitElement {
   }
 
   private async deleteSessions(keys: string[]) {
-    const context = this.context;
-    if (!context || keys.length === 0 || this.loading) {
+    if (keys.length === 0 || this.loading || this.sessionMutationPending) {
+      return;
+    }
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
     this.sessionMutationPending = true;
-    const result = await context.sessions
-      .deleteMany(
+    try {
+      const result = await scope.sessions.deleteMany(
         keys.map((key) => ({
           key,
-          agentId: this.sessionAgentId(key),
+          agentId: this.sessionAgentId(key, scope.context),
         })),
-      )
-      .finally(() => {
-        this.sessionMutationPending = false;
-      });
-    if (result.deleted.length > 0) {
-      const deleted = new Set(result.deleted);
-      const selected = new Set(this.selectedKeys);
-      for (const key of result.deleted) {
-        selected.delete(key);
-      }
-      this.selectedKeys = selected;
-      if (this.result) {
-        const sessions = this.result.sessions.filter((row) => !deleted.has(row.key));
-        this.result = {
-          ...this.result,
-          count: Math.max(0, this.result.count - (this.result.sessions.length - sessions.length)),
-          sessions,
-        };
-      }
-      if (this.expandedSessionKey && deleted.has(this.expandedSessionKey)) {
-        this.expandedSessionKey = null;
-      }
-      if (this.deepLinkSessionKey && deleted.has(this.deepLinkSessionKey)) {
-        this.deepLinkSessionKey = null;
-      }
-      // Deleting the currently targeted session must not leave the gateway
-      // pointing at a dead key; fall back to the agent main session, matching
-      // the archive path above and the sidebar delete path.
-      const deletedCurrent = result.deleted.find((key) =>
-        areUiSessionKeysEquivalent(key, context.gateway.snapshot.sessionKey),
       );
-      if (deletedCurrent) {
-        context.gateway.setSessionKey(
-          buildAgentMainSessionKey({
-            agentId:
-              parseAgentSessionKey(deletedCurrent)?.agentId ??
-              context.agentSelection.state.selectedId ??
-              "main",
-            mainKey: resolveUiConfiguredMainKey({
-              agentsList: context.agents.state.agentsList,
-              hello: context.gateway.snapshot.hello,
-            }),
-          }),
-        );
+      if (!this.isRequestScopeCurrent(scope)) {
+        return;
+      }
+      if (result.deleted.length > 0) {
+        const deleted = new Set(result.deleted);
+        const selected = new Set(this.selectedKeys);
+        for (const key of result.deleted) {
+          selected.delete(key);
+        }
+        this.selectedKeys = selected;
+        if (this.result) {
+          const sessions = this.result.sessions.filter((row) => !deleted.has(row.key));
+          this.result = {
+            ...this.result,
+            count: Math.max(0, this.result.count - (this.result.sessions.length - sessions.length)),
+            sessions,
+          };
+        }
+        if (this.expandedSessionKey && deleted.has(this.expandedSessionKey)) {
+          this.expandedSessionKey = null;
+        }
+        if (this.deepLinkSessionKey && deleted.has(this.deepLinkSessionKey)) {
+          this.deepLinkSessionKey = null;
+        }
+        const deletedCurrent = result.deleted.find((key) =>
+          areUiSessionKeysEquivalent(key, scope.gateway.snapshot.sessionKey),
+        );
+        if (deletedCurrent) {
+          scope.gateway.setSessionKey(
+            buildAgentMainSessionKey({
+              agentId:
+                parseAgentSessionKey(deletedCurrent)?.agentId ??
+                scope.context.agentSelection.state.selectedId ??
+                "main",
+              mainKey: resolveUiConfiguredMainKey({
+                agentsList: scope.context.agents.state.agentsList,
+                hello: scope.gateway.snapshot.hello,
+              }),
+            }),
+          );
+        }
+      }
+      if (result.errors.length > 0) {
+        this.error = result.errors.join("; ");
+      }
+    } catch (error) {
+      if (this.isRequestScopeCurrent(scope)) {
+        this.error = String(error);
+      }
+    } finally {
+      if (this.isRequestScopeCurrent(scope)) {
+        this.sessionMutationPending = false;
       }
-    }
-    if (result.errors.length > 0) {
-      this.error = result.errors.join("; ");
     }
   }
 
@@ -619,16 +687,19 @@ class SessionsPage extends LitElement {
   }
 
   private async patchSession(key: string, patch: Parameters<SessionsProps["onPatch"]>[1]) {
-    const context = this.context;
-    if (!context) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
     try {
-      const patched = await context.sessions.patch(key, patch, {
-        agentId: this.sessionAgentId(key),
+      const patched = await scope.sessions.patch(key, patch, {
+        agentId: this.sessionAgentId(key, scope.context),
       });
+      if (!this.isRequestScopeCurrent(scope)) {
+        return;
+      }
       if (!patched) {
-        this.error = context.sessions.state.error;
+        this.error = scope.sessions.state.error;
         return;
       }
       const selectedKeys = new Set(this.selectedKeys);
@@ -636,41 +707,52 @@ class SessionsPage extends LitElement {
       this.selectedKeys = selectedKeys;
       if (
         patch.archived === true &&
-        areUiSessionKeysEquivalent(key, context.gateway.snapshot.sessionKey)
+        areUiSessionKeysEquivalent(key, scope.gateway.snapshot.sessionKey)
       ) {
-        context.gateway.setSessionKey(
+        scope.gateway.setSessionKey(
           buildAgentMainSessionKey({
             agentId:
               parseAgentSessionKey(key)?.agentId ??
-              context.agentSelection.state.selectedId ??
+              scope.context.agentSelection.state.selectedId ??
               "main",
             mainKey: resolveUiConfiguredMainKey({
-              agentsList: context.agents.state.agentsList,
-              hello: context.gateway.snapshot.hello,
+              agentsList: scope.context.agents.state.agentsList,
+              hello: scope.gateway.snapshot.hello,
             }),
           }),
         );
       }
     } catch (error) {
-      this.error = String(error);
+      if (this.isRequestScopeCurrent(scope)) {
+        this.error = String(error);
+      }
     }
   }
 
   private async forkSession(key: string) {
-    const context = this.context;
-    if (!context) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
-    const agentId = this.sessionAgentId(key);
-    const forkedKey = await context.sessions.create({
-      parentSessionKey: key,
-      fork: true,
-      ...(agentId ? { agentId } : {}),
-    });
-    if (forkedKey) {
-      context.navigate("chat", { search: searchForSession(forkedKey), hash: "" });
-    } else if (context.sessions.state.error) {
-      this.error = context.sessions.state.error;
+    const agentId = this.sessionAgentId(key, scope.context);
+    try {
+      const forkedKey = await scope.sessions.create({
+        parentSessionKey: key,
+        fork: true,
+        ...(agentId ? { agentId } : {}),
+      });
+      if (!this.isRequestScopeCurrent(scope)) {
+        return;
+      }
+      if (forkedKey) {
+        scope.context.navigate("chat", { search: searchForSession(forkedKey), hash: "" });
+      } else if (scope.sessions.state.error) {
+        this.error = scope.sessions.state.error;
+      }
+    } catch (error) {
+      if (this.isRequestScopeCurrent(scope)) {
+        this.error = String(error);
+      }
     }
   }
 
@@ -707,23 +789,23 @@ class SessionsPage extends LitElement {
   }
 
   private async loadCheckpoint(sessionKey: string) {
-    const context = this.context;
-    if (!context) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
     const requestId = ++this.checkpointRequestId;
     this.checkpointLoadingKey = sessionKey;
     this.checkpointErrorByKey = { ...this.checkpointErrorByKey, [sessionKey]: "" };
     try {
-      const checkpoints = await context.sessions.listCheckpoints(sessionKey, {
-        agentId: this.sessionAgentId(sessionKey),
+      const checkpoints = await scope.sessions.listCheckpoints(sessionKey, {
+        agentId: this.sessionAgentId(sessionKey, scope.context),
       });
-      if (requestId !== this.checkpointRequestId) {
+      if (requestId !== this.checkpointRequestId || !this.isRequestScopeCurrent(scope)) {
         return;
       }
       this.checkpointItemsByKey = { ...this.checkpointItemsByKey, [sessionKey]: checkpoints };
     } catch (error) {
-      if (requestId !== this.checkpointRequestId) {
+      if (requestId !== this.checkpointRequestId || !this.isRequestScopeCurrent(scope)) {
         return;
       }
       this.checkpointErrorByKey = {
@@ -731,40 +813,44 @@ class SessionsPage extends LitElement {
         [sessionKey]: String(error),
       };
     } finally {
-      if (requestId === this.checkpointRequestId && this.checkpointLoadingKey === sessionKey) {
+      if (
+        requestId === this.checkpointRequestId &&
+        this.isRequestScopeCurrent(scope) &&
+        this.checkpointLoadingKey === sessionKey
+      ) {
         this.checkpointLoadingKey = null;
       }
     }
   }
 
   private async branchCheckpoint(sessionKey: string, checkpointId: string) {
-    const context = this.context;
-    if (!context) {
+    if (!window.confirm("Create a new child session from this compacted checkpoint?")) {
       return;
     }
-    if (!window.confirm("Create a new child session from this compacted checkpoint?")) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
     this.checkpointBusyKey = checkpointId;
     try {
-      const result = await context.sessions.branchCheckpoint(sessionKey, checkpointId, {
-        agentId: this.sessionAgentId(sessionKey),
+      const result = await scope.sessions.branchCheckpoint(sessionKey, checkpointId, {
+        agentId: this.sessionAgentId(sessionKey, scope.context),
       });
-      context.navigate("chat", { search: searchForSession(result.key), hash: "" });
+      if (this.isRequestScopeCurrent(scope)) {
+        scope.context.navigate("chat", { search: searchForSession(result.key), hash: "" });
+      }
     } catch (error) {
-      this.error = String(error);
+      if (this.isRequestScopeCurrent(scope)) {
+        this.error = String(error);
+      }
     } finally {
-      if (this.checkpointBusyKey === checkpointId) {
+      if (this.isRequestScopeCurrent(scope) && this.checkpointBusyKey === checkpointId) {
         this.checkpointBusyKey = null;
       }
     }
   }
 
   private async restoreCheckpoint(sessionKey: string, checkpointId: string) {
-    const context = this.context;
-    if (!context) {
-      return;
-    }
     if (
       !window.confirm(
         "Restore this session to the selected compacted checkpoint?\n\nThis replaces the current active transcript for the session key.",
@@ -772,15 +858,21 @@ class SessionsPage extends LitElement {
     ) {
       return;
     }
+    const scope = this.captureRequestScope();
+    if (!scope) {
+      return;
+    }
     this.checkpointBusyKey = checkpointId;
     try {
-      await context.sessions.restoreCheckpoint(sessionKey, checkpointId, {
-        agentId: this.sessionAgentId(sessionKey),
+      await scope.sessions.restoreCheckpoint(sessionKey, checkpointId, {
+        agentId: this.sessionAgentId(sessionKey, scope.context),
       });
     } catch (error) {
-      this.error = String(error);
+      if (this.isRequestScopeCurrent(scope)) {
+        this.error = String(error);
+      }
     } finally {
-      if (this.checkpointBusyKey === checkpointId) {
+      if (this.isRequestScopeCurrent(scope) && this.checkpointBusyKey === checkpointId) {
         this.checkpointBusyKey = null;
       }
     }
@@ -998,17 +1090,29 @@ class SessionsPage extends LitElement {
   }
 
   private async addToWorkboard(session: GatewaySessionRow) {
-    const context = this.context;
-    if (!context) {
+    const scope = this.captureRequestScope();
+    if (!scope) {
       return;
     }
-    await captureSessionToWorkboard({
-      host: context.workboard,
-      client: context.gateway.snapshot.client,
-      session,
-      requestUpdate: context.workboard.notify,
-    });
-    context.navigate("workboard");
+    try {
+      await captureSessionToWorkboard({
+        host: scope.workboard,
+        client: scope.client,
+        session,
+        requestUpdate: () => {
+          if (this.isRequestScopeCurrent(scope)) {
+            scope.workboard.notify();
+          }
+        },
+      });
+      if (this.isRequestScopeCurrent(scope)) {
+        scope.context.navigate("workboard");
+      }
+    } catch (error) {
+      if (this.isRequestScopeCurrent(scope)) {
+        this.error = String(error);
+      }
+    }
   }
 }
 
diff --git a/ui/src/pages/skill-workshop/skill-workshop-page.test.ts b/ui/src/pages/skill-workshop/skill-workshop-page.test.ts
new file mode 100644
index 00000000000..5bd7fdbf6ed
--- /dev/null
+++ b/ui/src/pages/skill-workshop/skill-workshop-page.test.ts
@@ -0,0 +1,215 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { SessionsListResult } from "../../api/types.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import type { SkillWorkshopProposal } from "../../lib/skill-workshop/index.ts";
+import { createSkillWorkshopState, skillWorkshopRouteData } from "./proposals.ts";
+import type { SkillWorkshopRouteData, SkillWorkshopState } from "./proposals.ts";
+import "./skill-workshop-page.ts";
+
+type SkillWorkshopPageTestElement = HTMLElement & {
+  context: ApplicationContext;
+  data?: SkillWorkshopRouteData;
+  state?: SkillWorkshopState;
+  handleRevisionRequest: (
+    instructions: string,
+    proposal: SkillWorkshopProposal,
+    proposalAgentId: string,
+  ) => Promise<void>;
+  updateComplete: Promise<boolean>;
+  requestUpdate: () => void;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((next) => {
+    resolve = next;
+  });
+  return { promise, resolve };
+}
+
+function createContext(
+  request: ReturnType<typeof vi.fn>,
+  options?: {
+    gatewaySubscribe?: (listener: (snapshot: ApplicationGatewaySnapshot) => void) => () => void;
+    sessions?: ApplicationContext["sessions"];
+  },
+): ApplicationContext {
+  const client = { request } as unknown as GatewayBrowserClient;
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected: true,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: "research",
+    sessionKey: "global",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const subscribe = () => () => undefined;
+  return {
+    gateway: {
+      snapshot,
+      subscribe: options?.gatewaySubscribe ?? subscribe,
+    },
+    config: {
+      current: { assistantIdentity: { name: "OpenClaw" } },
+      subscribe,
+    },
+    agentSelection: {
+      state: { selectedId: "research" },
+      subscribe,
+    },
+    agentIdentity: {
+      get: () => ({ agentId: "research", name: "Research" }),
+      subscribe,
+    },
+    sessions: options?.sessions ?? { state: { result: null, loading: false } },
+    skillWorkshopRevision: { prepare: vi.fn() },
+    navigate: vi.fn(),
+  } as unknown as ApplicationContext;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+});
+
+describe("SkillWorkshopPage lifecycle", () => {
+  it("forces a fresh proposal load when the gateway source changes", async () => {
+    const firstRequest = vi.fn(async () => ({}));
+    const secondRequest = vi.fn(async () => ({
+      schema: "openclaw.skill-workshop.proposals-manifest.v1",
+      updatedAt: "2026-07-08T00:00:00.000Z",
+      proposals: [],
+    }));
+    const loadedState = createSkillWorkshopState();
+    loadedState.skillWorkshopAgentId = "research";
+    loadedState.skillWorkshopLoaded = true;
+    const page = document.createElement(
+      "openclaw-skill-workshop-page",
+    ) as SkillWorkshopPageTestElement;
+    page.data = skillWorkshopRouteData(loadedState);
+    page.context = createContext(firstRequest);
+    document.body.append(page);
+    await page.updateComplete;
+    page.requestUpdate();
+    await page.updateComplete;
+    expect(firstRequest).not.toHaveBeenCalled();
+
+    page.context = createContext(secondRequest);
+    page.requestUpdate();
+    await page.updateComplete;
+
+    await vi.waitFor(() =>
+      expect(secondRequest).toHaveBeenCalledWith("skills.proposals.list", {
+        agentId: "research",
+      }),
+    );
+  });
+
+  it("detaches an in-flight proposal load on a same-client disconnect", async () => {
+    const manifest = deferred<unknown>();
+    const request = vi.fn(() => manifest.promise);
+    let gatewayListener: ((snapshot: ApplicationGatewaySnapshot) => void) | undefined;
+    const context = createContext(request, {
+      gatewaySubscribe: (listener) => {
+        gatewayListener = listener;
+        return () => undefined;
+      },
+    });
+    const page = document.createElement(
+      "openclaw-skill-workshop-page",
+    ) as SkillWorkshopPageTestElement;
+    page.context = context;
+    document.body.append(page);
+    await page.updateComplete;
+    page.requestUpdate();
+    await page.updateComplete;
+    await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(1));
+    const loadingState = page.state;
+
+    gatewayListener?.({ ...context.gateway.snapshot, connected: false });
+    expect(page.state).not.toBe(loadingState);
+    expect(page.state?.skillWorkshopLoaded).toBe(false);
+
+    manifest.resolve({
+      schema: "openclaw.skill-workshop.proposals-manifest.v1",
+      updatedAt: "2026-07-08T00:00:00.000Z",
+      proposals: [],
+    });
+    await manifest.promise;
+    await Promise.resolve();
+    expect(page.state?.skillWorkshopLoaded).toBe(false);
+    expect(page.state?.skillWorkshopProposals).toEqual([]);
+  });
+
+  it("does not prepare or navigate a revision resolved by a replaced context", async () => {
+    const sessionList = deferred<SessionsListResult>();
+    const oldSessions = {
+      state: { agentId: null, result: null, loading: false, error: null },
+      list: vi.fn(() => sessionList.promise),
+      create: vi.fn(async () => null),
+    } as unknown as ApplicationContext["sessions"];
+    const oldContext = createContext(
+      vi.fn(async () => ({})),
+      { sessions: oldSessions },
+    );
+    const loadedState = createSkillWorkshopState();
+    loadedState.skillWorkshopAgentId = "research";
+    loadedState.skillWorkshopLoaded = true;
+    const proposal = {
+      key: "proposal-1",
+      slug: "proposal-1",
+      name: "Proposal",
+      oneLine: "",
+      body: "",
+      status: "pending",
+      version: 1,
+      createdAt: 0,
+      updatedAt: 0,
+      recencyGroup: "today",
+      ageLabel: "now",
+      supportFiles: [],
+      isNew: false,
+      origin: {
+        agentId: "research",
+        sessionKey: "agent:research:revision",
+      },
+    } satisfies SkillWorkshopProposal;
+    loadedState.skillWorkshopProposals = [proposal];
+    loadedState.skillWorkshopSelectedKey = proposal.key;
+    const page = document.createElement(
+      "openclaw-skill-workshop-page",
+    ) as SkillWorkshopPageTestElement;
+    page.data = skillWorkshopRouteData(loadedState);
+    page.context = oldContext;
+    document.body.append(page);
+    await page.updateComplete;
+    page.requestUpdate();
+    await page.updateComplete;
+
+    const revision = page.handleRevisionRequest("revise it", proposal, "research");
+    await vi.waitFor(() => expect(oldSessions.list).toHaveBeenCalledTimes(1));
+
+    const newContext = createContext(vi.fn(async () => ({})));
+    page.context = newContext;
+    page.requestUpdate();
+    await page.updateComplete;
+
+    sessionList.resolve({
+      sessions: [
+        {
+          key: "agent:research:revision",
+          archived: false,
+          hasActiveRun: false,
+        },
+      ],
+    } as SessionsListResult);
+    await revision;
+
+    expect(oldContext.skillWorkshopRevision.prepare).not.toHaveBeenCalled();
+    expect(oldContext.navigate).not.toHaveBeenCalled();
+    expect(newContext.skillWorkshopRevision.prepare).not.toHaveBeenCalled();
+    expect(newContext.navigate).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/src/pages/skill-workshop/skill-workshop-page.ts b/ui/src/pages/skill-workshop/skill-workshop-page.ts
index 6d3661c39f2..8c0bdf1660c 100644
--- a/ui/src/pages/skill-workshop/skill-workshop-page.ts
+++ b/ui/src/pages/skill-workshop/skill-workshop-page.ts
@@ -1,15 +1,21 @@
 // Skill Workshop page owns its Control UI render glue.
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
 import type { GatewaySessionRow, SessionsListResult } from "../../api/types.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { loadSettings } from "../../app/settings.ts";
 import "../../components/tooltip.ts";
 import { t } from "../../i18n/index.ts";
 import { resolveSessionKey, searchForSession } from "../../lib/sessions/index.ts";
 import { normalizeAgentId } from "../../lib/sessions/session-key.ts";
 import { filterSkillWorkshopProposals } from "../../lib/skill-workshop/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import {
   countSkillWorkshopProposals,
   createSkillWorkshopState,
@@ -45,6 +51,17 @@ type SkillWorkshopRenderContext = {
 
 type SkillWorkshopProposal = SkillWorkshopState["skillWorkshopProposals"][number];
 
+type SkillWorkshopSourceScope = {
+  state: SkillWorkshopState;
+  context: SkillWorkshopPageContext;
+  epoch: number;
+  gateway: SkillWorkshopPageContext["gateway"];
+  agentSelection: SkillWorkshopPageContext["agentSelection"];
+  sessions: SkillWorkshopPageContext["sessions"];
+  revision: SkillWorkshopPageContext["skillWorkshopRevision"];
+  navigate: SkillWorkshopPageContext["navigate"];
+};
+
 function findRevisionSessionRow(
   result: SessionsListResult | null,
   sessionKey: string | undefined,
@@ -339,55 +356,169 @@ function renderSkillWorkshopPage(
   `;
 }
 
-class SkillWorkshopPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class SkillWorkshopPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context?: SkillWorkshopPageContext;
   @property({ attribute: false }) data?: SkillWorkshopRouteData;
   @property({ attribute: false }) onRevisionRequest?: SkillWorkshopRevisionRequest;
 
   private state?: SkillWorkshopState;
-  private stopGatewaySubscription?: () => void;
-  private stopConfigSubscription?: () => void;
-  private stopAgentSelectionSubscription?: () => void;
-  private stopAgentIdentitySubscription?: () => void;
+  private sourceEpoch = 0;
+  private hasBoundContext = false;
+  private contextSource?: SkillWorkshopPageContext;
+  private gatewaySource?: SkillWorkshopPageContext["gateway"];
+  private gatewayClient: SkillWorkshopPageContext["gateway"]["snapshot"]["client"] = null;
+  private gatewayConnected = false;
+  private hasBoundAgentSelection = false;
+  private agentSelectionSource?: SkillWorkshopPageContext["agentSelection"];
+  private selectedAgentId?: string | null;
+  private hasBoundSessions = false;
+  private sessionsSource?: SkillWorkshopPageContext["sessions"];
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context,
+      (context) => {
+        const sourceChanged = this.hasBoundContext && this.contextSource !== context;
+        this.hasBoundContext = true;
+        this.contextSource = context;
+        if (sourceChanged) {
+          const gateway = context.gateway;
+          this.gatewaySource = gateway;
+          this.gatewayClient = gateway.snapshot.client;
+          this.gatewayConnected = gateway.snapshot.connected;
+          this.agentSelectionSource = context.agentSelection;
+          this.selectedAgentId = context.agentSelection.state.selectedId;
+          this.sessionsSource = context.sessions;
+          this.resetSourceState();
+          this.loadProposals(true);
+        }
+      },
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const snapshot = gateway.snapshot;
+        const sourceChanged = this.gatewaySource !== undefined && this.gatewaySource !== gateway;
+        const clientChanged =
+          this.gatewaySource !== undefined && this.gatewayClient !== snapshot.client;
+        const connectionChanged =
+          this.gatewaySource !== undefined && this.gatewayConnected !== snapshot.connected;
+        this.applyGatewaySnapshot(
+          gateway,
+          snapshot,
+          sourceChanged || clientChanged || connectionChanged,
+        );
+        const cleanup = gateway.subscribe((nextSnapshot) => {
+          if (this.gatewaySource !== gateway || this.context?.gateway !== gateway) {
+            return;
+          }
+          const sourceEpochChanged =
+            nextSnapshot.client !== this.gatewayClient ||
+            nextSnapshot.connected !== this.gatewayConnected;
+          this.applyGatewaySnapshot(gateway, nextSnapshot, sourceEpochChanged);
+        });
+        return cleanup;
+      },
+    )
+    .watch(
+      () => this.context?.config,
+      (config, notify) => config.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.agentSelection,
+      (agentSelection) => {
+        let resetForSourceBind =
+          this.hasBoundAgentSelection && this.agentSelectionSource !== agentSelection;
+        this.hasBoundAgentSelection = true;
+        this.agentSelectionSource = agentSelection;
+        let initialNotification = true;
+        const handleChange = () => {
+          if (
+            this.agentSelectionSource !== agentSelection ||
+            this.context?.agentSelection !== agentSelection
+          ) {
+            return;
+          }
+          const nextAgentId = agentSelection.state.selectedId;
+          const agentChanged = !initialNotification && this.selectedAgentId !== nextAgentId;
+          this.selectedAgentId = nextAgentId;
+          const sourceEpochChanged = resetForSourceBind || agentChanged;
+          resetForSourceBind = false;
+          initialNotification = false;
+          if (sourceEpochChanged) {
+            this.resetSourceState();
+          }
+          this.loadProposals(sourceEpochChanged);
+        };
+        handleChange();
+        return agentSelection.subscribe(handleChange);
+      },
+    )
+    .effect(
+      () => this.context?.sessions,
+      (sessions) => {
+        const sourceChanged = this.hasBoundSessions && this.sessionsSource !== sessions;
+        this.hasBoundSessions = true;
+        this.sessionsSource = sessions;
+        if (sourceChanged) {
+          this.resetSourceState();
+          this.loadProposals(true);
+        }
+      },
+    )
+    .watch(
+      () => this.context?.agentIdentity,
+      (agentIdentity, notify) => agentIdentity.subscribe(notify),
+    );
 
   private readonly handleRevisionRequest: SkillWorkshopRevisionRequest = async (
     instructions,
     proposal,
     proposalAgentId,
   ) => {
-    if (!this.state || !this.context) {
+    const scope = this.captureSourceScope();
+    if (!scope) {
       throw new Error("Skill Workshop is not ready.");
     }
-    const sessionKey = await resolveRevisionSessionKey(
-      this.state,
-      this.context,
-      proposal,
-      proposalAgentId,
-    );
-    if (!sessionKey) {
-      throw new Error(
-        this.context.sessions.state.error ?? "Could not prepare a Skill Workshop session.",
+    let sessionKey: string | null;
+    try {
+      sessionKey = await resolveRevisionSessionKey(
+        scope.state,
+        scope.context,
+        proposal,
+        proposalAgentId,
       );
+    } catch (error) {
+      if (!this.isCurrentSourceScope(scope)) {
+        return;
+      }
+      throw error;
     }
-    this.context.skillWorkshopRevision.prepare({
-      sessionKey,
-      instructions,
-      proposalId: proposal.key,
-      proposalAgentId: normalizeAgentId(proposal.origin?.agentId ?? proposalAgentId),
-    });
-    this.context.navigate("chat", { search: searchForSession(sessionKey) });
+    if (!this.isCurrentSourceScope(scope)) {
+      return;
+    }
+    if (!sessionKey) {
+      throw new Error(scope.sessions.state.error ?? "Could not prepare a Skill Workshop session.");
+    }
+    try {
+      scope.revision.prepare({
+        sessionKey,
+        instructions,
+        proposalId: proposal.key,
+        proposalAgentId: normalizeAgentId(proposal.origin?.agentId ?? proposalAgentId),
+      });
+    } catch (error) {
+      if (!this.isCurrentSourceScope(scope)) {
+        return;
+      }
+      throw error;
+    }
+    if (!this.isCurrentSourceScope(scope)) {
+      return;
+    }
+    scope.navigate("chat", { search: searchForSession(sessionKey) });
   };
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.startGatewaySubscription();
-  }
-
   override willUpdate() {
     if (!this.state && this.context) {
       this.state = createSkillWorkshopState(this.data);
@@ -398,10 +529,9 @@ class SkillWorkshopPage extends LitElement {
   }
 
   override updated() {
-    this.startGatewaySubscription();
-    this.startConfigSubscription();
-    this.startAgentSelectionSubscription();
-    this.startAgentIdentitySubscription();
+    if (this.gatewayConnected && !this.state?.skillWorkshopLoaded) {
+      this.loadProposals(false);
+    }
     this.ensureWorkshopAgentIdentity();
   }
 
@@ -411,49 +541,79 @@ class SkillWorkshopPage extends LitElement {
     }
   };
 
-  private startGatewaySubscription(): void {
-    const context = this.context;
-    if (!this.state || !context || this.stopGatewaySubscription) {
+  private resetSourceState() {
+    this.sourceEpoch += 1;
+    const previous = this.state;
+    if (!previous) {
       return;
     }
-    this.stopGatewaySubscription = context.gateway.subscribe((snapshot) => {
-      if (!snapshot.connected || !this.state || !this.context) {
-        return;
-      }
-      void loadSkillWorkshopProposals(this.state, this.context).finally(this.requestPageUpdate);
-    });
-    if (!this.data?.skillWorkshopLoaded && context.gateway.snapshot.connected) {
-      void loadSkillWorkshopProposals(this.state, context).finally(this.requestPageUpdate);
+    if (previous.skillWorkshopActionNoticeTimer) {
+      globalThis.clearTimeout(previous.skillWorkshopActionNoticeTimer);
+    }
+    const next = createSkillWorkshopState();
+    next.skillWorkshopStatusFilter = previous.skillWorkshopStatusFilter;
+    next.skillWorkshopQuery = previous.skillWorkshopQuery;
+    next.skillWorkshopQueueWidth = previous.skillWorkshopQueueWidth;
+    next.skillWorkshopMode = previous.skillWorkshopMode;
+    next.skillWorkshopUseCurrentChatForRevisions = previous.skillWorkshopUseCurrentChatForRevisions;
+    this.state = next;
+    this.requestPageUpdate();
+  }
+
+  private applyGatewaySnapshot(
+    gateway: SkillWorkshopPageContext["gateway"],
+    snapshot: ApplicationGatewaySnapshot,
+    sourceEpochChanged: boolean,
+  ) {
+    this.gatewaySource = gateway;
+    this.gatewayClient = snapshot.client;
+    this.gatewayConnected = snapshot.connected;
+    if (sourceEpochChanged) {
+      this.resetSourceState();
+    }
+    if (snapshot.connected && (sourceEpochChanged || !this.state?.skillWorkshopLoaded)) {
+      this.loadProposals(sourceEpochChanged);
     }
   }
 
-  private startAgentIdentitySubscription(): void {
+  private captureSourceScope(): SkillWorkshopSourceScope | null {
+    const state = this.state;
     const context = this.context;
-    if (!context || this.stopAgentIdentitySubscription) {
-      return;
+    if (!state || !context) {
+      return null;
     }
-    this.stopAgentIdentitySubscription = context.agentIdentity.subscribe(this.requestPageUpdate);
+    return {
+      state,
+      context,
+      epoch: this.sourceEpoch,
+      gateway: context.gateway,
+      agentSelection: context.agentSelection,
+      sessions: context.sessions,
+      revision: context.skillWorkshopRevision,
+      navigate: context.navigate,
+    };
   }
 
-  private startConfigSubscription(): void {
-    const context = this.context;
-    if (!context || this.stopConfigSubscription) {
-      return;
-    }
-    this.stopConfigSubscription = context.config.subscribe(this.requestPageUpdate);
+  private isCurrentSourceScope(scope: SkillWorkshopSourceScope): boolean {
+    return (
+      this.state === scope.state &&
+      this.context === scope.context &&
+      this.sourceEpoch === scope.epoch &&
+      this.context.gateway === scope.gateway &&
+      this.context.agentSelection === scope.agentSelection &&
+      this.context.sessions === scope.sessions &&
+      this.context.skillWorkshopRevision === scope.revision &&
+      this.context.navigate === scope.navigate
+    );
   }
 
-  private startAgentSelectionSubscription(): void {
+  private loadProposals(force: boolean) {
+    const state = this.state;
     const context = this.context;
-    if (!context || !this.state || this.stopAgentSelectionSubscription) {
+    if (!state || !context || !context.gateway.snapshot.connected) {
       return;
     }
-    this.stopAgentSelectionSubscription = context.agentSelection.subscribe(() => {
-      if (!this.state || !this.context) {
-        return;
-      }
-      void loadSkillWorkshopProposals(this.state, this.context).finally(this.requestPageUpdate);
-    });
+    void loadSkillWorkshopProposals(state, context, { force }).finally(this.requestPageUpdate);
   }
 
   private ensureWorkshopAgentIdentity(): void {
@@ -466,18 +626,8 @@ class SkillWorkshopPage extends LitElement {
   }
 
   override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
-    this.stopAgentSelectionSubscription?.();
-    this.stopAgentSelectionSubscription = undefined;
-    this.stopAgentIdentitySubscription?.();
-    this.stopAgentIdentitySubscription = undefined;
-    if (this.state?.skillWorkshopActionNoticeTimer) {
-      globalThis.clearTimeout(this.state.skillWorkshopActionNoticeTimer);
-      this.state.skillWorkshopActionNoticeTimer = null;
-    }
+    this.subscriptions.clear();
+    this.resetSourceState();
     super.disconnectedCallback();
   }
 
diff --git a/ui/src/pages/skills/route.ts b/ui/src/pages/skills/route.ts
index cab7474c721..8d04b031b29 100644
--- a/ui/src/pages/skills/route.ts
+++ b/ui/src/pages/skills/route.ts
@@ -9,11 +9,15 @@ function errorMessage(error: unknown): string {
 }
 
 async function loadSkillsRouteData(context: ApplicationContext): Promise<SkillsRouteData> {
-  const gateway = context.gateway.snapshot;
-  const client = gateway.client;
-  if (!gateway.connected || !client) {
+  const gateway = context.gateway;
+  const gatewaySnapshot = gateway.snapshot;
+  const agents = context.agents;
+  const client = gatewaySnapshot.client;
+  if (!gatewaySnapshot.connected || !client) {
     return {
-      connected: false,
+      gateway,
+      gatewaySnapshot,
+      agents,
       agentsList: null,
       selectedAgentId: null,
       report: null,
@@ -25,7 +29,7 @@ async function loadSkillsRouteData(context: ApplicationContext): Promise<SkillsR
   let agentsList: SkillsRouteData["agentsList"] = null;
   let report: SkillsRouteData["report"] = null;
   try {
-    agentsList = await context.agents.ensureList();
+    agentsList = await agents.ensureList();
   } catch (err) {
     error = errorMessage(err);
   }
@@ -35,7 +39,9 @@ async function loadSkillsRouteData(context: ApplicationContext): Promise<SkillsR
     error ??= errorMessage(err);
   }
   return {
-    connected: true,
+    gateway,
+    gatewaySnapshot,
+    agents,
     agentsList,
     selectedAgentId: null,
     report,
diff --git a/ui/src/pages/skills/skills-page.ts b/ui/src/pages/skills/skills-page.ts
index 1f8e6069bea..348cc12aa97 100644
--- a/ui/src/pages/skills/skills-page.ts
+++ b/ui/src/pages/skills/skills-page.ts
@@ -1,10 +1,14 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type { AgentsListResult, SkillStatusReport } from "../../api/types.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import {
   closeClawHubDetail,
@@ -25,22 +29,22 @@ import {
   type ClawHubSkillSecurityVerdict,
   type SkillMessageMap,
 } from "../../lib/skills/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderSkills, type SkillDetailTab, type SkillsStatusFilter } from "./view.ts";
 
 export type SkillsRouteData = {
-  connected: boolean;
+  gateway: ApplicationContext["gateway"];
+  gatewaySnapshot: ApplicationGatewaySnapshot;
+  agents: ApplicationContext["agents"];
   agentsList: AgentsListResult | null;
   selectedAgentId: string | null;
   report: SkillStatusReport | null;
   error: string | null;
 };
 
-class SkillsPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class SkillsPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @property({ attribute: false }) routeData?: SkillsRouteData;
@@ -86,51 +90,61 @@ class SkillsPage extends LitElement {
   @state() skillCardLoadingKey: string | null = null;
   @state() skillCardErrors: Record<string, string> = {};
 
-  private stopGatewaySubscription?: () => void;
-  private stopAgentsSubscription?: () => void;
   private clawhubSearchTimer: ReturnType<typeof setTimeout> | null = null;
+  private routeDataInitialized = false;
+  private routeDataEnabled = true;
+  private hasBoundGatewaySource = false;
+  private sourceGeneration = 0;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const resetForSourceBind = this.hasBoundGatewaySource;
+        this.hasBoundGatewaySource = true;
+        const cleanup = gateway.subscribe((snapshot) => this.applyGatewaySnapshot(snapshot));
+        this.applyGatewaySnapshot(gateway.snapshot, resetForSourceBind);
+        return cleanup;
+      },
+    )
+    .effect(
+      () => this.context?.agents,
+      (agents) => {
+        const cleanup = agents.subscribe(() => {
+          this.syncAgentState();
+          this.requestUpdate();
+        });
+        this.syncAgentState();
+        this.ensureInitialData();
+        return cleanup;
+      },
+    );
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncGatewayState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe(() => {
-      const previousClient = this.client;
-      this.syncGatewayState();
-      if (previousClient !== this.client) {
-        this.resetLoadedSkillState();
-      }
-      this.ensureInitialData();
-    });
-    this.stopAgentsSubscription = this.context.agents.subscribe(() => {
-      this.syncAgentState();
-      this.requestUpdate();
-    });
-    this.syncAgentState();
-    this.ensureInitialData();
-  }
-
-  override willUpdate(changed: Map<PropertyKey, unknown>) {
+  override willUpdate(changed: PropertyValues<this>) {
     if (changed.has("routeData")) {
       this.applyRouteData();
+      this.ensureInitialData();
     }
   }
 
   override disconnectedCallback() {
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopAgentsSubscription?.();
-    this.stopAgentsSubscription = undefined;
+    this.subscriptions.clear();
     if (this.clawhubSearchTimer) {
       clearTimeout(this.clawhubSearchTimer);
       this.clawhubSearchTimer = null;
     }
+    this.resetLoadedSkillState();
     super.disconnectedCallback();
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    this.client = gateway.client;
-    this.connected = gateway.connected;
+  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, resetForSourceBind = false) {
+    const clientChanged = resetForSourceBind || snapshot.client !== this.client;
+    const connectionChanged = snapshot.connected !== this.connected;
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
+    if (clientChanged || connectionChanged) {
+      this.resetLoadedSkillState();
+    }
+    this.ensureInitialData();
   }
 
   private syncAgentState() {
@@ -149,6 +163,14 @@ class SkillsPage extends LitElement {
   }
 
   private resetLoadedSkillState() {
+    this.sourceGeneration++;
+    if (this.clawhubSearchTimer) {
+      clearTimeout(this.clawhubSearchTimer);
+      this.clawhubSearchTimer = null;
+    }
+    if (this.routeDataInitialized) {
+      this.routeDataEnabled = false;
+    }
     this.agentsLoading = false;
     this.agentsError = null;
     this.agentsList = null;
@@ -162,6 +184,13 @@ class SkillsPage extends LitElement {
     this.skillMessages = {};
     this.skillsDetailKey = null;
     this.skillsDetailTab = "overview";
+    this.clawhubSearchResults = null;
+    this.clawhubSearchLoading = false;
+    this.clawhubSearchError = null;
+    this.clawhubDetail = null;
+    this.clawhubDetailSlug = null;
+    this.clawhubDetailLoading = false;
+    this.clawhubDetailError = null;
     this.clawhubInstallSlug = null;
     this.clawhubInstallMessage = null;
     this.clawhubVerdicts = {};
@@ -178,10 +207,23 @@ class SkillsPage extends LitElement {
     if (!data) {
       return;
     }
+    this.routeDataInitialized = true;
+    this.routeDataEnabled = true;
+    const gateway = this.context.gateway;
+    const snapshot = gateway.snapshot;
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
+    if (
+      data.gateway !== gateway ||
+      data.gatewaySnapshot !== snapshot ||
+      data.agents !== this.context.agents
+    ) {
+      this.routeDataEnabled = false;
+      return;
+    }
     if (this.skillsAgentId && data.selectedAgentId && data.selectedAgentId !== this.skillsAgentId) {
       return;
     }
-    this.connected = data.connected;
     this.agentsLoading = false;
     this.agentsError = null;
     this.agentsList = data.agentsList ?? this.context.agents.state.agentsList;
@@ -195,7 +237,10 @@ class SkillsPage extends LitElement {
     if (!this.connected || !this.client) {
       return;
     }
-    if (this.routeData?.agentsList || this.routeData?.report || this.routeData?.error) {
+    if (
+      this.routeDataEnabled &&
+      (this.routeData?.agentsList || this.routeData?.report || this.routeData?.error)
+    ) {
       return;
     }
     if (!this.agentsList && !this.agentsLoading) {
@@ -204,6 +249,14 @@ class SkillsPage extends LitElement {
     if (!this.skillsReport && !this.skillsLoading) {
       void loadSkills(this);
     }
+    if (
+      this.clawhubSearchQuery.trim() &&
+      !this.clawhubSearchLoading &&
+      !this.clawhubSearchResults &&
+      !this.clawhubSearchError
+    ) {
+      void searchClawHub(this, this.clawhubSearchQuery);
+    }
   }
 
   private async loadAgents() {
@@ -211,15 +264,25 @@ class SkillsPage extends LitElement {
     if (!client || !this.connected || this.agentsLoading) {
       return;
     }
-    if (this.context.agents.state.agentsList) {
+    const gatewaySource = this.context.gateway;
+    const agentsSource = this.context.agents;
+    const sourceGeneration = this.sourceGeneration;
+    const isCurrent = () =>
+      this.isConnected &&
+      this.connected &&
+      this.client === client &&
+      this.context.gateway === gatewaySource &&
+      this.context.agents === agentsSource &&
+      this.sourceGeneration === sourceGeneration;
+    if (agentsSource.state.agentsList) {
       this.syncAgentState();
       return;
     }
     this.agentsLoading = true;
     this.agentsError = null;
     try {
-      const agents = await this.context.agents.ensureList();
-      if (this.client !== client) {
+      const agents = await agentsSource.ensureList();
+      if (!isCurrent()) {
         return;
       }
       this.agentsList = agents;
@@ -230,11 +293,11 @@ class SkillsPage extends LitElement {
         this.skillsDetailTab = "overview";
       }
     } catch (err) {
-      if (this.client === client) {
+      if (isCurrent()) {
         this.agentsError = String(err);
       }
     } finally {
-      if (this.client === client) {
+      if (isCurrent()) {
         this.agentsLoading = false;
       }
     }
diff --git a/ui/src/pages/tasks/tasks-page.test.ts b/ui/src/pages/tasks/tasks-page.test.ts
new file mode 100644
index 00000000000..3491449c764
--- /dev/null
+++ b/ui/src/pages/tasks/tasks-page.test.ts
@@ -0,0 +1,98 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import "./tasks-page.ts";
+
+type TasksPageTestElement = HTMLElement & {
+  context: ApplicationContext;
+  error: string | null;
+  cancellingTaskIds: Set<string>;
+  cancelTask: (taskId: string) => Promise<void>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((resolvePromise) => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+}
+
+function createGateway(client: GatewayBrowserClient) {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected: true,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  let snapshotListener: ((snapshot: ApplicationGatewaySnapshot) => void) | undefined;
+  const gateway = {
+    snapshot,
+    subscribe(listener: (snapshot: ApplicationGatewaySnapshot) => void) {
+      snapshotListener = listener;
+      return () => {
+        if (snapshotListener === listener) {
+          snapshotListener = undefined;
+        }
+      };
+    },
+    subscribeEvents: () => () => undefined,
+  } as unknown as ApplicationContext["gateway"];
+  return {
+    emitConnected(connected: boolean) {
+      snapshot.connected = connected;
+      snapshotListener?.(snapshot);
+    },
+    gateway,
+  };
+}
+
+function createContext(gateway: ApplicationContext["gateway"]): ApplicationContext {
+  return {
+    basePath: "",
+    gateway,
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("TasksPage cancellation lifecycle", () => {
+  it("discards a cancellation response across a same-client reconnect", async () => {
+    const pendingCancel = deferred<{ cancelled: false; found: true; reason: string }>();
+    const request = vi.fn((method: string) => {
+      if (method === "tasks.cancel") {
+        return pendingCancel.promise;
+      }
+      return Promise.resolve({ tasks: [] });
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const source = createGateway(client);
+    const page = document.createElement("openclaw-tasks-page") as TasksPageTestElement;
+    page.context = createContext(source.gateway);
+    document.body.append(page);
+    await vi.waitFor(() => expect(request).toHaveBeenCalledWith("tasks.list", expect.anything()));
+
+    const cancelling = page.cancelTask("task-1");
+    await vi.waitFor(() =>
+      expect(request).toHaveBeenCalledWith("tasks.cancel", { taskId: "task-1" }),
+    );
+    expect(page.cancellingTaskIds.has("task-1")).toBe(true);
+
+    source.emitConnected(false);
+    source.emitConnected(true);
+    pendingCancel.resolve({ cancelled: false, found: true, reason: "stale refusal" });
+    await cancelling;
+
+    expect(page.error).toBeNull();
+    expect(page.cancellingTaskIds.size).toBe(0);
+  });
+});
diff --git a/ui/src/pages/tasks/tasks-page.ts b/ui/src/pages/tasks/tasks-page.ts
index eeb28fcbf0f..253fbf240f7 100644
--- a/ui/src/pages/tasks/tasks-page.ts
+++ b/ui/src/pages/tasks/tasks-page.ts
@@ -1,12 +1,18 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html } from "lit";
 import { state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
-import { applicationContext, type ApplicationContext } from "../../app/context.ts";
+import {
+  applicationContext,
+  type ApplicationContext,
+  type ApplicationGatewaySnapshot,
+} from "../../app/context.ts";
 import { hasOperatorWriteAccess } from "../../app/operator-access.ts";
 import { t } from "../../i18n/index.ts";
 import { searchForSession } from "../../lib/sessions/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import {
   applyTaskEvent,
   mergeTaskLists,
@@ -23,12 +29,8 @@ function formatTaskError(error: unknown, fallback: string): string {
   return typeof error === "string" && error.trim() ? error.trim() : fallback;
 }
 
-class TasksPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class TasksPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private tasks: TaskSummary[] = [];
@@ -39,61 +41,117 @@ class TasksPage extends LitElement {
 
   private client: GatewayBrowserClient | null = null;
   private loadGeneration = 0;
-  private stopGatewaySubscription?: () => void;
-  private stopGatewayEvents?: () => void;
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.syncGatewayState();
-    this.stopGatewaySubscription = this.context.gateway.subscribe(() => {
-      const wasConnected = this.connected;
-      const previousClient = this.client;
-      this.syncGatewayState();
-      if (this.connected && (this.client !== previousClient || !wasConnected)) {
+  private operationEpoch = 0;
+  private gatewaySource?: ApplicationContext["gateway"];
+  private readonly subscriptions = new SubscriptionsController(this).effect(
+    () => this.context?.gateway,
+    (gateway) => {
+      const sourceChanged = this.gatewaySource !== undefined && this.gatewaySource !== gateway;
+      this.gatewaySource = gateway;
+      this.applyGatewaySnapshot(gateway.snapshot, sourceChanged);
+      const stopGateway = gateway.subscribe((snapshot) => {
+        if (this.gatewaySource !== gateway || this.context.gateway !== gateway) {
+          return;
+        }
+        const wasConnected = this.connected;
+        const previousClient = this.client;
+        this.applyGatewaySnapshot(snapshot, false);
+        if (this.connected && (this.client !== previousClient || !wasConnected)) {
+          void this.refreshTasks();
+        }
+      });
+      const stopEvents = gateway.subscribeEvents((event) => {
+        if (
+          this.gatewaySource !== gateway ||
+          this.context.gateway !== gateway ||
+          !this.connected ||
+          event.event !== "task"
+        ) {
+          return;
+        }
+        const result = applyTaskEvent(this.tasks, event.payload);
+        if (result.refetch) {
+          void this.refreshTasks();
+          return;
+        }
+        this.tasks = result.tasks;
+      });
+      if (this.connected) {
         void this.refreshTasks();
       }
-    });
-    this.stopGatewayEvents = this.context.gateway.subscribeEvents((event) => {
-      if (event.event !== "task") {
-        return;
-      }
-      const result = applyTaskEvent(this.tasks, event.payload);
-      if (result.refetch) {
-        void this.refreshTasks();
-        return;
-      }
-      this.tasks = result.tasks;
-    });
-    if (this.connected) {
-      void this.refreshTasks();
-    }
-  }
+      return () => {
+        stopGateway();
+        stopEvents();
+      };
+    },
+  );
 
   override disconnectedCallback() {
-    this.loadGeneration += 1;
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopGatewayEvents?.();
-    this.stopGatewayEvents = undefined;
+    this.subscriptions.clear();
+    this.invalidateGatewayWork();
+    this.gatewaySource = undefined;
+    this.client = null;
+    this.connected = false;
     super.disconnectedCallback();
   }
 
-  private syncGatewayState() {
-    const gateway = this.context.gateway.snapshot;
-    if (this.client !== gateway.client) {
-      this.loadGeneration += 1;
-      this.client = gateway.client;
-      this.tasks = [];
-      this.loading = false;
-      this.error = null;
-      this.cancellingTaskIds = new Set();
+  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, sourceChanged: boolean) {
+    const identityChanged = sourceChanged || this.client !== snapshot.client;
+    const connectionChanged = this.connected !== snapshot.connected;
+    if (identityChanged || connectionChanged) {
+      this.invalidateGatewayWork();
     }
-    this.connected = gateway.connected;
+    if (identityChanged) {
+      this.client = snapshot.client;
+      this.tasks = [];
+      this.error = null;
+    }
+    this.connected = snapshot.connected;
+  }
+
+  private invalidateGatewayWork() {
+    // Reconnects may reuse the client object; the epoch keeps pre-disconnect
+    // cancellation responses from mutating the replacement task snapshot.
+    this.loadGeneration += 1;
+    this.operationEpoch += 1;
+    this.loading = false;
+    this.cancellingTaskIds = new Set();
+  }
+
+  private isCancelScopeCurrent(
+    gateway: ApplicationContext["gateway"],
+    client: GatewayBrowserClient,
+    epoch: number,
+  ): boolean {
+    return (
+      this.isConnected &&
+      this.connected &&
+      this.gatewaySource === gateway &&
+      this.context.gateway === gateway &&
+      this.client === client &&
+      this.operationEpoch === epoch
+    );
+  }
+
+  private isLoadScopeCurrent(
+    gateway: ApplicationContext["gateway"],
+    client: GatewayBrowserClient,
+    generation: number,
+  ): boolean {
+    return (
+      this.isConnected &&
+      this.connected &&
+      this.gatewaySource === gateway &&
+      this.context.gateway === gateway &&
+      this.client === client &&
+      this.loadGeneration === generation
+    );
   }
 
   private async refreshTasks() {
+    const gateway = this.gatewaySource;
     const client = this.client;
-    if (!this.connected || !client) {
+    if (!gateway || this.context.gateway !== gateway || !this.connected || !client) {
       return;
     }
     const generation = ++this.loadGeneration;
@@ -112,15 +170,15 @@ class TasksPage extends LitElement {
         throw new Error(t("tasksPage.invalidResponse"));
       }
       const tasks = mergeTaskLists(recent, active);
-      if (generation === this.loadGeneration && client === this.client) {
+      if (this.isLoadScopeCurrent(gateway, client, generation)) {
         this.tasks = tasks;
       }
     } catch (error) {
-      if (generation === this.loadGeneration && client === this.client) {
+      if (this.isLoadScopeCurrent(gateway, client, generation)) {
         this.error = formatTaskError(error, t("tasksPage.loadFailed"));
       }
     } finally {
-      if (generation === this.loadGeneration && client === this.client) {
+      if (this.isLoadScopeCurrent(gateway, client, generation)) {
         this.loading = false;
       }
     }
@@ -128,13 +186,24 @@ class TasksPage extends LitElement {
 
   private async cancelTask(taskId: string) {
     const client = this.client;
-    if (!this.connected || !client || this.cancellingTaskIds.has(taskId)) {
+    const gateway = this.gatewaySource;
+    if (
+      !gateway ||
+      this.context.gateway !== gateway ||
+      !this.connected ||
+      !client ||
+      this.cancellingTaskIds.has(taskId)
+    ) {
       return;
     }
+    const epoch = this.operationEpoch;
     this.cancellingTaskIds = new Set([...this.cancellingTaskIds, taskId]);
     this.error = null;
     try {
       const payload = await client.request("tasks.cancel", { taskId });
+      if (!this.isCancelScopeCurrent(gateway, client, epoch)) {
+        return;
+      }
       const result = normalizeTasksCancelResult(payload);
       if (result?.task) {
         this.tasks = applyTaskEvent(this.tasks, { action: "upserted", task: result.task }).tasks;
@@ -145,11 +214,15 @@ class TasksPage extends LitElement {
         this.error = result?.reason?.trim() || t("tasksPage.cancelFailed");
       }
     } catch (error) {
-      this.error = formatTaskError(error, t("tasksPage.cancelFailed"));
+      if (this.isCancelScopeCurrent(gateway, client, epoch)) {
+        this.error = formatTaskError(error, t("tasksPage.cancelFailed"));
+      }
     } finally {
-      const next = new Set(this.cancellingTaskIds);
-      next.delete(taskId);
-      this.cancellingTaskIds = next;
+      if (this.isCancelScopeCurrent(gateway, client, epoch)) {
+        const next = new Set(this.cancellingTaskIds);
+        next.delete(taskId);
+        this.cancellingTaskIds = next;
+      }
     }
   }
 
diff --git a/ui/src/pages/usage/route.ts b/ui/src/pages/usage/route.ts
index 17429ead011..c6c9a23fc7f 100644
--- a/ui/src/pages/usage/route.ts
+++ b/ui/src/pages/usage/route.ts
@@ -26,7 +26,8 @@ function errorMessage(error: unknown): string {
 }
 
 async function loadUsageRouteData(context: ApplicationContext): Promise<UsageRouteData> {
-  const gateway = context.gateway.snapshot;
+  const gateway = context.gateway;
+  const gatewaySnapshot = gateway.snapshot;
   const startDate = currentLocalDate();
   const query: UsageRouteData["query"] = {
     startDate,
@@ -35,10 +36,10 @@ async function loadUsageRouteData(context: ApplicationContext): Promise<UsageRou
     timeZone: "local",
     agentId: null,
   };
-  if (!gateway.connected || !gateway.client) {
+  if (!gatewaySnapshot.connected || !gatewaySnapshot.client) {
     return {
-      client: gateway.client,
-      connected: gateway.connected,
+      gateway,
+      gatewaySnapshot,
       query,
       result: null,
       costSummary: null,
@@ -49,21 +50,21 @@ async function loadUsageRouteData(context: ApplicationContext): Promise<UsageRou
 
   try {
     const [result, costSummary, providerUsageSummary] = await Promise.all([
-      requestSessionUsage(gateway.client, {
+      requestSessionUsage(gatewaySnapshot.client, {
         ...query,
         agentId: query.agentId ?? undefined,
       }),
-      gateway.client.request<CostUsageSummary>("usage.cost", {
+      gatewaySnapshot.client.request<CostUsageSummary>("usage.cost", {
         startDate: query.startDate,
         endDate: query.endDate,
         agentScope: "all",
         ...buildSessionUsageDateParams(query.timeZone),
       }),
-      gateway.client.request<ProviderUsageSummary>("usage.status").catch(() => null),
+      gatewaySnapshot.client.request<ProviderUsageSummary>("usage.status").catch(() => null),
     ]);
     return {
-      client: gateway.client,
-      connected: true,
+      gateway,
+      gatewaySnapshot,
       query,
       result,
       costSummary,
@@ -72,8 +73,8 @@ async function loadUsageRouteData(context: ApplicationContext): Promise<UsageRou
     };
   } catch (error) {
     return {
-      client: gateway.client,
-      connected: true,
+      gateway,
+      gatewaySnapshot,
       query,
       result: null,
       costSummary: null,
diff --git a/ui/src/pages/usage/usage-page.ts b/ui/src/pages/usage/usage-page.ts
index 1e761868885..5cf30be8282 100644
--- a/ui/src/pages/usage/usage-page.ts
+++ b/ui/src/pages/usage/usage-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement } from "lit";
+import { html, type PropertyValues } from "lit";
 import { property, state } from "lit/decorators.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
 import type {
@@ -24,6 +24,8 @@ import {
   requestSessionUsageTimeSeries,
 } from "../../lib/sessions/index.ts";
 import { normalizeLowercaseStringOrEmpty } from "../../lib/string-coerce.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { mergeUsageCacheStatus } from "./cache-status.ts";
 import type { ProviderUsageSummary } from "./data-types.ts";
 import { selectUsageSessionKeys, toggleUsageRangeSelection } from "./helpers.ts";
@@ -31,8 +33,9 @@ import type { SessionLogEntry, SessionLogRole, UsageColumnId, UsageProps } from
 import { renderUsage } from "./view.ts";
 
 export type UsageRouteData = {
-  client: GatewayBrowserClient | null;
-  connected: boolean;
+  // Client identity alone cannot distinguish provider replacement or reconnect epochs.
+  gateway: ApplicationContext["gateway"];
+  gatewaySnapshot: ApplicationGatewaySnapshot;
   query: {
     startDate: string;
     endDate: string;
@@ -79,12 +82,8 @@ function toErrorMessage(error: unknown): string {
   return "request failed";
 }
 
-class UsagePage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class UsagePage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @property({ attribute: false }) routeData?: UsageRouteData;
@@ -135,36 +134,34 @@ class UsagePage extends LitElement {
   private logsRequestId = 0;
   private dateDebounceTimer: number | null = null;
   private queryDebounceTimer: number | null = null;
-  private subscriptions: Array<() => void> = [];
   private routeDataInitialized = false;
   private routeDataEnabled = true;
+  private hasBoundGatewaySource = false;
+  private readonly subscriptions = new SubscriptionsController(this)
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const resetForSourceBind = this.hasBoundGatewaySource;
+        this.hasBoundGatewaySource = true;
+        const cleanup = gateway.subscribe((snapshot) => this.applyGatewaySnapshot(snapshot));
+        this.applyGatewaySnapshot(gateway.snapshot, resetForSourceBind);
+        return cleanup;
+      },
+    )
+    .watch(
+      () => this.context?.agents,
+      (agents, notify) => agents.subscribe(notify),
+    );
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.subscriptions = [
-      this.context.gateway.subscribe((snapshot) => this.applyGatewaySnapshot(snapshot)),
-      this.context.agents.subscribe(() => this.requestUpdate()),
-    ];
-    this.applyGatewaySnapshot(this.context.gateway.snapshot, true);
-  }
-
-  override willUpdate(changed: Map<PropertyKey, unknown>) {
+  override willUpdate(changed: PropertyValues<this>) {
     if (changed.has("routeData")) {
       this.applyRouteData();
-    }
-  }
-
-  override updated(changed: Map<PropertyKey, unknown>) {
-    if (changed.has("routeData")) {
       this.ensureInitialData();
     }
   }
 
   override disconnectedCallback() {
-    for (const unsubscribe of this.subscriptions) {
-      unsubscribe();
-    }
-    this.subscriptions = [];
+    this.subscriptions.clear();
     this.clearDateDebounce();
     this.clearQueryDebounce();
     this.invalidateRequests();
@@ -173,13 +170,13 @@ class UsagePage extends LitElement {
     super.disconnectedCallback();
   }
 
-  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, initial = false) {
-    const clientChanged = snapshot.client !== this.client;
+  private applyGatewaySnapshot(snapshot: ApplicationGatewaySnapshot, resetForSourceBind = false) {
+    const clientChanged = resetForSourceBind || snapshot.client !== this.client;
     const becameConnected = snapshot.connected && !this.connected;
     this.client = snapshot.client;
     this.connected = snapshot.connected;
 
-    if (clientChanged && !initial) {
+    if (clientChanged) {
       this.resetForClientChange();
     }
     if (!snapshot.connected || !snapshot.client) {
@@ -202,8 +199,11 @@ class UsagePage extends LitElement {
     if (!this.routeDataEnabled) {
       return;
     }
-    const gateway = this.context.gateway.snapshot;
-    if (data.client !== gateway.client || data.connected !== gateway.connected) {
+    const gateway = this.context.gateway;
+    const snapshot = gateway.snapshot;
+    this.client = snapshot.client;
+    this.connected = snapshot.connected;
+    if (data.gateway !== gateway || data.gatewaySnapshot !== snapshot) {
       this.routeDataEnabled = false;
       this.usageLoading = false;
       return;
@@ -237,7 +237,9 @@ class UsagePage extends LitElement {
   private resetForClientChange() {
     this.clearDateDebounce();
     this.invalidateRequests();
-    this.routeDataEnabled = false;
+    if (this.routeDataInitialized) {
+      this.routeDataEnabled = false;
+    }
     this.usageResult = null;
     this.usageCostSummary = null;
     this.providerUsageSummary = null;
diff --git a/ui/src/pages/workboard/workboard-page.test.ts b/ui/src/pages/workboard/workboard-page.test.ts
new file mode 100644
index 00000000000..faaecdde199
--- /dev/null
+++ b/ui/src/pages/workboard/workboard-page.test.ts
@@ -0,0 +1,87 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import { createWorkboardCapability } from "../../lib/workboard/capability.ts";
+import type { WorkboardCapability } from "../../lib/workboard/capability.ts";
+
+const { stopPolling, stopLifecycleRefresh } = vi.hoisted(() => ({
+  stopPolling: vi.fn(),
+  stopLifecycleRefresh: vi.fn(),
+}));
+
+vi.mock("../../lib/workboard/index.ts", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("../../lib/workboard/index.ts")>()),
+  configureWorkboardPolling: vi.fn(),
+  loadWorkboard: vi.fn(async () => true),
+  stopWorkboardLifecycleRefresh: stopLifecycleRefresh,
+  stopWorkboardPolling: stopPolling,
+  syncWorkboardLifecycle: vi.fn(async () => undefined),
+}));
+
+await import("./workboard-page.ts");
+
+type WorkboardPageTestElement = HTMLElement & {
+  context: ApplicationContext;
+  updateComplete: Promise<boolean>;
+};
+
+function contextWithWorkboard(workboard: WorkboardCapability): ApplicationContext {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client: null,
+    connected: false,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  const subscribe = () => () => undefined;
+  return {
+    basePath: "",
+    gateway: { snapshot, subscribe } as unknown as ApplicationContext["gateway"],
+    agents: {
+      state: { agentsList: null, agentsLoading: false },
+      subscribe,
+    } as unknown as ApplicationContext["agents"],
+    runtimeConfig: {
+      state: {
+        configSnapshot: {
+          config: { plugins: { entries: { workboard: { enabled: true } } } },
+        },
+        configLoading: false,
+      },
+      subscribe,
+    } as unknown as ApplicationContext["runtimeConfig"],
+    sessions: {
+      state: { result: null, loading: false },
+      subscribe,
+    } as unknown as ApplicationContext["sessions"],
+    workboard,
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.clearAllMocks();
+});
+
+describe("WorkboardPage lifecycle", () => {
+  it("stops the previous capability runtime when the workboard source changes", async () => {
+    const first = createWorkboardCapability();
+    const second = createWorkboardCapability();
+    const page = document.createElement("openclaw-workboard-page") as WorkboardPageTestElement;
+    page.context = contextWithWorkboard(first);
+    document.body.append(page);
+    await page.updateComplete;
+    vi.clearAllMocks();
+
+    page.context = contextWithWorkboard(second);
+    (page as unknown as { requestUpdate: () => void }).requestUpdate();
+    await page.updateComplete;
+
+    expect(stopPolling).toHaveBeenCalledWith(first);
+    expect(stopLifecycleRefresh).toHaveBeenCalledWith(first);
+  });
+});
diff --git a/ui/src/pages/workboard/workboard-page.ts b/ui/src/pages/workboard/workboard-page.ts
index 2397ef087f7..2208728fb10 100644
--- a/ui/src/pages/workboard/workboard-page.ts
+++ b/ui/src/pages/workboard/workboard-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing } from "lit";
 import { subtitleForRoute, titleForRoute } from "../../app-navigation.ts";
 import { applicationContext, type ApplicationContext } from "../../app/context.ts";
 import { hasOperatorAdminAccess, hasOperatorWriteAccess } from "../../app/operator-access.ts";
@@ -12,81 +12,75 @@ import {
   stopWorkboardPolling,
   syncWorkboardLifecycle,
 } from "../../lib/workboard/index.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 import { renderWorkboard } from "./view.ts";
 
-class WorkboardPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class WorkboardPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context?: ApplicationContext;
 
-  private stopAgentsSubscription?: () => void;
-  private stopConfigSubscription?: () => void;
-  private stopGatewaySubscription?: () => void;
-  private stopSessionsSubscription?: () => void;
-  private stopWorkboardSubscription?: () => void;
-
   private readonly requestPageUpdate = () => this.context?.workboard.notify();
+  private readonly subscriptions = new SubscriptionsController(this)
+    .watch(
+      () => this.context?.agents,
+      (agents, notify) => agents.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.runtimeConfig,
+      (runtimeConfig) => {
+        const handleChange = () => {
+          this.requestUpdate();
+          this.ensureInitialData();
+        };
+        handleChange();
+        return runtimeConfig.subscribe(handleChange);
+      },
+    )
+    .watch(
+      () => this.context?.sessions,
+      (sessions, notify) => sessions.subscribe(notify),
+    )
+    .effect(
+      () => this.context?.workboard,
+      (workboard) => {
+        const unsubscribe = workboard.subscribe(() => this.requestUpdate());
+        return () => {
+          unsubscribe();
+          stopWorkboardPolling(workboard);
+          stopWorkboardLifecycleRefresh(workboard);
+        };
+      },
+    )
+    .effect(
+      () => this.context?.gateway,
+      (gateway) => {
+        const handleSnapshot = (snapshot: ApplicationContext["gateway"]["snapshot"]) => {
+          if (snapshot.connected && snapshot.client) {
+            this.ensureInitialData();
+          }
+          this.requestUpdate();
+        };
+        handleSnapshot(gateway.snapshot);
+        return gateway.subscribe(handleSnapshot);
+      },
+    );
 
   override connectedCallback() {
     super.connectedCallback();
-    this.ensureSubscriptions();
     this.ensureInitialData();
     this.syncWorkboardRuntime();
   }
 
   override updated() {
-    this.ensureSubscriptions();
     this.syncWorkboardRuntime();
   }
 
   override disconnectedCallback() {
-    this.stopAgentsSubscription?.();
-    this.stopAgentsSubscription = undefined;
-    this.stopConfigSubscription?.();
-    this.stopConfigSubscription = undefined;
-    this.stopGatewaySubscription?.();
-    this.stopGatewaySubscription = undefined;
-    this.stopSessionsSubscription?.();
-    this.stopSessionsSubscription = undefined;
-    this.stopWorkboardSubscription?.();
-    this.stopWorkboardSubscription = undefined;
-    const workboard = this.context?.workboard;
-    if (workboard) {
-      stopWorkboardPolling(workboard);
-      stopWorkboardLifecycleRefresh(workboard);
-    }
+    this.subscriptions.clear();
     super.disconnectedCallback();
   }
 
-  private ensureSubscriptions() {
-    const context = this.context;
-    if (!context || this.stopGatewaySubscription) {
-      return;
-    }
-    this.stopAgentsSubscription = context.agents.subscribe(() => {
-      this.requestUpdate();
-    });
-    this.stopConfigSubscription = context.runtimeConfig.subscribe(() => {
-      this.requestUpdate();
-      this.ensureInitialData();
-    });
-    this.stopSessionsSubscription = context.sessions.subscribe(() => {
-      this.requestUpdate();
-    });
-    this.stopWorkboardSubscription = context.workboard.subscribe(() => {
-      this.requestUpdate();
-    });
-    this.stopGatewaySubscription = context.gateway.subscribe((snapshot) => {
-      if (snapshot.connected && snapshot.client) {
-        this.ensureInitialData();
-      }
-      this.requestUpdate();
-    });
-  }
-
   private ensureInitialData() {
     const context = this.context;
     const gateway = context?.gateway.snapshot;
diff --git a/ui/src/pages/worktrees/worktrees-page.test.ts b/ui/src/pages/worktrees/worktrees-page.test.ts
new file mode 100644
index 00000000000..65a7041b5ec
--- /dev/null
+++ b/ui/src/pages/worktrees/worktrees-page.test.ts
@@ -0,0 +1,229 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { WorktreeRecord } from "../../../../packages/gateway-protocol/src/index.js";
+import type { GatewayBrowserClient } from "../../api/gateway.ts";
+import type { ApplicationContext, ApplicationGatewaySnapshot } from "../../app/context.ts";
+import "./worktrees-page.ts";
+
+type WorktreesPageTestElement = HTMLElement & {
+  context: ApplicationContext;
+  loading: boolean;
+  records: WorktreeRecord[];
+  error: string | null;
+  busyId: string | null;
+  updateComplete: Promise<boolean>;
+  requestUpdate: () => void;
+  removeWorktree: (record: WorktreeRecord) => Promise<void>;
+  restore: (record: WorktreeRecord) => Promise<void>;
+};
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+    resolve = resolvePromise;
+    reject = rejectPromise;
+  });
+  return { promise, reject, resolve };
+}
+
+function worktree(id = "worktree-1"): WorktreeRecord {
+  return {
+    id,
+    name: id,
+    repoFingerprint: "0123456789abcdef",
+    repoRoot: "/tmp/repo",
+    path: `/tmp/repo/.worktrees/${id}`,
+    branch: "main",
+    baseRef: "main",
+    ownerKind: "manual",
+    createdAt: 1,
+    lastActiveAt: 1,
+  };
+}
+
+function gatewayWithSnapshot(client: GatewayBrowserClient | null, connected: boolean) {
+  const snapshot: ApplicationGatewaySnapshot = {
+    client,
+    connected,
+    reconnecting: false,
+    hello: null,
+    assistantAgentId: null,
+    sessionKey: "main",
+    lastError: null,
+    lastErrorCode: null,
+  };
+  return {
+    snapshot,
+    subscribe: () => () => undefined,
+  } as unknown as ApplicationContext["gateway"];
+}
+
+function gatewayWithClient(client: GatewayBrowserClient) {
+  return gatewayWithSnapshot(client, true);
+}
+
+function mutableGateway(client: GatewayBrowserClient) {
+  const snapshot = gatewayWithClient(client).snapshot;
+  let listener: ((snapshot: ApplicationGatewaySnapshot) => void) | undefined;
+  const gateway = {
+    snapshot,
+    subscribe(next: (snapshot: ApplicationGatewaySnapshot) => void) {
+      listener = next;
+      return () => {
+        if (listener === next) {
+          listener = undefined;
+        }
+      };
+    },
+  } as unknown as ApplicationContext["gateway"];
+  return {
+    emit(connected: boolean) {
+      (snapshot as ApplicationGatewaySnapshot).connected = connected;
+      listener?.(snapshot as ApplicationGatewaySnapshot);
+    },
+    gateway,
+  };
+}
+
+function contextWithGateway(gateway: ApplicationContext["gateway"]): ApplicationContext {
+  return {
+    basePath: "",
+    gateway,
+    navigate: vi.fn(),
+    preload: vi.fn(async () => undefined),
+  } as unknown as ApplicationContext;
+}
+
+afterEach(() => {
+  document.body.replaceChildren();
+  vi.restoreAllMocks();
+});
+
+describe("WorktreesPage lifecycle", () => {
+  it("clears stale records when a null-client gateway source is replaced", async () => {
+    const page = document.createElement("openclaw-worktrees-page") as WorktreesPageTestElement;
+    page.records = [
+      {
+        id: "stale",
+        name: "stale",
+        repoFingerprint: "0123456789abcdef",
+        repoRoot: "/tmp/repo",
+        path: "/tmp/repo/.worktrees/stale",
+        branch: "main",
+        baseRef: "main",
+        ownerKind: "manual",
+        createdAt: 1,
+        lastActiveAt: 1,
+      },
+    ];
+    page.context = contextWithGateway(gatewayWithSnapshot(null, false));
+    document.body.append(page);
+    await page.updateComplete;
+    expect(page.records).toHaveLength(1);
+
+    page.context = contextWithGateway(gatewayWithSnapshot(null, false));
+    page.requestUpdate();
+    await page.updateComplete;
+
+    expect(page.records).toEqual([]);
+  });
+
+  it("starts a replacement-client load after disconnecting during an in-flight load", async () => {
+    let resolveFirst!: (value: { worktrees: [] }) => void;
+    const firstRequest = vi.fn(
+      () =>
+        new Promise<{ worktrees: [] }>((resolve) => {
+          resolveFirst = resolve;
+        }),
+    );
+    const secondRequest = vi.fn(async () => ({ worktrees: [] }));
+    const page = document.createElement("openclaw-worktrees-page") as WorktreesPageTestElement;
+    page.context = contextWithGateway(
+      gatewayWithClient({ request: firstRequest } as unknown as GatewayBrowserClient),
+    );
+
+    document.body.append(page);
+    await vi.waitFor(() => expect(firstRequest).toHaveBeenCalledOnce());
+    expect(page.loading).toBe(true);
+
+    page.remove();
+    page.context = contextWithGateway(
+      gatewayWithClient({ request: secondRequest } as unknown as GatewayBrowserClient),
+    );
+    document.body.append(page);
+
+    await vi.waitFor(() => expect(secondRequest).toHaveBeenCalledOnce());
+    await vi.waitFor(() => expect(page.loading).toBe(false));
+
+    resolveFirst({ worktrees: [] });
+    await Promise.resolve();
+    expect(page.loading).toBe(false);
+  });
+
+  it("never force-removes through a replacement gateway", async () => {
+    const pendingRemove = deferred<unknown>();
+    const firstRequest = vi.fn((method: string) => {
+      if (method === "worktrees.remove") {
+        return pendingRemove.promise;
+      }
+      return Promise.resolve({ worktrees: [] });
+    });
+    const secondRequest = vi.fn(async () => ({ worktrees: [] }));
+    const page = document.createElement("openclaw-worktrees-page") as WorktreesPageTestElement;
+    page.context = contextWithGateway(
+      gatewayWithClient({ request: firstRequest } as unknown as GatewayBrowserClient),
+    );
+    const confirm = vi.spyOn(window, "confirm").mockReturnValue(true);
+    document.body.append(page);
+    await vi.waitFor(() => expect(firstRequest).toHaveBeenCalledWith("worktrees.list", {}));
+
+    const removing = page.removeWorktree(worktree());
+    await vi.waitFor(() =>
+      expect(firstRequest).toHaveBeenCalledWith("worktrees.remove", { id: "worktree-1" }),
+    );
+
+    page.context = contextWithGateway(
+      gatewayWithClient({ request: secondRequest } as unknown as GatewayBrowserClient),
+    );
+    page.requestUpdate();
+    await page.updateComplete;
+    pendingRemove.reject(new Error("snapshot failed: stale gateway"));
+    await removing;
+
+    expect(confirm).toHaveBeenCalledOnce();
+    expect(secondRequest).not.toHaveBeenCalledWith("worktrees.remove", {
+      id: "worktree-1",
+      force: true,
+    });
+    expect(page.error).toBeNull();
+    expect(page.busyId).toBeNull();
+  });
+
+  it("discards a restore error across a same-client reconnect", async () => {
+    const pendingRestore = deferred<unknown>();
+    const request = vi.fn((method: string) => {
+      if (method === "worktrees.restore") {
+        return pendingRestore.promise;
+      }
+      return Promise.resolve({ worktrees: [] });
+    });
+    const client = { request } as unknown as GatewayBrowserClient;
+    const source = mutableGateway(client);
+    const page = document.createElement("openclaw-worktrees-page") as WorktreesPageTestElement;
+    page.context = contextWithGateway(source.gateway);
+    document.body.append(page);
+    await vi.waitFor(() => expect(request).toHaveBeenCalledWith("worktrees.list", {}));
+
+    const restoring = page.restore(worktree());
+    await vi.waitFor(() =>
+      expect(request).toHaveBeenCalledWith("worktrees.restore", { id: "worktree-1" }),
+    );
+    source.emit(false);
+    source.emit(true);
+    pendingRestore.reject(new Error("stale restore error"));
+    await restoring;
+
+    expect(page.error).toBeNull();
+    expect(page.busyId).toBeNull();
+  });
+});
diff --git a/ui/src/pages/worktrees/worktrees-page.ts b/ui/src/pages/worktrees/worktrees-page.ts
index 9972ff5ea2f..5da0206a0b5 100644
--- a/ui/src/pages/worktrees/worktrees-page.ts
+++ b/ui/src/pages/worktrees/worktrees-page.ts
@@ -1,5 +1,5 @@
 import { consume } from "@lit/context";
-import { html, LitElement, nothing } from "lit";
+import { html, nothing } from "lit";
 import { state } from "lit/decorators.js";
 import type { WorktreeRecord } from "../../../../packages/gateway-protocol/src/index.js";
 import type { GatewayBrowserClient } from "../../api/gateway.ts";
@@ -8,19 +8,23 @@ import { applicationContext, type ApplicationContext } from "../../app/context.t
 import { renderSettingsWorkspace } from "../../components/settings-workspace.ts";
 import { t } from "../../i18n/index.ts";
 import { formatRelativeTimestamp } from "../../lib/format.ts";
+import { OpenClawLightDomElement } from "../../lit/openclaw-element.ts";
+import { SubscriptionsController } from "../../lit/subscriptions-controller.ts";
 
 type WorktreesListResult = { worktrees: WorktreeRecord[] };
 
+type WorktreeOperationScope = {
+  gateway: ApplicationContext["gateway"];
+  client: GatewayBrowserClient;
+  epoch: number;
+};
+
 function repoName(repoRoot: string): string {
   return repoRoot.split(/[\\/]/).findLast(Boolean) ?? repoRoot;
 }
 
-class WorktreesPage extends LitElement {
-  override createRenderRoot() {
-    return this;
-  }
-
-  @consume({ context: applicationContext, subscribe: false })
+class WorktreesPage extends OpenClawLightDomElement {
+  @consume({ context: applicationContext, subscribe: true })
   private context!: ApplicationContext;
 
   @state() private loading = false;
@@ -29,67 +33,133 @@ class WorktreesPage extends LitElement {
   @state() private busyId: string | null = null;
 
   private client: GatewayBrowserClient | null = null;
-  private unsubscribe: (() => void) | null = null;
+  private gatewayConnected = false;
+  private gatewaySource?: ApplicationContext["gateway"];
+  private hasBoundGateway = false;
+  private loadGeneration = 0;
+  private operationEpoch = 0;
+  private readonly subscriptions = new SubscriptionsController(this).effect(
+    () => this.context?.gateway,
+    (gateway) => {
+      const sourceChanged = this.hasBoundGateway && this.gatewaySource !== gateway;
+      this.gatewaySource = gateway;
+      this.hasBoundGateway = true;
+      this.applyGatewaySnapshot(gateway.snapshot, sourceChanged);
+      return gateway.subscribe((snapshot) => {
+        if (this.gatewaySource === gateway && this.context.gateway === gateway) {
+          this.applyGatewaySnapshot(snapshot);
+        }
+      });
+    },
+  );
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.unsubscribe = this.context.gateway.subscribe((snapshot) => {
-      const connected = snapshot.connected && snapshot.client;
-      if (snapshot.client !== this.client) {
-        this.client = snapshot.client;
-        this.records = [];
-        this.loading = false;
-      }
-      if (connected) {
-        void this.load();
-      }
-    });
-    const snapshot = this.context.gateway.snapshot;
+  override disconnectedCallback() {
+    this.subscriptions.clear();
+    this.invalidateLoad();
+    this.invalidateOperations();
+    this.gatewaySource = undefined;
+    this.client = null;
+    this.gatewayConnected = false;
+    super.disconnectedCallback();
+  }
+
+  private applyGatewaySnapshot(
+    snapshot: ApplicationContext["gateway"]["snapshot"],
+    sourceChanged = false,
+  ) {
+    const clientChanged = snapshot.client !== this.client;
+    const connectionChanged = snapshot.connected !== this.gatewayConnected;
+    const identityChanged = sourceChanged || clientChanged;
     this.client = snapshot.client;
+    this.gatewayConnected = snapshot.connected;
+    if (identityChanged || connectionChanged) {
+      this.invalidateLoad();
+      this.invalidateOperations();
+    }
+    if (identityChanged) {
+      this.records = [];
+      this.error = null;
+    }
     if (snapshot.connected && snapshot.client) {
       void this.load();
     }
   }
 
-  override disconnectedCallback() {
-    this.unsubscribe?.();
-    this.unsubscribe = null;
-    this.client = null;
-    super.disconnectedCallback();
+  private invalidateLoad() {
+    this.loadGeneration += 1;
+    this.loading = false;
+  }
+
+  private invalidateOperations() {
+    this.operationEpoch += 1;
+    this.busyId = null;
+  }
+
+  private captureOperationScope(): WorktreeOperationScope | null {
+    const gateway = this.gatewaySource;
+    const client = this.client;
+    if (
+      !gateway ||
+      !client ||
+      !this.gatewayConnected ||
+      !this.isConnected ||
+      this.context.gateway !== gateway
+    ) {
+      return null;
+    }
+    return { gateway, client, epoch: this.operationEpoch };
+  }
+
+  private isOperationScopeCurrent(scope: WorktreeOperationScope): boolean {
+    return (
+      this.isConnected &&
+      this.gatewayConnected &&
+      this.gatewaySource === scope.gateway &&
+      this.context.gateway === scope.gateway &&
+      this.client === scope.client &&
+      this.operationEpoch === scope.epoch
+    );
   }
 
   private async load() {
     const client = this.client;
-    if (!client || this.loading) {
+    if (!client || !this.gatewayConnected || this.loading) {
       return;
     }
+    const generation = ++this.loadGeneration;
     this.loading = true;
     this.error = null;
     try {
       const result = await client.request<WorktreesListResult>("worktrees.list", {});
-      if (client === this.client) {
+      if (generation === this.loadGeneration && client === this.client) {
         this.records = result.worktrees;
       }
     } catch (error) {
-      if (client === this.client) {
+      if (generation === this.loadGeneration && client === this.client) {
         this.error = String(error);
       }
     } finally {
-      if (client === this.client) {
+      if (generation === this.loadGeneration && client === this.client) {
         this.loading = false;
       }
     }
   }
 
   private async removeWorktree(record: WorktreeRecord) {
-    if (!this.client || !window.confirm(t("worktrees.confirmDelete", { name: record.name }))) {
+    const scope = this.captureOperationScope();
+    if (!scope || !window.confirm(t("worktrees.confirmDelete", { name: record.name }))) {
       return;
     }
+    // Both attempts belong to one Gateway epoch. A force retry must never jump
+    // to a replacement client after the first request reports snapshot failure.
     this.busyId = record.id;
     this.error = null;
     try {
-      await this.client.request("worktrees.remove", { id: record.id });
+      await scope.client.request("worktrees.remove", { id: record.id });
     } catch (error) {
+      if (!this.isOperationScopeCurrent(scope)) {
+        return;
+      }
       const message = String(error);
       if (!message.toLowerCase().includes("snapshot failed")) {
         this.error = message;
@@ -100,46 +170,63 @@ class WorktreesPage extends LitElement {
         this.error = String(error);
         return;
       }
+      if (!this.isOperationScopeCurrent(scope)) {
+        return;
+      }
       try {
-        await this.client.request("worktrees.remove", { id: record.id, force: true });
+        await scope.client.request("worktrees.remove", { id: record.id, force: true });
       } catch (forceError) {
-        this.error = String(forceError);
+        if (this.isOperationScopeCurrent(scope)) {
+          this.error = String(forceError);
+        }
       }
     } finally {
-      this.busyId = null;
-      await this.load();
+      if (this.isOperationScopeCurrent(scope)) {
+        this.busyId = null;
+        await this.load();
+      }
     }
   }
 
   private async restore(record: WorktreeRecord) {
-    if (!this.client) {
+    const scope = this.captureOperationScope();
+    if (!scope) {
       return;
     }
     this.busyId = record.id;
     this.error = null;
     try {
-      await this.client.request("worktrees.restore", { id: record.id });
+      await scope.client.request("worktrees.restore", { id: record.id });
     } catch (error) {
-      this.error = String(error);
+      if (this.isOperationScopeCurrent(scope)) {
+        this.error = String(error);
+      }
     } finally {
-      this.busyId = null;
-      await this.load();
+      if (this.isOperationScopeCurrent(scope)) {
+        this.busyId = null;
+        await this.load();
+      }
     }
   }
 
   private async gc() {
-    if (!this.client) {
+    const scope = this.captureOperationScope();
+    if (!scope) {
       return;
     }
     this.loading = true;
     this.error = null;
     try {
-      await this.client.request("worktrees.gc", {});
+      await scope.client.request("worktrees.gc", {});
     } catch (error) {
-      this.error = String(error);
+      if (this.isOperationScopeCurrent(scope)) {
+        this.error = String(error);
+      }
     } finally {
-      this.loading = false;
-      await this.load();
+      if (this.isOperationScopeCurrent(scope)) {
+        this.loading = false;
+        await this.load();
+      }
     }
   }
 
diff --git a/ui/src/styles.css b/ui/src/styles.css
index d9aecc0d01b..7a3bc7290f6 100644
--- a/ui/src/styles.css
+++ b/ui/src/styles.css
@@ -12,6 +12,7 @@
 @import "./styles/logbook.css";
 @import "./styles/codex-sessions.css";
 @import "./styles/dreams.css";
+@import "./styles/lobster-pet.css";
 @import "./styles/workboard.css";
 @import "./styles/skill-workshop.css";
 @import "@create-markdown/preview/themes/system.css";
diff --git a/ui/src/styles/config-quick.css b/ui/src/styles/config-quick.css
index 6cc62e435d7..a7da8a461ec 100644
--- a/ui/src/styles/config-quick.css
+++ b/ui/src/styles/config-quick.css
@@ -955,173 +955,39 @@ openclaw-logs-page {
   height: 14px;
 }
 
-/* ── Presets Grid ── */
+/* ── Pending Changes ── */
 
-.qs-profiles {
-  display: grid;
-  gap: 14px;
-  padding: 14px 16px 16px;
-}
-
-.qs-profiles__intro {
-  margin: 0;
-  max-width: 78ch;
-  font-size: 0.8125rem;
-  line-height: 1.55;
-  color: var(--muted);
-  text-wrap: pretty;
-}
-
-.qs-presets-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(min(230px, 100%), 1fr));
-  gap: 10px;
-}
-
-.qs-profiles__footer {
+.qs-pending {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
   justify-content: space-between;
-  gap: 10px 16px;
-  padding-top: 12px;
-  border-top: 1px solid color-mix(in srgb, var(--border) 50%, transparent);
+  gap: 12px 16px;
+  padding: 14px 16px;
 }
 
-.qs-profiles__summary {
+.qs-pending__copy {
   display: flex;
-  flex-wrap: wrap;
-  align-items: baseline;
-  gap: 4px 10px;
-  min-width: 0;
+  flex-direction: column;
+  gap: 3px;
 }
 
-.qs-profiles__summary-label {
-  font-size: 0.8125rem;
-  font-weight: 650;
+.qs-pending__label {
+  font-weight: 600;
   color: var(--text-strong);
 }
 
-.qs-profiles__summary-values {
-  font-size: 0.75rem;
-  color: var(--muted);
-}
-
-.qs-profiles__actions {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 8px;
-}
-
-.qs-profiles__hint {
+.qs-pending__hint {
   font-size: 0.75rem;
   line-height: 1.4;
-  max-width: 46ch;
 }
 
-.qs-preset {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  padding: 14px;
-  border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
-  border-radius: var(--radius-lg);
-  background: var(--card);
-  cursor: pointer;
-  transition:
-    border-color var(--duration-normal) var(--ease-out),
-    background var(--duration-normal) var(--ease-out),
-    box-shadow var(--duration-normal) var(--ease-out),
-    transform var(--duration-normal) var(--ease-out);
-  text-align: left;
-  touch-action: manipulation;
-}
-
-.qs-preset:hover {
-  border-color: color-mix(in srgb, var(--accent) 40%, var(--border) 60%);
-  background: color-mix(in srgb, var(--accent-subtle) 40%, var(--card) 60%);
-}
-
-.qs-preset:focus-visible {
-  outline: none;
-  border-color: color-mix(in srgb, var(--accent) 55%, var(--border) 45%);
-  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 18%, transparent);
-}
-
-.qs-preset--active {
-  border-color: color-mix(in srgb, var(--accent) 50%, var(--border) 50%);
-  background: color-mix(in srgb, var(--accent-subtle) 60%, var(--card) 40%);
-  box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 15%, transparent);
-}
-
-.qs-preset--active:hover {
-  background: color-mix(in srgb, var(--accent-subtle) 80%, var(--card) 20%);
-}
-
-.qs-preset__head {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 12px;
-}
-
-.qs-preset__identity {
-  min-width: 0;
-  display: flex;
-  align-items: flex-start;
-  gap: 10px;
-}
-
-.qs-preset__identity-copy {
-  min-width: 0;
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.qs-preset__badges {
+.qs-pending__actions {
   display: flex;
   flex-wrap: wrap;
-  justify-content: flex-end;
-  gap: 6px;
-}
-
-.qs-preset__icon {
-  font-size: 1.45rem;
-  line-height: 1;
-  flex: 0 0 auto;
-}
-
-.qs-preset__label {
-  font-size: 0.875rem;
-  font-weight: 700;
-  letter-spacing: -0.01em;
-  color: var(--text-strong);
-}
-
-.qs-preset__desc {
-  font-size: 0.75rem;
-  line-height: 1.45;
-  color: var(--muted);
-  text-wrap: pretty;
-}
-
-.qs-preset__meta {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  font-size: 0.6875rem;
-  color: var(--muted);
-}
-
-.qs-preset__meta span {
-  display: inline-flex;
   align-items: center;
-  padding: 4px 8px;
-  border-radius: var(--radius-full);
-  background: color-mix(in srgb, var(--bg-elevated) 84%, transparent);
+  justify-content: flex-end;
+  gap: 8px;
 }
 
 @media (max-width: 1100px) {
@@ -1155,13 +1021,13 @@ openclaw-logs-page {
     grid-template-columns: 1fr;
   }
 
-  .qs-profiles__footer,
-  .qs-profiles__actions {
+  .qs-pending,
+  .qs-pending__actions {
     flex-direction: column;
     align-items: stretch;
   }
 
-  .qs-profiles__actions .btn {
+  .qs-pending__actions .btn {
     width: 100%;
     justify-content: center;
   }
diff --git a/ui/src/styles/layout.css b/ui/src/styles/layout.css
index 3fa95ea9c2e..408633ea280 100644
--- a/ui/src/styles/layout.css
+++ b/ui/src/styles/layout.css
@@ -1404,6 +1404,16 @@
   box-shadow: 0 18px 40px color-mix(in srgb, black 26%, transparent);
 }
 
+openclaw-native-link-menu[popover] {
+  width: 0;
+  height: 0;
+  margin: 0;
+  padding: 0;
+  overflow: visible;
+  border: 0;
+  background: transparent;
+}
+
 .sidebar-session-sort-menu {
   position: fixed;
   z-index: 121;
diff --git a/ui/src/styles/lobster-pet.css b/ui/src/styles/lobster-pet.css
new file mode 100644
index 00000000000..2fdb74fcc96
--- /dev/null
+++ b/ui/src/styles/lobster-pet.css
@@ -0,0 +1,363 @@
+/* ============================================
+   Lobster pet – decorative status mascot that
+   perches on the sidebar footer.
+   ============================================ */
+
+/* The footer bar is the pet's ledge. */
+.sidebar-shell__footer {
+  position: relative;
+}
+
+/* Host is a zero-layout overlay strip above the footer bar. Its bottom edge
+   sits 3px inside the footer so feet dangle over the divider, and
+   overflow: hidden makes duck/peek/enter moves read as "behind the ledge". */
+openclaw-lobster-pet {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: calc(100% - 3px);
+  display: block;
+  height: 52px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+/* The collapsed rail has no room for a pet. */
+.sidebar--collapsed openclaw-lobster-pet {
+  display: none;
+}
+
+.lobster-pet {
+  position: absolute;
+  bottom: 0;
+  left: var(--lob-x, 80%);
+  width: calc(16px * var(--lob-scale, 2));
+  height: calc(14px * var(--lob-scale, 2));
+  transform: translateX(-50%);
+  pointer-events: auto;
+  cursor: pointer;
+  user-select: none;
+  -webkit-user-select: none;
+  -webkit-tap-highlight-color: transparent;
+  transition: left 1.15s ease-in-out;
+}
+
+/* Disconnected pets lose their teal eye glow. */
+.lobster-pet--offline {
+  --lob-glint: #8a949d;
+}
+
+.lobster-pet__body {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.lobster-pet__svg {
+  display: block;
+  width: 100%;
+  height: 100%;
+  transform: scaleX(var(--lob-face, 1));
+  transform-origin: 50% 100%;
+}
+
+.lobster-pet .lobster-pet__svg {
+  animation: lobster-pet-breathe 3.4s ease-in-out infinite;
+}
+
+.lob-claw {
+  transform-box: view-box;
+}
+
+.lob-claw--l {
+  transform-origin: 25px 52px;
+}
+
+.lob-claw--r {
+  transform-origin: 95px 52px;
+}
+
+/* ---- Idle blinking: crossfade open pupils and closed-lid curves ---- */
+
+.lobster-pet .lob-eye-closed {
+  opacity: 0;
+}
+
+/* Exclude the nap act: a running blink animation would out-cascade the nap
+   opacity rules below and keep the eyes open mid-nap. */
+.lobster-pet:not(.lobster-pet--act-nap) .lob-eye-open {
+  animation: lobster-pet-blink-open 5.2s linear infinite;
+  animation-delay: var(--lob-blink-delay, 0s);
+}
+
+.lobster-pet:not(.lobster-pet--act-nap) .lob-eye-closed {
+  animation: lobster-pet-blink-closed 5.2s linear infinite;
+  animation-delay: var(--lob-blink-delay, 0s);
+}
+
+/* ---- Entrance: pops up from behind the footer ledge ---- */
+
+.lobster-pet--entering .lobster-pet__body {
+  animation: lobster-pet-enter 0.45s ease-out;
+}
+
+/* ---- Acts ---- */
+
+.lobster-pet--act-wave .lob-claw--r {
+  animation: lobster-pet-wave 1.4s ease-in-out;
+}
+
+.lobster-pet--act-snip .lob-claw {
+  animation: lobster-pet-snip 0.5s ease-in-out 2;
+}
+
+.lobster-pet--act-hop .lobster-pet__body {
+  animation: lobster-pet-hop 0.75s ease-in-out;
+}
+
+.lobster-pet--act-spin .lobster-pet__body {
+  animation: lobster-pet-spin 0.95s ease-in-out;
+}
+
+.lobster-pet--act-peek .lobster-pet__body {
+  animation: lobster-pet-peek 1.7s ease-in-out;
+}
+
+.lobster-pet--act-scuttle .lobster-pet__body {
+  animation: lobster-pet-waddle 0.3s ease-in-out infinite;
+}
+
+.lobster-pet--act-startle .lobster-pet__body {
+  animation: lobster-pet-startle 0.75s ease-out;
+}
+
+.lobster-pet--act-startle .lob-claw {
+  animation: lobster-pet-snip 0.38s ease-in-out 2;
+}
+
+/* ---- Nap: eyes shut, z's drift up ---- */
+
+.lobster-pet--act-nap .lob-eye-open {
+  opacity: 0;
+}
+
+.lobster-pet--act-nap .lob-eye-closed {
+  opacity: 1;
+}
+
+.lobster-pet__z {
+  position: absolute;
+  left: 58%;
+  bottom: 72%;
+  color: var(--lob-claw, #ff775f);
+  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+  font-size: calc(4.5px * var(--lob-scale, 2));
+  font-weight: 700;
+  line-height: 1;
+  opacity: 0;
+  pointer-events: none;
+}
+
+.lobster-pet--act-nap .lobster-pet__z {
+  animation: lobster-pet-z 2s ease-out infinite;
+  animation-delay: calc(var(--i, 0) * 0.7s);
+}
+
+/* ---- Bubbles ---- */
+
+.lobster-pet__bubble {
+  position: absolute;
+  left: 30%;
+  bottom: 55%;
+  width: calc(2px * var(--lob-scale, 2));
+  height: calc(2px * var(--lob-scale, 2));
+  border: 1px solid var(--lob-claw, #ff775f);
+  border-radius: 50%;
+  opacity: 0;
+  pointer-events: none;
+}
+
+.lobster-pet--act-bubble .lobster-pet__bubble {
+  animation: lobster-pet-bubble 1.6s ease-out;
+  animation-delay: calc(var(--i, 0) * 0.42s);
+}
+
+/* ---- Keyframes ---- */
+
+@keyframes lobster-pet-breathe {
+  0%,
+  100% {
+    transform: scaleX(var(--lob-face, 1)) scaleY(1);
+  }
+  50% {
+    transform: scaleX(var(--lob-face, 1)) scaleY(0.96);
+  }
+}
+
+@keyframes lobster-pet-blink-open {
+  0%,
+  93% {
+    opacity: 1;
+  }
+  94%,
+  97% {
+    opacity: 0;
+  }
+  98%,
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes lobster-pet-blink-closed {
+  0%,
+  93% {
+    opacity: 0;
+  }
+  94%,
+  97% {
+    opacity: 1;
+  }
+  98%,
+  100% {
+    opacity: 0;
+  }
+}
+
+@keyframes lobster-pet-enter {
+  from {
+    transform: translateY(105%);
+  }
+  to {
+    transform: translateY(0);
+  }
+}
+
+@keyframes lobster-pet-wave {
+  0%,
+  100% {
+    transform: translateY(0) rotate(0deg);
+  }
+  20%,
+  60% {
+    transform: translateY(-6px) rotate(-30deg);
+  }
+  40%,
+  80% {
+    transform: translateY(-6px) rotate(-6deg);
+  }
+}
+
+@keyframes lobster-pet-snip {
+  0%,
+  100% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(1.3, 0.78);
+  }
+}
+
+@keyframes lobster-pet-hop {
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  30% {
+    transform: translateY(-38%);
+  }
+  60% {
+    transform: translateY(0);
+  }
+  75% {
+    transform: translateY(3%) scaleY(0.94);
+  }
+}
+
+@keyframes lobster-pet-spin {
+  from {
+    transform: rotateY(0deg);
+  }
+  to {
+    transform: rotateY(360deg);
+  }
+}
+
+@keyframes lobster-pet-peek {
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  15% {
+    transform: translateY(96%);
+  }
+  35%,
+  75% {
+    transform: translateY(58%);
+  }
+}
+
+@keyframes lobster-pet-waddle {
+  0%,
+  100% {
+    transform: translateY(0) rotate(2.5deg);
+  }
+  50% {
+    transform: translateY(-6%) rotate(-2.5deg);
+  }
+}
+
+@keyframes lobster-pet-startle {
+  0% {
+    transform: translateY(0);
+  }
+  25% {
+    transform: translateY(-45%) rotate(-4deg);
+  }
+  55% {
+    transform: translateY(0);
+  }
+  70% {
+    transform: translateY(-12%);
+  }
+  85%,
+  100% {
+    transform: translateY(0);
+  }
+}
+
+@keyframes lobster-pet-z {
+  0% {
+    opacity: 0;
+    transform: translate(0, 0);
+  }
+  20% {
+    opacity: 0.9;
+  }
+  100% {
+    opacity: 0;
+    transform: translate(9px, -14px);
+  }
+}
+
+@keyframes lobster-pet-bubble {
+  0% {
+    opacity: 0;
+    transform: translate(0, 0) scale(0.6);
+  }
+  25% {
+    opacity: 0.85;
+  }
+  100% {
+    opacity: 0;
+    transform: translate(-7px, -16px) scale(1.25);
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  openclaw-lobster-pet .lobster-pet,
+  openclaw-lobster-pet .lobster-pet * {
+    animation: none !important;
+    transition: none !important;
+  }
+}
diff --git a/ui/src/styles/sessions.css b/ui/src/styles/sessions.css
index b677a6440fb..187e80b264c 100644
--- a/ui/src/styles/sessions.css
+++ b/ui/src/styles/sessions.css
@@ -47,10 +47,8 @@
   gap: 11px;
   min-width: 0;
   padding: 11px 13px;
-  background:
-    linear-gradient(180deg, var(--card-highlight), transparent 55%),
-    color-mix(in srgb, var(--card) 92%, transparent);
-  border: 1px solid color-mix(in srgb, var(--border) 88%, transparent);
+  background: var(--bg-elevated);
+  border: 1px solid var(--border);
   border-radius: var(--radius-md);
 }
 
@@ -62,7 +60,6 @@
   flex: 0 0 auto;
   color: var(--muted);
   background: var(--bg-hover);
-  border: 1px solid color-mix(in srgb, var(--border) 85%, transparent);
   border-radius: var(--radius-sm);
 }
 
@@ -115,7 +112,6 @@
 
 .sessions-overview__tile--live.sessions-overview__tile--active .sessions-overview__icon {
   background: var(--ok-subtle);
-  border-color: color-mix(in srgb, var(--ok) 28%, var(--border));
 }
 
 .sessions-overview__tile--unread.sessions-overview__tile--active .sessions-overview__icon,
@@ -125,7 +121,6 @@
 
 .sessions-overview__tile--unread.sessions-overview__tile--active .sessions-overview__icon {
   background: var(--accent-2-subtle);
-  border-color: color-mix(in srgb, var(--accent-2) 28%, var(--border));
 }
 
 /* --- Toolbar: search + filters + grouping in one strip --- */
@@ -410,7 +405,6 @@
   flex: 0 0 auto;
   color: var(--muted);
   background: var(--bg-hover);
-  border: 1px solid color-mix(in srgb, var(--border) 85%, transparent);
   border-radius: var(--radius-sm);
 }
 
@@ -427,25 +421,21 @@
 .session-avatar--cron {
   color: var(--ok);
   background: var(--ok-subtle);
-  border-color: color-mix(in srgb, var(--ok) 22%, var(--border));
 }
 
 .session-avatar--direct {
   color: var(--accent-2);
   background: var(--accent-2-subtle);
-  border-color: color-mix(in srgb, var(--accent-2) 22%, var(--border));
 }
 
 .session-avatar--group {
   color: var(--info);
   background: rgba(59, 130, 246, 0.1);
-  border-color: color-mix(in srgb, var(--info) 22%, var(--border));
 }
 
 .session-avatar--global {
   color: var(--warn);
   background: var(--warn-subtle);
-  border-color: color-mix(in srgb, var(--warn) 22%, var(--border));
 }
 
 .session-avatar__status {
@@ -627,8 +617,8 @@
   box-sizing: border-box;
   padding: 3px 7px;
   color: color-mix(in srgb, var(--text) 78%, var(--muted));
-  background: color-mix(in srgb, var(--bg-elevated) 82%, transparent);
-  border: 1px solid color-mix(in srgb, var(--border) 82%, transparent);
+  background: var(--bg-elevated);
+  border: 1px solid var(--border);
   border-radius: var(--radius-sm);
   font-size: 12px;
   line-height: 1.2;
@@ -696,15 +686,9 @@
   width: 72%;
   max-width: 150px;
   height: 12px;
-  background: linear-gradient(
-    90deg,
-    var(--bg-hover) 25%,
-    color-mix(in srgb, var(--bg-hover) 55%, var(--border-strong)) 50%,
-    var(--bg-hover) 75%
-  );
-  background-size: 200% 100%;
+  background: var(--bg-hover);
   border-radius: var(--radius-full);
-  animation: session-skeleton-shimmer 1.4s ease-in-out infinite;
+  animation: session-skeleton-pulse 1.4s ease-in-out infinite;
 }
 
 .session-skeleton--key {
@@ -713,12 +697,13 @@
   height: 14px;
 }
 
-@keyframes session-skeleton-shimmer {
-  from {
-    background-position: 200% 0;
+@keyframes session-skeleton-pulse {
+  0%,
+  100% {
+    opacity: 1;
   }
-  to {
-    background-position: -200% 0;
+  50% {
+    opacity: 0.45;
   }
 }
 
@@ -771,7 +756,7 @@
   width: 84px;
   height: 3px;
   overflow: hidden;
-  background: color-mix(in srgb, var(--border-strong) 55%, transparent);
+  background: var(--bg-hover);
   border-radius: var(--radius-full);
 }
 
@@ -968,8 +953,7 @@
 /* --- Row drawer: overrides, stats, compaction history --- */
 .session-details-row td {
   padding: 0;
-  background:
-    linear-gradient(180deg, rgba(255, 255, 255, 0.018), transparent 34%), var(--bg-accent);
+  background: var(--bg-accent);
 }
 
 .session-details-panel {
@@ -985,10 +969,9 @@
   justify-content: space-between;
   gap: 14px;
   padding: 14px;
-  border: 1px solid color-mix(in srgb, var(--border) 82%, transparent);
+  border: 1px solid var(--border);
   border-radius: var(--radius-md);
-  background: color-mix(in srgb, var(--card) 90%, transparent);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.035);
+  background: var(--card);
 }
 
 .session-details-panel__badges {
@@ -1026,9 +1009,9 @@
   display: grid;
   gap: 10px;
   padding: 14px;
-  border: 1px solid color-mix(in srgb, var(--border) 82%, transparent);
+  border: 1px solid var(--border);
   border-radius: var(--radius-md);
-  background: color-mix(in srgb, var(--bg-elevated) 78%, transparent);
+  background: var(--bg-elevated);
 }
 
 .session-details-section__header {
@@ -1095,9 +1078,9 @@ input.session-override-field__control {
 .session-detail-stat {
   min-width: 0;
   padding: 11px 12px;
-  border: 1px solid color-mix(in srgb, var(--border) 84%, transparent);
+  border: 1px solid var(--border);
   border-radius: var(--radius-sm);
-  background: color-mix(in srgb, var(--card) 86%, transparent);
+  background: var(--card);
 }
 
 .session-detail-stat__label {
@@ -1135,7 +1118,7 @@ input.session-override-field__control {
   padding: 12px;
   border: 1px solid var(--border);
   border-radius: var(--radius-md);
-  background: color-mix(in srgb, var(--card) 92%, transparent);
+  background: var(--card);
 }
 
 .session-checkpoint-card__header {