diff --git a/.github/scripts/ci-changes.cjs b/.github/scripts/ci-changes.cjs
index 1904f3790a4a..6a7fc4a6d5b5 100644
--- a/.github/scripts/ci-changes.cjs
+++ b/.github/scripts/ci-changes.cjs
@@ -36,6 +36,7 @@ const EXTRA_OWNERS = [
   // scripts/build-desktop-artifact.ts reads the GNOME extension manifest.
   [/^apps\/desktop\/gnome-extension\//, ["@t3tools/scripts"]],
   [/^native\/browser-secret\//, ["@t3tools/desktop"]],
+  [/^native\/kde-snap-shot\//, ["@t3tools/desktop"]],
   [/^native\/libghostty-vt\//, ["@t3tools/web"]],
 ];
 const RUST = /^native\/(resource-monitor|kde-snap-shot|hyprland-snap-shot)\//;
@@ -112,10 +113,10 @@ function ownersOf(file, packages) {
   // A manifest can change dependencies or versions other packages read.
   if (path.posix.basename(file) === "package.json") return null;
   if (RUNS_EVERYTHING.some((pattern) => pattern.test(file))) return null;
+  const extra = EXTRA_OWNERS.flatMap(([pattern, names]) => (pattern.test(file) ? names : []));
   // scripts/build-desktop-artifact.test.ts reads the crates' sources.
-  if (RUST.test(file)) return ["@t3tools/scripts"];
+  if (RUST.test(file)) return ["@t3tools/scripts", ...extra];
 
-  const extra = EXTRA_OWNERS.flatMap(([pattern, names]) => (pattern.test(file) ? names : []));
   const owner = packages
     .filter((pkg) => file.startsWith(`${pkg.dir}/`))
     .sort((a, b) => b.dir.length - a.dir.length)[0];
diff --git a/apps/desktop/src/app/DesktopAppErrors.test.ts b/apps/desktop/src/app/DesktopAppErrors.test.ts
deleted file mode 100644
index 666c36d391de..000000000000
--- a/apps/desktop/src/app/DesktopAppErrors.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { assert, describe, it } from "@effect/vitest";
-
-import {
-  DesktopBackendPortUnavailableError,
-  DesktopDevelopmentBackendPortRequiredError,
-} from "./DesktopApp.ts";
-
-describe("DesktopApp errors", () => {
-  it("preserves unavailable backend port context", () => {
-    const error = new DesktopBackendPortUnavailableError({
-      startPort: 3_773,
-      maxPort: 65_535,
-      hosts: ["127.0.0.1", "0.0.0.0", "::"],
-    });
-
-    assert.equal(error.startPort, 3_773);
-    assert.equal(error.maxPort, 65_535);
-    assert.deepEqual(error.hosts, ["127.0.0.1", "0.0.0.0", "::"]);
-    assert.equal(
-      error.message,
-      "No desktop backend port is available on hosts 127.0.0.1, 0.0.0.0, :: between 3773 and 65535.",
-    );
-  });
-
-  it("reports the required development port", () => {
-    const error = new DesktopDevelopmentBackendPortRequiredError();
-
-    assert.equal(error.message, "T3CODE_PORT is required in desktop development.");
-  });
-});
diff --git a/apps/desktop/src/app/DesktopDetachedActionErrors.test.ts b/apps/desktop/src/app/DesktopDetachedActionErrors.test.ts
deleted file mode 100644
index ae78080539b7..000000000000
--- a/apps/desktop/src/app/DesktopDetachedActionErrors.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { assert, describe, it } from "@effect/vitest";
-import * as Cause from "effect/Cause";
-
-import { DesktopLifecycleRelaunchError } from "./DesktopLifecycle.ts";
-import { DesktopApplicationMenuActionError } from "../window/DesktopApplicationMenu.ts";
-
-describe("desktop detached action errors", () => {
-  it("preserves the complete relaunch failure cause and reason", () => {
-    const cause = Cause.combine(
-      Cause.fail(new Error("shutdown failed")),
-      Cause.die(new Error("relaunch defect")),
-    );
-    const error = new DesktopLifecycleRelaunchError({
-      reason: "apply update",
-      cause,
-    });
-
-    assert.strictEqual(error.cause, cause);
-    assert.equal(error.reason, "apply update");
-    assert.equal(error.message, 'Desktop relaunch failed for reason "apply update".');
-  });
-
-  it("preserves the complete menu action failure cause and action", () => {
-    const cause = Cause.combine(
-      Cause.fail(new Error("window unavailable")),
-      Cause.die(new Error("dispatch defect")),
-    );
-    const error = new DesktopApplicationMenuActionError({
-      action: "open-settings",
-      cause,
-    });
-
-    assert.strictEqual(error.cause, cause);
-    assert.equal(error.action, "open-settings");
-    assert.equal(error.message, 'Desktop menu action "open-settings" failed.');
-  });
-});
diff --git a/apps/desktop/src/backend/DesktopBackendPool.test.ts b/apps/desktop/src/backend/DesktopBackendPool.test.ts
index 72a05e9d657d..b4e2fbe9f14b 100644
--- a/apps/desktop/src/backend/DesktopBackendPool.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendPool.test.ts
@@ -1,5 +1,4 @@
 import { assert, describe, it } from "@effect/vitest";
-import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
@@ -19,29 +18,7 @@ import * as DesktopWindow from "../window/DesktopWindow.ts";
 import * as DesktopWslEnvironment from "../wsl/DesktopWslEnvironment.ts";
 import * as DesktopBackendConfiguration from "./DesktopBackendConfiguration.ts";
 import * as DesktopBackendPool from "./DesktopBackendPool.ts";
-import type { DesktopBackendSnapshot, DesktopBackendStartConfig } from "./DesktopBackendManager.ts";
-
-function makeStubInstance(
-  id: DesktopBackendPool.BackendInstanceId,
-  label: string,
-): DesktopBackendPool.DesktopBackendInstance {
-  const snapshot: DesktopBackendSnapshot = {
-    desiredRunning: false,
-    ready: false,
-    activePid: Option.none(),
-    restartAttempt: 0,
-    restartScheduled: false,
-  };
-  return {
-    id,
-    label: Effect.succeed(label),
-    start: Effect.void,
-    stop: () => Effect.void,
-    currentConfig: Effect.succeed(Option.none<DesktopBackendStartConfig>()),
-    snapshot: Effect.succeed(snapshot),
-    waitForReady: (_timeout: Duration.Duration) => Effect.succeed(false),
-  };
-}
+import type { DesktopBackendStartConfig } from "./DesktopBackendManager.ts";
 
 function layerPool(labelRef: Ref.Ref<string>): Layer.Layer<DesktopBackendPool.DesktopBackendPool> {
   return DesktopBackendPool.layer.pipe(
@@ -111,36 +88,6 @@ function layerPool(labelRef: Ref.Ref<string>): Layer.Layer<DesktopBackendPool.De
 }
 
 describe("DesktopBackendPool", () => {
-  it.effect("layerTest exposes registered instances by id", () =>
-    Effect.gen(function* () {
-      const pool = yield* DesktopBackendPool.DesktopBackendPool;
-      const fetchedPrimary = yield* pool.get(DesktopBackendPool.PRIMARY_INSTANCE_ID);
-      const fetchedWsl = yield* pool.get(DesktopBackendPool.BackendInstanceId("wsl:ubuntu"));
-      const fetchedMissing = yield* pool.get(DesktopBackendPool.BackendInstanceId("missing"));
-      const all = yield* pool.list;
-      const resolvedPrimary = yield* pool.primary;
-
-      assert.equal(yield* Option.getOrThrow(fetchedPrimary).label, "Windows");
-      assert.equal(yield* Option.getOrThrow(fetchedWsl).label, "WSL (Ubuntu)");
-      assert.isTrue(Option.isNone(fetchedMissing));
-      assert.lengthOf(all, 2);
-      assert.equal(resolvedPrimary.id, DesktopBackendPool.PRIMARY_INSTANCE_ID);
-    }).pipe(
-      Effect.provide(
-        DesktopBackendPool.layerTest([
-          makeStubInstance(DesktopBackendPool.PRIMARY_INSTANCE_ID, "Windows"),
-          makeStubInstance(DesktopBackendPool.BackendInstanceId("wsl:ubuntu"), "WSL (Ubuntu)"),
-        ]),
-      ),
-    ),
-  );
-
-  it.effect("layerTest dies when no instances are supplied", () =>
-    Effect.exit(
-      DesktopBackendPool.DesktopBackendPool.pipe(Effect.provide(DesktopBackendPool.layerTest([]))),
-    ).pipe(Effect.map((exit) => assert.equal(exit._tag, "Failure"))),
-  );
-
   it.effect("resolves the primary label lazily after pool layer construction", () =>
     Effect.scoped(
       Effect.gen(function* () {
diff --git a/apps/desktop/src/wsl/DesktopWslEnvironment.test.ts b/apps/desktop/src/wsl/DesktopWslEnvironment.test.ts
index b3f695daf2de..670dcb898405 100644
--- a/apps/desktop/src/wsl/DesktopWslEnvironment.test.ts
+++ b/apps/desktop/src/wsl/DesktopWslEnvironment.test.ts
@@ -359,23 +359,6 @@ describe("WSL runtime cache", () => {
     expect(deleted).toBeGreaterThan(kept);
   });
 
-  it("treats a runtime whose executable no longer runs as a cache miss", () => {
-    const script = buildWslRuntimeInstallScript(
-      "/mnt/c/Program Files/T3 Code/wsl-runtime.tar.gz",
-      "1.2.3-x64",
-      "b".repeat(64),
-    );
-
-    expect(script).toContain('  [ -x "$1/t3" ] && "$1/t3" --version >/dev/null');
-
-    const entryCheckDefined = script.indexOf("runtime_entry_runs() {");
-    const readinessDefined = script.indexOf("runtime_is_ready() {");
-    const readyShortCircuit = script.indexOf("if runtime_is_ready; then");
-    expect(entryCheckDefined).toBeGreaterThan(-1);
-    expect(entryCheckDefined).toBeLessThan(readinessDefined);
-    expect(readinessDefined).toBeLessThan(readyShortCircuit);
-  });
-
   it("re-hashes the executable against the digest the install recorded", () => {
     const script = buildWslRuntimeInstallScript(
       "/mnt/c/Program Files/T3 Code/wsl-runtime.tar.gz",
@@ -624,6 +607,28 @@ describe.skipIf(posixShellRunner === null)("WSL runtime install script (executed
     expect(restored.stdout).toBe(SERVER_ENTRY_SOURCE);
   });
 
+  it("reinstalls an executable that fails --version despite a matching recorded digest", () => {
+    const fixture = createFixture();
+    expect(fixture.install().status).toBe(0);
+    const brokenEntry = "#!/bin/sh\nexit 42\n";
+    const corrupt = runShell(
+      [
+        "set -eu",
+        `printf '%s' ${sh(brokenEntry)} > ${sh(fixture.serverEntry)}`,
+        `chmod +x ${sh(fixture.serverEntry)}`,
+        `sha256sum ${sh(fixture.serverEntry)} | cut -d ' ' -f 1 > ${sh(`${fixture.runtimeRoot}/.t3code-wsl-runtime-ready`)}`,
+      ].join("\n"),
+    );
+    expect(corrupt.status, corrupt.stderr).toBe(0);
+    expect(runShell(`${sh(fixture.serverEntry)} --version`).status).toBe(42);
+
+    const repaired = fixture.install();
+    expect(repaired.status, repaired.stderr).toBe(0);
+    expect(parseWslRuntimeRoot(repaired.stdout)).toBe(fixture.runtimeRoot);
+    expect(runShell(`cat ${sh(fixture.serverEntry)}`).stdout).toBe(SERVER_ENTRY_SOURCE);
+    expect(runShell(`${sh(fixture.serverEntry)} --version`).status).toBe(0);
+  });
+
   it("falls back instead of launching a corrupted cache it cannot reinstall", () => {
     const fixture = createFixture();
     expect(fixture.install().status).toBe(0);
diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts
index 7858f2236989..893d6f8e076f 100644
--- a/apps/desktop/vite.config.ts
+++ b/apps/desktop/vite.config.ts
@@ -1,5 +1,5 @@
 import "vite-plus/test/config";
-import { defineConfig } from "vite-plus";
+import { defaultInclude, defineConfig } from "vite-plus";
 
 import { isDesktopRuntimeExternalDependency } from "../../scripts/lib/desktop-external-packages.ts";
 import { loadRepoEnv } from "../../scripts/lib/public-config.ts";
@@ -141,6 +141,7 @@ export default defineConfig({
     },
   ],
   test: {
+    include: [...defaultInclude, "../../native/kde-snap-shot/src/*.test.ts"],
     // The Windows lane runs workspace suites concurrently; filesystem-heavy
     // desktop integration tests can exceed Vitest's 5 second default there.
     testTimeout: 15_000,
diff --git a/apps/marketing/package.json b/apps/marketing/package.json
index e36e91bb7482..1de412b42381 100644
--- a/apps/marketing/package.json
+++ b/apps/marketing/package.json
@@ -8,7 +8,8 @@
     "dev": "node scripts/stage-install-scripts.mjs && astro dev",
     "build": "node scripts/stage-install-scripts.mjs && astro build",
     "preview": "astro preview",
-    "typecheck": "astro check"
+    "typecheck": "astro check",
+    "test": "vp test run"
   },
   "dependencies": {
     "@t3tools/shared": "workspace:*",
diff --git a/apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz b/apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz
deleted file mode 100644
index 4aa9184ac209..000000000000
Binary files a/apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz and /dev/null differ
diff --git a/apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz b/apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz
new file mode 100644
index 000000000000..33a1dcca0721
Binary files /dev/null and b/apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz differ
diff --git a/apps/mobile/modules/t3-native-controls/android/build.gradle b/apps/mobile/modules/t3-native-controls/android/build.gradle
index 01e035450f0e..9ecf11f68dbc 100644
--- a/apps/mobile/modules/t3-native-controls/android/build.gradle
+++ b/apps/mobile/modules/t3-native-controls/android/build.gradle
@@ -26,6 +26,7 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
   implementation 'androidx.compose.ui:ui-android:1.10.6'
+  implementation 'androidx.activity:activity:1.8.2'
   implementation 'androidx.compose.material3:material3-android:1.5.0-alpha17'
   implementation 'androidx.window:window:1.5.1'
 }
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt
index 3d48060dcaf5..3a924af4889e 100644
--- a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt
+++ b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3WorkspaceNavigationModule.kt
@@ -2,25 +2,60 @@ package expo.modules.t3nativecontrols
 
 import android.content.Context
 import android.view.ViewGroup
+import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedCallback
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.NavigationBarItemDefaults
+import androidx.compose.material3.Scrim
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.lerp
 import androidx.compose.ui.unit.sp
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.modules.Module
@@ -28,6 +63,8 @@ import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
 
+private val TABS = listOf("threads", "pullRequests", "settings")
+
 class T3WorkspaceNavigationModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("T3WorkspaceNavigation")
@@ -35,8 +72,21 @@ class T3WorkspaceNavigationModule : Module() {
       Prop("selectedTab") { view: T3WorkspaceNavigationView, value: String ->
         view.selectedTab = value
       }
+      Prop("rail") { view: T3WorkspaceNavigationView, value: Boolean -> view.rail = value }
       Prop("dark") { view: T3WorkspaceNavigationView, value: Boolean -> view.dark = value }
       Prop("textScale") { view: T3WorkspaceNavigationView, value: Float -> view.textScale = value }
+      Prop("newEnabled") { view: T3WorkspaceNavigationView, value: Boolean ->
+        view.newEnabled = value
+      }
+      Prop("safeAreaTop") { view: T3WorkspaceNavigationView, value: Float ->
+        view.safeAreaTop = value
+      }
+      Prop("safeAreaBottom") { view: T3WorkspaceNavigationView, value: Float ->
+        view.safeAreaBottom = value
+      }
+      Prop("headerHeight") { view: T3WorkspaceNavigationView, value: Float ->
+        view.headerHeight = value
+      }
       Prop("containerColor") { view: T3WorkspaceNavigationView, value: Int ->
         view.containerColor = value
       }
@@ -49,12 +99,18 @@ class T3WorkspaceNavigationModule : Module() {
       Prop("unselectedColor") { view: T3WorkspaceNavigationView, value: Int ->
         view.unselectedColor = value
       }
-      Events("onTabSelected")
+      Prop("actionColor") { view: T3WorkspaceNavigationView, value: Int ->
+        view.actionColor = value
+      }
+      Prop("actionContentColor") { view: T3WorkspaceNavigationView, value: Int ->
+        view.actionContentColor = value
+      }
+      Events("onTabSelected", "onNewThread", "onOverlayChange")
     }
   }
 }
 
-/** Material3 bottom navigation for the compact workspace. */
+/** One Material3 selection surface moves from below the list to its leading edge. */
 class T3WorkspaceNavigationView(
   context: Context,
   appContext: AppContext
@@ -63,13 +119,22 @@ class T3WorkspaceNavigationView(
   override val shouldUseAndroidLayout = true
 
   private val onTabSelected by EventDispatcher()
+  private val onNewThread by EventDispatcher()
+  private val onOverlayChange by EventDispatcher()
   var selectedTab by mutableStateOf("threads")
+  var rail by mutableStateOf(false)
   var dark by mutableStateOf(false)
   var textScale by mutableStateOf(1f)
+  var newEnabled by mutableStateOf(false)
+  var safeAreaTop by mutableStateOf(0f)
+  var safeAreaBottom by mutableStateOf(0f)
+  var headerHeight by mutableStateOf(56f)
   var containerColor by mutableStateOf(0)
   var selectedColor by mutableStateOf(0)
   var indicatorColor by mutableStateOf(0)
   var unselectedColor by mutableStateOf(0)
+  var actionColor by mutableStateOf(0)
+  var actionContentColor by mutableStateOf(0)
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     // Fabric measures the replacement bar before attaching it on a fold.
@@ -101,30 +166,30 @@ class T3WorkspaceNavigationView(
         )
         setContent {
           MaterialTheme(colorScheme = if (dark) darkColorScheme() else lightColorScheme()) {
-            val tabs = listOf("threads", "pullRequests")
-            NavigationBar(
-              modifier = Modifier.fillMaxSize(),
-              containerColor = Color(containerColor),
-              tonalElevation = androidx.compose.ui.unit.Dp(0f),
-              windowInsets = WindowInsets(0),
-            ) {
-              tabs.forEach { tab ->
-                NavigationBarItem(
-                  selected = selectedTab == tab,
-                  onClick = { onTabSelected(mapOf("tab" to tab)) },
-                  icon = { tabIcon(tab) },
-                  label = {
-                    val title = if (tab == "threads") "Chats" else "Pull requests"
-                    Text(title, fontSize = (12 * textScale).sp)
-                  },
-                  colors = NavigationBarItemDefaults.colors(
-                    selectedIconColor = Color(selectedColor),
-                    selectedTextColor = Color(selectedColor),
-                    indicatorColor = Color(indicatorColor),
-                    unselectedIconColor = Color(unselectedColor),
-                    unselectedTextColor = Color(unselectedColor),
-                  ),
-                )
+            if (rail) {
+              rail()
+            } else {
+              NavigationBar(
+                modifier = Modifier.fillMaxSize(),
+                containerColor = Color(containerColor),
+                tonalElevation = androidx.compose.ui.unit.Dp(0f),
+                windowInsets = WindowInsets(0),
+              ) {
+                TABS.forEach { tab ->
+                  NavigationBarItem(
+                    selected = selectedTab == tab,
+                    onClick = { onTabSelected(mapOf("tab" to tab)) },
+                    icon = { Icon(tabIconPainter(tab), contentDescription = null) },
+                    label = { Text(tabTitle(tab), fontSize = (12 * textScale).sp) },
+                    colors = NavigationBarItemDefaults.colors(
+                      selectedIconColor = Color(selectedColor),
+                      selectedTextColor = Color(selectedColor),
+                      indicatorColor = Color(indicatorColor),
+                      unselectedIconColor = Color(unselectedColor),
+                      unselectedTextColor = Color(unselectedColor),
+                    ),
+                  )
+                }
               }
             }
           }
@@ -135,15 +200,192 @@ class T3WorkspaceNavigationView(
   }
 
   @Composable
-  private fun tabIcon(tab: String) {
-    val drawable = if (tab == "threads") {
-      R.drawable.t3_chats
-    } else {
-      R.drawable.t3_pull_requests
-    }
-    Icon(
-      painter = painterResource(drawable),
-      contentDescription = if (tab == "threads") "Chats" else "Pull requests",
+  private fun rail() {
+    // One rail surface widens in place over the list. Material's ModalWideNavigationRail
+    // instead moves its destinations into a dialog window copy, which blanks them for a few
+    // frames while the window attaches and lays them out at a different height.
+    var expanded by remember { mutableStateOf(false) }
+    // React Native sizes this view to the rail. While the rail is open it spans the workspace,
+    // and it only widens once the host has made room, so the surface is never clipped.
+    var roomy by remember { mutableStateOf(false) }
+    val progress by animateFloatAsState(
+      targetValue = if (expanded && roomy) 1f else 0f,
+      animationSpec = MaterialTheme.motionScheme.defaultSpatialSpec(),
     )
+    val overlay = expanded || progress != 0f
+    LaunchedEffect(overlay) { onOverlayChange(mapOf("overlay" to overlay)) }
+    // The activity handles Back before React Native, so an open rail closes first.
+    val backDispatcher = (appContext.currentActivity as? ComponentActivity)?.onBackPressedDispatcher
+    DisposableEffect(backDispatcher, expanded) {
+      val callback = object : OnBackPressedCallback(expanded) {
+        override fun handleOnBackPressed() {
+          expanded = false
+        }
+      }
+      backDispatcher?.addCallback(callback)
+      onDispose { callback.remove() }
+    }
+    val density = LocalDensity.current
+    Box(
+      Modifier.fillMaxSize().onSizeChanged {
+        roomy = with(density) { it.width.toDp() } >= EXPANDED_RAIL_WIDTH
+      },
+    ) {
+      val fraction = progress.coerceIn(0f, 1f)
+      if (fraction > 0f) {
+        Scrim(
+          contentDescription = "Close navigation rail",
+          onClick = { expanded = false },
+          alpha = { fraction },
+        )
+      }
+      Column(
+        Modifier
+          .fillMaxHeight()
+          .width(lerp(RAIL_WIDTH, EXPANDED_RAIL_WIDTH, progress.coerceAtLeast(0f)))
+          .shadow(RAIL_SHADOW * fraction, RAIL_EXPANDED_SHAPE, clip = false)
+          .background(Color(containerColor), RAIL_EXPANDED_SHAPE)
+          .padding(top = safeAreaTop.dp, bottom = safeAreaBottom.dp + 12.dp)
+          .selectableGroup(),
+      ) {
+        // As tall as the list toolbar so the menu lines up with the toolbar's actions.
+        Box(
+          Modifier.height(headerHeight.dp).padding(start = RAIL_INSET),
+          contentAlignment = Alignment.CenterStart,
+        ) {
+          IconButton(
+            onClick = { expanded = !expanded },
+            modifier = Modifier.semantics {
+              contentDescription =
+                if (expanded) "Collapse navigation rail" else "Expand navigation rail"
+            },
+          ) {
+            Icon(
+              painterResource(R.drawable.t3_menu),
+              contentDescription = null,
+              tint = Color(unselectedColor),
+            )
+          }
+        }
+        newThreadButton(fraction) {
+          expanded = false
+          onNewThread(emptyMap<String, Any>())
+        }
+        Spacer(Modifier.weight(1f))
+        TABS.forEach { tab ->
+          railItem(tab, fraction) {
+            expanded = false
+            onTabSelected(mapOf("tab" to tab))
+          }
+        }
+        Spacer(Modifier.weight(1f))
+      }
+    }
+  }
+
+  /** The collapsed FAB widens with the rail and reveals its label as it goes. */
+  @Composable
+  private fun newThreadButton(fraction: Float, onClick: () -> Unit) {
+    Surface(
+      onClick = onClick,
+      enabled = newEnabled,
+      shape = MaterialTheme.shapes.large,
+      color = Color(actionColor),
+      contentColor = Color(actionContentColor),
+      shadowElevation = 3.dp,
+      modifier = Modifier
+        .padding(start = RAIL_INSET, top = 12.dp)
+        .height(FAB_SIZE)
+        .width(lerp(FAB_SIZE, EXPANDED_RAIL_WIDTH - RAIL_INSET * 2, fraction))
+        .alpha(if (newEnabled) 1f else DISABLED_ALPHA)
+        .semantics { contentDescription = "New thread" },
+    ) {
+      Row(
+        Modifier.padding(start = (FAB_SIZE - ICON_SIZE) / 2).clipToBounds(),
+        verticalAlignment = Alignment.CenterVertically,
+      ) {
+        Icon(painterResource(R.drawable.t3_new_thread), contentDescription = null)
+        Text(
+          "New thread",
+          Modifier.padding(start = 12.dp).alpha(labelAlpha(fraction)).clearAndSetSemantics {},
+          style = MaterialTheme.typography.labelLarge,
+          fontSize = (14 * textScale).sp,
+          maxLines = 1,
+          softWrap = false,
+        )
+      }
+    }
+  }
+
+  /**
+   * A destination whose indicator stretches from a circle around the icon into a pill around
+   * the icon and label. The icon never moves, so the collapsed and expanded rails share it.
+   */
+  @Composable
+  private fun railItem(tab: String, fraction: Float, onClick: () -> Unit) {
+    val selected = selectedTab == tab
+    val title = expandedTabTitle(tab)
+    val tint = Color(if (selected) selectedColor else unselectedColor)
+    Box(
+      Modifier
+        .padding(start = RAIL_INSET, bottom = 4.dp)
+        .height(ITEM_HEIGHT)
+        .width(lerp(ITEM_HEIGHT, EXPANDED_RAIL_WIDTH - RAIL_INSET * 2, fraction))
+        .clip(CircleShape)
+        .background(if (selected) Color(indicatorColor) else Color.Transparent)
+        .selectable(selected = selected, role = Role.Tab, onClick = onClick)
+        .semantics { contentDescription = title },
+    ) {
+      Row(
+        Modifier.fillMaxHeight().padding(start = (ITEM_HEIGHT - ICON_SIZE) / 2).clipToBounds(),
+        verticalAlignment = Alignment.CenterVertically,
+      ) {
+        Icon(tabIconPainter(tab), contentDescription = null, tint = tint)
+        Text(
+          title,
+          Modifier.padding(start = 12.dp).alpha(labelAlpha(fraction)).clearAndSetSemantics {},
+          color = tint,
+          style = MaterialTheme.typography.labelLarge,
+          fontSize = (14 * textScale).sp,
+          maxLines = 1,
+          softWrap = false,
+        )
+      }
+    }
+  }
+
+  private fun tabTitle(tab: String) = when (tab) {
+    "threads" -> "Chats"
+    "pullRequests" -> "PRs"
+    else -> "Settings"
+  }
+
+  private fun expandedTabTitle(tab: String) =
+    if (tab == "pullRequests") "Pull Requests" else tabTitle(tab)
+
+  @Composable
+  private fun tabIconPainter(tab: String) = painterResource(
+    when (tab) {
+      "threads" -> R.drawable.t3_chats
+      "pullRequests" -> R.drawable.t3_pull_requests
+      else -> R.drawable.t3_settings
+    }
+  )
+
+  private companion object {
+    // Material's 80dp compact rail, minus 8dp: still a 48dp touch target with 12dp margins.
+    val RAIL_WIDTH = 72.dp
+    val EXPANDED_RAIL_WIDTH = 240.dp
+    val RAIL_INSET = 12.dp
+    val ITEM_HEIGHT = 48.dp
+    val FAB_SIZE = 48.dp
+    val ICON_SIZE = 24.dp
+    val RAIL_SHADOW = 6.dp
+    val RAIL_EXPANDED_SHAPE = RoundedCornerShape(topEnd = 16.dp, bottomEnd = 16.dp)
+    const val DISABLED_ALPHA = 0.4f
+
+    // Labels fade in over the second half of the widening, once there is room for them, and
+    // fade out over the first half of the narrowing, before the surface clips them.
+    fun labelAlpha(fraction: Float) = ((fraction - 0.5f) / 0.5f).coerceIn(0f, 1f)
   }
 }
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_menu.xml b/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_menu.xml
new file mode 100644
index 000000000000..d483560d3785
--- /dev/null
+++ b/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_menu.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+  <path android:fillColor="#000000" android:pathData="M3,6H21V8H3ZM3,11H21V13H3ZM3,16H21V18H3Z" />
+</vector>
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_new_thread.xml b/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_new_thread.xml
new file mode 100644
index 000000000000..109e695d0168
--- /dev/null
+++ b/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_new_thread.xml
@@ -0,0 +1,4 @@
+<!-- Tabler Icons edit (MIT), the same glyph as the phone's New thread button (assets/icons/compose.xml). -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+  <path android:fillColor="#000000" android:pathData="M7,6 L6,6 C4.3431,6 3,7.3431 3,9 L3,18 C3,19.6569 4.3431,21 6,21 L15,21 C16.6569,21 18,19.6569 18,18 L18,17 C18,16.4477 17.5523,16 17,16 C16.4477,16 16,16.4477 16,17 L16,18 C16,18.5523 15.5523,19 15,19 L6,19 C5.4477,19 5,18.5523 5,18 L5,9 C5,8.4477 5.4477,8 6,8 L7,8 C7.5523,8 8,7.5523 8,7 C8,6.4477 7.5523,6 7,6 Z M21.0921,5.8779 L21.092,5.8778 L20.3849,6.5849 L21.092,7.292 C22.3027,6.0814 22.3027,4.1186 21.092,2.908 C19.8814,1.6973 17.9186,1.6973 16.708,2.908 L8.2942,11.2916 C8.1059,11.4793 8,11.7342 8,12 L8,15 C8,15.5523 8.4477,16 9,16 L12,16 C12.2658,16 12.5207,15.8942 12.7084,15.7058 L21.0934,7.2908 C21.4832,6.8996 21.4821,6.2665 21.0908,5.8766 C20.6996,5.4868 20.0665,5.4879 19.6766,5.8792 L11.2916,14.2942 L12,14 L9,14 L10,15 L10,12 L9.7058,12.7084 L18.1209,4.3235 C18.5518,3.8926 19.2482,3.8926 19.6778,4.3222 C20.1074,4.7518 20.1074,5.4482 19.6778,5.8778 C19.2873,6.2683 19.2873,6.9015 19.6778,7.292 L19.6779,7.2921 C20.0684,7.6826 20.7016,7.6826 21.0921,7.2921 C21.4826,6.9016 21.4826,6.2684 21.0921,5.8779 Z M15.2929,5.7071 L18.2929,8.7071 C18.6834,9.0976 19.3166,9.0976 19.7071,8.7071 C20.0976,8.3166 20.0976,7.6834 19.7071,7.2929 L16.7071,4.2929 C16.3166,3.9024 15.6834,3.9024 15.2929,4.2929 C14.9024,4.6834 14.9024,5.3166 15.2929,5.7071 Z" />
+</vector>
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_settings.xml b/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_settings.xml
new file mode 100644
index 000000000000..3c4dfa57233e
--- /dev/null
+++ b/apps/mobile/modules/t3-native-controls/android/src/main/res/drawable/t3_settings.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+  <path android:fillColor="#000000" android:pathData="M19.43,12.98C19.47,12.66 19.5,12.34 19.5,12C19.5,11.66 19.47,11.34 19.43,11.02L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.97 19.05,5.05L16.56,6.05C16.04,5.65 15.48,5.32 14.87,5.07L14.49,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.51,2.42L9.13,5.07C8.52,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.72,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11.02C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.66 4.57,12.98L2.46,14.63C2.27,14.78 2.22,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.95C7.96,18.35 8.52,18.68 9.13,18.93L9.51,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.49,21.58L14.87,18.93C15.48,18.68 16.04,18.34 16.56,17.95L19.05,18.95C19.28,19.04 19.54,18.95 19.66,18.73L21.66,15.27C21.79,15.05 21.73,14.78 21.54,14.63L19.43,12.98ZM12,15.5C10.07,15.5 8.5,13.93 8.5,12C8.5,10.07 10.07,8.5 12,8.5C13.93,8.5 15.5,10.07 15.5,12C15.5,13.93 13.93,15.5 12,15.5Z" />
+</vector>
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 349eb8a1e9b8..a20120edd4d9 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -133,7 +133,7 @@
     "react-native-pdf-jsi": "5.0.0",
     "react-native-reanimated": "4.7.1",
     "react-native-safe-area-context": "~5.10.1",
-    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.27.tgz",
+    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.29.tgz",
     "react-native-shiki-engine": "^0.3.12",
     "react-native-svg": "15.16.0",
     "react-native-webview": "14.0.1",
diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx
index 6d7ebcb9ffe7..16abe358e911 100644
--- a/apps/mobile/src/Stack.tsx
+++ b/apps/mobile/src/Stack.tsx
@@ -32,7 +32,9 @@ import { useResolveClassNames } from "uniwind";
 import { AppText as Text } from "./components/ui/AppText";
 import { androidWorkspaceDestinationAnimation } from "./lib/android-workspace-navigation";
 import { getCompactBrandHeaderOptions } from "./components/CompactBrandTitle";
+import { WorkspaceConnectionStatusProvider } from "./features/home/WorkspaceConnectionTitle";
 import { WorkspaceRootScreen } from "./features/workspace/WorkspaceRootScreen";
+import { AndroidWorkspaceSettings } from "./features/workspace/AndroidWorkspaceSettings";
 import { AndroidWorkspaceTabsProvider } from "./features/workspace/AndroidWorkspaceTabsProvider";
 import {
   PullRequestRouteScreen,
@@ -219,6 +221,9 @@ const SettingsContentStack = createV5SheetStackNavigator({
       linking: "",
       options: {
         title: "Settings",
+        // Android draws its own app bar here. Hidden only from inside the screen, the native one
+        // showed for the first frame of the Settings tab and pushed the page down.
+        headerShown: Platform.OS !== "android",
       },
     }),
     SettingsEnvironments: createNativeStackScreen({
@@ -562,7 +567,12 @@ const WORKSPACE_OVERLAY_ROUTES = new Set([
 ]);
 
 function workspaceLocationFromState(state: NavigationState) {
-  const routes = state.routes.filter((route) => !WORKSPACE_OVERLAY_ROUTES.has(route.name));
+  // Android opens Settings as a workspace page rather than an overlay, so the layout sees it.
+  const routes = state.routes.filter(
+    (route) =>
+      !WORKSPACE_OVERLAY_ROUTES.has(route.name) ||
+      (Platform.OS === "android" && route.name === "SettingsSheet"),
+  );
   const effectiveState =
     routes.length > 0 && routes.length !== state.routes.length
       ? ({ ...state, routes, index: routes.length - 1 } as NavigationState)
@@ -618,16 +628,18 @@ function RootStackLayout(props: {
       <ThreadOutboxDrainWorker />
       <ShowcaseCaptureCoordinator pathname={pathname} />
       <ExistingThreadSettingsRouteProvider>
-        <AndroidWorkspaceTabsProvider>
-          <AdaptiveWorkspaceLayout
-            pathname={workspaceLocation.pathname}
-            workspaceRouteKey={workspaceLocation.routeKey}
-            selectedPullRequestKey={selectedPullRequestKey(props.state)}
-          >
-            {props.children}
-            <HardwareKeyboardCommandOverlay />
-          </AdaptiveWorkspaceLayout>
-        </AndroidWorkspaceTabsProvider>
+        <WorkspaceConnectionStatusProvider>
+          <AndroidWorkspaceTabsProvider state={props.state}>
+            <AdaptiveWorkspaceLayout
+              pathname={workspaceLocation.pathname}
+              workspaceRouteKey={workspaceLocation.routeKey}
+              selectedPullRequestKey={selectedPullRequestKey(props.state)}
+            >
+              {props.children}
+              <HardwareKeyboardCommandOverlay />
+            </AdaptiveWorkspaceLayout>
+          </AndroidWorkspaceTabsProvider>
+        </WorkspaceConnectionStatusProvider>
       </ExistingThreadSettingsRouteProvider>
     </HardwareKeyboardCommandProvider>
   );
@@ -913,11 +925,14 @@ const RootStackConfig = createWorkspaceStackNavigator({
     }),
     SettingsSheet: createNativeStackScreen({
       screen: SettingsSheetStack,
+      layout: ({ children }) => <AndroidWorkspaceSettings>{children}</AndroidWorkspaceSettings>,
       linking: "settings",
       options: {
         ...NESTED_NAVIGATOR_OPTIONS,
         gestureEnabled: true,
         headerShown: false,
+        // Android opens Settings as a top-level tab, so it swaps like the other tabs.
+        ...(Platform.OS === "android" ? { animation: "none" as const } : null),
       },
     }),
     SettingsLegal: createNativeStackScreen({
diff --git a/apps/mobile/src/components/ui/NativeAppBar.android.tsx b/apps/mobile/src/components/ui/NativeAppBar.android.tsx
index b06b0908356e..2c028fded803 100644
--- a/apps/mobile/src/components/ui/NativeAppBar.android.tsx
+++ b/apps/mobile/src/components/ui/NativeAppBar.android.tsx
@@ -14,10 +14,13 @@ export function NativeAppBar(props: {
   const { colors } = useControlTheme();
   const layout = useToolbarLayout();
   return (
-    <NativeThemeHost matchContents={{ vertical: true }} style={{ width: "100%" }}>
+    // The bar's height is fixed, so React Native lays out the screen below it from the first frame
+    // instead of at zero height until Compose has measured and reported the bar.
+    <NativeThemeHost style={{ width: "100%", height: layout.height }}>
       <TopAppBar
         applyWindowInsets={false}
-        modifiers={[fillMaxWidth(), height(Math.max(64, layout.height))]}
+        // Every header shares the list toolbar's height, so titles line up across panes.
+        modifiers={[fillMaxWidth(), height(layout.height)]}
         colors={{
           containerColor: colors["--color-header"],
           titleContentColor: colors["--color-header-foreground"],
diff --git a/apps/mobile/src/features/connection/ConnectionFormField.test.tsx b/apps/mobile/src/features/connection/ConnectionFormField.test.tsx
deleted file mode 100644
index 9c9be070e212..000000000000
--- a/apps/mobile/src/features/connection/ConnectionFormField.test.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { ReactNode } from "react";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vite-plus/test";
-
-vi.mock("react-native", () => ({
-  View: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-}));
-vi.mock("../../components/ui/AppText", () => ({
-  AppText: ({
-    accessibilityElementsHidden,
-    importantForAccessibility,
-    children,
-  }: {
-    accessibilityElementsHidden?: boolean;
-    importantForAccessibility?: string;
-    children: ReactNode;
-  }) => (
-    <span
-      aria-hidden={
-        accessibilityElementsHidden || importantForAccessibility === "no-hide-descendants"
-      }
-    >
-      {children}
-    </span>
-  ),
-  AppTextInput: ({ accessibilityLabel }: { accessibilityLabel?: string }) => (
-    <input aria-label={accessibilityLabel} />
-  ),
-}));
-
-import { ConnectionFormField } from "./ConnectionFormField";
-
-describe("ConnectionFormField accessibility", () => {
-  it.each(["Host", "Pairing code"])("exposes %s once as the input name", (label) => {
-    const markup = renderToStaticMarkup(
-      <ConnectionFormField label={label} placeholder="Not an accessible name" />,
-    );
-
-    expect(markup).toContain(`<span aria-hidden="true">${label}</span>`);
-    expect(markup).toContain(`<input aria-label="${label}"/>`);
-  });
-});
diff --git a/apps/mobile/src/features/home/AndroidHomeFab.android.tsx b/apps/mobile/src/features/home/AndroidHomeFab.android.tsx
index e8a29ce516c6..7c6fa8c6850f 100644
--- a/apps/mobile/src/features/home/AndroidHomeFab.android.tsx
+++ b/apps/mobile/src/features/home/AndroidHomeFab.android.tsx
@@ -36,10 +36,12 @@ export function AndroidHomeFabLayout(props: ComponentProps<typeof SharedAndroidH
   }, []);
 
   // Remount only the FAB when its font or pane changes to clear the cached expanded width.
+  // The split-view sidebar has no FAB: the navigation rail carries New thread. On phones it
+  // keeps Material's 16dp corner margin; the bottom bar already consumes the gesture inset.
   return (
     <View className="flex-1" onLayout={(event) => setLayoutWidth(event.nativeEvent.layout.width)}>
       <FabScrollContext value={onScroll}>{props.children}</FabScrollContext>
-      {!props.disabled && state.hasConnections && layoutWidth !== null ? (
+      {!props.disabled && !props.sidebar && state.hasConnections && layoutWidth !== null ? (
         <NewThreadButton
           key={`${appearance.baseFontSize}:${fontScale}:${layoutWidth}`}
           extended
diff --git a/apps/mobile/src/features/home/HomeHeader.android.tsx b/apps/mobile/src/features/home/HomeHeader.android.tsx
index d6eb9c203566..8666329f87ab 100644
--- a/apps/mobile/src/features/home/HomeHeader.android.tsx
+++ b/apps/mobile/src/features/home/HomeHeader.android.tsx
@@ -98,7 +98,6 @@ export function HomeHeader(props: HomeHeaderProps) {
         filterActions={menuActions}
         filterCustomized={hasCustomListOptions}
         onFilterAction={handleMenuAction}
-        onOpenSettings={props.onOpenSettings}
         onOpenEnvironments={props.onOpenEnvironments}
       />
     </>
diff --git a/apps/mobile/src/features/home/ThreadListToolbar.tsx b/apps/mobile/src/features/home/ThreadListToolbar.tsx
index 974f29b83b6b..9a66d1e28eca 100644
--- a/apps/mobile/src/features/home/ThreadListToolbar.tsx
+++ b/apps/mobile/src/features/home/ThreadListToolbar.tsx
@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useRef, useState, type ComponentProps } from "react";
 import { useNavigation, useNavigationState } from "@react-navigation/native";
 import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
-import { useWorkspaceListNavigation } from "../workspace/useAndroidWorkspaceNavigation";
 import {
   BackHandler,
   Keyboard,
@@ -9,22 +8,16 @@ import {
   View,
   type LayoutChangeEvent,
 } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 import type { MenuAction } from "@react-native-menu/menu";
 
 import { AndroidHeaderIconButton } from "../../components/ui/AndroidScreenHeader";
-import { CompactBrandTitle } from "../../components/CompactBrandTitle";
-import { FloatingActionButton } from "../../components/ui/FloatingActionButton";
 import { AndroidAnchoredMenu } from "../../components/ui/AndroidAnchoredMenu";
 import { Menu } from "../../components/ui/Menu";
 import { SearchField } from "../../components/ui/SearchField";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
-import { WorkspaceConnectionTitle } from "./WorkspaceConnectionTitle";
-import { useWorkspaceState } from "../../state/workspace";
-import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
+import { WorkspaceListToolbarRow } from "../workspace/WorkspaceListToolbarRow";
+import { useWorkspaceConnectionState } from "../../state/workspace";
 import { useToolbarLayout } from "../../components/ui/useToolbarLayout";
-import { PullRequestGlyph } from "../pull-requests/pullRequestGlyphs";
-import { androidHomeFabPosition } from "./AndroidHomeFab.shared";
 
 /** One toolbar height for the compact list and expanded sidebar, including search. */
 export function ThreadListToolbar(props: {
@@ -33,25 +26,20 @@ export function ThreadListToolbar(props: {
   readonly filterActions: MenuAction[];
   readonly filterCustomized: boolean;
   readonly onFilterAction: NonNullable<ComponentProps<typeof Menu>["onPressAction"]>;
-  readonly onOpenSettings: () => void;
   readonly onOpenEnvironments: () => void;
   readonly sidebar?: boolean;
   readonly onLayout?: (event: LayoutChangeEvent) => void;
   readonly onRequestVisibility?: () => void;
 }) {
-  const insets = useSafeAreaInsets();
   const navigation = useNavigation();
   const workspace = useWorkspaceTabs();
   const isTabActive = workspace?.isTabActive;
   const homeFocused = useNavigationState((state) => state.routes[state.index]?.name === "Home");
   const listFocused =
     homeFocused && (workspace === null || workspace.state.selectedTab === "threads");
-  const { fabSize } = useAndroidControlSizing();
-  const fab = androidHomeFabPosition(insets.bottom, props.sidebar);
-  const { height: toolbarHeight, ...headerPadding } = useToolbarLayout();
-  const { state } = useWorkspaceState();
+  const { paddingTop, paddingBottom } = useToolbarLayout();
+  const connectionState = useWorkspaceConnectionState();
   const { onRequestVisibility, onSearchQueryChange } = props;
-  const showPullRequests = useWorkspaceListNavigation("pullRequests");
   const searchRef = useRef<TextInputInstance>(null);
   const [searchOpen, setSearchOpen] = useState(false);
   const searching = searchOpen || props.searchQuery.length > 0;
@@ -100,68 +88,34 @@ export function ThreadListToolbar(props: {
       onChangeText={onSearchQueryChange}
     />
   );
+  const filterButton = connectionState.hasConnections ? (
+    <AndroidAnchoredMenu actions={props.filterActions} onPressAction={props.onFilterAction}>
+      {(open) => (
+        <AndroidHeaderIconButton
+          accessibilityLabel="Filter threads"
+          icon={filterIcon}
+          onPress={open}
+        />
+      )}
+    </AndroidAnchoredMenu>
+  ) : null;
 
   return (
-    <>
-      <View
-        onLayout={props.onLayout}
-        className={
-          props.sidebar ? "absolute inset-x-0 top-0 z-[4] bg-header px-2" : "bg-header px-2"
-        }
-        style={headerPadding}
-      >
-        <View className="flex-row items-center gap-1" style={{ minHeight: toolbarHeight }}>
-          {searching ? (
-            <>
-              <AndroidHeaderIconButton
-                accessibilityLabel="Close search"
-                icon="arrow.left"
-                onPress={closeSearch}
-              />
-              {searchField}
-            </>
-          ) : (
-            <>
-              <View className="min-w-0 flex-1 pl-4">
-                <WorkspaceConnectionTitle
-                  grow
-                  onPress={props.onOpenEnvironments}
-                  brand={<CompactBrandTitle allowFontScaling={false} fit />}
-                />
-              </View>
-              {props.sidebar && workspace ? (
-                <AndroidHeaderIconButton
-                  accessibilityLabel="Show pull requests"
-                  icon={PullRequestGlyph.pullRequest}
-                  onPress={showPullRequests}
-                />
-              ) : null}
-              <AndroidHeaderIconButton
-                accessibilityLabel="Search threads"
-                icon="magnifyingglass"
-                onPress={openSearch}
-              />
-              <AndroidHeaderIconButton
-                accessibilityLabel="Open settings"
-                icon="gearshape"
-                onPress={props.onOpenSettings}
-              />
-            </>
-          )}
-        </View>
-      </View>
-      {state.hasConnections ? (
-        <View
-          className="absolute z-[5]"
-          style={{ right: fab.right, bottom: fab.bottom + fabSize + 8 }}
-        >
-          <AndroidAnchoredMenu actions={props.filterActions} onPressAction={props.onFilterAction}>
-            {(open) => (
-              <FloatingActionButton label="Filter threads" icon={filterIcon} onPress={open} />
-            )}
-          </AndroidAnchoredMenu>
-        </View>
-      ) : null}
-    </>
+    <View
+      onLayout={props.onLayout}
+      className={props.sidebar ? "absolute inset-x-0 top-0 z-[4] bg-header px-2" : "bg-header px-2"}
+      style={{ paddingTop, paddingBottom }}
+    >
+      <WorkspaceListToolbarRow
+        searching={searching}
+        searchField={searchField}
+        onCloseSearch={closeSearch}
+        onOpenSearch={openSearch}
+        searchAccessibilityLabel="Search threads"
+        titleAccessibilityLabel="T3 Code, Threads"
+        onOpenEnvironments={props.onOpenEnvironments}
+        filter={filterButton}
+      />
+    </View>
   );
 }
diff --git a/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx b/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx
index f1b9bfd5b926..ab22cd6e7d4d 100644
--- a/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx
+++ b/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx
@@ -1,5 +1,5 @@
 import type { NativeStackNavigationOptions } from "@react-navigation/native-stack";
-import { useEffect, useState, type ReactNode } from "react";
+import { createContext, use, useEffect, useMemo, useState, type ReactNode } from "react";
 import { Animated, Platform, Pressable, View } from "react-native";
 
 import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
@@ -20,22 +20,47 @@ import {
 const STATUS_SHOW_DELAY_MS = 800;
 const FADE_IN_MS = 250;
 
-function useDelayedConnectionStatus(): WorkspaceConnectionStatusPresentation | null {
+type ConnectionStatus = WorkspaceConnectionStatusPresentation & {
+  /** Only while the status first appears. A header that shows it later shows it at once. */
+  readonly fadeIn: boolean;
+};
+
+const ConnectionStatusContext = createContext<ConnectionStatus | null>(null);
+
+/**
+ * The delay hides brief reconnects, so it is the workspace's, not each header's: every header
+ * shows the status from the same moment. Headers read it from context instead of subscribing
+ * themselves, because a hidden Android tab drops its subscriptions and showed a stale status for
+ * a moment when it came back, while context still reaches it.
+ */
+export function WorkspaceConnectionStatusProvider(props: { readonly children: ReactNode }) {
   const { state } = useWorkspaceState();
   const presentation = workspaceConnectionStatusPresentation(state);
   const hasStatus = presentation !== null;
-  const [visible, setVisible] = useState(false);
+  const [phase, setPhase] = useState<"waiting" | "fading" | "shown">("waiting");
 
   useEffect(() => {
-    if (!hasStatus) {
-      setVisible(false);
-      return;
-    }
-    const timer = setTimeout(() => setVisible(true), STATUS_SHOW_DELAY_MS);
-    return () => clearTimeout(timer);
+    if (!hasStatus) return;
+    const timers = [
+      setTimeout(() => setPhase("fading"), STATUS_SHOW_DELAY_MS),
+      setTimeout(() => setPhase("shown"), STATUS_SHOW_DELAY_MS + FADE_IN_MS),
+    ];
+    return () => {
+      for (const timer of timers) clearTimeout(timer);
+      setPhase("waiting");
+    };
   }, [hasStatus]);
 
-  return visible ? presentation : null;
+  const label = presentation?.label;
+  const showsProgress = presentation?.showsProgress ?? false;
+  const status = useMemo(
+    () =>
+      label === undefined || phase === "waiting"
+        ? null
+        : { label, showsProgress, fadeIn: phase === "fading" },
+    [label, showsProgress, phase],
+  );
+  return <ConnectionStatusContext value={status}>{props.children}</ConnectionStatusContext>;
 }
 
 /**
@@ -46,12 +71,15 @@ function useDelayedConnectionStatus(): WorkspaceConnectionStatusPresentation | n
  */
 function StatusFadeIn(props: {
   readonly children: ReactNode;
+  readonly animate: boolean;
   readonly grow?: boolean;
   readonly maxWidth?: number;
 }) {
+  const { animate } = props;
   const [opacity] = useState(() => new Animated.Value(0));
 
   useEffect(() => {
+    if (!animate) return;
     const animation = Animated.timing(opacity, {
       duration: FADE_IN_MS,
       toValue: 1,
@@ -59,12 +87,18 @@ function StatusFadeIn(props: {
     });
     animation.start();
     return () => animation.stop();
-  }, [opacity]);
+  }, [animate, opacity]);
 
   return (
     <Animated.View
       style={[
-        { alignItems: "center", flexDirection: "row", maxWidth: props.maxWidth, opacity },
+        {
+          alignItems: "center",
+          flexDirection: "row",
+          maxWidth: props.maxWidth,
+          // A hidden tab never runs the fade, so its value would still be 0 when the tab returns.
+          opacity: animate ? opacity : 1,
+        },
         props.grow ? { flex: 1, minWidth: 0 } : null,
       ]}
     >
@@ -81,7 +115,7 @@ export function WorkspaceConnectionTitle(props: {
   readonly statusOffset?: number;
   readonly maxWidth?: number;
 }) {
-  const status = useDelayedConnectionStatus();
+  const status = use(ConnectionStatusContext);
   const size = props.size ?? "navbar";
   const { scale } = useAndroidControlSizing();
 
@@ -96,7 +130,7 @@ export function WorkspaceConnectionTitle(props: {
   }
 
   return (
-    <StatusFadeIn grow={props.grow} maxWidth={props.maxWidth}>
+    <StatusFadeIn animate={status.fadeIn} grow={props.grow} maxWidth={props.maxWidth}>
       <Pressable
         accessibilityHint="Opens environment settings"
         accessibilityLabel={status.label}
diff --git a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
index 669537b6fae6..480ca463dac8 100644
--- a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
+++ b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
@@ -60,6 +60,10 @@ import {
   useHardwareKeyboardCommand,
 } from "../keyboard/hardwareKeyboardCommands";
 import { AndroidHomeFabLayout } from "../home/AndroidHomeFab";
+import {
+  AndroidWorkspaceNavigation,
+  ANDROID_WORKSPACE_RAIL_WIDTH,
+} from "../workspace/AndroidWorkspaceNavigation";
 import { AndroidWorkspaceSidebar } from "../workspace/AndroidWorkspaceSidebar";
 import { useAndroidWorkspaceSelection } from "../workspace/useAndroidWorkspaceSelection";
 import { HomeListOptionsProvider } from "../home/home-list-options";
@@ -235,6 +239,9 @@ function AdaptiveWorkspaceLayoutContent(
   const nativeMetrics = useNativeLayoutMetrics();
   const { width: viewportWidth, height } = nativeMetrics ?? windowDimensions;
   const pathname = props.pathname;
+  // Android's Settings tab is a full workspace page: the rail stays, the sidebar and
+  // auxiliary panes hide.
+  const workspacePage = Platform.OS === "android" && pathname.startsWith("/settings");
   const navigation = useNavigation();
   const activeRoleOwner = useRef<symbol | null>(null);
   const [primarySidebarPreferredVisible, setPrimarySidebarPreferredVisible] = useState(true);
@@ -247,6 +254,7 @@ function AdaptiveWorkspaceLayoutContent(
     null,
   );
   const [primarySidebarSearchQuery, setPrimarySidebarSearchQuery] = useState("");
+  const [railOverlay, setRailOverlay] = useState(false);
   const [focusedAuxiliaryPaneRole, setFocusedAuxiliaryPaneRole] =
     useState<WorkspaceAuxiliaryPaneRole | null>(null);
   // The compiler can't memoize these derivations: they stay live across later hook calls. Fresh
@@ -262,7 +270,13 @@ function AdaptiveWorkspaceLayoutContent(
     nativeWorkspace,
     usesSplitView: baseLayout.usesSplitView,
   });
-  const showPrimarySidebar = primarySidebarPinned || primarySidebarPreferredVisible;
+  const showPrimarySidebar =
+    !workspacePage && (primarySidebarPinned || primarySidebarPreferredVisible);
+  const shouldRenderNavigationRail = Platform.OS === "android" && baseLayout.usesSplitView;
+  const navigationRailWidth =
+    shouldRenderNavigationRail && (showPrimarySidebar || workspacePage)
+      ? ANDROID_WORKSPACE_RAIL_WIDTH
+      : 0;
   const [hinge, setHinge] = useState<VerticalHinge | null>(null);
   const [windowHinge, setWindowHinge] = useState<VerticalHinge | null>(null);
   const handleHingeChange = (next: VerticalHinge | null, nextWindow: VerticalHinge | null) => {
@@ -270,35 +284,38 @@ function AdaptiveWorkspaceLayoutContent(
     setWindowHinge(nextWindow);
   };
   const layout = useMemo(
-    () => alignListPaneToHinge({ layout: baseLayout, hinge, viewportWidth }),
-    [baseLayout, hinge, viewportWidth],
+    () =>
+      alignListPaneToHinge({
+        layout: baseLayout,
+        hinge,
+        viewportWidth,
+        leadingWidth: navigationRailWidth,
+      }),
+    [baseLayout, hinge, navigationRailWidth, viewportWidth],
   );
+  const width = viewportWidth - navigationRailWidth;
+  // The sidebar stays mounted under a workspace page, so its list is ready on the way back.
   const shouldRenderPrimarySidebar = layout.usesSplitView;
   const fileInspector = useMemo(
     () =>
       deriveFileInspectorPaneLayout({
         layout,
-        viewportWidth,
+        viewportWidth: width,
         preferredWidth: fileInspectorPreferredWidth ?? undefined,
         reservedLeadingWidth:
           shouldRenderPrimarySidebar && showPrimarySidebar
             ? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)
             : 0,
       }),
-    [
-      fileInspectorPreferredWidth,
-      layout,
-      showPrimarySidebar,
-      shouldRenderPrimarySidebar,
-      viewportWidth,
-    ],
+    [fileInspectorPreferredWidth, layout, showPrimarySidebar, shouldRenderPrimarySidebar, width],
   );
   const auxiliaryPaneRole: WorkspaceAuxiliaryPaneRole =
     focusedAuxiliaryPaneRole ?? (/\/files(?:\/|$)/.test(pathname) ? "inspector" : "supplementary");
   const auxiliaryPanePreferredVisible =
-    auxiliaryPaneRole === "inspector"
+    !workspacePage &&
+    (auxiliaryPaneRole === "inspector"
       ? fileInspectorPreferredVisible
-      : supplementaryPanePreferredVisible;
+      : supplementaryPanePreferredVisible);
   const auxiliaryPanePreferredWidth =
     auxiliaryPaneRole === "inspector"
       ? fileInspectorPreferredWidth
@@ -307,7 +324,7 @@ function AdaptiveWorkspaceLayoutContent(
     () =>
       deriveWorkspacePaneLayout({
         layout,
-        viewportWidth,
+        viewportWidth: width,
         primarySidebarPreferredVisible: showPrimarySidebar,
         auxiliaryPanePreferredVisible,
         auxiliaryPaneRole,
@@ -319,7 +336,7 @@ function AdaptiveWorkspaceLayoutContent(
       auxiliaryPanePreferredWidth,
       layout,
       showPrimarySidebar,
-      viewportWidth,
+      width,
     ],
   );
   const activeThread = parseActiveThreadPath(pathname);
@@ -484,6 +501,7 @@ function AdaptiveWorkspaceLayoutContent(
     : null;
   const [contentSizing, setContentSizing] = useState({
     viewportWidth,
+    workspacePage,
     target: contentTargetWidth,
     sidebarVisible: panes.primarySidebarVisible,
     width: contentTargetWidth,
@@ -495,11 +513,15 @@ function AdaptiveWorkspaceLayoutContent(
   if (
     Platform.OS === "android" &&
     (contentSizing.viewportWidth !== viewportWidth ||
+      contentSizing.workspacePage !== workspacePage ||
       contentSizing.target !== contentTargetWidth ||
       contentSizing.sidebarVisible !== panes.primarySidebarVisible ||
       contentSizing.listPaneTarget !== layout.listPaneWidth)
   ) {
-    const sameViewport = contentSizing.viewportWidth === viewportWidth;
+    // A workspace page swaps the sidebar in the same frame, so nothing animates to wait for.
+    const sameViewport =
+      contentSizing.viewportWidth === viewportWidth &&
+      contentSizing.workspacePage === workspacePage;
     const openingSidebar =
       sameViewport && !contentSizing.sidebarVisible && panes.primarySidebarVisible;
     // A book-posture hinge resizes the visible list pane instead of revealing it.
@@ -514,6 +536,7 @@ function AdaptiveWorkspaceLayoutContent(
       contentTargetWidth !== null;
     setContentSizing({
       viewportWidth,
+      workspacePage,
       target: contentTargetWidth,
       sidebarVisible: panes.primarySidebarVisible,
       // Clip the wide navigator while the sidebar opens or widens, then reflow once at the
@@ -556,23 +579,41 @@ function AdaptiveWorkspaceLayoutContent(
   const renderedSidebarWidth = useSharedValue(
     panes.primarySidebarVisible ? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0) : 0,
   );
+  const renderedRailWidth = useSharedValue(navigationRailWidth);
+  const leavingWorkspacePage = useRef(false);
   useEffect(() => {
     if (nativeWorkspace) return;
+    renderedRailWidth.set(withTiming(navigationRailWidth, WORKSPACE_PANE_TIMING));
+    // A workspace page hides the sidebar through React instead, in the same commit that mounts
+    // the page. Animating it here would hide it a few frames before the page appears.
+    if (workspacePage) {
+      leavingWorkspacePage.current = true;
+      return;
+    }
+    const snap = leavingWorkspacePage.current;
+    leavingWorkspacePage.current = false;
     const targetWidth = panes.primarySidebarVisible
       ? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)
       : 0;
-    renderedSidebarWidth.value = withTiming(targetWidth, WORKSPACE_PANE_TIMING, (finished) => {
-      if (finished && Platform.OS === "android") runOnJS(settleContentWidth)(contentRevision);
-    });
+    // The content beside it already took its final width when the page closed.
+    renderedSidebarWidth.set(
+      withTiming(targetWidth, snap ? { duration: 0 } : WORKSPACE_PANE_TIMING, (finished) => {
+        if (finished && Platform.OS === "android") runOnJS(settleContentWidth)(contentRevision);
+      }),
+    );
   }, [
     nativeWorkspace,
+    navigationRailWidth,
     layout.listPaneWidth,
     layout.listPaneGap,
     panes.primarySidebarVisible,
     renderedSidebarWidth,
+    renderedRailWidth,
     settleContentWidth,
     contentRevision,
+    workspacePage,
   ]);
+  const railAnimatedStyle = useAnimatedStyle(() => ({ width: renderedRailWidth.value }));
   // Showing or hiding the sidebar clips a fixed-width list. A hinge resize instead tracks the
   // animated edge, so the header actions slide with it rather than jumping or being covered.
   const listPaneGap = layout.listPaneGap ?? 0;
@@ -593,7 +634,13 @@ function AdaptiveWorkspaceLayoutContent(
   // merely clip/reveal it over a matching background.
   const renderedInspectorWidth = useSharedValue(inspectorColumnTargetWidth);
   const renderedContentWidth = useDerivedValue(() =>
-    Math.max(0, viewportWidth - renderedSidebarWidth.value - renderedInspectorWidth.value),
+    Math.max(
+      0,
+      viewportWidth -
+        renderedRailWidth.value -
+        renderedSidebarWidth.value -
+        renderedInspectorWidth.value,
+    ),
   );
 
   const selectAndroidWorkspace = useAndroidWorkspaceSelection();
@@ -682,6 +729,9 @@ function AdaptiveWorkspaceLayoutContent(
             className={Platform.OS === "android" ? "flex-1 flex-row bg-header" : "flex-1 flex-row"}
           >
             <AndroidHingeObserver onChange={handleHingeChange} />
+            {shouldRenderNavigationRail ? (
+              <Animated.View className="self-stretch" style={railAnimatedStyle} />
+            ) : null}
             {shouldRenderPrimarySidebar && layout.listPaneWidth !== null ? (
               <Animated.View
                 className="self-stretch overflow-hidden"
@@ -691,7 +741,13 @@ function AdaptiveWorkspaceLayoutContent(
                   panes.primarySidebarVisible ? "auto" : "no-hide-descendants"
                 }
                 pointerEvents={panes.primarySidebarVisible ? "auto" : "none"}
-                style={sidebarAnimatedStyle}
+                // Under a workspace page the sidebar leaves the row but keeps its size, so its
+                // lists never lay out at zero size and are ready, unchanged, on the way back. The
+                // content pane, laid out after it, covers it, in the same mount as the page.
+                style={[
+                  workspacePage ? { position: "absolute", top: 0, bottom: 0, left: 0 } : null,
+                  sidebarAnimatedStyle,
+                ]}
               >
                 <Animated.View className="flex-1" style={listPaneAnimatedStyle}>
                   <RenderErrorBoundary
@@ -764,6 +820,20 @@ function AdaptiveWorkspaceLayoutContent(
               setAuxiliaryPaneWidth={setAuxiliaryPaneWidth}
               onClosed={handleWorkspaceInspectorClosed}
             />
+            {shouldRenderNavigationRail && navigationRailWidth > 0 ? (
+              // The rail reserves its slot above and draws over the panes, so it can widen over
+              // the list in place. It takes the whole workspace only while it is open.
+              <View
+                className="absolute inset-y-0 left-0"
+                style={railOverlay ? { right: 0 } : { width: navigationRailWidth }}
+              >
+                <AndroidWorkspaceNavigation
+                  rail
+                  onSelect={revealPrimarySidebar}
+                  onOverlayChange={setRailOverlay}
+                />
+              </View>
+            ) : null}
           </View>
         </WindowHingeContext>
       </AdaptiveWorkspaceContext.Provider>
diff --git a/apps/mobile/src/features/pull-requests/PullRequestFilterMenuContext.tsx b/apps/mobile/src/features/pull-requests/PullRequestFilterMenuContext.tsx
new file mode 100644
index 000000000000..68a423f80aa0
--- /dev/null
+++ b/apps/mobile/src/features/pull-requests/PullRequestFilterMenuContext.tsx
@@ -0,0 +1,50 @@
+import type { MenuAction } from "@react-native-menu/menu";
+import {
+  createContext,
+  use,
+  useLayoutEffect,
+  useState,
+  type Dispatch,
+  type ReactNode,
+  type SetStateAction,
+} from "react";
+
+export interface PullRequestFilterMenu {
+  readonly actions: readonly MenuAction[];
+  readonly onSelect: (id: string) => void;
+  /** Whether any filter, the environment, or a non-default sort is active. */
+  readonly customized: boolean;
+}
+
+const MenuContext = createContext<PullRequestFilterMenu | null>(null);
+const PublishContext = createContext<Dispatch<SetStateAction<PullRequestFilterMenu | null>> | null>(
+  null,
+);
+
+/**
+ * The Android PR header opens the full filter menu, but the facets (authors, labels) and the
+ * controls live in the list below it. The list publishes its menu here; only the header reads
+ * it, so the list's own renders don't fan out.
+ */
+export function PullRequestFilterMenuProvider(props: { readonly children: ReactNode }) {
+  const [menu, setMenu] = useState<PullRequestFilterMenu | null>(null);
+  return (
+    <PublishContext value={setMenu}>
+      <MenuContext value={menu}>{props.children}</MenuContext>
+    </PublishContext>
+  );
+}
+
+export function usePullRequestFilterMenu() {
+  return use(MenuContext);
+}
+
+export function usePublishPullRequestFilterMenu(menu: PullRequestFilterMenu | null) {
+  const publish = use(PublishContext);
+  // A layout effect, so the header's filter button lands in the same frame as the list. There is
+  // no cleanup: the list lives exactly as long as this provider, and a hidden tab runs its
+  // cleanups, which would drop the button for a few frames every time the tab came back.
+  useLayoutEffect(() => {
+    if (publish && menu) publish(menu);
+  }, [publish, menu]);
+}
diff --git a/apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx b/apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx
index be9b6ccff0e7..2a9e71bc2f24 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx
@@ -3,6 +3,7 @@ import { useMemo } from "react";
 import { Platform, ScrollView } from "react-native";
 import type { MenuProps } from "../../components/ui/Menu.types";
 import { ListFilterMenu } from "../workspace/ListFilterMenu";
+import { usePublishPullRequestFilterMenu } from "./PullRequestFilterMenuContext";
 import { useProjects, useThreadShells } from "../../state/entities";
 import { useMobileProjectGroupingSettings } from "../../state/project-grouping";
 import { buildHomeProjectScopes, sortHomeProjectScopes } from "../home/homeThreadList";
@@ -63,6 +64,8 @@ function useProjectsInSidebarOrder<Project extends { id: string; environmentId:
 }
 
 export function PullRequestListFilters(props: {
+  /** Android sidebar rows sit further in than full-width rows; the pills follow them. */
+  readonly sidebar?: boolean;
   readonly environments: readonly { id: string; label: string }[];
   readonly environmentId: string | null;
   readonly onEnvironmentChange: (id: string | null) => void;
@@ -100,6 +103,8 @@ export function PullRequestListFilters(props: {
         break;
       case "reset":
         props.onChange(DEFAULT_PR_LIST_CONTROLS);
+        // The Android header menu also holds the environment, so its reset clears that too.
+        if (next === "environment") props.onEnvironmentChange(null);
         break;
       case "state":
         props.onChange({ ...value, state: next as PullRequestListControls["state"] });
@@ -217,26 +222,89 @@ export function PullRequestListFilters(props: {
       ),
     },
     { id: "sort", title: SORTS[value.sort], subactions: choices("sort", SORTS, value.sort) },
-    {
-      id: id("reset", ""),
-      title: "Reset filters",
-      attributes: { disabled: count === 0 && value.sort === "updated" },
-    },
   ];
+  const reset = (withEnvironment: boolean): MenuProps["actions"][number] => ({
+    id: id("reset", withEnvironment ? "environment" : ""),
+    title: "Reset filters",
+    attributes: {
+      disabled:
+        count === 0 &&
+        value.sort === "updated" &&
+        (!withEnvironment || props.environmentId === null),
+    },
+  });
   const labels = [...new Set([...selectedLabels, ...props.labels])].slice(0, 60);
   const authors = [
     ...new Set([...(author && author !== "me" ? [author] : []), ...props.authors]),
   ].slice(0, 60);
+  const environmentActions = choices(
+    "environment",
+    Object.fromEntries([
+      ["", "All environments"],
+      ...props.environments.map((environment) => [environment.id, environment.label]),
+    ]),
+    props.environmentId ?? "",
+  );
+  const stateActions = choices("state", STATES, value.state);
+  const involvementActions = choices("involvement", INVOLVEMENT, value.involvement);
+  const labelActions: MenuProps["actions"] = [
+    { id: id("labels", ""), title: "All labels", state: selectedLabels.length ? "off" : "on" },
+    ...labels.map((label) => ({
+      id: id("label", label),
+      title: label,
+      state: selectedLabelSet.has(label) ? ("on" as const) : ("off" as const),
+    })),
+  ];
+  const authorActions = choices(
+    "author",
+    Object.fromEntries([
+      ["", "All authors"],
+      ["me", "Me"],
+      ...authors.map((login) => [login, login]),
+    ]),
+    author ?? "",
+  );
+  const customized = count > 0 || value.sort !== "updated" || props.environmentId !== null;
+  // The Android header's filter button opens every filter.
+  const headerMenu =
+    Platform.OS === "android"
+      ? {
+          actions: [
+            { id: "environment", title: "Environment", subactions: environmentActions },
+            { id: "state", title: "State", subactions: stateActions },
+            { id: "involvement", title: "Involvement", subactions: involvementActions },
+            { id: "labels", title: "Labels", subactions: labelActions },
+            { id: "author", title: "Author", subactions: authorActions },
+            ...more,
+            reset(true),
+          ],
+          onSelect: select,
+          customized,
+        }
+      : null;
+  usePublishPullRequestFilterMenu(headerMenu);
   return (
-    <ScrollView horizontal showsHorizontalScrollIndicator={false} contentContainerStyle={ROW_STYLE}>
-      <ListFilterMenu
-        label={count ? String(count) : "Filters"}
-        icon
-        active={count > 0}
-        accessibilityLabel={count ? `Filters, ${count} active` : "More filters"}
-        actions={more}
-        onSelect={select}
-      />
+    <ScrollView
+      horizontal
+      showsHorizontalScrollIndicator={false}
+      // In the Android sidebar the first pill lines up with the rows' content instead
+      // (8dp row margin + 12dp padding).
+      contentContainerStyle={
+        props.sidebar && Platform.OS === "android"
+          ? { ...ROW_STYLE, paddingHorizontal: 20 }
+          : ROW_STYLE
+      }
+    >
+      {Platform.OS === "android" ? null : (
+        <ListFilterMenu
+          label={count ? String(count) : "Filters"}
+          icon
+          active={count > 0}
+          accessibilityLabel={count ? `Filters, ${count} active` : "More filters"}
+          actions={[...more, reset(false)]}
+          onSelect={select}
+        />
+      )}
       {props.environments.length > 1 ? (
         <ListFilterMenu
           label={
@@ -244,14 +312,7 @@ export function PullRequestListFilters(props: {
               ?.label ?? "All environments"
           }
           accessibilityLabel="Choose pull request environment"
-          actions={choices(
-            "environment",
-            Object.fromEntries([
-              ["", "All environments"],
-              ...props.environments.map((environment) => [environment.id, environment.label]),
-            ]),
-            props.environmentId ?? "",
-          )}
+          actions={environmentActions}
           onSelect={select}
         />
       ) : null}
@@ -259,47 +320,28 @@ export function PullRequestListFilters(props: {
         label={STATES[value.state]}
         active={value.state !== "open"}
         accessibilityLabel="Filter by state"
-        actions={choices("state", STATES, value.state)}
+        actions={stateActions}
         onSelect={select}
       />
       <ListFilterMenu
         label={INVOLVEMENT[value.involvement]}
         active={value.involvement !== "all"}
         accessibilityLabel="Filter by involvement"
-        actions={choices("involvement", INVOLVEMENT, value.involvement)}
+        actions={involvementActions}
         onSelect={select}
       />
       <ListFilterMenu
         label={selectedLabels.length ? `Labels ${selectedLabels.length}` : "Labels"}
         active={selectedLabels.length > 0}
         accessibilityLabel="Filter by label"
-        actions={[
-          {
-            id: id("labels", ""),
-            title: "All labels",
-            state: selectedLabels.length ? "off" : "on",
-          },
-          ...labels.map((label) => ({
-            id: id("label", label),
-            title: label,
-            state: selectedLabelSet.has(label) ? ("on" as const) : ("off" as const),
-          })),
-        ]}
+        actions={labelActions}
         onSelect={select}
       />
       <ListFilterMenu
         label={author === "me" ? "By you" : (author ?? "Author")}
         active={Boolean(author)}
         accessibilityLabel="Filter by author"
-        actions={choices(
-          "author",
-          Object.fromEntries([
-            ["", "All authors"],
-            ["me", "Me"],
-            ...authors.map((login) => [login, login]),
-          ]),
-          author ?? "",
-        )}
+        actions={authorActions}
         onSelect={select}
       />
     </ScrollView>
diff --git a/apps/mobile/src/features/pull-requests/PullRequestToolbar.android.tsx b/apps/mobile/src/features/pull-requests/PullRequestToolbar.android.tsx
index 9b320fb26e7b..fd0211a69d57 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestToolbar.android.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestToolbar.android.tsx
@@ -1,29 +1,24 @@
 import { useNavigation, useNavigationState } from "@react-navigation/native";
 import { useCallback, useEffect, useRef } from "react";
 import { BackHandler, Keyboard, View, type TextInputInstance } from "react-native";
-import {
-  AndroidHeaderIconButton,
-  AndroidScreenHeader,
-} from "../../components/ui/AndroidScreenHeader";
-import { CompactBrandTitle } from "../../components/CompactBrandTitle";
+import { AndroidHeaderIconButton } from "../../components/ui/AndroidScreenHeader";
+import { AndroidAnchoredMenu } from "../../components/ui/AndroidAnchoredMenu";
 import { SearchField } from "../../components/ui/SearchField";
-import { WorkspaceConnectionTitle } from "../home/WorkspaceConnectionTitle";
+import { useToolbarLayout } from "../../components/ui/useToolbarLayout";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
+import { WorkspaceListToolbarRow } from "../workspace/WorkspaceListToolbarRow";
 import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
-import { useWorkspaceListNavigation } from "../workspace/useAndroidWorkspaceNavigation";
+import { usePullRequestFilterMenu } from "./PullRequestFilterMenuContext";
 
-/** PR search shares the thread list's native Android header placement. */
-export function PullRequestToolbar(props: {
-  readonly sidebar?: boolean;
-  readonly onRequestVisibility?: () => void;
-}) {
+/** PR search shares the thread list's Android header row. */
+export function PullRequestToolbar(props: { readonly onRequestVisibility?: () => void }) {
   const navigation = useNavigation();
+  const filters = usePullRequestFilterMenu();
   const workspace = useWorkspaceTabs()!;
   const { dispatch, getScrollOffset, recordScrollOffset, isTabActive } = workspace;
   const homeFocused = useNavigationState((state) => state.routes[state.index]?.name === "Home");
   const listFocused = homeFocused && workspace.state.selectedTab === "pullRequests";
   const { onRequestVisibility } = props;
-  const showThreads = useWorkspaceListNavigation("threads");
   const tab = workspace.state.tabs.pullRequests;
   const input = useRef<TextInputInstance>(null);
   const searching = tab.searchMode !== "resting";
@@ -57,11 +52,12 @@ export function PullRequestToolbar(props: {
     });
     return () => subscription.remove();
   }, [searching, closeSearch, listFocused, navigation, isTabActive]);
+  const { paddingTop, paddingBottom } = useToolbarLayout();
   return (
-    <AndroidScreenHeader
-      title="Pull requests"
-      titleContent={
-        searching ? (
+    <View className="bg-header px-2" style={{ paddingTop, paddingBottom }}>
+      <WorkspaceListToolbarRow
+        searching={searching}
+        searchField={
           <SearchField
             inputRef={input}
             accessibilityLabel="Search pull requests"
@@ -70,65 +66,38 @@ export function PullRequestToolbar(props: {
             value={tab.query}
             onChangeText={(query) => dispatch({ type: "query", tab: "pullRequests", query })}
           />
-        ) : (
-          <View className="min-w-0 flex-1 pl-3">
-            <WorkspaceConnectionTitle
-              grow
-              brand={
-                <CompactBrandTitle
-                  allowFontScaling={false}
-                  accessibilityLabel="T3 Code, Pull requests"
-                  fit
+        }
+        onCloseSearch={closeSearch}
+        onOpenSearch={openSearch}
+        searchAccessibilityLabel="Search pull requests"
+        titleAccessibilityLabel="T3 Code, Pull requests"
+        onOpenEnvironments={() =>
+          navigation.navigate("SettingsSheet", {
+            screen: "SettingsContent",
+            params: { screen: "SettingsEnvironments" },
+          })
+        }
+        filter={
+          filters ? (
+            <AndroidAnchoredMenu
+              actions={filters.actions}
+              onPressAction={({ nativeEvent }) => filters.onSelect(nativeEvent.event)}
+            >
+              {(open) => (
+                <AndroidHeaderIconButton
+                  accessibilityLabel="Filter pull requests"
+                  icon={
+                    filters.customized
+                      ? "line.3.horizontal.decrease.circle.fill"
+                      : "line.3.horizontal.decrease.circle"
+                  }
+                  onPress={open}
                 />
-              }
-              onPress={() =>
-                navigation.navigate("SettingsSheet", {
-                  screen: "SettingsContent",
-                  params: { screen: "SettingsEnvironments" },
-                })
-              }
-            />
-          </View>
-        )
-      }
-      leading={
-        searching ? (
-          <AndroidHeaderIconButton
-            accessibilityLabel="Close search"
-            icon="arrow.left"
-            onPress={closeSearch}
-          />
-        ) : undefined
-      }
-      actions={
-        searching
-          ? []
-          : [
-              ...(props.sidebar
-                ? [
-                    {
-                      accessibilityLabel: "Show threads",
-                      icon: "text.bubble",
-                      onPress: showThreads,
-                    } as const,
-                  ]
-                : []),
-              {
-                accessibilityLabel: "Search pull requests",
-                icon: "magnifyingglass",
-                onPress: openSearch,
-              },
-              {
-                accessibilityLabel: "Open settings",
-                icon: "gearshape",
-                onPress: () =>
-                  navigation.navigate("SettingsSheet", {
-                    screen: "SettingsContent",
-                    params: { screen: "Settings" },
-                  }),
-              },
-            ]
-      }
-    />
+              )}
+            </AndroidAnchoredMenu>
+          ) : null
+        }
+      />
+    </View>
   );
 }
diff --git a/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
index 7b2e7df98c6e..70adb0623975 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
@@ -70,7 +70,6 @@ export function PullRequestsScreen(
   const configs = useAtomValue(environmentServerConfigsAtom);
   const insets = useSafeAreaInsets();
   const [initialOffset] = useState(() => workspace.getScrollOffset("pullRequests"));
-  const [initialAnchor] = useState(() => workspace.getScrollAnchor("pullRequests"));
   const listRef = useRef<LegendListRef>(null);
   const tab = workspace.state.tabs.pullRequests;
   const maintainVisiblePosition = useMemo(
@@ -206,9 +205,6 @@ export function PullRequestsScreen(
         animated: false,
       });
   }, [tab.searchMode, tab.scrollOffset, insets.top]);
-  const initialIndex = initialAnchor
-    ? entries.findIndex((entry) => pullRequestKey(entry) === initialAnchor.key)
-    : -1;
 
   return (
     <View className={sidebar ? "flex-1 bg-drawer" : "flex-1 bg-screen"}>
@@ -233,19 +229,17 @@ export function PullRequestsScreen(
           />
         }
         alwaysBounceVertical
+        // Android flashes a list's scrollbar whenever it becomes visible, which was every return
+        // to this tab. The thread list shows none either.
+        showsVerticalScrollIndicator={Platform.OS !== "android"}
         recycleItems
         renderScrollComponent={Platform.OS === "ios" ? PullRequestScrollView : undefined}
         contentInsetAdjustmentBehavior="never"
         contentInset={Platform.OS === "ios" ? { top: insets.top } : undefined}
+        // A plain offset: LegendList adds the list header to an index-based restore, which
+        // landed every return one header lower.
         initialScrollOffset={
-          !initialAnchor && initialOffset > 0
-            ? initialOffset - (Platform.OS === "ios" ? insets.top : 0)
-            : undefined
-        }
-        initialScrollIndex={
-          initialIndex >= 0 && initialAnchor
-            ? { index: initialIndex, viewOffset: initialAnchor.viewOffset, viewPosition: 0 }
-            : undefined
+          initialOffset > 0 ? initialOffset - (Platform.OS === "ios" ? insets.top : 0) : undefined
         }
         contentInsetStartAdjustment={Platform.OS === "ios" ? insets.top : 0}
         contentContainerStyle={{
@@ -259,13 +253,6 @@ export function PullRequestsScreen(
               event.nativeEvent.contentOffset.y + (Platform.OS === "ios" ? insets.top : 0),
             ),
           );
-          const list = listRef.current?.getState();
-          const item = list ? entries[list.start] : undefined;
-          if (list && item)
-            workspace.recordScrollAnchor("pullRequests", {
-              key: pullRequestKey(item),
-              viewOffset: list.positionAtIndex(list.start) - event.nativeEvent.contentOffset.y,
-            });
         }}
         keyboardDismissMode="on-drag"
         keyboardShouldPersistTaps="handled"
@@ -273,6 +260,7 @@ export function PullRequestsScreen(
         ListHeaderComponent={
           <>
             <PullRequestListFilters
+              sidebar={sidebar}
               environments={environments.map((item) => ({
                 id: String(item.environmentId),
                 label: item.environmentLabel,
diff --git a/apps/mobile/src/features/settings/components/SettingsScreen.tsx b/apps/mobile/src/features/settings/components/SettingsScreen.tsx
index c6ce3d919c92..b3f8176ebceb 100644
--- a/apps/mobile/src/features/settings/components/SettingsScreen.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsScreen.tsx
@@ -1,10 +1,11 @@
-import { useNavigation } from "@react-navigation/native";
+import { useNavigation, useNavigationState, useRoute } from "@react-navigation/native";
 import type { ReactNode } from "react";
 import { Platform, View } from "react-native";
 
 import type { AppBarProps } from "../../../components/ui/AppBar.types";
 import { AppBar } from "../../../components/ui/AppBar";
 import { ScreenContent as SettingsScreenContent } from "../../../components/ui/ScreenContent";
+import { useWorkspaceTabs } from "../../workspace/WorkspaceTabsContext";
 
 export { SettingsScreenContent };
 
@@ -15,6 +16,12 @@ export function SettingsScreen(
   },
 ) {
   const navigation = useNavigation();
+  const route = useRoute();
+  const index = useNavigationState((state) => state.index);
+  const workspace = useWorkspaceTabs();
+  // Android opens Settings as a workspace tab; its root page has nothing to go back to.
+  const workspaceRoot =
+    Platform.OS === "android" && workspace !== null && index === 0 && route.name === "Settings";
 
   return (
     <View collapsable={false} className="flex-1 bg-sheet">
@@ -23,7 +30,7 @@ export function SettingsScreen(
         actions={props.actions}
         trailing={Platform.OS === "android" ? props.trailing : undefined}
         sidebar={false}
-        onBack={() => navigation.goBack()}
+        onBack={workspaceRoot ? undefined : () => navigation.goBack()}
         hideBottomBorder={!props.formSheet}
       />
       {props.formSheet ? (
diff --git a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
index 1cd870b006bc..e454e6ec91cb 100644
--- a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
+++ b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
@@ -875,7 +875,6 @@ function ThreadNavigationSidebarPane(
           filterActions={listMenuActions}
           filterCustomized={filterCustomized}
           onFilterAction={handleListMenuAction}
-          onOpenSettings={props.onOpenSettings}
           onOpenEnvironments={props.onOpenEnvironmentSettings}
           onRequestVisibility={props.onRequestVisibility}
         />
diff --git a/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx b/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx
index 552b54c4fcfc..78ee563b4302 100644
--- a/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx
+++ b/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx
@@ -1,6 +1,5 @@
 import { requireNativeView } from "expo";
-import { useNavigation } from "@react-navigation/native";
-import { resetAndroidWorkspace } from "../../lib/android-workspace-navigation";
+import { CommonActions, useNavigation } from "@react-navigation/native";
 import {
   Keyboard,
   processColor,
@@ -12,20 +11,40 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useKeyboardState } from "react-native-keyboard-controller";
 
 import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
+import { useToolbarLayout } from "../../components/ui/useToolbarLayout";
+import { useWorkspaceConnectionState } from "../../state/workspace";
 import { androidWorkspaceNavigationColors } from "./android-workspace-navigation-colors";
+import {
+  androidWorkspaceTabNavigationState,
+  type AndroidWorkspaceNavigationTab,
+} from "./android-workspace-tabs";
 import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
+import { useAndroidWorkspaceRoot } from "./AndroidWorkspaceTabsProvider";
 import { useWorkspaceTabs } from "./WorkspaceTabsContext";
-import type { WorkspaceTab } from "./workspace-tabs-state";
+
+// Matches RAIL_WIDTH in the native rail.
+export const ANDROID_WORKSPACE_RAIL_WIDTH = 72;
 
 interface NativeNavigationProps extends ViewProps {
-  readonly selectedTab: WorkspaceTab;
+  readonly rail: boolean;
+  readonly selectedTab: AndroidWorkspaceNavigationTab;
   readonly dark: boolean;
   readonly textScale: number;
+  readonly newEnabled: boolean;
+  readonly safeAreaTop: number;
+  readonly safeAreaBottom: number;
+  readonly headerHeight: number;
   readonly containerColor: number;
   readonly selectedColor: number;
   readonly indicatorColor: number;
   readonly unselectedColor: number;
-  readonly onTabSelected: (event: NativeSyntheticEvent<{ readonly tab: WorkspaceTab }>) => void;
+  readonly actionColor: number;
+  readonly actionContentColor: number;
+  readonly onTabSelected: (
+    event: NativeSyntheticEvent<{ readonly tab: AndroidWorkspaceNavigationTab }>,
+  ) => void;
+  readonly onNewThread: () => void;
+  readonly onOverlayChange: (event: NativeSyntheticEvent<{ readonly overlay: boolean }>) => void;
 }
 
 const NativeNavigation = requireNativeView<NativeNavigationProps>("T3WorkspaceNavigation");
@@ -35,36 +54,73 @@ function nativeColor(value: string) {
   return typeof color === "number" ? color : 0;
 }
 
-export function AndroidWorkspaceNavigation() {
+export function AndroidWorkspaceNavigation(props: {
+  readonly rail?: boolean;
+  readonly onSelect?: () => void;
+  /** The rail needs the whole workspace while it widens over the list. */
+  readonly onOverlayChange?: (overlay: boolean) => void;
+}) {
   const workspace = useWorkspaceTabs()!;
+  const root = useAndroidWorkspaceRoot();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
+  const toolbar = useToolbarLayout();
+  const connectionState = useWorkspaceConnectionState();
   const keyboardVisible = useKeyboardState((state) => state.isVisible);
   const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
   const { scale } = useAndroidControlSizing();
+  const rail = Boolean(props.rail);
   const { containerColor, indicatorColor, selectedColor, unselectedColor } =
-    androidWorkspaceNavigationColors(colors);
-  if (keyboardVisible) return null;
+    androidWorkspaceNavigationColors(colors, rail);
+  const selectedTab: AndroidWorkspaceNavigationTab = root?.settingsOpen
+    ? "settings"
+    : workspace.state.selectedTab;
+  if (!rail && keyboardVisible) return null;
 
   return (
-    <View style={{ backgroundColor: containerColor, paddingBottom: insets.bottom }}>
+    <View
+      style={
+        // The rail draws its own surface and pads the system bars; while open it spans the
+        // workspace, so the rest of it must stay transparent.
+        rail ? { flex: 1 } : { backgroundColor: containerColor, paddingBottom: insets.bottom }
+      }
+    >
       <NativeNavigation
-        selectedTab={workspace.state.selectedTab}
+        rail={rail}
+        selectedTab={selectedTab}
         dark={themeAppearance === "dark"}
         textScale={scale}
+        newEnabled={connectionState.hasConnections}
+        safeAreaTop={toolbar.paddingTop}
+        safeAreaBottom={insets.bottom}
+        headerHeight={toolbar.height}
         containerColor={nativeColor(containerColor)}
         selectedColor={nativeColor(selectedColor)}
         indicatorColor={nativeColor(indicatorColor)}
         unselectedColor={nativeColor(unselectedColor)}
+        actionColor={nativeColor(colors["--color-primary"])}
+        actionContentColor={nativeColor(colors["--color-primary-foreground"])}
         onTabSelected={(event) => {
           Keyboard.dismiss();
           const tab = event.nativeEvent.tab;
-          if (tab !== workspace.state.selectedTab) {
-            workspace.dispatch({ type: "select", tab });
-            resetAndroidWorkspace(navigation);
+          if (tab !== selectedTab) {
+            if (tab !== "settings") workspace.dispatch({ type: "select", tab });
+            // Reset the root stack even when a nested settings navigator has focus.
+            if (root) {
+              navigation.dispatch({
+                ...CommonActions.reset(androidWorkspaceTabNavigationState(root.getState(), tab)),
+                target: root.key,
+              });
+            }
           }
+          props.onSelect?.();
+        }}
+        onNewThread={() => {
+          Keyboard.dismiss();
+          navigation.navigate("NewTaskSheet", { screen: "NewTask" });
         }}
-        style={{ height: 80 * Math.max(1, scale) }}
+        onOverlayChange={(event) => props.onOverlayChange?.(event.nativeEvent.overlay)}
+        style={rail ? { flex: 1 } : { height: 80 * Math.max(1, scale) }}
       />
     </View>
   );
diff --git a/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.tsx b/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.tsx
index 251dc977a9dd..7d3bbd80e2eb 100644
--- a/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.tsx
+++ b/apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.tsx
@@ -1,3 +1,9 @@
-export function AndroidWorkspaceNavigation() {
+export function AndroidWorkspaceNavigation(_props: {
+  readonly rail?: boolean;
+  readonly onSelect?: () => void;
+  readonly onOverlayChange?: (overlay: boolean) => void;
+}) {
   return null;
 }
+
+export const ANDROID_WORKSPACE_RAIL_WIDTH = 72;
diff --git a/apps/mobile/src/features/workspace/AndroidWorkspaceSettings.tsx b/apps/mobile/src/features/workspace/AndroidWorkspaceSettings.tsx
new file mode 100644
index 000000000000..c246604a8d8a
--- /dev/null
+++ b/apps/mobile/src/features/workspace/AndroidWorkspaceSettings.tsx
@@ -0,0 +1,20 @@
+import type { ReactNode } from "react";
+import { Platform, View } from "react-native";
+import { SafeAreaInsetsContext, useSafeAreaInsets } from "react-native-safe-area-context";
+import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
+import { AndroidWorkspaceNavigation } from "./AndroidWorkspaceNavigation";
+
+/** Settings keeps its existing stack inside the full workspace, above compact navigation. */
+export function AndroidWorkspaceSettings(props: { readonly children: ReactNode }) {
+  const { layout } = useAdaptiveWorkspaceLayout();
+  const insets = useSafeAreaInsets();
+  if (Platform.OS !== "android") return props.children;
+  return (
+    <View className="flex-1 bg-header">
+      <SafeAreaInsetsContext value={layout.usesSplitView ? insets : { ...insets, bottom: 0 }}>
+        <View className="flex-1">{props.children}</View>
+      </SafeAreaInsetsContext>
+      {layout.usesSplitView ? null : <AndroidWorkspaceNavigation />}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.android.tsx b/apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.android.tsx
index f59d31037f6e..498550d2a118 100644
--- a/apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.android.tsx
+++ b/apps/mobile/src/features/workspace/AndroidWorkspaceSidebar.android.tsx
@@ -1,9 +1,11 @@
 import { useMemo, type ReactNode } from "react";
 import { View } from "react-native";
 import { ScreenContent } from "../../components/ui/ScreenContent";
+import { PullRequestFilterMenuProvider } from "../pull-requests/PullRequestFilterMenuContext";
 import { PullRequestsScreen } from "../pull-requests/PullRequestsScreen";
 import { PullRequestToolbar } from "../pull-requests/PullRequestToolbar.android";
 import { WorkspaceTabsContext, useWorkspaceTabs } from "./WorkspaceTabsContext";
+import { WorkspaceTabPanes } from "./WorkspaceTabPanes";
 
 export function AndroidWorkspaceSidebar(props: {
   readonly children: ReactNode;
@@ -12,16 +14,29 @@ export function AndroidWorkspaceSidebar(props: {
 }) {
   const workspace = useWorkspaceTabs()!;
   const context = useMemo(() => ({ ...workspace, bottomClearance: 16 }), [workspace]);
-  return workspace.state.selectedTab === "threads" ? (
-    props.children
-  ) : (
-    <WorkspaceTabsContext value={context}>
-      <View className="flex-1 bg-header">
-        <PullRequestToolbar sidebar onRequestVisibility={props.onRequestVisibility} />
-        <ScreenContent insetHorizontal>
-          <PullRequestsScreen sidebar selectedPullRequestKey={props.selectedPullRequestKey} />
-        </ScreenContent>
-      </View>
-    </WorkspaceTabsContext>
+  return (
+    <WorkspaceTabPanes
+      tabs={["threads", "pullRequests"]}
+      selected={workspace.state.selectedTab}
+      renderTab={(tab) =>
+        tab === "threads" ? (
+          props.children
+        ) : (
+          <WorkspaceTabsContext value={context}>
+            <PullRequestFilterMenuProvider>
+              <View className="flex-1 bg-header">
+                <PullRequestToolbar onRequestVisibility={props.onRequestVisibility} />
+                <ScreenContent insetHorizontal>
+                  <PullRequestsScreen
+                    sidebar
+                    selectedPullRequestKey={props.selectedPullRequestKey}
+                  />
+                </ScreenContent>
+              </View>
+            </PullRequestFilterMenuProvider>
+          </WorkspaceTabsContext>
+        )
+      }
+    />
   );
 }
diff --git a/apps/mobile/src/features/workspace/AndroidWorkspaceTabsProvider.tsx b/apps/mobile/src/features/workspace/AndroidWorkspaceTabsProvider.tsx
index 6230fe280462..6b9c65a1a68e 100644
--- a/apps/mobile/src/features/workspace/AndroidWorkspaceTabsProvider.tsx
+++ b/apps/mobile/src/features/workspace/AndroidWorkspaceTabsProvider.tsx
@@ -1,10 +1,54 @@
-import type { ReactNode } from "react";
+import type { NavigationState } from "@react-navigation/native";
+import {
+  createContext,
+  use,
+  useCallback,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  type ReactNode,
+} from "react";
 import { Platform } from "react-native";
+import { androidWorkspaceSettingsOpen } from "./android-workspace-tabs";
 import { WorkspaceTabsProvider } from "./WorkspaceTabsContext";
 
-export function AndroidWorkspaceTabsProvider(props: { readonly children: ReactNode }) {
+interface AndroidWorkspaceRoot {
+  /**
+   * The root stack's key and state. The rail renders in the root navigator's layout, where
+   * `useNavigation()` resolves to the container ref: its dispatch goes to the focused
+   * navigator and hands that navigator's state to a callback. A tab press from inside nested
+   * Settings must reset the root stack, so the rail reads the root state here and targets
+   * the root key.
+   */
+  readonly key: string;
+  readonly getState: () => NavigationState;
+  /** Settings is derived from navigation rather than kept in the tab reducer. */
+  readonly settingsOpen: boolean;
+}
+
+const AndroidWorkspaceRootContext = createContext<AndroidWorkspaceRoot | null>(null);
+
+export function useAndroidWorkspaceRoot() {
+  return use(AndroidWorkspaceRootContext);
+}
+
+/** Android keeps one tab controller above the root navigator and split sidebar. */
+export function AndroidWorkspaceTabsProvider(props: {
+  readonly state: NavigationState;
+  readonly children: ReactNode;
+}) {
+  const stateRef = useRef(props.state);
+  useLayoutEffect(() => {
+    stateRef.current = props.state;
+  }, [props.state]);
+  const getState = useCallback(() => stateRef.current, []);
+  const key = props.state.key;
+  const settingsOpen = Platform.OS === "android" && androidWorkspaceSettingsOpen(props.state);
+  const root = useMemo(() => ({ key, getState, settingsOpen }), [key, getState, settingsOpen]);
   return Platform.OS === "android" ? (
-    <WorkspaceTabsProvider>{props.children}</WorkspaceTabsProvider>
+    <WorkspaceTabsProvider>
+      <AndroidWorkspaceRootContext value={root}>{props.children}</AndroidWorkspaceRootContext>
+    </WorkspaceTabsProvider>
   ) : (
     props.children
   );
diff --git a/apps/mobile/src/features/workspace/WorkspaceListToolbarRow.tsx b/apps/mobile/src/features/workspace/WorkspaceListToolbarRow.tsx
new file mode 100644
index 000000000000..07515a8d7125
--- /dev/null
+++ b/apps/mobile/src/features/workspace/WorkspaceListToolbarRow.tsx
@@ -0,0 +1,63 @@
+import type { ReactNode } from "react";
+import { View } from "react-native";
+import { AndroidHeaderIconButton } from "../../components/ui/AndroidScreenHeader";
+import { CompactBrandTitle } from "../../components/CompactBrandTitle";
+import { useToolbarLayout } from "../../components/ui/useToolbarLayout";
+import { WorkspaceConnectionTitle } from "../home/WorkspaceConnectionTitle";
+
+/**
+ * The Android header row above each workspace tab's list. Both tabs draw this same row, so
+ * switching tabs leaves the title and buttons where they were. It is plain React Native rather
+ * than the Compose app bar: a hidden tab lays out at zero size, and Compose-hosted content takes
+ * several frames to measure again when the tab comes back.
+ */
+export function WorkspaceListToolbarRow(props: {
+  readonly searching: boolean;
+  readonly searchField: ReactNode;
+  readonly onCloseSearch: () => void;
+  readonly onOpenSearch: () => void;
+  readonly searchAccessibilityLabel: string;
+  readonly titleAccessibilityLabel: string;
+  readonly onOpenEnvironments: () => void;
+  /** Stays trailing while searching, so it never moves and still narrows the results. */
+  readonly filter: ReactNode;
+}) {
+  const { height } = useToolbarLayout();
+  return (
+    <View className="flex-row items-center gap-1" style={{ minHeight: height }}>
+      {props.searching ? (
+        <>
+          <AndroidHeaderIconButton
+            accessibilityLabel="Close search"
+            icon="arrow.left"
+            onPress={props.onCloseSearch}
+          />
+          {props.searchField}
+          {props.filter}
+        </>
+      ) : (
+        <>
+          <View className="min-w-0 flex-1 pl-4">
+            <WorkspaceConnectionTitle
+              grow
+              onPress={props.onOpenEnvironments}
+              brand={
+                <CompactBrandTitle
+                  allowFontScaling={false}
+                  accessibilityLabel={props.titleAccessibilityLabel}
+                  fit
+                />
+              }
+            />
+          </View>
+          <AndroidHeaderIconButton
+            accessibilityLabel={props.searchAccessibilityLabel}
+            icon="magnifyingglass"
+            onPress={props.onOpenSearch}
+          />
+          {props.filter}
+        </>
+      )}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/workspace/WorkspaceRootScreen.android.tsx b/apps/mobile/src/features/workspace/WorkspaceRootScreen.android.tsx
index 367ee3acbff8..bbc8c62f9830 100644
--- a/apps/mobile/src/features/workspace/WorkspaceRootScreen.android.tsx
+++ b/apps/mobile/src/features/workspace/WorkspaceRootScreen.android.tsx
@@ -7,11 +7,16 @@ import { EmptyState } from "../../components/ui/EmptyState";
 import { ScreenContent } from "../../components/ui/ScreenContent";
 import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
 import { HomeRouteScreen } from "../home/HomeRouteScreen";
+import { PullRequestFilterMenuProvider } from "../pull-requests/PullRequestFilterMenuContext";
 import { PullRequestsScreen } from "../pull-requests/PullRequestsScreen";
 import { PullRequestToolbar } from "../pull-requests/PullRequestToolbar.android";
 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
 import { AndroidWorkspaceNavigation } from "./AndroidWorkspaceNavigation";
 import { WorkspaceTabsContext, useWorkspaceTabs } from "./WorkspaceTabsContext";
+import { WorkspaceTabPanes } from "./WorkspaceTabPanes";
+import type { WorkspaceTab } from "./workspace-tabs-state";
+
+const TABS: readonly WorkspaceTab[] = ["threads", "pullRequests"];
 
 export function WorkspaceRootScreen() {
   const { layout } = useAdaptiveWorkspaceLayout();
@@ -25,22 +30,31 @@ export function WorkspaceRootScreen() {
     }),
     [workspace, fabClearance],
   );
+  const tab = workspace.state.selectedTab;
 
   if (layout.usesSplitView) {
-    return workspace.state.selectedTab === "threads" ? (
-      <HomeRouteScreen />
-    ) : (
-      <>
-        <NativeStackScreenOptions options={{ headerShown: false }} />
-        <AndroidScreenHeader title="Pull requests" />
-        <View className="flex-1 items-center justify-center px-10">
-          <EmptyState
-            title="Select a pull request"
-            detail="Choose a pull request from the sidebar to review it."
-            variant="plain"
-          />
-        </View>
-      </>
+    return (
+      <WorkspaceTabPanes
+        tabs={TABS}
+        selected={tab}
+        renderTab={(tab) =>
+          tab === "threads" ? (
+            <HomeRouteScreen />
+          ) : (
+            <>
+              <NativeStackScreenOptions options={{ headerShown: false }} />
+              <AndroidScreenHeader title="Pull requests" />
+              <View className="flex-1 items-center justify-center px-10">
+                <EmptyState
+                  title="Select a pull request"
+                  detail="Choose a pull request from the sidebar to review it."
+                  variant="plain"
+                />
+              </View>
+            </>
+          )
+        }
+      />
     );
   }
 
@@ -49,18 +63,22 @@ export function WorkspaceRootScreen() {
       <View className="flex-1 bg-header">
         <NativeStackScreenOptions options={{ headerShown: false }} />
         <SafeAreaInsetsContext value={{ ...insets, bottom: 0 }}>
-          <View className="flex-1">
-            {workspace.state.selectedTab === "threads" ? (
-              <HomeRouteScreen />
-            ) : (
-              <>
-                <PullRequestToolbar />
-                <ScreenContent>
-                  <PullRequestsScreen />
-                </ScreenContent>
-              </>
-            )}
-          </View>
+          <WorkspaceTabPanes
+            tabs={TABS}
+            selected={tab}
+            renderTab={(tab) =>
+              tab === "threads" ? (
+                <HomeRouteScreen />
+              ) : (
+                <PullRequestFilterMenuProvider>
+                  <PullRequestToolbar />
+                  <ScreenContent>
+                    <PullRequestsScreen />
+                  </ScreenContent>
+                </PullRequestFilterMenuProvider>
+              )
+            }
+          />
         </SafeAreaInsetsContext>
         <AndroidWorkspaceNavigation />
       </View>
diff --git a/apps/mobile/src/features/workspace/WorkspaceTabPanes.tsx b/apps/mobile/src/features/workspace/WorkspaceTabPanes.tsx
new file mode 100644
index 000000000000..d4cc8c0c2efb
--- /dev/null
+++ b/apps/mobile/src/features/workspace/WorkspaceTabPanes.tsx
@@ -0,0 +1,26 @@
+import { Activity, useState, type ReactNode } from "react";
+import { View } from "react-native";
+
+/**
+ * Top-level tabs swap in a single frame. A tab mounts on its first visit and then stays mounted
+ * while hidden, so returning to it shows its list as it was left instead of an empty one that
+ * fills in. Hidden tabs keep their state but run no effects, so they register no keyboard
+ * commands, back handlers, or header options.
+ */
+export function WorkspaceTabPanes<Tab extends string>(props: {
+  readonly tabs: readonly Tab[];
+  readonly selected: Tab;
+  readonly renderTab: (tab: Tab) => ReactNode;
+}) {
+  const [visited, setVisited] = useState<readonly Tab[]>(() => [props.selected]);
+  if (!visited.includes(props.selected)) {
+    setVisited([...visited, props.selected]);
+  }
+  return props.tabs.map((tab) =>
+    visited.includes(tab) ? (
+      <Activity key={tab} mode={tab === props.selected ? "visible" : "hidden"}>
+        <View className="flex-1">{props.renderTab(tab)}</View>
+      </Activity>
+    ) : null,
+  );
+}
diff --git a/apps/mobile/src/features/workspace/WorkspaceTabsContext.tsx b/apps/mobile/src/features/workspace/WorkspaceTabsContext.tsx
index 7e6c2cb59116..863701444d0a 100644
--- a/apps/mobile/src/features/workspace/WorkspaceTabsContext.tsx
+++ b/apps/mobile/src/features/workspace/WorkspaceTabsContext.tsx
@@ -17,11 +17,6 @@ import {
   type WorkspaceTabsState,
 } from "./workspace-tabs-state";
 
-export interface WorkspaceScrollAnchor {
-  readonly key: string;
-  readonly viewOffset: number;
-}
-
 export const WorkspaceTabsContext = createContext<{
   readonly state: WorkspaceTabsState;
   readonly dispatch: Dispatch<WorkspaceTabsAction>;
@@ -29,8 +24,6 @@ export const WorkspaceTabsContext = createContext<{
   readonly bottomClearance: number;
   readonly getScrollOffset: (tab: WorkspaceTab) => number;
   readonly recordScrollOffset: (tab: WorkspaceTab, offset: number) => void;
-  readonly getScrollAnchor: (tab: WorkspaceTab) => WorkspaceScrollAnchor | undefined;
-  readonly recordScrollAnchor: (tab: WorkspaceTab, anchor: WorkspaceScrollAnchor) => void;
 } | null>(null);
 
 export function useWorkspaceTabs() {
@@ -45,15 +38,10 @@ export function WorkspaceTabsProvider(props: { readonly children: ReactNode }) {
   }, [state.selectedTab]);
   const isTabActive = useCallback((tab: WorkspaceTab) => activeTab.current === tab, []);
   const scrollOffsets = useRef({ threads: 0, pullRequests: 0 });
-  const scrollAnchors = useRef<Partial<Record<WorkspaceTab, WorkspaceScrollAnchor>>>({});
   const getScrollOffset = useCallback((tab: WorkspaceTab) => scrollOffsets.current[tab], []);
   const recordScrollOffset = useCallback((tab: WorkspaceTab, offset: number) => {
     scrollOffsets.current[tab] = offset;
   }, []);
-  const getScrollAnchor = useCallback((tab: WorkspaceTab) => scrollAnchors.current[tab], []);
-  const recordScrollAnchor = useCallback((tab: WorkspaceTab, anchor: WorkspaceScrollAnchor) => {
-    scrollAnchors.current[tab] = anchor;
-  }, []);
   const context = useMemo(
     () => ({
       state,
@@ -62,10 +50,8 @@ export function WorkspaceTabsProvider(props: { readonly children: ReactNode }) {
       bottomClearance: 0,
       getScrollOffset,
       recordScrollOffset,
-      getScrollAnchor,
-      recordScrollAnchor,
     }),
-    [state, isTabActive, getScrollOffset, recordScrollOffset, getScrollAnchor, recordScrollAnchor],
+    [state, isTabActive, getScrollOffset, recordScrollOffset],
   );
   return <WorkspaceTabsContext value={context}>{props.children}</WorkspaceTabsContext>;
 }
diff --git a/apps/mobile/src/features/workspace/android-workspace-navigation-colors.test.ts b/apps/mobile/src/features/workspace/android-workspace-navigation-colors.test.ts
index 00418107c956..efdf234e6c9d 100644
--- a/apps/mobile/src/features/workspace/android-workspace-navigation-colors.test.ts
+++ b/apps/mobile/src/features/workspace/android-workspace-navigation-colors.test.ts
@@ -34,14 +34,19 @@ function expectVisibleSelection(colors: ReturnType<typeof androidWorkspaceNaviga
 }
 
 describe("Android workspace navigation colors", () => {
-  it.each(MOBILE_THEME_IDS)("keeps %s selection visible", (themeId) => {
-    for (const appearance of ["light", "dark"] as const) {
-      const variables = getMobileThemeRuntimeVariables(themeId, appearance, "android");
-      const snapshot = { ...variables };
-      expectVisibleSelection(androidWorkspaceNavigationColors(variables));
-      expect(variables).toEqual(snapshot);
-    }
-  });
+  it.each(MOBILE_THEME_IDS)(
+    "keeps %s selection visible in both navigation positions",
+    (themeId) => {
+      for (const appearance of ["light", "dark"] as const) {
+        const variables = getMobileThemeRuntimeVariables(themeId, appearance, "android");
+        const snapshot = { ...variables };
+        for (const rail of [false, true]) {
+          expectVisibleSelection(androidWorkspaceNavigationColors(variables, rail));
+        }
+        expect(variables).toEqual(snapshot);
+      }
+    },
+  );
 
   it.each(["#6750a4", "#006a6a", "#9c4146"])(
     "keeps Material You selection visible for system seed %s",
@@ -85,17 +90,19 @@ describe("Android workspace navigation colors", () => {
           appearance,
           getMobileThemeRuntimeVariables("material-you", appearance, "android"),
         );
-        expectVisibleSelection(androidWorkspaceNavigationColors(variables));
+        for (const rail of [false, true]) {
+          expectVisibleSelection(androidWorkspaceNavigationColors(variables, rail));
+        }
       }
     },
   );
 
   it("preserves an already visible tonal fill", () => {
     const variables = getMobileThemeRuntimeVariables("t3-chat", "light", "android");
-    const colors = androidWorkspaceNavigationColors({
-      ...variables,
-      "--color-secondary": "#e091cf",
-    });
+    const colors = androidWorkspaceNavigationColors(
+      { ...variables, "--color-secondary": "#e091cf" },
+      true,
+    );
     expect(colors.indicatorColor).toBe("#e091cf");
     expectVisibleSelection(colors);
   });
diff --git a/apps/mobile/src/features/workspace/android-workspace-navigation-colors.ts b/apps/mobile/src/features/workspace/android-workspace-navigation-colors.ts
index efcade30fbe2..774f20aad8bb 100644
--- a/apps/mobile/src/features/workspace/android-workspace-navigation-colors.ts
+++ b/apps/mobile/src/features/workspace/android-workspace-navigation-colors.ts
@@ -5,12 +5,11 @@ import {
   type MobileThemeVariables,
 } from "../../lib/mobileTheme";
 
-export function androidWorkspaceNavigationColors(colors: MobileThemeVariables) {
+export function androidWorkspaceNavigationColors(colors: MobileThemeVariables, rail: boolean) {
   const header = flattenThemeColor(colors["--color-header"], colors["--color-screen"]);
-  const containerColor = flattenThemeColor(
-    themeColorWithAlpha(colors["--color-header-foreground"], 0.05),
-    header,
-  );
+  const containerColor = rail
+    ? header
+    : flattenThemeColor(themeColorWithAlpha(colors["--color-header-foreground"], 0.05), header);
   const indicatorColor = themeColorWithContrast(
     flattenThemeColor(colors["--color-secondary"], containerColor),
     containerColor,
diff --git a/apps/mobile/src/features/workspace/android-workspace-tabs.ts b/apps/mobile/src/features/workspace/android-workspace-tabs.ts
new file mode 100644
index 000000000000..999838f52dc3
--- /dev/null
+++ b/apps/mobile/src/features/workspace/android-workspace-tabs.ts
@@ -0,0 +1,47 @@
+import type { NavigationState } from "@react-navigation/native";
+import { androidWorkspaceNavigationState } from "../../lib/android-workspace-navigation";
+import type { WorkspaceTab } from "./workspace-tabs-state";
+
+/** Settings joins the two list tabs as a top-level Android destination. */
+export type AndroidWorkspaceNavigationTab = WorkspaceTab | "settings";
+
+const WORKSPACE_ROUTES = new Set(["Home", "Thread", "PullRequest", "SettingsSheet"]);
+
+/**
+ * The Settings tab reuses the settings navigator, reset over Home alone so stale chat and
+ * PR history is dropped while nested settings pages keep an ordinary Back.
+ */
+export function androidWorkspaceTabNavigationState(
+  state: NavigationState,
+  tab: AndroidWorkspaceNavigationTab,
+) {
+  const home = androidWorkspaceNavigationState(state);
+  if (tab !== "settings") return home;
+  return {
+    ...home,
+    index: 1,
+    routes: [
+      ...home.routes,
+      {
+        name: "SettingsSheet",
+        params: { screen: "SettingsContent", params: { screen: "Settings" } },
+      },
+    ],
+  };
+}
+
+/** Settings stays selected while its navigator is the topmost workspace route. */
+export function androidWorkspaceSettingsOpen(state: NavigationState): boolean {
+  const top = state.routes
+    .slice(0, state.index + 1)
+    .findLast((route) => WORKSPACE_ROUTES.has(route.name));
+  return top?.name === "SettingsSheet";
+}
+
+export function androidWorkspaceTabFromNavigationState(
+  state: NavigationState,
+  selected: AndroidWorkspaceNavigationTab,
+): AndroidWorkspaceNavigationTab {
+  if (androidWorkspaceSettingsOpen(state)) return "settings";
+  return selected === "settings" ? "threads" : selected;
+}
diff --git a/apps/mobile/src/lib/android-workspace-navigation.test.ts b/apps/mobile/src/lib/android-workspace-navigation.test.ts
index 68f3732acabe..724eec158097 100644
--- a/apps/mobile/src/lib/android-workspace-navigation.test.ts
+++ b/apps/mobile/src/lib/android-workspace-navigation.test.ts
@@ -1,5 +1,10 @@
 import * as NodeModule from "node:module";
 import { describe, expect, it } from "vite-plus/test";
+import {
+  androidWorkspaceTabFromNavigationState,
+  androidWorkspaceTabNavigationState,
+  type AndroidWorkspaceNavigationTab,
+} from "../features/workspace/android-workspace-tabs";
 import {
   androidWorkspaceNavigationState,
   resetAndroidWorkspace,
@@ -229,3 +234,53 @@ describe("Android workspace navigation", () => {
     expect(names(apply(root, action!))).toEqual(["Home", "Thread"]);
   });
 });
+
+describe("Android Settings tab", () => {
+  type State = ReturnType<typeof router.getInitialState>;
+  type Tab = AndroidWorkspaceNavigationTab;
+  const openTab = (state: State, tab: Tab) =>
+    apply(state, CommonActions.reset(androidWorkspaceTabNavigationState(state, tab)));
+  const selectedTab = (state: State, previous: Tab) =>
+    androidWorkspaceTabFromNavigationState(state, previous);
+
+  it("opens over Home alone, dropping chat and PR history, and Back returns to Home", () => {
+    const previous = legacyHistory();
+    const settings = openTab(previous, "settings");
+    expect(names(settings)).toEqual(["Home", "SettingsSheet"]);
+    expect(settings.routes[0]?.key).toBe(previous.routes[0]?.key);
+    expect(selectedTab(settings, "threads")).toBe("settings");
+    const back = apply(settings, StackActions.pop());
+    expect(names(back)).toEqual(["Home"]);
+    expect(back.routes[0]?.key).toBe(previous.routes[0]?.key);
+    expect(selectedTab(back, "settings")).not.toBe("settings");
+  });
+
+  it("stays selected under a nested settings page until a list tab returns to Home", () => {
+    const previous = legacyHistory();
+    const settings = openTab(previous, "settings");
+    // Usage pushes inside the nested settings navigator, which the root router never sees.
+    const usage: State = {
+      ...settings,
+      routes: settings.routes.map((route) =>
+        route.name === "SettingsSheet"
+          ? {
+              ...route,
+              state: {
+                routes: [
+                  {
+                    name: "SettingsContent",
+                    state: { index: 1, routes: [{ name: "Settings" }, { name: "SettingsUsage" }] },
+                  },
+                ],
+              },
+            }
+          : route,
+      ),
+    };
+    expect(selectedTab(usage, "threads")).toBe("settings");
+    const list = openTab(usage, "pullRequests");
+    expect(names(list)).toEqual(["Home"]);
+    expect(list.routes[0]?.key).toBe(previous.routes[0]?.key);
+    expect(selectedTab(list, "pullRequests")).toBe("pullRequests");
+  });
+});
diff --git a/apps/mobile/src/lib/layout.test.ts b/apps/mobile/src/lib/layout.test.ts
index 47f225012bfe..52415e799742 100644
--- a/apps/mobile/src/lib/layout.test.ts
+++ b/apps/mobile/src/lib/layout.test.ts
@@ -420,15 +420,30 @@ describe("deriveWorkspacePaneLayout", () => {
 describe("alignListPaneToHinge", () => {
   const layout = deriveLayout({ width: 852, height: 880 });
 
-  it("ends the list pane at a book-posture hinge", () => {
+  it("ends the list pane at a book-posture hinge after the rail", () => {
     expect(
-      alignListPaneToHinge({ layout, hinge: { x: 426, width: 0 }, viewportWidth: 852 }),
-    ).toMatchObject({ listPaneWidth: 426, listPaneGap: 0 });
+      alignListPaneToHinge({
+        layout,
+        hinge: { x: 426, width: 0 },
+        viewportWidth: 852,
+        leadingWidth: 96,
+      }),
+    ).toMatchObject({ listPaneWidth: 330, listPaneGap: 0 });
   });
 
   it("keeps the default split when either side of the hinge would be too narrow", () => {
-    const narrowList = { layout, hinge: { x: 250, width: 0 }, viewportWidth: 852 };
-    const narrowDetail = { layout, hinge: { x: 600, width: 0 }, viewportWidth: 852 };
+    const narrowList = {
+      layout,
+      hinge: { x: 300, width: 0 },
+      viewportWidth: 852,
+      leadingWidth: 96,
+    };
+    const narrowDetail = {
+      layout,
+      hinge: { x: 600, width: 0 },
+      viewportWidth: 852,
+      leadingWidth: 0,
+    };
     expect(alignListPaneToHinge(narrowList)).toBe(layout);
     expect(alignListPaneToHinge(narrowDetail)).toBe(layout);
   });
diff --git a/apps/mobile/src/lib/layout.ts b/apps/mobile/src/lib/layout.ts
index f3d4c40c2c3e..8b1e344826e6 100644
--- a/apps/mobile/src/lib/layout.ts
+++ b/apps/mobile/src/lib/layout.ts
@@ -139,18 +139,26 @@ export interface VerticalHinge {
   readonly width: number;
 }
 
-/** Moves the list/detail split onto a book-posture hinge so neither pane straddles the crease. */
+/**
+ * Moves the list/detail split onto a book-posture hinge so neither pane straddles the crease.
+ * `leadingWidth` is chrome left of the list pane, such as the Android navigation rail.
+ */
 export function alignListPaneToHinge(input: {
   readonly layout: Layout;
   readonly hinge: VerticalHinge | null;
   readonly viewportWidth: number;
+  readonly leadingWidth: number;
 }): Layout {
   const { layout, hinge } = input;
   if (!hinge || !layout.usesSplitView) return layout;
-  if (hinge.x < SPLIT_SIDEBAR_MIN_WIDTH || input.viewportWidth - hinge.x - hinge.width < 320) {
+  const listPaneWidth = hinge.x - input.leadingWidth;
+  if (
+    listPaneWidth < SPLIT_SIDEBAR_MIN_WIDTH ||
+    input.viewportWidth - hinge.x - hinge.width < 320
+  ) {
     return layout;
   }
-  return { ...layout, listPaneWidth: hinge.x, listPaneGap: hinge.width };
+  return { ...layout, listPaneWidth, listPaneGap: hinge.width };
 }
 
 /**
diff --git a/apps/mobile/src/native/scrollEdgeEffects.test.ts b/apps/mobile/src/native/scrollEdgeEffects.test.ts
index cf7e590671c9..4bf3afd037eb 100644
--- a/apps/mobile/src/native/scrollEdgeEffects.test.ts
+++ b/apps/mobile/src/native/scrollEdgeEffects.test.ts
@@ -1,29 +1,9 @@
 import { describe, expect, it } from "vite-plus/test";
 
-import { nativeHeaderScrollEdgeEffects, nativeTopScrollEdgeEffect } from "./scrollEdgeEffects";
+import { nativeTopScrollEdgeEffect } from "./scrollEdgeEffects";
 
 describe("nativeTopScrollEdgeEffect", () => {
-  it("keeps the automatic native treatment on iOS 26", () => {
-    expect(nativeTopScrollEdgeEffect("ios", "26.5")).toBe("automatic");
-  });
-
-  it("keeps UIKit automatic scroll-edge sampling on iOS 27 and later", () => {
+  it("keeps UIKit content sampling instead of a local soft overlay on iOS 27", () => {
     expect(nativeTopScrollEdgeEffect("ios", "27.0")).toBe("automatic");
-    expect(nativeTopScrollEdgeEffect("ios", 28)).toBe("automatic");
-  });
-
-  it("does not apply the iOS workaround to other platforms", () => {
-    expect(nativeTopScrollEdgeEffect("android", 27)).toBe("automatic");
-  });
-});
-
-describe("nativeHeaderScrollEdgeEffects", () => {
-  it("keeps non-top header edges hidden while applying the platform top effect", () => {
-    expect(nativeHeaderScrollEdgeEffects("ios", "27.0")).toEqual({
-      top: "automatic",
-      bottom: "hidden",
-      left: "hidden",
-      right: "hidden",
-    });
   });
 });
diff --git a/apps/mobile/src/state/thread-order.test.ts b/apps/mobile/src/state/thread-order.test.ts
index 5df8c3a8dc60..cf5a59b052b6 100644
--- a/apps/mobile/src/state/thread-order.test.ts
+++ b/apps/mobile/src/state/thread-order.test.ts
@@ -90,7 +90,7 @@ describe("shared mobile pending move", () => {
     expect(getPendingThreadOrder()).toBeNull();
   });
 
-  it.each(["failure", "interruption"])("releases a %s without restoring old canonical keys", () => {
+  it("releases a cancelled move without restoring old canonical keys", () => {
     const { start, upsert } = fixture();
     const move = start();
     upsert("b", "aa");
diff --git a/apps/server/src/assets/AssetAccess.test.ts b/apps/server/src/assets/AssetAccess.test.ts
index a327121fd619..ed8ba831146b 100644
--- a/apps/server/src/assets/AssetAccess.test.ts
+++ b/apps/server/src/assets/AssetAccess.test.ts
@@ -7,6 +7,7 @@ import {
   AssetPreviewTypeValidationError,
   ThreadId,
   TurnItemId,
+  type ToolActivityNativeAppReference,
 } from "@t3tools/contracts";
 import { PROJECT_FAVICON_FALLBACK_MARKER } from "@t3tools/shared/projectFavicon";
 import { MCP_APP_MAX_HTML_BYTES } from "@t3tools/shared/mcpApp";
@@ -1082,21 +1083,37 @@ describe("AssetAccess", () => {
       });
     }).pipe(Effect.provide(layerTest)),
   );
-  it.effect("issues signed native application icon capabilities", () =>
-    Effect.gen(function* () {
-      const result = yield* issueAssetUrl({
-        resource: {
-          _tag: "native-app-icon",
-          app: { _tag: "app-id", appId: "com.example.Editor" },
-        },
-      });
+  it.effect("issues signed native application icon capabilities", () => {
+    const resolvedApps: Array<ToolActivityNativeAppReference> = [];
+    return Effect.gen(function* () {
+      const app = { _tag: "app-id", appId: "com.example.Editor" } as const;
+      const result = yield* issueAssetUrl({ resource: { _tag: "native-app-icon", app } });
 
       expect(result.relativeUrl).toMatch(
         new RegExp(`^${ASSET_ROUTE_PREFIX}/[^/]+/native-app-icon\\.png$`, "u"),
       );
-      expect(result.expiresAt).toBeGreaterThan(0);
-    }).pipe(Effect.provide(layerTest)),
-  );
+      const suffix = result.relativeUrl.slice(`${ASSET_ROUTE_PREFIX}/`.length);
+      const separator = suffix.indexOf("/");
+      const token = suffix.slice(0, separator);
+      const name = suffix.slice(separator + 1);
+      expect(yield* resolveAsset(token, name)).toEqual({ kind: "file", path: "/icons/editor.png" });
+      expect(yield* resolveAsset(`${token}tampered`, name)).toBeNull();
+      expect(resolvedApps).toEqual([app]);
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          layerTest,
+          Layer.succeed(NativeAppIconResolver.NativeAppIconResolver, {
+            resolve: (app) =>
+              Effect.sync(() => {
+                resolvedApps.push(app);
+                return "/icons/editor.png";
+              }),
+          }),
+        ),
+      ),
+    );
+  });
 
   it.effect("serves document attachments inline when a viewer requests it", () =>
     Effect.gen(function* () {
diff --git a/apps/server/src/environmentTheme.test.ts b/apps/server/src/environmentTheme.test.ts
index 998d8cc0acfb..7287425c3902 100644
--- a/apps/server/src/environmentTheme.test.ts
+++ b/apps/server/src/environmentTheme.test.ts
@@ -142,11 +142,20 @@ it.layer(NodeServices.layer)("environment theme", (it) => {
           path.join(environmentThemesDir, "shared-light.json"),
           encodeThemeFile(SHARED_THEME),
         );
-        const first = yield* environmentTheme.streamChanges.pipe(Stream.runHead);
+        const seen = yield* Queue.unbounded<ReadonlyArray<{ readonly id: string }>>();
+        yield* Stream.runForEach(environmentTheme.streamChanges, (themes) =>
+          Queue.offer(seen, themes),
+        ).pipe(Effect.forkScoped);
         assert.deepEqual(
-          Option.getOrNull(first)?.map((theme) => theme.id),
+          (yield* Queue.take(seen)).map((theme) => theme.id),
           ["nightfall", "shared-light"],
         );
+        yield* fs.remove(path.join(environmentThemesDir, "nightfall.json"));
+        yield* currentThemes;
+        assert.deepEqual(
+          (yield* Queue.take(seen)).map((theme) => theme.id),
+          ["shared-light"],
+        );
       }),
     ),
   );
diff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.ts
index bef260bf9254..e2823551d995 100644
--- a/apps/server/src/keybindings.test.ts
+++ b/apps/server/src/keybindings.test.ts
@@ -602,6 +602,9 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const [first, second] = yield* Effect.gen(function* () {
         const keybindings = yield* Keybindings.Keybindings;
         const firstLoad = (yield* keybindings.loadConfigState).keybindings;
+        yield* writeKeybindingsConfig(keybindingsConfigPath, [
+          { key: "mod+shift+y", command: "script.run-tests.run" },
+        ]);
         const secondLoad = (yield* keybindings.loadConfigState).keybindings;
         return [firstLoad, secondLoad] as const;
       });
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
index ce997f64828b..92bb99e4de16 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
@@ -15,16 +15,11 @@ import { assert, describe, it } from "@effect/vitest";
 import {
   CheckpointId,
   EnvironmentId,
-  MessageId,
   type ModelSelection,
-  NodeId,
-  ProjectId,
   ProviderDriverKind,
   ProviderInstanceId,
   ProviderSessionId,
   ProviderThreadId,
-  RunAttemptId,
-  RunId,
   ThreadId,
   type OrchestrationV2ProviderThread,
   type ProviderOptionDescriptor,
@@ -73,6 +68,7 @@ import {
 } from "@t3tools/provider-grok/testing";
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
+import { makeTurnInput } from "./AcpAdapterV2.testkit.ts";
 import type * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
 import {
   AcpProviderCapabilitiesV2,
@@ -540,69 +536,6 @@ const pollProtocolMethods = (events: Queue.Queue<EffectAcpProtocol.AcpProtocolLo
     return methods;
   });
 
-function makeTurnInput(input: {
-  readonly threadId: ThreadId;
-  readonly providerThread: OrchestrationV2ProviderThread;
-  readonly instanceId: ProviderInstanceId;
-  readonly runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy;
-  readonly now: DateTime.Utc;
-  readonly ordinal?: number;
-  readonly modelSelection?: ModelSelection;
-  readonly messageCreatedBy?: "user" | "agent";
-  readonly messageCreationSource?: "web" | "mobile" | "mcp" | "provider" | "server";
-  readonly messageText?: string;
-}): ProviderAdapter.ProviderAdapterV2TurnInput {
-  const ordinal = input.ordinal ?? 1;
-  const suffix = `${input.threadId}:${ordinal}`;
-  const modelSelection =
-    input.modelSelection ?? ({ instanceId: input.instanceId, model: "default" } as const);
-  return {
-    appThread: {
-      createdBy: "user",
-      creationSource: "web",
-      id: input.threadId,
-      projectId: ProjectId.make(`project:${input.threadId}`),
-      title: "ACP adapter test",
-      providerInstanceId: input.instanceId,
-      modelSelection,
-      runtimeMode: "approval-required",
-      interactionMode: "default",
-      branch: null,
-      worktreePath: null,
-      activeProviderThreadId: input.providerThread.id,
-      lineage: {
-        parentThreadId: null,
-        relationshipToParent: null,
-        rootThreadId: input.threadId,
-      },
-      forkedFrom: null,
-      createdAt: input.now,
-      updatedAt: input.now,
-      archivedAt: null,
-      settledOverride: null,
-      settledAt: null,
-      lastVisitedAt: null,
-      deletedAt: null,
-    },
-    threadId: input.threadId,
-    runId: RunId.make(`run:${suffix}`),
-    runOrdinal: ordinal,
-    providerTurnOrdinal: ordinal,
-    attemptId: RunAttemptId.make(`attempt:${suffix}`),
-    rootNodeId: NodeId.make(`node:${suffix}`),
-    providerThread: input.providerThread,
-    message: {
-      createdBy: input.messageCreatedBy ?? "user",
-      creationSource: input.messageCreationSource ?? "web",
-      messageId: MessageId.make(`message:${suffix}`),
-      text: input.messageText ?? "test prompt",
-      attachments: [],
-    },
-    modelSelection,
-    runtimePolicy: input.runtimePolicy,
-  };
-}
-
 describe("AcpAdapterV2", () => {
   it.live.each(["failed", "recovered", "completed", "cancelled"] as const)(
     "projects Mistral retry notices and their %s outcome",
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.testkit.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.testkit.ts
index 421cc9592455..6f8333dd27fb 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.testkit.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.testkit.ts
@@ -1,8 +1,19 @@
 import {
+  MessageId,
+  type ModelSelection,
+  NodeId,
+  ProjectId,
+  type ProviderInstanceId,
+  RunAttemptId,
+  RunId,
+  type OrchestrationV2ProviderThread,
+  type ThreadId,
   ProviderDriverKind,
   ProviderReplayEntry,
   type ProviderReplayTranscript,
 } from "@t3tools/contracts";
+import type * as DateTime from "effect/DateTime";
+import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
 import * as Effect from "effect/Effect";
 import * as Crypto from "effect/Crypto";
 import * as FileSystem from "effect/FileSystem";
@@ -181,6 +192,7 @@ export function makeAcpReplayRuntime(input: {
   readonly scriptPath: string;
   readonly childProcessSpawner: ChildProcessSpawner.ChildProcessSpawner["Service"];
   readonly fileSystem: FileSystem.FileSystem;
+  readonly customModels?: AcpSessionRuntime.AcpSessionRuntimeOptions["customModels"];
   readonly cancelMeta?: AcpSessionRuntime.AcpSessionRuntimeOptions["cancelMeta"];
   readonly initializeMeta?: AcpSessionRuntime.AcpSessionRuntimeOptions["initializeMeta"];
   readonly replayGate?: ProviderReplayGate;
@@ -222,6 +234,7 @@ export function makeAcpReplayRuntime(input: {
             },
           },
           authMethodId: "replay",
+          ...(input.customModels === undefined ? {} : { customModels: input.customModels }),
           ...(input.cancelMeta === undefined ? {} : { cancelMeta: input.cancelMeta }),
           ...(input.initializeMeta === undefined ? {} : { initializeMeta: input.initializeMeta }),
           ...(input.replayGate === undefined
@@ -238,3 +251,66 @@ export function makeAcpReplayRuntime(input: {
       );
     });
 }
+
+export function makeTurnInput(input: {
+  readonly threadId: ThreadId;
+  readonly providerThread: OrchestrationV2ProviderThread;
+  readonly instanceId: ProviderInstanceId;
+  readonly runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy;
+  readonly now: DateTime.Utc;
+  readonly ordinal?: number;
+  readonly modelSelection?: ModelSelection;
+  readonly messageCreatedBy?: "user" | "agent";
+  readonly messageCreationSource?: "web" | "mobile" | "mcp" | "provider" | "server";
+  readonly messageText?: string;
+}): ProviderAdapter.ProviderAdapterV2TurnInput {
+  const ordinal = input.ordinal ?? 1;
+  const suffix = `${input.threadId}:${ordinal}`;
+  const modelSelection =
+    input.modelSelection ?? ({ instanceId: input.instanceId, model: "default" } as const);
+  return {
+    appThread: {
+      createdBy: "user",
+      creationSource: "web",
+      id: input.threadId,
+      projectId: ProjectId.make(`project:${input.threadId}`),
+      title: "ACP adapter test",
+      providerInstanceId: input.instanceId,
+      modelSelection,
+      runtimeMode: "approval-required",
+      interactionMode: "default",
+      branch: null,
+      worktreePath: null,
+      activeProviderThreadId: input.providerThread.id,
+      lineage: {
+        parentThreadId: null,
+        relationshipToParent: null,
+        rootThreadId: input.threadId,
+      },
+      forkedFrom: null,
+      createdAt: input.now,
+      updatedAt: input.now,
+      archivedAt: null,
+      settledOverride: null,
+      settledAt: null,
+      lastVisitedAt: null,
+      deletedAt: null,
+    },
+    threadId: input.threadId,
+    runId: RunId.make(`run:${suffix}`),
+    runOrdinal: ordinal,
+    providerTurnOrdinal: ordinal,
+    attemptId: RunAttemptId.make(`attempt:${suffix}`),
+    rootNodeId: NodeId.make(`node:${suffix}`),
+    providerThread: input.providerThread,
+    message: {
+      createdBy: input.messageCreatedBy ?? "user",
+      creationSource: input.messageCreationSource ?? "web",
+      messageId: MessageId.make(`message:${suffix}`),
+      text: input.messageText ?? "test prompt",
+      attachments: [],
+    },
+    modelSelection,
+    runtimePolicy: input.runtimePolicy,
+  };
+}
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
index 6b27625e1e6e..fb931519d9e3 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
@@ -1,11 +1,16 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
-import { ProviderInstanceId, ProviderSessionId, ThreadId } from "@t3tools/contracts";
+import {
+  type ModelSelection,
+  ProviderInstanceId,
+  ProviderSessionId,
+  ThreadId,
+} from "@t3tools/contracts";
 import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
-import * as Cause from "effect/Cause";
+import * as DateTime from "effect/DateTime";
+import * as Stream from "effect/Stream";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
@@ -33,6 +38,7 @@ import {
   decodeAcpReplayTranscript,
   makeAcpReplayCompletenessAssertion,
   makeAcpReplayRuntime,
+  makeTurnInput,
 } from "./AcpAdapterV2.testkit.ts";
 import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
 import { BUILT_IN_PROVIDER_ADAPTER_DRIVER_KINDS_V2 } from "../builtInProviderAdapterDrivers.ts";
@@ -143,7 +149,7 @@ describe("AcpRegistryAdapterV2", () => {
     });
   });
 
-  describe("applying a stored selection to a scripted agent", () => {
+  describe("the agent's own pickers", () => {
     type Frame = Record<string, unknown>;
     const outbound = (method: string, params: unknown = "<any>"): Frame => ({
       type: "expect_outbound",
@@ -153,8 +159,6 @@ describe("AcpRegistryAdapterV2", () => {
       type: "emit_inbound",
       frame: { kind: "response", method, result },
     });
-    const assertOpened = (opened: Exit.Exit<void, unknown>) =>
-      assert.isTrue(Exit.isSuccess(opened));
     const permissionModeOption = (currentValue: string) => ({
       id: "permission-mode",
       name: "Permission mode",
@@ -164,17 +168,19 @@ describe("AcpRegistryAdapterV2", () => {
       options: ["ask", "auto"].map((value) => ({ value, name: value })),
     });
 
-    const openWithStoredSelection = Effect.fn("openWithStoredSelection")(function* (input: {
+    const openWithStoredPicks = Effect.fn("openWithStoredPicks")(function* (input: {
       readonly setup: unknown;
-      readonly selectionFrames: ReadonlyArray<Frame>;
-      readonly model?: string;
+      readonly pickFrames: ReadonlyArray<Frame>;
+      readonly customModels?: ReadonlyArray<string>;
+      readonly storedModel?: string;
       readonly storedModePick?: string;
+      readonly turnModels?: ReadonlyArray<string>;
     }) {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const fileSystem = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
       const replayDir = yield* fileSystem.makeTempDirectoryScoped({
-        prefix: "t3-acp-registry-mode-pick-",
+        prefix: "t3-acp-registry-stored-picks-",
       });
       const statusPath = path.join(replayDir, "status.json");
       const transcript = yield* decodeAcpReplayTranscript(
@@ -182,7 +188,7 @@ describe("AcpRegistryAdapterV2", () => {
           provider: ACP_REGISTRY_PROVIDER,
           protocol: "acp.ndjson-jsonrpc",
           version: "1",
-          scenario: "stored-mode-pick",
+          scenario: "stored-picks",
           entries: [
             outbound("initialize"),
             answer("initialize", {
@@ -192,21 +198,24 @@ describe("AcpRegistryAdapterV2", () => {
             }),
             outbound("session/new"),
             answer("session/new", { sessionId: "agent-session", ...(input.setup as object) }),
-            ...input.selectionFrames,
+            ...input.pickFrames,
           ] as never,
         },
         ACP_REGISTRY_PROVIDER,
       );
-      const instanceId = ProviderInstanceId.make("acp-registry-mode-pick");
+      const instanceId = ProviderInstanceId.make("acp-registry-stored-picks");
+      let published: AcpRegistryLiveConfiguration | undefined;
       const adapter = yield* makeAcpRegistryAdapterV2({
         selfInvocation: yield* resolveSelfInvocation(),
         instanceId,
         settings: yield* decodeAcpRegistryAdapterSettings({
           agentId: "fixture-agent",
           authMethodId: "test",
+          customModels: input.customModels ?? [],
         }),
         environment: {},
         makeRuntime: makeAcpReplayRuntime({
+          customModels: input.customModels,
           transcript,
           statusPath,
           scriptPath: yield* path.fromFileUrl(
@@ -215,49 +224,107 @@ describe("AcpRegistryAdapterV2", () => {
           childProcessSpawner,
           fileSystem,
         }),
-      }).pipe(Effect.provide(layerInjectedRuntimeCatalog));
-      const opened = yield* adapter
-        .openSession({
-          threadId: ThreadId.make("thread-acp-registry-mode-pick"),
-          providerSessionId: ProviderSessionId.make("provider-session-mode-pick"),
-          modelSelection: {
-            instanceId,
-            model: input.model ?? "default",
-            ...(input.storedModePick === undefined
-              ? {}
-              : { options: [{ id: ACP_SESSION_MODE_OPTION_ID, value: input.storedModePick }] }),
-          },
-          runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-            runtimeMode: "approval-required",
-            interactionMode: "default",
-            cwd: replayDir,
-          }),
-        })
-        .pipe(Effect.asVoid, Effect.scoped, Effect.exit);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            layerInjectedRuntimeCatalog,
+            Layer.mock(AcpRegistryRuntimeCoordinator.AcpRegistryRuntimeCoordinator)({
+              withForegroundStartup: (_startupKey, effect) => effect,
+              publishLiveConfiguration: (_instanceId, configuration) =>
+                Effect.sync(() => {
+                  published = configuration;
+                }),
+            }),
+          ),
+        ),
+      );
+      const threadId = ThreadId.make("thread-acp-registry-stored-picks");
+      const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "approval-required",
+        interactionMode: "default",
+        cwd: replayDir,
+      });
+      const stored: ModelSelection = {
+        instanceId,
+        model: input.storedModel ?? "default",
+        ...(input.storedModePick === undefined
+          ? {}
+          : { options: [{ id: ACP_SESSION_MODE_OPTION_ID, value: input.storedModePick }] }),
+      };
+      const configurations: Array<AcpRegistryLiveConfiguration | undefined> = [];
+      yield* Effect.gen(function* () {
+        const runtime = yield* adapter.openSession({
+          threadId,
+          providerSessionId: ProviderSessionId.make("provider-session-stored-picks"),
+          modelSelection: stored,
+          runtimePolicy,
+        });
+        configurations.push(published);
+        if (input.turnModels === undefined) return;
+        const providerThread = yield* runtime.ensureThread({
+          threadId,
+          modelSelection: stored,
+          runtimePolicy,
+        });
+        const now = yield* DateTime.now;
+        let current = stored;
+        for (const [index, model] of input.turnModels.entries()) {
+          const target: ModelSelection = { instanceId, model };
+          const plan = yield* adapter.planSelectionTransition({
+            current,
+            target,
+            sessionCapabilities: runtime.providerSession.capabilities,
+          });
+          assert.equal(plan.type, "apply_on_next_turn");
+          yield* runtime.startTurn(
+            makeTurnInput({
+              threadId,
+              providerThread,
+              instanceId,
+              runtimePolicy,
+              now,
+              ordinal: index + 1,
+              modelSelection: target,
+            }),
+          );
+          yield* runtime.events.pipe(
+            Stream.takeUntil((event) => event.type === "turn.terminal"),
+            Stream.runForEach((event) =>
+              Effect.sync(() => {
+                if (event.type === "turn.terminal") {
+                  assert.equal(event.status, "completed", event.failure?.message);
+                }
+              }),
+            ),
+          );
+          configurations.push(published);
+          current = target;
+        }
+      }).pipe(Effect.scoped);
       yield* makeAcpReplayCompletenessAssertion(fileSystem, statusPath, transcript);
-      return opened;
+      return { configurations };
     });
 
     it.effect("switches an agent that only advertises modes with session/set_mode", () =>
-      openWithStoredSelection({
+      openWithStoredPicks({
         setup: {
           modes: {
             currentModeId: "default",
             availableModes: ["default", "autoEdit"].map((id) => ({ id, name: id })),
           },
         },
-        selectionFrames: [
+        pickFrames: [
           outbound("session/set_mode", { sessionId: "agent-session", modeId: "autoEdit" }),
           answer("session/set_mode", {}),
         ],
         storedModePick: "autoEdit",
-      }).pipe(Effect.map(assertOpened), Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest), Effect.scoped),
     );
 
     it.effect("switches a mode config option under its own id", () =>
-      openWithStoredSelection({
+      openWithStoredPicks({
         setup: { configOptions: [permissionModeOption("ask")] },
-        selectionFrames: [
+        pickFrames: [
           outbound("session/set_config_option", {
             sessionId: "agent-session",
             configId: "permission-mode",
@@ -266,9 +333,195 @@ describe("AcpRegistryAdapterV2", () => {
           answer("session/set_config_option", { configOptions: [permissionModeOption("auto")] }),
         ],
         storedModePick: "auto",
-      }).pipe(Effect.map(assertOpened), Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest), Effect.scoped),
     );
 
+    const modelOption = (id: string, currentValue: string, grouped = false) => ({
+      id,
+      name: "Model",
+      category: "model",
+      type: "select",
+      currentValue,
+      options: grouped
+        ? [{ group: "models", name: "Models", options: [{ value: "default", name: "Default" }] }]
+        : [{ value: "auto", name: "Auto" }],
+    });
+    const configOptionUpdate = (configOptions: ReadonlyArray<unknown>): Frame => ({
+      type: "emit_inbound",
+      frame: {
+        kind: "notification",
+        method: "session/update",
+        params: {
+          sessionId: "agent-session",
+          update: { sessionUpdate: "config_option_update", configOptions },
+        },
+      },
+    });
+    const prompt = (...updates: ReadonlyArray<Frame>): ReadonlyArray<Frame> => [
+      outbound("session/prompt"),
+      ...updates,
+      answer("session/prompt", { stopReason: "end_turn" }),
+    ];
+    const setModel = (modelId: string): ReadonlyArray<Frame> => [
+      outbound("session/set_model", { sessionId: "agent-session", modelId }),
+      answer("session/set_model", {}),
+    ];
+
+    it.effect(
+      "discovers session models and switches through live model configuration changes",
+      () =>
+        Effect.gen(function* () {
+          const flatOption = (current: string) => modelOption("live-model", current);
+          const groupedOption = (current: string) =>
+            modelOption("replacement-model", current, true);
+          const { configurations } = yield* openWithStoredPicks({
+            setup: {
+              models: {
+                currentModelId: "hermes",
+                availableModels: ["hermes", "auto", "default"].map((modelId) => ({
+                  modelId,
+                  name: modelId,
+                })),
+              },
+            },
+            customModels: ["custom-model"],
+            storedModel: "default",
+            turnModels: [
+              "hermes",
+              "custom-model",
+              "auto",
+              "default",
+              "hermes",
+              "custom-model",
+              "auto",
+              "custom-model",
+              "default",
+              "hermes",
+            ],
+            pickFrames: [
+              ...setModel("default"),
+              ...setModel("hermes"),
+              ...prompt(),
+              ...setModel("custom-model"),
+              ...prompt(),
+              ...setModel("auto"),
+              ...prompt(),
+              ...setModel("default"),
+              ...prompt(),
+              ...setModel("hermes"),
+              ...prompt(configOptionUpdate([flatOption("hermes")])),
+              outbound("session/set_config_option", {
+                sessionId: "agent-session",
+                configId: "live-model",
+                value: "custom-model",
+              }),
+              answer("session/set_config_option", { configOptions: [flatOption("custom-model")] }),
+              ...prompt(),
+              outbound("session/set_config_option", {
+                sessionId: "agent-session",
+                configId: "live-model",
+                value: "auto",
+              }),
+              answer("session/set_config_option", { configOptions: [flatOption("auto")] }),
+              ...prompt(configOptionUpdate([groupedOption("auto")])),
+              outbound("session/set_config_option", {
+                sessionId: "agent-session",
+                configId: "replacement-model",
+                value: "custom-model",
+              }),
+              answer("session/set_config_option", {
+                configOptions: [groupedOption("custom-model")],
+              }),
+              ...prompt(),
+              outbound("session/set_config_option", {
+                sessionId: "agent-session",
+                configId: "replacement-model",
+                value: "default",
+              }),
+              answer("session/set_config_option", { configOptions: [groupedOption("default")] }),
+              ...prompt(configOptionUpdate([])),
+              ...setModel("hermes"),
+              ...prompt(),
+            ],
+          });
+          assert.deepEqual(
+            configurations.map((configuration) => ({
+              models: configuration?.models.map((model) => model.id),
+              current: configuration?.currentModelId,
+            })),
+            [
+              { models: ["hermes", "auto", "default"], current: "default" },
+              { models: ["hermes", "auto", "default"], current: "hermes" },
+              { models: ["hermes", "auto", "default"], current: null },
+              { models: ["hermes", "auto", "default"], current: "auto" },
+              { models: ["hermes", "auto", "default"], current: "default" },
+              { models: ["auto"], current: null },
+              { models: ["auto"], current: null },
+              { models: ["default"], current: null },
+              { models: ["default"], current: null },
+              { models: ["hermes", "auto", "default"], current: "default" },
+              { models: ["hermes", "auto", "default"], current: "hermes" },
+            ],
+          );
+        }).pipe(Effect.provide(layerTest), Effect.scoped),
+    );
+
+    it.effect("leaves unadvertised model IDs alone in both model selection protocols", () =>
+      Effect.gen(function* () {
+        const { configurations } = yield* openWithStoredPicks({
+          setup: {
+            models: {
+              currentModelId: "hermes",
+              availableModels: ["hermes", "other"].map((modelId) => ({ modelId, name: modelId })),
+            },
+          },
+          storedModel: "default",
+          turnModels: [
+            "auto",
+            "removed-model",
+            "other",
+            "default",
+            "auto",
+            "hermes",
+            "removed-model",
+          ],
+          pickFrames: [
+            ...prompt(),
+            ...prompt(),
+            ...setModel("other"),
+            ...prompt(
+              configOptionUpdate([
+                {
+                  ...modelOption("live-model", "other"),
+                  options: [{ value: "other", name: "Other" }],
+                },
+              ]),
+            ),
+            ...prompt(),
+            ...prompt(),
+            ...prompt(
+              configOptionUpdate([
+                {
+                  ...modelOption("replacement-model", "other", true),
+                  options: [
+                    {
+                      group: "models",
+                      name: "Models",
+                      options: [{ value: "other", name: "Other" }],
+                    },
+                  ],
+                },
+              ]),
+            ),
+            ...prompt(),
+          ],
+        });
+        assert.deepEqual(
+          configurations.map((configuration) => configuration?.currentModelId),
+          ["hermes", "hermes", "hermes", "other", "other", "other", "other", "other"],
+        );
+      }).pipe(Effect.provide(layerTest), Effect.scoped),
+    );
     const modelOptions = [
       { id: "fast", name: "Fast", category: "model", type: "boolean", currentValue: false },
       {
@@ -333,9 +586,9 @@ describe("AcpRegistryAdapterV2", () => {
         assert.equal(catalog.currentModelId, "gateway");
         const model = catalog.models[1]?.id;
         assert.isDefined(model);
-        const opened = yield* openWithStoredSelection({
+        const opened = yield* openWithStoredPicks({
           setup,
-          selectionFrames: [
+          pickFrames: [
             outbound("session/set_config_option", {
               sessionId: "agent-session",
               configId: "provider",
@@ -347,32 +600,20 @@ describe("AcpRegistryAdapterV2", () => {
               ),
             }),
           ],
-          model,
+          storedModel: model,
         });
-        assertOpened(opened);
+        assert.equal(opened.configurations.at(-1)?.currentModelId, "codex");
       }).pipe(Effect.provide(layerTest), Effect.scoped),
     );
 
-    it.effect("rejects a later-option model before writing any configuration", () =>
+    it.effect("ignores a later-option model without writing configuration", () =>
       Effect.gen(function* () {
-        const opened = yield* openWithStoredSelection({
+        const { configurations } = yield* openWithStoredPicks({
           setup: { configOptions: modelOptions },
-          selectionFrames: [],
-          model: "later-model",
-        });
-        assert.isTrue(Exit.isFailure(opened));
-        const failure = Exit.isFailure(opened) ? Cause.squash(opened.cause) : undefined;
-        assert.instanceOf(failure, ProviderAdapter.ProviderAdapterOpenSessionError);
-        const rejection = failure instanceof Error ? failure.cause : undefined;
-        assert.instanceOf(rejection, EffectAcpErrors.AcpRequestError);
-        assert.deepInclude(rejection, {
-          code: -32602,
-          data: {
-            configId: "provider",
-            allowedValues: ["gateway", "codex"],
-            receivedValue: "later-model",
-          },
+          pickFrames: [],
+          storedModel: "later-model",
         });
+        assert.equal(configurations[0]?.currentModelId, "gateway");
       }).pipe(Effect.provide(layerTest), Effect.scoped),
     );
   });
diff --git a/apps/server/src/orchestration-v2/FoundationPersistence.test.ts b/apps/server/src/orchestration-v2/FoundationPersistence.test.ts
index 3a50b441a84c..172378b9a9ef 100644
--- a/apps/server/src/orchestration-v2/FoundationPersistence.test.ts
+++ b/apps/server/src/orchestration-v2/FoundationPersistence.test.ts
@@ -1,3 +1,5 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 import * as ServerSettings from "../serverSettings.ts";
 import { assert, it } from "@effect/vitest";
 import {
@@ -30,8 +32,10 @@ import * as Deferred from "effect/Deferred";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import * as Path from "effect/Path";
 import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Scheduler from "effect/Scheduler";
@@ -3551,3 +3555,91 @@ it.effect("publishes live events in commit order across concurrent writers", ()
     }).pipe(Effect.provide(layerEventSink));
   }).pipe(Effect.provide(layerDatabase)),
 );
+
+it.effect.each(["events", "receipts"] as const)(
+  "allows writes while compaction waits for the reader to discover obsolete %s",
+  (kind) =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const directory = yield* fs.makeTempDirectoryScoped({ prefix: "compaction-reader-" });
+      const database = SqlitePersistence.layerFromPath(path.join(directory, "statev2.sqlite"));
+      const maintenanceLayer = ProjectionMaintenance.layer.pipe(
+        Layer.provide(Layer.merge(EventStore.layer, ProjectionStore.layer)),
+        Layer.provideMerge(database),
+      );
+      yield* Effect.gen(function* () {
+        const sql = yield* SqlClient.SqlClient;
+        const maintenance = yield* ProjectionMaintenance.ProjectionMaintenanceV2;
+        const now = DateTime.formatIso(yield* DateTime.now);
+        yield* sql`
+          INSERT INTO orchestration_v2_legacy_imports (
+            thread_id, source_updated_at, shell_imported_at, transcript_imported_at,
+            imported_message_count, last_error
+          ) VALUES ('imported', ${now}, ${now}, ${now}, 1, NULL)
+        `;
+        for (const threadId of ["imported", "pending"]) {
+          if (kind === "events") {
+            yield* sql`
+              INSERT INTO orchestration_events (
+                event_id, aggregate_kind, stream_id, stream_version, event_type,
+                occurred_at, actor_kind, payload_json, metadata_json, application_event_version
+              ) VALUES (
+                ${threadId}, 'thread', ${threadId}, 1, 'thread.message-appended',
+                ${now}, 'user', '{}', '{}', 1
+              )
+            `;
+          } else {
+            yield* sql`
+              INSERT INTO orchestration_command_receipts (
+                command_id, aggregate_kind, aggregate_id, accepted_at, result_sequence,
+                status, command_type
+              ) VALUES (${threadId}, 'thread', ${threadId}, ${now}, 1, 'accepted', 'legacy')
+            `;
+          }
+        }
+        yield* sql`CREATE TABLE concurrent_writes (value TEXT)`;
+        const readerHeld = yield* Deferred.make<void>();
+        const releaseReader = yield* Deferred.make<void>();
+        const reader = yield* sql
+          .withTransaction(
+            Deferred.succeed(readerHeld, undefined).pipe(
+              Effect.andThen(Deferred.await(releaseReader)),
+            ),
+          )
+          .pipe(NodeSqliteClient.readOnly, Effect.forkChild);
+        yield* Deferred.await(readerHeld);
+        const discoveryStarted = yield* Deferred.make<Tracer.Span>();
+        const observeDiscovery: Statement.Transformer = (statement, _sql, _fiber, span) => {
+          const [query] = statement.compile();
+          const pageQuery =
+            kind === "events" ? /^\s*SELECT\s+event\.sequence/ : /^\s*SELECT\s+receipt\.rowid/;
+          return pageQuery.test(query)
+            ? Deferred.succeed(discoveryStarted, span).pipe(Effect.as(statement))
+            : Effect.succeed(statement);
+        };
+        const compacted = yield* Deferred.make<void>();
+        const compaction = yield* maintenance.compactEventStore.pipe(
+          Effect.provideService(Statement.CurrentTransformer, observeDiscovery),
+          Effect.provideService(Statement.SpanPropagationEnabled, true),
+          Effect.tap(() => Deferred.succeed(compacted, undefined)),
+          Effect.forkChild,
+        );
+        const discoverySpan = yield* Deferred.await(discoveryStarted);
+        yield* sql`INSERT INTO concurrent_writes VALUES ('committed')`;
+        assert.isFalse(yield* Deferred.isDone(compacted));
+        assert.deepEqual(yield* sql`SELECT value FROM concurrent_writes`, [{ value: "committed" }]);
+        yield* Deferred.succeed(releaseReader, undefined);
+        yield* Fiber.join(reader);
+        const result = yield* Fiber.join(compaction);
+        assert.equal(discoverySpan.attributes.get("db.connection"), "reader");
+        assert.equal(result.deletedEventCount, kind === "events" ? 1 : 0);
+        assert.equal(result.deletedReceiptCount, kind === "receipts" ? 1 : 0);
+        const retained =
+          kind === "events"
+            ? yield* sql`SELECT stream_id AS id FROM orchestration_events`
+            : yield* sql`SELECT aggregate_id AS id FROM orchestration_command_receipts`;
+        assert.deepEqual(retained, [{ id: "pending" }]);
+      }).pipe(Effect.provide(maintenanceLayer));
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
diff --git a/apps/server/src/orchestration-v2/Orchestrator.ts b/apps/server/src/orchestration-v2/Orchestrator.ts
index d91b40804d5a..885e3a34c36e 100644
--- a/apps/server/src/orchestration-v2/Orchestrator.ts
+++ b/apps/server/src/orchestration-v2/Orchestrator.ts
@@ -3769,6 +3769,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
         sourceProjection,
         sourceRun,
         sourceProviderThread,
+        sourceTokenUsage: providerTurnForRun(sourceProjection, sourceRun)?.tokenUsage,
         canonicalSourcePoint: contextSourcePointForRun(sourceProjection, sourceRun),
         transferId,
         targetThreadId: command.targetThreadId,
diff --git a/apps/server/src/orchestration-v2/ProjectionMaintenance.ts b/apps/server/src/orchestration-v2/ProjectionMaintenance.ts
index f8acaf065cb9..6c5835d8f40e 100644
--- a/apps/server/src/orchestration-v2/ProjectionMaintenance.ts
+++ b/apps/server/src/orchestration-v2/ProjectionMaintenance.ts
@@ -1,4 +1,5 @@
 import { ThreadId } from "@t3tools/contracts";
+import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
@@ -226,8 +227,7 @@ export const layer: Layer.Layer<
     const supersedableThreadEventTypes = new Set(SUPERSEDABLE_THREAD_EVENT_TYPES);
     const readStateThreadEventTypes = new Set(READ_STATE_THREAD_EVENT_TYPES);
     // Keep subagent.updated and turn-item.updated rows: slimmed payloads reference their prompts.
-    // Discovery runs on the shared synchronous connection; json_extract over
-    // large payloads made 500-row pages block the event loop for ~90ms.
+    // Small pages bound work on the reader worker and synchronous fallback.
     const COMPACTION_PAGE_SIZE = 50;
 
     /**
@@ -299,7 +299,7 @@ export const layer: Layer.Layer<
           WHERE event.sequence <= ${throughSequence}
           ORDER BY event.sequence DESC
           LIMIT ${COMPACTION_PAGE_SIZE}
-        `;
+        `.pipe(NodeSqliteClient.readOnly);
         const obsolete: number[] = [];
         for (const row of rows) {
           if (row.imported_legacy_thread === 1) {
@@ -342,8 +342,7 @@ export const layer: Layer.Layer<
             }
           }
         }
-        // Both discovery and deletion use the synchronous connection. Yield even
-        // when this page has nothing to delete so startup and requests can progress.
+        // Yield even without deletions for clients using the synchronous fallback.
         yield* Effect.yieldNow;
         if (obsolete.length > 0) {
           yield* sql`DELETE FROM orchestration_events WHERE sequence IN ${sql.in(obsolete)}`;
@@ -376,7 +375,7 @@ export const layer: Layer.Layer<
           WHERE receipt.rowid <= ${throughReceiptRowId}
           ORDER BY receipt.rowid DESC
           LIMIT ${COMPACTION_PAGE_SIZE}
-        `;
+        `.pipe(NodeSqliteClient.readOnly);
         const obsolete = rows
           .filter((row) => row.imported_legacy_thread === 1)
           .map((row) => row.command_id);
diff --git a/apps/server/src/orchestration-v2/ProjectionStore.test.ts b/apps/server/src/orchestration-v2/ProjectionStore.test.ts
index 64635a75d9d8..35581cde5409 100644
--- a/apps/server/src/orchestration-v2/ProjectionStore.test.ts
+++ b/apps/server/src/orchestration-v2/ProjectionStore.test.ts
@@ -42,6 +42,7 @@ import {
   decodeThreadHistoryCursor,
   selectHistoryPageFromCursor,
   THREAD_HISTORY_PAGE_POLICY,
+  THREAD_HISTORY_SNAPSHOT_ROW_LIMIT,
 } from "./threadHistoryPaging.ts";
 
 const layerTest = Layer.mergeAll(
@@ -6074,6 +6075,161 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
     }),
   );
 
+  it.effect("skips parent bodies once a fork's own turns fill its first page", () =>
+    Effect.gen(function* () {
+      const store = yield* ProjectionStore.ProjectionStoreV2;
+      const now = DateTime.makeUnsafe("2026-10-01T00:00:00.000Z");
+      const parentId = ThreadId.make("thread:filled-fork:parent");
+      const forkId = ThreadId.make("thread:filled-fork:fork");
+      const parentText = "parent prompt";
+      const createThread = (
+        threadId: ThreadId,
+        forkedFrom: { readonly threadId: ThreadId; readonly runId: RunId } | null,
+      ) =>
+        store.apply({
+          id: EventId.make(`event:${threadId}`),
+          type: "thread.created",
+          threadId,
+          occurredAt: now,
+          payload: {
+            createdBy: "user",
+            creationSource: "web",
+            id: threadId,
+            projectId: ProjectId.make("project:filled-fork"),
+            title: "Filled fork",
+            providerInstanceId,
+            modelSelection,
+            runtimeMode: "full-access",
+            interactionMode: "default",
+            branch: null,
+            worktreePath: null,
+            activeProviderThreadId: null,
+            lineage: {
+              parentThreadId: forkedFrom?.threadId ?? null,
+              relationshipToParent: forkedFrom === null ? null : "fork",
+              rootThreadId: parentId,
+            },
+            forkedFrom: forkedFrom === null ? null : { type: "run", ...forkedFrom },
+            createdAt: now,
+            updatedAt: now,
+            archivedAt: null,
+            settledOverride: null,
+            settledAt: null,
+            lastVisitedAt: null,
+            deletedAt: null,
+          },
+        });
+      const addTurn = Effect.fnUntraced(function* (threadId: ThreadId, turn: number, text: string) {
+        const runId = RunId.make(`run:${threadId}:${turn}`);
+        const nodeId = NodeId.make(`node:${threadId}:${turn}`);
+        yield* store.apply({
+          id: EventId.make(`event:${runId}`),
+          type: "run.created",
+          threadId,
+          runId,
+          nodeId,
+          driver,
+          occurredAt: now,
+          payload: {
+            id: runId,
+            threadId,
+            ordinal: turn,
+            providerInstanceId,
+            modelSelection,
+            providerThreadId: null,
+            userMessageId: MessageId.make(`message:${runId}`),
+            rootNodeId: nodeId,
+            activeAttemptId: null,
+            status: "completed",
+            requestedAt: now,
+            startedAt: now,
+            completedAt: now,
+            checkpointId: null,
+            contextHandoffId: null,
+          },
+        });
+        yield* store.apply({
+          id: EventId.make(`event:${runId}:prompt`),
+          type: "turn-item.updated",
+          threadId,
+          runId,
+          driver,
+          occurredAt: now,
+          payload: {
+            id: TurnItemId.make(`item:${runId}`),
+            threadId,
+            runId,
+            nodeId: null,
+            providerThreadId: null,
+            providerTurnId: null,
+            nativeItemRef: null,
+            parentItemId: null,
+            ordinal: turn,
+            status: "completed",
+            title: null,
+            startedAt: now,
+            completedAt: now,
+            updatedAt: now,
+            type: "user_message",
+            messageId: MessageId.make(`message:${runId}`),
+            inputIntent: "turn_start",
+            createdBy: "user",
+            creationSource: "web",
+            text,
+            attachments: [],
+          },
+        });
+      });
+      const readFirstPage = Effect.fnUntraced(function* (
+        threadId: ThreadId,
+        parsesParent: boolean,
+      ) {
+        const full = yield* store.getThreadSnapshot(threadId);
+        // Measure only the window read; the full snapshot is the pagination oracle.
+        const parse = yield* Effect.acquireRelease(
+          Effect.sync(() => vi.spyOn(JSON, "parse")),
+          (spy) => Effect.sync(() => spy.mockRestore()),
+        );
+        const window = yield* store.getThreadSnapshotWindow(threadId, {
+          rowLimit: THREAD_HISTORY_SNAPSHOT_ROW_LIMIT,
+          userTurnLimit: THREAD_HISTORY_PAGE_POLICY.maxUserTurns,
+        });
+        assert.equal(
+          parse.mock.calls.some(([text]) => text.includes(parentText)),
+          parsesParent,
+        );
+        const page = buildBoundedThreadProjection(window);
+        assert.deepEqual(page, buildBoundedThreadProjection(full));
+        assert.isTrue(page.hasMoreHistory);
+        assert.isNotNull(page.historyCursor);
+        return page.projection.visibleTurnItems;
+      }, Effect.scoped);
+
+      yield* createThread(parentId, null);
+      for (const turn of [1, 2, 3]) yield* addTurn(parentId, turn, `${parentText} ${turn}`);
+      // The third parent turn is after the fork boundary and must stay excluded.
+      yield* createThread(forkId, { threadId: parentId, runId: RunId.make(`run:${parentId}:2`) });
+      for (let turn = 1; turn <= 9; turn += 1) yield* addTurn(forkId, turn, "fork prompt");
+      const partial = yield* readFirstPage(forkId, true);
+      assert.include(
+        partial.map((row) => row.visibility),
+        "inherited",
+      );
+
+      yield* addTurn(forkId, 10, "fork prompt");
+      const filled = yield* readFirstPage(forkId, false);
+      assert.notInclude(
+        filled.map((row) => row.visibility),
+        "inherited",
+      );
+
+      const nestedId = ThreadId.make("thread:filled-fork:nested");
+      yield* createThread(nestedId, { threadId: forkId, runId: RunId.make(`run:${forkId}:10`) });
+      for (let turn = 1; turn <= 10; turn += 1) yield* addTurn(nestedId, turn, "nested prompt");
+      yield* readFirstPage(nestedId, true);
+    }),
+  );
+
   it.effect("a pull request watch keeps a finished thread working until it ends", () =>
     Effect.gen(function* () {
       const store = yield* ProjectionStore.ProjectionStoreV2;
diff --git a/apps/server/src/orchestration-v2/ProjectionStore.ts b/apps/server/src/orchestration-v2/ProjectionStore.ts
index 71251df71766..8448ff8268e1 100644
--- a/apps/server/src/orchestration-v2/ProjectionStore.ts
+++ b/apps/server/src/orchestration-v2/ProjectionStore.ts
@@ -1339,8 +1339,9 @@ function withLocalVisibleTurnItems(
 
 function renumberVisibleTurnItems(
   rows: ReadonlyArray<Omit<OrchestrationV2ProjectedTurnItem, "position">>,
+  offset = 0,
 ): Array<OrchestrationV2ProjectedTurnItem> {
-  return rows.map((row, position) => ({ ...row, position }));
+  return rows.map((row, position) => ({ ...row, position: position + offset }));
 }
 
 function makeForkMarkerTurnItem(input: {
@@ -1428,16 +1429,23 @@ function visibleTurnItemsThroughRun(input: {
 function buildVisibleTurnItems(input: {
   readonly projection: OrchestrationV2ThreadProjection;
   readonly sourceProjection: OrchestrationV2ThreadProjection | null;
+  readonly inheritedRowCount?: number;
 }): Array<OrchestrationV2ProjectedTurnItem> {
   const forkedFrom = input.projection.thread.forkedFrom;
-  if (forkedFrom?.type !== "run" || input.sourceProjection === null) {
+  if (
+    forkedFrom?.type !== "run" ||
+    (input.sourceProjection === null && input.inheritedRowCount === undefined)
+  ) {
     return localVisibleTurnItems(input.projection);
   }
 
-  const inherited = visibleTurnItemsThroughRun({
-    sourceProjection: input.sourceProjection,
-    sourceRunId: forkedFrom.runId,
-  });
+  const inherited =
+    input.sourceProjection === null
+      ? []
+      : visibleTurnItemsThroughRun({
+          sourceProjection: input.sourceProjection,
+          sourceRunId: forkedFrom.runId,
+        });
   const markerItem = makeForkMarkerTurnItem({
     targetProjection: input.projection,
     sourceThreadId: forkedFrom.threadId,
@@ -1450,16 +1458,19 @@ function buildVisibleTurnItems(input: {
     item: row.item,
   }));
 
-  return renumberVisibleTurnItems([
-    ...inherited,
-    {
-      visibility: "synthetic",
-      sourceThreadId: forkedFrom.threadId,
-      sourceItemId: markerItem.id,
-      item: markerItem,
-    },
-    ...local,
-  ]);
+  return renumberVisibleTurnItems(
+    [
+      ...inherited,
+      {
+        visibility: "synthetic",
+        sourceThreadId: forkedFrom.threadId,
+        sourceItemId: markerItem.id,
+        item: markerItem,
+      },
+      ...local,
+    ],
+    input.inheritedRowCount ?? 0,
+  );
 }
 
 function pendingRuntimeRequestSummary(
@@ -2779,47 +2790,16 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
           ),
       );
 
-    const readCanonicalProjection = Effect.fn("ProjectionStore.readCanonicalProjection")(
-      function* (
-        threadId: ThreadId,
-        window?: {
-          readonly rowLimit: number;
-          readonly userTurnLimit?: number | undefined;
-          readonly anchorItemId?: TurnItemId | undefined;
-          readonly requiredRunId?: RunId | undefined;
-          readonly suppressLocal?: boolean | undefined;
-        },
-        fields?: ReadonlyArray<ProjectionRecordField>,
-        filter?: ProjectionRecordFilter,
-      ) {
-        const threadRows = yield* sql<PayloadRow>`
-          SELECT payload_json
-          FROM orchestration_v2_projection_threads
-          WHERE thread_id = ${threadId}
-          LIMIT 1
-        `;
-        const threadRow = threadRows[0];
-        if (!threadRow) {
-          return yield* new ProjectionStoreThreadNotFoundError({ threadId });
-        }
-
-        const boundedTurnItemRows =
-          (fields !== undefined && !fields.includes("turnItems")) ||
-          (window === undefined &&
-            matchesNothing(filter?.turnItemTypes, filter?.turnItemStatuses, filter?.turnItemRunIds))
-            ? []
-            : window === undefined
-              ? yield* sql<PayloadRow>`
-                SELECT payload_json
-                FROM orchestration_v2_projection_turn_items
-                WHERE thread_id = ${threadId}
-                  ${filter?.turnItemTypes === undefined ? sql`` : sql`AND type IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))`}
-                  ${filter?.turnItemStatuses === undefined ? sql`` : sql`AND status IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemStatuses)}))`}
-                  ${filter?.turnItemRunId === undefined ? sql`` : sql`AND run_id = ${filter.turnItemRunId}`}
-                  ${filter?.turnItemRunIds === undefined ? sql`` : sql`AND (run_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRunIds.filter((id): id is RunId => id !== null))})) OR (${filter.turnItemRunIds.includes(null) ? 1 : 0} = 1 AND run_id IS NULL))`}
-                ORDER BY ordinal ASC, turn_item_id ASC
-              `
-              : yield* sql<PayloadRow>`
+    // Share selection so counting discarded ancestry preserves payload-read positions.
+    const retainedWindowRows = (
+      threadId: ThreadId,
+      window: {
+        readonly rowLimit: number;
+        readonly userTurnLimit?: number | undefined;
+        readonly anchorItemId?: TurnItemId | undefined;
+        readonly requiredRunId?: RunId | undefined;
+      },
+    ) => sql`
                 WITH eligible AS NOT MATERIALIZED (
                   SELECT item.rowid AS item_rowid, item.payload_json, item.ordinal, item.turn_item_id,
                     item.run_id, item.node_id, item.type
@@ -2984,6 +2964,50 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                   ) AS latest
                   ORDER BY ordinal ASC, turn_item_id ASC
                 )
+              `;
+
+    const readCanonicalProjection = Effect.fn("ProjectionStore.readCanonicalProjection")(
+      function* (
+        threadId: ThreadId,
+        window?: {
+          readonly rowLimit: number;
+          readonly userTurnLimit?: number | undefined;
+          readonly anchorItemId?: TurnItemId | undefined;
+          readonly requiredRunId?: RunId | undefined;
+          readonly suppressLocal?: boolean | undefined;
+        },
+        fields?: ReadonlyArray<ProjectionRecordField>,
+        filter?: ProjectionRecordFilter,
+      ) {
+        const threadRows = yield* sql<PayloadRow>`
+          SELECT payload_json
+          FROM orchestration_v2_projection_threads
+          WHERE thread_id = ${threadId}
+          LIMIT 1
+        `;
+        const threadRow = threadRows[0];
+        if (!threadRow) {
+          return yield* new ProjectionStoreThreadNotFoundError({ threadId });
+        }
+
+        const boundedTurnItemRows =
+          (fields !== undefined && !fields.includes("turnItems")) ||
+          (window === undefined &&
+            matchesNothing(filter?.turnItemTypes, filter?.turnItemStatuses, filter?.turnItemRunIds))
+            ? []
+            : window === undefined
+              ? yield* sql<PayloadRow>`
+                SELECT payload_json
+                FROM orchestration_v2_projection_turn_items
+                WHERE thread_id = ${threadId}
+                  ${filter?.turnItemTypes === undefined ? sql`` : sql`AND type IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))`}
+                  ${filter?.turnItemStatuses === undefined ? sql`` : sql`AND status IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemStatuses)}))`}
+                  ${filter?.turnItemRunId === undefined ? sql`` : sql`AND run_id = ${filter.turnItemRunId}`}
+                  ${filter?.turnItemRunIds === undefined ? sql`` : sql`AND (run_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRunIds.filter((id): id is RunId => id !== null))})) OR (${filter.turnItemRunIds.includes(null) ? 1 : 0} = 1 AND run_id IS NULL))`}
+                ORDER BY ordinal ASC, turn_item_id ASC
+              `
+              : yield* sql<PayloadRow>`
+                ${retainedWindowRows(threadId, window)}
                 -- CROSS JOIN keeps the sorted IDs as the outer loop, so SQLite
                 -- skips sorting again once the payloads are attached. Carry the
                 -- rowid through selection to avoid a second string-key index lookup.
@@ -3592,6 +3616,45 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                 };
               });
 
+        // Filled local pages need only the inherited count for cursor positions.
+        // Run-forked parents still need the recursive read to include their ancestry.
+        if (
+          window?.userTurnLimit !== undefined &&
+          window.historyAnchor === undefined &&
+          seenThreadIds.size === 0 &&
+          sourceWindow !== undefined &&
+          activeLocalTurnItems(projection).filter((row) => isThreadHistoryUserTurn(row.item))
+            .length >= Math.max(window.userTurnLimit, THREAD_HISTORY_PAGE_POLICY.maxUserTurns)
+        ) {
+          const counted = yield* sql<{ readonly inherited_rows: number | null }>`
+            ${retainedWindowRows(forkedFrom.threadId, {
+              ...sourceWindow,
+              rowLimit: sourceWindow.suppressLocal ? 0 : sourceWindow.rowLimit,
+            })}
+            SELECT CASE
+              WHEN json_extract(source.payload_json, '$.forkedFrom.type') = 'run' THEN NULL
+              WHEN NOT EXISTS (
+                SELECT 1 FROM orchestration_v2_projection_runs
+                WHERE thread_id = source.thread_id AND run_id = ${forkedFrom.runId}
+              ) THEN 0
+              ELSE (SELECT COUNT(*) FROM retained)
+            END AS inherited_rows
+            FROM orchestration_v2_projection_threads AS source
+            WHERE source.thread_id = ${forkedFrom.threadId}
+          `;
+          const inheritedRowCount = counted[0]?.inherited_rows ?? null;
+          if (inheritedRowCount !== null) {
+            return {
+              ...projection,
+              visibleTurnItems: buildVisibleTurnItems({
+                projection,
+                sourceProjection: null,
+                inheritedRowCount,
+              }),
+            };
+          }
+        }
+
         const sourceProjection = yield* readProjection(
           forkedFrom.threadId,
           new Set([...seenThreadIds, threadId]),
diff --git a/apps/server/src/orchestration-v2/RunExecutionService.test.ts b/apps/server/src/orchestration-v2/RunExecutionService.test.ts
index 8cf9a4f28a43..1281f578e34c 100644
--- a/apps/server/src/orchestration-v2/RunExecutionService.test.ts
+++ b/apps/server/src/orchestration-v2/RunExecutionService.test.ts
@@ -327,6 +327,141 @@ it("routes only enrolled workflow members after the root turn ends", () => {
   );
 });
 
+it("moves a child thread to the run that shows its subagent now", () => {
+  const threadId = ThreadId.make("thread:handoff");
+  const rootProviderTurnId = ProviderTurnId.make("provider-turn:handoff");
+  const identity: RunExecutionService.ProviderEventRouteIdentity = {
+    threadId,
+    runId: RunId.make("run:handoff:1"),
+    attemptId: RunAttemptId.make("attempt:handoff:1"),
+    providerThreadId: ProviderThreadId.make("provider-thread:handoff"),
+  };
+  const resumedChild = ThreadId.make("thread:handoff:resumed");
+  const siblingChild = ThreadId.make("thread:handoff:sibling");
+  const providerThreadOf = (childThreadId: ThreadId) =>
+    ProviderThreadId.make(`provider-thread:${childThreadId}`);
+  const subagent = (childThreadId: ThreadId, runId: RunId): OrchestrationV2Subagent => ({
+    id: NodeId.make(`node:${childThreadId}`),
+    threadId,
+    runId,
+    parentNodeId: NodeId.make("node:handoff"),
+    origin: "provider_native",
+    createdBy: "agent",
+    driver,
+    providerInstanceId: ProviderInstanceId.make("codex"),
+    providerThreadId: providerThreadOf(childThreadId),
+    childThreadId,
+    nativeTaskRef: null,
+    prompt: "Work",
+    title: "Work",
+    model: null,
+    status: "running",
+    result: null,
+    startedAt: null,
+    completedAt: null,
+    updatedAt: DateTime.makeUnsafe(0),
+  });
+  const childMessage = (childThreadId: ThreadId) =>
+    ({
+      type: "message.updated",
+      driver,
+      message: {
+        id: MessageId.make(`message:${childThreadId}`),
+        threadId: childThreadId,
+        runId: null,
+      },
+    }) as ProviderAdapter.ProviderAdapterV2Event;
+  const childTurn = (childThreadId: ThreadId, ordinal: number) =>
+    ({
+      type: "provider_turn.updated",
+      driver,
+      providerTurn: {
+        id: ProviderTurnId.make(`provider-turn:${childThreadId}:${ordinal}`),
+        providerThreadId: providerThreadOf(childThreadId),
+        runAttemptId: null,
+        status: "running",
+      },
+    }) as ProviderAdapter.ProviderAdapterV2Event;
+  const ended = RunExecutionService.routeProviderEvent(
+    {
+      type: "turn.terminal",
+      driver,
+      providerThreadId: identity.providerThreadId,
+      providerTurnId: rootProviderTurnId,
+      runOrdinal: 1,
+      status: "completed",
+      failure: null,
+      threadDisposition: "reusable",
+    },
+    identity,
+    RunExecutionService.makeProviderEventRoutingState({
+      identity,
+      providerTurnId: rootProviderTurnId,
+      relatedThreadIds: [resumedChild, siblingChild],
+      relatedProviderThreadIds: [providerThreadOf(resumedChild), providerThreadOf(siblingChild)],
+    }),
+  )[1];
+  const [firstTurnAccepted, withChildTurn] = RunExecutionService.routeProviderEvent(
+    childTurn(resumedChild, 1),
+    identity,
+    ended,
+  );
+  assert.isTrue(firstTurnAccepted);
+  const [movedAccepted, afterMove] = RunExecutionService.routeProviderEvent(
+    {
+      type: "subagent.updated",
+      driver,
+      subagent: subagent(resumedChild, RunId.make("run:handoff:2")),
+    },
+    identity,
+    withChildTurn,
+  );
+  assert.isFalse(movedAccepted);
+  assert.isFalse(
+    RunExecutionService.routeProviderEvent(childMessage(resumedChild), identity, afterMove)[0],
+  );
+  assert.isTrue(
+    RunExecutionService.routeProviderEvent(childMessage(siblingChild), identity, afterMove)[0],
+  );
+  assert.isFalse(
+    RunExecutionService.routeProviderEvent(childTurn(resumedChild, 1), identity, afterMove)[0],
+  );
+  assert.isFalse(
+    RunExecutionService.routeProviderEvent(childTurn(resumedChild, 2), identity, afterMove)[0],
+  );
+  assert.isTrue(
+    RunExecutionService.routeProviderEvent(childTurn(siblingChild, 1), identity, afterMove)[0],
+  );
+  assert.isTrue(
+    RunExecutionService.routeProviderEvent(
+      { type: "subagent.updated", driver, subagent: subagent(siblingChild, identity.runId) },
+      identity,
+      afterMove,
+    )[0],
+  );
+  const resuming: RunExecutionService.ProviderEventRouteIdentity = {
+    ...identity,
+    runId: RunId.make("run:handoff:2"),
+    attemptId: RunAttemptId.make("attempt:handoff:2"),
+  };
+  const resumingState = RunExecutionService.makeProviderEventRoutingState({
+    identity: resuming,
+    providerTurnId: ProviderTurnId.make("provider-turn:handoff:2"),
+  });
+  assert.isFalse(
+    RunExecutionService.routeProviderEvent(childMessage(resumedChild), resuming, resumingState)[0],
+  );
+  const [moveAccepted, afterTake] = RunExecutionService.routeProviderEvent(
+    { type: "subagent.updated", driver, subagent: subagent(resumedChild, resuming.runId) },
+    resuming,
+    resumingState,
+  );
+  assert.isTrue(moveAccepted);
+  assert.isTrue(
+    RunExecutionService.routeProviderEvent(childMessage(resumedChild), resuming, afterTake)[0],
+  );
+});
+
 it("does not route a superseded attempt through a reused provider thread", () => {
   const threadId = ThreadId.make("thread:shared-runtime:restart");
   const providerThreadId = ProviderThreadId.make("provider-thread:shared-runtime:restart");
@@ -1740,6 +1875,65 @@ it.effect("keeps ingesting a child thread's late background item completion", ()
   }),
 );
 
+it.effect.each([null, "run:nested-sdk"] as const)(
+  "releases a settled run when its live child transfers to another run (%s)",
+  (nestedRunId) =>
+    Effect.gen(function* () {
+      const consumed = yield* Deferred.make<void>();
+      const result = yield* Effect.raceFirst(
+        runBackgroundItemScenario(
+          "child-transfer-release",
+          (ids) => {
+            const running = subagentEvent(ids, "running");
+            if (running.type !== "subagent.updated") throw new Error("Missing subagent");
+            const linked = {
+              ...running,
+              subagent: {
+                ...running.subagent,
+                origin: "provider_native" as const,
+                childThreadId: ids.childThreadId,
+                providerThreadId: null,
+              },
+            };
+            return [
+              childThreadCreatedEvent(ids),
+              linked,
+              {
+                ...linked,
+                subagent: {
+                  ...linked.subagent,
+                  id: NodeId.make("node:child-transfer-release:nested"),
+                  threadId: ids.childThreadId,
+                  runId: nestedRunId === null ? null : RunId.make(nestedRunId),
+                  childThreadId: null,
+                },
+              },
+              childBackgroundTurnItemEvent(ids, "running", 1),
+              rootTerminalEvent(ids, "completed"),
+              { ...linked, subagent: { ...linked.subagent, runId: RunId.make("run:replacement") } },
+            ];
+          },
+          {
+            keepEventStreamOpen: true,
+            onEventsConsumed: Deferred.succeed(consumed, undefined).pipe(Effect.asVoid),
+          },
+        ).pipe(Effect.map(Option.some)),
+        Deferred.await(consumed).pipe(Effect.as(Option.none())),
+      );
+      assert.isTrue(
+        Option.isSome(result),
+        "the transferred child must release its prior subscription",
+      );
+      if (Option.isSome(result))
+        assert.deepEqual(result.value, [
+          "subagent:running",
+          "subagent:running",
+          "turn_item:running",
+          "root-finalized",
+        ]);
+    }),
+);
+
 it.effect("keeps ingesting until the last of several background items terminalizes", () =>
   Effect.gen(function* () {
     const secondItemId = TurnItemId.make("turn-item:bg-multi:second");
@@ -4377,6 +4571,7 @@ function runBackgroundItemScenario(
       ReadonlyArray<{ readonly id: TurnItemId; readonly runId: RunId }>
     >;
     readonly onSubscribe?: Effect.Effect<void>;
+    readonly onEventsConsumed?: Effect.Effect<void>;
     readonly onFinalized?: (
       events: ReadonlyArray<OrchestrationV2DomainEvent>,
     ) => Effect.Effect<void>;
@@ -4444,7 +4639,11 @@ function runBackgroundItemScenario(
           events: Stream.empty,
           subscribeEvents: Effect.gen(function* () {
             yield* options?.onSubscribe ?? Effect.void;
-            const events = Stream.fromIterable(makeEvents(ids));
+            const events = Stream.fromIterable(makeEvents(ids)).pipe(
+              Stream.concat(
+                Stream.fromEffect(options?.onEventsConsumed ?? Effect.void).pipe(Stream.drain),
+              ),
+            );
             return {
               events:
                 options?.keepEventStreamOpen === true
diff --git a/apps/server/src/orchestration-v2/RunExecutionService.ts b/apps/server/src/orchestration-v2/RunExecutionService.ts
index 74916428333f..07c19e73e9cb 100644
--- a/apps/server/src/orchestration-v2/RunExecutionService.ts
+++ b/apps/server/src/orchestration-v2/RunExecutionService.ts
@@ -60,7 +60,7 @@ export interface ProviderEventRoutingState {
   readonly rootTurnEnded: boolean;
   readonly workflowMemberParents: ReadonlyMap<ThreadId, ThreadId>;
   readonly ownedProviderThreadIds: ReadonlySet<ProviderThreadId>;
-  readonly ownedProviderTurnIds: ReadonlySet<ProviderTurnId>;
+  readonly ownedProviderTurns: ReadonlyMap<ProviderTurnId, ProviderThreadId>;
   readonly inheritedBackgroundTurnItems: ReadonlyMap<TurnItemId, OrchestrationV2Run["id"]>;
   readonly rootProviderTurnId: ProviderTurnId | null;
 }
@@ -337,8 +337,10 @@ export function makeProviderEventRoutingState(input: {
       input.identity.providerThreadId,
       ...(input.relatedProviderThreadIds ?? []),
     ]),
-    ownedProviderTurnIds:
-      input.providerTurnId === null ? new Set() : new Set([input.providerTurnId]),
+    ownedProviderTurns:
+      input.providerTurnId === null
+        ? new Map()
+        : new Map([[input.providerTurnId, input.identity.providerThreadId]]),
     inheritedBackgroundTurnItems: new Map(
       (input.inheritedBackgroundTurnItems ?? []).map((item) => [item.id, item.runId]),
     ),
@@ -361,10 +363,11 @@ export function routeProviderEvent(
   });
   const addProviderTurn = (
     providerTurnId: ProviderTurnId,
+    providerThreadId: ProviderThreadId,
     root: boolean,
   ): ProviderEventRoutingState => ({
     ...state,
-    ownedProviderTurnIds: new Set([...state.ownedProviderTurnIds, providerTurnId]),
+    ownedProviderTurns: new Map(state.ownedProviderTurns).set(providerTurnId, providerThreadId),
     rootProviderTurnId: root ? providerTurnId : state.rootProviderTurnId,
   });
 
@@ -405,9 +408,14 @@ export function routeProviderEvent(
         isRoot ||
         (event.providerTurn.providerThreadId !== input.providerThreadId &&
           state.ownedProviderThreadIds.has(event.providerTurn.providerThreadId)) ||
-        state.ownedProviderTurnIds.has(event.providerTurn.id) ||
+        state.ownedProviderTurns.has(event.providerTurn.id) ||
         (event.threadId !== undefined && ownsChildThread(event.threadId));
-      return belongs ? [true, addProviderTurn(event.providerTurn.id, isRoot)] : [false, state];
+      return belongs
+        ? [
+            true,
+            addProviderTurn(event.providerTurn.id, event.providerTurn.providerThreadId, isRoot),
+          ]
+        : [false, state];
     }
     case "node.updated": {
       const belongs = ownsRun(event.node.runId) || ownsChildThread(event.node.threadId);
@@ -417,6 +425,25 @@ export function routeProviderEvent(
       return [true, addProviderThread(event.node.providerThreadId)];
     }
     case "subagent.updated": {
+      const moved = event.subagent;
+      if (
+        moved.origin === "provider_native" &&
+        moved.threadId === input.threadId &&
+        moved.runId !== null &&
+        !ownsRun(moved.runId) &&
+        moved.childThreadId !== null &&
+        ownsChildThread(moved.childThreadId)
+      ) {
+        const ownedThreadIds = new Set(state.ownedThreadIds);
+        ownedThreadIds.delete(moved.childThreadId);
+        const ownedProviderThreadIds = new Set(state.ownedProviderThreadIds);
+        if (moved.providerThreadId !== null) ownedProviderThreadIds.delete(moved.providerThreadId);
+        const ownedProviderTurns = new Map(state.ownedProviderTurns);
+        for (const [turnId, threadId] of ownedProviderTurns) {
+          if (threadId === moved.providerThreadId) ownedProviderTurns.delete(turnId);
+        }
+        return [false, { ...state, ownedThreadIds, ownedProviderThreadIds, ownedProviderTurns }];
+      }
       const belongs = ownsRun(event.subagent.runId) || ownsChildThread(event.subagent.threadId);
       const coordinator = event.subagent;
       // A provider-native subagent's child thread follows the live run it is
@@ -478,7 +505,7 @@ export function routeProviderEvent(
       return [
         (event.threadId !== undefined && ownsChildThread(event.threadId)) ||
           (event.runtimeRequest.providerTurnId !== null &&
-            state.ownedProviderTurnIds.has(event.runtimeRequest.providerTurnId)),
+            state.ownedProviderTurns.has(event.runtimeRequest.providerTurnId)),
         state,
       ];
     case "command_output.delta":
@@ -974,7 +1001,7 @@ export const layer: Layer.Layer<
         const rootRunFinalized = yield* Ref.make(false);
         const providerThreadOwnerLost = yield* Ref.make(false);
         const activeChildProviderTurns = yield* Ref.make<ReadonlySet<ProviderTurnId>>(new Set());
-        const activeChildSubagents = yield* Ref.make<ReadonlySet<NodeId>>(new Set());
+        const activeChildSubagents = yield* Ref.make<ReadonlyMap<NodeId, ThreadId>>(new Map());
         const activeBackgroundTurnItems = yield* Ref.make<
           ReadonlySet<OrchestrationV2TurnItem["id"]>
         >(new Set(inheritedBackgroundTurnItemsById.keys()));
@@ -1050,11 +1077,11 @@ export const layer: Layer.Layer<
               routing.ownedThreadIds.has(event.subagent.threadId);
             if (belongsToRootRun || belongsToOwnedChildThread) {
               yield* Ref.update(activeChildSubagents, (current) => {
-                const next = new Set(current);
+                const next = new Map(current);
                 if (isSettledSubagentStatus(event.subagent.status)) {
                   next.delete(event.subagent.id);
                 } else {
-                  next.add(event.subagent.id);
+                  next.set(event.subagent.id, event.subagent.threadId);
                 }
                 return next;
               });
@@ -1209,11 +1236,84 @@ export const layer: Layer.Layer<
         // when finally written, behind every item that began after it.
         const reservedHeldTurnItemIds = new Set<TurnItemId>();
         const providerEventFiber = yield* eventSubscription.events.pipe(
-          Stream.filterEffect((event) =>
-            Ref.modify(eventRouting, (state) => routeProviderEvent(event, routeIdentity, state)),
+          Stream.mapEffect((event) =>
+            Effect.gen(function* () {
+              const previous = yield* Ref.get(eventRouting);
+              const [accepted, routing] = routeProviderEvent(event, routeIdentity, previous);
+              yield* Ref.set(eventRouting, routing);
+              if (
+                event.type === "subagent.updated" &&
+                event.subagent.childThreadId !== null &&
+                previous.ownedThreadIds.has(event.subagent.childThreadId) &&
+                !routing.ownedThreadIds.has(event.subagent.childThreadId)
+              ) {
+                const moved = event.subagent;
+                const detached = yield* Ref.modify(openRunOwnedSubagents, (current) => {
+                  const subagentIds = new Set([moved.id]);
+                  for (const subagent of current.subagents.values()) {
+                    if (subagent.threadId === moved.childThreadId) subagentIds.add(subagent.id);
+                  }
+                  const childTurnItems = new Map(
+                    [...current.childTurnItems].filter(
+                      ([, item]) => item.threadId !== moved.childThreadId,
+                    ),
+                  );
+                  const turnItems = new Map(current.turnItems);
+                  turnItems.delete(moved.id);
+                  const detachedItems = new Set(
+                    [...current.childTurnItems.values(), ...current.turnItems.values()]
+                      .filter(
+                        (item) => item.threadId === moved.childThreadId || item.nodeId === moved.id,
+                      )
+                      .map((item) => item.id),
+                  );
+                  return [
+                    { itemIds: detachedItems, subagentIds },
+                    {
+                      subagents: new Map(
+                        [...current.subagents].filter(([id]) => !subagentIds.has(id)),
+                      ),
+                      turnItems,
+                      childTurnItems,
+                      nodes: new Map(
+                        [...current.nodes].filter(
+                          ([id, node]) => id !== moved.id && node.threadId !== moved.childThreadId,
+                        ),
+                      ),
+                      linkedChildThreadIds: new Set(
+                        [...current.linkedChildThreadIds].filter(
+                          (id) => id !== moved.childThreadId,
+                        ),
+                      ),
+                    },
+                  ];
+                });
+                yield* Ref.update(
+                  activeChildSubagents,
+                  (current) =>
+                    new Map(
+                      [...current].filter(
+                        ([id, threadId]) =>
+                          !detached.subagentIds.has(id) && threadId !== moved.childThreadId,
+                      ),
+                    ),
+                );
+                yield* Ref.update(
+                  activeChildProviderTurns,
+                  (current) =>
+                    new Set([...current].filter((id) => routing.ownedProviderTurns.has(id))),
+                );
+                yield* Ref.update(
+                  activeBackgroundTurnItems,
+                  (current) => new Set([...current].filter((id) => !detached.itemIds.has(id))),
+                );
+              }
+              return { event, accepted };
+            }),
           ),
-          Stream.tap((event) =>
+          Stream.tap(({ event, accepted }) =>
             Effect.gen(function* () {
+              if (!accepted) return;
               let storedEventCount = 0;
               const deliveredEvent = filterAssistantEvent(
                 event,
diff --git a/apps/server/src/orchestration-v2/ThreadForkService.ts b/apps/server/src/orchestration-v2/ThreadForkService.ts
index b3b798d57dee..c31a5e4611a2 100644
--- a/apps/server/src/orchestration-v2/ThreadForkService.ts
+++ b/apps/server/src/orchestration-v2/ThreadForkService.ts
@@ -6,6 +6,7 @@ import {
   OrchestrationV2ContextTransfer,
   OrchestrationV2CreationSource,
   OrchestrationV2ProviderThread,
+  OrchestrationV2ProviderTurnTokenUsage,
   OrchestrationV2Run,
   OrchestrationV2ThreadProjection,
   ThreadId,
@@ -54,6 +55,7 @@ export interface ThreadForkServiceV2Shape {
     readonly sourceProjection: Pick<OrchestrationV2ThreadProjection, "thread">;
     readonly sourceRun: OrchestrationV2Run;
     readonly sourceProviderThread: OrchestrationV2ProviderThread | undefined;
+    readonly sourceTokenUsage?: OrchestrationV2ProviderTurnTokenUsage | undefined;
     readonly canonicalSourcePoint: OrchestrationV2ContextSourcePoint;
     readonly transferId: ContextTransferId;
     readonly targetThreadId: ThreadId;
@@ -119,6 +121,12 @@ export const layer: Layer.Layer<ThreadForkServiceV2> = Layer.succeed(
         sourcePoint: input.canonicalSourcePoint,
         basePoint: null,
         sourceProviderInstanceId: input.sourceRun.providerInstanceId,
+        // Only native forks retain this context; portable handoffs rebuild it.
+        sourceTokenUsage:
+          (input.sourceRun.status === "completed" || input.sourceRun.status === "waiting") &&
+          input.sourceProviderThread?.nativeThreadRef?.strength === "strong"
+            ? input.sourceTokenUsage
+            : undefined,
         targetProviderInstanceId: null,
         targetRunId: null,
         status: "pending",
diff --git a/apps/server/src/orchestration-v2/testkit/ThreadFork.integration.test.ts b/apps/server/src/orchestration-v2/testkit/ThreadFork.integration.test.ts
index 96ba1fe2c172..3f1c1af63681 100644
--- a/apps/server/src/orchestration-v2/testkit/ThreadFork.integration.test.ts
+++ b/apps/server/src/orchestration-v2/testkit/ThreadFork.integration.test.ts
@@ -284,6 +284,8 @@ describe("orchestration V2 thread fork", () => {
         assert.lengthOf(transfers, 1);
         assert.equal(transfers[0]?.status, "consumed");
         assert.equal(transfers[0]?.resolution?.strategy, "native_fork");
+        assert.isUndefined(sourceProjection.providerTurns[0]?.tokenUsage);
+        assert.isUndefined(transfers[0]?.sourceTokenUsage);
         assert.equal(transfers[0]?.targetRunId, targetProjection.runs[0]?.id);
 
         const transferCreatedIndex = result.domainEvents.findIndex(
@@ -452,6 +454,9 @@ describe("orchestration V2 thread fork", () => {
         assert.lengthOf(transfers, 1);
         assert.equal(transfers[0]?.status, "consumed");
         assert.equal(transfers[0]?.resolution?.strategy, "native_fork");
+        const sourceUsage = sourceProjection.providerTurns[0]?.tokenUsage;
+        assert.isDefined(sourceUsage);
+        assert.deepEqual(transfers[0]?.sourceTokenUsage, sourceUsage);
       }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
 
@@ -780,6 +785,11 @@ describe("orchestration V2 thread fork", () => {
         "forking from the first source run must not preserve later source turns in native Claude context",
       );
       assert.equal(targetProjection.contextTransfers[0]?.resolution?.strategy, "native_fork");
+      const sourceProjection = result.projections.get(materialized.sourceThreadId);
+      const sourceUsage = sourceProjection?.providerTurns[0]?.tokenUsage;
+      assert.isDefined(sourceUsage);
+      assert.notDeepEqual(sourceUsage, sourceProjection?.providerTurns[1]?.tokenUsage);
+      assert.deepEqual(targetProjection.contextTransfers[0]?.sourceTokenUsage, sourceUsage);
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
 
diff --git a/apps/server/src/persistence/DatabaseStorage.test.ts b/apps/server/src/persistence/DatabaseStorage.test.ts
index 7196f18f40ed..23dda5aabc57 100644
--- a/apps/server/src/persistence/DatabaseStorage.test.ts
+++ b/apps/server/src/persistence/DatabaseStorage.test.ts
@@ -1,10 +1,13 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
+import * as Clock from "effect/Clock";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
+import * as Queue from "effect/Queue";
 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import * as SqlClient from "effect/sql/SqlClient";
@@ -108,3 +111,106 @@ it.effect("publishes nothing when doctor would repair a different database", ()
     ),
   ),
 );
+
+const compactionLayer = (
+  compactEventStore: ProjectionMaintenance.ProjectionMaintenanceV2["Service"]["compactEventStore"],
+) =>
+  DatabaseStorage.layer.pipe(
+    Layer.provide(
+      Layer.succeed(ProjectionMaintenance.ProjectionMaintenanceV2, {
+        compactEventStore,
+        verify: Effect.die("unexpected verification"),
+        rebuild: Effect.die("unexpected rebuild"),
+      }),
+    ),
+    Layer.provide(Sqlite.layerMemory),
+  );
+
+const minute = 60_000;
+const hour = 60 * minute;
+const startupTime = Date.UTC(2026, 9, 19);
+const emptyCompaction = { deletedEventCount: 0, deletedReceiptCount: 0, reclaimableBytes: 0 };
+
+it.effect.each([
+  { name: "recent success", saved: String(startupTime - 2 * hour), delay: 4 * hour },
+  { name: "overdue success", saved: String(startupTime - 7 * hour), delay: minute },
+  { name: "nearly due success", saved: String(startupTime - 6 * hour + 1), delay: minute },
+  { name: "future timestamp", saved: String(startupTime + hour), delay: 6 * hour },
+  { name: "missing timestamp", saved: undefined, delay: minute },
+  { name: "invalid timestamp", saved: "not a timestamp", delay: minute },
+  { name: "unreadable timestamp", saved: undefined, delay: minute },
+])("schedules startup compaction after $name", ({ name, saved, delay }) =>
+  Effect.gen(function* () {
+    yield* TestClock.setTime(startupTime);
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const config = yield* ServerConfig.ServerConfig;
+    const timestampPath = path.join(path.dirname(config.dbPath), "compacted-at");
+    if (name === "unreadable timestamp") yield* fs.makeDirectory(timestampPath);
+    else if (saved !== undefined) yield* fs.writeFileString(timestampPath, saved);
+    const started = yield* Deferred.make<number>();
+    const compact = Clock.currentTimeMillis.pipe(
+      Effect.flatMap((now) => Deferred.succeed(started, now)),
+      Effect.as(emptyCompaction),
+    );
+    yield* Effect.gen(function* () {
+      yield* TestClock.adjust(delay - 1);
+      assert.isFalse(yield* Deferred.isDone(started));
+      yield* TestClock.adjust(1);
+      assert.equal(yield* Deferred.await(started), startupTime + delay);
+    }).pipe(Effect.provide(compactionLayer(compact)));
+  }).pipe(Effect.provide(testConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
+);
+
+it.effect.each(["success", "compaction failure", "timestamp write failure"] as const)(
+  "keeps the six-hour cadence after %s and remembers only successful completion",
+  (outcome) =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(startupTime);
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const config = yield* ServerConfig.ServerConfig;
+      const timestampPath = path.join(path.dirname(config.dbPath), "compacted-at");
+      const previous = String(startupTime - 7 * hour);
+      if (outcome === "timestamp write failure") yield* fs.makeDirectory(timestampPath);
+      else yield* fs.writeFileString(timestampPath, previous);
+      const starts = yield* Queue.unbounded<number>();
+      const finish = yield* Queue.unbounded<void>();
+      const writeFinished = yield* Deferred.make<void>();
+      const compact = Effect.gen(function* () {
+        yield* Queue.offer(starts, yield* Clock.currentTimeMillis);
+        yield* Queue.take(finish);
+        if (outcome === "compaction failure") {
+          return yield* new ProjectionMaintenance.ProjectionMaintenanceError({ operation: "test" });
+        }
+        return emptyCompaction;
+      });
+      yield* Effect.gen(function* () {
+        yield* TestClock.adjust(minute);
+        assert.equal(yield* Queue.take(starts), startupTime + minute);
+        yield* TestClock.adjust(2 * minute);
+        if (outcome !== "timestamp write failure") {
+          assert.equal(yield* fs.readFileString(timestampPath), previous);
+        }
+        yield* Queue.offer(finish, undefined);
+        if (outcome !== "compaction failure") yield* Deferred.await(writeFinished);
+        yield* TestClock.adjust(6 * hour - 1);
+        assert.equal(yield* Queue.size(starts), 0);
+        yield* TestClock.adjust(1);
+        assert.equal(yield* Queue.take(starts), startupTime + 3 * minute + 6 * hour);
+      }).pipe(
+        Effect.provide(compactionLayer(compact)),
+        Effect.provideService(FileSystem.FileSystem, {
+          ...fs,
+          writeFileString: (file, content, options) =>
+            fs
+              .writeFileString(file, content, options)
+              .pipe(Effect.ensuring(Deferred.succeed(writeFinished, undefined))),
+        }),
+      );
+      if (outcome !== "timestamp write failure") {
+        const saved = Number(yield* fs.readFileString(timestampPath));
+        assert.equal(saved, outcome === "success" ? startupTime + 3 * minute : Number(previous));
+      }
+    }).pipe(Effect.provide(testConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
+);
diff --git a/apps/server/src/persistence/DatabaseStorage.ts b/apps/server/src/persistence/DatabaseStorage.ts
index 3866020c1c1c..2dfcd22c0c85 100644
--- a/apps/server/src/persistence/DatabaseStorage.ts
+++ b/apps/server/src/persistence/DatabaseStorage.ts
@@ -1,7 +1,10 @@
 import type { DatabaseStorageStatus } from "@t3tools/contracts";
+import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Equal from "effect/Equal";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
 import * as Schedule from "effect/Schedule";
@@ -16,6 +19,7 @@ import { forkParked } from "../serverActivation.ts";
 
 /** Pages returned per reclaim pass; one minute of churn, not a backlog. */
 const RECLAIM_PAGES_PER_PASS = 1024;
+const COMPACTION_INTERVAL = Duration.hours(6);
 
 export class DatabaseStorage extends Context.Service<
   DatabaseStorage,
@@ -37,6 +41,7 @@ const make = Effect.gen(function* () {
   const sql = yield* SqlClient.SqlClient;
   const maintenance = yield* ProjectionMaintenance.ProjectionMaintenanceV2;
   const config = yield* ServerConfig.ServerConfig;
+  const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const statusRef = yield* SubscriptionRef.make<DatabaseStorageStatus | null>(null);
 
@@ -89,21 +94,40 @@ const make = Effect.gen(function* () {
     Effect.catch((cause) => Effect.logWarning("Database space reclamation failed", { cause })),
   );
 
-  const compact = maintenance.compactEventStore.pipe(
-    Effect.tap((result) =>
-      result.deletedEventCount > 0 || result.deletedReceiptCount > 0
-        ? Effect.logInfo("Compacted orchestration history", result)
-        : Effect.void,
-    ),
+  // Even a pass that deletes nothing scans the event store. Persist completion
+  // so restarting does not trigger another scan before the six-hour interval.
+  const compactedAtPath = path.join(path.dirname(config.dbPath), "compacted-at");
+  const compact = Effect.gen(function* () {
+    const result = yield* maintenance.compactEventStore;
+    const completedAt = yield* Clock.currentTimeMillis;
+    yield* fs.writeFileString(compactedAtPath, String(completedAt)).pipe(Effect.ignore);
+    if (result.deletedEventCount > 0 || result.deletedReceiptCount > 0) {
+      yield* Effect.logInfo("Compacted orchestration history", result);
+    }
+  }).pipe(
     Effect.catch((cause) =>
       Effect.logWarning("Orchestration history compaction failed", { cause }),
     ),
   );
+  const lastCompactedAt = yield* fs.readFileString(compactedAtPath).pipe(
+    Effect.map(Number),
+    Effect.orElseSucceed(() => Number.NaN),
+  );
+  const intervalMs = Duration.toMillis(COMPACTION_INTERVAL);
+  const untilDueMs = Number.isFinite(lastCompactedAt)
+    ? lastCompactedAt + intervalMs - (yield* Clock.currentTimeMillis)
+    : 0;
+  const firstCompactionDelay = Duration.millis(
+    Math.min(intervalMs, Math.max(Duration.toMillis(Duration.minutes(1)), untilDueMs)),
+  );
 
   yield* forkParked(
-    Effect.sleep("1 minute").pipe(
+    Effect.sleep(firstCompactionDelay).pipe(
       Effect.andThen(
-        compact.pipe(Effect.andThen(publishStatus), Effect.repeat(Schedule.spaced("6 hours"))),
+        compact.pipe(
+          Effect.andThen(publishStatus),
+          Effect.repeat(Schedule.spaced(COMPACTION_INTERVAL)),
+        ),
       ),
     ),
   );
diff --git a/apps/server/src/persistence/Errors.test.ts b/apps/server/src/persistence/Errors.test.ts
index 2e8907d199bd..840210a5d4c0 100644
--- a/apps/server/src/persistence/Errors.test.ts
+++ b/apps/server/src/persistence/Errors.test.ts
@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import * as SqlClient from "effect/sql/SqlClient";
 
-import { PersistenceDecodeError, PersistenceSqlError, toPersistenceSqlError } from "./Errors.ts";
+import { PersistenceDecodeError, toPersistenceSqlError } from "./Errors.ts";
 
 const decodeRuntimePayload = Schema.decodeUnknownEffect(
   Schema.Struct({
@@ -14,19 +14,6 @@ const decodeRuntimePayload = Schema.decodeUnknownEffect(
   }),
 );
 
-it("keeps SQL operation context without a tautological detail", () => {
-  const cause = new Error("database unavailable");
-  const error = new PersistenceSqlError({
-    operation: "AuthSessionRepository.list:query",
-    cause,
-  });
-
-  assert.equal(error.operation, "AuthSessionRepository.list:query");
-  assert.equal(error.detail, undefined);
-  assert.equal(error.cause, cause);
-  assert.equal(error.message, "SQL error in AuthSessionRepository.list:query");
-});
-
 it.effect("names a real SQLite condition without copying query data", () =>
   Effect.gen(function* () {
     const sql = yield* SqlClient.SqlClient;
diff --git a/apps/server/src/preview/Manager.test.ts b/apps/server/src/preview/Manager.test.ts
index 50946b7d0559..a3bac1941ec0 100644
--- a/apps/server/src/preview/Manager.test.ts
+++ b/apps/server/src/preview/Manager.test.ts
@@ -6,6 +6,7 @@ import { PreviewUrlNormalizationError } from "@t3tools/shared/preview";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as PubSub from "effect/PubSub";
+import * as TestClock from "effect/testing/TestClock";
 import { expect } from "vite-plus/test";
 
 import * as ServerConfig from "../config.ts";
@@ -459,12 +460,12 @@ it.layer(layer)("PreviewManager", (it) => {
       const threadId = freshThreadId();
       const manager = yield* PreviewManager.PreviewManager;
       const first = yield* manager.open({ threadId, url: "http://localhost:5173" });
+      yield* TestClock.adjust("1 second");
       const second = yield* manager.open({ threadId, url: "http://localhost:3000" });
+      yield* TestClock.adjust("1 second");
+      yield* manager.navigate({ threadId, tabId: first.tabId, url: "http://localhost:5173/next" });
       const result = yield* manager.list({ threadId });
-      expect(result.sessions).toHaveLength(2);
-      const ids = result.sessions.map((s) => s.tabId);
-      expect(ids).toContain(first.tabId);
-      expect(ids).toContain(second.tabId);
+      expect(result.sessions.map((s) => s.tabId)).toEqual([second.tabId, first.tabId]);
     }),
   );
 
diff --git a/apps/server/src/project/AgentSessionScanner.test.ts b/apps/server/src/project/AgentSessionScanner.test.ts
index 29093265d153..956157751961 100644
--- a/apps/server/src/project/AgentSessionScanner.test.ts
+++ b/apps/server/src/project/AgentSessionScanner.test.ts
@@ -2,6 +2,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NodeOS from "node:os";
 import { describe, expect, it } from "@effect/vitest";
 import {
+  AgentSessionImportSource,
   type OrchestrationProjectShell,
   ProjectId,
   ProviderDriverKind,
@@ -9,6 +10,7 @@ import {
   type ServerSettings as ContractServerSettings,
 } from "@t3tools/contracts";
 import { symlinksSupported } from "@t3tools/shared/testing/symlinks";
+import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
@@ -121,6 +123,8 @@ const claudeSessionLine = (cwd: string) =>
 const codexRolloutLine = (cwd: string) =>
   `${JSON.stringify({ timestamp: "2026-01-01T00:00:00.000Z", type: "session_meta", payload: { id: "r1", cwd } })}\n`;
 
+const decodeImportSource = Schema.decodeUnknownSync(AgentSessionImportSource);
+
 const encodeTranscriptRecord = Schema.encodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
 
 function makeRecordLimitTranscript(cwd: string, overflow: boolean): string {
@@ -148,6 +152,87 @@ function makeRecordLimitTranscript(cwd: string, overflow: boolean): string {
     : records;
 }
 
+const makeFileIdentityFixture = Effect.fn("AgentSessionScanner.test.makeFileIdentityFixture")(
+  function* (originalInode = 10_000_000_000_000_001n, replacementInode = 10_000_000_000_000_000n) {
+    const path = yield* Path.Path;
+    const fileSystem = yield* FileSystem.FileSystem;
+    const nowMs = Date.parse("2026-08-24T12:00:00.000Z");
+    yield* TestClock.setTime(nowMs);
+    const claudeHomePath = yield* makeTempDir("t3code-large-id-claude-");
+    const codexHomePath = yield* makeTempDir("t3code-large-id-codex-");
+    const workspace = yield* makeTempDir("t3code-large-id-workspace-");
+    const filePath = path.join(
+      codexHomePath,
+      "sessions",
+      "2026",
+      "08",
+      "24",
+      "rollout-identity.jsonl",
+    );
+    const replacementPath = `${filePath}.replacement`;
+    const savedPath = `${filePath}.saved`;
+    for (const [target, sessionId] of [
+      [filePath, "original-session"],
+      [replacementPath, "replaced-session"],
+    ] as const) {
+      yield* writeTranscript({
+        filePath: target,
+        contents: [
+          encodeTranscriptRecord({
+            type: "session_meta",
+            payload: { id: sessionId, cwd: workspace },
+          }),
+          encodeTranscriptRecord({
+            type: "event_msg",
+            payload: { type: "user_message", message: "Imported prompt" },
+          }),
+        ].join("\n"),
+        mtimeMs: nowMs,
+      });
+    }
+
+    // Adjacent NTFS IDs round to the same number; birthtimes can also collide.
+    const birthtime = Option.some(DateTime.toDateUtc(DateTime.makeUnsafe(nowMs)));
+    const ids = new Map<bigint, bigint>();
+    const effectIdentity = (target: string, info: FileSystem.File.Info) => {
+      if (target !== filePath) return info;
+      const realInode = Option.getOrThrow(info.ino);
+      const inode = ids.get(realInode) ?? (ids.size === 0 ? originalInode : replacementInode);
+      ids.set(realInode, inode);
+      return { ...info, ino: Option.some(inode), birthtime };
+    };
+    let opens = 0;
+    const simulatedFileSystem = FileSystem.FileSystem.of({
+      ...fileSystem,
+      stat: (target) =>
+        fileSystem.stat(target).pipe(Effect.map((info) => effectIdentity(target, info))),
+      open: (target, options) => {
+        if (target === filePath) opens += 1;
+        return fileSystem.open(target, options).pipe(
+          Effect.map((file) => ({
+            ...file,
+            stat: file.stat.pipe(Effect.map((info) => effectIdentity(target, info))),
+            readAlloc: (size: number) => file.readAlloc(size),
+          })),
+        );
+      },
+    });
+    const scanner = yield* AgentSessionScanner.AgentSessionScanner.pipe(
+      Effect.provide(layerScannerTest({ claudeHomePath, codexHomePath })),
+      Effect.provideService(FileSystem.FileSystem, simulatedFileSystem),
+    );
+    return {
+      scanner,
+      workspace,
+      opens: () => opens,
+      replace: Effect.gen(function* () {
+        yield* fileSystem.rename(filePath, savedPath);
+        yield* fileSystem.rename(replacementPath, filePath);
+      }).pipe(Effect.orDie),
+    };
+  },
+);
+
 it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
   describe("scan", () => {
     it.effect("reads Claude project cwds from transcripts, newest first", () =>
@@ -1905,70 +1990,84 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
 
     it.effect("checks file identity and provider before skipping completed history", () =>
       Effect.gen(function* () {
-        const path = yield* Path.Path;
-        const fileSystem = yield* FileSystem.FileSystem;
-        const nowMs = Date.parse("2026-08-24T12:00:00.000Z");
-        yield* TestClock.setTime(nowMs);
-        const claudeHomePath = yield* makeTempDir("t3code-completed-claude-");
-        const codexHomePath = yield* makeTempDir("t3code-completed-codex-");
-        const workspace = yield* makeTempDir("t3code-completed-workspace-");
-        const filePath = path.join(
-          codexHomePath,
-          "sessions",
-          "2026",
-          "08",
-          "24",
-          "rollout-replaced.jsonl",
-        );
-        const contents = (sessionId: string) =>
-          [
-            encodeTranscriptRecord({
-              type: "session_meta",
-              payload: { id: sessionId, cwd: workspace },
-            }),
-            encodeTranscriptRecord({
-              type: "event_msg",
-              payload: { type: "user_message", message: "Imported prompt" },
-            }),
-          ].join("\n");
-        yield* writeTranscript({
-          filePath,
-          contents: contents("original-session"),
-          mtimeMs: nowMs,
+        const fixture = yield* makeFileIdentityFixture(42n, 43n);
+        const { scanner, workspace } = fixture;
+        const initial = yield* scanner.recentThreads(workspace).pipe(Stream.runCollect);
+        const imported = initial[0];
+        expect(imported?._tag).toBe("Importable");
+        if (imported?._tag !== "Importable") return;
+        const legacy = decodeImportSource({ ...imported.source, inode: 42 });
+        const opensBeforeCompleted = fixture.opens();
+        const completed = yield* scanner.recentThreads(workspace, [legacy]).pipe(Stream.runCollect);
+        expect(completed[0]?._tag).toBe("AlreadyImported");
+        expect(fixture.opens()).toBe(opensBeforeCompleted);
+        const wrongProvider = yield* scanner
+          .recentThreads(workspace, [{ ...imported.source, provider: "claudeAgent" }])
+          .pipe(Stream.runCollect);
+        expect(wrongProvider[0]?._tag).toBe("Importable");
+
+        yield* fixture.replace;
+        const replaced = yield* scanner
+          .recentThreads(workspace, [imported.source])
+          .pipe(Stream.runCollect);
+        expect(replaced[0]).toMatchObject({
+          _tag: "Importable",
+          thread: { providerSessionId: "replaced-session" },
+          source: { size: imported.source.size, mtimeMs: imported.source.mtimeMs },
         });
+      }),
+    );
 
-        yield* Effect.gen(function* () {
-          const scanner = yield* AgentSessionScanner.AgentSessionScanner;
+    it.effect(
+      "imports same-metadata replacements with exact large file IDs and backfills legacy IDs once",
+      () =>
+        Effect.gen(function* () {
+          const fixture = yield* makeFileIdentityFixture();
+          const { scanner, workspace } = fixture;
           const initial = yield* scanner.recentThreads(workspace).pipe(Stream.runCollect);
           const imported = initial[0];
           expect(imported?._tag).toBe("Importable");
           if (imported?._tag !== "Importable") return;
-          const completed = yield* scanner
-            .recentThreads(workspace, [imported.source])
-            .pipe(Stream.runCollect);
-          expect(completed[0]?._tag).toBe("AlreadyImported");
-          const wrongProvider = yield* scanner
-            .recentThreads(workspace, [{ ...imported.source, provider: "claudeAgent" }])
-            .pipe(Stream.runCollect);
-          expect(wrongProvider[0]?._tag).toBe("Importable");
 
-          yield* fileSystem.open(filePath);
-          yield* fileSystem.remove(filePath);
-          yield* writeTranscript({
-            filePath,
-            contents: contents("replaced-session"),
-            mtimeMs: nowMs,
-          });
+          yield* fixture.replace;
           const replaced = yield* scanner
             .recentThreads(workspace, [imported.source])
             .pipe(Stream.runCollect);
           expect(replaced[0]).toMatchObject({
             _tag: "Importable",
             thread: { providerSessionId: "replaced-session" },
-            source: { size: imported.source.size, mtimeMs: imported.source.mtimeMs },
+            source: {
+              ...imported.source,
+              providerSessionId: "replaced-session",
+              inode: "10000000000000000",
+            },
           });
-        }).pipe(Effect.provide(layerScannerTest({ claudeHomePath, codexHomePath })));
-      }),
+          expect(imported.source.inode).toBe("10000000000000001");
+          if (replaced[0]?._tag !== "Importable") return;
+
+          const roundedInode = Number(imported.source.inode);
+          expect(Number.isSafeInteger(roundedInode)).toBe(false);
+          expect(String(roundedInode)).toBe(replaced[0].source.inode);
+          for (const inode of [null, roundedInode]) {
+            const legacy = decodeImportSource({ ...imported.source, inode });
+            const opensBeforeBackfill = fixture.opens();
+            const backfilled = yield* scanner
+              .recentThreads(workspace, [legacy])
+              .pipe(Stream.runCollect);
+            expect(backfilled[0]).toMatchObject({
+              _tag: "Importable",
+              thread: { providerSessionId: "replaced-session" },
+              source: replaced[0].source,
+            });
+            expect(fixture.opens()).toBe(opensBeforeBackfill + 1);
+            if (backfilled[0]?._tag !== "Importable") return;
+            const completed = yield* scanner
+              .recentThreads(workspace, [backfilled[0].source])
+              .pipe(Stream.runCollect);
+            expect(completed[0]?._tag).toBe("AlreadyImported");
+            expect(fixture.opens()).toBe(opensBeforeBackfill + 1);
+          }
+        }),
     );
 
     it.effect("imports visible history from a transcript with an oversized tool record", () =>
diff --git a/apps/server/src/project/AgentSessionScanner.ts b/apps/server/src/project/AgentSessionScanner.ts
index 79f4b890bd20..d2fdd3fb33f8 100644
--- a/apps/server/src/project/AgentSessionScanner.ts
+++ b/apps/server/src/project/AgentSessionScanner.ts
@@ -567,7 +567,7 @@ function transcriptIdentity(filePath: string, stats: FileSystem.File.Info) {
     size: Number(stats.size),
     mtimeMs: Option.match(stats.mtime, { onNone: () => null, onSome: (date) => date.getTime() }),
     device: Number(stats.dev),
-    inode: Option.match(stats.ino, { onNone: () => null, onSome: Number }),
+    inode: Option.match(stats.ino, { onNone: () => null, onSome: String }),
     birthtimeMs: Option.match(stats.birthtime, {
       onNone: () => null,
       onSome: (date) => date.getTime(),
@@ -580,13 +580,22 @@ type TranscriptIdentity = Pick<
   "filePath" | "size" | "mtimeMs" | "device" | "inode" | "birthtimeMs"
 >;
 
+const fileIdKey = (inode: TranscriptIdentity["inode"]) => (inode === null ? null : String(inode));
+
 function sameTranscriptIdentity(left: TranscriptIdentity, right: TranscriptIdentity): boolean {
+  // Unsafe legacy numbers may already have lost file ID precision.
+  if (
+    (typeof left.inode === "number" && !Number.isSafeInteger(left.inode)) ||
+    (typeof right.inode === "number" && !Number.isSafeInteger(right.inode))
+  ) {
+    return false;
+  }
   return (
     left.filePath === right.filePath &&
     left.size === right.size &&
     left.mtimeMs === right.mtimeMs &&
     left.device === right.device &&
-    left.inode === right.inode &&
+    fileIdKey(left.inode) === fileIdKey(right.inode) &&
     left.birthtimeMs === right.birthtimeMs
   );
 }
diff --git a/apps/server/src/provider/AcpRegistryProbe.test.ts b/apps/server/src/provider/AcpRegistryProbe.test.ts
index 7b69ca58baaa..6c8cb5aebf83 100644
--- a/apps/server/src/provider/AcpRegistryProbe.test.ts
+++ b/apps/server/src/provider/AcpRegistryProbe.test.ts
@@ -292,32 +292,42 @@ describe("ACP Registry probe", () => {
     ]);
   });
 
-  it("omits a current model that falls outside the bounded model catalog", () => {
-    const result = acpRegistryProbeResult(instanceId, {
-      sessionId: "probe-session",
-      initializeResult: { protocolVersion: 1 },
-      sessionSetupResult: {
+  it.each(["config option", "session model state"] as const)(
+    "retains the current model beyond the catalog cap from %s",
+    (source) => {
+      const models = Array.from({ length: 257 }, (_, index) => ({
+        modelId: `model-${index}`,
+        name: `Model ${index}`,
+      }));
+      const result = acpRegistryProbeResult(instanceId, {
         sessionId: "probe-session",
-        configOptions: [
-          {
-            id: "model",
-            name: "Model",
-            category: "model",
-            type: "select",
-            currentValue: "model-256",
-            options: Array.from({ length: 257 }, (_, index) => ({
-              value: `model-${index}`,
-              name: `Model ${index}`,
-            })),
-          },
-        ],
-      },
-      modelConfigId: "model",
-    } satisfies AcpSessionRuntime.AcpSessionRuntimeStartResult);
-
-    expect(result.models).toHaveLength(256);
-    expect(result.currentModelId).toBeNull();
-  });
+        initializeResult: { protocolVersion: 1 },
+        sessionSetupResult: {
+          sessionId: "probe-session",
+          ...(source === "config option"
+            ? {
+                configOptions: [
+                  {
+                    id: "model",
+                    name: "Model",
+                    category: "model",
+                    type: "select",
+                    currentValue: "model-256",
+                    options: models.map(({ modelId, name }) => ({ value: modelId, name })),
+                  },
+                ],
+              }
+            : { models: { currentModelId: "model-256", availableModels: models } }),
+        },
+        modelConfigId: source === "config option" ? "model" : undefined,
+      } satisfies AcpSessionRuntime.AcpSessionRuntimeStartResult);
+
+      expect(result.models).toHaveLength(256);
+      expect(result.models[0]?.id).toBe("model-0");
+      expect(result.models.at(-1)?.id).toBe("model-256");
+      expect(result.currentModelId).toBe("model-256");
+    },
+  );
 
   it("bounds and de-duplicates advertised commands", () => {
     const commands = normalizeAcpRegistryCommands([
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 56117435db01..f5b2f29990c8 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -1151,8 +1151,13 @@ export default function ChatView(props: ChatViewProps) {
     status: threadStatus,
   });
   const threadDetailLoading = threadSyncPhase === "loading";
+  const activeProviderThread = serverProjection?.providerThreads.find(
+    (thread) => thread.id === serverProjection.thread.activeProviderThreadId,
+  );
   const activeThreadLiveTokenUsage = latestProviderTurnTokenUsage(
     serverProjection?.providerTurns ?? [],
+    serverProjection,
+    activeProviderThread,
   );
   const serverVisibleTurnItems = useThreadVisibleTurnItems(routeThreadDetailRef);
   const serverThreadHistory = useThreadHistory(routeThreadDetailRef);
@@ -2532,9 +2537,7 @@ export default function ChatView(props: ChatViewProps) {
   const activeContextWindow = deriveLatestContextWindowSnapshot(
     serverVisibleTurnItems ?? [],
     activeThreadLiveTokenUsage,
-    serverProjection?.providerThreads.find(
-      (thread) => thread.id === serverProjection.thread.activeProviderThreadId,
-    ),
+    activeProviderThread,
   );
   const pendingBackgroundTasks = (() => {
     if (serverProjection === null || serverProjection === undefined) {
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.ts
index de40918e4098..59d524e25403 100644
--- a/apps/web/src/components/Sidebar.logic.test.ts
+++ b/apps/web/src/components/Sidebar.logic.test.ts
@@ -38,7 +38,6 @@ import {
   resolveSidebarThreadStatus,
   resolveSidebarV2TopStatus,
   resolveThreadLastVisitedAt,
-  resolveThreadRowClassName,
   resolveThreadStatusPill,
   resolveWorkingStartedAt,
   pullRequestMatchesSearchQuery,
@@ -54,7 +53,6 @@ import {
   sortProjectsForSidebar,
   sortScopedProjectsForSidebar,
   sortSidebarV2ProjectGroups,
-  shouldCreateNewThreadInCurrentProject,
   shouldNavigateAfterThreadPark,
   THREAD_JUMP_HINT_SHOW_DELAY_MS,
   type SidebarListItem,
@@ -63,7 +61,6 @@ import {
   resolveSidebarDropVerb,
 } from "./Sidebar.logic";
 import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
-import { sortSettledThreads } from "@t3tools/client-runtime/state/thread-sort";
 import { EnvironmentId, ProjectId, ProviderInstanceId, RunId, ThreadId } from "@t3tools/contracts";
 
 import {
@@ -1790,43 +1787,6 @@ describe("sortProjectsForSidebar", () => {
     ]);
   });
 
-  it("ignores archived threads when sorting projects", () => {
-    const sorted = sortProjectsForSidebar(
-      [
-        makeProject({
-          id: ProjectId.make("project-1"),
-          title: "Visible project",
-          updatedAt: "2026-03-09T10:01:00.000Z",
-        }),
-        makeProject({
-          id: ProjectId.make("project-2"),
-          title: "Archived-only project",
-          updatedAt: "2026-03-09T10:00:00.000Z",
-        }),
-      ],
-      [
-        makeThread({
-          id: ThreadId.make("thread-visible"),
-          projectId: ProjectId.make("project-1"),
-          updatedAt: "2026-03-09T10:02:00.000Z",
-          archivedAt: null,
-        }),
-        makeThread({
-          id: ThreadId.make("thread-archived"),
-          projectId: ProjectId.make("project-2"),
-          updatedAt: "2026-03-09T10:10:00.000Z",
-          archivedAt: "2026-03-09T10:11:00.000Z",
-        }),
-      ].filter((thread) => thread.archivedAt === null),
-      "updated_at",
-    );
-
-    expect(sorted.map((project) => project.id)).toEqual([
-      ProjectId.make("project-1"),
-      ProjectId.make("project-2"),
-    ]);
-  });
-
   it.each(["updated_at", "created_at"] as const)(
     "matches the per-comparison %s order on a shuffled list with ties",
     (sortOrder) => {
diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.ts
index d0bd3b95838a..6e80cfcd730e 100644
--- a/apps/web/src/components/Sidebar.logic.ts
+++ b/apps/web/src/components/Sidebar.logic.ts
@@ -23,7 +23,7 @@ import {
   type ThreadSortInput,
 } from "../lib/threadSort";
 import type { SidebarThreadSummary, Thread } from "../types";
-import { cn, normalizeSearchText } from "../lib/utils";
+import { normalizeSearchText } from "../lib/utils";
 import { isLatestRunSettled } from "../session-logic";
 import { resolveServerBackedAppStageLabel } from "../branding.logic";
 
@@ -876,40 +876,6 @@ export function isContextMenuPointerDown(input: {
   return input.isMac && input.button === 0 && input.ctrlKey;
 }
 
-export function resolveThreadRowClassName(input: {
-  isActive: boolean;
-  isSelected: boolean;
-}): string {
-  const baseClassName =
-    "h-8 w-full translate-x-0 cursor-pointer justify-start rounded-md px-2 text-left text-sm select-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring";
-
-  if (input.isSelected && input.isActive) {
-    return cn(
-      baseClassName,
-      "bg-sidebar-row-active text-sidebar-foreground font-medium hover:bg-sidebar-row-active hover:text-sidebar-foreground",
-    );
-  }
-
-  if (input.isSelected) {
-    return cn(
-      baseClassName,
-      "bg-sidebar-row-selected text-sidebar-foreground hover:bg-sidebar-row-active hover:text-sidebar-foreground",
-    );
-  }
-
-  if (input.isActive) {
-    return cn(
-      baseClassName,
-      "bg-sidebar-row-active text-sidebar-foreground font-medium hover:bg-sidebar-row-active hover:text-sidebar-foreground",
-    );
-  }
-
-  return cn(
-    baseClassName,
-    "text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground",
-  );
-}
-
 export type SidebarThreadStatus =
   | "approval"
   | "input"
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index 65656ba4f2a0..f87ddab1371f 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -63,6 +63,7 @@ import {
 } from "@t3tools/client-runtime/text-paste";
 import { serializeComposerFileLink } from "@t3tools/shared/composerTrigger";
 import { folderDropTarget, resolveDroppedFolderPath } from "./folderDrop";
+import { splitTransferredFiles } from "./workspaceFileDrop";
 import { createModelSelection, normalizeModelSlug } from "@t3tools/shared/model";
 import { USAGE_LIMITS_COMMAND } from "@t3tools/shared/usageLimits";
 import {
@@ -5711,32 +5712,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     return true;
   };
 
-  const onComposerPaste = (event: React.ClipboardEvent<HTMLElement>) => {
-    const files = Array.from(event.clipboardData.files);
-    const plainText = event.clipboardData.getData("text/plain");
-    const bypassAutoAttachment = consumePasteAsTextShortcut(pasteAsTextShortcutUntilRef);
-    if (
-      files.length > 0 &&
-      activeThreadId &&
-      shouldHandleComposerAttachmentPaste({ files, plainText })
-    ) {
-      event.preventDefault();
-      event.stopPropagation();
-      void addComposerAttachments(files, { skipImageInlineChip: bypassAutoAttachment });
-      return;
-    }
-
-    if ((readPastedComposerContext(event.clipboardData)?.records.length ?? 0) > 0) return;
-    if (!foldPastedText(plainText, bypassAutoAttachment)) {
-      return;
-    }
-
-    event.preventDefault();
-    event.stopPropagation();
-  };
-  // The editor is memoized; fresh closures here re-render it on every parent
-  // render, which during a stream is every delta.
-  const onComposerPasteStable = useStableCallback(onComposerPaste);
   const onComposerCommandKeyStable = useStableCallback(onComposerCommandKey);
   const isPathQueryActiveStable = useStableCallback(
     () => resolveActiveComposerTrigger().trigger?.kind === "path",
@@ -5755,7 +5730,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       text.length === 0 ||
       isConnecting ||
       isComposerApprovalState ||
-      pendingUserInputs.length > 0 ||
+      activePendingIsResponding ||
+      (pendingUserInputs.length > 0 && !activePendingProgress?.activeQuestion) ||
       projectSelectionRequired ||
       (options?.citationCommentAnchor && !composerEditorRef.current)
     ) {
@@ -5801,6 +5777,75 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   };
   const insertComposerTextAtEndStable = useStableCallback(insertComposerTextAtEnd);
 
+  const addComposerFolders = (folders: File[]) => {
+    const target = folderDropTarget({
+      localEnvironmentDisabled: isLocalEnvironmentDisabled(),
+      environmentId,
+      primaryEnvironmentId,
+    });
+    if (target === "remote") {
+      toastManager.add({
+        type: "error",
+        title: "Folders can only be referenced in the local desktop environment",
+      });
+      return;
+    }
+    for (const folder of folders) {
+      const path = resolveDroppedFolderPath(folder, window.desktopBridge?.getPathForFile);
+      if (path === null) {
+        toastManager.add({
+          type: "error",
+          title: `Couldn't get the path of "${folder.name}"`,
+          description: "Type the folder path with @ instead.",
+        });
+        continue;
+      }
+      const inserted = insertComposerTextAtEndStable(`${serializeComposerFileLink(path)} `, {
+        ensureLeadingBoundary: true,
+      });
+      if (!inserted) {
+        toastManager.add({
+          type: "error",
+          title: "Unable to add folder",
+          description: "The composer is busy; try again once it is ready.",
+        });
+        break;
+      }
+    }
+    focusComposer();
+  };
+  const addComposerFoldersStable = useStableCallback(addComposerFolders);
+
+  const onComposerPaste = (event: React.ClipboardEvent<HTMLElement>) => {
+    const { files, folders } = splitTransferredFiles(event.clipboardData);
+    const plainText = event.clipboardData.getData("text/plain");
+    const bypassAutoAttachment = consumePasteAsTextShortcut(pasteAsTextShortcutUntilRef);
+    if (
+      folders.length > 0 ||
+      (activeThreadId &&
+        files.length > 0 &&
+        shouldHandleComposerAttachmentPaste({ files, plainText }))
+    ) {
+      event.preventDefault();
+      event.stopPropagation();
+      if (folders.length > 0) addComposerFoldersStable(folders);
+      if (files.length > 0) {
+        void addComposerAttachments(files, { skipImageInlineChip: bypassAutoAttachment });
+      }
+      return;
+    }
+
+    if ((readPastedComposerContext(event.clipboardData)?.records.length ?? 0) > 0) return;
+    if (!foldPastedText(plainText, bypassAutoAttachment)) {
+      return;
+    }
+
+    event.preventDefault();
+    event.stopPropagation();
+  };
+  // The editor is memoized; fresh closures here re-render it on every parent
+  // render, which during a stream is every delta.
+  const onComposerPasteStable = useStableCallback(onComposerPaste);
   const insertContextReferencesAtCaret = (
     references: ReadonlyArray<ComposerContextReference>,
   ): boolean =>
@@ -6073,35 +6118,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
           if (!inserted) focusComposer();
         });
       },
-      addDroppedFolders: (folders: File[]) => {
-        const target = folderDropTarget({
-          localEnvironmentDisabled: isLocalEnvironmentDisabled(),
-          environmentId,
-          primaryEnvironmentId,
-        });
-        if (target === "remote") {
-          toastManager.add({
-            type: "error",
-            title: "Folders can't be dropped into remote environments",
-          });
-          return;
-        }
-        for (const folder of folders) {
-          const path = resolveDroppedFolderPath(folder, window.desktopBridge?.getPathForFile);
-          if (path === null) {
-            toastManager.add({
-              type: "error",
-              title: `Couldn't get the path of "${folder.name}"`,
-              description: "Type the folder path with @ instead.",
-            });
-            continue;
-          }
-          insertComposerTextAtEndStable(`${serializeComposerFileLink(path)} `, {
-            ensureLeadingBoundary: true,
-          });
-        }
-        focusComposer();
-      },
+      addDroppedFolders: addComposerFoldersStable,
       hasPendingAttachments: () =>
         (pendingImageCompressionsRef.current.get(attachmentTargetKey) ?? 0) > 0 ||
         pendingDraftWork.has(attachmentTargetKey),
@@ -6303,6 +6320,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     [
       activeThread,
       addComposerAttachments,
+      addComposerFoldersStable,
       foldPastedText,
       composerDraftTarget,
       composerModelOptions,
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index c4d91be940cf..03d74039945e 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -387,9 +387,12 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
           <span>{compactTokens}</span>
         </TooltipTrigger>
         <TooltipPopup>
-          {keepFullHistory
-            ? `Next send keeps all ${compactTokens} tokens. Click to compact first`
-            : `Next send compacts ${compactTokens} tokens first. Click to keep full history`}
+          <div>
+            {keepFullHistory
+              ? `Next send keeps all ${compactTokens} tokens.`
+              : `Next send compacts ${compactTokens} tokens first.`}
+          </div>
+          <div>{keepFullHistory ? "Click to compact first" : "Click to keep full history"}</div>
         </TooltipPopup>
       </Tooltip>
       {submit}
diff --git a/apps/web/src/components/chat/ThreadDetailsPrRow.browser.test.tsx b/apps/web/src/components/chat/ThreadDetailsPrRow.browser.test.tsx
index 47adb13580c6..10ad05b12e3c 100644
--- a/apps/web/src/components/chat/ThreadDetailsPrRow.browser.test.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsPrRow.browser.test.tsx
@@ -156,10 +156,15 @@ it("requires a new merge click after passing checks become pending and pass agai
 it.each<[PullRequestCheck["status"], PullRequestCheck["status"], string]>([
   ["success", "skipped", ""],
   ["failure", "cancelled", ""],
-  ["success", "action-required", ""],
+  ["success", "action-required", "1/2"],
   ["success", "pending", "1/2"],
+  ["pending", "pending", "0/2"],
+  ["pending", "action-required", "0/2"],
+  ["skipped", "pending", "1/2"],
+  ["neutral", "pending", "1/2"],
   ["failure", "pending", "1/2"],
-])("shows a count only while checks run (%s, %s)", (status, extraStatus, count) => {
+  ["cancelled", "pending", "1/2"],
+])("counts finished checks while work remains (%s, %s)", (status, extraStatus, count) => {
   state.status = status;
   state.extraStatus = extraStatus;
   act(() => {
diff --git a/apps/web/src/components/chat/pendingDraftWork.test.ts b/apps/web/src/components/chat/pendingDraftWork.test.ts
index 935556ab4596..2f5fe807999e 100644
--- a/apps/web/src/components/chat/pendingDraftWork.test.ts
+++ b/apps/web/src/components/chat/pendingDraftWork.test.ts
@@ -42,15 +42,6 @@ describe("PendingDraftWork", () => {
     expect(pending.has("isolated-a")).toBe(false);
   });
 
-  it("keeps a claim on the draft across a remount of the composer", async () => {
-    const { pendingDraftWork: first } = await import("./pendingDraftWork");
-    first.begin("remounted");
-    const { pendingDraftWork: second } = await import("./pendingDraftWork");
-    expect(second.has("remounted")).toBe(true);
-    second.end("remounted");
-    expect(first.has("remounted")).toBe(false);
-  });
-
   it("does not go negative when a transfer ends twice", () => {
     const pending = pendingDraftWork;
     pending.begin("double-end");
diff --git a/apps/web/src/components/chat/workspaceFileDrop.test.ts b/apps/web/src/components/chat/workspaceFileDrop.test.ts
index e7efc2864f25..6b25b4671f06 100644
--- a/apps/web/src/components/chat/workspaceFileDrop.test.ts
+++ b/apps/web/src/components/chat/workspaceFileDrop.test.ts
@@ -1,10 +1,62 @@
 import { describe, expect, it, vi } from "@effect/vitest";
 import {
   makeWorkspaceFileDropHandlers,
+  splitTransferredFiles,
   type WorkspaceFileDragEvent,
   type WorkspaceFileDropHost,
 } from "./workspaceFileDrop";
 
+describe("splitTransferredFiles", () => {
+  it("separates copied folders from files before attachment validation", () => {
+    const folder = new File([], "photos.png");
+    const emptyFile = new File([], "empty.txt");
+    const image = new File(["image"], "photo.png", { type: "image/png" });
+
+    expect(
+      splitTransferredFiles({
+        files: [folder, emptyFile, image],
+        items: [
+          {
+            kind: "string",
+            getAsFile: () => null,
+            webkitGetAsEntry: () => null,
+          },
+          {
+            kind: "file",
+            getAsFile: () => folder,
+            webkitGetAsEntry: () => ({ isDirectory: true }),
+          },
+          {
+            kind: "file",
+            getAsFile: () => emptyFile,
+            webkitGetAsEntry: () => ({ isDirectory: false }),
+          },
+          {
+            kind: "file",
+            getAsFile: () => image,
+            webkitGetAsEntry: () => null,
+          },
+        ],
+      }),
+    ).toEqual({ files: [emptyFile, image], folders: [folder] });
+  });
+
+  it("ignores clipboard file items that cannot provide a file", () => {
+    expect(
+      splitTransferredFiles({
+        files: [],
+        items: [
+          {
+            kind: "file",
+            getAsFile: () => null,
+            webkitGetAsEntry: () => ({ isDirectory: true }),
+          },
+        ],
+      }),
+    ).toEqual({ files: [], folders: [] });
+  });
+});
+
 function makeDragEvent(options?: {
   types?: string[];
   files?: File[];
@@ -70,13 +122,14 @@ describe("makeWorkspaceFileDropHandlers", () => {
 
   it("forwards dropped files and clears the active state", () => {
     const file = new File(["contents"], "example.txt", { type: "text/plain" });
-    const { host, setDragActive, addFiles } = makeHost();
+    const { host, setDragActive, addFiles, addFolders } = makeHost();
     const { event } = makeDragEvent({ files: [file] });
 
     makeWorkspaceFileDropHandlers(host).onDrop(event);
 
     expect(setDragActive).toHaveBeenCalledWith(false);
     expect(addFiles).toHaveBeenCalledWith([file]);
+    expect(addFolders).not.toHaveBeenCalled();
   });
 
   it("routes mixed drops to files and folders", () => {
@@ -120,15 +173,4 @@ describe("makeWorkspaceFileDropHandlers", () => {
     expect(addFiles).not.toHaveBeenCalled();
     expect(addFolders).toHaveBeenCalledWith([folder]);
   });
-
-  it("uses files when the browser does not expose drag items", () => {
-    const file = new File(["contents"], "example.txt", { type: "text/plain" });
-    const { host, addFiles, addFolders } = makeHost();
-    const { event } = makeDragEvent({ files: [file] });
-
-    makeWorkspaceFileDropHandlers(host).onDrop(event);
-
-    expect(addFiles).toHaveBeenCalledWith([file]);
-    expect(addFolders).not.toHaveBeenCalled();
-  });
 });
diff --git a/apps/web/src/components/chat/workspaceFileDrop.ts b/apps/web/src/components/chat/workspaceFileDrop.ts
index 9ac85419f178..7f7019dff4ca 100644
--- a/apps/web/src/components/chat/workspaceFileDrop.ts
+++ b/apps/web/src/components/chat/workspaceFileDrop.ts
@@ -30,7 +30,9 @@ function movedWithinDropTarget(event: WorkspaceFileDragEvent): boolean {
   return event.relatedTarget !== null && event.currentTarget.contains(event.relatedTarget as Node);
 }
 
-function splitDroppedItems(dataTransfer: WorkspaceFileDragEvent["dataTransfer"]): {
+export function splitTransferredFiles(
+  dataTransfer: Pick<WorkspaceFileDragEvent["dataTransfer"], "files" | "items">,
+): {
   files: File[];
   folders: File[];
 } {
@@ -76,7 +78,7 @@ export function makeWorkspaceFileDropHandlers(host: WorkspaceFileDropHost) {
       if (!isFileDrag(event)) return;
       event.preventDefault();
       host.setDragActive(false);
-      const { files, folders } = splitDroppedItems(event.dataTransfer);
+      const { files, folders } = splitTransferredFiles(event.dataTransfer);
       if (files.length > 0) host.addFiles(files);
       if (folders.length > 0) host.addFolders(folders);
     },
diff --git a/apps/web/src/components/clerk/clerkAppearance.test.ts b/apps/web/src/components/clerk/clerkAppearance.test.ts
index 18ecb7b23fe8..7ab07aff1371 100644
--- a/apps/web/src/components/clerk/clerkAppearance.test.ts
+++ b/apps/web/src/components/clerk/clerkAppearance.test.ts
@@ -51,34 +51,17 @@ const builtInThemeModes = [
 );
 
 describe("clerkAppearance", () => {
-  it("maps theme colors without overriding Clerk's component structure", () => {
-    expect(clerkAppearance).toEqual({
-      variables: {
-        colorPrimary: "var(--update-foreground)",
-        colorPrimaryForeground: "var(--card)",
-        colorDanger: "var(--error)",
-        colorSuccess: "var(--success)",
-        colorWarning: "var(--warning)",
-        colorNeutral: "var(--contrast-foreground)",
-        colorForeground: "var(--contrast-foreground)",
-        colorMuted: "color-mix(in srgb, var(--card) 98%, var(--contrast-foreground))",
-        colorMutedForeground: "var(--contrast-muted-foreground)",
-        colorBackground: "var(--card)",
-        colorInputForeground: "var(--contrast-foreground)",
-        colorInput: "var(--secondary)",
-        colorRing: "var(--ring)",
-      },
-      elements: {
-        formFieldErrorText: { color: "var(--error-foreground)" },
-        formFieldWarningText: { color: "var(--warning-foreground)" },
-        formFieldSuccessText: { color: "var(--success-foreground)" },
-        otpCodeFieldErrorText: { color: "var(--error-foreground)" },
-        otpCodeFieldSuccessText: { color: "var(--success-foreground)" },
-      },
-    });
-  });
-
   it.each(builtInThemeModes)("keeps Clerk text readable across a built-in palette", (colors) => {
+    expect(clerkAppearance.variables).toMatchObject({
+      colorForeground: "var(--contrast-foreground)",
+      colorBackground: "var(--card)",
+      colorMutedForeground: "var(--contrast-muted-foreground)",
+      colorMuted: "color-mix(in srgb, var(--card) 98%, var(--contrast-foreground))",
+      colorInputForeground: "var(--contrast-foreground)",
+      colorInput: "var(--secondary)",
+      colorPrimary: "var(--update-foreground)",
+      colorPrimaryForeground: "var(--card)",
+    });
     const mutedSurface = mixThemeColors(colors.surface, colors.text, 0.98);
 
     expect(contrastRatio(colors.text, colors.surface)).toBeGreaterThanOrEqual(4.5);
diff --git a/apps/web/src/components/contextChipParts.tsx b/apps/web/src/components/contextChipParts.tsx
index fc874f1e489d..4260a415127c 100644
--- a/apps/web/src/components/contextChipParts.tsx
+++ b/apps/web/src/components/contextChipParts.tsx
@@ -201,9 +201,11 @@ export function ImageChipButton({
       ) : (
         <ImageIcon />
       )}
-      <ContextChipLabel className="max-w-72">{middleTruncateAttachmentName(name)}</ContextChipLabel>
-      <span className="shrink-0 text-3xs text-current">{size}</span>
-      {suffix ? <span className="text-3xs text-current">{suffix}</span> : null}
+      <ContextChipLabel className="flex items-baseline gap-[0.33em]">
+        <span className="max-w-72 truncate">{middleTruncateAttachmentName(name)}</span>
+        <span className="shrink-0 text-3xs text-current">{size}</span>
+        {suffix ? <span className="text-3xs text-current">{suffix}</span> : null}
+      </ContextChipLabel>
     </ContextChip>
   );
 }
@@ -275,11 +277,11 @@ function FileChipContent(props: {
       ) : (
         <PierreEntryIcon pathValue={props.name} kind="file" theme={props.theme} />
       )}
-      <ContextChipLabel className="max-w-72">
-        {middleTruncateAttachmentName(props.name)}
+      <ContextChipLabel className="flex items-baseline gap-[0.33em]">
+        <span className="max-w-72 truncate">{middleTruncateAttachmentName(props.name)}</span>
+        <span className="shrink-0 text-3xs text-current">{props.size}</span>
+        {props.suffix ? <span className="text-3xs text-current">{props.suffix}</span> : null}
       </ContextChipLabel>
-      <span className="shrink-0 text-3xs text-current">{props.size}</span>
-      {props.suffix ? <span className="text-3xs text-current">{props.suffix}</span> : null}
     </>
   );
 }
diff --git a/apps/web/src/components/desktop/DesktopWebLinkCoordinator.browser.test.tsx b/apps/web/src/components/desktop/DesktopWebLinkCoordinator.browser.test.tsx
new file mode 100644
index 000000000000..63c73d52d056
--- /dev/null
+++ b/apps/web/src/components/desktop/DesktopWebLinkCoordinator.browser.test.tsx
@@ -0,0 +1,147 @@
+import { EnvironmentId, ProjectId } from "@t3tools/contracts";
+import type { Atom } from "effect/reactivity";
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, expect, it, vi } from "vite-plus/test";
+
+const state = vi.hoisted(() => ({
+  projects: [] as never[],
+  navigate: vi.fn(async (): Promise<void> => undefined),
+  openScratchProject: vi.fn(async () => null),
+}));
+
+// One connected primary environment that can read pull requests. Its project list and
+// discovery flag start empty so a test can deliver links before they arrive.
+vi.mock(import("@tanstack/react-router"), async (original) => ({
+  ...(await original()),
+  useNavigate: (() => state.navigate) as never,
+  useRouter: (() => ({ navigate: state.navigate, state: { matches: [] } })) as never,
+}));
+vi.mock(import("../../state/environments"), async (original) => ({
+  ...(await original()),
+  usePrimaryEnvironmentId: () => "local" as EnvironmentId,
+  usePrimaryEnvironment: (() => ({
+    environmentId: "local",
+    connection: { phase: "connected" },
+    serverConfig: {},
+  })) as never,
+}));
+vi.mock(import("../../state/server"), async (original) => {
+  const { Atom } = await import("effect/reactivity");
+  const capabilities = { pullRequests: true, threadPullRequests: true };
+  return {
+    ...(await original()),
+    environmentServerConfigsAtom: Atom.make(
+      new Map([["local", { environment: { capabilities } }]]),
+    ) as never,
+  };
+});
+vi.mock(import("../../state/shell"), async (original) => {
+  const { Atom } = await import("effect/reactivity");
+  return { ...(await original()), allReachableShellsLiveAtom: Atom.make(false) };
+});
+vi.mock(import("../../state/entities"), async (original) => ({
+  ...(await original()),
+  readProjects: () => state.projects,
+}));
+vi.mock(import("../../hooks/useScratchProject"), async (original) => ({
+  ...(await original()),
+  useScratchProject: (() => ({
+    scratchEnvironmentId: () => "local",
+    openScratchProject: state.openScratchProject,
+  })) as never,
+}));
+
+import { AppAtomRegistryProvider, appAtomRegistry } from "../../rpc/atomRegistry";
+import { allReachableShellsLiveAtom } from "../../state/shell";
+import { DesktopWebLinkCoordinator } from "./DesktopWebLinkCoordinator";
+
+const discoverySettled = allReachableShellsLiveAtom as Atom.Writable<boolean>;
+const environmentId = EnvironmentId.make("local");
+const projectId = ProjectId.make("effect");
+const project = {
+  id: projectId,
+  environmentId,
+  repositoryIdentity: {
+    provider: "github",
+    displayName: "Effect-TS/effect",
+    canonicalKey: "github.com/effect-ts/effect",
+    locator: {
+      source: "git-remote",
+      remoteName: "origin",
+      remoteUrl: "https://github.com/Effect-TS/effect.git",
+    },
+  },
+} as never;
+const pullRequestUrl = "https://github.com/Effect-TS/effect/pull/9339";
+const pullRequestView = {
+  to: "/pull-requests",
+  search: {
+    involvement: "all",
+    state: "all",
+    repository: "effect-ts/effect",
+    number: 9339,
+    selectedHost: "github.com",
+    selectedProjectId: projectId,
+    selectedEnvironmentId: environmentId,
+  },
+};
+
+let root: Root;
+
+/** Mounts the coordinator behind a desktop bridge that hands over `urls` once the renderer is ready. */
+async function mount(...urls: string[]) {
+  let deliver: ((url: string) => void) | undefined;
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  vi.stubGlobal("desktopBridge", {
+    getClientSettings: async () => null,
+    webLinks: {
+      onOpen: (listener: (url: string) => void) => {
+        deliver = listener;
+        return () => undefined;
+      },
+      setReady: async (ready: boolean) => {
+        if (ready) for (const url of urls.splice(0)) deliver?.(url);
+      },
+    },
+  });
+  root = createRoot(document.createElement("div"));
+  await act(async () =>
+    root.render(
+      <AppAtomRegistryProvider>
+        <DesktopWebLinkCoordinator />
+      </AppAtomRegistryProvider>,
+    ),
+  );
+}
+
+afterEach(async () => {
+  await act(async () => root.unmount());
+  vi.unstubAllGlobals();
+  vi.clearAllMocks();
+  state.projects = [];
+  appAtomRegistry.set(discoverySettled, false);
+});
+
+it("holds a launch PR link until project discovery settles, then opens the PR view", async () => {
+  await mount(pullRequestUrl);
+  expect(state.navigate).not.toHaveBeenCalled();
+  expect(state.openScratchProject).not.toHaveBeenCalled();
+
+  state.projects = [project];
+  const navigated = new Promise<void>((resolve) => {
+    state.navigate.mockImplementationOnce(async () => resolve());
+  });
+  await act(async () => {
+    appAtomRegistry.set(discoverySettled, true);
+    await navigated;
+  });
+  expect(state.navigate).toHaveBeenCalledExactlyOnceWith(pullRequestView);
+  expect(state.openScratchProject).not.toHaveBeenCalled();
+});
+
+it("opens an ordinary link in the browser while a PR link is still held", async () => {
+  await mount(pullRequestUrl, "https://example.com/docs");
+  expect(state.openScratchProject).toHaveBeenCalledOnce();
+  expect(state.navigate).not.toHaveBeenCalled();
+});
diff --git a/apps/web/src/components/desktop/DesktopWebLinkCoordinator.tsx b/apps/web/src/components/desktop/DesktopWebLinkCoordinator.tsx
index 5b46b60ba526..6e42b7257c3f 100644
--- a/apps/web/src/components/desktop/DesktopWebLinkCoordinator.tsx
+++ b/apps/web/src/components/desktop/DesktopWebLinkCoordinator.tsx
@@ -1,8 +1,12 @@
 import { scopeProjectRef, scopeThreadRef } from "@t3tools/client-runtime/environment";
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import type { EnvironmentId, ScopedThreadRef } from "@t3tools/contracts";
+import { parseChangeRequestUrl } from "@t3tools/shared/changeRequestUrl";
 import { promptLinkAppPath } from "@t3tools/shared/promptLinks";
 import { useRouter } from "@tanstack/react-router";
+import * as Effect from "effect/Effect";
+import { AtomRegistry } from "effect/reactivity";
+import * as Stream from "effect/Stream";
 import { useEffect, useEffectEvent, useRef } from "react";
 
 import { openFileInPreview, openUrlInPreview } from "../../browser/openFileInPreview";
@@ -10,15 +14,37 @@ import { isPreviewAvailableFor } from "../../browser/previewRuntime";
 import { useComposerDraftStore } from "../../composerDraftStore";
 import { useNewThreadHandler } from "../../hooks/useHandleNewThread";
 import { useScratchProject } from "../../hooks/useScratchProject";
+import { useClientSettings } from "../../hooks/useSettings";
+import { useOpenChangeRequestLink } from "../../lib/openPullRequestLink";
 import { selectActiveRightPanelSurface, useRightPanelStore } from "../../rightPanelStore";
+import { appAtomRegistry } from "../../rpc/atomRegistry";
 import { resolveThreadRouteTarget } from "../../threadRoutes";
 import { assetEnvironment } from "../../state/assets";
 import { useEnvironmentHttpBaseUrl, usePrimaryEnvironment } from "../../state/environments";
 import { previewEnvironment } from "../../state/preview";
+import { allReachableShellsLiveAtom } from "../../state/shell";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { useAtomQueryRunner } from "../../state/use-atom-query-runner";
 import { stackedThreadToast, toastManager } from "../ui/toast";
 
+/** A link handed over by the OS is a plain click: nothing about it asks for the browser. */
+const externalClick = {
+  preventDefault() {},
+  stopPropagation() {},
+  metaKey: false,
+  ctrlKey: false,
+};
+
+/** Resolves once every reachable environment has reported its projects or settled offline. */
+const projectsSettled = (): Promise<void> =>
+  Effect.runPromise(
+    AtomRegistry.toStream(appAtomRegistry, allReachableShellsLiveAtom).pipe(
+      Stream.filter((settled) => settled),
+      Stream.runHead,
+      Effect.asVoid,
+    ),
+  );
+
 /**
  * HTML files are served by this machine's environment, so only its threads can
  * take them.
@@ -47,6 +73,8 @@ function threadShowingBrowser(
 export function DesktopWebLinkCoordinator() {
   const router = useRouter();
   const primaryEnvironment = usePrimaryEnvironment();
+  const openPullRequestsInApp = useClientSettings((settings) => settings.pullRequestLinksOpenInApp);
+  const openChangeRequest = useOpenChangeRequestLink();
   const { scratchEnvironmentId, openScratchProject } = useScratchProject();
   const openThread = useNewThreadHandler();
   const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
@@ -91,6 +119,7 @@ export function DesktopWebLinkCoordinator() {
       await router.navigate({ href: appPath });
       return;
     }
+    if (openChangeRequest(externalClick, url)) return;
     const isFile = url.startsWith("file:");
     const routeParams = router.state.matches.at(-1)?.params ?? {};
     const threadRef =
@@ -121,12 +150,23 @@ export function DesktopWebLinkCoordinator() {
     }
   });
 
+  const receiveLink = useEffectEvent((url: string) => {
+    // A connected server publishes its config before its project snapshot, so a PR link
+    // delivered at launch would miss its project and fall through to the browser. Hold PR
+    // links, and only those, until discovery settles; an ordinary link never waits for it.
+    const hold =
+      openPullRequestsInApp && parseChangeRequestUrl(url) !== null
+        ? projectsSettled()
+        : Promise.resolve();
+    void hold.then(() => {
+      queueRef.current = queueRef.current.then(() => openLink(url)).catch(() => undefined);
+    });
+  });
+
   useEffect(() => {
     if (!ready || webLinks === undefined) return;
     let subscribed = true;
-    const unsubscribe = webLinks.onOpen((url) => {
-      queueRef.current = queueRef.current.then(() => openLink(url)).catch(() => undefined);
-    });
+    const unsubscribe = webLinks.onOpen(receiveLink);
     queueMicrotask(() => {
       if (subscribed) void webLinks.setReady(true).catch(() => undefined);
     });
diff --git a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
index 49f70b23b739..dd3ac359a8e4 100644
--- a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
@@ -68,30 +68,38 @@ function ChecksBody({
   const { attention, running, completed } = groupPullRequestChecks(checks);
   const canCollapse = attention.length + running.length > 0 && completed.length > 0;
   const visibleChecks = [...attention, ...running, ...(showAll || !canCollapse ? completed : [])];
+  const hasDetails = visibleChecks.some((check) => check.url !== null);
   if (checks.length === 0) {
     return <p className="text-muted-foreground text-xs">No checks reported</p>;
   }
   return (
     <>
       <ScrollArea className="max-h-64">
-        <ul className="flex flex-col gap-1">
-          {}
+        <ul
+          className={cn(
+            "grid gap-x-2 gap-y-1",
+            hasDetails
+              ? "grid-cols-[auto_minmax(0,1fr)_auto_auto]"
+              : "grid-cols-[auto_minmax(0,1fr)_auto]",
+          )}
+        >
           {visibleChecks.map((check, index) => (
-            <li key={`${index}:${check.name}`} className="flex items-center gap-2 text-xs">
+            <li
+              key={`${index}:${check.name}`}
+              className="col-span-full grid grid-cols-subgrid items-center text-xs"
+            >
               <PullRequestCheckStatusIcon status={check.status} />
               <Tooltip>
-                <TooltipTrigger
-                  render={<span className="min-w-0 flex-1 truncate">{check.name}</span>}
-                />
+                <TooltipTrigger render={<span className="min-w-0 truncate">{check.name}</span>} />
                 <TooltipPopup side="top">{check.description ?? check.name}</TooltipPopup>
               </Tooltip>
-              <span className="shrink-0 text-muted-foreground">
+              <span className="justify-self-end whitespace-nowrap text-muted-foreground">
                 {pullRequestCheckStatusLabel(check)}
               </span>
               {check.url === null ? null : (
                 <button
                   type="button"
-                  className="shrink-0 text-primary hover:underline"
+                  className="text-primary hover:underline"
                   onClick={() => {
                     if (!check.url) return;
                     void openLink(check.url).catch((error: unknown) => {
@@ -143,7 +151,9 @@ export function PullRequestChecksPopover({
   render?: React.ReactElement;
 }) {
   const presentation = pullRequestChecksStatePresentation(checksState);
-  const runningCount = checks?.filter((check) => check.status === "pending").length ?? 0;
+  const incompleteCount =
+    checks?.filter((check) => check.status === "pending" || check.status === "action-required")
+      .length ?? 0;
   const failedCount =
     checks?.filter((check) => check.status === "failure" || check.status === "cancelled").length ??
     0;
@@ -176,9 +186,9 @@ export function PullRequestChecksPopover({
         <presentation.Icon aria-hidden className={cn("size-3.5", presentation.toneClassName)} />
         {variant === "count" ? (
           <>
-            {checks !== undefined && runningCount > 0 ? (
+            {checks !== undefined && incompleteCount > 0 ? (
               <span className="tabular-nums">
-                {runningCount}/{checks.length}
+                {checks.length - incompleteCount}/{checks.length}
               </span>
             ) : failedCount > 0 ? (
               <span className="tabular-nums">{failedCount} failed</span>
diff --git a/apps/web/src/components/pullRequest/pullRequestReactions.logic.test.ts b/apps/web/src/components/pullRequest/pullRequestReactions.logic.test.ts
index f7aa346fae01..ed17c7b466fb 100644
--- a/apps/web/src/components/pullRequest/pullRequestReactions.logic.test.ts
+++ b/apps/web/src/components/pullRequest/pullRequestReactions.logic.test.ts
@@ -3,9 +3,6 @@ import { describe, expect, it } from "vite-plus/test";
 
 import {
   applyPendingPullRequestReactions,
-  PULL_REQUEST_REACTION_ORDER,
-  pullRequestReactionEmoji,
-  pullRequestReactionName,
   pullRequestReactionTooltip,
 } from "./pullRequestReactions.logic";
 
@@ -19,33 +16,6 @@ function reaction(overrides: Partial<PullRequestReaction> = {}): PullRequestReac
   };
 }
 
-describe("reaction presentation", () => {
-  it("names and draws all eight, in GitHub's picker order", () => {
-    expect(PULL_REQUEST_REACTION_ORDER).toEqual([
-      "thumbs-up",
-      "thumbs-down",
-      "laugh",
-      "hooray",
-      "confused",
-      "heart",
-      "rocket",
-      "eyes",
-    ]);
-    expect(PULL_REQUEST_REACTION_ORDER.map(pullRequestReactionEmoji)).toEqual([
-      "👍",
-      "👎",
-      "😄",
-      "🎉",
-      "😕",
-      "❤️",
-      "🚀",
-      "👀",
-    ]);
-    expect(pullRequestReactionName("thumbs-up")).toBe("thumbs up");
-    expect(pullRequestReactionName("eyes")).toBe("eyes");
-  });
-});
-
 describe("reaction tooltip", () => {
   it("reads as GitHub's sentence for one, two and three names", () => {
     expect(
diff --git a/apps/web/src/composer-logic.test.ts b/apps/web/src/composer-logic.test.ts
index 7050dc6251db..4c7bad292d4e 100644
--- a/apps/web/src/composer-logic.test.ts
+++ b/apps/web/src/composer-logic.test.ts
@@ -876,21 +876,6 @@ describe("assistant citation cursor offsets", () => {
   });
 });
 
-describe("replaceTextRange trailing space consumption", () => {
-  it("double space after insertion when replacement ends with space", () => {
-    const text = "and then @AG summarize";
-    const rangeStart = "and then ".length;
-    const rangeEnd = "and then @AG".length;
-
-    const withoutConsume = replaceTextRange(text, rangeStart, rangeEnd, "@AGENTS.md ");
-    expect(withoutConsume.text).toBe("and then @AGENTS.md  summarize");
-
-    const extendedEnd = text[rangeEnd] === " " ? rangeEnd + 1 : rangeEnd;
-    const withConsume = replaceTextRange(text, rangeStart, extendedEnd, "@AGENTS.md ");
-    expect(withConsume.text).toBe("and then @AGENTS.md summarize");
-  });
-});
-
 describe("isCollapsedCursorAdjacentToInlineToken", () => {
   it("returns false when no mention exists", () => {
     expect(isCollapsedCursorAdjacentToInlineToken("plain text", 6, "left")).toBe(false);
diff --git a/apps/web/src/hooks/useThreadActions.undo.test.ts b/apps/web/src/hooks/useThreadActions.undo.test.ts
index da65bf2ef931..9950911bee3d 100644
--- a/apps/web/src/hooks/useThreadActions.undo.test.ts
+++ b/apps/web/src/hooks/useThreadActions.undo.test.ts
@@ -162,9 +162,8 @@ describe("archive Undo", () => {
 
   it("shows no Undo when the archive failed", async () => {
     commands.archive.mockResolvedValue({ _tag: "Failure", cause: new Error("nope") });
-    const add = vi.spyOn(toastManager, "add").mockReturnValue("toast");
     await useThreadActions().archiveThread(target);
-    expect(add).not.toHaveBeenCalled();
+    expect(useThreadUndoNotice.getState().notice).toBeNull();
   });
 });
 
diff --git a/apps/web/src/lib/contextWindow.test.ts b/apps/web/src/lib/contextWindow.test.ts
index e672c36c19c4..a5a80b8ca573 100644
--- a/apps/web/src/lib/contextWindow.test.ts
+++ b/apps/web/src/lib/contextWindow.test.ts
@@ -1,5 +1,14 @@
 import { describe, expect, it } from "vite-plus/test";
 import * as DateTime from "effect/DateTime";
+import {
+  ContextTransferId,
+  ProviderDriverKind,
+  ProviderInstanceId,
+  RunId,
+  ThreadId,
+} from "@t3tools/contracts";
+import { makeThreadProjectionFixture } from "../test-fixtures";
+import { shouldOfferResumeCompaction } from "../components/chat/ContextWindowMeter.logic";
 import {
   deriveLatestContextWindowSnapshot,
   formatContextWindowTokens,
@@ -108,4 +117,125 @@ describe("latestProviderTurnTokenUsage", () => {
     ]);
     expect(latest?.usedTokens).toBe(300_000);
   });
+
+  const sourceUsage = {
+    usedTokens: 513_000,
+    maxTokens: 1_000_000,
+    promptCacheTtlMs: 5 * 60_000,
+    updatedAt: "2026-10-19T12:00:00.000Z",
+  };
+  function forkProjection() {
+    const projection = makeThreadProjectionFixture();
+    const sourceThreadId = ThreadId.make("parent");
+    const runId = RunId.make("fork-point");
+    return {
+      thread: {
+        ...projection.thread,
+        forkedFrom: { type: "run" as const, threadId: sourceThreadId, runId },
+      },
+      contextTransfers: [
+        {
+          id: ContextTransferId.make("fork-transfer"),
+          type: "fork" as const,
+          sourceThreadId,
+          targetThreadId: projection.thread.id,
+          sourcePoint: { threadId: sourceThreadId, runId },
+          basePoint: null,
+          sourceProviderInstanceId: projection.thread.modelSelection.instanceId,
+          sourceTokenUsage: sourceUsage,
+          targetProviderInstanceId: null,
+          targetRunId: null,
+          status: "pending" as const,
+          resolution: null,
+          createdBy: "user" as const,
+          error: null,
+          createdAt: projection.updatedAt,
+          updatedAt: projection.updatedAt,
+          consumedAt: null,
+        },
+      ],
+    };
+  }
+
+  it("keeps fork-point context and its cache expiry before the fork reports usage", () => {
+    const usage = latestProviderTurnTokenUsage([], forkProjection());
+    expect(usage).toEqual(sourceUsage);
+    const snapshot = deriveLatestContextWindowSnapshot([], usage);
+    expect(snapshot?.usedTokens).toBe(513_000);
+    expect(
+      shouldOfferResumeCompaction({
+        provider: "claudeAgent",
+        usedTokens: snapshot?.usedTokens,
+        updatedAt: snapshot?.updatedAt,
+        promptCacheTtlMs: usage?.promptCacheTtlMs,
+        now: "2026-10-19T12:06:00.000Z",
+      }),
+    ).toBe(true);
+  });
+
+  it("replaces inherited usage with the fork's own report", () => {
+    const tokenUsage = { usedTokens: 42_000, updatedAt: "2026-10-19T12:10:00.000Z" };
+    expect(latestProviderTurnTokenUsage([{ tokenUsage }], forkProjection())).toEqual(tokenUsage);
+  });
+
+  it.each([0, 42_000])(
+    "prefers target provider-thread usage of %d tokens over inherited usage",
+    (usedTokens) => {
+      const providerThread = {
+        contextUsage: {
+          usedTokens,
+          maxTokens: 200_000,
+          cost: { amount: 0.42, currency: "USD" },
+        },
+        updatedAt: DateTime.makeUnsafe("2026-10-19T12:10:00.000Z"),
+      };
+      const usage = latestProviderTurnTokenUsage([], forkProjection(), providerThread);
+      const snapshot = deriveLatestContextWindowSnapshot([], usage, providerThread);
+
+      expect(snapshot).toMatchObject({
+        usedTokens,
+        maxTokens: 200_000,
+        cost: { amount: 0.42, currency: "USD" },
+        updatedAt: "2026-10-19T12:10:00.000Z",
+      });
+    },
+  );
+
+  it("keeps the fallback after a native fork is consumed", () => {
+    const projection = forkProjection();
+    const transfer = projection.contextTransfers[0]!;
+    expect(
+      latestProviderTurnTokenUsage([], {
+        ...projection,
+        contextTransfers: [
+          {
+            ...transfer,
+            status: "consumed",
+            resolution: {
+              strategy: "native_fork",
+              providerThreadRef: {
+                driver: ProviderDriverKind.make("claudeAgent"),
+                nativeId: "fork",
+                strength: "strong",
+              },
+            },
+          },
+        ],
+      }),
+    ).toEqual(sourceUsage);
+  });
+
+  it("does not reuse usage for portable handoffs, different providers, or missing history", () => {
+    const projection = forkProjection();
+    const transfer = projection.contextTransfers[0]!;
+    for (const contextTransfers of [
+      [],
+      [{ ...transfer, sourceTokenUsage: undefined }],
+      [{ ...transfer, status: "resolved_portable" as const }],
+      [{ ...transfer, sourceProviderInstanceId: ProviderInstanceId.make("other") }],
+      [{ ...transfer, sourcePoint: { ...transfer.sourcePoint, runId: RunId.make("later") } }],
+    ]) {
+      expect(latestProviderTurnTokenUsage([], { ...projection, contextTransfers })).toBeNull();
+    }
+  });
 });
diff --git a/apps/web/src/lib/contextWindow.ts b/apps/web/src/lib/contextWindow.ts
index e64525e7e90e..cfbc1eb800f5 100644
--- a/apps/web/src/lib/contextWindow.ts
+++ b/apps/web/src/lib/contextWindow.ts
@@ -2,6 +2,7 @@ import type {
   OrchestrationV2ProviderTurn,
   OrchestrationV2ProviderTurnTokenUsage,
   OrchestrationV2ProviderThread,
+  OrchestrationV2ThreadProjection,
   OrchestrationV2TurnItem,
   ThreadTokenUsageSnapshot,
 } from "@t3tools/contracts";
@@ -28,6 +29,8 @@ export type ContextWindowSnapshot = NullableContextWindowUsage & {
     by provider thread, not time, so pick by timestamp. */
 export function latestProviderTurnTokenUsage(
   turns: ReadonlyArray<Pick<OrchestrationV2ProviderTurn, "tokenUsage">>,
+  projection?: Pick<OrchestrationV2ThreadProjection, "thread" | "contextTransfers"> | null,
+  providerThread?: Pick<OrchestrationV2ProviderThread, "contextUsage"> | null,
 ): OrchestrationV2ProviderTurnTokenUsage | null {
   let latest: OrchestrationV2ProviderTurnTokenUsage | null = null;
   for (const { tokenUsage } of turns) {
@@ -37,7 +40,20 @@ export function latestProviderTurnTokenUsage(
       latest = tokenUsage;
     }
   }
-  return latest;
+  if (latest !== null || projection == null || providerThread?.contextUsage != null) return latest;
+  const forkedFrom = projection.thread.forkedFrom;
+  if (forkedFrom?.type !== "run") return null;
+  return (
+    projection.contextTransfers.find(
+      (transfer) =>
+        transfer.type === "fork" &&
+        transfer.targetThreadId === projection.thread.id &&
+        transfer.sourceThreadId === forkedFrom.threadId &&
+        transfer.sourcePoint.runId === forkedFrom.runId &&
+        transfer.sourceProviderInstanceId === projection.thread.modelSelection.instanceId &&
+        (transfer.status === "pending" || transfer.resolution?.strategy === "native_fork"),
+    )?.sourceTokenUsage ?? null
+  );
 }
 
 export function deriveLatestContextWindowSnapshot(
diff --git a/apps/web/src/lib/openPullRequestLink.ts b/apps/web/src/lib/openPullRequestLink.ts
index 323173e4cb6e..ce5fb92778b9 100644
--- a/apps/web/src/lib/openPullRequestLink.ts
+++ b/apps/web/src/lib/openPullRequestLink.ts
@@ -14,7 +14,7 @@ import { useRightPanelStore } from "../rightPanelStore";
 import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
 
 import { appAtomRegistry } from "../rpc/atomRegistry";
-import { useProjects } from "../state/entities";
+import { readProjects, useProjects } from "../state/entities";
 import { environmentServerConfigsAtom, serverEnvironment } from "../state/server";
 import { usePrimaryEnvironmentId } from "../state/environments";
 
@@ -116,14 +116,15 @@ export function useOpenChangeRequestLink(
   targetEnvironmentId?: EnvironmentId,
 ) => boolean {
   const navigate = useNavigate();
-  const allProjects = useProjects();
   const primaryEnvironmentId = usePrimaryEnvironmentId();
   const openInApp = useClientSettings((settings) => settings.pullRequestLinksOpenInApp);
   return (event, targetUrl, targetThreadRef, targetEnvironmentId) => {
     if (!openInApp || shouldOpenPullRequestExternally(event)) return false;
     // Read at click time: every provider status push replaces the config map, and
-    // subscribing would hand every rendered link a new handler.
+    // subscribing would hand every rendered link a new handler. Projects likewise, so a
+    // link can resolve against a snapshot that arrived after this handler was built.
     const serverConfigs = appAtomRegistry.get(environmentServerConfigsAtom);
+    const allProjects = readProjects();
     const resolvedThreadRef = targetThreadRef ?? threadRef;
     const resolvedPanelRef = panelRef ?? resolvedThreadRef;
     const parsed = parseChangeRequestUrl(targetUrl);
diff --git a/apps/web/src/onboarding/firstRun.logic.test.ts b/apps/web/src/onboarding/firstRun.logic.test.ts
index 2b5d17e085aa..ab6af33c0c56 100644
--- a/apps/web/src/onboarding/firstRun.logic.test.ts
+++ b/apps/web/src/onboarding/firstRun.logic.test.ts
@@ -321,6 +321,17 @@ const bootstrapThread = {
   runtime: null,
 };
 
+const freshBootstrap = {
+  primaryEnvironmentId,
+  serverCwd: "/projects/current",
+  bootstrapProjectId: bootstrapProject.id,
+  bootstrapThreadId: bootstrapThread.id,
+  bootstrapProjectCreated: true,
+  bootstrapThreadCreated: true,
+  projects: [bootstrapProject],
+  threads: [bootstrapThread],
+};
+
 describe("isFreshFirstRunWorkspace", () => {
   it("accepts an empty workspace", () => {
     expect(
@@ -394,8 +405,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects projects from another environment even when their paths match", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [{ ...bootstrapProject, environmentId: "remote-environment" }],
         threads: [],
       }),
@@ -405,8 +415,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects threads from another environment", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [bootstrapProject],
         threads: [{ ...bootstrapThread, environmentId: "remote-environment" }],
       }),
@@ -416,8 +425,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects a thread that does not belong to the bootstrap project", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [bootstrapProject],
         threads: [{ ...bootstrapThread, projectId: "another-project" }],
       }),
@@ -427,8 +435,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects a thread when there is no bootstrap project", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [],
         threads: [bootstrapThread],
       }),
@@ -438,8 +445,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects a bootstrap thread that already has a user message", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [bootstrapProject],
         threads: [
           {
@@ -454,8 +460,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects a bootstrap thread that has started a turn", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [bootstrapProject],
         threads: [{ ...bootstrapThread, latestRun: { id: "first-run" } }],
       }),
@@ -465,8 +470,7 @@ describe("isFreshFirstRunWorkspace", () => {
   it("rejects a bootstrap thread that has a provider session", () => {
     expect(
       isFreshFirstRunWorkspace({
-        primaryEnvironmentId,
-        serverCwd: "/projects/current",
+        ...freshBootstrap,
         projects: [bootstrapProject],
         threads: [{ ...bootstrapThread, runtime: { status: "ready" } }],
       }),
diff --git a/apps/web/src/promptStashStore.test.ts b/apps/web/src/promptStashStore.test.ts
index 2586ebc4d04e..97867091385d 100644
--- a/apps/web/src/promptStashStore.test.ts
+++ b/apps/web/src/promptStashStore.test.ts
@@ -238,7 +238,12 @@ describe("promptStashStore", () => {
       environmentId: EnvironmentId.make("environment-1"),
     };
 
-    store.stashEntry({ ...makeEntry({ id: "with-file" }), files: [file] });
+    writePromptStashStorageForTest(
+      JSON.stringify({
+        version: 2,
+        state: { entries: [{ ...makeEntry({ id: "with-file" }), files: [file] }] },
+      }),
+    );
     store.finalizeEntryImages("with-file", {
       attachments: [],
       droppedImageNames: [],
@@ -289,8 +294,7 @@ describe("promptStashStore", () => {
 });
 
 describe("prompt stash context records", () => {
-  it("keeps the records behind a stashed prompt's chips", () => {
-    const store = usePromptStashStore.getState();
+  it("restores the records behind a persisted prompt's chips", () => {
     const records = [
       {
         version: 1 as const,
@@ -304,14 +308,23 @@ describe("prompt stash context records", () => {
         text: "boom",
       },
     ];
-    store.stashEntry({
-      id: "entry-records",
-      createdAt: "2026-01-01T00:00:00.000Z",
-      prompt: "see [Terminal 1 line 4](t3-context://v1/terminal/ctx-1)",
-      attachments: [],
-      droppedImageNames: [],
-      records,
-    });
+    writePromptStashStorageForTest(
+      JSON.stringify({
+        version: 2,
+        state: {
+          entries: [
+            {
+              id: "entry-records",
+              createdAt: "2026-01-01T00:00:00.000Z",
+              prompt: "see [Terminal 1 line 4](t3-context://v1/terminal/ctx-1)",
+              attachments: [],
+              droppedImageNames: [],
+              records,
+            },
+          ],
+        },
+      }),
+    );
     const taken = usePromptStashStore.getState().takeEntry("entry-records");
     expect(taken.entry?.records).toEqual(records);
   });
diff --git a/apps/web/src/providerInstances.test.ts b/apps/web/src/providerInstances.test.ts
index b6aaac5960aa..7b6df7cb41ee 100644
--- a/apps/web/src/providerInstances.test.ts
+++ b/apps/web/src/providerInstances.test.ts
@@ -1,4 +1,5 @@
 import {
+  DEFAULT_MODEL_BY_PROVIDER,
   ProjectId,
   ProviderDriverKind,
   ProviderInstanceId,
@@ -520,8 +521,7 @@ describe("getDefaultProviderInstanceModel", () => {
       providers,
       ProviderInstanceId.make("claudeAgent"),
     );
-    expect(typeof resolved).toBe("string");
-    expect(resolved?.length).toBeGreaterThan(0);
+    expect(resolved).toBe(DEFAULT_MODEL_BY_PROVIDER[ProviderDriverKind.make("claudeAgent")]);
   });
 
   it("honors the instance's declared default before model-list order", () => {
diff --git a/apps/web/src/terminal/ghostty/keyCodes.test.ts b/apps/web/src/terminal/ghostty/keyCodes.test.ts
index 5cc965bf97db..5d530014943d 100644
--- a/apps/web/src/terminal/ghostty/keyCodes.test.ts
+++ b/apps/web/src/terminal/ghostty/keyCodes.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vite-plus/test";
+import ghosttyKeyHeader from "../../../../../native/libghostty-vt/include/ghostty/vt/key/event.h?raw";
 
 import {
   ghosttyConsumedMods,
@@ -8,11 +9,24 @@ import {
 } from "./keyCodes";
 
 describe("ghosttyKeyForCode", () => {
-  it("keeps the tail of the pinned Ghostty key enum in order", () => {
-    expect(ghosttyKeyForCode("F25")).toBe(ghosttyKeyForCode("F24") + 1);
-    expect(ghosttyKeyForCode("PrintScreen")).toBe(ghosttyKeyForCode("FnLock") + 1);
-    expect(ghosttyKeyForCode("Pause")).toBe(ghosttyKeyForCode("ScrollLock") + 1);
-    expect(ghosttyKeyForCode("Paste")).toBe(ghosttyKeyForCode("Cut") + 1);
+  it("matches the pinned native key enum after the function keys", () => {
+    const enumBody = ghosttyKeyHeader.slice(
+      ghosttyKeyHeader.indexOf("GHOSTTY_KEY_UNIDENTIFIED"),
+      ghosttyKeyHeader.indexOf("GHOSTTY_KEY_MAX_VALUE"),
+    );
+    const keys = [...enumBody.matchAll(/GHOSTTY_KEY_([A-Z0-9_]+)/g)].map((match) => match[1]);
+    for (const [code, native] of [
+      ["F24", "F24"],
+      ["F25", "F25"],
+      ["FnLock", "FN_LOCK"],
+      ["PrintScreen", "PRINT_SCREEN"],
+      ["ScrollLock", "SCROLL_LOCK"],
+      ["Pause", "PAUSE"],
+      ["Paste", "PASTE"],
+    ]) {
+      expect(keys).toContain(native);
+      expect(ghosttyKeyForCode(code!)).toBe(keys.indexOf(native));
+    }
   });
 });
 
diff --git a/apps/web/src/terminal/ghostty/surface.test.ts b/apps/web/src/terminal/ghostty/surface.test.ts
index c486b3a05a3f..550eff2138c3 100644
--- a/apps/web/src/terminal/ghostty/surface.test.ts
+++ b/apps/web/src/terminal/ghostty/surface.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vite-plus/test";
+import * as appearanceFonts from "../../appearanceFonts";
 
 import { GhosttyTerminalCore, type GhosttyCell, type GhosttyRow } from "./core";
 import {
@@ -1594,10 +1595,13 @@ describe("terminal font resolution", () => {
   });
 
   it("ignores proportional families the cell grid cannot lay out", () => {
-    // Node has no canvas, so the probe answers "monospace" and the
-    // family is kept; the guard is exercised in the browser instead.
-    const stack = terminalFontFamily("Helvetica Neue");
-    expect(stack.endsWith("monospace")).toBe(true);
+    const probe = vi.spyOn(appearanceFonts, "isMonospaceFamily").mockReturnValueOnce(false);
+    try {
+      expect(terminalFontFamily("Helvetica Neue")).toBe(DEFAULT_TERMINAL_FONT_FAMILY);
+      expect(probe).toHaveBeenCalledWith('"Helvetica Neue"');
+    } finally {
+      probe.mockRestore();
+    }
   });
 
   it("quotes families the canvas font shorthand would otherwise reject", () => {
diff --git a/docs/operations/mobile-screens-fork.md b/docs/operations/mobile-screens-fork.md
index f9da54a93ab0..db92950963c6 100644
--- a/docs/operations/mobile-screens-fork.md
+++ b/docs/operations/mobile-screens-fork.md
@@ -1,7 +1,7 @@
 # Building the mobile Screens dependency
 
 The mobile v5 stack uses a committed tarball from the
-[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.27).
+[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.29).
 The fork owns the integration changes; the app does not patch this package.
 Each archive includes compiled JavaScript, declarations, native source and
 `t3-fork.json` recording its version, source commit and upstream base.
diff --git a/docs/operations/relay-observability.md b/docs/operations/relay-observability.md
index 3f174e6882de..f2cd94e333b7 100644
--- a/docs/operations/relay-observability.md
+++ b/docs/operations/relay-observability.md
@@ -147,6 +147,15 @@ account limit.
 **Traffic dropped.** The Worker is down, a deploy broke it, or spans stopped reaching Axiom. Check
 `https://relay.t3.codes/health` first.
 
+**Tunnel cleanup stopped / tunnel deletions failing.** Warnings for the five-minute reaper that deletes
+idle Cloudflare tunnels. "Stopped" counts sweeps that finished, so it also fires when every sweep
+fails; a sweep fails when listing tunnels does, usually behind Cloudflare 429s. Idle tunnels are
+billed until the reaper catches up, which the "Idle tunnels in Cloudflare" chart shows. A failed
+sweep records no counts, so while sweeps fail the chart stops at the last good one; check the tunnel
+list in the Cloudflare dashboard for current numbers. For failed
+deletions, read the relay's "Failed to delete an inactive managed tunnel" warnings. To pause cleanup,
+see [Managed tunnel cleanup rollout](release.md#managed-tunnel-cleanup-rollout).
+
 **Links degraded / database slow.** Warnings for slow degradation. Link failures above 20% over six
 hours have so far meant provisioning running into the 9 s deadline, with Postgres latency as the
 usual cause.
diff --git a/docs/user/default-browser.md b/docs/user/default-browser.md
index 7364608d2115..1e1ef5003456 100644
--- a/docs/user/default-browser.md
+++ b/docs/user/default-browser.md
@@ -8,6 +8,9 @@ page, so you can ask an agent about it right away.
 Choose **T3 Code** under **System Settings → Desktop & Dock → Default web browser**. To go back,
 choose another browser there.
 
+Pull request links for a connected project open in the pull request view when opening pull
+request links in the app is enabled. Other links still open in the browser panel.
+
 HTML files you open from Finder open the same way. [Prompt links](prompt-links.md) to
 app.t3.codes open in the app as a draft.
 
diff --git a/infra/relay/src/agentActivity/ApnsProviderTokens.test.ts b/infra/relay/src/agentActivity/ApnsProviderTokens.test.ts
index 2a38e578f8d0..1e93aab87516 100644
--- a/infra/relay/src/agentActivity/ApnsProviderTokens.test.ts
+++ b/infra/relay/src/agentActivity/ApnsProviderTokens.test.ts
@@ -2,6 +2,8 @@
 import * as NodeCrypto from "node:crypto";
 
 import { describe, expect, it } from "@effect/vitest";
+import { vi } from "vite-plus/test";
+import { p256 } from "@noble/curves/nist";
 import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
@@ -61,12 +63,17 @@ describe("ApnsProviderTokens", () => {
 
   it.effect("serves repeat pushes from the isolate cache without re-signing", () => {
     ApnsProviderTokens.__resetApnsProviderTokenCacheForTest();
+    const sign = vi.spyOn(p256, "sign");
     return Effect.gen(function* () {
       const tokens = yield* ApnsProviderTokens.ApnsProviderTokens;
       const first = yield* tokens.getJwt({ ...signingInput, issuedAtUnixSeconds: WINDOW + 10 });
       const again = yield* tokens.getJwt({ ...signingInput, issuedAtUnixSeconds: WINDOW + 500 });
       expect(again).toBe(first);
+      expect(sign).toHaveBeenCalledTimes(1);
       ApnsProviderTokens.__resetApnsProviderTokenCacheForTest();
-    }).pipe(Effect.provide(ApnsProviderTokens.layer));
+    }).pipe(
+      Effect.provide(ApnsProviderTokens.layer),
+      Effect.ensuring(Effect.sync(() => sign.mockRestore())),
+    );
   });
 });
diff --git a/infra/relay/src/agentActivity/DeliveryAttempts.test.ts b/infra/relay/src/agentActivity/DeliveryAttempts.test.ts
index 2f3d948983d9..2f0943884a8e 100644
--- a/infra/relay/src/agentActivity/DeliveryAttempts.test.ts
+++ b/infra/relay/src/agentActivity/DeliveryAttempts.test.ts
@@ -1,5 +1,7 @@
 import * as NodeCryptoLayer from "@effect/platform-node/NodeCrypto";
 import { describe, expect, it } from "@effect/vitest";
+import type { SQL } from "drizzle-orm";
+import { PgDialect } from "drizzle-orm/pg-core";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 
@@ -274,7 +276,7 @@ describe("DeliveryAttempts", () => {
 
   it.effect("completes a claimed source job with the APNs outcome", () => {
     const updatedValues: Array<Record<string, unknown>> = [];
-    const whereClauses: Array<unknown> = [];
+    const whereClauses: Array<SQL> = [];
     const fakeDb = {
       update: (table: unknown) => {
         expect(table).toBe(relayDeliveryAttempts);
@@ -282,7 +284,7 @@ describe("DeliveryAttempts", () => {
           set: (values: Record<string, unknown>) => {
             updatedValues.push(values);
             return {
-              where: (clause: unknown) => {
+              where: (clause: SQL) => {
                 whereClauses.push(clause);
                 return Effect.void;
               },
@@ -301,7 +303,9 @@ describe("DeliveryAttempts", () => {
         apnsId: "apns-id",
       });
 
-      expect(whereClauses).toHaveLength(1);
+      expect(whereClauses.map((clause) => new PgDialect().sqlToQuery(clause))).toEqual([
+        { sql: '"relay_delivery_attempts"."source_job_id" = $1', params: ["job-1"] },
+      ]);
       expect(updatedValues).toEqual([
         {
           createdAt: expect.any(String),
diff --git a/infra/relay/src/auth/DpopProofs.test.ts b/infra/relay/src/auth/DpopProofs.test.ts
index fba64586e285..0a51034948b2 100644
--- a/infra/relay/src/auth/DpopProofs.test.ts
+++ b/infra/relay/src/auth/DpopProofs.test.ts
@@ -1,4 +1,6 @@
 import { describe, expect, it } from "@effect/vitest";
+import type { SQL } from "drizzle-orm";
+import { PgDialect } from "drizzle-orm/pg-core";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
@@ -73,15 +75,13 @@ describe("DpopProofReplay", () => {
   });
 
   it.effect("prunes expired proof rows from the maintenance path", () => {
-    const calls: Array<string> = [];
+    const conditions: Array<SQL> = [];
     const fakeDb = {
       delete: (table: unknown) => {
         expect(table).toBe(relayDpopProofs);
-        calls.push("delete");
         return {
-          where: (condition: unknown) => {
-            expect(condition).toBeDefined();
-            calls.push("delete.where");
+          where: (condition: SQL) => {
+            conditions.push(condition);
             return Effect.void;
           },
         };
@@ -91,7 +91,10 @@ describe("DpopProofReplay", () => {
     return Effect.gen(function* () {
       const replay = yield* DpopProofs.DpopProofReplay;
       yield* replay.pruneExpired;
-      expect(calls).toEqual(["delete", "delete.where"]);
+      const now = DateTime.formatIso(yield* DateTime.now);
+      expect(conditions.map((condition) => new PgDialect().sqlToQuery(condition))).toEqual([
+        { sql: '"relay_dpop_proofs"."expires_at" < $1', params: [now] },
+      ]);
     }).pipe(
       Effect.provide(DpopProofs.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb)))),
     );
diff --git a/infra/relay/src/environments/ManagedEndpointAllocations.test.ts b/infra/relay/src/environments/ManagedEndpointAllocations.test.ts
index ca1c96de17d4..2c8a3f545373 100644
--- a/infra/relay/src/environments/ManagedEndpointAllocations.test.ts
+++ b/infra/relay/src/environments/ManagedEndpointAllocations.test.ts
@@ -3,6 +3,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import { PgDialect } from "drizzle-orm/pg-core";
+import type { SQL } from "drizzle-orm";
 
 import * as RelayDb from "../db.ts";
 import { relayManagedEndpointAllocations } from "../persistence/schema.ts";
@@ -286,15 +287,18 @@ describe("ManagedEndpointAllocations", () => {
   );
 
   it.effect("returns a claim generation only when deprovision wins the allocation CAS", () => {
+    const conditions: SQL[] = [];
+    const results = [[{ generation: 8 }], []];
     const fakeDb = {
       update: (table: unknown) => {
         expect(table).toBe(relayManagedEndpointAllocations);
         return {
           set: (_values: { readonly updatedAt: string }) => {
             return {
-              where: () => ({
-                returning: () => Effect.succeed([{ generation: 8 }]),
-              }),
+              where: (condition: SQL) => {
+                conditions.push(condition);
+                return { returning: () => Effect.succeed(results.shift() ?? []) };
+              },
             };
           },
         };
@@ -303,14 +307,14 @@ describe("ManagedEndpointAllocations", () => {
 
     return Effect.gen(function* () {
       const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
-      const generation = yield* allocations.claimDeprovision({
-        userId: "user-1",
-        environmentId: "environment-1",
-        generation: 7,
-      });
+      const input = { userId: "user-1", environmentId: "environment-1", generation: 7 };
 
-      expect(generation).toBe(8);
-      expect(generation).not.toBeNull();
+      expect(yield* allocations.claimDeprovision(input)).toBe(8);
+      expect(yield* allocations.claimDeprovision(input)).toBeNull();
+      expect(new PgDialect().sqlToQuery(conditions[0]!)).toEqual({
+        sql: '(((("relay_managed_endpoint_allocations"."user_id" = $1) and ("relay_managed_endpoint_allocations"."environment_id" = $2))) and ("relay_managed_endpoint_allocations"."generation" = $3))',
+        params: ["user-1", "environment-1", 7],
+      });
     }).pipe(Effect.provide(layerWithDb(fakeDb)));
   });
 
diff --git a/infra/relay/src/monitoring.ts b/infra/relay/src/monitoring.ts
index f791dfc45026..6577dab61cf9 100644
--- a/infra/relay/src/monitoring.ts
+++ b/infra/relay/src/monitoring.ts
@@ -14,6 +14,11 @@ const LINK_ROUTE = `"/v1/client/environment-links"`;
 const TUNNEL_ROUTES = `"/v1/environments/:environmentId/tunnel", "/v1/environments/:environmentId/tunnel/recovery"`;
 const CLOUDFLARE_API = `['attributes.url.full'] startswith "https://api.cloudflare.com"`;
 const STATUS = `toint(['attributes.http.response.status_code'])`;
+// The tunnel reaper records its counters on this span every five minutes,
+// including while cleanup is off.
+const SWEEP = `name == "relay.managed_endpoint_reaper.sweep"`;
+const sweepCounter = (field: string) =>
+  `toint(['attributes.custom']['relay.managed_endpoint_reaper.${field}'])`;
 
 // Status codes, not span errors: a request cut off by the relay deadline ends
 // as an interrupted span with no error flag, but still answers 504.
@@ -173,6 +178,33 @@ const relayMonitors: ReadonlyArray<RelayMonitor> = [
     rangeMinutes: 15,
     triggerFromNRuns: 2,
   },
+  {
+    id: "RelayTunnelCleanupStoppedMonitor",
+    severity: "warn",
+    name: "T3 Connect relay: tunnel cleanup stopped",
+    description:
+      "Tunnel cleanup sweeps that finished in 30 min. Healthy: 6. The cron is not running, or every sweep fails, as during the 2026-10-19 Cloudflare 429s when listing tunnels timed out. Idle tunnels pile up and are billed meanwhile.",
+    query: (dataset) =>
+      `['${dataset}']\n| where ${SWEEP} and error != true\n| summarize sweeps = count()`,
+    operator: "Below",
+    threshold: 1,
+    rangeMinutes: 30,
+    triggerFromNRuns: 2,
+    alertOnNoData: true,
+  },
+  {
+    id: "RelayTunnelCleanupFailingMonitor",
+    severity: "warn",
+    name: "T3 Connect relay: tunnel deletions failing",
+    description:
+      "Cloudflare tunnel deletions that failed in 30 min. Healthy: 0; the worst 30 min so far had 3. The relay logs a warning with the Cloudflare error for each.",
+    query: (dataset) =>
+      `['${dataset}']\n| where ${SWEEP}\n| summarize failed = sum(${sweepCounter("failed")})`,
+    operator: "Above",
+    threshold: 10,
+    rangeMinutes: 30,
+    triggerFromNRuns: 2,
+  },
 ];
 
 interface QueryChart {
@@ -202,8 +234,8 @@ const relayDashboardCharts = (dataset: string): ReadonlyArray<QueryChart> => {
     ),
     timeSeries(
       "link-latency",
-      "Link latency (ms, 9 s deadline)",
-      `${linkRequests}\n| summarize p50 = percentile(duration, 50) / 1000000, p90 = percentile(duration, 90) / 1000000 by bin_auto(_time)`,
+      "Link latency (9 s deadline)",
+      `${linkRequests}\n| summarize p50 = percentile(duration, 50), p90 = percentile(duration, 90) by bin_auto(_time)`,
     ),
     timeSeries(
       "reachability",
@@ -222,14 +254,26 @@ const relayDashboardCharts = (dataset: string): ReadonlyArray<QueryChart> => {
     ),
     timeSeries(
       "postgres",
-      "Postgres query time (ms)",
-      `${source}\n| where name == "postgres"\n| summarize p50 = percentile(duration, 50) / 1000000, p90 = percentile(duration, 90) / 1000000 by bin_auto(_time)`,
+      "Postgres query time",
+      `${source}\n| where name == "postgres"\n| summarize p50 = percentile(duration, 50), p90 = percentile(duration, 90) by bin_auto(_time)`,
     ),
     timeSeries(
       "push",
       "Push delivery jobs",
       `${source}\n| where name in ("relay.apns_deliveries.process_signed_job", "relay.fcm.process")\n| summarize delivered = countif(error != true), failed = countif(error == true) by bin_auto(_time), service = iff(name == "relay.fcm.process", "fcm", "apns")`,
     ),
+    timeSeries(
+      "tunnel-cleanup",
+      "Tunnel cleanup per sweep",
+      `${source}\n| where ${SWEEP}\n| summarize deleted = sum(${sweepCounter("deleted")}), deleted_legacy = sum(${sweepCounter("deletedLegacy")}), would_delete = sum(${sweepCounter("wouldDelete")}), would_delete_legacy = sum(${sweepCounter("wouldDeleteLegacy")}), failed = sum(${sweepCounter("failed")}), sweeps_failed = countif(error == true) by bin_auto(_time)`,
+    ),
+    // Cloudflare's own counts for this stage, including tunnels the reaper
+    // skips, so this is the idle tunnels still billed.
+    timeSeries(
+      "tunnel-backlog",
+      "Idle tunnels in Cloudflare",
+      `${source}\n| where ${SWEEP}\n| summarize down = max(${sweepCounter("totalDown")}), never_connected = max(${sweepCounter("totalInactive")}) by bin_auto(_time)`,
+    ),
     timeSeries(
       "server-errors",
       "5xx by route",
@@ -248,8 +292,8 @@ const relayDashboardCharts = (dataset: string): ReadonlyArray<QueryChart> => {
     // and the host's spans. An attempt lasts until initial sync finishes.
     timeSeries(
       "connect-time",
-      "Connecting: time to connected by surface (ms)",
-      `${clientConnections}\n| summarize p50 = percentile(duration, 50) / 1000000, p90 = percentile(duration, 90) / 1000000 by bin_auto(_time), surface`,
+      "Connecting: time to connected by surface",
+      `${clientConnections}\n| summarize p50 = percentile(duration, 50), p90 = percentile(duration, 90) by bin_auto(_time), surface`,
     ),
     timeSeries(
       "connect-outcomes",
@@ -258,7 +302,7 @@ const relayDashboardCharts = (dataset: string): ReadonlyArray<QueryChart> => {
     ),
     {
       id: "connect-phases",
-      name: "Connecting: where the time goes (ms)",
+      name: "Connecting: where the time goes",
       type: "Table",
       query: {
         // Failed direct route checks stay in: waiting out an unreachable LAN
@@ -279,15 +323,15 @@ const relayDashboardCharts = (dataset: string): ReadonlyArray<QueryChart> => {
           `    name == "relay.connection.attempt", "Total: time to connected",`,
           `    "")`,
           `| where phase != "" and (error != true or phase startswith "0.")`,
-          `| summarize calls = count(), p50_ms = round(percentile(duration, 50) / 1000000, 0), p90_ms = round(percentile(duration, 90) / 1000000, 0) by phase`,
+          `| summarize calls = count(), p50 = percentile(duration, 50), p90 = percentile(duration, 90) by phase`,
           `| order by phase asc`,
         ].join("\n"),
       },
     },
     timeSeries(
       "relay-latency-by-continent",
-      "Relay token and connect latency by user continent (p50 ms)",
-      `${source}\n| where kind == "server" and ['attributes.http.request.method'] == "POST" and (['attributes.http.route'] == "/v1/client/dpop-token" or ['attributes.http.route'] == "/v1/environments/:environmentId/connect")\n| extend continent = tostring(['attributes.custom']['relay.edge.continent'])\n| where isnotempty(continent)\n| summarize p50 = percentile(duration, 50) / 1000000 by bin_auto(_time), continent`,
+      "Relay token and connect latency by user continent (p50)",
+      `${source}\n| where kind == "server" and ['attributes.http.request.method'] == "POST" and (['attributes.http.route'] == "/v1/client/dpop-token" or ['attributes.http.route'] == "/v1/environments/:environmentId/connect")\n| extend continent = tostring(['attributes.custom']['relay.edge.continent'])\n| where isnotempty(continent)\n| summarize p50 = percentile(duration, 50) by bin_auto(_time), continent`,
     ),
   ];
 };
diff --git a/packages/client-runtime/src/environment/knownEnvironment.test.ts b/packages/client-runtime/src/environment/knownEnvironment.test.ts
index 032be152fdbc..b22a22008b24 100644
--- a/packages/client-runtime/src/environment/knownEnvironment.test.ts
+++ b/packages/client-runtime/src/environment/knownEnvironment.test.ts
@@ -43,17 +43,6 @@ describe("scoped refs", () => {
     expect(scopedThreadKey(threadRef)).toBe("environment-test:thread-1");
   });
 
-  it("returns typed scoped refs", () => {
-    expect(projectRef).toEqual({
-      environmentId,
-      projectId: ProjectId.make("project-1"),
-    });
-    expect(threadRef).toEqual({
-      environmentId,
-      threadId: ThreadId.make("thread-1"),
-    });
-  });
-
   it("parses scoped project and thread keys back into refs", () => {
     expect(parseScopedProjectKey("environment-test:project-1")).toEqual(projectRef);
     expect(parseScopedThreadKey("environment-test:thread-1")).toEqual(threadRef);
diff --git a/packages/client-runtime/src/state/runtime.test.ts b/packages/client-runtime/src/state/runtime.test.ts
index e31092acc756..c389f454186e 100644
--- a/packages/client-runtime/src/state/runtime.test.ts
+++ b/packages/client-runtime/src/state/runtime.test.ts
@@ -11,7 +11,6 @@ import * as Cause from "effect/Cause";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
-import * as Fiber from "effect/Fiber";
 import * as Latch from "effect/Latch";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
@@ -1065,115 +1064,6 @@ describe("environment query lifecycle", () => {
   );
 });
 
-describe("Atom.fn mutation semantics", () => {
-  it.effect("interrupts the previous invocation when the same mutation atom is written again", () =>
-    Effect.gen(function* () {
-      const firstLatch = Latch.makeUnsafe();
-      const secondLatch = Latch.makeUnsafe();
-      const interrupted: string[] = [];
-      const mutation = Atom.fn((id: "first" | "second") =>
-        (id === "first" ? firstLatch : secondLatch).await.pipe(
-          Effect.as(id),
-          Effect.onInterrupt(() =>
-            Effect.sync(() => {
-              interrupted.push(id);
-            }),
-          ),
-        ),
-      );
-      const registry = AtomRegistry.make();
-      const unmount = registry.mount(mutation);
-
-      registry.set(mutation, "first");
-      registry.set(mutation, "second");
-      yield* Effect.yieldNow;
-
-      expect(interrupted).toEqual(["first"]);
-
-      secondLatch.openUnsafe();
-      expect(
-        yield* AtomRegistry.getResult(registry, mutation, {
-          suspendOnWaiting: true,
-        }),
-      ).toBe("second");
-
-      unmount();
-      registry.dispose();
-    }),
-  );
-
-  it.effect("keeps stream mutations waiting until the final emitted value", () =>
-    Effect.gen(function* () {
-      const completionLatch = Latch.makeUnsafe();
-      const mutation = Atom.fn(() =>
-        Stream.make("progress").pipe(
-          Stream.concat(Stream.fromEffect(completionLatch.await.pipe(Effect.as("done")))),
-        ),
-      );
-      const registry = AtomRegistry.make();
-      const unmount = registry.mount(mutation);
-
-      registry.set(mutation, undefined);
-
-      const progress = registry.get(mutation);
-      expect(AsyncResult.isSuccess(progress)).toBe(true);
-      if (AsyncResult.isSuccess(progress)) {
-        expect(progress.value).toBe("progress");
-        expect(progress.waiting).toBe(true);
-      }
-
-      completionLatch.openUnsafe();
-      expect(
-        yield* AtomRegistry.getResult(registry, mutation, {
-          suspendOnWaiting: true,
-        }),
-      ).toBe("done");
-
-      unmount();
-      registry.dispose();
-    }),
-  );
-
-  it.effect(
-    "allows concurrent effects to finish but does not correlate results to individual writes",
-    () =>
-      Effect.gen(function* () {
-        const firstLatch = Latch.makeUnsafe();
-        const secondLatch = Latch.makeUnsafe();
-        const mutation = Atom.fn<never, "first" | "second", "first" | "second">(
-          (id: "first" | "second") =>
-            (id === "first" ? firstLatch : secondLatch).await.pipe(Effect.as(id)),
-          { concurrent: true },
-        );
-        const registry = AtomRegistry.make();
-        const unmount = registry.mount(mutation);
-
-        registry.set(mutation, "first");
-        const firstResult = yield* AtomRegistry.getResult(registry, mutation, {
-          suspendOnWaiting: true,
-        }).pipe(Effect.forkChild({ startImmediately: true }));
-        registry.set(mutation, "second");
-        const secondResult = yield* AtomRegistry.getResult(registry, mutation, {
-          suspendOnWaiting: true,
-        }).pipe(Effect.forkChild({ startImmediately: true }));
-
-        secondLatch.openUnsafe();
-        yield* Effect.yieldNow;
-
-        const stillWaiting = registry.get(mutation);
-        expect(stillWaiting.waiting).toBe(true);
-
-        firstLatch.openUnsafe();
-
-        expect(yield* Fiber.join(firstResult)).toBe("first");
-        expect(yield* Fiber.join(secondResult)).toBe("first");
-
-        unmount();
-        registry.dispose();
-      }),
-  );
-});
-
 describe("executeAtomQuery", () => {
   it("keeps concurrent query results correlated to their atoms", async () => {
     const firstLatch = Latch.makeUnsafe();
diff --git a/packages/client-runtime/src/work-log/commandLabel.test.ts b/packages/client-runtime/src/work-log/commandLabel.test.ts
index f6394ee87c56..a7226bf4854f 100644
--- a/packages/client-runtime/src/work-log/commandLabel.test.ts
+++ b/packages/client-runtime/src/work-log/commandLabel.test.ts
@@ -163,13 +163,14 @@ describe("commandProgramName", () => {
     expect(commandProgramName(command)).toBe(program);
   });
 
-  it.each(
-    ["cd /tmp", "export CI=1", "unset DEBUG", "source env.sh", ". env.sh"].flatMap((setup) =>
-      ["&&", " || ", ";", "\n", "|", " |& ", " & "].map(
-        (operator) => [`${setup}${operator}npm test`, "npm"] as const,
-      ),
+  it.each([
+    ...["&&", " || ", ";", "\n", "|", " |& ", " & "].map(
+      (operator) => [`cd /tmp${operator}npm test`, "npm"] as const,
+    ),
+    ...["export CI=1", "unset DEBUG", "source env.sh", ". env.sh"].map(
+      (setup) => [`${setup}&&npm test`, "npm"] as const,
     ),
-  )("handles shell setup followed by every command separator: %s", (command, program) => {
+  ])("handles shell setup followed by every command separator: %s", (command, program) => {
     expect(commandProgramName(command)).toBe(program);
   });
 
diff --git a/packages/contracts/src/keybindings.test.ts b/packages/contracts/src/keybindings.test.ts
index 1491fbe482bd..96f80b4192e3 100644
--- a/packages/contracts/src/keybindings.test.ts
+++ b/packages/contracts/src/keybindings.test.ts
@@ -22,138 +22,6 @@ const decode = <S extends Schema.Top>(
 const decodeResolvedRule = Schema.decodeUnknownEffect(ResolvedKeybindingRule as never);
 const encodeResolvedKeybindings = Schema.encodeEffect(ResolvedKeybindingsConfig);
 
-it.effect("parses keybinding rules", () =>
-  Effect.gen(function* () {
-    const parsed = yield* decode(KeybindingRule, {
-      key: "mod+j",
-      command: "terminal.toggle",
-    });
-    assert.strictEqual(parsed.command, "terminal.toggle");
-
-    const parsedSidebarToggle = yield* decode(KeybindingRule, {
-      key: "mod+b",
-      command: "sidebar.toggle",
-    });
-    assert.strictEqual(parsedSidebarToggle.command, "sidebar.toggle");
-
-    const parsedRightPanelToggle = yield* decode(KeybindingRule, {
-      key: "mod+alt+b",
-      command: "rightPanel.toggle",
-    });
-    assert.strictEqual(parsedRightPanelToggle.command, "rightPanel.toggle");
-
-    const parsedThreadPanelToggle = yield* decode(KeybindingRule, {
-      key: "mod+shift+b",
-      command: "threadPanel.toggle",
-    });
-    assert.strictEqual(parsedThreadPanelToggle.command, "threadPanel.toggle");
-    const parsedRightPanelToggleMaximized = yield* decode(KeybindingRule, {
-      key: "mod+shift+m",
-      command: "rightPanel.toggleMaximized",
-    });
-    assert.strictEqual(parsedRightPanelToggleMaximized.command, "rightPanel.toggleMaximized");
-
-    const parsedClose = yield* decode(KeybindingRule, {
-      key: "mod+w",
-      command: "terminal.close",
-    });
-    assert.strictEqual(parsedClose.command, "terminal.close");
-
-    const parsedDiffToggle = yield* decode(KeybindingRule, {
-      key: "mod+d",
-      command: "diff.toggle",
-    });
-    assert.strictEqual(parsedDiffToggle.command, "diff.toggle");
-
-    const parsedCommandPalette = yield* decode(KeybindingRule, {
-      key: "mod+k",
-      command: "commandPalette.toggle",
-    });
-    assert.strictEqual(parsedCommandPalette.command, "commandPalette.toggle");
-
-    const parsedFilePicker = yield* decode(KeybindingRule, {
-      key: "mod+p",
-      command: "filePicker.toggle",
-    });
-    assert.strictEqual(parsedFilePicker.command, "filePicker.toggle");
-
-    const parsedProjectSearch = yield* decode(KeybindingRule, {
-      key: "mod+shift+f",
-      command: "projectSearch.toggle",
-    });
-    assert.strictEqual(parsedProjectSearch.command, "projectSearch.toggle");
-
-    const parsedUsageOpen = yield* decode(KeybindingRule, {
-      key: "mod+u",
-      command: "usage.open",
-    });
-    assert.strictEqual(parsedUsageOpen.command, "usage.open");
-
-    const parsedThemeEditor = yield* decode(KeybindingRule, {
-      key: "mod+alt+shift+t",
-      command: "themeEditor.toggle",
-    });
-    assert.strictEqual(parsedThemeEditor.command, "themeEditor.toggle");
-
-    const parsedLocal = yield* decode(KeybindingRule, {
-      key: "mod+shift+n",
-      command: "chat.newLocal",
-    });
-    assert.strictEqual(parsedLocal.command, "chat.newLocal");
-
-    const parsedFind = yield* decode(KeybindingRule, {
-      key: "mod+f",
-      command: "chat.find",
-    });
-    assert.strictEqual(parsedFind.command, "chat.find");
-
-    const parsedModelPickerToggle = yield* decode(KeybindingRule, {
-      key: "mod+shift+m",
-      command: "modelPicker.toggle",
-    });
-    assert.strictEqual(parsedModelPickerToggle.command, "modelPicker.toggle");
-
-    const parsedModelPickerJump = yield* decode(KeybindingRule, {
-      key: "mod+1",
-      command: "modelPicker.jump.1",
-    });
-    assert.strictEqual(parsedModelPickerJump.command, "modelPicker.jump.1");
-
-    const parsedThreadPrevious = yield* decode(KeybindingRule, {
-      key: "mod+shift+[",
-      command: "thread.previous",
-    });
-    assert.strictEqual(parsedThreadPrevious.command, "thread.previous");
-
-    const parsedThreadSettle = yield* decode(KeybindingRule, {
-      key: "mod+shift+s",
-      command: "thread.settle",
-      when: "!terminalFocus",
-    });
-    assert.strictEqual(parsedThreadSettle.command, "thread.settle");
-
-    const parsedThreadCopyReference = yield* decode(KeybindingRule, {
-      key: "mod+shift+c",
-      command: "thread.copyReference",
-      when: "!terminalFocus",
-    });
-    assert.strictEqual(parsedThreadCopyReference.command, "thread.copyReference");
-
-    const parsedPullRequestCopyNumber = yield* decode(KeybindingRule, {
-      key: "mod+shift+k",
-      command: "pullRequest.copyNumber",
-      when: "!terminalFocus",
-    });
-    assert.strictEqual(parsedPullRequestCopyNumber.command, "pullRequest.copyNumber");
-
-    const parsedThreadStop = yield* decode(KeybindingRule, {
-      key: "mod+escape",
-      command: "thread.stop",
-    });
-    assert.strictEqual(parsedThreadStop.command, "thread.stop");
-  }),
-);
-
 it.effect("rejects invalid command values", () =>
   Effect.gen(function* () {
     const result = yield* Effect.exit(
diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.ts
index 65a7f9f16e9e..d5364ea2fa8f 100644
--- a/packages/contracts/src/orchestrationV2.ts
+++ b/packages/contracts/src/orchestrationV2.ts
@@ -163,6 +163,19 @@ export const OrchestrationV2ContextTransferResolution = Schema.Union([
 export type OrchestrationV2ContextTransferResolution =
   typeof OrchestrationV2ContextTransferResolution.Type;
 
+export const OrchestrationV2ProviderTurnTokenUsage = Schema.Struct({
+  usedTokens: NonNegativeInt,
+  maxTokens: Schema.optional(Schema.NullOr(NonNegativeInt)),
+  inputTokens: Schema.optional(NonNegativeInt),
+  cachedInputTokens: Schema.optional(NonNegativeInt),
+  outputTokens: Schema.optional(NonNegativeInt),
+  reasoningOutputTokens: Schema.optional(NonNegativeInt),
+  promptCacheTtlMs: Schema.optional(PositiveInt),
+  updatedAt: Schema.String,
+});
+export type OrchestrationV2ProviderTurnTokenUsage =
+  typeof OrchestrationV2ProviderTurnTokenUsage.Type;
+
 export const OrchestrationV2ContextTransfer = Schema.Struct({
   id: ContextTransferId,
   type: OrchestrationV2ContextTransferType,
@@ -171,6 +184,7 @@ export const OrchestrationV2ContextTransfer = Schema.Struct({
   sourcePoint: OrchestrationV2ContextSourcePoint,
   basePoint: Schema.NullOr(OrchestrationV2ContextSourcePoint),
   sourceProviderInstanceId: Schema.NullOr(ProviderInstanceId),
+  sourceTokenUsage: Schema.optional(OrchestrationV2ProviderTurnTokenUsage),
   targetProviderInstanceId: Schema.NullOr(ProviderInstanceId),
   targetRunId: Schema.NullOr(RunId),
   status: Schema.Literals([
@@ -950,19 +964,6 @@ export const OrchestrationV2ContextHandoff = Schema.Struct({
 });
 export type OrchestrationV2ContextHandoff = typeof OrchestrationV2ContextHandoff.Type;
 
-export const OrchestrationV2ProviderTurnTokenUsage = Schema.Struct({
-  usedTokens: NonNegativeInt,
-  maxTokens: Schema.optional(Schema.NullOr(NonNegativeInt)),
-  inputTokens: Schema.optional(NonNegativeInt),
-  cachedInputTokens: Schema.optional(NonNegativeInt),
-  outputTokens: Schema.optional(NonNegativeInt),
-  reasoningOutputTokens: Schema.optional(NonNegativeInt),
-  promptCacheTtlMs: Schema.optional(PositiveInt),
-  updatedAt: Schema.String,
-});
-export type OrchestrationV2ProviderTurnTokenUsage =
-  typeof OrchestrationV2ProviderTurnTokenUsage.Type;
-
 export const OrchestrationV2ProviderTurn = Schema.Struct({
   id: ProviderTurnId,
   providerThreadId: ProviderThreadId,
diff --git a/packages/contracts/src/rpc.test.ts b/packages/contracts/src/rpc.test.ts
index f0c15f65094b..aa396b9ff6a0 100644
--- a/packages/contracts/src/rpc.test.ts
+++ b/packages/contracts/src/rpc.test.ts
@@ -6,12 +6,6 @@ import { ORCHESTRATION_V2_WS_METHODS } from "./orchestrationV2.ts";
 import { WS_METHODS, WsRpcGroup, WsSubscribeServerConfigRpc } from "./rpc.ts";
 
 describe("subscribeServerConfig payload compatibility", () => {
-  it("is accepted by a server whose schema predates the field", () => {
-    const oldServerPayload = Schema.Struct({});
-    const decoded = Schema.decodeExit(oldServerPayload)({ environmentThemes: true });
-    expect(Exit.isSuccess(decoded)).toBe(true);
-  });
-
   it("is carried by a server that declares it", () => {
     const decoded = Schema.decodeSync(WsSubscribeServerConfigRpc.payloadSchema)({
       environmentThemes: true,
diff --git a/packages/contracts/src/settings.test.ts b/packages/contracts/src/settings.test.ts
index c92b3a6a8e1c..9f16bbc74a9d 100644
--- a/packages/contracts/src/settings.test.ts
+++ b/packages/contracts/src/settings.test.ts
@@ -598,7 +598,7 @@ describe("ClientSettings glass opacity", () => {
     expect(() => decodeClientSettingsPatch({ glassOpacity: value })).toThrow();
   });
 
-  it.each([40, 75, 100])("accepts a glass opacity within the supported range: %s", (value) => {
+  it.each([40, 100])("accepts a glass opacity within the supported range: %s", (value) => {
     expect(decodeClientSettings({ glassOpacity: value }).glassOpacity).toBe(value);
     expect(decodeClientSettingsPatch({ glassOpacity: value }).glassOpacity).toBe(value);
   });
@@ -614,7 +614,7 @@ describe("ClientSettings appearance contrast", () => {
     expect(() => decodeClientSettingsPatch({ appearanceContrast: value })).toThrow();
   });
 
-  it.each([50, 100, 150, 200])("accepts an appearance contrast in range: %s", (value) => {
+  it.each([50, 200])("accepts an appearance contrast in range: %s", (value) => {
     expect(decodeClientSettings({ appearanceContrast: value }).appearanceContrast).toBe(value);
     expect(decodeClientSettingsPatch({ appearanceContrast: value }).appearanceContrast).toBe(value);
   });
diff --git a/packages/contracts/src/terminal.test.ts b/packages/contracts/src/terminal.test.ts
index 066253602a49..8dfaa01ad7d6 100644
--- a/packages/contracts/src/terminal.test.ts
+++ b/packages/contracts/src/terminal.test.ts
@@ -125,18 +125,14 @@ describe("TerminalOpenInput", () => {
     expect(parsed.providerInstanceId).toBe("codex_work");
   });
 
-  it("rejects invalid env keys", () => {
-    expect(
-      decodes(TerminalOpenInput, {
-        threadId: "thread-1",
-        cwd: "/tmp/project",
-        cols: 100,
-        rows: 24,
-        env: {
-          "bad-key": "1",
-        },
-      }),
-    ).toBe(false);
+  it("drops invalid env keys while retaining valid overrides", () => {
+    const parsed = decodeSync(TerminalOpenInput, {
+      threadId: "thread-1",
+      terminalId: DEFAULT_TERMINAL_ID,
+      cwd: "/tmp/project",
+      env: { "bad-key": "1", GOOD_KEY: "2" },
+    });
+    expect(parsed.env).toEqual({ GOOD_KEY: "2" });
   });
 
   it("rejects invalid provider instance ids", () => {
diff --git a/packages/provider-acp-registry/src/server/adapter.ts b/packages/provider-acp-registry/src/server/adapter.ts
index 63157b164624..6de4e773ee1c 100644
--- a/packages/provider-acp-registry/src/server/adapter.ts
+++ b/packages/provider-acp-registry/src/server/adapter.ts
@@ -187,6 +187,7 @@ export const makeAcpRegistryAdapterV2 = Effect.fn("makeAcpRegistryAdapterV2")(fu
   const flavor: AcpAdapterV2Flavor = {
     driver: ACP_REGISTRY_PROVIDER,
     capabilities: AcpProviderCapabilitiesV2,
+    customModels: readCustomModelEntries(options.settings.customModels).map((entry) => entry.slug),
     promptFailure: (cause) => acpRegistryPromptFailure(registryAgentId, cause),
     ...(registryAgentId === "mistral-vibe"
       ? { registerExtensions: registerMistralVibeAcpExtensions }
@@ -219,10 +220,10 @@ export const makeAcpRegistryAdapterV2 = Effect.fn("makeAcpRegistryAdapterV2")(fu
               options.instanceId,
               normalizeAcpRegistryCommands(commands),
             ),
-          onSessionConfigurationUpdate: (configOptions, modeState) =>
+          onSessionConfigurationUpdate: (configOptions, modeState, modelState) =>
             runtimeCoordinator.publishLiveConfiguration(
               options.instanceId,
-              normalizeAcpRegistryLiveConfiguration(configOptions, modeState),
+              normalizeAcpRegistryLiveConfiguration(configOptions, modeState, modelState),
             ),
           onUrlElicitation: ({ elicitationId, url, message }) => {
             const normalizedUrl = normalizeAcpRegistryWebUrl(url);
diff --git a/packages/provider-acp-registry/src/server/probe.ts b/packages/provider-acp-registry/src/server/probe.ts
index 52bf5f505fc7..ba50b57461fa 100644
--- a/packages/provider-acp-registry/src/server/probe.ts
+++ b/packages/provider-acp-registry/src/server/probe.ts
@@ -59,31 +59,36 @@ export function normalizeAcpRegistryWebUrl(value: string): string | undefined {
   return url.protocol === "https:" || url.protocol === "http:" ? url.href : undefined;
 }
 
+function normalizedModel(id: string, candidate: AcpRegistryProbeModel): AcpRegistryProbeModel {
+  return {
+    id,
+    name: boundedText(candidate.name, MAX_NAME_LENGTH) || id,
+    description:
+      candidate.description === null
+        ? null
+        : boundedText(candidate.description, MAX_DESCRIPTION_LENGTH) || null,
+  };
+}
+
 function normalizeModels(
-  modelChoices: ReadonlyArray<EffectAcpSchema.SessionConfigSelectOption>,
+  candidates: ReadonlyArray<AcpRegistryProbeModel>,
+  currentModelId: string | null,
 ): ReadonlyArray<AcpRegistryProbeModel> {
-  // Model discovery is the model config option's base models; ACP has no
-  // other portable model inventory.
-  const candidates = modelChoices.map((model) => ({
-    id: model.value,
-    name: model.name,
-    description: model.description ?? null,
-  }));
   const seen = new Set<string>();
   const models: Array<AcpRegistryProbeModel> = [];
   for (const candidate of candidates) {
+    if (models.length === MAX_MODELS) break;
     const id = boundedOpaqueValue(candidate.id, MAX_ID_LENGTH);
     if (id === undefined || seen.has(id)) continue;
     seen.add(id);
-    models.push({
-      id,
-      name: boundedText(candidate.name, MAX_NAME_LENGTH) || id,
-      description:
-        candidate.description === null
-          ? null
-          : boundedText(candidate.description, MAX_DESCRIPTION_LENGTH) || null,
-    });
-    if (models.length === MAX_MODELS) break;
+    models.push(normalizedModel(id, candidate));
+  }
+  // Keep the running model visible even when its advertised position exceeds the cap.
+  if (currentModelId !== null && models.length === MAX_MODELS && !seen.has(currentModelId)) {
+    const current = candidates.find((candidate) => candidate.id === currentModelId);
+    if (current !== undefined) {
+      models[MAX_MODELS - 1] = normalizedModel(currentModelId, current);
+    }
   }
   return models;
 }
@@ -168,13 +173,28 @@ export interface AcpRegistryLiveConfiguration {
 export function normalizeAcpRegistryLiveConfiguration(
   configOptions: ReadonlyArray<EffectAcpSchema.SessionConfigOption>,
   modeState?: Parameters<typeof acpProviderOptionDescriptors>[0]["modeState"],
+  modelState?: EffectAcpSchema.SessionModelState | null,
 ): AcpRegistryLiveConfiguration {
   const modelOption = findModelConfigOption(configOptions);
-  const boundedCurrentModelId =
+  const currentModelId =
+    modelOption?.type === "select" ? modelOption.currentValue : modelState?.currentModelId;
+  const candidates =
     modelOption === undefined
+      ? (modelState?.availableModels ?? []).map((model) => ({
+          id: model.modelId,
+          name: model.name,
+          description: model.description ?? null,
+        }))
+      : flattenSelectChoices(modelOption.options).map((model) => ({
+          id: model.value,
+          name: model.name,
+          description: model.description ?? null,
+        }));
+  const boundedCurrentModelId =
+    currentModelId === undefined
       ? null
-      : (boundedOpaqueValue(modelOption.currentValue, MAX_ID_LENGTH) ?? null);
-  const models = normalizeModels(flattenSelectChoices(modelOption?.options ?? []));
+      : (boundedOpaqueValue(currentModelId, MAX_ID_LENGTH) ?? null);
+  const models = normalizeModels(candidates, boundedCurrentModelId);
   return {
     models,
     currentModelId: models.some((model) => model.id === boundedCurrentModelId)
@@ -236,6 +256,7 @@ export function acpRegistryProbeResult(
   const liveConfiguration = normalizeAcpRegistryLiveConfiguration(
     started.sessionSetupResult.configOptions ?? [],
     parseSessionModeState(started.sessionSetupResult),
+    started.sessionSetupResult.models,
   );
   return AcpRegistryProbeResult.make({
     instanceId,
diff --git a/packages/provider-acp/src/server/adapter.ts b/packages/provider-acp/src/server/adapter.ts
index 5d7ea0b7d288..5aaac47c943b 100644
--- a/packages/provider-acp/src/server/adapter.ts
+++ b/packages/provider-acp/src/server/adapter.ts
@@ -217,6 +217,7 @@ export interface AcpAdapterV2Flavor {
   readonly onSessionConfigurationUpdate?: (
     configOptions: ReadonlyArray<EffectAcpSchema.SessionConfigOption>,
     modeState: AcpSessionModeState | undefined,
+    modelState: EffectAcpSchema.SessionModelState | null | undefined,
   ) => Effect.Effect<void>;
   readonly onUrlElicitation?: (input: {
     readonly elicitationId: string;
@@ -231,6 +232,7 @@ export interface AcpAdapterV2Flavor {
     EffectAcpErrors.AcpError,
     ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
   >;
+  readonly customModels?: ReadonlyArray<string>;
   readonly resolveModelId?: (selection: ModelSelection) => string | undefined;
   readonly getModelContextWindow?: (
     selection: ModelSelection,
@@ -516,14 +518,15 @@ function negotiatedCapabilities(
   const agent = started.initializeResult.agentCapabilities ?? {};
   const session = agent.sessionCapabilities;
   const setup = started.sessionSetupResult;
-  const hasModelConfig = findModelConfigOption(setup.configOptions) !== undefined;
+  const canSwitchModel =
+    findModelConfigOption(setup.configOptions) !== undefined || setup.models != null;
   const canLoad = agent.loadSession === true;
   const canFork = session?.fork != null;
   return {
     ...base,
     sessions: {
       ...base.sessions,
-      supportsModelSwitchInSession: hasModelConfig,
+      supportsModelSwitchInSession: canSwitchModel,
     },
     threads: {
       ...base.threads,
@@ -5129,6 +5132,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                   flavor.onSessionConfigurationUpdate?.(
                     yield* runtime.getConfigOptions,
                     yield* runtime.getModeState,
+                    (yield* Ref.get(activeSessionSetup))?.sessionSetupResult.models,
                   ) ?? Effect.void
                 );
               }
@@ -5904,13 +5908,33 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
               startResult,
               modelSelection,
             });
-          } else if (
-            requestedModel.length > 0 &&
-            requestedModel !== "auto" &&
-            requestedModel !== "default"
-          ) {
-            if (findModelConfigOption(startResult.sessionSetupResult.configOptions) !== undefined) {
-              yield* runtime.setModel(requestedModel);
+          } else if (requestedModel.length > 0) {
+            // Stored catalog choices can expire; explicitly configured custom IDs
+            // are validated by the agent instead.
+            const isCustomModel = flavor.customModels?.includes(requestedModel) === true;
+            const modelOption = findModelConfigOption(yield* runtime.getConfigOptions);
+            const modelState = startResult.sessionSetupResult.models;
+            if (modelOption?.type === "select") {
+              if (
+                isCustomModel ||
+                modelOption.options.some((entry) =>
+                  "value" in entry
+                    ? entry.value === requestedModel
+                    : entry.options.some((choice) => choice.value === requestedModel),
+                )
+              ) {
+                yield* runtime.setConfigOption(modelOption.id, requestedModel);
+                appliedModel = requestedModel;
+              }
+            } else if (
+              modelState != null &&
+              (isCustomModel ||
+                modelState.availableModels.some((model) => model.modelId === requestedModel))
+            ) {
+              if (modelState.currentModelId !== requestedModel) {
+                yield* runtime.setSessionModel(requestedModel);
+              }
+              appliedModel = requestedModel;
             }
           }
           if (appliedModel !== undefined) {
@@ -6078,6 +6102,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
             flavor.onSessionConfigurationUpdate?.(
               yield* runtime.getConfigOptions,
               yield* runtime.getModeState,
+              (yield* Ref.get(activeSessionSetup))?.sessionSetupResult.models,
             ) ?? Effect.void
           );
         });
diff --git a/packages/shared/src/cliArgs.test.ts b/packages/shared/src/cliArgs.test.ts
index 58ef904b81ec..98f6f858021c 100644
--- a/packages/shared/src/cliArgs.test.ts
+++ b/packages/shared/src/cliArgs.test.ts
@@ -66,20 +66,6 @@ describe("parseCliArgs", () => {
     });
   });
 
-  it("parses --chrome with --verbose", () => {
-    expect(parseCliArgs("--chrome --verbose")).toEqual({
-      flags: { chrome: null, verbose: null },
-      positionals: [],
-    });
-  });
-
-  it("parses --effort with a value", () => {
-    expect(parseCliArgs("--effort high")).toEqual({
-      flags: { effort: "high" },
-      positionals: [],
-    });
-  });
-
   it("parses --chrome --effort high --debug", () => {
     expect(parseCliArgs("--chrome --effort high --debug")).toEqual({
       flags: { chrome: null, effort: "high", debug: null },
@@ -87,20 +73,6 @@ describe("parseCliArgs", () => {
     });
   });
 
-  it("parses --model with full model name", () => {
-    expect(parseCliArgs("--model claude-sonnet-4-6")).toEqual({
-      flags: { model: "claude-sonnet-4-6" },
-      positionals: [],
-    });
-  });
-
-  it("parses --append-system-prompt with value and --chrome", () => {
-    expect(parseCliArgs("--append-system-prompt always-think-step-by-step --chrome")).toEqual({
-      flags: { "append-system-prompt": "always-think-step-by-step", chrome: null },
-      positionals: [],
-    });
-  });
-
   it("parses quoted --append-system-prompt with value and --chrome", () => {
     expect(parseCliArgs(`--append-system-prompt "always think step by step" --chrome`)).toEqual({
       flags: { "append-system-prompt": "always think step by step", chrome: null },
@@ -108,20 +80,6 @@ describe("parseCliArgs", () => {
     });
   });
 
-  it("parses --max-budget-usd with numeric value", () => {
-    expect(parseCliArgs("--chrome --max-budget-usd 5.00")).toEqual({
-      flags: { chrome: null, "max-budget-usd": "5.00" },
-      positionals: [],
-    });
-  });
-
-  it("parses --effort=high syntax", () => {
-    expect(parseCliArgs("--effort=high")).toEqual({
-      flags: { effort: "high" },
-      positionals: [],
-    });
-  });
-
   it("parses --key=value mixed with boolean flags", () => {
     expect(parseCliArgs("--chrome --model=claude-sonnet-4-6 --debug")).toEqual({
       flags: { chrome: null, model: "claude-sonnet-4-6", debug: null },
diff --git a/packages/shared/src/composerInlineTokens.test.ts b/packages/shared/src/composerInlineTokens.test.ts
index 20700b06e607..c7e104b5d2f1 100644
--- a/packages/shared/src/composerInlineTokens.test.ts
+++ b/packages/shared/src/composerInlineTokens.test.ts
@@ -31,22 +31,19 @@ describe("collectComposerInlineTokens", () => {
     ]);
   });
 
-  it.each(["$", "€", "£", "¥", "₹", "₩", "₿", "𑿝"])(
-    "collects %s skill names that begin with a digit",
-    (prefix) => {
-      expect(collectComposerInlineTokens(`Use ${prefix}2spec next`)).toEqual([
-        {
-          type: "skill",
-          value: "2spec",
-          source: `${prefix}2spec`,
-          start: 4,
-          end: 9 + prefix.length,
-        },
-      ]);
-    },
-  );
+  it.each(["$", "€", "𑿝"])("collects %s skill names that begin with a digit", (prefix) => {
+    expect(collectComposerInlineTokens(`Use ${prefix}2spec next`)).toEqual([
+      {
+        type: "skill",
+        value: "2spec",
+        source: `${prefix}2spec`,
+        start: 4,
+        end: 9 + prefix.length,
+      },
+    ]);
+  });
 
-  it.each(["€", "£", "¥", "₹", "₩", "₿", "𑿝"])("leaves %s currency amounts as text", (prefix) => {
+  it.each(["€", "𑿝"])("leaves %s currency amounts as text", (prefix) => {
     expect(
       collectComposerInlineTokens(
         `${prefix}20 ${prefix}1_000 ${prefix}20k ${prefix}100M ${prefix}1e6 `,
diff --git a/packages/shared/src/composerTrigger.test.ts b/packages/shared/src/composerTrigger.test.ts
index c6fce0ffd9a6..5cccaf1749ea 100644
--- a/packages/shared/src/composerTrigger.test.ts
+++ b/packages/shared/src/composerTrigger.test.ts
@@ -43,18 +43,15 @@ describe("detectComposerTrigger", () => {
     (text) => expect(detectComposerTrigger(text, text.length)).toBeNull(),
   );
 
-  it.each(["$", "€", "£", "¥", "₹", "₩", "₿", "𑿝"])(
-    "detects %s skill prefixes and their source range",
-    (prefix) => {
-      const text = `Use ${prefix}review`;
-      expect(detectComposerTrigger(text, text.length)).toEqual({
-        kind: "skill",
-        query: "review",
-        rangeStart: 4,
-        rangeEnd: text.length,
-      });
-    },
-  );
+  it.each(["$", "€", "𑿝"])("detects %s skill prefixes and their source range", (prefix) => {
+    const text = `Use ${prefix}review`;
+    expect(detectComposerTrigger(text, text.length)).toEqual({
+      kind: "skill",
+      query: "review",
+      rangeStart: 4,
+      rangeEnd: text.length,
+    });
+  });
 });
 
 describe("serializeComposerFileLink", () => {
diff --git a/packages/shared/src/image.test.ts b/packages/shared/src/image.test.ts
index 1699c4e65345..00354f6e749b 100644
--- a/packages/shared/src/image.test.ts
+++ b/packages/shared/src/image.test.ts
@@ -29,26 +29,10 @@ describe("imageMimeType", () => {
   });
 });
 
-describe("legacy attachments", () => {
-  it("recognizes a picture that was sent before pictures were typed by content", () => {
-    expect(imageMimeType({ name: "IMG_4996.PNG", mimeType: "application/octet-stream" })).toBe(
-      "image/png",
-    );
-    expect(imageMimeType({ name: "1000000020.png", mimeType: "" })).toBe("image/png");
-  });
-});
-
 describe("a declared non-image type", () => {
   it("wins over a misleading picture extension", () => {
     expect(imageMimeType({ name: "report.png", mimeType: "application/pdf" })).toBeNull();
     expect(imageMimeType({ name: "archive.jpg", mimeType: "application/zip" })).toBeNull();
     expect(imageMimeType({ name: "clip.png", mimeType: "video/mp4" })).toBeNull();
   });
-
-  it("still falls back when the type is absent or generic", () => {
-    expect(imageMimeType({ name: "IMG_4996.PNG", mimeType: "application/octet-stream" })).toBe(
-      "image/png",
-    );
-    expect(imageMimeType({ name: "1000000020.png", mimeType: "" })).toBe("image/png");
-  });
 });
diff --git a/packages/shared/src/model.test.ts b/packages/shared/src/model.test.ts
index 7595ef47560d..31a95bac2344 100644
--- a/packages/shared/src/model.test.ts
+++ b/packages/shared/src/model.test.ts
@@ -164,22 +164,6 @@ describe("descriptor helpers", () => {
     ).toEqual([{ id: "fastMode", value: true }]);
   });
 
-  it("stores option selection arrays in model selections", () => {
-    expect(
-      createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [
-        { id: "reasoningEffort", value: "high" },
-        { id: "fastMode", value: true },
-      ]),
-    ).toEqual({
-      instanceId: "codex",
-      model: "gpt-5.4",
-      options: [
-        { id: "reasoningEffort", value: "high" },
-        { id: "fastMode", value: true },
-      ],
-    });
-  });
-
   it("reads typed option selection values", () => {
     const selection = createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [
       { id: "reasoningEffort", value: "high" },
diff --git a/packages/shared/src/nodeSqliteClient.test.ts b/packages/shared/src/nodeSqliteClient.test.ts
index 3010122fc712..a50fda417eb8 100644
--- a/packages/shared/src/nodeSqliteClient.test.ts
+++ b/packages/shared/src/nodeSqliteClient.test.ts
@@ -9,6 +9,8 @@ import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as Path from "effect/Path";
+import * as Scheduler from "effect/Scheduler";
+import type * as Scope from "effect/Scope";
 import * as SqlClient from "effect/sql/SqlClient";
 import * as Statement from "effect/sql/Statement";
 import * as TestClock from "effect/testing/TestClock";
@@ -758,7 +760,8 @@ const withCheckpointClient = <A, E>(
   use: (
     sql: SqlClient.SqlClient,
     filename: string,
-  ) => Effect.Effect<A, E, SqlClient.SqlClient | FileSystem.FileSystem>,
+  ) => Effect.Effect<A, E, SqlClient.SqlClient | FileSystem.FileSystem | Scope.Scope>,
+  options: { readonly readerWorker?: boolean } = {},
 ) =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
@@ -769,15 +772,31 @@ const withCheckpointClient = <A, E>(
       const sql = yield* SqlClient.SqlClient;
       yield* sql`PRAGMA journal_mode = WAL`;
       return yield* use(sql, filename);
-    }).pipe(Effect.provide(SqliteClient.layer({ filename, checkpointWorker: true })));
+    }).pipe(Effect.provide(SqliteClient.layer({ filename, checkpointWorker: true, ...options })));
   }).pipe(Effect.scoped, Effect.provide(NodeServices.layer));
 
+const supportsNoopCheckpoint = (() => {
+  const db = new NodeSqlite.DatabaseSync(":memory:");
+  const version = String(db.prepare("SELECT sqlite_version() AS version").get()?.version);
+  db.close();
+  const [major = 0, minor = 0] = version.split(".").map(Number);
+  return major > 3 || (major === 3 && minor >= 51);
+})();
+
 const checkpointWorkerReply = (worker: NodeWorkerThreads.Worker) =>
   Effect.promise(
     () =>
       new Promise<void>((resolve) => {
+        let replies = 0;
         const onReply = (reply: unknown) => {
           if (reply !== "barrier") return;
+          if (++replies < 2) {
+            // One checkpoint response may queue a coalesced follow-up behind the first barrier.
+            // A second barrier observes that follow-up and makes the helper deterministic.
+            // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
+            worker.postMessage("barrier");
+            return;
+          }
           worker.off("message", onReply);
           resolve();
         };
@@ -787,18 +806,218 @@ const checkpointWorkerReply = (worker: NodeWorkerThreads.Worker) =>
       }),
   );
 
+const waitForCheckpointMessage = (worker: NodeWorkerThreads.Worker, id: unknown) =>
+  new Promise<Record<string, unknown>>((resolve) => {
+    const onMessage = (message: unknown) => {
+      if (
+        typeof message === "object" &&
+        message !== null &&
+        "type" in message &&
+        message.type === "checkpoint" &&
+        "id" in message &&
+        message.id === id
+      ) {
+        worker.off("message", onMessage);
+        resolve(message as Record<string, unknown>);
+      }
+    };
+    worker.on("message", onMessage);
+  });
+
+const waitForTruncateCompletion = (worker: NodeWorkerThreads.Worker) =>
+  new Promise<Record<string, unknown>>((resolve) => {
+    const onMessage = (message: unknown) => {
+      if (
+        typeof message === "object" &&
+        message !== null &&
+        "type" in message &&
+        message.type === "checkpoint" &&
+        "truncateId" in message &&
+        typeof message.truncateId === "number"
+      ) {
+        worker.off("message", onMessage);
+        resolve(message as Record<string, unknown>);
+      }
+    };
+    worker.on("message", onMessage);
+  });
+
+const holdWorkerMessage = (worker: NodeWorkerThreads.Worker, type: string) => {
+  const emit = worker.emit.bind(worker) as (
+    eventName: string | symbol,
+    ...args: unknown[]
+  ) => boolean;
+  let held: unknown;
+  let resolve: (message: unknown) => void = () => {};
+  const ready = new Promise<unknown>((done) => {
+    resolve = done;
+  });
+  const spy = vi.spyOn(worker, "emit").mockImplementation((eventName, ...args) => {
+    const message = args[0];
+    if (
+      eventName === "message" &&
+      held === undefined &&
+      typeof message === "object" &&
+      message !== null &&
+      "type" in message &&
+      message.type === type
+    ) {
+      held = message;
+      resolve(message);
+      return true;
+    }
+    return emit(eventName, ...args);
+  });
+  return {
+    ready,
+    deliver() {
+      spy.mockRestore();
+      if (held !== undefined) emit("message", held);
+    },
+    release() {
+      spy.mockRestore();
+      if (held !== undefined) emit("message", held);
+    },
+  };
+};
+
+const schedulerHoldingDispatch = (afterResume = false) => {
+  let resuming = false;
+  let yielded = false;
+  let resolveContinuation = () => {};
+  const continuation = new Promise<void>((resolve) => {
+    resolveContinuation = resolve;
+  });
+  let holdNext = false;
+  let heldTask: (() => void) | undefined;
+  let resolvePaused: () => void = () => {};
+  const paused = new Promise<void>((resolve) => {
+    resolvePaused = resolve;
+  });
+  const mixed = new Scheduler.MixedScheduler("async", (task) => {
+    if (holdNext) {
+      holdNext = false;
+      heldTask = task;
+      if (resuming) resolveContinuation();
+      else resolvePaused();
+      return () => {
+        if (heldTask === task) heldTask = undefined;
+      };
+    }
+    const immediate = setImmediate(task);
+    return () => clearImmediate(immediate);
+  });
+  const scheduler: Scheduler.Scheduler = {
+    executionMode: mixed.executionMode,
+    makeDispatcher: () => mixed.makeDispatcher(),
+    shouldYield: () => {
+      if (resuming && afterResume && !yielded) {
+        yielded = true;
+        holdNext = true;
+        return true;
+      }
+      return false;
+    },
+  };
+  return {
+    scheduler,
+    paused,
+    continuation,
+    arm() {
+      holdNext = true;
+    },
+    resume() {
+      const task = heldTask;
+      heldTask = undefined;
+      if (task !== undefined)
+        setImmediate(() => {
+          resuming = true;
+          task();
+          resuming = false;
+        });
+    },
+  };
+};
+
+const pauseCheckpointRequests = (worker: NodeWorkerThreads.Worker) => {
+  const queued: Array<Parameters<typeof worker.postMessage>> = [];
+  const send = worker.postMessage.bind(worker);
+  const spy = vi.spyOn(worker, "postMessage").mockImplementation((...args) => {
+    queued.push(args);
+  });
+  let restored = false;
+  return {
+    queued,
+    sendNext() {
+      const args = queued.shift();
+      if (args !== undefined) send(...args);
+      return args?.[0];
+    },
+    release() {
+      if (restored) return;
+      restored = true;
+      spy.mockRestore();
+      for (const args of queued.splice(0)) send(...args);
+    },
+  };
+};
+
+const blockCheckpointBehindReader = (
+  sql: SqlClient.SqlClient,
+  filename: string,
+  worker: NodeWorkerThreads.Worker,
+) =>
+  Effect.gen(function* () {
+    yield* sql.unsafe("PRAGMA journal_size_limit = 1").unprepared;
+    yield* sql.unsafe("CREATE TABLE entries(value INTEGER PRIMARY KEY)").unprepared;
+    yield* sql.unsafe("CREATE TABLE pages(payload BLOB)").unprepared;
+    const reader = yield* Effect.acquireRelease(
+      Effect.sync(() => new NodeSqlite.DatabaseSync(filename)),
+      (database) => Effect.sync(() => database.close()),
+    );
+    reader.exec("BEGIN");
+    reader.prepare("SELECT COUNT(*) AS count FROM entries").get();
+
+    const checkpointRequests = pauseCheckpointRequests(worker);
+    yield* Effect.addFinalizer(() => Effect.sync(checkpointRequests.release));
+    yield* sql.unsafe(`
+      WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < 1200)
+      INSERT INTO pages(payload) SELECT randomblob(4000) FROM n
+    `).unprepared;
+
+    const request = checkpointRequests.queued[0]?.[0];
+    assert(typeof request === "object" && request !== null && "id" in request);
+    const blocked = waitForCheckpointMessage(worker, (request as { readonly id: unknown }).id);
+    checkpointRequests.sendNext();
+    const state = yield* Effect.promise(() => blocked);
+    assert.isTrue(state.blocked as boolean);
+    assert.isAbove(state.log as number, 0);
+    return { reader, checkpointRequests };
+  });
+
+const readCheckpointState = (db: NodeSqlite.DatabaseSync) => {
+  const state = db.prepare("PRAGMA wal_checkpoint(NOOP)").get();
+  if (typeof state?.log !== "number" || typeof state.checkpointed !== "number") {
+    throw new Error("SQLite returned invalid WAL checkpoint frame counts");
+  }
+  return { log: state.log, checkpointed: state.checkpointed };
+};
+
 it.effect("checkpoints the WAL on the worker instead of the writer", () =>
   withCheckpointClient((sql, filename) =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
       const walSize = Effect.map(fs.stat(`${filename}-wal`), (info) => Number(info.size));
       const worker = startedWorkers.at(-1)!;
+      const checkpointRequests = pauseCheckpointRequests(worker);
+      yield* Effect.addFinalizer(() => Effect.sync(checkpointRequests.release));
       const limit = 1024 * 1024;
       yield* sql.unsafe(`PRAGMA journal_size_limit = ${limit}`);
       const autocheckpoint = yield* sql<{
         readonly wal_autocheckpoint: number;
       }>`PRAGMA wal_autocheckpoint`;
-      assert.equal(autocheckpoint[0]?.wal_autocheckpoint, 10_000);
+      assert.equal(autocheckpoint[0]?.wal_autocheckpoint, 0);
+      assert.deepEqual(yield* sql`PRAGMA synchronous`, [{ synchronous: 2 }]);
 
       // About 1200 frames, past the 1000 that start a checkpoint.
       yield* sql`CREATE TABLE pages(payload BLOB)`;
@@ -806,21 +1025,78 @@ it.effect("checkpoints the WAL on the worker instead of the writer", () =>
         WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < 1200)
         INSERT INTO pages(payload) SELECT randomblob(4000) FROM n
       `;
+      const pending = yield* sql<{
+        readonly log: number;
+        readonly checkpointed: number;
+      }>`PRAGMA wal_checkpoint(NOOP)`;
+      assert.isAbove(pending[0]!.log, 1000);
+      assert.isBelow(pending[0]!.checkpointed, pending[0]!.log);
+      checkpointRequests.release();
       yield* checkpointWorkerReply(worker);
       const wal = yield* sql<{
         readonly log: number;
         readonly checkpointed: number;
       }>`PRAGMA wal_checkpoint(NOOP)`;
-      assert.isAbove(wal[0]!.log, 1000);
-      assert.equal(wal[0]!.checkpointed, wal[0]!.log);
+      assert.isAtMost(wal[0]!.log - wal[0]!.checkpointed, 1000);
 
-      assert.isAbove(yield* walSize, limit);
+      assert.isAtMost(yield* walSize, limit);
       yield* sql`INSERT INTO pages(payload) VALUES (x'00')`;
       assert.isAtMost(yield* walSize, limit);
     }),
   ),
 );
 
+it.effect.skipIf(!supportsNoopCheckpoint)(
+  "answers checks received while the worker waits for truncation acknowledgement",
+  () =>
+    withCheckpointClient((sql) =>
+      Effect.gen(function* () {
+        const worker = startedWorkers.at(-1)!;
+        const send = worker.postMessage.bind(worker);
+        const truncateRequest = holdWorkerMessage(worker, "truncate-request");
+        yield* Effect.addFinalizer(() => Effect.sync(truncateRequest.release));
+        const checkpointRequests = pauseCheckpointRequests(worker);
+        yield* Effect.addFinalizer(() => Effect.sync(checkpointRequests.release));
+        const replies: Array<unknown> = [];
+        const onMessage = (message: unknown) => replies.push(message);
+        worker.on("message", onMessage);
+        yield* Effect.addFinalizer(() => Effect.sync(() => worker.off("message", onMessage)));
+
+        yield* sql.unsafe("PRAGMA journal_size_limit = 1").unprepared;
+        yield* sql.unsafe("CREATE TABLE pages(payload BLOB)").unprepared;
+        yield* sql.unsafe(`
+          WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < 1200)
+          INSERT INTO pages(payload) SELECT randomblob(4000) FROM n
+        `).unprepared;
+        checkpointRequests.sendNext();
+        const pending = yield* Effect.promise(() => truncateRequest.ready);
+        assert(typeof pending === "object" && pending !== null && "generation" in pending);
+        assert.equal(typeof pending.generation, "number");
+
+        // Queue a newer check before allowing the main thread to acknowledge truncation.
+        send({ type: "check", id: "during-truncate", generation: Number(pending.generation) + 1 });
+        truncateRequest.deliver();
+        checkpointRequests.release();
+        yield* checkpointWorkerReply(worker);
+        const reply = replies.find(
+          (message) =>
+            typeof message === "object" &&
+            message !== null &&
+            "id" in message &&
+            message.id === "during-truncate",
+        );
+        assert.include(reply, {
+          type: "checkpoint",
+          id: "during-truncate",
+          generation: pending.generation,
+          blocked: true,
+        });
+        yield* sql.unsafe("INSERT INTO pages(payload) VALUES (x'00')").unprepared;
+        assert.deepEqual(yield* sql`SELECT COUNT(*) AS count FROM pages`, [{ count: 1201 }]);
+      }),
+    ),
+);
+
 it.effect("hands checkpoints back to the writer when the worker stops", () =>
   withCheckpointClient((sql) =>
     Effect.gen(function* () {
@@ -1004,3 +1280,439 @@ it.effect.each([
       );
     }).pipe(Effect.provide(SqliteClient.layer({ filename: ":memory:" }))),
 );
+
+const openDatabase = (filename: string) =>
+  Effect.acquireRelease(
+    Effect.sync(() => new NodeSqlite.DatabaseSync(filename)),
+    (db) => Effect.sync(() => db.close()),
+  );
+
+it.effect.each([false, true])(
+  "bounds a busy truncate without gating a reset WAL (resetDuringHandoff=%s)",
+  (resetDuringHandoff) =>
+    withCheckpointClient((sql, filename) =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const worker = startedWorkers.at(-1)!;
+        const reader = yield* openDatabase(filename);
+        const observer = yield* openDatabase(filename);
+        const limit = 1024 * 1024;
+        const requests = pauseCheckpointRequests(worker);
+        yield* Effect.addFinalizer(() => Effect.sync(requests.release));
+        const truncation = holdWorkerMessage(worker, "truncate-request");
+        yield* Effect.addFinalizer(() => Effect.sync(truncation.release));
+        yield* sql.unsafe(`PRAGMA journal_size_limit = ${limit}`).unprepared;
+        yield* sql`CREATE TABLE pages(payload BLOB)`;
+        yield* sql`
+          WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < 1200)
+          INSERT INTO pages(payload) SELECT zeroblob(4000) FROM n
+        `;
+        // Reading before PASSIVE pins the last WAL frame even when every frame is copied.
+        reader.exec("BEGIN");
+        assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM pages").get()?.count, 1200);
+        requests.sendNext();
+        yield* Effect.promise(() => truncation.ready);
+        const copied = readCheckpointState(observer);
+        assert.equal(copied.checkpointed, copied.log);
+        assert.isAbove(copied.log, 1000);
+        assert.isBelow(copied.log, 10_000);
+        assert.isAbove(Number((yield* fs.stat(`${filename}-wal`)).size), limit);
+
+        if (resetDuringHandoff) {
+          // Another connection can reset the WAL before the main thread acknowledges truncation.
+          reader.exec("ROLLBACK");
+          assert.equal(observer.prepare("PRAGMA wal_checkpoint(TRUNCATE)").get()?.busy, 0);
+          observer.exec("INSERT INTO pages VALUES (x'01')");
+          reader.exec("BEGIN");
+          assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM pages").get()?.count, 1201);
+          assert.isAbove(readCheckpointState(observer).log, 0);
+          assert.isBelow(readCheckpointState(observer).log, 10_000);
+          assert.isAtMost(Number((yield* fs.stat(`${filename}-wal`)).size), limit);
+        }
+
+        const completed = waitForTruncateCompletion(worker);
+        requests.release();
+        const started = performance.now();
+        truncation.deliver();
+        const write = yield* Effect.forkChild(sql`INSERT INTO pages VALUES (x'02')`, {
+          startImmediately: true,
+        });
+        const reply = yield* Effect.promise(() => completed);
+        const elapsed = performance.now() - started;
+        assert.equal(reply.log, reply.checkpointed);
+        if (resetDuringHandoff) {
+          yield* Fiber.join(write);
+          assert.deepEqual(yield* sql`SELECT COUNT(*) AS count FROM pages`, [{ count: 1202 }]);
+          assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM pages").get()?.count, 1201);
+        } else {
+          yield* eventLoopTurn;
+          assert.isUndefined(write.pollUnsafe(), "the physical size limit must still gate writes");
+          assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM pages").get()?.count, 1200);
+        }
+        reader.exec("ROLLBACK");
+        yield* checkpointWorkerReply(worker);
+        yield* Fiber.join(write);
+        yield* sql`INSERT INTO pages VALUES (x'03')`;
+        assert.deepEqual(yield* sql`SELECT COUNT(*) AS count FROM pages`, [
+          { count: resetDuringHandoff ? 1203 : 1202 },
+        ]);
+        assert.isAtMost(Number((yield* fs.stat(`${filename}-wal`)).size), limit);
+        assert.equal(reply.blocked, !resetDuringHandoff);
+        // Both implementations eventually reply; only a bound distinguishes SQLite's 5s busy wait.
+        assert.isBelow(elapsed, 1000, "TRUNCATE must return promptly while the reader stays open");
+      }),
+    ),
+  { skip: !supportsNoopCheckpoint, timeout: 15_000 },
+);
+
+it.effect.each(["statement", "commit", "rollback", "partial failure", "worker failure"] as const)(
+  "bounds a real WAL backlog and resumes writes (%s)",
+  (mode) =>
+    withCheckpointClient(
+      (sql, filename) =>
+        Effect.gen(function* () {
+          const worker = startedWorkers.at(-1)!;
+          yield* sql`PRAGMA journal_size_limit = 1048576`;
+          yield* sql`CREATE TABLE pages(id INTEGER PRIMARY KEY, payload BLOB)`;
+          yield* sql`INSERT INTO pages VALUES (12001, x'00')`;
+          yield* checkpointWorkerReply(worker);
+          const reader = yield* openDatabase(filename);
+          const observer = yield* openDatabase(filename);
+          reader.exec("BEGIN");
+          reader.prepare("SELECT COUNT(*) FROM pages").get();
+          const requests = pauseCheckpointRequests(worker);
+          yield* Effect.addFinalizer(() => Effect.sync(requests.release));
+          const insert = sql.unsafe(`
+        WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < ${mode === "partial failure" ? 12001 : 12000})
+        INSERT OR FAIL INTO pages SELECT i, zeroblob(4000) FROM n ORDER BY i
+      `).unprepared;
+          if (mode === "commit" || mode === "rollback") {
+            const result = yield* sql
+              .withTransaction(
+                Effect.gen(function* () {
+                  yield* insert;
+                  // Admission must not prevent an active transaction from finishing.
+                  yield* sql`INSERT INTO pages VALUES (12002, x'00')`;
+                  assert.deepEqual(yield* sql`SELECT COUNT(*) AS count FROM pages`, [
+                    { count: 12002 },
+                  ]);
+                  if (mode === "rollback") return yield* Effect.fail("rollback");
+                }),
+              )
+              .pipe(Effect.exit);
+            assert.equal(result._tag, mode === "rollback" ? "Failure" : "Success");
+          } else if (mode === "partial failure") {
+            const error = yield* insert.pipe(Effect.flip);
+            assert.equal(error.reason._tag, "ConstraintError");
+          } else yield* insert;
+
+          if (mode !== "rollback") {
+            assert.isAbove(
+              readCheckpointState(observer).log - readCheckpointState(observer).checkpointed,
+              10_000,
+            );
+          }
+          const finished = yield* Deferred.make<void>();
+          const write = yield* Effect.forkChild(
+            sql`INSERT INTO pages VALUES (12003, x'00')`.pipe(
+              Effect.andThen(Deferred.succeed(finished, undefined)),
+            ),
+            { startImmediately: true },
+          );
+          yield* eventLoopTurn;
+          const expected = mode === "rollback" ? 1 : mode === "commit" ? 12002 : 12001;
+          if (mode !== "rollback") {
+            assert.isFalse(yield* Deferred.isDone(finished));
+            const before = Number(
+              (yield* (yield* FileSystem.FileSystem).stat(`${filename}-wal`)).size,
+            );
+            assert.deepEqual(
+              yield* sql`SELECT COUNT(*) AS count FROM pages`.pipe(SqliteClient.readOnly),
+              [{ count: expected }],
+            );
+            yield* eventLoopTurn;
+            assert.isFalse(yield* Deferred.isDone(finished));
+            assert.equal(
+              Number((yield* (yield* FileSystem.FileSystem).stat(`${filename}-wal`)).size),
+              before,
+            );
+          }
+          if (mode === "worker failure") {
+            yield* Effect.promise(() => worker.terminate());
+            yield* Fiber.join(write);
+            assert.deepEqual(yield* sql`PRAGMA wal_autocheckpoint`, [{ wal_autocheckpoint: 1000 }]);
+            reader.exec("ROLLBACK");
+          } else {
+            reader.exec("ROLLBACK");
+            requests.release();
+            yield* Fiber.join(write);
+            yield* checkpointWorkerReply(worker);
+            if (mode !== "rollback")
+              assert.isAtMost(
+                Number((yield* (yield* FileSystem.FileSystem).stat(`${filename}-wal`)).size),
+                1048576,
+              );
+          }
+          assert.deepEqual(yield* sql`SELECT COUNT(*) AS count FROM pages`, [
+            { count: expected + 1 },
+          ]);
+          yield* sql.withTransaction(sql`INSERT INTO pages VALUES (12004, x'00')`);
+        }),
+      { readerWorker: true },
+    ),
+  { skip: !supportsNoopCheckpoint },
+);
+
+it.effect.each([
+  { reserved: false, stage: "queued" },
+  { reserved: true, stage: "queued" },
+  { reserved: false, stage: "elected" },
+  { reserved: true, stage: "elected" },
+  { reserved: false, stage: "resumed" },
+  { reserved: true, stage: "resumed" },
+] as const)(
+  "hands cancellation to the next writer (reserved=$reserved, stage=$stage)",
+  ({ reserved, stage }) =>
+    withCheckpointClient((sql, filename) =>
+      Effect.gen(function* () {
+        const worker = startedWorkers.at(-1)!;
+        const { reader, checkpointRequests } = yield* blockCheckpointBehindReader(
+          sql,
+          filename,
+          worker,
+        );
+        yield* Effect.scoped(
+          Effect.gen(function* () {
+            const connection = reserved ? yield* sql.reserve : undefined;
+            const insert = (value: number) =>
+              connection
+                ? connection.executeUnprepared("INSERT INTO entries VALUES (?)", [value], undefined)
+                : sql`INSERT INTO entries VALUES (${value})`;
+            const scheduled = schedulerHoldingDispatch(stage === "resumed");
+            yield* Effect.addFinalizer(() => Effect.sync(scheduled.resume));
+            const first = yield* Effect.forkChild(
+              insert(1).pipe(Effect.provideService(Scheduler.Scheduler, scheduled.scheduler)),
+              { startImmediately: true },
+            );
+            const second = yield* Effect.forkChild(insert(2), { startImmediately: true });
+            yield* eventLoopTurn;
+            assert.isUndefined(first.pollUnsafe());
+            assert.isUndefined(second.pollUnsafe());
+            if (stage !== "queued") {
+              scheduled.arm();
+              const truncated = waitForTruncateCompletion(worker);
+              checkpointRequests.release();
+              reader.exec("ROLLBACK");
+              yield* Effect.promise(() => truncated);
+              yield* Effect.promise(() => scheduled.paused);
+              if (stage === "resumed") {
+                scheduled.resume();
+                yield* Effect.promise(() => scheduled.continuation);
+              }
+            }
+            yield* Fiber.interrupt(first);
+            scheduled.resume();
+            if (stage === "queued") {
+              reader.exec("ROLLBACK");
+              checkpointRequests.release();
+              yield* checkpointWorkerReply(worker);
+            }
+            yield* eventLoopTurn;
+            assert.isDefined(
+              second.pollUnsafe(),
+              "cancellation must hand off without waiting for a later checkpoint",
+            );
+            yield* Fiber.join(second);
+          }),
+        );
+        yield* sql.withTransaction(sql`INSERT INTO entries VALUES (3)`);
+        assert.deepEqual(yield* sql`SELECT value FROM entries ORDER BY value`.values, [[2], [3]]);
+      }),
+    ),
+  { skip: !supportsNoopCheckpoint },
+);
+
+it.effect.each([false, true])(
+  "keeps masked cleanup waiting at the checkpoint gate (transaction=%s)",
+  (transaction) =>
+    withCheckpointClient((sql, filename) =>
+      Effect.gen(function* () {
+        const worker = startedWorkers.at(-1)!;
+        const { reader, checkpointRequests } = yield* blockCheckpointBehindReader(
+          sql,
+          filename,
+          worker,
+        );
+        const entered = yield* Deferred.make<void>();
+        const cleanupEntered = yield* Deferred.make<void>();
+        const work = yield* Effect.forkChild(
+          Deferred.succeed(entered, undefined).pipe(
+            Effect.andThen(Effect.never),
+            Effect.onInterrupt(() =>
+              Effect.gen(function* () {
+                yield* Deferred.succeed(cleanupEntered, undefined);
+                const insert = sql.unsafe("INSERT INTO entries VALUES (1)").unprepared;
+                yield* transaction ? sql.withTransaction(insert) : insert;
+              }),
+            ),
+          ),
+          { startImmediately: true },
+        );
+        yield* Deferred.await(entered);
+        const interrupt = yield* Effect.forkChild(Fiber.interrupt(work), {
+          startImmediately: true,
+        });
+        yield* Deferred.await(cleanupEntered);
+        yield* Effect.yieldNow;
+        assert.isUndefined(work.pollUnsafe());
+
+        const truncateFinished = waitForTruncateCompletion(worker);
+        checkpointRequests.release();
+        reader.exec("ROLLBACK");
+        yield* Effect.promise(() => truncateFinished);
+        yield* Fiber.join(interrupt);
+        assert.deepEqual(yield* sql.unsafe("SELECT value FROM entries").unprepared, [{ value: 1 }]);
+      }),
+    ),
+  { skip: !supportsNoopCheckpoint },
+);
+
+it.effect.each(["PRAGMA incremental_vacuum(1)", "PRAGMA user_version = 42"])(
+  "admits maintenance mutations through the checkpoint gate (%s)",
+  (operation) =>
+    withCheckpointClient((sql, filename) =>
+      Effect.gen(function* () {
+        const worker = startedWorkers.at(-1)!;
+        yield* sql`PRAGMA auto_vacuum = INCREMENTAL`;
+        yield* sql`VACUUM`;
+        yield* sql`CREATE TABLE reclaim(payload BLOB)`;
+        yield* sql`INSERT INTO reclaim VALUES (zeroblob(8000000))`;
+        yield* sql`DELETE FROM reclaim`;
+        yield* checkpointWorkerReply(worker);
+        const { reader, checkpointRequests } = yield* blockCheckpointBehindReader(
+          sql,
+          filename,
+          worker,
+        );
+        const before = (yield* sql<{ freelist_count: number }>`PRAGMA freelist_count`)[0]!
+          .freelist_count;
+        assert.isAbove(before, 0);
+        const mutation = yield* Effect.forkChild(sql.unsafe(operation).unprepared, {
+          startImmediately: true,
+        });
+        yield* eventLoopTurn;
+        assert.isUndefined(mutation.pollUnsafe());
+        assert.equal(reader.prepare("PRAGMA user_version").get()?.user_version, 0);
+        reader.exec("ROLLBACK");
+        checkpointRequests.release();
+        yield* Fiber.join(mutation);
+        if (operation.includes("incremental_vacuum")) {
+          assert.isBelow(
+            (yield* sql<{ freelist_count: number }>`PRAGMA freelist_count`)[0]!.freelist_count,
+            before,
+          );
+        } else assert.deepEqual(yield* sql`PRAGMA user_version`, [{ user_version: 42 }]);
+        yield* sql.withTransaction(sql`INSERT INTO entries VALUES (1)`);
+      }),
+    ),
+  { skip: !supportsNoopCheckpoint },
+);
+
+it.effect("keeps automatic checkpoints when mutation classification is unavailable", () =>
+  Effect.acquireUseRelease(
+    Effect.sync(() => {
+      const descriptor = Object.getOwnPropertyDescriptor(
+        NodeSqlite.DatabaseSync.prototype,
+        "setAuthorizer",
+      )!;
+      Object.defineProperty(NodeSqlite.DatabaseSync.prototype, "setAuthorizer", {
+        configurable: true,
+        value: undefined,
+      });
+      return descriptor;
+    }),
+    () =>
+      withCheckpointClient((sql) =>
+        Effect.gen(function* () {
+          assert.deepEqual(yield* sql`PRAGMA wal_autocheckpoint`, [{ wal_autocheckpoint: 1000 }]);
+          assert.deepEqual(yield* sql`PRAGMA synchronous`, [{ synchronous: 2 }]);
+          yield* sql`CREATE TABLE fallback(value INTEGER)`;
+          yield* sql.withTransaction(sql`INSERT INTO fallback VALUES (1)`);
+          assert.deepEqual(yield* sql`SELECT value FROM fallback`, [{ value: 1 }]);
+        }),
+      ),
+    (descriptor) =>
+      Effect.sync(() =>
+        Object.defineProperty(NodeSqlite.DatabaseSync.prototype, "setAuthorizer", descriptor),
+      ),
+  ),
+);
+
+it.effect.each(["successful", "failed"] as const)(
+  "lets the event loop run while draining queued writes (%s)",
+  (outcome) =>
+    withCheckpointClient((sql, filename) =>
+      Effect.gen(function* () {
+        const worker = startedWorkers.at(-1)!;
+        const { reader, checkpointRequests } = yield* blockCheckpointBehindReader(
+          sql,
+          filename,
+          worker,
+        );
+        let completed = 0;
+        let resolveHeartbeat = (_completed: number) => {};
+        const heartbeat = new Promise<number>((resolve) => {
+          resolveHeartbeat = resolve;
+        });
+        const scheduler = new Scheduler.MixedScheduler("async", (task) => {
+          const handle = setImmediate(task);
+          return () => clearImmediate(handle);
+        });
+        const writeScheduler: Scheduler.Scheduler = {
+          executionMode: scheduler.executionMode,
+          makeDispatcher: () => scheduler.makeDispatcher(),
+          shouldYield: () => false,
+        };
+        const writes = [];
+        for (let value = 0; value < 20; value++) {
+          writes.push(
+            yield* Effect.forkChild(
+              sql`INSERT INTO entries VALUES (${outcome === "failed" ? "invalid" : value})`.pipe(
+                Effect.match({
+                  onSuccess: () => assert.equal(outcome, "successful"),
+                  onFailure: (error) => {
+                    assert.equal(outcome, "failed");
+                    assert.equal(error._tag, "SqlError");
+                    assert.equal(error.reason.operation, "execute");
+                    assert.include(String(error.reason.cause), "datatype mismatch");
+                  },
+                }),
+                Effect.tap(() =>
+                  Effect.sync(() => {
+                    if (++completed === 1) setImmediate(() => resolveHeartbeat(completed));
+                  }),
+                ),
+                Effect.provideService(Scheduler.Scheduler, writeScheduler),
+              ),
+              { startImmediately: true },
+            ),
+          );
+        }
+        yield* eventLoopTurn;
+        assert.equal(completed, 0);
+        reader.exec("ROLLBACK");
+        checkpointRequests.release();
+        const completedAtHeartbeat = yield* Effect.promise(() => heartbeat);
+        for (const write of writes) yield* Fiber.join(write);
+        assert.equal(completed, writes.length);
+        assert.deepEqual(
+          yield* sql`SELECT value FROM entries ORDER BY value`,
+          outcome === "failed"
+            ? []
+            : Array.from({ length: writes.length }, (_, value) => ({ value })),
+        );
+        assert.isBelow(completedAtHeartbeat, writes.length);
+      }),
+    ),
+  { skip: !supportsNoopCheckpoint },
+);
diff --git a/packages/shared/src/nodeSqliteClient.ts b/packages/shared/src/nodeSqliteClient.ts
index 6cd0913de198..7ee8292cb71b 100644
--- a/packages/shared/src/nodeSqliteClient.ts
+++ b/packages/shared/src/nodeSqliteClient.ts
@@ -468,43 +468,134 @@ const makeReader = Effect.fnUntraced(function* (options: SqliteClientConfig) {
 });
 
 const CHECKPOINT_FRAMES = 1000;
-// While the worker runs, the writer still checkpoints a WAL this long. Writes
-// with no pause leave the worker behind, and the WAL can only restart once
-// every frame is checkpointed, so this keeps the file from growing forever.
-const WRITER_BACKSTOP_FRAMES = 10 * CHECKPOINT_FRAMES;
 const CHECKPOINT_IDLE_MS = 100;
+const CHECKPOINT_BACKPRESSURE_FRAMES = 10 * CHECKPOINT_FRAMES;
 
-// SQLite before 3.51 reads NOOP as PASSIVE and would checkpoint on every
-// request, so the worker refuses to start there and the writer keeps
-// checkpointing.
+const readSafeSqliteInteger = (value: unknown) => {
+  const number = typeof value === "bigint" ? Number(value) : value;
+  return typeof number === "number" && Number.isSafeInteger(number) ? number : undefined;
+};
+
+// Evaluated source also works in bundles and single-executable builds.
 const checkpointWorkerSource = `
 const { parentPort, workerData } = require("node:worker_threads");
 const { DatabaseSync } = require("node:sqlite");
-const db = new DatabaseSync(workerData.filename);
-const version = db.prepare("SELECT sqlite_version() AS version").get().version;
-const [major, minor] = version.split(".").map(Number);
-if (major < 3 || (major === 3 && minor < 51)) throw new Error("SQLite " + version + " has no NOOP checkpoint");
-// macOS fsync() does not flush the drive cache; F_FULLFSYNC does. Other platforms ignore this.
-db.exec("PRAGMA checkpoint_fullfsync = ON;");
-const frames = db.prepare("PRAGMA wal_checkpoint(NOOP)");
-const checkpoint = db.prepare("PRAGMA wal_checkpoint(PASSIVE)");
-const finish = () => {
-  const { log, checkpointed } = frames.get();
-  if (log >= workerData.frames && checkpointed < log) checkpoint.get();
-};
+const { statSync } = require("node:fs");
+let db;
+let frames;
+let checkpoint;
+let truncate;
+let journalSizeLimit = -1;
+let generation = 0;
+let nextTruncateId = 0;
+let pendingTruncate;
+let pendingBarriers = 0;
 let idle;
+const initialize = () => {
+  if (db !== undefined) return;
+  // The writer switches to WAL after constructing the client.
+  db = new DatabaseSync(workerData.filename);
+  db.exec("PRAGMA busy_timeout = 5000;");
+  const mode = String(db.prepare("PRAGMA journal_mode").get().journal_mode).toLowerCase();
+  if (mode !== "wal") throw new Error("database uses journal_mode " + mode + ", not wal");
+  // macOS requires F_FULLFSYNC to flush the drive cache.
+  db.exec("PRAGMA checkpoint_fullfsync = ON;");
+  frames = db.prepare("PRAGMA wal_checkpoint(NOOP)");
+  checkpoint = db.prepare("PRAGMA wal_checkpoint(PASSIVE)");
+  truncate = db.prepare("PRAGMA wal_checkpoint(TRUNCATE)");
+};
+const atCeiling = (state) => state.log >= workerData.backpressureFrames;
+const exceedsSizeLimit = () =>
+  journalSizeLimit >= 0 && statSync(workerData.filename + "-wal").size > journalSizeLimit;
+const schedule = (state, blocked) => {
+  if (blocked || state.log - state.checkpointed >= workerData.frames) {
+    idle = setTimeout(() => check(undefined, undefined, true), workerData.idleMs);
+  }
+};
+const check = (id, nextJournalSizeLimit, force, nextGeneration = generation) => {
+  initialize();
+  if (Number.isSafeInteger(nextGeneration)) generation = Math.max(generation, nextGeneration);
+  if (Number.isSafeInteger(nextJournalSizeLimit)) journalSizeLimit = nextJournalSizeLimit;
+  let state = frames.get();
+  const oversized = exceedsSizeLimit();
+  if (force || state.log - state.checkpointed >= workerData.frames || oversized) {
+    checkpoint.get();
+    state = frames.get();
+  }
+  if (state.checkpointed === state.log && (atCeiling(state) || oversized)) {
+    pendingTruncate = { truncateId: ++nextTruncateId, checkId: id, generation, state };
+    parentPort.postMessage({
+      type: "truncate-request",
+      truncateId: pendingTruncate.truncateId,
+      checkId: id,
+      generation,
+      ...state,
+    });
+    return;
+  }
+  const blocked = (atCeiling(state) || oversized) && state.checkpointed < state.log;
+  parentPort.postMessage({ type: "checkpoint", id, generation, ...state, blocked });
+  schedule(state, blocked);
+};
+const finishTruncate = (truncateId) => {
+  if (pendingTruncate === undefined || pendingTruncate.truncateId !== truncateId) return;
+  const pending = pendingTruncate;
+  parentPort.postMessage({ type: "truncate-start", truncateId });
+  let busy;
+  // Admission is paused here; a pinned reader must not make truncation wait.
+  db.exec("PRAGMA busy_timeout = 0;");
+  try {
+    busy = truncate.get().busy !== 0;
+  } finally {
+    db.exec("PRAGMA busy_timeout = 5000;");
+  }
+  const state = frames.get();
+  const blocked = (atCeiling(state) && (busy || state.checkpointed < state.log)) || exceedsSizeLimit();
+  pendingTruncate = undefined;
+  parentPort.postMessage({
+    type: "checkpoint",
+    id: pending.checkId,
+    generation: pending.generation,
+    truncateId,
+    ...state,
+    blocked,
+  });
+  while (pendingBarriers > 0) {
+    pendingBarriers--;
+    parentPort.postMessage("barrier");
+  }
+  schedule(state, blocked);
+};
 parentPort.on("message", (request) => {
-  const { log, checkpointed } = frames.get();
-  if (log - checkpointed >= workerData.frames) checkpoint.get();
   clearTimeout(idle);
-  idle = setTimeout(finish, workerData.idleMs);
-  parentPort.postMessage(request);
+  if (request && request.type === "truncate") {
+    finishTruncate(request.truncateId);
+    return;
+  }
+  const isBarrier = request === "barrier";
+  if (pendingTruncate !== undefined) {
+    if (isBarrier) pendingBarriers++;
+    else if (request && request.type === "check") {
+      // Retire the request without labeling the pending snapshot with a newer generation.
+      parentPort.postMessage({
+        type: "checkpoint",
+        id: request.id,
+        generation: pendingTruncate.generation,
+        ...pendingTruncate.state,
+        blocked: true,
+      });
+    }
+    return;
+  }
+  const input = request && typeof request === "object" ? request : {};
+  check(input.id, input.journalSizeLimit, input.force, input.generation);
+  if (isBarrier) {
+    if (pendingTruncate !== undefined) pendingBarriers++;
+    else parentPort.postMessage("barrier");
+  }
 });
 `;
 
-/**
- * Call the returned function after each statement on the writer.
- */
 const startCheckpointWorker = Effect.fnUntraced(function* (
   filename: string,
   writer: NodeSqlite.DatabaseSync,
@@ -514,60 +605,227 @@ const startCheckpointWorker = Effect.fnUntraced(function* (
       "SQLite checkpoint worker unavailable; checkpoints run on the main connection",
       { reason },
     );
+  if (typeof writer.isTransaction !== "boolean" || typeof writer.setAuthorizer !== "function") {
+    yield* warn("Node SQLite lacks transaction-state or statement-authorizer support");
+    return undefined;
+  }
+  const version = String(writer.prepare("SELECT sqlite_version() AS version").get()?.version);
+  const [major = 0, minor = 0] = version.split(".").map(Number);
+  // Older SQLite treats NOOP as PASSIVE, which would checkpoint on the writer.
+  if (major < 3 || (major === 3 && minor < 51)) {
+    yield* warn(`SQLite ${version} has no NOOP checkpoint`);
+    return undefined;
+  }
+  const frames = writer.prepare("PRAGMA wal_checkpoint(NOOP)");
+  const sizeLimit = writer.prepare("PRAGMA journal_size_limit");
   let worker: NodeWorkerThreads.Worker;
   try {
     worker = new NodeWorkerThreads.Worker(checkpointWorkerSource, {
       eval: true,
-      workerData: { filename, frames: CHECKPOINT_FRAMES, idleMs: CHECKPOINT_IDLE_MS },
+      workerData: {
+        filename,
+        frames: CHECKPOINT_FRAMES,
+        backpressureFrames: CHECKPOINT_BACKPRESSURE_FRAMES,
+        idleMs: CHECKPOINT_IDLE_MS,
+      },
     });
   } catch (cause) {
     yield* warn(String(cause));
     return undefined;
   }
-  writer.exec(`PRAGMA wal_autocheckpoint = ${WRITER_BACKSTOP_FRAMES};`);
   const runFork = Effect.runForkWith(yield* Effect.context<never>());
   let stopped = false;
-  let checking = false;
+  let generation = 0;
+  let nextId = 0;
+  let inFlight: number | undefined;
   let checkAgain = false;
+  let blocked = false;
+  let log = 0;
+  let checkpointed = 0;
+  let unknown = false;
+  let truncate: { id: number; acknowledged: boolean } | undefined;
+  type Waiter = { resume: () => void; cancelled: boolean };
+  const waiters: Array<Waiter> = [];
+  let elected: Waiter | undefined;
+  const gated = () =>
+    !stopped &&
+    !writer.isTransaction &&
+    (unknown || blocked || truncate !== undefined || log >= CHECKPOINT_BACKPRESSURE_FRAMES);
+  const wake = () => {
+    if (!gated() && elected === undefined) {
+      elected = waiters.shift();
+      elected?.resume();
+    }
+    if (waiters.length === 0 && elected === undefined) worker.unref();
+  };
+  const release = (waiter: Waiter) => {
+    waiter.cancelled = true;
+    const index = waiters.indexOf(waiter);
+    if (index !== -1) waiters.splice(index, 1);
+    if (elected === waiter) elected = undefined;
+    wake();
+  };
   const handBack = (reason: string) => {
     if (stopped) return;
     stopped = true;
+    truncate = undefined;
     try {
       writer.exec(`PRAGMA wal_autocheckpoint = ${CHECKPOINT_FRAMES};`);
     } catch {}
+    wake();
     runFork(warn(reason));
   };
+  const send = (message: unknown) => {
+    try {
+      // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
+      worker.postMessage(message);
+    } catch (cause) {
+      handBack(String(cause));
+    }
+  };
+  const acknowledge = () => {
+    if (truncate === undefined || truncate.acknowledged || stopped || writer.isTransaction) return;
+    truncate.acknowledged = true;
+    send({ type: "truncate", truncateId: truncate.id });
+  };
+  const observe = () => {
+    try {
+      const state = frames.get();
+      const nextLog = readSafeSqliteInteger(state?.log);
+      const nextCheckpointed = readSafeSqliteInteger(state?.checkpointed);
+      if (nextLog === undefined || nextCheckpointed === undefined)
+        throw new Error("Invalid WAL frame counts");
+      log = nextLog;
+      checkpointed = nextCheckpointed;
+      unknown = false;
+    } catch {
+      unknown = true;
+    }
+  };
+  const request = (force = false) => {
+    if (stopped || writer.isTransaction) return;
+    if (truncate !== undefined) {
+      acknowledge();
+      return;
+    }
+    if (inFlight !== undefined) {
+      checkAgain = true;
+      return;
+    }
+    if (!force && !gated() && log - checkpointed < CHECKPOINT_FRAMES) return;
+    inFlight = ++nextId;
+    try {
+      send({
+        type: "check",
+        id: inFlight,
+        generation,
+        journalSizeLimit: readSafeSqliteInteger(sizeLimit.get()?.journal_size_limit),
+        force: force || gated(),
+      });
+    } catch (cause) {
+      handBack(String(cause));
+    }
+  };
+  const check = () => {
+    if (stopped || writer.isTransaction) return;
+    generation++;
+    observe();
+    request();
+    wake();
+  };
   worker.on("error", (cause) => handBack(cause.message));
   worker.on("exit", (code) => handBack(`exited with code ${code}`));
+  worker.on("message", (message: unknown) => {
+    if (stopped || typeof message !== "object" || message === null || !("type" in message)) return;
+    if (
+      message.type === "truncate-request" &&
+      "truncateId" in message &&
+      typeof message.truncateId === "number"
+    ) {
+      truncate = { id: message.truncateId, acknowledged: false };
+      blocked = true;
+      acknowledge();
+      return;
+    }
+    if (message.type !== "checkpoint") return;
+    const completedTruncate =
+      truncate !== undefined && "truncateId" in message && message.truncateId === truncate.id;
+    if (completedTruncate) truncate = undefined;
+    // An acknowledged truncate excludes new writer mutations, so its result is current.
+    if (
+      (completedTruncate || ("generation" in message && message.generation === generation)) &&
+      "log" in message &&
+      typeof message.log === "number" &&
+      "checkpointed" in message &&
+      typeof message.checkpointed === "number" &&
+      "blocked" in message &&
+      typeof message.blocked === "boolean"
+    ) {
+      log = message.log;
+      checkpointed = message.checkpointed;
+      blocked = message.blocked;
+      unknown = false;
+    }
+    // Even a stale snapshot must retire its request so a newer check can run.
+    if ("id" in message && message.id === inFlight) inFlight = undefined;
+    if (checkAgain && inFlight === undefined) {
+      checkAgain = false;
+      request(true);
+    }
+    wake();
+  });
   yield* Effect.addFinalizer(() =>
     Effect.promise(() => {
       stopped = true;
+      truncate = undefined;
+      wake();
       return worker.terminate();
     }),
   );
-
-  // At most one request is in flight. A statement that runs during it asks for
-  // one more check, so the frames of a last commit before idle still get one.
-  const check = () => {
-    if (stopped) return;
-    if (checking) {
-      checkAgain = true;
-      return;
-    }
-    checking = true;
-    // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
-    worker.postMessage(null);
-  };
-  worker.on("message", () => {
-    checking = false;
-    if (checkAgain) {
-      checkAgain = false;
-      check();
-    }
-  });
-  // After the listeners: adding a "message" listener refs the worker again.
+  writer.exec("PRAGMA wal_autocheckpoint = 0;");
+  observe();
   worker.unref();
-  return check;
+
+  const runWithAdmission = <A, E>(
+    execute: () => Exit.Exit<A, E>,
+    admitted?: Waiter,
+  ): Effect.Effect<A, E> =>
+    Effect.suspend(() => {
+      if (!gated()) {
+        // Release the election after executing; its successor must see the new WAL state.
+        try {
+          return execute();
+        } finally {
+          if (admitted !== undefined) release(admitted);
+        }
+      }
+      if (admitted !== undefined) release(admitted);
+      const waiter: Waiter = { resume: () => {}, cancelled: false };
+      const wait = Effect.uninterruptibleMask((restore) =>
+        Effect.withFiber((fiber) =>
+          (fiber.getRef(TransactionAcquire)?.restore ?? restore)(
+            Effect.callback<void>(function (this: Scheduler.Scheduler, resume) {
+              const dispatcher = this.makeDispatcher();
+              waiter.resume = () => {
+                dispatcher.scheduleTask(() => {
+                  if (!waiter.cancelled) resume(Effect.void);
+                }, 0);
+              };
+              waiters.push(waiter);
+              worker.ref();
+              request(true);
+              wake();
+              return Effect.sync(() => release(waiter));
+            }),
+          ),
+        ),
+      );
+      return wait.pipe(
+        Effect.flatMap(() => runWithAdmission(execute, waiter)),
+        Effect.onInterrupt(() => Effect.sync(() => release(waiter))),
+      );
+    });
+  return { check, runWithAdmission };
 });
 
 const make = Effect.fn("makeWithDatabase")(function* (
@@ -611,6 +869,71 @@ const make = Effect.fn("makeWithDatabase")(function* (
         : undefined;
 
     const statementReaderCache = new WeakMap<NodeSqlite.StatementSync, boolean>();
+    interface CheckpointClassification {
+      backpressure: boolean;
+      check: boolean;
+    }
+    const checkpointClassifications = new WeakMap<
+      NodeSqlite.StatementSync,
+      CheckpointClassification
+    >();
+    const mutatingPragmasWithValues = new Set([
+      "application_id",
+      "auto_vacuum",
+      "journal_mode",
+      "schema_version",
+      "user_version",
+    ]);
+    const mutatesPragma = (name: string | null, value: string | null) => {
+      const pragma = name?.toLowerCase();
+      if (pragma === undefined) return false;
+      if (pragma === "incremental_vacuum" || pragma === "optimize") return true;
+      if (pragma === "wal_checkpoint") return value?.toLowerCase() !== "noop";
+      return value !== null && mutatingPragmasWithValues.has(pragma);
+    };
+    let activeClassification: CheckpointClassification | undefined;
+    const withClassification = <A>(
+      classification: CheckpointClassification | undefined,
+      f: () => A,
+    ): A => {
+      if (classification === undefined) return f();
+      const previous = activeClassification;
+      activeClassification = classification;
+      try {
+        return f();
+      } finally {
+        activeClassification = previous;
+      }
+    };
+    if (checkpoint !== undefined) {
+      // SQLite may reprepare an expired statement while it executes. Keep this
+      // callback installed and collect only around that statement's prepare/run.
+      db.setAuthorizer((actionCode, action, argument) => {
+        const classification = activeClassification;
+        if (classification === undefined) return NodeSqlite.constants.SQLITE_OK;
+        const constants = NodeSqlite.constants;
+        if (actionCode === constants.SQLITE_TRANSACTION) {
+          classification.backpressure ||= action === "BEGIN";
+          classification.check ||= action === "COMMIT" || action === "ROLLBACK";
+        } else if (actionCode === constants.SQLITE_SAVEPOINT) {
+          classification.backpressure ||= action === "BEGIN";
+          classification.check = true;
+        } else if (actionCode === constants.SQLITE_PRAGMA && mutatesPragma(action, argument)) {
+          classification.backpressure = true;
+          classification.check = true;
+        } else if (
+          actionCode !== constants.SQLITE_READ &&
+          actionCode !== constants.SQLITE_SELECT &&
+          actionCode !== constants.SQLITE_FUNCTION &&
+          actionCode !== constants.SQLITE_RECURSIVE &&
+          actionCode !== constants.SQLITE_PRAGMA
+        ) {
+          classification.backpressure = true;
+          classification.check = true;
+        }
+        return constants.SQLITE_OK;
+      });
+    }
     const hasRows = (statement: NodeSqlite.StatementSync): boolean => {
       const cached = statementReaderCache.get(statement);
       if (cached !== undefined) {
@@ -623,7 +946,12 @@ const make = Effect.fn("makeWithDatabase")(function* (
 
     const prepare = (sql: string) =>
       Effect.try({
-        try: () => db.prepare(sql),
+        try: () => {
+          const classification = { backpressure: false, check: false };
+          const statement = withClassification(classification, () => db.prepare(sql));
+          if (checkpoint !== undefined) checkpointClassifications.set(statement, classification);
+          return statement;
+        },
         catch: (cause) =>
           new SqlError({
             reason: classifyError(cause, "Failed to prepare statement", "prepare"),
@@ -643,81 +971,64 @@ const make = Effect.fn("makeWithDatabase")(function* (
     const runStatement = (
       statement: NodeSqlite.StatementSync,
       params: ReadonlyArray<unknown>,
-      raw: boolean,
+      mode: "rows" | "raw" | "values" = "rows",
     ) =>
       Effect.withFiber<ReadonlyArray<any>, SqlError>((fiber) => {
-        try {
-          statement.setReadBigInts(Boolean(Context.get(fiber.context, Client.SafeIntegers)));
-          if (hasRows(statement)) {
-            const rows = statement.all(...(params as any));
-            checkpoint?.();
-            return Effect.succeed(rows);
-          }
-          const result = statement.run(...(params as any));
-          checkpoint?.();
-          return Effect.succeed(raw ? (result as unknown as ReadonlyArray<any>) : []);
-        } catch (cause) {
-          return Effect.fail(
-            new SqlError({
-              reason: classifyError(cause, "Failed to execute statement", "execute"),
-            }),
-          );
-        }
-      });
-
-    const run = (sql: string, params: ReadonlyArray<unknown>, raw = false) =>
-      Effect.flatMap(statementFor(sql, params), (s) => runStatement(s, params, raw));
-
-    const runStatementValues = (
-      statement: NodeSqlite.StatementSync,
-      params: ReadonlyArray<unknown>,
-    ) =>
-      Effect.acquireUseRelease(
-        Effect.succeed(statement),
-        (statement) =>
-          Effect.try({
-            try: () => {
-              statement.setReadBigInts(
-                Boolean(Context.get(Fiber.getCurrent()!.context, Client.SafeIntegers)),
-              );
+        const classification = checkpointClassifications.get(statement);
+        const execute = () => {
+          let arrays = false;
+          let result: Exit.Exit<ReadonlyArray<unknown>, SqlError>;
+          try {
+            const value = withClassification(classification, () => {
+              statement.setReadBigInts(Boolean(Context.get(fiber.context, Client.SafeIntegers)));
               if (hasRows(statement)) {
-                statement.setReturnArrays(true);
-                const rows = statement.all(...(params as any)) as unknown as ReadonlyArray<
-                  ReadonlyArray<unknown>
-                >;
-                checkpoint?.();
-                return rows;
+                arrays = mode === "values";
+                if (arrays) statement.setReturnArrays(true);
+                return statement.all(...(params as any));
               }
-              statement.run(...(params as any));
-              checkpoint?.();
-              return [];
-            },
-            catch: (cause) =>
+              const result = statement.run(...(params as any));
+              return mode === "raw" ? (result as unknown as ReadonlyArray<unknown>) : [];
+            });
+            result = Exit.succeed(value);
+          } catch (cause) {
+            result = Exit.fail(
               new SqlError({
                 reason: classifyError(cause, "Failed to execute statement", "execute"),
               }),
-          }),
-        (statement) =>
-          Effect.try({
-            try: () => {
-              if (hasRows(statement)) {
-                statement.setReturnArrays(false);
-              }
-            },
-            catch: (cause) =>
-              new SqlError({
-                reason: classifyError(
-                  cause,
-                  "Failed to reset statement result mode",
-                  "resetResultMode",
-                ),
-              }),
-          }).pipe(Effect.orDie),
-      );
+            );
+          } finally {
+            // OR FAIL may have committed earlier rows even when execution throws.
+            if (classification?.check) checkpoint?.check();
+          }
+          if (arrays) {
+            try {
+              statement.setReturnArrays(false);
+            } catch (cause) {
+              return Exit.die(
+                new SqlError({
+                  reason: classifyError(
+                    cause,
+                    "Failed to reset statement result mode",
+                    "resetResultMode",
+                  ),
+                }),
+              );
+            }
+          }
+          return result;
+        };
+        return checkpoint !== undefined && classification?.backpressure
+          ? checkpoint.runWithAdmission(execute)
+          : execute();
+      });
 
+    const run = (sql: string, params: ReadonlyArray<unknown>, raw = false) =>
+      Effect.flatMap(statementFor(sql, params), (statement) =>
+        runStatement(statement, params, raw ? "raw" : "rows"),
+      );
     const runValues = (sql: string, params: ReadonlyArray<unknown>) =>
       Effect.flatMap(statementFor(sql, params), (statement) =>
-        runStatementValues(statement, params),
+        runStatement(statement, params, "values"),
       );
 
     return identity<Connection>({
@@ -732,12 +1043,12 @@ const make = Effect.fn("makeWithDatabase")(function* (
       },
       executeValuesUnprepared(sql, params) {
         return Effect.flatMap(prepare(sql), (statement) =>
-          runStatementValues(statement, params ?? []),
+          runStatement(statement, params ?? [], "values"),
         );
       },
       executeUnprepared(sql, params, rowTransform) {
         const effect = prepare(sql).pipe(
-          Effect.flatMap((statement) => runStatement(statement, params ?? [], false)),
+          Effect.flatMap((statement) => runStatement(statement, params ?? [])),
         );
         return rowTransform ? Effect.map(effect, rowTransform) : effect;
       },
@@ -773,23 +1084,49 @@ const make = Effect.fn("makeWithDatabase")(function* (
     lockWaitMs: Number((clock.monotonicTimeNanosUnsafe() - start) / 1000n) / 1000,
   });
 
+  const writerBorrowBatchSize = 16;
+  let writerBorrowsSinceYield = 0;
   const borrower: Borrower = (use) =>
     Effect.flatMap(route, (target) =>
       Effect.withFiber((fiber) => {
-        const effect = Effect.suspend(() => use(target.connection));
-        if (
-          !fiber.getRef(References.TracerEnabled) ||
-          !fiber.getRef(Statement.SpanPropagationEnabled)
-        ) {
-          return target.lock.withPermits(1)(effect);
-        }
         const clock = fiber.getRef(Clock.Clock);
         const start = clock.monotonicTimeNanosUnsafe();
-        return target.lock.withPermits(1)(
-          Effect.andThen(
-            Effect.sync(() => annotateAcquired(fiber, acquired(target, clock, start))),
-            effect,
-          ),
+        const useConnection = Effect.suspend(() => {
+          if (
+            fiber.getRef(References.TracerEnabled) &&
+            fiber.getRef(Statement.SpanPropagationEnabled)
+          ) {
+            annotateAcquired(fiber, acquired(target, clock, start));
+          }
+          return use(target.connection);
+        });
+        if (!options.checkpointWorker || target.name !== "writer") {
+          return target.lock.withPermits(1)(useConnection);
+        }
+        const writerUse = Effect.onExit(useConnection, (exit) =>
+          Effect.sync(() => {
+            writerBorrowsSinceYield = Exit.hasInterrupts(exit)
+              ? 0
+              : Math.min(writerBorrowsSinceYield + 1, writerBorrowBatchSize);
+          }),
+        );
+        return Effect.flatMap(target.lock.withPermitsIfAvailable(1)(writerUse), (result) =>
+          Option.isSome(result)
+            ? Effect.succeed(result.value)
+            : target.lock.withPermits(1)(
+                Effect.andThen(
+                  // Failed SQL also consumes the batch; cancellation hands off immediately.
+                  Effect.suspend(() => {
+                    if (writerBorrowsSinceYield < writerBorrowBatchSize) return Effect.void;
+                    writerBorrowsSinceYield = 0;
+                    return Effect.callback<void>((resume) => {
+                      const immediate = setImmediate(() => resume(Effect.void));
+                      return Effect.sync(() => clearImmediate(immediate));
+                    });
+                  }),
+                  writerUse,
+                ),
+              ),
         );
       }),
     );
diff --git a/packages/shared/src/previewViewport.test.ts b/packages/shared/src/previewViewport.test.ts
index 7a049376c50e..3c01dd6dae19 100644
--- a/packages/shared/src/previewViewport.test.ts
+++ b/packages/shared/src/previewViewport.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vite-plus/test";
 
-import { PREVIEW_VIEWPORT_PRESETS, resolvePreviewViewport } from "./previewViewport.ts";
+import { resolvePreviewViewport } from "./previewViewport.ts";
 
 describe("previewViewport", () => {
   it("resolves fill and exact freeform viewports", () => {
@@ -32,26 +32,4 @@ describe("previewViewport", () => {
       presetId: "iphone-12-pro",
     });
   });
-
-  it("matches Chrome's standard device catalog ordering", () => {
-    expect(PREVIEW_VIEWPORT_PRESETS.map((preset) => preset.label)).toEqual([
-      "iPhone SE",
-      "iPhone XR",
-      "iPhone 12 Pro",
-      "iPhone 14 Pro Max",
-      "Pixel 7",
-      "Samsung Galaxy S8+",
-      "Samsung Galaxy S20 Ultra",
-      "iPad Mini",
-      "iPad Air",
-      "iPad Pro",
-      "Surface Pro 7",
-      "Surface Duo",
-      "Galaxy Z Fold 5",
-      "Asus Zenbook Fold",
-      "Samsung Galaxy A51/71",
-      "Nest Hub",
-      "Nest Hub Max",
-    ]);
-  });
 });
diff --git a/packages/shared/src/terminalLabels.test.ts b/packages/shared/src/terminalLabels.test.ts
index 2b2d73418b1f..d1a24eef55c2 100644
--- a/packages/shared/src/terminalLabels.test.ts
+++ b/packages/shared/src/terminalLabels.test.ts
@@ -43,10 +43,6 @@ describe("nextTerminalId", () => {
     expect(nextTerminalId([])).toBe(DEFAULT_TERMINAL_ID);
   });
 
-  it("allocates term-2 when only term-1 exists", () => {
-    expect(nextTerminalId([DEFAULT_TERMINAL_ID])).toBe("term-2");
-  });
-
   it("skips over taken term-N slots", () => {
     expect(nextTerminalId([DEFAULT_TERMINAL_ID, "term-2", "term-3"])).toBe("term-4");
     expect(nextTerminalId([DEFAULT_TERMINAL_ID, "term-3"])).toBe("term-2");
diff --git a/patches/expo-modules-core@58.0.22.patch b/patches/expo-modules-core@58.0.22.patch
new file mode 100644
index 000000000000..af01af2df0b9
--- /dev/null
+++ b/patches/expo-modules-core@58.0.22.patch
@@ -0,0 +1,42 @@
+diff --git a/android/src/main/java/expo/modules/kotlin/views/ExpoView.kt b/android/src/main/java/expo/modules/kotlin/views/ExpoView.kt
+index c732ab4..2e3f40e 100644
+--- a/android/src/main/java/expo/modules/kotlin/views/ExpoView.kt
++++ b/android/src/main/java/expo/modules/kotlin/views/ExpoView.kt
+@@ -3,6 +3,7 @@ package expo.modules.kotlin.views
+ import android.content.Context
+ import android.graphics.Canvas
+ import android.widget.LinearLayout
++import androidx.core.view.OneShotPreDrawListener
+ import androidx.annotation.UiThread
+ import com.facebook.react.uimanager.BackgroundStyleApplicator
+ import com.facebook.react.uimanager.StateWrapper
+@@ -47,12 +48,27 @@ abstract class ExpoView(
+     layout(left, top, right, bottom)
+   }
+ 
++  private var isLayoutScheduled = false
++
+   override fun requestLayout() {
+     super.requestLayout()
+-    if (shouldUseAndroidLayout) {
++    if (shouldUseAndroidLayout && !isLayoutScheduled) {
+       // We need to force measure and layout, because React Native doesn't do it for us.
+-      post { measureAndLayout() }
++      // A posted layout runs after the frame being prepared is drawn, so a view that changes in a
++      // mount would show unlaid-out content for a frame. The pre-draw listener lays it out before
++      // that frame instead; the post covers a request that no frame follows.
++      isLayoutScheduled = true
++      OneShotPreDrawListener.add(this) { runScheduledLayout() }
++      post { runScheduledLayout() }
++    }
++  }
++
++  private fun runScheduledLayout() {
++    if (!isLayoutScheduled) {
++      return
+     }
++    isLayoutScheduled = false
++    measureAndLayout()
+   }
+ 
+   override fun forceLayout() {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 65b81cff07c0..427fb33de38c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -177,6 +177,7 @@ patchedDependencies:
   alchemy@2.0.0-beta.80: bea1b6c0c0b23157fd5f439a1d7feff430f28ac1621ba135d8a13eeec60ccacd
   dbus-next@0.10.2: cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4
   expo-audio@58.0.9: 2c2f8c73a23d48804c8b537b8cd73c25eb331aa47d82eaa481c6766cb81e5add
+  expo-modules-core@58.0.22: f0b0fd100550ed76e5c25b4d13eb7c9ff62825f8f197c53edf7bf447c50c9fb7
   expo-network@58.0.3: cd09b6d1744dde4efa081b5619ebcff38877d98f7502a51cab121629dece8237
   expo-sharing@58.0.19: ad248759641ddd71b8331c09dbb3b18c8a551785f2df507533805babd3c0c124
   expo-widgets@58.0.20: 8623cb034b720c5ef2da8012c765805a7298909bd92eaf8381f64dbde41b77dd
@@ -375,7 +376,7 @@ importers:
         version: 7.5.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
       '@react-navigation/native-stack':
         specifier: 7.21.0
-        version: 7.21.0(patch_hash=caae6552051bce91a85f567f3a08f9c8d25ce4c53f65a9391a67f016bb1d798e)(f7bd434a41a50f5d33209f0baf5b709c)
+        version: 7.21.0(patch_hash=caae6552051bce91a85f567f3a08f9c8d25ce4c53f65a9391a67f016bb1d798e)(6f7595467acac269803072e24b2c2fee)
       '@shikijs/core':
         specifier: 4.2.0
         version: 4.2.0
@@ -587,8 +588,8 @@ importers:
         specifier: ~5.10.1
         version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
       react-native-screens:
-        specifier: file:deps/react-native-screens-5.0.0-t3.27.tgz
-        version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
+        specifier: file:deps/react-native-screens-5.0.0-t3.29.tgz
+        version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
       react-native-shiki-engine:
         specifier: ^0.3.12
         version: 0.3.12(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -11258,9 +11259,9 @@ packages:
       react: '*'
       react-native: '*'
 
-  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz:
-    resolution: {integrity: sha512-krNMVmduM2fXeJYveadSz6NkYI/AFN3hAAirjk42Z9wkBrPtuhmcp3E2+Me95Xdj5LBL3G3dgltUjo5vYeEtLw==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz}
-    version: 5.0.0-t3.27
+  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz:
+    resolution: {integrity: sha512-Y5gaQmd/p1SOeCh7Esyaj1DEycDJ7XFNUdXS1ZDOsuwF5yK1h8yu4H4tCw6mKDrSVV8bNPBYhf4qs5/AaNe3zQ==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz}
+    version: 5.0.0-t3.29
     peerDependencies:
       react: '*'
       react-native: '*'
@@ -16464,7 +16465,7 @@ snapshots:
     optionalDependencies:
       '@react-native-masked-view/masked-view': 0.3.2(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
 
-  '@react-navigation/native-stack@7.21.0(patch_hash=caae6552051bce91a85f567f3a08f9c8d25ce4c53f65a9391a67f016bb1d798e)(f7bd434a41a50f5d33209f0baf5b709c)':
+  '@react-navigation/native-stack@7.21.0(patch_hash=caae6552051bce91a85f567f3a08f9c8d25ce4c53f65a9391a67f016bb1d798e)(6f7595467acac269803072e24b2c2fee)':
     dependencies:
       '@react-navigation/elements': 2.9.45(da16e244bd876bd7d4e1e8899c8eabfd)
       '@react-navigation/native': 7.5.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -16472,7 +16473,7 @@ snapshots:
       react: 19.3.0
       react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6)
       react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
-      react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
+      react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
       sf-symbols-typescript: 2.2.0
       warn-once: 0.1.1
     transitivePeerDependencies:
@@ -19761,7 +19762,7 @@ snapshots:
       - supports-color
       - typescript
 
-  expo-modules-core@58.0.22(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0):
+  expo-modules-core@58.0.22(patch_hash=f0b0fd100550ed76e5c25b4d13eb7c9ff62825f8f197c53edf7bf447c50c9fb7)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0):
     dependencies:
       expo-modules-jsi: 58.0.15(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))
       expo-modules-macros: 0.20.0
@@ -19942,7 +19943,7 @@ snapshots:
       expo-font: 58.0.8(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
       expo-keep-awake: 58.0.3(expo@58.0.14)(react@19.3.0)
       expo-modules-autolinking: 58.0.13(typescript@7.0.2)
-      expo-modules-core: 58.0.22(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
+      expo-modules-core: 58.0.22(patch_hash=f0b0fd100550ed76e5c25b4d13eb7c9ff62825f8f197c53edf7bf447c50c9fb7)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)
       pretty-format: 29.7.0
       react: 19.3.0
       react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6)
@@ -22639,7 +22640,7 @@ snapshots:
       react: 19.3.0
       react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6)
 
-  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.27.tgz(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0):
+  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.29.tgz(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0):
     dependencies:
       react: 19.3.0
       react-freeze: 1.0.4(react@19.3.0)
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 73827916a40b..ac0a089fb950 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -345,6 +345,9 @@ patchedDependencies:
   # Android: a nested WebView hands a vertical drag to its scrolling parent at the page's edge.
   react-native-webview@14.0.1: patches/react-native-webview@14.0.1.patch
   "@expo/ui@58.0.20": patches/@expo__ui@58.0.20.patch
+  # Android: a Compose host that requests layout in a mount (a new screen's app bar) is laid out
+  # before that frame is drawn, instead of a frame later.
+  expo-modules-core@58.0.22: patches/expo-modules-core@58.0.22.patch
   # Android: Maven-resolved gradle plugins (expo-widgets) have no sourceDir; without this
   # skip, the fingerprint silently drops every Expo native module and OTAs reach stale binaries.
   "@expo/fingerprint@0.21.5": patches/@expo__fingerprint@0.21.5.patch
diff --git a/scripts/build-desktop-artifact.test.ts b/scripts/build-desktop-artifact.test.ts
index aafe04677b8a..abc616f22578 100644
--- a/scripts/build-desktop-artifact.test.ts
+++ b/scripts/build-desktop-artifact.test.ts
@@ -749,17 +749,6 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
     }).pipe(Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} })))),
   );
 
-  it("excludes foreign node-pty prebuilds from macOS and Linux packages", () => {
-    assert.deepStrictEqual(MAC_FILE_EXCLUSIONS, [
-      "!**/node_modules/node-pty/prebuilds/win32-*/**/*",
-      "!**/node_modules/node-pty/third_party/conpty/**/*",
-    ]);
-    assert.deepStrictEqual(LINUX_FILE_EXCLUSIONS, [
-      ...MAC_FILE_EXCLUSIONS,
-      "!**/node_modules/node-pty/prebuilds/darwin-*/**/*",
-    ]);
-  });
-
   it("unpacks native binaries while keeping their JavaScript and metadata archived", () => {
     for (const file of [
       "node_modules/@napi-rs/keyring/keyring.win32-x64-msvc.node",
diff --git a/scripts/dev-runner.test.ts b/scripts/dev-runner.test.ts
index b19552862b3b..510b89094ec8 100644
--- a/scripts/dev-runner.test.ts
+++ b/scripts/dev-runner.test.ts
@@ -20,7 +20,6 @@ import {
   createDevRunnerEnv,
   devPortProbeHosts,
   findFirstAvailableOffset,
-  getDevRunnerModeArgs,
   isBrowserAllowedPort,
   resolveModePortOffsets,
   resolveOffset,
@@ -84,32 +83,6 @@ it.layer(NodeServices.layer)("dev-runner", (it) => {
     }),
   );
 
-  describe("getDevRunnerModeArgs", () => {
-    it.effect("lets Vite+ honor the desktop dev task graph", () =>
-      Effect.sync(() => {
-        assert.deepStrictEqual(getDevRunnerModeArgs("dev:desktop"), [
-          "run",
-          "--filter=@t3tools/desktop",
-          "--filter=@t3tools/web",
-          "dev",
-        ]);
-      }),
-    );
-
-    it.effect("places Vite+ run flags before the task name", () =>
-      Effect.sync(() => {
-        assert.deepStrictEqual(getDevRunnerModeArgs("dev"), [
-          "run",
-          "--filter=@t3tools/contracts",
-          "--filter=@t3tools/web",
-          "--filter=t3",
-          "--parallel",
-          "dev",
-        ]);
-      }),
-    );
-  });
-
   describe("resolveOffset", () => {
     it.effect("uses explicit T3CODE_PORT_OFFSET when provided", () =>
       Effect.gen(function* () {
diff --git a/scripts/dev-runner.ts b/scripts/dev-runner.ts
index eb5d4dfc0ce2..4ac144fcf252 100644
--- a/scripts/dev-runner.ts
+++ b/scripts/dev-runner.ts
@@ -92,10 +92,6 @@ type PortAvailabilityCheck<R = never> = (
 
 const DEV_RUNNER_MODES = Object.keys(MODE_ARGS) as Array<DevMode>;
 
-export function getDevRunnerModeArgs(mode: DevMode): ReadonlyArray<string> {
-  return MODE_ARGS[mode];
-}
-
 export function isBrowserAllowedPort(port: number): boolean {
   return !FETCH_BAD_PORTS.has(port);
 }
diff --git a/scripts/lib/brand-assets.test.ts b/scripts/lib/brand-assets.test.ts
index 5403fe30e2a4..74365f3ba126 100644
--- a/scripts/lib/brand-assets.test.ts
+++ b/scripts/lib/brand-assets.test.ts
@@ -2,8 +2,6 @@ import { describe, expect, it } from "vite-plus/test";
 
 import {
   BRAND_ASSET_PATHS,
-  DEVELOPMENT_ICON_OVERRIDES,
-  DEVELOPMENT_PUBLIC_ICON_OVERRIDES,
   resolveWebAssetBrandForChannel,
   resolveWebAssetBrandForPackageVersion,
   resolveWebIconOverrides,
@@ -31,34 +29,6 @@ describe("brand-assets", () => {
     ]);
   });
 
-  it("maps server build web assets to development icons", () => {
-    expect(DEVELOPMENT_ICON_OVERRIDES[0]).toEqual({
-      sourceRelativePath: BRAND_ASSET_PATHS.developmentWebFaviconIco,
-      targetRelativePath: "dist/client/favicon.ico",
-    });
-  });
-
-  it("maps development web assets to the public splash and favicon files", () => {
-    expect(DEVELOPMENT_PUBLIC_ICON_OVERRIDES).toEqual([
-      {
-        sourceRelativePath: BRAND_ASSET_PATHS.developmentWebFaviconIco,
-        targetRelativePath: "apps/web/public/favicon.ico",
-      },
-      {
-        sourceRelativePath: BRAND_ASSET_PATHS.developmentWebFavicon16Png,
-        targetRelativePath: "apps/web/public/favicon-16x16.png",
-      },
-      {
-        sourceRelativePath: BRAND_ASSET_PATHS.developmentWebFavicon32Png,
-        targetRelativePath: "apps/web/public/favicon-32x32.png",
-      },
-      {
-        sourceRelativePath: BRAND_ASSET_PATHS.developmentWebAppleTouchIconPng,
-        targetRelativePath: "apps/web/public/apple-touch-icon.png",
-      },
-    ]);
-  });
-
   it("can target hosted web dist directly", () => {
     expect(resolveWebIconOverrides("production", "apps/web/dist")).toContainEqual({
       sourceRelativePath: BRAND_ASSET_PATHS.productionWebAppleTouchIconPng,
@@ -83,19 +53,4 @@ describe("brand-assets", () => {
     expect(resolveWebAssetBrandForPackageVersion("0.0.29-nightly.20260723.882")).toBe("nightly");
     expect(resolveWebAssetBrandForPackageVersion("0.0.29-preview.20260723.882")).toBe("nightly");
   });
-
-  it("keeps development, nightly, and production icon families separate", () => {
-    expect([
-      BRAND_ASSET_PATHS.developmentIconComposerProject,
-      BRAND_ASSET_PATHS.nightlyIconComposerProject,
-      BRAND_ASSET_PATHS.productionIconComposerProject,
-    ]).toEqual([
-      "assets/dev/app-icon.icon",
-      "assets/nightly/app-icon.icon",
-      "assets/prod/app-icon.icon",
-    ]);
-    expect(BRAND_ASSET_PATHS.developmentDesktopIconPng).toMatch(/^assets\/dev\/blueprint-/);
-    expect(BRAND_ASSET_PATHS.nightlyMacIconPng).toMatch(/^assets\/nightly\/nightly-/);
-    expect(BRAND_ASSET_PATHS.productionMacIconPng).toMatch(/^assets\/prod\/black-/);
-  });
 });
diff --git a/scripts/mobile-showcase.config.ts b/scripts/mobile-showcase.config.ts
index 10b32e760055..1d737b9fa4f6 100644
--- a/scripts/mobile-showcase.config.ts
+++ b/scripts/mobile-showcase.config.ts
@@ -12,7 +12,7 @@ export type { ShowcaseScene };
 export type ShowcaseAppearance = "light" | "dark";
 
 export const SHOWCASE_THEMES = MOBILE_THEME_IDS;
-export const DEFAULT_SHOWCASE_THEME = MOBILE_DEFAULT_THEME_ID;
+const DEFAULT_SHOWCASE_THEME = MOBILE_DEFAULT_THEME_ID;
 export type ShowcaseTheme = MobileThemeId;
 
 export interface ShowcaseStoreAssetSpec {
diff --git a/scripts/mobile-showcase.test.ts b/scripts/mobile-showcase.test.ts
index 1b1446bb3699..3a2815293728 100644
--- a/scripts/mobile-showcase.test.ts
+++ b/scripts/mobile-showcase.test.ts
@@ -3,8 +3,7 @@ import * as NodePath from "node:path";
 import { assert, it } from "@effect/vitest";
 import { PNG } from "pngjs";
 
-import showcaseConfig, {
-  DEFAULT_SHOWCASE_THEME,
+import {
   resolveShowcaseAndroidAbi,
   SHOWCASE_THEMES,
   type ShowcaseConfig,
@@ -263,34 +262,6 @@ it("enforces store screenshot count limits", () => {
   assert.throws(() => validateStoreAssetCount(googleSpec, 9, false), /allows at most 8/u);
 });
 
-it("defaults every device to the app's own palette", () => {
-  assert.equal(DEFAULT_SHOWCASE_THEME, "t3-code");
-  assert.equal(
-    showcaseConfig.devices.every((device) => device.theme === DEFAULT_SHOWCASE_THEME),
-    true,
-  );
-});
-
-it("configures every default device with an exact upload-ready store target", () => {
-  assert.deepStrictEqual(
-    showcaseConfig.devices.map((device) => [
-      device.id,
-      device.platform === "ios" ? (device.orientation ?? "portrait") : null,
-      device.storeAsset.directory,
-      device.storeAsset.width,
-      device.storeAsset.height,
-    ]),
-    [
-      ["iphone-6.9", "portrait", "apple/iphone-6.9", 1320, 2868],
-      ["iphone-6.5", "portrait", "apple/iphone-6.5", 1284, 2778],
-      ["ipad-13", "landscape", "apple/ipad-13", 2752, 2064],
-      ["pixel", null, "google-play/phone", 1080, 1920],
-      ["android-tablet-7", null, "google-play/tablet-7", 1080, 1920],
-      ["android-tablet-10", null, "google-play/tablet-10", 1440, 2560],
-    ],
-  );
-});
-
 it("selects a reachable LAN IPv4 address", () => {
   assert.equal(
     selectLanIpv4Address([