From ea15f17afd94e7ce7133e52f5b5983910662c9ec Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 16:09:00 -0700
Subject: [PATCH 01/25] fix(mobile): use native settings and snooze controls
 (#12512)

---
 .../sections/CodeAppearanceSection.tsx        |   2 +-
 .../sections/TerminalAppearanceSection.tsx    |   2 +-
 .../sections/TextAppearanceSection.tsx        |   2 +-
 .../settings/components/SettingsSection.tsx   |   6 +-
 .../threads/CustomSnoozeSheet.android.tsx     |  12 +-
 .../threads/CustomSnoozeSheet.ios.tsx         | 296 ++++++++++--------
 .../threads/CustomSnoozeSheet.shared.tsx      |   4 +-
 .../features/threads/ThreadSettingsSheet.tsx  | 196 ++++++------
 .../threads/provider-catalog-refresh.ts       |   2 +-
 .../src/features/usage/UsageRouteScreen.tsx   |   6 +-
 10 files changed, 284 insertions(+), 244 deletions(-)

diff --git a/apps/mobile/src/features/settings/appearance/sections/CodeAppearanceSection.tsx b/apps/mobile/src/features/settings/appearance/sections/CodeAppearanceSection.tsx
index bb4bb4d0a8fe..6760504bfa28 100644
--- a/apps/mobile/src/features/settings/appearance/sections/CodeAppearanceSection.tsx
+++ b/apps/mobile/src/features/settings/appearance/sections/CodeAppearanceSection.tsx
@@ -26,7 +26,7 @@ export function CodeAppearanceSection() {
   );
 
   return (
-    <SettingsSection card title="Code & Diffs">
+    <SettingsSection title="Code & Diffs">
       <CodeAppearancePreview
         fontSize={appearance.codeFontSize}
         wordBreak={appearance.codeWordBreak}
diff --git a/apps/mobile/src/features/settings/appearance/sections/TerminalAppearanceSection.tsx b/apps/mobile/src/features/settings/appearance/sections/TerminalAppearanceSection.tsx
index 911e6c307e85..1e8b5a3fbef7 100644
--- a/apps/mobile/src/features/settings/appearance/sections/TerminalAppearanceSection.tsx
+++ b/apps/mobile/src/features/settings/appearance/sections/TerminalAppearanceSection.tsx
@@ -26,7 +26,7 @@ export function TerminalAppearanceSection() {
   );
 
   return (
-    <SettingsSection card title="Terminal">
+    <SettingsSection title="Terminal">
       <TerminalAppearancePreview fontSize={appearance.terminalFontSize} />
       <AppearancePreviewSeparator />
       <SettingsSwitchRow
diff --git a/apps/mobile/src/features/settings/appearance/sections/TextAppearanceSection.tsx b/apps/mobile/src/features/settings/appearance/sections/TextAppearanceSection.tsx
index 6617a75720c4..c1424088f8d0 100644
--- a/apps/mobile/src/features/settings/appearance/sections/TextAppearanceSection.tsx
+++ b/apps/mobile/src/features/settings/appearance/sections/TextAppearanceSection.tsx
@@ -15,7 +15,7 @@ export function TextAppearanceSection() {
   const { isReady, appearance, setBaseFontSize } = useAppearancePreferences();
 
   return (
-    <SettingsSection card title="Text">
+    <SettingsSection title="Text">
       <TextAppearancePreview fontSize={appearance.baseFontSize} />
       <AppearancePreviewSeparator />
       <FontSizeSliderRow
diff --git a/apps/mobile/src/features/settings/components/SettingsSection.tsx b/apps/mobile/src/features/settings/components/SettingsSection.tsx
index 954a2b435a37..05276b767fc4 100644
--- a/apps/mobile/src/features/settings/components/SettingsSection.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsSection.tsx
@@ -7,8 +7,6 @@ export function SettingsSection(props: {
   readonly title?: string;
   readonly trailing?: ReactNode;
   readonly children: ReactNode;
-  /** Force the grouped card background; Android otherwise lists options flat. */
-  readonly card?: boolean;
 }) {
   return (
     <View className="gap-2">
@@ -30,9 +28,7 @@ export function SettingsSection(props: {
         className={
           Platform.OS === "android"
             ? "overflow-hidden rounded-[28px] bg-card"
-            : props.card
-              ? "overflow-hidden rounded-[24px] border-continuous bg-card"
-              : "overflow-hidden rounded-[24px] border-continuous bg-card android:bg-transparent"
+            : "overflow-hidden rounded-[24px] border-continuous bg-card"
         }
       >
         {props.children}
diff --git a/apps/mobile/src/features/threads/CustomSnoozeSheet.android.tsx b/apps/mobile/src/features/threads/CustomSnoozeSheet.android.tsx
index 85600838881f..e066c01b43cf 100644
--- a/apps/mobile/src/features/threads/CustomSnoozeSheet.android.tsx
+++ b/apps/mobile/src/features/threads/CustomSnoozeSheet.android.tsx
@@ -1,7 +1,6 @@
 import { MaterialSegmentedButtons } from "../../components/MaterialSegmentedButtons.android";
 import {
   BasicAlertDialog,
-  Button,
   Column,
   DateTimePicker,
   Host,
@@ -240,19 +239,16 @@ export function CustomSnoozeSheet(props: Props) {
                 <Row horizontalArrangement="end" modifiers={[fillMaxWidth()]}>
                   <TextButton
                     onClick={props.onClose}
-                    colors={{ contentColor: colors["--color-primary"] }}
+                    colors={{ contentColor: colors["--color-foreground"] }}
                   >
                     <Text style={bodyTypography}>Cancel</Text>
                   </TextButton>
-                  <Button
+                  <TextButton
                     onClick={submit}
-                    colors={{
-                      containerColor: colors["--color-primary"],
-                      contentColor: colors["--color-primary-foreground"],
-                    }}
+                    colors={{ contentColor: colors["--color-foreground"] }}
                   >
                     <Text style={bodyTypography}>Snooze</Text>
-                  </Button>
+                  </TextButton>
                 </Row>
               </Column>
             </Column>
diff --git a/apps/mobile/src/features/threads/CustomSnoozeSheet.ios.tsx b/apps/mobile/src/features/threads/CustomSnoozeSheet.ios.tsx
index 20176064be52..c8d9abbc5fa8 100644
--- a/apps/mobile/src/features/threads/CustomSnoozeSheet.ios.tsx
+++ b/apps/mobile/src/features/threads/CustomSnoozeSheet.ios.tsx
@@ -1,27 +1,22 @@
 import {
-  Button,
   DatePicker,
   Host,
   HStack,
   Picker,
   Popover,
+  RNHostView,
   Spacer,
   Text,
   VStack,
 } from "@expo/ui/swift-ui";
 import {
-  accessibilityAddTraits,
   accessibilityHidden,
-  buttonBorderShape,
-  buttonStyle,
   clipped,
-  controlSize,
   font,
   datePickerStyle,
   foregroundStyle,
   frame,
   labelsHidden,
-  labelStyle,
   padding,
   pickerStyle,
   tag,
@@ -32,12 +27,17 @@ import {
   resolveCustomSnooze,
   type CustomSnoozeInput,
 } from "@t3tools/client-runtime/state/thread-settled";
-import { useState } from "react";
-import { useWindowDimensions } from "react-native";
+import { useState, type ReactNode } from "react";
+import { NavigationContainer, NavigationIndependentTree } from "@react-navigation/native";
+import { createNativeStackNavigator } from "@react-navigation/native-stack";
+import { ScrollView, useWindowDimensions, View } from "react-native";
+import { useMobileNavigationTheme } from "../../lib/useMobileNavigationTheme";
+import { NativeHeaderToolbar } from "../../native/StackHeader";
 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
 import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
 
 const durationAmounts = Array.from({ length: 99 }, (_, index) => index + 1);
+const SnoozeStack = createNativeStackNavigator<{ CustomSnooze: undefined }>();
 const modes = [
   { value: "date", label: "Date and time" },
   { value: "duration", label: "Duration" },
@@ -52,13 +52,15 @@ export function CustomSnoozeSheet(props: {
   readonly onClose: () => void;
   readonly onSnooze: (snoozedUntil: string) => void;
 }) {
-  const { width } = useWindowDimensions();
+  const { width, height } = useWindowDimensions();
   const [mode, setMode] = useState<CustomSnoozeInput["mode"]>("date");
   const [date, setDate] = useState(() => new Date(Date.now() + 3_600_000));
   const [amount, setAmount] = useState(2);
   const [unit, setUnit] = useState<"minutes" | "hours" | "days">("hours");
   const [error, setError] = useState<string | null>(null);
   const { themeVariables: colors, themeAppearance } = useAppearancePreferences();
+  const popoverWidth = Math.min(360, width - 32);
+  const popoverHeight = Math.min(error ? 364 : 324, height - 96);
   const updateDate = (value: Date) => {
     setDate(value);
     setError(null);
@@ -98,133 +100,179 @@ export function CustomSnoozeSheet(props: {
           />
         </Popover.Trigger>
         <Popover.Content>
-          <VStack
-            spacing={16}
-            modifiers={[padding({ all: 16 }), frame({ width: Math.min(360, width - 32) })]}
+          <SnoozePopoverNavigation
+            width={popoverWidth}
+            height={popoverHeight}
+            onClose={props.onClose}
+            onSubmit={submit}
           >
-            <HStack spacing={12}>
-              <Button
-                label="Cancel"
-                systemImage="xmark"
-                role="cancel"
-                onPress={props.onClose}
-                modifiers={[
-                  labelStyle("iconOnly"),
-                  buttonStyle(NATIVE_LIQUID_GLASS_SUPPORTED ? "glass" : "bordered"),
-                  buttonBorderShape("circle"),
-                  controlSize("large"),
-                ]}
-              />
-              <Text
-                modifiers={[
-                  font({ textStyle: "headline" }),
-                  frame({ maxWidth: Infinity, alignment: "leading" }),
-                  accessibilityAddTraits(["isHeader"]),
-                ]}
-              >
-                Custom snooze
-              </Text>
-              <Button
-                label="Snooze"
-                onPress={submit}
-                modifiers={[
-                  buttonStyle(
-                    NATIVE_LIQUID_GLASS_SUPPORTED ? "glassProminent" : "borderedProminent",
-                  ),
-                  controlSize("large"),
-                ]}
-              />
-            </HStack>
-            <Picker
-              label="Snooze mode"
-              selection={mode}
-              onSelectionChange={(value: CustomSnoozeInput["mode"]) => {
-                setMode(value);
-                setError(null);
-              }}
-              modifiers={[pickerStyle("segmented")]}
+            <Host
+              matchContents={{ vertical: true }}
+              colorScheme={themeAppearance}
+              style={{ width: popoverWidth }}
             >
-              {modes.map((option) => (
-                <Text key={option.value} modifiers={[tag(option.value)]}>
-                  {option.label}
-                </Text>
-              ))}
-            </Picker>
-            {mode === "date" ? (
-              <DatePicker
-                title="Snooze until"
-                selection={date}
-                displayedComponents={["date", "hourAndMinute"]}
-                onDateChange={updateDate}
-                modifiers={[
-                  datePickerStyle("wheel"),
-                  labelsHidden(),
-                  frame({ maxWidth: Infinity, height: 180 }),
-                ]}
-              />
-            ) : (
-              <HStack spacing={0}>
-                <Picker
-                  label="Duration amount"
-                  selection={amount}
-                  onSelectionChange={(value: number) => {
-                    setAmount(value);
-                    setError(null);
-                  }}
-                  modifiers={[
-                    pickerStyle("wheel"),
-                    labelsHidden(),
-                    frame({ minWidth: 0, maxWidth: Infinity, height: 180 }),
-                    clipped(),
-                  ]}
-                >
-                  {durationAmounts.map((value) => (
-                    <Text
-                      key={value}
-                      modifiers={[tag(value), foregroundStyle(colors["--color-foreground"])]}
-                    >
-                      {String(value)}
-                    </Text>
-                  ))}
-                </Picker>
+              <VStack
+                spacing={16}
+                modifiers={[padding({ all: 16 }), foregroundStyle(colors["--color-foreground"])]}
+              >
                 <Picker
-                  label="Duration unit"
-                  selection={unit}
-                  onSelectionChange={(value: typeof unit) => {
-                    setUnit(value);
+                  label="Snooze mode"
+                  selection={mode}
+                  onSelectionChange={(value: CustomSnoozeInput["mode"]) => {
+                    setMode(value);
                     setError(null);
                   }}
-                  modifiers={[
-                    pickerStyle("wheel"),
-                    labelsHidden(),
-                    frame({ minWidth: 0, maxWidth: Infinity, height: 180 }),
-                    clipped(),
-                  ]}
+                  modifiers={[pickerStyle("segmented")]}
                 >
-                  {units.map((option) => (
-                    <Text
-                      key={option.value}
-                      modifiers={[tag(option.value), foregroundStyle(colors["--color-foreground"])]}
-                    >
+                  {modes.map((option) => (
+                    <Text key={option.value} modifiers={[tag(option.value)]}>
                       {option.label}
                     </Text>
                   ))}
                 </Picker>
-              </HStack>
-            )}
-            {error ? (
-              <Text
-                modifiers={[
-                  font({ textStyle: "footnote" }),
-                  foregroundStyle(colors["--color-danger-foreground"]),
-                ]}
-              >
-                {error}
-              </Text>
-            ) : null}
-          </VStack>
+                {mode === "date" ? (
+                  <DatePicker
+                    title="Snooze until"
+                    selection={date}
+                    displayedComponents={["date", "hourAndMinute"]}
+                    onDateChange={updateDate}
+                    modifiers={[
+                      datePickerStyle("wheel"),
+                      labelsHidden(),
+                      frame({ maxWidth: Infinity, height: 180 }),
+                    ]}
+                  />
+                ) : (
+                  <HStack spacing={0}>
+                    <Picker
+                      label="Duration amount"
+                      selection={amount}
+                      onSelectionChange={(value: number) => {
+                        setAmount(value);
+                        setError(null);
+                      }}
+                      modifiers={[
+                        pickerStyle("wheel"),
+                        labelsHidden(),
+                        frame({ minWidth: 0, maxWidth: Infinity, height: 180 }),
+                        clipped(),
+                      ]}
+                    >
+                      {durationAmounts.map((value) => (
+                        <Text
+                          key={value}
+                          modifiers={[tag(value), foregroundStyle(colors["--color-foreground"])]}
+                        >
+                          {String(value)}
+                        </Text>
+                      ))}
+                    </Picker>
+                    <Picker
+                      label="Duration unit"
+                      selection={unit}
+                      onSelectionChange={(value: typeof unit) => {
+                        setUnit(value);
+                        setError(null);
+                      }}
+                      modifiers={[
+                        pickerStyle("wheel"),
+                        labelsHidden(),
+                        frame({ minWidth: 0, maxWidth: Infinity, height: 180 }),
+                        clipped(),
+                      ]}
+                    >
+                      {units.map((option) => (
+                        <Text
+                          key={option.value}
+                          modifiers={[
+                            tag(option.value),
+                            foregroundStyle(colors["--color-foreground"]),
+                          ]}
+                        >
+                          {option.label}
+                        </Text>
+                      ))}
+                    </Picker>
+                  </HStack>
+                )}
+                {error ? (
+                  <Text
+                    modifiers={[
+                      font({ textStyle: "footnote" }),
+                      foregroundStyle(colors["--color-danger-foreground"]),
+                    ]}
+                  >
+                    {error}
+                  </Text>
+                ) : null}
+              </VStack>
+            </Host>
+          </SnoozePopoverNavigation>
         </Popover.Content>
       </Popover>
     </Host>
   );
 }
+
+/** The popover owns a native navigation bar, just like the app's sheet screens. */
+function SnoozePopoverNavigation(props: {
+  readonly width: number;
+  readonly height: number;
+  readonly onClose: () => void;
+  readonly onSubmit: () => void;
+  readonly children: ReactNode;
+}) {
+  const navigationTheme = useMobileNavigationTheme();
+  const { themeVariables: colors } = useAppearancePreferences();
+
+  return (
+    <VStack modifiers={[frame({ width: props.width, height: props.height })]}>
+      <RNHostView>
+        <View style={{ width: props.width, height: props.height }}>
+          <NavigationIndependentTree>
+            <NavigationContainer theme={navigationTheme}>
+              <SnoozeStack.Navigator
+                screenOptions={{
+                  contentStyle: { backgroundColor: "transparent" },
+                  headerShadowVisible: false,
+                  headerStyle: {
+                    backgroundColor: NATIVE_LIQUID_GLASS_SUPPORTED
+                      ? "transparent"
+                      : colors["--color-card"],
+                  },
+                  headerTintColor: colors["--color-foreground"],
+                  headerTitleStyle: { fontSize: 17, fontWeight: "700" },
+                  headerTransparent: NATIVE_LIQUID_GLASS_SUPPORTED,
+                  title: "Custom snooze",
+                }}
+              >
+                <SnoozeStack.Screen name="CustomSnooze">
+                  {() => (
+                    <>
+                      <NativeHeaderToolbar placement="left">
+                        <NativeHeaderToolbar.Button
+                          accessibilityLabel="Cancel custom snooze"
+                          icon="xmark"
+                          onPress={props.onClose}
+                        />
+                      </NativeHeaderToolbar>
+                      <NativeHeaderToolbar placement="right">
+                        <NativeHeaderToolbar.Button label="Snooze" onPress={props.onSubmit} />
+                      </NativeHeaderToolbar>
+                      <ScrollView
+                        contentInsetAdjustmentBehavior="automatic"
+                        showsVerticalScrollIndicator={false}
+                      >
+                        {props.children}
+                      </ScrollView>
+                    </>
+                  )}
+                </SnoozeStack.Screen>
+              </SnoozeStack.Navigator>
+            </NavigationContainer>
+          </NavigationIndependentTree>
+        </View>
+      </RNHostView>
+    </VStack>
+  );
+}
diff --git a/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx b/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx
index 9278bb6b941e..5fc60bc05dfd 100644
--- a/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx
+++ b/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx
@@ -152,7 +152,7 @@ export function CustomSnoozeSheet(props: {
             </Pressable>
             <Pressable
               accessibilityRole="button"
-              className="min-h-12 justify-center rounded-xl bg-primary px-3"
+              className="min-h-12 justify-center rounded-xl bg-subtle px-3"
               onPress={() => {
                 const input: CustomSnoozeInput =
                   mode === "date"
@@ -171,7 +171,7 @@ export function CustomSnoozeSheet(props: {
                 props.onClose();
               }}
             >
-              <AppText className="text-primary-foreground">Snooze</AppText>
+              <AppText className="text-foreground">Snooze</AppText>
             </Pressable>
           </View>
         </ScrollView>
diff --git a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
index b8411229a8ac..7be5dc4bbdbc 100644
--- a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
@@ -9,7 +9,6 @@ import type {
 import type { LegendListRenderItemProps } from "@legendapp/list/react-native";
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
 import { AnimatedLegendList } from "@legendapp/list/reanimated";
-import { HeaderHeightContext } from "@react-navigation/elements";
 import {
   getProviderOptionCurrentLabel,
   getProviderOptionCurrentValue,
@@ -31,13 +30,22 @@ import {
   useState,
   type ReactNode,
 } from "react";
-import { Alert, Platform, Pressable, ScrollView, TextInput, View } from "react-native";
+import {
+  Alert,
+  Platform,
+  Pressable,
+  RefreshControl,
+  ScrollView,
+  TextInput,
+  View,
+} from "react-native";
 import Animated, { FadeIn, FadeOut, LinearTransition } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { SymbolView } from "../../components/AppSymbol";
 import { AppText as Text } from "../../components/AppText";
 import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
+import { AndroidAnchoredMenu } from "../../components/AndroidAnchoredMenu";
 import { MaterialButton } from "../../components/MaterialButton";
 import { MaterialIconButton } from "../../components/MaterialIconButton";
 import { ProviderIcon } from "../../components/ProviderIcon";
@@ -759,12 +767,27 @@ function ThreadSettingsMainContent(props: {
   readonly onOpenSubmenu: (submenu: ThreadSettingsSubmenuPage) => void;
 }) {
   const session = useThreadSettingsSession();
+  const refreshProvidersCommand = useAtomCommand(serverEnvironment.refreshProviders, {
+    reportFailure: false,
+  });
+  const refreshProviderCatalog = useMemo(
+    () => createProviderCatalogRefreshRunner(refreshProvidersCommand),
+    [refreshProvidersCommand],
+  );
+  const [isRefreshingProviders, setIsRefreshingProviders] = useState(false);
+  const refreshProviders = useCallback(() => {
+    if (!session.environmentId || isRefreshingProviders) return;
+    setIsRefreshingProviders(true);
+    void refreshProviderCatalog(session.environmentId).then((result) => {
+      setIsRefreshingProviders(false);
+      const error = providerCatalogRefreshError(result);
+      if (error) Alert.alert("Could not refresh models", error);
+    });
+  }, [isRefreshingProviders, refreshProviderCatalog, session.environmentId]);
   const catalogItems = useThreadSettingsCatalogItems(session);
   const [animationsReady, setAnimationsReady] = useState(false);
-  const nativeHeaderHeight = use(HeaderHeightContext) ?? 0;
   const hasActiveCatalogFilter =
     session.providerFilter !== null || session.searchQuery.trim().length > 0;
-  const usesTransparentNativeHeader = Platform.OS === "ios" && NATIVE_LIQUID_GLASS_SUPPORTED;
   const listItems = useMemo<ReadonlyArray<ThreadSettingsCatalogItem>>(
     () => [
       ...(catalogItems.length === 0 ? ([{ kind: "empty", key: "empty" }] as const) : catalogItems),
@@ -830,6 +853,7 @@ function ThreadSettingsMainContent(props: {
 
   return (
     <AnimatedLegendList
+      alwaysBounceVertical
       automaticallyAdjustsScrollIndicatorInsets
       className="flex-1 bg-sheet"
       style={
@@ -838,7 +862,7 @@ function ThreadSettingsMainContent(props: {
           : undefined
       }
       contentContainerStyle={{ paddingTop: 4 }}
-      contentInsetAdjustmentBehavior={usesTransparentNativeHeader ? "never" : "automatic"}
+      contentInsetAdjustmentBehavior="automatic"
       data={listItems}
       estimatedItemSize={Platform.OS === "android" ? 56 : 48}
       extraData={animationsReady}
@@ -850,7 +874,6 @@ function ThreadSettingsMainContent(props: {
       maintainVisibleContentPosition={THREAD_SETTINGS_MAINTAIN_VISIBLE_CONTENT_POSITION}
       ListHeaderComponent={
         <>
-          {usesTransparentNativeHeader ? <View style={{ height: nativeHeaderHeight }} /> : null}
           {Platform.OS === "android" ? (
             <View className="px-4 pb-2 pt-3">
               <View
@@ -886,43 +909,16 @@ function ThreadSettingsMainContent(props: {
                   />
                 ) : null}
               </View>
-              <View className="flex-row gap-2 pt-3">
-                <Pressable
-                  accessibilityRole="button"
-                  accessibilityState={{
-                    selected: session.providerFilter !== FAVORITES_PROVIDER_FILTER,
-                  }}
-                  className={cn(
-                    "rounded-full px-4 py-2",
-                    session.providerFilter !== FAVORITES_PROVIDER_FILTER
-                      ? "bg-subtle-strong"
-                      : "bg-subtle",
-                  )}
-                  onPress={() => session.setProviderFilter(null)}
-                >
-                  <Text className="text-sm font-t3-medium text-foreground">All</Text>
-                </Pressable>
-                <Pressable
-                  accessibilityRole="button"
-                  accessibilityState={{
-                    selected: session.providerFilter === FAVORITES_PROVIDER_FILTER,
-                  }}
-                  className={cn(
-                    "rounded-full px-4 py-2",
-                    session.providerFilter === FAVORITES_PROVIDER_FILTER
-                      ? "bg-subtle-strong"
-                      : "bg-subtle",
-                  )}
-                  onPress={() => session.setProviderFilter(FAVORITES_PROVIDER_FILTER)}
-                >
-                  <Text className="text-sm font-t3-medium text-foreground">Favorites</Text>
-                </Pressable>
-              </View>
             </View>
           ) : null}
         </>
       }
       recycleItems
+      refreshControl={
+        session.environmentId ? (
+          <RefreshControl refreshing={isRefreshingProviders} onRefresh={refreshProviders} />
+        ) : undefined
+      }
       onLoad={() => setAnimationsReady(true)}
       renderItem={renderCatalogItem}
       showsVerticalScrollIndicator={false}
@@ -1042,27 +1038,22 @@ function ThreadSettingsModelsScreen() {
   const navigation = useNavigation<NativeStackNavigationProp<ThreadSettingsPickerStackParams>>();
   const usesNativeMailSearchToolbar = Platform.OS === "ios" && NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED;
   const hasCustomCatalogFilter = session.providerFilter !== null || session.showLegacy;
-  const refreshProvidersCommand = useAtomCommand(serverEnvironment.refreshProviders, {
-    reportFailure: false,
-  });
-  const refreshProviderCatalog = useMemo(
-    () => createProviderCatalogRefreshRunner(refreshProvidersCommand),
-    [refreshProvidersCommand],
-  );
-  const [isRefreshingProviders, setIsRefreshingProviders] = useState(false);
-  const refreshProviders = useCallback(() => {
-    if (!session.environmentId || isRefreshingProviders) return;
-    setIsRefreshingProviders(true);
-    void refreshProviderCatalog(session.environmentId).then((result) => {
-      setIsRefreshingProviders(false);
-      const error = providerCatalogRefreshError(result);
-      if (error) Alert.alert("Could not refresh models", error);
-    });
-  }, [isRefreshingProviders, refreshProviderCatalog, session.environmentId]);
   const commitAndClose = useCallback(() => {
     if (!session.commitPendingModel()) return;
     presentation.onClose();
   }, [presentation, session]);
+  const providerFilters = useMemo(
+    () => [
+      { id: "all-providers", title: "All providers", value: null },
+      { id: "favorites", title: "Favorites", value: FAVORITES_PROVIDER_FILTER },
+      ...session.providerGroups.map((group) => ({
+        id: `provider:${group.providerKey}`,
+        title: group.providerLabel,
+        value: group.providerKey,
+      })),
+    ],
+    [session.providerGroups],
+  );
   const filterMenu = useMemo(
     () => ({
       title: "Model filters",
@@ -1070,30 +1061,12 @@ function ThreadSettingsModelsScreen() {
         {
           type: "submenu" as const,
           title: "Provider",
-          items: [
-            {
-              type: "action" as const,
-              title: "All providers",
-              state: session.providerFilter === null ? ("on" as const) : ("off" as const),
-              onPress: () => session.setProviderFilter(null),
-            },
-            {
-              type: "action" as const,
-              title: "Favorites",
-              state:
-                session.providerFilter === FAVORITES_PROVIDER_FILTER
-                  ? ("on" as const)
-                  : ("off" as const),
-              onPress: () => session.setProviderFilter(FAVORITES_PROVIDER_FILTER),
-            },
-            ...session.providerGroups.map((group) => ({
-              type: "action" as const,
-              title: group.providerLabel,
-              state:
-                session.providerFilter === group.providerKey ? ("on" as const) : ("off" as const),
-              onPress: () => session.setProviderFilter(group.providerKey),
-            })),
-          ],
+          items: providerFilters.map((filter) => ({
+            type: "action" as const,
+            title: filter.title,
+            state: session.providerFilter === filter.value ? ("on" as const) : ("off" as const),
+            onPress: () => session.setProviderFilter(filter.value),
+          })),
         },
         ...(session.hasLegacyModels
           ? [
@@ -1107,25 +1080,59 @@ function ThreadSettingsModelsScreen() {
           : []),
       ],
     }),
-    [session],
+    [providerFilters, session],
   );
 
   return (
     <>
       {Platform.OS === "android" ? (
         <AndroidScreenHeader
-          actions={[
-            {
-              accessibilityLabel: "Refresh models",
-              disabled: isRefreshingProviders || session.environmentId === null,
-              icon: "arrow.clockwise",
-              onPress: refreshProviders,
-            },
-          ]}
           trailing={
-            session.pendingModel ? (
-              <MaterialButton label="Save" tone="text" onPress={commitAndClose} />
-            ) : undefined
+            <View className="flex-row items-center">
+              <AndroidAnchoredMenu
+                title="Model filters"
+                actions={[
+                  {
+                    title: "Provider",
+                    subactions: providerFilters.map((filter) => ({
+                      id: filter.id,
+                      title: filter.title,
+                      state: session.providerFilter === filter.value ? "on" : "off",
+                    })),
+                  },
+                  ...(session.hasLegacyModels
+                    ? [
+                        {
+                          id: "show-legacy",
+                          title: "Show legacy models",
+                          state: session.showLegacy ? ("on" as const) : ("off" as const),
+                        },
+                      ]
+                    : []),
+                ]}
+                onPressAction={({ nativeEvent }) => {
+                  if (nativeEvent.event === "show-legacy") {
+                    session.setShowLegacy(!session.showLegacy);
+                  } else {
+                    const filter = providerFilters.find((item) => item.id === nativeEvent.event);
+                    if (filter) session.setProviderFilter(filter.value);
+                  }
+                }}
+              >
+                {(open) => (
+                  <MaterialIconButton
+                    accessibilityLabel="Filter models"
+                    icon="line.3.horizontal.decrease"
+                    selected={hasCustomCatalogFilter}
+                    variant={hasCustomCatalogFilter ? "tonal" : "standard"}
+                    onPress={open}
+                  />
+                )}
+              </AndroidAnchoredMenu>
+              {session.pendingModel ? (
+                <MaterialButton label="Save" tone="text" onPress={commitAndClose} />
+              ) : null}
+            </View>
           }
           onBack={presentation.onClose}
           title="Thread settings"
@@ -1189,13 +1196,6 @@ function ThreadSettingsModelsScreen() {
         />
       </NativeHeaderToolbar>
       <NativeHeaderToolbar placement="right">
-        <NativeHeaderToolbar.Button
-          accessibilityLabel="Refresh models"
-          disabled={isRefreshingProviders || session.environmentId === null}
-          icon="arrow.clockwise"
-          onPress={refreshProviders}
-          separateBackground
-        />
         <NativeHeaderToolbar.Button
           accessibilityLabel={session.pendingModel ? "Save thread settings" : "Done"}
           label={session.pendingModel ? "Save" : "Done"}
diff --git a/apps/mobile/src/features/threads/provider-catalog-refresh.ts b/apps/mobile/src/features/threads/provider-catalog-refresh.ts
index 9c0078b03280..de2b12054773 100644
--- a/apps/mobile/src/features/threads/provider-catalog-refresh.ts
+++ b/apps/mobile/src/features/threads/provider-catalog-refresh.ts
@@ -10,7 +10,7 @@ type RefreshProvidersTarget = {
   readonly input: { readonly refreshModels: true };
 };
 
-/** Explicit model-picker refresh. Repeated taps share the pending discovery. */
+/** Pull-to-refresh in the model picker shares any pending discovery. */
 export function createProviderCatalogRefreshRunner<Result>(
   refreshProviders: (target: RefreshProvidersTarget) => Promise<Result>,
 ) {
diff --git a/apps/mobile/src/features/usage/UsageRouteScreen.tsx b/apps/mobile/src/features/usage/UsageRouteScreen.tsx
index af45e9eefb2a..d1bec8cbc140 100644
--- a/apps/mobile/src/features/usage/UsageRouteScreen.tsx
+++ b/apps/mobile/src/features/usage/UsageRouteScreen.tsx
@@ -412,7 +412,7 @@ function ProviderSection(props: {
   );
 
   return (
-    <SettingsSection title="Providers" card>
+    <SettingsSection title="Providers">
       {ordered.map((provider, index) => {
         const share = metric === "cost" ? provider.costShare : provider.tokenShare;
         return (
@@ -463,7 +463,7 @@ function TotalsSection(props: { readonly merged: MergedUsage; readonly isPast24H
   const cachedShare = observedInput === 0 ? 0 : merged.cachedInputTokens / observedInput;
 
   return (
-    <SettingsSection title="Totals" card>
+    <SettingsSection title="Totals">
       <View className="flex-row flex-wrap">
         <MetricCell
           label="Processed tokens"
@@ -524,7 +524,7 @@ function ModelsSection(props: { readonly merged: MergedUsage }) {
   if (merged.models.length === 0) return null;
 
   return (
-    <SettingsSection title="By model" card>
+    <SettingsSection title="By model">
       {merged.models.map((model, index) => (
         <View
           key={`${model.provider}:${model.model}`}

From d99bc5a4d707df2506e60cbb411b8d30022bbf89 Mon Sep 17 00:00:00 2001
From: oliver <97427849+flamboh@users.noreply.github.com>
Date: Fri, 18 Sep 2026 16:11:40 -0700
Subject: [PATCH 02/25] feat(web): sort pull requests by what is blocked on me
 (#12508)

---
 .../pullRequest/pullRequestList.logic.test.ts | 104 ++++++++++++++++++
 .../pullRequest/pullRequestList.logic.ts      |  52 +++++++++
 .../pullRequest/pullRequestListPreferences.ts |   1 +
 apps/web/src/routes/_chat.pull-requests.tsx   |   5 +-
 4 files changed, 161 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/pullRequest/pullRequestList.logic.test.ts b/apps/web/src/components/pullRequest/pullRequestList.logic.test.ts
index a90022ad72c9..9154e38026d2 100644
--- a/apps/web/src/components/pullRequest/pullRequestList.logic.test.ts
+++ b/apps/web/src/components/pullRequest/pullRequestList.logic.test.ts
@@ -21,6 +21,8 @@ import {
   readPullRequestListSnapshot,
   writePullRequestListSnapshot,
   rankPullRequestMatches,
+  rankPullRequestsBlockedOnAuthor,
+  rankPullRequestsBlockedOnReviewer,
   rankPullRequestsByMergeReadiness,
   scorePullRequestMatch,
   sortPullRequestGroups,
@@ -873,6 +875,108 @@ describe("default merge-readiness ranking", () => {
   });
 });
 
+describe("blocked-on-me ranking", () => {
+  it("ranks authored work by how surely it is the author's to unblock, newest first within a tier", () => {
+    const conflict = entry({
+      number: 1,
+      mergeability: "conflicting",
+      checksState: "failing",
+      updatedAt: "2026-08-01T00:00:00Z",
+    });
+    const olderFailing = entry({
+      number: 2,
+      checksState: "failing",
+      updatedAt: "2026-08-01T00:00:00Z",
+    });
+    const changesRequested = entry({
+      number: 3,
+      reviewDecision: "changes-requested",
+      checksState: "failing",
+      updatedAt: "2026-08-02T00:00:00Z",
+    });
+    const approved = entry({ number: 4, checksState: "passing", reviewDecision: "approved" });
+    const draft = entry({ number: 5, isDraft: true, checksState: "passing" });
+    const waiting = entry({ number: 6 });
+    const merged = entry({ number: 7, state: "merged", updatedAt: "2026-08-01T00:00:00Z" });
+    const newerClosed = entry({ number: 8, state: "closed", updatedAt: "2026-08-03T00:00:00Z" });
+    const newerFailing = entry({
+      number: 9,
+      checksState: "failing",
+      updatedAt: "2026-08-03T00:00:00Z",
+    });
+
+    expect(
+      rankPullRequestsBlockedOnAuthor([
+        waiting,
+        merged,
+        olderFailing,
+        draft,
+        approved,
+        changesRequested,
+        newerClosed,
+        conflict,
+        newerFailing,
+      ]).map((row) => row.number),
+    ).toEqual([1, 3, 9, 2, 5, 6, 4, 8, 7]);
+  });
+
+  it("ranks reviewer work with open rows first, newest first", () => {
+    const olderOpen = entry({ number: 1, updatedAt: "2026-08-01T00:00:00Z" });
+    const newerOpen = entry({ number: 2, updatedAt: "2026-08-02T00:00:00Z" });
+    const olderFinished = entry({ number: 3, state: "merged", updatedAt: "2026-08-01T00:00:00Z" });
+    const newerFinished = entry({ number: 4, state: "closed", updatedAt: "2026-08-03T00:00:00Z" });
+
+    expect(
+      rankPullRequestsBlockedOnReviewer([newerFinished, newerOpen, olderFinished, olderOpen]).map(
+        (row) => row.number,
+      ),
+    ).toEqual([2, 1, 4, 3]);
+  });
+
+  it("ranks blocked groups according to their involvement", () => {
+    const authored = [
+      entry({ number: 1, isDraft: true }),
+      entry({ number: 2, checksState: "failing" }),
+    ];
+    const reviewing = [
+      entry({ number: 3, updatedAt: "2026-08-02T00:00:00Z" }),
+      entry({ number: 4, updatedAt: "2026-08-01T00:00:00Z" }),
+    ];
+    const others = [
+      entry({ number: 5, updatedAt: "2026-08-02T00:00:00Z" }),
+      entry({ number: 6, isDraft: true }),
+    ];
+    const groups = [
+      { key: "authored", label: "Authored", entries: authored },
+      { key: "reviewRequested", label: "Review requested", entries: reviewing },
+      { key: "others", label: "Others", entries: others },
+    ] as const;
+
+    expect(
+      sortPullRequestGroups(groups, "blocked", "", undefined, "all").map((group) =>
+        group.entries.map((row) => row.number),
+      ),
+    ).toEqual([
+      [2, 1],
+      [3, 4],
+      [5, 6],
+    ]);
+    expect(
+      sortPullRequestGroups([groups[2]], "blocked", "", undefined, "authored")[0]!.entries.map(
+        (row) => row.number,
+      ),
+    ).toEqual([6, 5]);
+    expect(
+      sortPullRequestGroups([groups[2]], "blocked", "", undefined, "reviewing")[0]!.entries.map(
+        (row) => row.number,
+      ),
+    ).toEqual([5, 6]);
+    expect(sortPullRequestGroups(groups, "blocked", "needle", undefined, "authored")).toEqual(
+      groups,
+    );
+  });
+});
+
 describe("line counts that arrive after the rows", () => {
   const stats = new Map([["env-1 project-1 7", { additions: 42, deletions: 3 }]]);
 
diff --git a/apps/web/src/components/pullRequest/pullRequestList.logic.ts b/apps/web/src/components/pullRequest/pullRequestList.logic.ts
index c2fdde3d011f..f001e33829c5 100644
--- a/apps/web/src/components/pullRequest/pullRequestList.logic.ts
+++ b/apps/web/src/components/pullRequest/pullRequestList.logic.ts
@@ -1034,12 +1034,50 @@ export function rankPullRequestsByMergeReadiness<Entry extends PullRequestListEn
   });
 }
 
+function rankByTierThenRecency<Entry extends PullRequestListEntry>(
+  entries: ReadonlyArray<Entry>,
+  tier: (entry: Entry) => number,
+): ReadonlyArray<Entry> {
+  const timestamp = (entry: Entry) => toSortableTimestamp(entry.updatedAt);
+  return entries.toSorted((left, right) => {
+    const byTier = tier(left) - tier(right);
+    if (byTier !== 0) return byTier;
+    const leftUpdated = timestamp(left);
+    const rightUpdated = timestamp(right);
+    const measured = Number(leftUpdated === null) - Number(rightUpdated === null);
+    if (measured !== 0) return measured;
+    if (leftUpdated === null || rightUpdated === null) return 0;
+    return rightUpdated - leftUpdated;
+  });
+}
+
+export function rankPullRequestsBlockedOnAuthor<Entry extends PullRequestListEntry>(
+  entries: ReadonlyArray<Entry>,
+): ReadonlyArray<Entry> {
+  return rankByTierThenRecency(entries, (entry) => {
+    if (entry.state !== "open") return 6;
+    if (entry.mergeability === "conflicting") return 0;
+    if (entry.reviewDecision === "changes-requested") return 1;
+    if (entry.checksState === "failing") return 2;
+    if (entry.isDraft) return 3;
+    if (entry.checksState === "passing" && entry.reviewDecision === "approved") return 5;
+    return 4;
+  });
+}
+
+export function rankPullRequestsBlockedOnReviewer<Entry extends PullRequestListEntry>(
+  entries: ReadonlyArray<Entry>,
+): ReadonlyArray<Entry> {
+  return rankByTierThenRecency(entries, (entry) => (entry.state === "open" ? 0 : 1));
+}
+
 /** Keeps authored work first while applying the selected ordering inside every involvement group. */
 export function sortPullRequestGroups<Entry extends PullRequestListEntry>(
   groups: ReadonlyArray<PullRequestGroup<Entry>>,
   sort: PullRequestListSort,
   searchText: string,
   hasMeasuredSize: (entry: Entry) => boolean = (entry) => entry.additions + entry.deletions > 0,
+  involvement: PullRequestInvolvement = "all",
 ): ReadonlyArray<PullRequestGroup<Entry>> {
   const sortWithinGroups = (rank: (entries: ReadonlyArray<Entry>) => ReadonlyArray<Entry>) =>
     groups.map((group) => ({ ...group, entries: rank(group.entries) }));
@@ -1049,6 +1087,20 @@ export function sortPullRequestGroups<Entry extends PullRequestListEntry>(
       ? sortWithinGroups((entries) => rankPullRequestsByMergeReadiness(entries, hasMeasuredSize))
       : groups;
   }
+  if (sort === "blocked") {
+    if (searchText.trim().length > 0) return groups;
+    const role = (key: PullRequestGroupKey) =>
+      key === "others" ? involvement : key === "authored" ? "authored" : "reviewing";
+    return groups.map((group) => {
+      const groupRole = role(group.key);
+      if (groupRole === "all") return group;
+      const rank =
+        groupRole === "authored"
+          ? rankPullRequestsBlockedOnAuthor
+          : rankPullRequestsBlockedOnReviewer;
+      return { ...group, entries: rank(group.entries) };
+    });
+  }
   if (sort === "updated") return groups;
 
   const timestamp = (entry: Entry) =>
diff --git a/apps/web/src/components/pullRequest/pullRequestListPreferences.ts b/apps/web/src/components/pullRequest/pullRequestListPreferences.ts
index 95c4bf02e743..afb926c5862d 100644
--- a/apps/web/src/components/pullRequest/pullRequestListPreferences.ts
+++ b/apps/web/src/components/pullRequest/pullRequestListPreferences.ts
@@ -10,6 +10,7 @@ import {
 
 export const PullRequestListSort = Schema.Literals([
   "ready",
+  "blocked",
   "updated",
   "newest",
   "oldest",
diff --git a/apps/web/src/routes/_chat.pull-requests.tsx b/apps/web/src/routes/_chat.pull-requests.tsx
index bed2b65da5e4..f54415b1986c 100644
--- a/apps/web/src/routes/_chat.pull-requests.tsx
+++ b/apps/web/src/routes/_chat.pull-requests.tsx
@@ -28,6 +28,7 @@ import {
   Maximize2Icon,
   Minimize2Icon,
   SearchIcon,
+  UserLockIcon,
 } from "lucide-react";
 import {
   useCallback,
@@ -203,6 +204,7 @@ const STATE_TABS = [
 
 const SORT_OPTIONS = [
   { value: "ready", label: "Merge readiness", Icon: ListChecksIcon },
+  { value: "blocked", label: "Blocked on me", Icon: UserLockIcon },
   { value: "updated", label: "Recently updated", Icon: ClockIcon },
   { value: "newest", label: "Newest shown", Icon: CalendarArrowDownIcon },
   { value: "oldest", label: "Oldest shown", Icon: CalendarArrowUpIcon },
@@ -1437,8 +1439,9 @@ function PullRequestsRouteView() {
       typedParsed.text,
       (entry) =>
         entry.additions + entry.deletions > 0 || statsByRow.has(pullRequestDiffStatKey(entry)),
+      search.involvement,
     );
-  }, [groups, sort, statsByRow, typedParsed.text]);
+  }, [groups, search.involvement, sort, statsByRow, typedParsed.text]);
   const listedPullRequestsBySurface = useMemo(
     () =>
       new Map(

From 8c3b5bef17a637bf53f297189350359790ef7afb Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 16:50:19 -0700
Subject: [PATCH 03/25] fix(mobile): prefer pull-to-refresh on list screens
 (#12515)

---
 .../src/components/ScreenHeader.android.tsx   |  2 +-
 .../archive/ArchivedThreadsScreen.tsx         | 13 +++-
 .../connection/CloudEnvironmentRows.tsx       | 29 +--------
 .../src/features/files/FileTreeBrowser.tsx    | 32 ++++++----
 .../features/files/MaterialFilesHeader.tsx    | 23 +++++--
 .../features/files/ThreadFilesRouteScreen.tsx | 13 +++-
 .../files/thread-file-navigator-pane.tsx      | 12 +---
 .../SettingsEnvironmentsRouteScreen.tsx       | 61 ++++++++++++++++++-
 .../features/threads/git/GitOverviewSheet.tsx | 58 ++++++++++++------
 9 files changed, 166 insertions(+), 77 deletions(-)

diff --git a/apps/mobile/src/components/ScreenHeader.android.tsx b/apps/mobile/src/components/ScreenHeader.android.tsx
index edb0b770e93c..f7b70e695ad9 100644
--- a/apps/mobile/src/components/ScreenHeader.android.tsx
+++ b/apps/mobile/src/components/ScreenHeader.android.tsx
@@ -138,7 +138,7 @@ export function ScreenHeader(props: ScreenHeaderProps) {
                 icon: "magnifyingglass",
                 onPress: () => setSearchOpen(true),
               },
-              ...(search.onRefresh
+              ...(search.refreshInToolbar && search.onRefresh
                 ? [
                     {
                       accessibilityLabel: search.refreshAccessibilityLabel ?? "Refresh",
diff --git a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
index a191a9c7175b..ea150180393c 100644
--- a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
+++ b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
@@ -14,6 +14,7 @@ import { SymbolView } from "../../components/AppSymbol";
 import { useCallback, useMemo, useRef, type ComponentProps } from "react";
 import {
   ActivityIndicator,
+  Platform,
   Pressable,
   RefreshControl,
   useWindowDimensions,
@@ -63,9 +64,6 @@ function ArchivedThreadsHeader(props: {
         compactPlaceholder: "Search",
         mode: "inline",
         compactToolbar: width < 700,
-        onRefresh: props.onRefresh,
-        refreshInToolbar: true,
-        refreshAccessibilityLabel: "Refresh archived threads",
       }}
       menus={[
         {
@@ -110,6 +108,15 @@ function ArchivedThreadsHeader(props: {
                 },
               ],
             },
+            ...(Platform.OS === "android"
+              ? [
+                  {
+                    id: "refresh",
+                    title: "Refresh archived threads",
+                    onPress: props.onRefresh,
+                  },
+                ]
+              : []),
           ],
         },
       ]}
diff --git a/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx b/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
index cccc6425ec13..2828392ba8f3 100644
--- a/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
+++ b/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
@@ -41,16 +41,14 @@ interface CloudEnvironmentRowsProps {
   readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
   readonly showcaseSignedIn?: boolean;
   /**
-   * Hide the "T3 Connect" section title + refresh button for hosts that
-   * provide their own chrome (the onboarding sheet's native header and
-   * pull-to-refresh).
+   * Hide the "T3 Connect" section title when the host provides its own header.
    */
   readonly showHeader?: boolean;
 }
 
 /**
  * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
+ * with connect switches, availability status, and loading/error
  * states. Shared between the Settings environments screen and the T3 Connect
  * onboarding sheet.
  *
@@ -120,29 +118,8 @@ function CloudEnvironmentRowsContent(
   return (
     <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
       {showHeader ? (
-        <View className="flex-row items-center justify-between px-1">
+        <View className="px-1">
           <Text className="text-sm font-t3-bold uppercase text-foreground-muted">T3 Connect</Text>
-          {discoveryAvailable ? (
-            <Pressable
-              accessibilityRole="button"
-              disabled={controller.relayDiscovery.isRefreshing}
-              onPress={() => {
-                void controller.refreshRelayEnvironments();
-              }}
-              className="h-9 w-9 items-center justify-center rounded-full bg-subtle active:opacity-70 disabled:opacity-50"
-            >
-              {controller.relayDiscovery.isRefreshing ? (
-                <ActivityIndicator colorClassName={"accent-icon"} size="small" />
-              ) : (
-                <SymbolView
-                  name="arrow.clockwise"
-                  size={14}
-                  tintColorClassName={"accent-icon"}
-                  type="monochrome"
-                />
-              )}
-            </Pressable>
-          ) : null}
         </View>
       ) : null}
 
diff --git a/apps/mobile/src/features/files/FileTreeBrowser.tsx b/apps/mobile/src/features/files/FileTreeBrowser.tsx
index f2dfd3f15a97..df18347f336c 100644
--- a/apps/mobile/src/features/files/FileTreeBrowser.tsx
+++ b/apps/mobile/src/features/files/FileTreeBrowser.tsx
@@ -234,15 +234,6 @@ export function FileTreeBrowser(props: {
     ],
   );
 
-  if (props.error && props.entries.length === 0) {
-    return (
-      <View className="flex-1 bg-sheet px-4 py-5">
-        <Text className="text-sm font-t3-bold text-foreground">Files unavailable</Text>
-        <Text className="mt-1 text-xs leading-normal text-foreground-muted">{props.error}</Text>
-      </View>
-    );
-  }
-
   // SPIKE: render the FlatList as the screen's DIRECT content (no wrapping View), and
   // mirror the Home ScrollView exactly — `contentInsetAdjustmentBehavior: "automatic"`
   // with NO manual contentInset. iOS only applies the nav-bar top inset + scroll-edge
@@ -250,6 +241,7 @@ export function FileTreeBrowser(props: {
   // flex-1 Views is ignored, which is why the tree rendered under the header with no blur.
   return (
     <FlatList
+      alwaysBounceVertical
       className="flex-1"
       data={visibleNodes}
       keyExtractor={(item) => item.node.path}
@@ -270,7 +262,7 @@ export function FileTreeBrowser(props: {
       renderItem={renderItem}
       ListHeaderComponent={
         <>
-          {props.error ? (
+          {props.error && props.entries.length > 0 ? (
             <Text accessibilityRole="alert" className="mx-4 my-2 text-xs text-foreground-muted">
               {props.error}
             </Text>
@@ -284,7 +276,25 @@ export function FileTreeBrowser(props: {
       }
       ListEmptyComponent={
         <View className="px-4 py-5">
-          {props.isPending ? (
+          {props.error && props.entries.length === 0 ? (
+            <>
+              <Text className="text-sm font-t3-bold text-foreground">Files unavailable</Text>
+              <Text
+                accessibilityRole="alert"
+                className="mt-1 text-xs leading-normal text-foreground-muted"
+              >
+                {props.error}
+              </Text>
+              <Pressable
+                accessibilityRole="button"
+                onPress={props.onRefresh}
+                disabled={props.isPending}
+                className="mt-3 min-h-11 self-start justify-center rounded-full bg-subtle px-4 active:opacity-70 disabled:opacity-50"
+              >
+                <Text className="text-sm font-t3-medium text-foreground">Try again</Text>
+              </Pressable>
+            </>
+          ) : props.isPending ? (
             <ActivityIndicator size="small" />
           ) : (
             <>
diff --git a/apps/mobile/src/features/files/MaterialFilesHeader.tsx b/apps/mobile/src/features/files/MaterialFilesHeader.tsx
index 8936ae9b37ed..61d007ea5c3e 100644
--- a/apps/mobile/src/features/files/MaterialFilesHeader.tsx
+++ b/apps/mobile/src/features/files/MaterialFilesHeader.tsx
@@ -3,6 +3,7 @@ import { BackHandler, Keyboard, type TextInput, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { AndroidHeaderIconButton, AndroidScreenHeader } from "../../components/AndroidScreenHeader";
+import { AndroidAnchoredMenu } from "../../components/AndroidAnchoredMenu";
 import { MaterialSearchField } from "../../components/MaterialSearchField";
 
 /** Keep Files search in the same header row on compact and expanded layouts. */
@@ -55,12 +56,24 @@ export function MaterialFilesHeader(props: {
               icon: "magnifyingglass",
               onPress: () => setSearchOpen(true),
             },
-            {
-              accessibilityLabel: "Refresh files",
-              icon: "arrow.clockwise",
-              onPress: props.onRefresh,
-            },
           ]}
+          trailing={
+            <AndroidAnchoredMenu
+              title="File options"
+              actions={[{ id: "refresh", title: "Refresh files" }]}
+              onPressAction={({ nativeEvent }) => {
+                if (nativeEvent.event === "refresh") props.onRefresh();
+              }}
+            >
+              {(open) => (
+                <AndroidHeaderIconButton
+                  accessibilityLabel="File options"
+                  icon="ellipsis"
+                  onPress={open}
+                />
+              )}
+            </AndroidAnchoredMenu>
+          }
         />
       </View>
       {searching ? (
diff --git a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
index 9e89ea1b24e4..06ef8f6ba4d9 100644
--- a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
+++ b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
@@ -77,11 +77,20 @@ function FilesBrowserHeader(props: {
         value: props.searchQuery,
         onChangeText: props.onSearchQueryChange,
         placeholder: "Search files",
-        onRefresh: props.onRefresh,
-        refreshAccessibilityLabel: "Refresh files",
         closeAccessibilityLabel: "Close file search",
         clearAccessibilityLabel: "Clear file search",
       }}
+      menus={
+        Platform.OS === "android"
+          ? [
+              {
+                title: "File options",
+                icon: "ellipsis",
+                items: [{ id: "refresh", title: "Refresh files", onPress: props.onRefresh }],
+              },
+            ]
+          : undefined
+      }
     />
   );
 }
diff --git a/apps/mobile/src/features/files/thread-file-navigator-pane.tsx b/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
index f62ba6b7abba..c3c906e3d515 100644
--- a/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
+++ b/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
@@ -55,16 +55,6 @@ export function ThreadFileNavigatorPane(props: {
   const nativeHeaderRightBarButtonItems = useMemo(
     () =>
       [
-        {
-          accessibilityLabel: "Refresh files",
-          icon: { name: "arrow.clockwise", type: "sfSymbol" as const },
-          identifier: "thread-file-navigator-refresh",
-          onPress: entriesQuery.refresh,
-          sharesBackground: false,
-          tintColor: foregroundColor,
-          type: "button" as const,
-          width: 44,
-        },
         {
           accessibilityLabel: "Close files",
           icon: { name: "xmark", type: "sfSymbol" as const },
@@ -76,7 +66,7 @@ export function ThreadFileNavigatorPane(props: {
           width: 44,
         },
       ] as ComponentProps<typeof ScreenStackHeaderConfig>["headerRightBarButtonItems"],
-    [entriesQuery.refresh, foregroundColor, toggleAuxiliaryPane],
+    [foregroundColor, toggleAuxiliaryPane],
   );
 
   const fileTree = (
diff --git a/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
index ce6077db6163..7ca791afec6d 100644
--- a/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
@@ -1,16 +1,23 @@
 import { ScreenScrollView as ScrollView } from "../../components/ScreenScrollView";
 import { useNavigation } from "@react-navigation/native";
+import { useAtomValue } from "@effect/atom-react";
+import { managedRelaySessionAtom } from "@t3tools/client-runtime/relay";
 import type { EnvironmentId } from "@t3tools/contracts";
-import { useCallback, useState } from "react";
+import { useCallback, useRef, useState } from "react";
+import { Platform, RefreshControl } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { SettingsScreen } from "./components/SettingsScreen";
+import { AndroidAnchoredMenu } from "../../components/AndroidAnchoredMenu";
+import { AndroidHeaderIconButton } from "../../components/AndroidScreenHeader";
 import { CloudEnvironmentRows } from "../connection/CloudEnvironmentRows";
 import { LocalEnvironmentList } from "../connection/LocalEnvironmentList";
 import { GitHubRoutingSettings } from "../connection/GitHubRoutingSettings";
 import { splitEnvironmentSections } from "../connection/environmentSections";
 import { useUniwindTheme } from "../../lib/useUniwindTheme";
 import { useRemoteConnections } from "../../state/use-remote-environment-registry";
+import { relayEnvironmentDiscovery } from "../../state/relay";
+import { useAtomCommand } from "../../state/use-atom-command";
 import {
   applyShowcaseLocalEnvironmentDisplayUrls,
   resolveShowcaseEnvironmentUpdateDisplayUrl,
@@ -42,6 +49,24 @@ export function SettingsEnvironmentsRouteScreen() {
     : environmentSections.connectedCloudEnvironments;
   const [expandedId, setExpandedId] = useState<EnvironmentId | null>(null);
   const headerIconColor = useUniwindTheme()["--color-icon"];
+  const relaySession = useAtomValue(managedRelaySessionAtom);
+  const refreshRelayEnvironments = useAtomCommand(
+    relayEnvironmentDiscovery.refresh,
+    "relay environment refresh",
+  );
+  const [isRefreshingCloud, setIsRefreshingCloud] = useState(false);
+  const cloudRefreshPendingRef = useRef(false);
+  async function refreshCloudEnvironments() {
+    if (!relaySession || cloudRefreshPendingRef.current) return;
+    cloudRefreshPendingRef.current = true;
+    setIsRefreshingCloud(true);
+    try {
+      await refreshRelayEnvironments();
+    } finally {
+      cloudRefreshPendingRef.current = false;
+      setIsRefreshingCloud(false);
+    }
+  }
 
   const handleToggle = useCallback((environmentId: EnvironmentId) => {
     setExpandedId((prev) => (prev === environmentId ? null : environmentId));
@@ -76,6 +101,31 @@ export function SettingsEnvironmentsRouteScreen() {
   return (
     <SettingsScreen
       title="Environments"
+      trailing={
+        Platform.OS === "android" && relaySession ? (
+          <AndroidAnchoredMenu
+            title="Environment options"
+            actions={[
+              {
+                id: "refresh",
+                title: "Refresh cloud environments",
+                attributes: { disabled: isRefreshingCloud },
+              },
+            ]}
+            onPressAction={({ nativeEvent }) => {
+              if (nativeEvent.event === "refresh") void refreshCloudEnvironments();
+            }}
+          >
+            {(open) => (
+              <AndroidHeaderIconButton
+                accessibilityLabel="Environment options"
+                icon="ellipsis"
+                onPress={open}
+              />
+            )}
+          </AndroidAnchoredMenu>
+        ) : undefined
+      }
       actions={[
         {
           accessibilityLabel: "Add environment",
@@ -90,6 +140,7 @@ export function SettingsEnvironmentsRouteScreen() {
       ]}
     >
       <ScrollView
+        alwaysBounceVertical
         contentInsetAdjustmentBehavior="automatic"
         showsVerticalScrollIndicator={false}
         className="flex-1"
@@ -97,6 +148,14 @@ export function SettingsEnvironmentsRouteScreen() {
         contentContainerStyle={{
           paddingBottom: Math.max(insets.bottom, 18) + 18,
         }}
+        refreshControl={
+          relaySession ? (
+            <RefreshControl
+              refreshing={isRefreshingCloud}
+              onRefresh={() => void refreshCloudEnvironments()}
+            />
+          ) : undefined
+        }
       >
         <LocalEnvironmentList
           environments={localEnvironments}
diff --git a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
index ace7a5a5cda4..7293173ecee7 100644
--- a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
@@ -26,6 +26,7 @@ import {
   AndroidHeaderIconButton,
   AndroidSheetHeader,
 } from "../../../components/AndroidScreenHeader";
+import { AndroidAnchoredMenu } from "../../../components/AndroidAnchoredMenu";
 import { MaterialScreenContent } from "../../../components/MaterialScreenContent";
 import { useAdaptiveWorkspaceLayout } from "../../layout/AdaptiveWorkspaceLayout";
 import { AppText as Text } from "../../../components/AppText";
@@ -232,6 +233,7 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
 
   const content = (
     <ScrollView
+      alwaysBounceVertical
       className={Platform.OS === "android" ? "flex-1 bg-sheet-solid" : "flex-1 bg-screen"}
       contentInsetAdjustmentBehavior={Platform.OS === "ios" ? "automatic" : "never"}
       showsVerticalScrollIndicator={false}
@@ -400,7 +402,7 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
     // stack header, so — like the Settings sheet — the header must come from a
     // nested native stack INSIDE the sheet. This reuses the exact structure of the
     // inspector branch below: branch as the title, status summary as the native
-    // subtitle, refresh as a header button.
+    // subtitle, and content that owns pull-to-refresh.
     return (
       <View collapsable={false} className="flex-1 bg-sheet">
         <ScreenStack style={{ flex: 1 }}>
@@ -431,6 +433,30 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
     );
   }
 
+  const refreshMenu = (
+    <AndroidAnchoredMenu
+      title="Repository options"
+      actions={[
+        {
+          id: "refresh",
+          title: "Refresh repository status",
+          attributes: { disabled: busy || isPullRefreshing },
+        },
+      ]}
+      onPressAction={({ nativeEvent }) => {
+        if (nativeEvent.event === "refresh") void handlePullRefresh();
+      }}
+    >
+      {(open) => (
+        <AndroidHeaderIconButton
+          accessibilityLabel="Repository options"
+          icon="ellipsis"
+          onPress={open}
+        />
+      )}
+    </AndroidAnchoredMenu>
+  );
+
   return (
     <View
       collapsable={false}
@@ -465,14 +491,7 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
           }
         >
           {Platform.OS === "android" ? (
-            <View className="absolute right-3 top-4 z-[1]">
-              <AndroidHeaderIconButton
-                accessibilityLabel="Refresh repository status"
-                disabled={busy}
-                icon="arrow.clockwise"
-                onPress={() => void gitActions.refreshSelectedThreadGitStatus()}
-              />
-            </View>
+            <View className="absolute right-3 top-4 z-[1]">{refreshMenu}</View>
           ) : (
             <Pressable
               className={
@@ -506,14 +525,19 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
           hideBottomBorder={Platform.OS === "android"}
           subtitle={currentStatusSummary}
           onBack={() => navigation.goBack()}
-          actions={[
-            {
-              accessibilityLabel: "Refresh repository status",
-              disabled: busy,
-              icon: "arrow.clockwise",
-              onPress: () => void gitActions.refreshSelectedThreadGitStatus(),
-            },
-          ]}
+          trailing={Platform.OS === "android" ? refreshMenu : undefined}
+          actions={
+            Platform.OS === "android"
+              ? undefined
+              : [
+                  {
+                    accessibilityLabel: "Refresh repository status",
+                    disabled: busy,
+                    icon: "arrow.clockwise",
+                    onPress: () => void gitActions.refreshSelectedThreadGitStatus(),
+                  },
+                ]
+          }
         />
       )}
 

From de6a230db0bb71d3fa91d8de0ae7067b68253f82 Mon Sep 17 00:00:00 2001
From: shivam <91240327+shivamhwp@users.noreply.github.com>
Date: Sat, 19 Sep 2026 05:42:41 +0530
Subject: [PATCH 04/25] fix(acp): accept SDK elicitation requests (#11294)

---
 packages/effect-acp/src/client.test.ts | 147 +++++++++++++++++++++++++
 packages/effect-acp/src/client.ts      |  22 +++-
 packages/effect-acp/src/protocol.ts    |  12 +-
 packages/effect-acp/src/rpc.ts         |  16 +++
 4 files changed, 191 insertions(+), 6 deletions(-)

diff --git a/packages/effect-acp/src/client.test.ts b/packages/effect-acp/src/client.test.ts
index 3a0b262e6e22..5d1bd1d3ac94 100644
--- a/packages/effect-acp/src/client.test.ts
+++ b/packages/effect-acp/src/client.test.ts
@@ -778,3 +778,150 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
       }),
   );
 });
+
+const elicitationForm = {
+  sessionId: "session-1",
+  mode: "form" as const,
+  message: "Continue?",
+  requestedSchema: {
+    type: "object" as const,
+    properties: { choice: { type: "string" as const } },
+    required: ["choice"],
+  },
+};
+const decodeWireResponse = Schema.decodeEffect(Schema.fromJsonString(Schema.Unknown));
+const decodeWireError = Schema.decodeEffect(
+  Schema.fromJsonString(Schema.Struct({ error: Schema.Struct({ code: Schema.Finite }) })),
+);
+
+it.effect.each(["accept", "decline", "cancel"] as const)(
+  "returns a flat %s action to the SDK and preserves the legacy response",
+  (action) =>
+    Effect.gen(function* () {
+      for (const method of ["elicitation/create", "session/elicitation"]) {
+        const { stdio, input, output } = yield* makeInMemoryStdio();
+        const acp = yield* AcpClient.make(stdio);
+        const answer = action === "accept" ? { action, content: { choice: "yes" } } : { action };
+        const response = { action: answer, _meta: { trace: "fixture" } };
+        yield* acp.handleElicitation((request) => {
+          assert.deepEqual(request, elicitationForm);
+          return Effect.succeed(response);
+        });
+        yield* Queue.offer(
+          input,
+          yield* encodeJsonl(jsonRpcRequest(method, AcpSchema.ElicitationRequest), {
+            jsonrpc: "2.0",
+            id: 71,
+            headers: [],
+            method,
+            params: elicitationForm,
+          }),
+        );
+        const received = yield* decodeWireResponse(yield* Queue.take(output));
+        assert.deepEqual(received, {
+          jsonrpc: "2.0",
+          id: 71,
+          result: method === "elicitation/create" ? { ...answer, _meta: response._meta } : response,
+        });
+      }
+    }).pipe(Effect.scoped),
+);
+
+it.effect("dispatches SDK URL elicitation to the same registered handler", () =>
+  Effect.gen(function* () {
+    const { stdio, input, output } = yield* makeInMemoryStdio();
+    const acp = yield* AcpClient.make(stdio);
+    const params = {
+      sessionId: "session-1",
+      mode: "url" as const,
+      message: "Sign in",
+      elicitationId: "elicitation-1",
+      url: "https://example.test/sign-in",
+    };
+    yield* acp.handleElicitation((request) => {
+      assert.deepEqual(request, params);
+      return Effect.succeed({ action: { action: "accept" as const } });
+    });
+    yield* Queue.offer(
+      input,
+      yield* encodeJsonl(jsonRpcRequest("elicitation/create", AcpSchema.ElicitationRequest), {
+        jsonrpc: "2.0",
+        id: 72,
+        headers: [],
+        method: "elicitation/create",
+        params,
+      }),
+    );
+    assert.deepEqual(yield* decodeWireResponse(yield* Queue.take(output)), {
+      jsonrpc: "2.0",
+      id: 72,
+      result: { action: "accept" },
+    });
+  }).pipe(Effect.scoped),
+);
+
+it.effect.each(["elicitation/complete", "session/elicitation/complete"])(
+  "delivers %s notifications to the completion handler",
+  (method) =>
+    Effect.gen(function* () {
+      const { stdio, input } = yield* makeInMemoryStdio();
+      const acp = yield* AcpClient.make(stdio);
+      const received = yield* Deferred.make<AcpSchema.ElicitationCompleteNotification>();
+      yield* acp.handleElicitationComplete((notification) =>
+        Deferred.succeed(received, notification).pipe(Effect.asVoid),
+      );
+      yield* Queue.offer(
+        input,
+        yield* encodeJsonl(jsonRpcNotification(method, AcpSchema.ElicitationCompleteNotification), {
+          jsonrpc: "2.0",
+          method,
+          params: { elicitationId: "elicitation-1" },
+        }),
+      );
+      assert.deepEqual(yield* Deferred.await(received), { elicitationId: "elicitation-1" });
+    }).pipe(Effect.scoped),
+);
+
+it.effect("rejects malformed SDK elicitation without calling the question handler", () =>
+  Effect.gen(function* () {
+    const { stdio, input, output } = yield* makeInMemoryStdio();
+    const acp = yield* AcpClient.make(stdio);
+    let calls = 0;
+    yield* acp.handleElicitation(() => {
+      calls++;
+      return Effect.succeed({ action: { action: "cancel" as const } });
+    });
+    yield* Queue.offer(
+      input,
+      yield* encodeJsonl(jsonRpcRequest("elicitation/create", Schema.Unknown), {
+        jsonrpc: "2.0",
+        id: 73,
+        headers: [],
+        method: "elicitation/create",
+        params: { ...elicitationForm, message: 123 },
+      }),
+    );
+    const response = yield* decodeWireError(yield* Queue.take(output));
+    assert.equal(response.error.code, -32602);
+    assert.equal(calls, 0);
+  }).pipe(Effect.scoped),
+);
+
+it.effect("returns method-not-found when SDK elicitation has no question handler", () =>
+  Effect.gen(function* () {
+    const { stdio, input, output } = yield* makeInMemoryStdio();
+    yield* AcpClient.make(stdio);
+    yield* Queue.offer(
+      input,
+      yield* encodeJsonl(jsonRpcRequest("elicitation/create", AcpSchema.ElicitationRequest), {
+        jsonrpc: "2.0",
+        id: 74,
+        headers: [],
+        method: "elicitation/create",
+        params: elicitationForm,
+      }),
+    );
+    const response = yield* decodeWireError(yield* Queue.take(output));
+    assert.equal(response.error.code, -32601);
+  }).pipe(Effect.scoped),
+);
diff --git a/packages/effect-acp/src/client.ts b/packages/effect-acp/src/client.ts
index b3bcf3cd2433..27203c20c627 100644
--- a/packages/effect-acp/src/client.ts
+++ b/packages/effect-acp/src/client.ts
@@ -22,6 +22,8 @@ import {
 } from "./_internal/shared.ts";
 import { makeChildStdio, makeTerminationError } from "./_internal/stdio.ts";
 
+const decodeElicitationRequest = Schema.decodeUnknownEffect(AcpSchema.ElicitationRequest);
+
 export interface AcpClientOptions {
   readonly logIncoming?: boolean;
   readonly logOutgoing?: boolean;
@@ -151,7 +153,7 @@ export class AcpClient extends Context.Service<
       ) => Effect.Effect<AcpSchema.RequestPermissionResponse, AcpError.AcpError>,
     ) => Effect.Effect<void>;
     /**
-     * Registers a handler for `session/elicitation`.
+     * Registers a handler for `session/elicitation` and `elicitation/create`.
      * @see https://agentclientprotocol.com/protocol/schema#session/elicitation
      */
     readonly handleElicitation: (
@@ -232,7 +234,7 @@ export class AcpClient extends Context.Service<
       ) => Effect.Effect<void, AcpError.AcpError>,
     ) => Effect.Effect<void>;
     /**
-     * Registers a handler for `session/elicitation/complete`.
+     * Registers a handler for `session/elicitation/complete` and `elicitation/complete`.
      * @see https://agentclientprotocol.com/protocol/schema#session/elicitation/complete
      */
     readonly handleElicitationComplete: (
@@ -431,6 +433,22 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
         ),
       [CLIENT_METHODS.session_elicitation]: (payload) =>
         runHandler(coreHandlers.elicitation, payload, CLIENT_METHODS.session_elicitation),
+      "elicitation/create": (payload) =>
+        decodeElicitationRequest(payload).pipe(
+          Effect.mapError((cause) =>
+            AcpError.AcpRequestError.invalidExtensionPayload(
+              "elicitation/create",
+              cause,
+            ).toProtocolError(),
+          ),
+          Effect.flatMap((request) =>
+            runHandler(coreHandlers.elicitation, request, "elicitation/create"),
+          ),
+          Effect.map(({ action, _meta }) => ({
+            ...action,
+            ...(_meta !== undefined ? { _meta } : {}),
+          })),
+        ),
       [CLIENT_METHODS.fs_read_text_file]: (payload) =>
         runHandler(coreHandlers.readTextFile, payload, CLIENT_METHODS.fs_read_text_file),
       [CLIENT_METHODS.fs_write_text_file]: (payload) =>
diff --git a/packages/effect-acp/src/protocol.ts b/packages/effect-acp/src/protocol.ts
index cd6043f2db00..f74a8ea29e37 100644
--- a/packages/effect-acp/src/protocol.ts
+++ b/packages/effect-acp/src/protocol.ts
@@ -34,7 +34,7 @@ export type AcpIncomingNotification =
     }
   | {
       readonly _tag: "ElicitationComplete";
-      readonly method: typeof CLIENT_METHODS.session_elicitation_complete;
+      readonly method: typeof CLIENT_METHODS.session_elicitation_complete | "elicitation/complete";
       readonly params: AcpSchema.ElicitationCompleteNotification;
     }
   | {
@@ -316,20 +316,24 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi
           Effect.flatMap(dispatchNotification),
         );
       }
-      if (message.tag === CLIENT_METHODS.session_elicitation_complete) {
+      if (
+        message.tag === CLIENT_METHODS.session_elicitation_complete ||
+        message.tag === "elicitation/complete"
+      ) {
+        const method = message.tag;
         return decodeElicitationComplete(message.payload).pipe(
           Effect.map(
             (params) =>
               ({
                 _tag: "ElicitationComplete",
-                method: CLIENT_METHODS.session_elicitation_complete,
+                method,
                 params,
               }) satisfies AcpIncomingNotification,
           ),
           Effect.mapError((cause) =>
             AcpError.AcpProtocolParseError.fromSchemaError(
               "decode-notification-payload",
-              CLIENT_METHODS.session_elicitation_complete,
+              method,
               cause,
             ),
           ),
diff --git a/packages/effect-acp/src/rpc.ts b/packages/effect-acp/src/rpc.ts
index 5026645374eb..118e5e377659 100644
--- a/packages/effect-acp/src/rpc.ts
+++ b/packages/effect-acp/src/rpc.ts
@@ -1,5 +1,6 @@
 import * as Rpc from "effect/unstable/rpc/Rpc";
 import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
+import * as Schema from "effect/Schema";
 
 import * as AcpSchema from "./_generated/schema.gen.ts";
 import { AGENT_METHODS, CLIENT_METHODS } from "./_generated/meta.gen.ts";
@@ -100,6 +101,20 @@ const ElicitationRpc = Rpc.make(CLIENT_METHODS.session_elicitation, {
   error: AcpSchema.Error,
 });
 
+// The pinned v0.11.3 schema predates the SDK's method name and flat response.
+// Keep its RPC for existing peers and translate the SDK alias at the boundary.
+const CreateElicitationRpc = Rpc.make("elicitation/create", {
+  payload: Schema.Unknown,
+  success: Schema.Struct({
+    action: Schema.Literals(["accept", "decline", "cancel"]),
+    content: Schema.optionalKey(
+      Schema.NullOr(Schema.Record(Schema.String, AcpSchema.ElicitationContentValue)),
+    ),
+    _meta: AcpSchema.ElicitationResponse.fields._meta,
+  }),
+  error: AcpSchema.Error,
+});
+
 const CreateTerminalRpc = Rpc.make(CLIENT_METHODS.terminal_create, {
   payload: AcpSchema.CreateTerminalRequest,
   success: AcpSchema.CreateTerminalResponse,
@@ -150,6 +165,7 @@ export const ClientRpcs = RpcGroup.make(
   WriteTextFileRpc,
   RequestPermissionRpc,
   ElicitationRpc,
+  CreateElicitationRpc,
   CreateTerminalRpc,
   TerminalOutputRpc,
   ReleaseTerminalRpc,

From bd0b9edac3cf8fe30f8242dd7943a9240810b2c9 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 17:24:23 -0700
Subject: [PATCH 05/25] fix(release): read relay configuration without loading
 deployment providers (#12518)

---
 .github/workflows/release.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 381a6b2b9b13..5e227d00ebcf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -312,14 +312,16 @@ jobs:
               - --filter=t3code-relay...
 
       # The deployed stack's outputs, read from Alchemy's state store without
-      # planning or applying. Redacted values are persisted as
+      # planning or applying. Select the backend explicitly to avoid loading
+      # the stack's unrelated provider credentials; suppress informational logs
+      # so stdout stays valid JSON. Redacted values are persisted as
       # {"__redacted__": "<value>"}; the token is masked before it is written.
       - name: Read production relay tracing config
         shell: bash
         working-directory: infra/relay
         run: |
           set -euo pipefail
-          output="$(npx alchemy state read T3CodeRelay/prod/output --no-input)"
+          output="$(npx alchemy state read T3CodeRelay/prod/output --backend cloudflare --log-level error --no-input)"
           field() {
             jq -er --arg key "$1" '.[$key] | if type == "object" then .__redacted__ else . end | select(. != null and . != "")' <<<"$output" \
               || { echo "Relay stack output is missing $1" >&2; exit 1; }

From 4931d73af3e68d8706d7568b9af37c8397caffdb Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 17:34:13 -0700
Subject: [PATCH 06/25] fix(ci): reconcile native change labels against pinned
 commits (#12517)

---
 .../workflows/mobile-fingerprint-check.yml    | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/mobile-fingerprint-check.yml b/.github/workflows/mobile-fingerprint-check.yml
index fd98817cd105..b8b872f019f6 100644
--- a/.github/workflows/mobile-fingerprint-check.yml
+++ b/.github/workflows/mobile-fingerprint-check.yml
@@ -13,17 +13,9 @@ name: Mobile Fingerprint Check
 # pnpm), so the comparison is self-consistent; no EXPO_TOKEN needed.
 on:
   pull_request:
-    paths:
-      - apps/mobile/**
-      - packages/client-runtime/**
-      - packages/contracts/**
-      - packages/shared/**
-      - assets/**
-      - scripts/**
-      - patches/**
-      - pnpm-lock.yaml
-      - pnpm-workspace.yaml
-      - .github/workflows/mobile-fingerprint-check.yml
+    # Run even when a rebase or base change removes every native input from the
+    # diff, so the label can be cleared without installing Expo dependencies.
+    types: [opened, synchronize, reopened, edited]
 
 concurrency:
   group: mobile-fingerprint-check-${{ github.event.pull_request.number }}
@@ -44,12 +36,29 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          # Default pull_request checkout is the merge commit (PR applied on
-          # top of base), so the "head" fingerprint is the state main would
-          # actually be in after merging — stale branches compare cleanly.
-          fetch-depth: 0
+          # The merge ref can advance after the event is queued. Pin its commit
+          # and compare against its first parent, rather than the event's base.
+          ref: ${{ github.sha }}
+          fetch-depth: 2
+
+      - id: changes
+        name: Detect native fingerprint inputs
+        run: |
+          base_sha=$(git rev-parse HEAD^1)
+          echo "base_sha=$base_sha" >> "$GITHUB_OUTPUT"
+          paths=$(git diff --no-renames --name-only "$base_sha" HEAD -- \
+            apps/mobile/ packages/client-runtime/ packages/contracts/ packages/shared/ \
+            assets/ scripts/ patches/ package.json pnpm-lock.yaml pnpm-workspace.yaml \
+            .github/workflows/mobile-fingerprint-check.yml)
+          if [[ -n "$paths" ]]; then
+            echo "relevant=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "relevant=false" >> "$GITHUB_OUTPUT"
+            echo "No native fingerprint inputs changed; clearing any stale native change label." >> "$GITHUB_STEP_SUMMARY"
+          fi
 
       - name: Setup Vite+
+        if: steps.changes.outputs.relevant == 'true'
         uses: voidzero-dev/setup-vp@v1
         with:
           node-version-file: package.json
@@ -59,6 +68,7 @@ jobs:
               - --filter=@t3tools/mobile...
 
       - name: Expose pnpm
+        if: steps.changes.outputs.relevant == 'true'
         run: |
           pnpm_version="$(node --print "require('./package.json').packageManager.split('@').pop()")"
           vp_pnpm_bin="$HOME/.vite-plus/package_manager/pnpm/$pnpm_version/pnpm/bin"
@@ -66,6 +76,7 @@ jobs:
           "$vp_pnpm_bin/pnpm" --version
 
       - name: Fingerprint merge result
+        if: steps.changes.outputs.relevant == 'true'
         working-directory: apps/mobile
         run: |
           mkdir -p "$RUNNER_TEMP/fp/head" "$RUNNER_TEMP/fp/base"
@@ -74,8 +85,11 @@ jobs:
           done
 
       - name: Fingerprint base
+        if: steps.changes.outputs.relevant == 'true'
+        env:
+          BASE_SHA: ${{ steps.changes.outputs.base_sha }}
         run: |
-          git checkout --quiet "${{ github.event.pull_request.base.sha }}"
+          git checkout --quiet "$BASE_SHA"
           # Re-sync node_modules to the base commit's lockfile before
           # fingerprinting — a dep-changing PR must not fingerprint the base
           # against head's installed packages.
@@ -87,6 +101,7 @@ jobs:
 
       - id: compare
         name: Compare fingerprints
+        if: steps.changes.outputs.relevant == 'true'
         run: |
           changed=""
           {

From e74c668d786ffc14f40a9540cd3aede02ba5d62e Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 17:44:23 -0700
Subject: [PATCH 07/25] fix(release): strip Alchemy progress before parsing
 relay state (#12519)

---
 .github/scripts/relay-state-output.test.cjs | 76 +++++++++++++++++++++
 .github/workflows/release.yml               |  5 +-
 scripts/release-smoke.ts                    |  6 ++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 .github/scripts/relay-state-output.test.cjs

diff --git a/.github/scripts/relay-state-output.test.cjs b/.github/scripts/relay-state-output.test.cjs
new file mode 100644
index 000000000000..fcb829dd91e8
--- /dev/null
+++ b/.github/scripts/relay-state-output.test.cjs
@@ -0,0 +1,76 @@
+const assert = require("node:assert/strict");
+const { spawnSync } = require("node:child_process");
+const { mkdtempSync, readFileSync, rmSync, existsSync } = require("node:fs");
+const { tmpdir } = require("node:os");
+const { join } = require("node:path");
+const { test } = require("node:test");
+
+const workflow = readFileSync(join(__dirname, "../workflows/release.yml"), "utf8");
+const step = workflow.match(
+  /- name: Read production relay tracing config\n[\s\S]*?        run: \|\n((?:          .*\n|\n)+)/,
+);
+assert.ok(step, "Could not find the relay state workflow step");
+const script = step[1].replace(/^          /gm, "");
+const config = {
+  clientTracingUrl: "https://example.invalid/traces",
+  clientTracingDataset: "fixture-dataset",
+  clientTracingToken: { __redacted__: "fixture-token" },
+};
+const json = JSON.stringify(config, null, 2);
+
+function runStep(stdout, exitCode = 0) {
+  const runnerTemp = mkdtempSync(join(tmpdir(), "t3-relay-state-test-"));
+  try {
+    const result = spawnSync(
+      "bash",
+      ["-c", 'npx() { printf "%s\\n" "$FIXTURE_STDOUT"; return "$FIXTURE_EXIT"; }\n' + script],
+      {
+        encoding: "utf8",
+        env: {
+          PATH: process.env.PATH,
+          RUNNER_TEMP: runnerTemp,
+          FIXTURE_STDOUT: stdout,
+          FIXTURE_EXIT: String(exitCode),
+        },
+      },
+    );
+    assert.ifError(result.error);
+    const envPath = join(runnerTemp, "relay-client-tracing.env");
+    return {
+      ...result,
+      envFile: existsSync(envPath) ? readFileSync(envPath, "utf8") : undefined,
+    };
+  } finally {
+    rmSync(runnerTemp, { recursive: true, force: true });
+  }
+}
+
+for (const prefix of [
+  "",
+  "• Refreshing Cloudflare State Store credentials\n✓ Refreshing Cloudflare State Store credentials\n",
+]) {
+  test(`extracts tracing config ${prefix ? "after progress output" : "from plain JSON"}`, () => {
+    const result = runStep(prefix + json);
+    assert.equal(result.status, 0, result.stderr);
+    assert.equal(result.stdout, "::add-mask::fixture-token\n");
+    assert.equal(
+      result.envFile,
+      "T3CODE_RELAY_CLIENT_OTLP_TRACES_URL=https://example.invalid/traces\n" +
+        "T3CODE_RELAY_CLIENT_OTLP_TRACES_DATASET=fixture-dataset\n" +
+        "T3CODE_RELAY_CLIENT_OTLP_TRACES_TOKEN=fixture-token\n",
+    );
+  });
+}
+
+for (const [name, stdout, exitCode] of [
+  ["failed CLI even with valid JSON", json, 1],
+  ["missing JSON", "Refreshing credentials...", 0],
+  ["malformed JSON", "{not JSON", 0],
+  ["missing token", JSON.stringify({ ...config, clientTracingToken: null }, null, 2), 0],
+]) {
+  test(`rejects ${name} without writing config`, () => {
+    const result = runStep(stdout, exitCode);
+    assert.notEqual(result.status, 0);
+    assert.equal(result.envFile, undefined);
+  });
+}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5e227d00ebcf..8890de34e721 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -314,14 +314,15 @@ jobs:
       # The deployed stack's outputs, read from Alchemy's state store without
       # planning or applying. Select the backend explicitly to avoid loading
       # the stack's unrelated provider credentials; suppress informational logs
-      # so stdout stays valid JSON. Redacted values are persisted as
+      # and strip the credential-refresh progress prefix before parsing JSON.
+      # Redacted values are persisted as
       # {"__redacted__": "<value>"}; the token is masked before it is written.
       - name: Read production relay tracing config
         shell: bash
         working-directory: infra/relay
         run: |
           set -euo pipefail
-          output="$(npx alchemy state read T3CodeRelay/prod/output --backend cloudflare --log-level error --no-input)"
+          output="$(npx alchemy state read T3CodeRelay/prod/output --backend cloudflare --log-level error --no-input | sed -n '/^{/,$p')"
           field() {
             jq -er --arg key "$1" '.[$key] | if type == "object" then .__redacted__ else . end | select(. != null and . != "")' <<<"$output" \
               || { echo "Relay stack output is missing $1" >&2; exit 1; }
diff --git a/scripts/release-smoke.ts b/scripts/release-smoke.ts
index 45d2dd436b6a..e33116bb1dbf 100644
--- a/scripts/release-smoke.ts
+++ b/scripts/release-smoke.ts
@@ -188,6 +188,12 @@ function assertMissing(path: string, message: string): void {
 const tempRoot = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-release-smoke-"));
 
 try {
+  NodeChildProcess.execFileSync(
+    process.execPath,
+    ["--test", NodePath.resolve(repoRoot, ".github/scripts/relay-state-output.test.cjs")],
+    { stdio: "inherit" },
+  );
+
   copyWorkspaceManifestFixture(tempRoot);
 
   NodeChildProcess.execFileSync(

From 9cb586acd0494c4f47f60045ee42ef25edb5a07c Mon Sep 17 00:00:00 2001
From: Theo Browne <me@t3.gg>
Date: Fri, 18 Sep 2026 18:23:56 -0700
Subject: [PATCH 08/25] refactor: remove obsolete code (#9917)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
---
 .../src/app/DesktopAppIdentity.test.ts        |   1 -
 .../app/DesktopConnectionCatalogStore.test.ts |  34 +-
 apps/desktop/src/app/DesktopLifecycle.test.ts |   1 -
 .../src/backend/DesktopBackendManager.test.ts |   6 +-
 .../src/backend/DesktopBackendPool.test.ts    |   1 -
 apps/desktop/src/electron/ElectronApp.test.ts |   3 -
 apps/desktop/src/electron/ElectronApp.ts      |   3 -
 .../settings/DesktopSavedEnvironments.test.ts | 206 +---
 .../src/settings/DesktopSavedEnvironments.ts  | 273 +-----
 .../src/shell/DesktopShellEnvironment.test.ts |  10 -
 .../src/shell/DesktopShellEnvironment.ts      |  24 -
 apps/desktop/src/ssh/DesktopSshEnvironment.ts |   4 -
 .../src/ssh/DesktopSshPasswordPrompts.ts      |   4 -
 .../DesktopTelemetryPublisher.test.ts         |   9 +-
 .../telemetry/DesktopTelemetryPublisher.ts    |   4 -
 .../src/updates/DesktopRemoteUpdates.test.ts  |   1 -
 .../src/window/DesktopApplicationMenu.test.ts |   1 -
 .../t3-review-diff/ios/T3ReviewDiffView.swift |  20 -
 .../features/cloud/linkEnvironment.test.ts    | 897 +-----------------
 .../src/features/cloud/linkEnvironment.ts     | 343 +------
 apps/mobile/src/features/review/reviewPerf.ts |  27 -
 .../features/review/shikiReviewHighlighter.ts |  55 +-
 .../OrchestrationEngineHarness.integration.ts |   9 -
 .../orchestrationEngine.integration.test.ts   |  29 +-
 apps/server/src/orchestration/Errors.ts       |  45 +-
 .../Layers/ProjectionSnapshotQuery.ts         |  17 +-
 apps/server/src/persistence/Errors.test.ts    |   2 +-
 apps/server/src/persistence/Errors.ts         |  34 -
 .../Layers/ProjectionCheckpoints.ts           | 217 -----
 .../Layers/ProjectionPendingApprovals.ts      |  20 -
 .../persistence/Layers/ProjectionProjects.ts  |  47 -
 .../Layers/ProjectionRepositories.test.ts     |   3 -
 .../src/persistence/Layers/ProjectionState.ts |  25 -
 .../persistence/Layers/ProjectionThreads.ts   |  66 --
 .../016_CanonicalizeModelSelections.test.ts   |   2 +-
 ...19_ProjectionSnapshotLookupIndexes.test.ts |   2 +-
 ...ckfillProjectionThreadShellSummary.test.ts |   2 +-
 ...pInvalidProjectionPendingApprovals.test.ts |   2 +-
 ..._CanonicalizeModelSelectionOptions.test.ts |   2 +-
 .../027_028_ProviderInstanceIdColumns.test.ts |   2 +-
 ...jectionThreadDetailOrderingIndexes.test.ts |   2 +-
 .../031_AuthAuthorizationScopes.test.ts       |   2 +-
 ..._ProjectionThreadTitleRegeneration.test.ts |   2 +-
 .../040_ProjectionProjectFaviconPath.test.ts  |   2 +-
 .../041_AuthSessionClientConnection.test.ts   |   2 +-
 ..._ProjectionThreadLinkedPullRequest.test.ts |   2 +-
 ...epairAutomaticSettlementTimestamps.test.ts |   2 +-
 .../047_ProjectionProjectIcon.test.ts         |   2 +-
 ...49_ProjectionThreadsActiveOrderKey.test.ts |  49 +-
 .../050_ProjectionThreadPullRequests.test.ts  |  41 +-
 ...051_ProjectionThreadMessageContext.test.ts |   2 +-
 .../Services/ProjectionCheckpoints.ts         |  95 --
 .../Services/ProjectionPendingApprovals.ts    |  12 -
 .../Services/ProjectionProjects.ts            |  22 -
 .../persistence/Services/ProjectionState.ts   |   7 -
 .../persistence/Services/ProjectionThreads.ts |  26 -
 .../src/provider/acp/XAiAcpExtension.ts       |   4 -
 apps/server/src/server.test.ts                |  21 +-
 .../src/textGeneration/TextGeneration.ts      |   2 -
 .../src/workspace/WorkspaceSearchIndex.ts     |   6 -
 apps/web/src/cloud/managedAuth.test.ts        |   9 +-
 apps/web/src/cloud/managedAuth.tsx            |   8 -
 .../web/src/components/ChatView.logic.test.ts |  46 -
 apps/web/src/components/ChatView.logic.ts     |  30 +-
 .../preview/PreviewPanelShell.test.ts         |  12 +-
 .../settings/settingsLayout.test.tsx          |  20 +-
 .../components/settings/settingsLayout.tsx    |   2 +-
 apps/web/src/components/ui/alert-dialog.tsx   |   8 -
 apps/web/src/components/ui/autocomplete.tsx   |  40 -
 apps/web/src/components/ui/combobox.tsx       | 146 ---
 apps/web/src/components/ui/command.tsx        |  30 -
 apps/web/src/components/ui/dialog.tsx         |   3 -
 apps/web/src/components/ui/group.tsx          |  20 -
 apps/web/src/components/ui/input-group.tsx    |  19 +-
 apps/web/src/components/ui/menu.tsx           |   8 -
 apps/web/src/components/ui/number-field.tsx   |  73 +-
 apps/web/src/components/ui/popover.tsx        |  11 -
 apps/web/src/components/ui/select.tsx         |  52 +-
 apps/web/src/components/ui/sheet.tsx          |  54 --
 apps/web/src/components/ui/sidebar.test.tsx   |  86 +-
 apps/web/src/components/ui/sidebar.tsx        | 133 ---
 apps/web/src/components/ui/table.tsx          |  22 +-
 apps/web/src/components/ui/toggle-group.tsx   |  22 +-
 apps/web/src/components/ui/tooltip.tsx        |   4 +-
 apps/web/src/providerInstances.test.ts        |  39 -
 apps/web/src/providerInstances.ts             |  18 -
 apps/web/src/types.ts                         |   5 -
 apps/web/src/vite-plus-browser-matchers.d.ts  |  11 -
 .../AgentActivityPublisher.test.ts            |   2 -
 infra/relay/src/agentActivity/ApnsClient.ts   |   9 +-
 .../src/agentActivity/FcmDeliveries.test.ts   |   2 -
 .../agentActivity/MobileRegistrations.test.ts |   2 -
 .../environments/EnvironmentConnector.test.ts |   2 -
 .../environments/EnvironmentLinker.test.ts    |   2 -
 .../src/environments/EnvironmentLinks.test.ts |  14 +-
 .../src/environments/EnvironmentLinks.ts      |  86 +-
 infra/relay/src/http/Api.test.ts              |   2 -
 infra/relay/src/http/Api.ts                   |   1 -
 .../src/authorization/remote.test.ts          |  40 -
 .../src/authorization/remote.ts               |  21 -
 packages/contracts/src/environment.ts         |  14 -
 packages/contracts/src/ipc.ts                 | 254 +----
 packages/contracts/src/orchestration.ts       |  20 -
 .../contracts/src/providerRuntime.test.ts     |  12 +-
 packages/contracts/src/providerRuntime.ts     |  53 --
 .../scripts/generate.ts                       |   6 +-
 packages/shared/src/nodeSqliteClient.test.ts  |   2 +-
 packages/shared/src/nodeSqliteClient.ts       |  48 +-
 packages/shared/src/shell.ts                  |   1 -
 packages/tailscale/src/tailscale.ts           |  12 +-
 scripts/dev-runner.ts                         |  11 -
 scripts/lib/dev-share.ts                      |  11 +-
 scripts/mobile-showcase.ts                    |  13 -
 scripts/notify-discord-release.test.ts        |   8 +-
 scripts/notify-discord-release.ts             |   7 -
 scripts/sync-reference-repos.ts               |  13 +-
 116 files changed, 260 insertions(+), 4095 deletions(-)
 delete mode 100644 apps/server/src/persistence/Layers/ProjectionCheckpoints.ts
 delete mode 100644 apps/server/src/persistence/Services/ProjectionCheckpoints.ts
 delete mode 100644 apps/web/src/vite-plus-browser-matchers.d.ts

diff --git a/apps/desktop/src/app/DesktopAppIdentity.test.ts b/apps/desktop/src/app/DesktopAppIdentity.test.ts
index 71bcf5f7aef1..ce0c7d013a99 100644
--- a/apps/desktop/src/app/DesktopAppIdentity.test.ts
+++ b/apps/desktop/src/app/DesktopAppIdentity.test.ts
@@ -57,7 +57,6 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
       }),
     setAppUserModelId: () => Effect.void,
     getAppMetrics: Effect.succeed([]),
-    isDefaultProtocolClient: () => Effect.succeed(false),
     setAsDefaultProtocolClient: () => Effect.succeed(true),
     setDesktopName: () => Effect.void,
     setDockIcon: (iconPath) =>
diff --git a/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts b/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
index aa28ff8d86eb..fdc69841343c 100644
--- a/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
+++ b/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
@@ -3,6 +3,7 @@ import { assert, describe, it } from "@effect/vitest";
 import { ConnectionCatalogDocument } from "@t3tools/client-runtime/platform";
 import { EnvironmentId, type PersistedSavedEnvironmentRecord } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
+import * as Encoding from "effect/Encoding";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import * as Layer from "effect/Layer";
@@ -22,6 +23,11 @@ const textEncoder = new TextEncoder();
 const decodeConnectionCatalog = Schema.decodeEffect(
   Schema.fromJsonString(ConnectionCatalogDocument),
 );
+const encodeLegacySavedEnvironments = Schema.encodeEffect(
+  Schema.fromJsonString(
+    Schema.Struct({ version: Schema.Literal(1), records: Schema.Array(Schema.Unknown) }),
+  ),
+);
 function makeSafeStorageLayer(available: boolean, failDecrypt: Ref.Ref<boolean> | null = null) {
   return Layer.succeed(ElectronSafeStorage.ElectronSafeStorage, {
     isEncryptionAvailable: Effect.succeed(available),
@@ -125,7 +131,8 @@ describe("DesktopConnectionCatalogStore", () => {
     withStore(
       Effect.gen(function* () {
         const store = yield* DesktopConnectionCatalogStore.DesktopConnectionCatalogStore;
-        const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
+        const environment = yield* DesktopEnvironment.DesktopEnvironment;
+        const fileSystem = yield* FileSystem.FileSystem;
         const records: readonly PersistedSavedEnvironmentRecord[] = [
           {
             environmentId: EnvironmentId.make("relay-environment"),
@@ -159,11 +166,21 @@ describe("DesktopConnectionCatalogStore", () => {
             lastConnectedAt: null,
           },
         ];
-        yield* savedEnvironments.setRegistry(records);
-        assert.isTrue(
-          yield* savedEnvironments.setSecret({
-            environmentId: EnvironmentId.make("bearer-environment"),
-            secret: "legacy-token",
+        yield* fileSystem.makeDirectory(environment.stateDir, { recursive: true });
+        yield* fileSystem.writeFileString(
+          environment.savedEnvironmentRegistryPath,
+          yield* encodeLegacySavedEnvironments({
+            version: 1,
+            records: records.map((record) =>
+              record.environmentId === "bearer-environment"
+                ? {
+                    ...record,
+                    encryptedBearerToken: Encoding.encodeBase64(
+                      textEncoder.encode("encrypted:legacy-token"),
+                    ),
+                  }
+                : record,
+            ),
           }),
         );
 
@@ -218,7 +235,10 @@ describe("DesktopConnectionCatalogStore", () => {
           assert.equal(catalog.credentials[0].credential.token, "legacy-token");
         }
 
-        yield* savedEnvironments.setRegistry([]);
+        yield* fileSystem.writeFileString(
+          environment.savedEnvironmentRegistryPath,
+          '{"version":1,"records":[]}',
+        );
         assert.deepEqual(yield* store.get, migrated);
       }),
     ),
diff --git a/apps/desktop/src/app/DesktopLifecycle.test.ts b/apps/desktop/src/app/DesktopLifecycle.test.ts
index 515be6726c94..33c74f5a8b9b 100644
--- a/apps/desktop/src/app/DesktopLifecycle.test.ts
+++ b/apps/desktop/src/app/DesktopLifecycle.test.ts
@@ -43,7 +43,6 @@ function makeElectronAppLayer(
     setAboutPanelOptions: () => Effect.void,
     setAppUserModelId: () => Effect.void,
     getAppMetrics: Effect.succeed([]),
-    isDefaultProtocolClient: () => Effect.succeed(false),
     setAsDefaultProtocolClient: () => Effect.succeed(true),
     setDesktopName: () => Effect.void,
     setDockIcon: () => Effect.void,
diff --git a/apps/desktop/src/backend/DesktopBackendManager.test.ts b/apps/desktop/src/backend/DesktopBackendManager.test.ts
index 5a1ef70ad1c2..df2001f1ac20 100644
--- a/apps/desktop/src/backend/DesktopBackendManager.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendManager.test.ts
@@ -165,9 +165,7 @@ function makeTestInstance(input: MakeInstanceInput) {
       latest: Effect.succeed(Option.none()),
       changes: Stream.empty,
       encoded: input.desktopTelemetryStream ?? Stream.empty,
-      handleControl: () => Effect.void,
-      handleControlForSource: (_sourceId, message) =>
-        (input.desktopTelemetryPublisher?.handleControl ?? (() => Effect.void))(message),
+      handleControlForSource: () => Effect.void,
       removeControlSource: () => Effect.void,
       publishUpdateReport: () => Effect.void,
       updateRequests: Stream.empty,
@@ -596,7 +594,7 @@ describe("DesktopBackendManager", () => {
         const instance = yield* makeTestInstance({
           spawnerLayer,
           desktopTelemetryPublisher: {
-            handleControl: (message) =>
+            handleControlForSource: (_sourceId, message) =>
               message.type === "setDiagnosticsDemand"
                 ? Deferred.succeed(handled, message.enabled).pipe(Effect.asVoid)
                 : Effect.void,
diff --git a/apps/desktop/src/backend/DesktopBackendPool.test.ts b/apps/desktop/src/backend/DesktopBackendPool.test.ts
index b9a96d72a77a..7859223161b7 100644
--- a/apps/desktop/src/backend/DesktopBackendPool.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendPool.test.ts
@@ -70,7 +70,6 @@ function makePoolLayer(
           latest: Effect.succeed(Option.none()),
           changes: Stream.empty,
           encoded: Stream.empty,
-          handleControl: () => Effect.void,
           handleControlForSource: () => Effect.void,
           removeControlSource: () => Effect.void,
           publishUpdateReport: () => Effect.void,
diff --git a/apps/desktop/src/electron/ElectronApp.test.ts b/apps/desktop/src/electron/ElectronApp.test.ts
index 4189ea793e2d..84f37b6f5f53 100644
--- a/apps/desktop/src/electron/ElectronApp.test.ts
+++ b/apps/desktop/src/electron/ElectronApp.test.ts
@@ -10,7 +10,6 @@ const {
   getAppPathMock,
   getSystemLocaleMock,
   getVersionMock,
-  isDefaultProtocolClientMock,
   onMock,
   quitMock,
   relaunchMock,
@@ -32,7 +31,6 @@ const {
   getAppPathMock: vi.fn(() => "/app"),
   getSystemLocaleMock: vi.fn(() => "en-GB"),
   getVersionMock: vi.fn(() => "1.2.3"),
-  isDefaultProtocolClientMock: vi.fn(() => false),
   onMock: vi.fn(),
   quitMock: vi.fn(),
   relaunchMock: vi.fn(),
@@ -64,7 +62,6 @@ vi.mock("electron", () => ({
     getAppPath: getAppPathMock,
     getSystemLocale: getSystemLocaleMock,
     getVersion: getVersionMock,
-    isDefaultProtocolClient: isDefaultProtocolClientMock,
     isPackaged: true,
     name: "T3 Code",
     on: onMock,
diff --git a/apps/desktop/src/electron/ElectronApp.ts b/apps/desktop/src/electron/ElectronApp.ts
index b54da535add0..f75ea51552e7 100644
--- a/apps/desktop/src/electron/ElectronApp.ts
+++ b/apps/desktop/src/electron/ElectronApp.ts
@@ -64,7 +64,6 @@ export class ElectronApp extends Context.Service<
     ) => Effect.Effect<void>;
     readonly setAppUserModelId: (id: string) => Effect.Effect<void>;
     readonly getAppMetrics: Effect.Effect<ReadonlyArray<Electron.ProcessMetric>>;
-    readonly isDefaultProtocolClient: (protocol: string) => Effect.Effect<boolean>;
     readonly setAsDefaultProtocolClient: (
       protocol: string,
       path?: string,
@@ -166,8 +165,6 @@ export const make = ElectronApp.of({
       Electron.app.setAppUserModelId(id);
     }),
   getAppMetrics: Effect.sync(() => Electron.app.getAppMetrics()),
-  isDefaultProtocolClient: (protocol) =>
-    Effect.sync(() => Electron.app.isDefaultProtocolClient(protocol)),
   setAsDefaultProtocolClient: (protocol, path, args) =>
     Effect.sync(() => {
       if (path === undefined) {
diff --git a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
index 348f6cb3843e..dad53815f3a6 100644
--- a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
+++ b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
@@ -2,6 +2,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import { EnvironmentId, type PersistedSavedEnvironmentRecord } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
+import * as Encoding from "effect/Encoding";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import * as Layer from "effect/Layer";
@@ -39,16 +40,29 @@ const SavedEnvironmentRegistryDocumentProbe = Schema.Struct({
 const SavedEnvironmentRegistryDocumentProbeJson = Schema.fromJsonString(
   SavedEnvironmentRegistryDocumentProbe,
 );
-const decodeSavedEnvironmentRegistryDocumentProbe = Schema.decodeEffect(
-  SavedEnvironmentRegistryDocumentProbeJson,
-);
 const encodeSavedEnvironmentRegistryDocumentProbe = Schema.encodeEffect(
   SavedEnvironmentRegistryDocumentProbeJson,
 );
+
+const seedSavedEnvironmentRegistry = Effect.fn(function* (encryptedBearerToken?: string) {
+  const environment = yield* DesktopEnvironment.DesktopEnvironment;
+  const fileSystem = yield* FileSystem.FileSystem;
+  yield* fileSystem.makeDirectory(environment.stateDir, { recursive: true });
+  const encoded = yield* encodeSavedEnvironmentRegistryDocumentProbe({
+    version: 1,
+    records: [
+      {
+        ...savedRegistryRecord,
+        ...(encryptedBearerToken === undefined ? {} : { encryptedBearerToken }),
+      },
+    ],
+  });
+  yield* fileSystem.writeFileString(environment.savedEnvironmentRegistryPath, `${encoded}\n`);
+});
+
 function makeSafeStorageLayer(input: {
   readonly available: boolean;
   readonly availabilityError?: unknown;
-  readonly encryptError?: unknown;
   readonly decryptError?: unknown;
 }) {
   return Layer.succeed(ElectronSafeStorage.ElectronSafeStorage, {
@@ -60,14 +74,7 @@ function makeSafeStorageLayer(input: {
               cause: input.availabilityError,
             }),
           ),
-    encryptString: (value) =>
-      input.encryptError === undefined
-        ? Effect.succeed(textEncoder.encode(`enc:${value}`))
-        : Effect.fail(
-            new ElectronSafeStorage.ElectronSafeStorageEncryptError({
-              cause: input.encryptError,
-            }),
-          ),
+    encryptString: (value) => Effect.succeed(textEncoder.encode(`enc:${value}`)),
     decryptString: (value) => {
       if (input.decryptError !== undefined) {
         return Effect.fail(
@@ -96,7 +103,6 @@ function makeLayer(
   options?: {
     readonly availableSecretStorage?: boolean;
     readonly availabilityError?: unknown;
-    readonly encryptError?: unknown;
     readonly decryptError?: unknown;
   },
   fileSystemLayer: Layer.Layer<FileSystem.FileSystem> = NodeServices.layer,
@@ -120,7 +126,6 @@ function makeLayer(
   const safeStorageLayer = makeSafeStorageLayer({
     available: options?.availableSecretStorage ?? true,
     availabilityError: options?.availabilityError,
-    encryptError: options?.encryptError,
     decryptError: options?.decryptError,
   });
   const dependencies = Layer.mergeAll(
@@ -138,7 +143,6 @@ const withSavedEnvironments = <A, E, R>(
   options?: {
     readonly availableSecretStorage?: boolean;
     readonly availabilityError?: unknown;
-    readonly encryptError?: unknown;
     readonly decryptError?: unknown;
   },
 ) =>
@@ -151,20 +155,13 @@ const withSavedEnvironments = <A, E, R>(
   }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
 
 describe("DesktopSavedEnvironments", () => {
-  it.effect("persists and reloads saved environment metadata", () =>
+  it.effect("reads saved environment metadata", () =>
     withSavedEnvironments(
       Effect.gen(function* () {
-        const environment = yield* DesktopEnvironment.DesktopEnvironment;
-        const fileSystem = yield* FileSystem.FileSystem;
         const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
+        yield* seedSavedEnvironmentRegistry();
 
         assert.deepEqual(yield* savedEnvironments.getRegistry, [savedRegistryRecord]);
-        const persisted = yield* decodeSavedEnvironmentRegistryDocumentProbe(
-          yield* fileSystem.readFileString(environment.savedEnvironmentRegistryPath),
-        );
-        assert.equal(persisted.version, 1);
-        assert.lengthOf(persisted.records, 1);
       }),
     ),
   );
@@ -205,17 +202,12 @@ describe("DesktopSavedEnvironments", () => {
     ),
   );
 
-  it.effect("persists encrypted saved environment secrets when encryption is available", () =>
+  it.effect("reads encrypted saved environment secrets when encryption is available", () =>
     withSavedEnvironments(
       Effect.gen(function* () {
         const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
-
-        assert.isTrue(
-          yield* savedEnvironments.setSecret({
-            environmentId: savedRegistryRecord.environmentId,
-            secret: "bearer-token",
-          }),
+        yield* seedSavedEnvironmentRegistry(
+          Encoding.encodeBase64(textEncoder.encode("enc:bearer-token")),
         );
 
         assert.deepEqual(
@@ -230,14 +222,8 @@ describe("DesktopSavedEnvironments", () => {
     withSavedEnvironments(
       Effect.gen(function* () {
         const environment = yield* DesktopEnvironment.DesktopEnvironment;
-        const fileSystem = yield* FileSystem.FileSystem;
         const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* fileSystem.makeDirectory(environment.stateDir, { recursive: true });
-        const encoded = yield* encodeSavedEnvironmentRegistryDocumentProbe({
-          version: 1,
-          records: [{ ...savedRegistryRecord, encryptedBearerToken: "%%%" }],
-        });
-        yield* fileSystem.writeFileString(environment.savedEnvironmentRegistryPath, `${encoded}\n`);
+        yield* seedSavedEnvironmentRegistry("%%%");
 
         const error = yield* savedEnvironments
           .getSecret(savedRegistryRecord.environmentId)
@@ -256,17 +242,17 @@ describe("DesktopSavedEnvironments", () => {
     ),
   );
 
-  it.effect("returns false when writing secrets while encryption is unavailable", () =>
+  it.effect("returns no secret while encryption is unavailable", () =>
     withSavedEnvironments(
       Effect.gen(function* () {
         const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
+        yield* seedSavedEnvironmentRegistry(
+          Encoding.encodeBase64(textEncoder.encode("enc:bearer-token")),
+        );
 
-        assert.isFalse(
-          yield* savedEnvironments.setSecret({
-            environmentId: savedRegistryRecord.environmentId,
-            secret: "next-token",
-          }),
+        assert.deepEqual(
+          yield* savedEnvironments.getSecret(savedRegistryRecord.environmentId),
+          Option.none(),
         );
       }),
       { availableSecretStorage: false },
@@ -279,13 +265,12 @@ describe("DesktopSavedEnvironments", () => {
       Effect.gen(function* () {
         const environment = yield* DesktopEnvironment.DesktopEnvironment;
         const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
+        yield* seedSavedEnvironmentRegistry(
+          Encoding.encodeBase64(textEncoder.encode("enc:bearer-token")),
+        );
 
         const error = yield* savedEnvironments
-          .setSecret({
-            environmentId: savedRegistryRecord.environmentId,
-            secret: "next-token",
-          })
+          .getSecret(savedRegistryRecord.environmentId)
           .pipe(Effect.flip);
 
         assert.instanceOf(
@@ -309,45 +294,6 @@ describe("DesktopSavedEnvironments", () => {
     );
   });
 
-  it.effect("removes saved environment secrets", () =>
-    withSavedEnvironments(
-      Effect.gen(function* () {
-        const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
-        yield* savedEnvironments.setSecret({
-          environmentId: savedRegistryRecord.environmentId,
-          secret: "bearer-token",
-        });
-
-        yield* savedEnvironments.removeSecret(savedRegistryRecord.environmentId);
-
-        assert.isTrue(
-          Option.isNone(yield* savedEnvironments.getSecret(savedRegistryRecord.environmentId)),
-        );
-      }),
-    ),
-  );
-
-  it.effect("removes saved environment metadata and its embedded secret atomically", () =>
-    withSavedEnvironments(
-      Effect.gen(function* () {
-        const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
-        yield* savedEnvironments.setSecret({
-          environmentId: savedRegistryRecord.environmentId,
-          secret: "bearer-token",
-        });
-
-        yield* savedEnvironments.removeEnvironment(savedRegistryRecord.environmentId);
-
-        assert.deepEqual(yield* savedEnvironments.getRegistry, []);
-        assert.isTrue(
-          Option.isNone(yield* savedEnvironments.getSecret(savedRegistryRecord.environmentId)),
-        );
-      }),
-    ),
-  );
-
   it.effect("treats empty saved environment documents as empty", () =>
     withSavedEnvironments(
       Effect.gen(function* () {
@@ -388,13 +334,6 @@ describe("DesktopSavedEnvironments", () => {
           secretError,
           DesktopSavedEnvironments.DesktopSavedEnvironmentsDocumentDecodeError,
         );
-        const mutationError = yield* savedEnvironments
-          .setRegistry([savedRegistryRecord])
-          .pipe(Effect.flip);
-        assert.instanceOf(
-          mutationError,
-          DesktopSavedEnvironments.DesktopSavedEnvironmentsDocumentDecodeError,
-        );
       }),
     ),
   );
@@ -431,77 +370,4 @@ describe("DesktopSavedEnvironments", () => {
       assert.notEqual(error.message, permissionError.message);
     }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
   );
-
-  it.effect("reports the failed saved environment write operation and path", () =>
-    Effect.gen(function* () {
-      const baseFileSystem = yield* FileSystem.FileSystem;
-      const path = yield* Path.Path;
-      const baseDir = yield* baseFileSystem.makeTempDirectoryScoped({
-        prefix: "t3-desktop-saved-environments-test-",
-      });
-      const permissionError = PlatformError.systemError({
-        _tag: "PermissionDenied",
-        module: "FileSystem",
-        method: "makeDirectory",
-        pathOrDescriptor: path.join(baseDir, "userdata"),
-      });
-      const fileSystemLayer = Layer.succeed(
-        FileSystem.FileSystem,
-        FileSystem.makeNoop({
-          readFileString: baseFileSystem.readFileString,
-          makeDirectory: () => Effect.fail(permissionError),
-        }),
-      );
-      const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments.pipe(
-        Effect.provide(makeLayer(baseDir, undefined, fileSystemLayer)),
-      );
-
-      const error = yield* savedEnvironments.setRegistry([savedRegistryRecord]).pipe(Effect.flip);
-      assert.instanceOf(error, DesktopSavedEnvironments.DesktopSavedEnvironmentsWriteError);
-      assert.equal(error.operation, "create-directory");
-      assert.equal(error.path, path.join(baseDir, "userdata"));
-      assert.strictEqual(error.cause, permissionError);
-      assert.equal(
-        error.message,
-        `Desktop saved-environment write failed during create-directory at ${path.join(baseDir, "userdata")}.`,
-      );
-      assert.notEqual(error.message, permissionError.message);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
-  );
-
-  it.effect("returns false when writing a secret without metadata", () =>
-    withSavedEnvironments(
-      Effect.gen(function* () {
-        const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-
-        assert.isFalse(
-          yield* savedEnvironments.setSecret({
-            environmentId: savedRegistryRecord.environmentId,
-            secret: "bearer-token",
-          }),
-        );
-      }),
-    ),
-  );
-
-  it.effect("preserves encrypted secrets when metadata is rewritten", () =>
-    withSavedEnvironments(
-      Effect.gen(function* () {
-        const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
-        yield* savedEnvironments.setSecret({
-          environmentId: savedRegistryRecord.environmentId,
-          secret: "bearer-token",
-        });
-
-        yield* savedEnvironments.setRegistry([savedRegistryRecord]);
-
-        assert.deepEqual(yield* savedEnvironments.getRegistry, [savedRegistryRecord]);
-        assert.deepEqual(
-          yield* savedEnvironments.getSecret(savedRegistryRecord.environmentId),
-          Option.some("bearer-token"),
-        );
-      }),
-    ),
-  );
 });
diff --git a/apps/desktop/src/settings/DesktopSavedEnvironments.ts b/apps/desktop/src/settings/DesktopSavedEnvironments.ts
index 79959bc3c733..f54b464a7dbd 100644
--- a/apps/desktop/src/settings/DesktopSavedEnvironments.ts
+++ b/apps/desktop/src/settings/DesktopSavedEnvironments.ts
@@ -1,13 +1,11 @@
 import { EnvironmentId, type PersistedSavedEnvironmentRecord } from "@t3tools/contracts";
 import { fromLenientJson } from "@t3tools/shared/schemaJson";
 import * as Context from "effect/Context";
-import * as Crypto from "effect/Crypto";
 import * as Effect from "effect/Effect";
 import * as Encoding from "effect/Encoding";
 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 Schema from "effect/Schema";
 
 import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
@@ -65,37 +63,12 @@ const SavedEnvironmentRegistryDocumentJson = fromLenientJson(
 const decodeSavedEnvironmentRegistryDocumentJson = Schema.decodeEffect(
   SavedEnvironmentRegistryDocumentJson,
 );
-const encodeSavedEnvironmentRegistryDocumentJson = Schema.encodeEffect(
-  SavedEnvironmentRegistryDocumentJson,
-);
-
-const DesktopSavedEnvironmentsWriteOperation = Schema.Literals([
-  "create-temporary-file-name",
-  "encode-registry",
-  "create-directory",
-  "write-temporary-file",
-  "replace-registry-file",
-]);
 
 const DesktopSavedEnvironmentSecretProtectionOperation = Schema.Literals([
   "check-encryption-availability",
-  "encrypt-secret",
   "decrypt-secret",
 ]);
 
-export class DesktopSavedEnvironmentsWriteError extends Schema.TaggedError<DesktopSavedEnvironmentsWriteError>()(
-  "DesktopSavedEnvironmentsWriteError",
-  {
-    operation: DesktopSavedEnvironmentsWriteOperation,
-    path: Schema.String,
-    cause: Schema.Defect(),
-  },
-) {
-  override get message(): string {
-    return `Desktop saved-environment write failed during ${this.operation} at ${this.path}.`;
-  }
-}
-
 export class DesktopSavedEnvironmentsReadError extends Schema.TaggedError<DesktopSavedEnvironmentsReadError>()(
   "DesktopSavedEnvironmentsReadError",
   {
@@ -152,19 +125,12 @@ export type DesktopSavedEnvironmentsReadRegistryError =
   | DesktopSavedEnvironmentsReadError
   | DesktopSavedEnvironmentsDocumentDecodeError;
 
-export type DesktopSavedEnvironmentsMutationError =
-  | DesktopSavedEnvironmentsReadRegistryError
-  | DesktopSavedEnvironmentsWriteError;
-
 export type DesktopSavedEnvironmentsGetSecretError =
   | DesktopSavedEnvironmentsReadRegistryError
   | DesktopSavedEnvironmentSecretDecodeError
   | DesktopSavedEnvironmentSecretProtectionError;
 
-export type DesktopSavedEnvironmentsSetSecretError =
-  | DesktopSavedEnvironmentsMutationError
-  | DesktopSavedEnvironmentSecretProtectionError;
-
+/** Reads the previous registry for connection-catalog migration. */
 export class DesktopSavedEnvironments extends Context.Service<
   DesktopSavedEnvironments,
   {
@@ -172,22 +138,10 @@ export class DesktopSavedEnvironments extends Context.Service<
       readonly PersistedSavedEnvironmentRecord[],
       DesktopSavedEnvironmentsReadRegistryError
     >;
-    readonly setRegistry: (
-      records: readonly PersistedSavedEnvironmentRecord[],
-    ) => Effect.Effect<void, DesktopSavedEnvironmentsMutationError>;
-    readonly removeEnvironment: (
-      environmentId: string,
-    ) => Effect.Effect<void, DesktopSavedEnvironmentsMutationError>;
+
     readonly getSecret: (
       environmentId: string,
     ) => Effect.Effect<Option.Option<string>, DesktopSavedEnvironmentsGetSecretError>;
-    readonly setSecret: (input: {
-      readonly environmentId: string;
-      readonly secret: string;
-    }) => Effect.Effect<boolean, DesktopSavedEnvironmentsSetSecretError>;
-    readonly removeSecret: (
-      environmentId: string,
-    ) => Effect.Effect<void, DesktopSavedEnvironmentsMutationError>;
   }
 >()("@t3tools/desktop/settings/DesktopSavedEnvironments") {}
 
@@ -209,28 +163,6 @@ function toPersistedSavedEnvironmentRecord(
   };
 }
 
-function toSavedEnvironmentStorageRecord(
-  record: PersistedSavedEnvironmentRecord | PersistedSavedEnvironmentStorageRecord,
-  encryptedBearerToken: Option.Option<string>,
-): PersistedSavedEnvironmentStorageRecord {
-  const nextRecord = {
-    environmentId: record.environmentId,
-    label: record.label,
-    httpBaseUrl: record.httpBaseUrl,
-    wsBaseUrl: record.wsBaseUrl,
-    createdAt: record.createdAt,
-    lastConnectedAt: record.lastConnectedAt,
-  };
-  const metadata = {
-    ...(record.desktopSsh ? { desktopSsh: record.desktopSsh } : {}),
-    ...(record.relayManaged ? { relayManaged: record.relayManaged } : {}),
-  };
-  return Option.match(encryptedBearerToken, {
-    onNone: () => ({ ...nextRecord, ...metadata }),
-    onSome: (value) => ({ ...nextRecord, ...metadata, encryptedBearerToken: value }),
-  });
-}
-
 function normalizeSavedEnvironmentRegistryDocument(
   document: SavedEnvironmentRegistryStorageDocument,
 ): SavedEnvironmentRegistryDocument {
@@ -272,80 +204,6 @@ function readRegistryDocument(
   );
 }
 
-const writeRegistryDocument = Effect.fn("desktop.savedEnvironments.writeRegistryDocument")(
-  function* (input: {
-    readonly fileSystem: FileSystem.FileSystem;
-    readonly path: Path.Path;
-    readonly registryPath: string;
-    readonly document: SavedEnvironmentRegistryDocument;
-    readonly suffix: string;
-  }): Effect.fn.Return<void, DesktopSavedEnvironmentsWriteError> {
-    const directory = input.path.dirname(input.registryPath);
-    const tempPath = `${input.registryPath}.${process.pid}.${input.suffix}.tmp`;
-    const encoded = yield* encodeSavedEnvironmentRegistryDocumentJson(input.document).pipe(
-      Effect.mapError(
-        (cause) =>
-          new DesktopSavedEnvironmentsWriteError({
-            operation: "encode-registry",
-            path: input.registryPath,
-            cause,
-          }),
-      ),
-    );
-    yield* input.fileSystem.makeDirectory(directory, { recursive: true }).pipe(
-      Effect.mapError(
-        (cause) =>
-          new DesktopSavedEnvironmentsWriteError({
-            operation: "create-directory",
-            path: directory,
-            cause,
-          }),
-      ),
-    );
-    yield* input.fileSystem.writeFileString(tempPath, `${encoded}\n`).pipe(
-      Effect.mapError(
-        (cause) =>
-          new DesktopSavedEnvironmentsWriteError({
-            operation: "write-temporary-file",
-            path: tempPath,
-            cause,
-          }),
-      ),
-    );
-    yield* input.fileSystem.rename(tempPath, input.registryPath).pipe(
-      Effect.mapError(
-        (cause) =>
-          new DesktopSavedEnvironmentsWriteError({
-            operation: "replace-registry-file",
-            path: input.registryPath,
-            cause,
-          }),
-      ),
-    );
-  },
-);
-
-function preserveExistingSecrets(
-  currentDocument: SavedEnvironmentRegistryDocument,
-  records: readonly PersistedSavedEnvironmentRecord[],
-): SavedEnvironmentRegistryDocument {
-  const encryptedBearerTokenById = new Map(
-    currentDocument.records.flatMap((record) =>
-      record.encryptedBearerToken
-        ? [[record.environmentId, record.encryptedBearerToken] as const]
-        : [],
-    ),
-  );
-
-  return {
-    version: currentDocument.version,
-    records: records.map((record) => {
-      const encryptedBearerToken = encryptedBearerTokenById.get(record.environmentId);
-      return toSavedEnvironmentStorageRecord(record, Option.fromNullishOr(encryptedBearerToken));
-    }),
-  };
-}
-
 function decodeSecretBytes(
   environmentId: string,
   registryPath: string,
@@ -368,31 +226,8 @@ function decodeSecretBytes(
 export const make = Effect.gen(function* () {
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const fileSystem = yield* FileSystem.FileSystem;
-  const path = yield* Path.Path;
-  const safeStorage = yield* ElectronSafeStorage.ElectronSafeStorage;
-  const crypto = yield* Crypto.Crypto;
 
-  const writeDocument = (document: SavedEnvironmentRegistryDocument) =>
-    crypto.randomUUIDv4.pipe(
-      Effect.map((uuid) => uuid.replace(/-/g, "")),
-      Effect.mapError(
-        (cause) =>
-          new DesktopSavedEnvironmentsWriteError({
-            operation: "create-temporary-file-name",
-            path: environment.savedEnvironmentRegistryPath,
-            cause,
-          }),
-      ),
-      Effect.flatMap((suffix) =>
-        writeRegistryDocument({
-          fileSystem,
-          path,
-          registryPath: environment.savedEnvironmentRegistryPath,
-          document,
-          suffix,
-        }),
-      ),
-    );
+  const safeStorage = yield* ElectronSafeStorage.ElectronSafeStorage;
 
   return DesktopSavedEnvironments.of({
     getRegistry: readRegistryDocument(fileSystem, environment.savedEnvironmentRegistryPath).pipe(
@@ -401,30 +236,7 @@ export const make = Effect.gen(function* () {
       ),
       Effect.withSpan("desktop.savedEnvironments.getRegistry"),
     ),
-    setRegistry: Effect.fn("desktop.savedEnvironments.setRegistry")(function* (records) {
-      const currentDocument = yield* readRegistryDocument(
-        fileSystem,
-        environment.savedEnvironmentRegistryPath,
-      );
-      yield* writeDocument(preserveExistingSecrets(currentDocument, records));
-    }),
-    removeEnvironment: Effect.fn("desktop.savedEnvironments.removeEnvironment")(
-      function* (environmentId) {
-        yield* Effect.annotateCurrentSpan({ environmentId });
-        const document = yield* readRegistryDocument(
-          fileSystem,
-          environment.savedEnvironmentRegistryPath,
-        );
-        if (!document.records.some((record) => record.environmentId === environmentId)) {
-          return;
-        }
 
-        yield* writeDocument({
-          version: document.version,
-          records: document.records.filter((record) => record.environmentId !== environmentId),
-        });
-      },
-    ),
     getSecret: Effect.fn("desktop.savedEnvironments.getSecret")(function* (environmentId) {
       yield* Effect.annotateCurrentSpan({ environmentId });
       const document = yield* readRegistryDocument(
@@ -472,85 +284,6 @@ export const make = Effect.gen(function* () {
         ),
       );
     }),
-    setSecret: Effect.fn("desktop.savedEnvironments.setSecret")(function* (input) {
-      const { environmentId, secret } = input;
-      yield* Effect.annotateCurrentSpan({ environmentId });
-      const document = yield* readRegistryDocument(
-        fileSystem,
-        environment.savedEnvironmentRegistryPath,
-      );
-
-      const encryptionAvailable = yield* safeStorage.isEncryptionAvailable.pipe(
-        Effect.mapError(
-          (cause) =>
-            new DesktopSavedEnvironmentSecretProtectionError({
-              operation: "check-encryption-availability",
-              environmentId,
-              registryPath: environment.savedEnvironmentRegistryPath,
-              cause,
-            }),
-        ),
-      );
-      if (!encryptionAvailable) {
-        return false;
-      }
-
-      const encryptedBearerToken = Encoding.encodeBase64(
-        yield* safeStorage.encryptString(secret).pipe(
-          Effect.mapError(
-            (cause) =>
-              new DesktopSavedEnvironmentSecretProtectionError({
-                operation: "encrypt-secret",
-                environmentId,
-                registryPath: environment.savedEnvironmentRegistryPath,
-                cause,
-              }),
-          ),
-        ),
-      );
-      let found = false;
-      const nextDocument: SavedEnvironmentRegistryDocument = {
-        version: document.version,
-        records: document.records.map((record) => {
-          if (record.environmentId !== environmentId) {
-            return record;
-          }
-
-          found = true;
-          return toSavedEnvironmentStorageRecord(record, Option.some(encryptedBearerToken));
-        }),
-      };
-
-      if (found) {
-        yield* writeDocument(nextDocument);
-      }
-      return found;
-    }),
-    removeSecret: Effect.fn("desktop.savedEnvironments.removeSecret")(function* (environmentId) {
-      yield* Effect.annotateCurrentSpan({ environmentId });
-      const document = yield* readRegistryDocument(
-        fileSystem,
-        environment.savedEnvironmentRegistryPath,
-      );
-      if (
-        !document.records.some(
-          (record) =>
-            record.environmentId === environmentId && record.encryptedBearerToken !== undefined,
-        )
-      ) {
-        return;
-      }
-
-      yield* writeDocument({
-        version: document.version,
-        records: document.records.map((record) => {
-          if (record.environmentId !== environmentId) {
-            return record;
-          }
-          return toPersistedSavedEnvironmentRecord(record);
-        }),
-      });
-    }),
   });
 });
 
diff --git a/apps/desktop/src/shell/DesktopShellEnvironment.test.ts b/apps/desktop/src/shell/DesktopShellEnvironment.test.ts
index 5a76402b1d34..6a369a4598a2 100644
--- a/apps/desktop/src/shell/DesktopShellEnvironment.test.ts
+++ b/apps/desktop/src/shell/DesktopShellEnvironment.test.ts
@@ -397,16 +397,6 @@ describe("DesktopShellEnvironment", () => {
     }),
   );
 
-  it("resolves dbus runtime dir candidates with existence checks", () => {
-    const busPath = DesktopShellEnvironment.resolveDefaultLinuxDbusSessionBusAddress({
-      env: { XDG_RUNTIME_DIR: "/tmp/stale-runtime" },
-      uid: 1000,
-      exists: (path) => path === "/run/user/1000/bus",
-    });
-
-    assert.equal(busPath, "unix:path=/run/user/1000/bus");
-  });
-
   it.effect("logs command failures with safe probe context and the exact cause", () => {
     const env: NodeJS.ProcessEnv = {
       SHELL: "/bin/bash",
diff --git a/apps/desktop/src/shell/DesktopShellEnvironment.ts b/apps/desktop/src/shell/DesktopShellEnvironment.ts
index 5c6b67fd58c0..704b061db363 100644
--- a/apps/desktop/src/shell/DesktopShellEnvironment.ts
+++ b/apps/desktop/src/shell/DesktopShellEnvironment.ts
@@ -122,30 +122,6 @@ const linuxRuntimeDirCandidates = (
   return candidates.filter((candidate) => candidate.length > 0);
 };
 
-function resolveDefaultLinuxDbusSessionBusPath(input: {
-  readonly env: NodeJS.ProcessEnv;
-  readonly uid: number | undefined;
-  readonly exists?: (path: string) => boolean;
-}): string | null {
-  for (const runtimeDir of linuxRuntimeDirCandidates(input.env, input.uid)) {
-    const busPath = `${runtimeDir}/bus`;
-    if (input.exists === undefined || input.exists(busPath)) {
-      return busPath;
-    }
-  }
-
-  return null;
-}
-
-export function resolveDefaultLinuxDbusSessionBusAddress(input: {
-  readonly env: NodeJS.ProcessEnv;
-  readonly exists: (path: string) => boolean;
-  readonly uid: number | undefined;
-}): string | null {
-  const busPath = resolveDefaultLinuxDbusSessionBusPath(input);
-  return busPath !== null && input.exists(busPath) ? `unix:path=${busPath}` : null;
-}
-
 const pathComparisonKey = (entry: string, platform: NodeJS.Platform) => {
   const normalized = entry.trim().replace(/^"+|"+$/g, "");
   return platform === "win32" ? normalized.toLowerCase() : normalized;
diff --git a/apps/desktop/src/ssh/DesktopSshEnvironment.ts b/apps/desktop/src/ssh/DesktopSshEnvironment.ts
index b0094f6867bc..b5e724084a21 100644
--- a/apps/desktop/src/ssh/DesktopSshEnvironment.ts
+++ b/apps/desktop/src/ssh/DesktopSshEnvironment.ts
@@ -45,10 +45,6 @@ export type DesktopSshEnvironmentOperationError =
 
 export type DesktopSshEnvironmentDiscoverError = SshHostDiscoveryError;
 
-export type DesktopSshEnvironmentError =
-  | DesktopSshEnvironmentDiscoverError
-  | DesktopSshEnvironmentOperationError;
-
 export class DesktopSshEnvironment extends Context.Service<
   DesktopSshEnvironment,
   {
diff --git a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.ts b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.ts
index 120199da6486..5c0bf0998f40 100644
--- a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.ts
+++ b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.ts
@@ -164,10 +164,6 @@ export type DesktopSshPasswordPromptResolveError =
   | DesktopSshPromptInvalidRequestIdError
   | DesktopSshPromptExpiredError;
 
-export type DesktopSshPasswordPromptError =
-  | DesktopSshPasswordPromptRequestError
-  | DesktopSshPasswordPromptResolveError;
-
 export const DesktopSshPasswordPromptCancellation = Schema.Union([
   DesktopSshPromptCancelledError,
   DesktopSshPromptWindowClosedError,
diff --git a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts
index d705252ef588..cef90b29874b 100644
--- a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts
+++ b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.test.ts
@@ -39,7 +39,6 @@ function makeElectronAppLayer(
       onMetricsRead();
       return metrics;
     }),
-    isDefaultProtocolClient: () => Effect.succeed(false),
     setAsDefaultProtocolClient: () => Effect.succeed(true),
     setDesktopName: () => Effect.void,
     setDockIcon: () => Effect.void,
@@ -172,7 +171,7 @@ describe("DesktopTelemetryPublisher", () => {
 
         const nextSnapshotFiber = yield* Stream.runHead(publisher.changes).pipe(Effect.forkChild);
         yield* Effect.yieldNow;
-        yield* publisher.handleControl({
+        yield* publisher.handleControlForSource("primary-backend", {
           version: 1,
           type: "setDiagnosticsDemand",
           enabled: true,
@@ -188,7 +187,7 @@ describe("DesktopTelemetryPublisher", () => {
           type: "setDiagnosticsDemand",
           enabled: true,
         });
-        yield* publisher.handleControl({
+        yield* publisher.handleControlForSource("primary-backend", {
           version: 1,
           type: "setDiagnosticsDemand",
           enabled: false,
@@ -308,7 +307,7 @@ describe("DesktopTelemetryPublisher", () => {
           Effect.forkChild,
         );
         yield* Effect.yieldNow;
-        yield* publisher.handleControl({
+        yield* publisher.handleControlForSource("primary-backend", {
           version: 1,
           type: "setHostPowerIntervals",
           activeIntervalMs: 7_000,
@@ -369,7 +368,7 @@ describe("DesktopTelemetryPublisher", () => {
           Effect.forkChild,
         );
         yield* Effect.yieldNow;
-        yield* publisher.handleControl({
+        yield* publisher.handleControlForSource("primary-backend", {
           version: 1,
           type: "setDiagnosticsDemand",
           enabled: true,
diff --git a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
index 8fd478c821e7..18ea0a8380a3 100644
--- a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
+++ b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
@@ -63,7 +63,6 @@ export class DesktopTelemetryPublisher extends Context.Service<
     readonly latest: Effect.Effect<Option.Option<DesktopHostTelemetrySnapshot>>;
     readonly changes: Stream.Stream<DesktopHostTelemetrySnapshot>;
     readonly encoded: Stream.Stream<Uint8Array>;
-    readonly handleControl: (message: DesktopTelemetryControlMessage) => Effect.Effect<void>;
     readonly handleControlForSource: (
       sourceId: string,
       message: DesktopTelemetryControlMessage,
@@ -365,8 +364,6 @@ export const make = Effect.fn("desktop.telemetryPublisher.make")(function* () {
           : Queue.offer(sampleTriggers, undefined).pipe(Effect.asVoid),
       ),
     );
-  const handleControl: DesktopTelemetryPublisher["Service"]["handleControl"] = (message) =>
-    handleControlForSource("legacy", message);
 
   const snapshots = Stream.unwrap(
     Effect.gen(function* () {
@@ -415,7 +412,6 @@ export const make = Effect.fn("desktop.telemetryPublisher.make")(function* () {
     latest: Ref.get(latest),
     changes: Stream.fromPubSub(changes),
     encoded,
-    handleControl,
     handleControlForSource,
     removeControlSource,
     publishUpdateReport,
diff --git a/apps/desktop/src/updates/DesktopRemoteUpdates.test.ts b/apps/desktop/src/updates/DesktopRemoteUpdates.test.ts
index 0f4cb970da2c..1198429a1700 100644
--- a/apps/desktop/src/updates/DesktopRemoteUpdates.test.ts
+++ b/apps/desktop/src/updates/DesktopRemoteUpdates.test.ts
@@ -57,7 +57,6 @@ function runRemoteUpdatesTest(
         latest: Effect.succeedNone,
         changes: Stream.empty,
         encoded: Stream.empty,
-        handleControl: () => Effect.void,
         handleControlForSource: () => Effect.void,
         removeControlSource: () => Effect.void,
         publishUpdateReport: (report) =>
diff --git a/apps/desktop/src/window/DesktopApplicationMenu.test.ts b/apps/desktop/src/window/DesktopApplicationMenu.test.ts
index 4b06f5ee510e..5f5cbaa1d7fc 100644
--- a/apps/desktop/src/window/DesktopApplicationMenu.test.ts
+++ b/apps/desktop/src/window/DesktopApplicationMenu.test.ts
@@ -41,7 +41,6 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
   setAboutPanelOptions: () => Effect.void,
   setAppUserModelId: () => Effect.void,
   getAppMetrics: Effect.succeed([]),
-  isDefaultProtocolClient: () => Effect.succeed(false),
   setAsDefaultProtocolClient: () => Effect.succeed(true),
   setDesktopName: () => Effect.void,
   setDockIcon: () => Effect.void,
diff --git a/apps/mobile/modules/t3-review-diff/ios/T3ReviewDiffView.swift b/apps/mobile/modules/t3-review-diff/ios/T3ReviewDiffView.swift
index 9b36d60f94ec..74111988f150 100644
--- a/apps/mobile/modules/t3-review-diff/ios/T3ReviewDiffView.swift
+++ b/apps/mobile/modules/t3-review-diff/ios/T3ReviewDiffView.swift
@@ -2001,19 +2001,6 @@ private final class ReviewDiffContentView: UIView, UIGestureRecognizerDelegate {
     )
   }
 
-  private func fileStatusText(_ changeType: String?) -> String {
-    switch changeType {
-    case "new":
-      return "A"
-    case "deleted":
-      return "D"
-    case "renamed":
-      return "R"
-    default:
-      return ""
-    }
-  }
-
   private func fileStatusColor(_ changeType: String?) -> UIColor {
     switch changeType {
     case "new":
@@ -2027,13 +2014,6 @@ private final class ReviewDiffContentView: UIView, UIGestureRecognizerDelegate {
     }
   }
 
-  private func drawStatusPill(_ text: String, rect: CGRect, color: UIColor, font: UIFont) {
-    let path = UIBezierPath(roundedRect: rect, cornerRadius: rect.height / 2)
-    color.withAlphaComponent(0.12).setFill()
-    path.fill()
-    drawCenteredText(text, rect: rect, color: color, font: font)
-  }
-
   private func drawFileIcon(rect: CGRect, changeType: String?) {
     let color = fileStatusColor(changeType)
     let outerPath = UIBezierPath(roundedRect: rect, cornerRadius: 6)
diff --git a/apps/mobile/src/features/cloud/linkEnvironment.test.ts b/apps/mobile/src/features/cloud/linkEnvironment.test.ts
index feadf6c81893..8fa346c5be45 100644
--- a/apps/mobile/src/features/cloud/linkEnvironment.test.ts
+++ b/apps/mobile/src/features/cloud/linkEnvironment.test.ts
@@ -4,20 +4,13 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { EnvironmentId } from "@t3tools/contracts";
 import { RelayMobileClientId } from "@t3tools/contracts/relay";
-import { DPOP_UNKNOWN_HINT, ManagedRelay } from "@t3tools/client-runtime/relay";
+import { ManagedRelay } from "@t3tools/client-runtime/relay";
 import { remoteHttpClientLayer } from "@t3tools/client-runtime/rpc";
 import { HttpClient } from "effect/unstable/http";
-import { MobilePreferencesStore } from "../../persistence/mobile-preferences";
+
 import { MobileStorage } from "../../persistence/mobile-storage";
 
-import {
-  linkEnvironmentToCloud,
-  linkEnvironmentToCloudWithPreference,
-  connectCloudEnvironment,
-  listCloudEnvironments,
-  listCloudEnvironmentsWithStatus,
-  refreshCloudEnvironmentConnection,
-} from "./linkEnvironment";
+import { linkEnvironmentToCloudWithPreference } from "./linkEnvironment";
 
 vi.mock("expo-constants", () => ({
   default: {
@@ -56,8 +49,6 @@ vi.mock("expo-secure-store", () => ({
   setItemAsync: vi.fn(),
 }));
 
-const loadPreferences = vi.fn(() => Effect.succeed({}));
-
 const savedConnection = {
   environmentId: EnvironmentId.make("env-1"),
   environmentLabel: "Desktop",
@@ -68,8 +59,6 @@ const savedConnection = {
   bearerToken: "local-bearer",
 };
 
-const stableClerkToken = "eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJzdWIiOiJ1c2VyXzEyMyJ9.test";
-
 const createProofMock = vi.fn(
   (input: { readonly method: string; readonly url: string; readonly accessToken?: string }) =>
     Effect.succeed(`dpop:${input.method}:${input.url}`),
@@ -86,14 +75,6 @@ function cloudClientLayer() {
   const httpClientLayer = remoteHttpClientLayer((input, init) => globalThis.fetch(input, init));
   return Layer.mergeAll(
     httpClientLayer,
-    Layer.succeed(
-      MobilePreferencesStore,
-      MobilePreferencesStore.of({
-        load: loadPreferences(),
-        savePatch: (patch) => Effect.succeed(patch),
-        update: () => Effect.succeed({}),
-      }),
-    ),
     Layer.succeed(
       MobileStorage,
       MobileStorage.of({
@@ -123,7 +104,6 @@ const withCloudServices = <A, E>(
     | HttpClient.HttpClient
     | ManagedRelay.ManagedRelayClient
     | ManagedRelay.ManagedRelayDpopSigner
-    | MobilePreferencesStore
     | MobileStorage
   >,
 ) => effect.pipe(Effect.provide(cloudClientLayer()));
@@ -163,439 +143,12 @@ function requestBodyText(body: BodyInit | null | undefined): string {
   return body instanceof Uint8Array ? new TextDecoder().decode(body) : String(body ?? "");
 }
 
-function validDpopAccessTokenResponse(scope = "environment:status environment:connect") {
-  return {
-    access_token: "relay-dpop-token",
-    issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
-    token_type: "DPoP",
-    expires_in: 300,
-    scope,
-  };
-}
-
-function listedEnvironment(environmentId: string) {
-  return {
-    environmentId: EnvironmentId.make(environmentId),
-    label: "Desktop",
-    endpoint: {
-      httpBaseUrl: `https://${environmentId}.example.test/`,
-      wsBaseUrl: `wss://${environmentId}.example.test/ws`,
-      providerKind: "cloudflare_tunnel" as const,
-    },
-    linkedAt: "2026-05-25T00:00:00.000Z",
-  };
-}
-
 describe("mobile cloud link environment client", () => {
   beforeEach(() => {
     vi.restoreAllMocks();
     createProofMock.mockClear();
-    loadPreferences.mockClear();
   });
 
-  it.effect("decodes relay environment list responses before returning records", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn(() =>
-          Promise.resolve(
-            Response.json({
-              environments: [
-                {
-                  environmentId: "env-1",
-                  label: "Desktop",
-                  endpoint: {
-                    httpBaseUrl: "https://desktop.example.test/",
-                    wsBaseUrl: "wss://desktop.example.test/ws",
-                    providerKind: "cloudflare_tunnel",
-                  },
-                  linkedAt: "2026-05-25T00:00:00.000Z",
-                },
-              ],
-            }),
-          ),
-        ),
-      );
-
-      const records = yield* withCloudServices(
-        listCloudEnvironments({ clerkToken: "clerk-token" }),
-      );
-      expect(records).toEqual([
-        {
-          environmentId: "env-1",
-          label: "Desktop",
-          endpoint: {
-            httpBaseUrl: "https://desktop.example.test/",
-            wsBaseUrl: "wss://desktop.example.test/ws",
-            providerKind: "cloudflare_tunnel",
-          },
-          linkedAt: "2026-05-25T00:00:00.000Z",
-        },
-      ]);
-    }),
-  );
-
-  it.effect("rejects malformed relay environment list responses", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn(() =>
-          Promise.resolve(
-            Response.json({
-              environments: [
-                {
-                  environmentId: "env-1",
-                  label: "Desktop",
-                  endpoint: {
-                    httpBaseUrl: "",
-                    wsBaseUrl: "wss://desktop.example.test/ws",
-                    providerKind: "cloudflare_tunnel",
-                  },
-                  linkedAt: "2026-05-25T00:00:00.000Z",
-                },
-              ],
-            }),
-          ),
-        ),
-      );
-
-      const error = yield* withCloudServices(
-        listCloudEnvironments({ clerkToken: "clerk-token" }),
-      ).pipe(Effect.flip);
-      expect(error).toMatchObject({
-        _tag: "CloudEnvironmentLinkError",
-        message: "https://relay.example.test/v1/environments failed",
-      });
-    }),
-  );
-
-  it.effect("loads signed status for each advertised cloud environment", () =>
-    Effect.gen(function* () {
-      const fetchMock = vi.fn((url: string | URL, _init?: RequestInit) => {
-        if (String(url) === "https://relay.example.test/v1/environments") {
-          return Promise.resolve(
-            Response.json({
-              environments: [
-                {
-                  environmentId: "env-1",
-                  label: "Desktop",
-                  endpoint: {
-                    httpBaseUrl: "https://desktop.example.test/",
-                    wsBaseUrl: "wss://desktop.example.test/ws",
-                    providerKind: "cloudflare_tunnel",
-                  },
-                  linkedAt: "2026-05-25T00:00:00.000Z",
-                },
-              ],
-            }),
-          );
-        }
-        if (String(url) === "https://relay.example.test/v1/client/dpop-token") {
-          return Promise.resolve(Response.json(validDpopAccessTokenResponse()));
-        }
-        expect(String(url)).toBe("https://relay.example.test/v1/environments/env-1/status");
-        return Promise.resolve(
-          Response.json({
-            environmentId: "env-1",
-            endpoint: {
-              httpBaseUrl: "https://desktop.example.test/",
-              wsBaseUrl: "wss://desktop.example.test/ws",
-              providerKind: "cloudflare_tunnel",
-            },
-            status: "online",
-            checkedAt: "2026-05-25T00:01:00.000Z",
-            descriptor: {
-              environmentId: "env-1",
-              label: "Desktop",
-              platform: { os: "darwin", arch: "arm64" },
-              serverVersion: "0.0.0-test",
-              capabilities: { repositoryIdentity: true },
-            },
-          }),
-        );
-      });
-      vi.stubGlobal("fetch", fetchMock);
-
-      const records = yield* withCloudServices(
-        listCloudEnvironmentsWithStatus({ clerkToken: "clerk-token" }),
-      );
-      expect(records).toMatchObject([
-        {
-          environment: {
-            environmentId: "env-1",
-            label: "Desktop",
-          },
-          status: {
-            environmentId: "env-1",
-            status: "online",
-            checkedAt: "2026-05-25T00:01:00.000Z",
-          },
-          statusError: null,
-        },
-      ]);
-      expect(String(fetchMock.mock.calls[2]?.[0])).toBe(
-        "https://relay.example.test/v1/environments/env-1/status",
-      );
-      expect(fetchMock.mock.calls[2]?.[1]?.method).toBe("POST");
-      const statusHeaders = new Headers(fetchMock.mock.calls[2]?.[1]?.headers);
-      expect(statusHeaders.get("authorization")).toBe("DPoP relay-dpop-token");
-      expect(statusHeaders.get("dpop")).toBe(
-        "dpop:POST:https://relay.example.test/v1/environments/env-1/status",
-      );
-      expect(createProofMock).toHaveBeenCalledWith({
-        method: "POST",
-        url: "https://relay.example.test/v1/environments/env-1/status",
-        accessToken: "relay-dpop-token",
-      });
-    }),
-  );
-
-  it.effect("reuses one valid DPoP access token while probing multiple environment statuses", () =>
-    Effect.gen(function* () {
-      const fetchMock = vi.fn((url: string | URL, _init?: RequestInit) => {
-        if (String(url).endsWith("/v1/environments")) {
-          return Promise.resolve(
-            Response.json({
-              environments: [listedEnvironment("env-1"), listedEnvironment("env-2")],
-            }),
-          );
-        }
-        if (String(url).endsWith("/v1/client/dpop-token")) {
-          return Promise.resolve(Response.json(validDpopAccessTokenResponse()));
-        }
-        const environmentId = String(url).includes("/env-1/") ? "env-1" : "env-2";
-        return Promise.resolve(
-          Response.json({
-            environmentId,
-            endpoint: listedEnvironment(environmentId).endpoint,
-            status: "online",
-            checkedAt: "2026-05-25T00:01:00.000Z",
-            descriptor: {
-              environmentId,
-              label: "Desktop",
-              platform: { os: "darwin", arch: "arm64" },
-              serverVersion: "0.0.0-test",
-              capabilities: { repositoryIdentity: true },
-            },
-          }),
-        );
-      });
-      vi.stubGlobal("fetch", fetchMock);
-
-      yield* withCloudServices(listCloudEnvironmentsWithStatus({ clerkToken: stableClerkToken }));
-
-      expect(
-        fetchMock.mock.calls.filter(([url]) => String(url).endsWith("/v1/client/dpop-token")),
-      ).toHaveLength(1);
-    }),
-  );
-
-  it.effect("reuses the status-and-connect token when connecting from the cloud list", () =>
-    Effect.gen(function* () {
-      const fetchMock = vi.fn((url: string | URL, _init?: RequestInit) => {
-        if (String(url).endsWith("/v1/environments")) {
-          return Promise.resolve(
-            Response.json({
-              environments: [listedEnvironment("env-1")],
-            }),
-          );
-        }
-        if (String(url).endsWith("/v1/client/dpop-token")) {
-          return Promise.resolve(Response.json(validDpopAccessTokenResponse()));
-        }
-        if (String(url).endsWith("/status")) {
-          return Promise.resolve(
-            Response.json({
-              environmentId: "env-1",
-              endpoint: listedEnvironment("env-1").endpoint,
-              status: "online",
-              checkedAt: "2026-05-25T00:01:00.000Z",
-              descriptor: {
-                environmentId: "env-1",
-                label: "Desktop",
-                platform: { os: "darwin", arch: "arm64" },
-                serverVersion: "0.0.0-test",
-                capabilities: { repositoryIdentity: true },
-              },
-            }),
-          );
-        }
-        if (String(url).endsWith("/connect")) {
-          return Promise.resolve(
-            Response.json({
-              environmentId: "env-1",
-              endpoint: listedEnvironment("env-1").endpoint,
-              credential: "one-time-cloud-credential",
-              expiresAt: "2026-05-25T00:05:00.000Z",
-            }),
-          );
-        }
-        if (String(url).endsWith("/.well-known/t3/environment")) {
-          return Promise.resolve(
-            Response.json({
-              environmentId: "env-1",
-              label: "Desktop",
-              platform: { os: "darwin", arch: "arm64" },
-              serverVersion: "0.0.0-test",
-              capabilities: { repositoryIdentity: true },
-            }),
-          );
-        }
-        return Promise.resolve(
-          Response.json({
-            access_token: "environment-dpop-token",
-            issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
-            token_type: "DPoP",
-            expires_in: 3600,
-            scope: "orchestration:read orchestration:operate terminal:operate review:write",
-          }),
-        );
-      });
-      vi.stubGlobal("fetch", fetchMock);
-
-      yield* withCloudServices(
-        Effect.gen(function* () {
-          const records = yield* listCloudEnvironmentsWithStatus({
-            clerkToken: stableClerkToken,
-          });
-          yield* connectCloudEnvironment({
-            clerkToken: stableClerkToken,
-            environment: records[0]!.environment,
-          });
-        }),
-      );
-
-      expect(
-        fetchMock.mock.calls.filter(([url]) => String(url).endsWith("/v1/client/dpop-token")),
-      ).toHaveLength(1);
-      const exchangeRequest = fetchMock.mock.calls.find(([url]) =>
-        String(url).endsWith("/v1/client/dpop-token"),
-      )?.[1];
-      expect(new URLSearchParams(requestBodyText(exchangeRequest?.body)).get("scope")).toBe(
-        "environment:status environment:connect",
-      );
-      const environmentTokenRequest = fetchMock.mock.calls.find(([url]) =>
-        String(url).endsWith("/oauth/token"),
-      )?.[1];
-      const environmentTokenBody = new URLSearchParams(
-        requestBodyText(environmentTokenRequest?.body),
-      );
-      expect(environmentTokenBody.get("client_label")).toBe("T3 Code Mobile");
-      expect(environmentTokenBody.get("client_device_type")).toBe("mobile");
-      expect(environmentTokenBody.get("client_os")).toBe("iOS");
-    }),
-  );
-
-  it.effect("keeps advertised environments visible when status probing fails", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn((url: string | URL) => {
-          if (String(url) === "https://relay.example.test/v1/environments") {
-            return Promise.resolve(
-              Response.json({
-                environments: [
-                  {
-                    environmentId: "env-1",
-                    label: "Desktop",
-                    endpoint: {
-                      httpBaseUrl: "https://desktop.example.test/",
-                      wsBaseUrl: "wss://desktop.example.test/ws",
-                      providerKind: "cloudflare_tunnel",
-                    },
-                    linkedAt: "2026-05-25T00:00:00.000Z",
-                  },
-                ],
-              }),
-            );
-          }
-          if (String(url) === "https://relay.example.test/v1/client/dpop-token") {
-            return Promise.resolve(Response.json(validDpopAccessTokenResponse()));
-          }
-          return Promise.resolve(Response.json({ error: "offline" }, { status: 503 }));
-        }),
-      );
-
-      const records = yield* withCloudServices(
-        listCloudEnvironmentsWithStatus({ clerkToken: "clerk-token" }),
-      );
-      expect(records).toMatchObject([
-        {
-          environment: {
-            environmentId: "env-1",
-            label: "Desktop",
-          },
-          status: null,
-          statusError: "https://relay.example.test/v1/environments/env-1/status failed",
-        },
-      ]);
-    }),
-  );
-
-  it.effect("rejects status responses for a different advertised environment", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn((url: string | URL) => {
-          if (String(url) === "https://relay.example.test/v1/environments") {
-            return Promise.resolve(
-              Response.json({
-                environments: [
-                  {
-                    environmentId: "env-1",
-                    label: "Desktop",
-                    endpoint: {
-                      httpBaseUrl: "https://desktop.example.test/",
-                      wsBaseUrl: "wss://desktop.example.test/ws",
-                      providerKind: "cloudflare_tunnel",
-                    },
-                    linkedAt: "2026-05-25T00:00:00.000Z",
-                  },
-                ],
-              }),
-            );
-          }
-          if (String(url) === "https://relay.example.test/v1/client/dpop-token") {
-            return Promise.resolve(Response.json(validDpopAccessTokenResponse()));
-          }
-          return Promise.resolve(
-            Response.json({
-              environmentId: "env-other",
-              endpoint: {
-                httpBaseUrl: "https://desktop.example.test/",
-                wsBaseUrl: "wss://desktop.example.test/ws",
-                providerKind: "cloudflare_tunnel",
-              },
-              status: "online",
-              checkedAt: "2026-05-25T00:01:00.000Z",
-              descriptor: {
-                environmentId: "env-other",
-                label: "Other Desktop",
-                platform: { os: "darwin", arch: "arm64" },
-                serverVersion: "0.0.0-test",
-                capabilities: { repositoryIdentity: true },
-              },
-            }),
-          );
-        }),
-      );
-
-      const records = yield* withCloudServices(
-        listCloudEnvironmentsWithStatus({ clerkToken: "clerk-token" }),
-      );
-      expect(records).toMatchObject([
-        {
-          environment: {
-            environmentId: "env-1",
-            label: "Desktop",
-          },
-          status: null,
-          statusError: "Relay returned status for a different environment.",
-        },
-      ]);
-    }),
-  );
-
   it.effect(
     "rejects relay link credentials for a different environment before persisting relay config",
     () =>
@@ -612,9 +165,10 @@ describe("mobile cloud link environment client", () => {
         vi.stubGlobal("fetch", fetchMock);
 
         const error = yield* withCloudServices(
-          linkEnvironmentToCloud({
+          linkEnvironmentToCloudWithPreference({
             clerkToken: "clerk-token",
             connection: savedConnection,
+            liveActivitiesEnabled: true,
           }),
         ).pipe(Effect.flip);
         expect(error).toMatchObject({
@@ -644,9 +198,10 @@ describe("mobile cloud link environment client", () => {
       vi.stubGlobal("fetch", fetchMock);
 
       const error = yield* withCloudServices(
-        linkEnvironmentToCloud({
+        linkEnvironmentToCloudWithPreference({
           clerkToken: "clerk-token",
           connection: savedConnection,
+          liveActivitiesEnabled: true,
         }),
       ).pipe(Effect.flip);
       expect(error._tag).toBe("CloudEnvironmentLinkError");
@@ -681,9 +236,10 @@ describe("mobile cloud link environment client", () => {
       vi.stubGlobal("fetch", fetchMock);
 
       const error = yield* withCloudServices(
-        linkEnvironmentToCloud({
+        linkEnvironmentToCloudWithPreference({
           clerkToken: "clerk-token",
           connection: savedConnection,
+          liveActivitiesEnabled: true,
         }),
       ).pipe(Effect.flip);
       expect(error).toMatchObject({
@@ -718,9 +274,10 @@ describe("mobile cloud link environment client", () => {
       vi.stubGlobal("fetch", fetchMock);
 
       const error = yield* withCloudServices(
-        linkEnvironmentToCloud({
+        linkEnvironmentToCloudWithPreference({
           clerkToken: "clerk-token",
           connection: savedConnection,
+          liveActivitiesEnabled: true,
         }),
       ).pipe(Effect.flip);
       expect(error).toMatchObject({
@@ -733,7 +290,6 @@ describe("mobile cloud link environment client", () => {
 
   it.effect("preserves disabled Live Activity preferences when linking an environment", () =>
     Effect.gen(function* () {
-      loadPreferences.mockReturnValueOnce(Effect.succeed({ liveActivitiesEnabled: false }));
       const bodies: Array<unknown> = [];
       const fetchMock = vi.fn((url: string | URL, init?: RequestInit) => {
         if (init?.body) {
@@ -756,9 +312,10 @@ describe("mobile cloud link environment client", () => {
       vi.stubGlobal("fetch", fetchMock);
 
       yield* withCloudServices(
-        linkEnvironmentToCloud({
+        linkEnvironmentToCloudWithPreference({
           clerkToken: "clerk-token",
           connection: savedConnection,
+          liveActivitiesEnabled: false,
         }),
       );
 
@@ -786,9 +343,8 @@ describe("mobile cloud link environment client", () => {
     }),
   );
 
-  it.effect("uses an explicit Live Activity preference when persisted state is unavailable", () =>
+  it.effect("enables Live Activities for both the link challenge and registration", () =>
     Effect.gen(function* () {
-      loadPreferences.mockReturnValueOnce(Effect.die("persisted preferences must not be read"));
       const bodies: Array<Record<string, unknown>> = [];
       const fetchMock = vi.fn((url: string | URL, init?: RequestInit) => {
         if (init?.body) {
@@ -824,429 +380,4 @@ describe("mobile cloud link environment client", () => {
       ]);
     }),
   );
-
-  it.effect(
-    "does not persist cloud connect bootstrap credentials in saved connection records",
-    () =>
-      Effect.gen(function* () {
-        let connectRequestBody = "";
-        const fetchMock = vi.fn((url: string | URL, init?: RequestInit) => {
-          if (String(url).endsWith("/v1/client/dpop-token")) {
-            return Promise.resolve(
-              Response.json(validDpopAccessTokenResponse("environment:connect")),
-            );
-          }
-          if (String(url).endsWith("/.well-known/t3/environment")) {
-            return Promise.resolve(
-              Response.json({
-                environmentId: "env-1",
-                label: "Desktop",
-                platform: { os: "darwin", arch: "arm64" },
-                serverVersion: "0.0.0-test",
-                capabilities: { repositoryIdentity: true },
-              }),
-            );
-          }
-          if (String(url).endsWith("/oauth/token")) {
-            return Promise.resolve(
-              Response.json({
-                access_token: "environment-dpop-token",
-                issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
-                token_type: "DPoP",
-                expires_in: 3600,
-                scope: "orchestration:read orchestration:operate terminal:operate review:write",
-              }),
-            );
-          }
-          connectRequestBody = requestBodyText(init?.body);
-          return Promise.resolve(
-            Response.json({
-              environmentId: "env-1",
-              endpoint: {
-                httpBaseUrl: "https://desktop.example.test/",
-                wsBaseUrl: "wss://desktop.example.test/ws",
-                providerKind: "cloudflare_tunnel",
-              },
-              credential: "one-time-cloud-credential",
-              expiresAt: "2026-05-25T00:05:00.000Z",
-            }),
-          );
-        });
-        vi.stubGlobal("fetch", fetchMock);
-
-        const connection = yield* withCloudServices(
-          connectCloudEnvironment({
-            clerkToken: "clerk-token",
-            environment: {
-              environmentId: EnvironmentId.make("env-1"),
-              label: "Desktop",
-              endpoint: {
-                httpBaseUrl: "https://desktop.example.test/",
-                wsBaseUrl: "wss://desktop.example.test/ws",
-                providerKind: "cloudflare_tunnel",
-              },
-              linkedAt: "2026-05-25T00:00:00.000Z",
-            },
-          }),
-        );
-
-        expect(connection.pairingUrl).toBe("https://desktop.example.test/");
-        expect(connection.pairingUrl).not.toContain("one-time-cloud-credential");
-        expect(connection.bearerToken).toBeNull();
-        expect(connection.authenticationMethod).toBe("dpop");
-        expect(connection.dpopAccessToken).toBe("environment-dpop-token");
-        expect(connection.relayManaged).toBe(true);
-        // @effect-diagnostics-next-line preferSchemaOverJson:off
-        expect(JSON.parse(connectRequestBody)).toMatchObject({
-          deviceId: "device-1",
-          clientKeyThumbprint: "client-proof-key-thumbprint",
-        });
-        expect(createProofMock).toHaveBeenCalledWith({
-          method: "POST",
-          url: "https://relay.example.test/v1/environments/env-1/connect",
-          accessToken: "relay-dpop-token",
-        });
-        expect(createProofMock).toHaveBeenCalledWith({
-          method: "POST",
-          url: "https://desktop.example.test/oauth/token",
-        });
-      }),
-  );
-
-  it.effect("refreshes a saved environment against a rotated managed endpoint", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn((url: string | URL) => {
-          if (String(url).endsWith("/v1/client/dpop-token")) {
-            return Promise.resolve(
-              Response.json(validDpopAccessTokenResponse("environment:connect")),
-            );
-          }
-          if (String(url).endsWith("/.well-known/t3/environment")) {
-            return Promise.resolve(
-              Response.json({
-                environmentId: "env-1",
-                label: "Rotated Desktop",
-                platform: { os: "darwin", arch: "arm64" },
-                serverVersion: "0.0.0-test",
-                capabilities: { repositoryIdentity: true },
-              }),
-            );
-          }
-          if (String(url).endsWith("/oauth/token")) {
-            return Promise.resolve(
-              Response.json({
-                access_token: "fresh-environment-dpop-token",
-                issued_token_type: "urn:ietf:params:oauth:token-type:access_token",
-                token_type: "DPoP",
-                expires_in: 3600,
-                scope: "orchestration:read orchestration:operate terminal:operate review:write",
-              }),
-            );
-          }
-          return Promise.resolve(
-            Response.json({
-              environmentId: "env-1",
-              endpoint: {
-                httpBaseUrl: "https://rotated-desktop.example.test/",
-                wsBaseUrl: "wss://rotated-desktop.example.test/ws",
-                providerKind: "cloudflare_tunnel",
-              },
-              credential: "rotated-one-time-cloud-credential",
-              expiresAt: "2026-05-25T00:05:00.000Z",
-            }),
-          );
-        }),
-      );
-
-      const connection = yield* withCloudServices(
-        refreshCloudEnvironmentConnection({
-          clerkToken: "clerk-token",
-          connection: {
-            environmentId: EnvironmentId.make("env-1"),
-            environmentLabel: "Desktop",
-            pairingUrl: "https://desktop.example.test/",
-            displayUrl: "https://desktop.example.test/",
-            httpBaseUrl: "https://desktop.example.test/",
-            wsBaseUrl: "wss://desktop.example.test/ws",
-            bearerToken: null,
-            authenticationMethod: "dpop",
-            relayManaged: true,
-          },
-        }),
-      );
-
-      expect(connection).toMatchObject({
-        environmentId: "env-1",
-        environmentLabel: "Rotated Desktop",
-        displayUrl: "https://rotated-desktop.example.test/",
-        httpBaseUrl: "https://rotated-desktop.example.test/",
-        wsBaseUrl: "wss://rotated-desktop.example.test/ws",
-        dpopAccessToken: "fresh-environment-dpop-token",
-      });
-    }),
-  );
-
-  it.effect("rejects relay connect responses for a different environment", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn((url: string | URL) =>
-          Promise.resolve(
-            String(url).endsWith("/v1/client/dpop-token")
-              ? Response.json(validDpopAccessTokenResponse("environment:connect"))
-              : Response.json({
-                  environmentId: "env-other",
-                  endpoint: {
-                    httpBaseUrl: "https://desktop.example.test/",
-                    wsBaseUrl: "wss://desktop.example.test/ws",
-                    providerKind: "cloudflare_tunnel",
-                  },
-                  credential: "one-time-cloud-credential",
-                  expiresAt: "2026-05-25T00:05:00.000Z",
-                }),
-          ),
-        ),
-      );
-
-      const error = yield* withCloudServices(
-        connectCloudEnvironment({
-          clerkToken: "clerk-token",
-          environment: {
-            environmentId: EnvironmentId.make("env-1"),
-            label: "Desktop",
-            endpoint: {
-              httpBaseUrl: "https://desktop.example.test/",
-              wsBaseUrl: "wss://desktop.example.test/ws",
-              providerKind: "cloudflare_tunnel",
-            },
-            linkedAt: "2026-05-25T00:00:00.000Z",
-          },
-        }),
-      ).pipe(Effect.flip);
-      expect(error).toMatchObject({
-        _tag: "CloudEnvironmentLinkError",
-        message: "Relay returned credentials for a different environment.",
-      });
-    }),
-  );
-
-  it.effect("preserves relay DPoP auth failures while connecting environments", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn((url: string | URL) =>
-          Promise.resolve(
-            String(url).endsWith("/v1/client/dpop-token")
-              ? Response.json(validDpopAccessTokenResponse("environment:connect"))
-              : Response.json(
-                  {
-                    _tag: "RelayAuthInvalidError",
-                    code: "auth_invalid",
-                    reason: "invalid_dpop",
-                    traceId: "trace-connect",
-                  },
-                  { status: 401 },
-                ),
-          ),
-        ),
-      );
-
-      const error = yield* withCloudServices(
-        connectCloudEnvironment({
-          clerkToken: "clerk-token",
-          environment: {
-            environmentId: EnvironmentId.make("env-1"),
-            label: "Desktop",
-            endpoint: {
-              httpBaseUrl: "https://desktop.example.test/",
-              wsBaseUrl: "wss://desktop.example.test/ws",
-              providerKind: "cloudflare_tunnel",
-            },
-            linkedAt: "2026-05-25T00:00:00.000Z",
-          },
-        }),
-      ).pipe(Effect.flip);
-      expect(error).toMatchObject({
-        _tag: "CloudEnvironmentLinkError",
-        message: `https://relay.example.test/v1/environments/env-1/connect failed: Relay rejected the DPoP proof. ${DPOP_UNKNOWN_HINT}`,
-        traceId: "trace-connect",
-      });
-    }),
-  );
-
-  it.effect(
-    "presents clock skew as one possible cause when an older environment rejects DPoP",
-    () =>
-      Effect.gen(function* () {
-        vi.stubGlobal(
-          "fetch",
-          vi.fn((url: string | URL) => {
-            const value = String(url);
-            if (value.endsWith("/v1/client/dpop-token")) {
-              return Promise.resolve(
-                Response.json(validDpopAccessTokenResponse("environment:connect")),
-              );
-            }
-            if (value.endsWith("/v1/environments/env-1/connect")) {
-              return Promise.resolve(
-                Response.json({
-                  environmentId: "env-1",
-                  endpoint: {
-                    httpBaseUrl: "https://desktop.example.test/",
-                    wsBaseUrl: "wss://desktop.example.test/ws",
-                    providerKind: "cloudflare_tunnel",
-                  },
-                  credential: "one-time-cloud-credential",
-                  expiresAt: "2026-05-25T00:05:00.000Z",
-                }),
-              );
-            }
-            if (value.endsWith("/.well-known/t3/environment")) {
-              return Promise.resolve(
-                Response.json({
-                  environmentId: "env-1",
-                  label: "Desktop",
-                  platform: { os: "darwin", arch: "arm64" },
-                  serverVersion: "0.0.0-test",
-                  capabilities: { repositoryIdentity: true },
-                }),
-              );
-            }
-            return Promise.resolve(
-              Response.json(
-                {
-                  _tag: "EnvironmentAuthInvalidError",
-                  code: "auth_invalid",
-                  reason: "invalid_credential",
-                  traceId: "trace-environment",
-                },
-                { status: 401 },
-              ),
-            );
-          }),
-        );
-
-        const error = yield* withCloudServices(
-          connectCloudEnvironment({
-            clerkToken: "clerk-token",
-            environment: {
-              environmentId: EnvironmentId.make("env-1"),
-              label: "Desktop",
-              endpoint: {
-                httpBaseUrl: "https://desktop.example.test/",
-                wsBaseUrl: "wss://desktop.example.test/ws",
-                providerKind: "cloudflare_tunnel",
-              },
-              linkedAt: "2026-05-25T00:00:00.000Z",
-            },
-          }),
-        ).pipe(Effect.flip);
-
-        expect(error).toMatchObject({
-          _tag: "CloudEnvironmentLinkError",
-          message: `Could not exchange a managed endpoint DPoP access token. ${DPOP_UNKNOWN_HINT}`,
-          traceId: "trace-environment",
-        });
-      }),
-  );
-
-  it.effect("rejects relay connect responses for a different endpoint", () =>
-    Effect.gen(function* () {
-      vi.stubGlobal(
-        "fetch",
-        vi.fn((url: string | URL) =>
-          Promise.resolve(
-            String(url).endsWith("/v1/client/dpop-token")
-              ? Response.json(validDpopAccessTokenResponse("environment:connect"))
-              : Response.json({
-                  environmentId: "env-1",
-                  endpoint: {
-                    httpBaseUrl: "https://other-desktop.example.test/",
-                    wsBaseUrl: "wss://other-desktop.example.test/ws",
-                    providerKind: "cloudflare_tunnel",
-                  },
-                  credential: "one-time-cloud-credential",
-                  expiresAt: "2026-05-25T00:05:00.000Z",
-                }),
-          ),
-        ),
-      );
-
-      const error = yield* withCloudServices(
-        connectCloudEnvironment({
-          clerkToken: "clerk-token",
-          environment: {
-            environmentId: EnvironmentId.make("env-1"),
-            label: "Desktop",
-            endpoint: {
-              httpBaseUrl: "https://desktop.example.test/",
-              wsBaseUrl: "wss://desktop.example.test/ws",
-              providerKind: "cloudflare_tunnel",
-            },
-            linkedAt: "2026-05-25T00:00:00.000Z",
-          },
-        }),
-      ).pipe(Effect.flip);
-      expect(error).toMatchObject({
-        _tag: "CloudEnvironmentLinkError",
-        message: "Relay returned credentials for a different endpoint.",
-      });
-    }),
-  );
-
-  it.effect(
-    "rejects managed endpoints whose descriptor does not match the selected environment",
-    () =>
-      Effect.gen(function* () {
-        vi.stubGlobal(
-          "fetch",
-          vi.fn((url: string | URL) =>
-            Promise.resolve(
-              String(url).endsWith("/v1/client/dpop-token")
-                ? Response.json(validDpopAccessTokenResponse("environment:connect"))
-                : String(url).endsWith("/.well-known/t3/environment")
-                  ? Response.json({
-                      environmentId: "env-other",
-                      label: "Other Desktop",
-                      platform: { os: "darwin", arch: "arm64" },
-                      serverVersion: "0.0.0-test",
-                      capabilities: { repositoryIdentity: true },
-                    })
-                  : Response.json({
-                      environmentId: "env-1",
-                      endpoint: {
-                        httpBaseUrl: "https://desktop.example.test/",
-                        wsBaseUrl: "wss://desktop.example.test/ws",
-                        providerKind: "cloudflare_tunnel",
-                      },
-                      credential: "one-time-cloud-credential",
-                      expiresAt: "2026-05-25T00:05:00.000Z",
-                    }),
-            ),
-          ),
-        );
-
-        const error = yield* withCloudServices(
-          connectCloudEnvironment({
-            clerkToken: "clerk-token",
-            environment: {
-              environmentId: EnvironmentId.make("env-1"),
-              label: "Desktop",
-              endpoint: {
-                httpBaseUrl: "https://desktop.example.test/",
-                wsBaseUrl: "wss://desktop.example.test/ws",
-                providerKind: "cloudflare_tunnel",
-              },
-              linkedAt: "2026-05-25T00:00:00.000Z",
-            },
-          }),
-        ).pipe(Effect.flip);
-        expect(error).toMatchObject({
-          _tag: "CloudEnvironmentLinkError",
-          message: "Connected endpoint descriptor does not match the selected environment.",
-        });
-      }),
-  );
 });
diff --git a/apps/mobile/src/features/cloud/linkEnvironment.ts b/apps/mobile/src/features/cloud/linkEnvironment.ts
index b8dc8f878e0c..73bd28c550ed 100644
--- a/apps/mobile/src/features/cloud/linkEnvironment.ts
+++ b/apps/mobile/src/features/cloud/linkEnvironment.ts
@@ -4,45 +4,24 @@ import * as Schema from "effect/Schema";
 import { HttpClient } from "effect/unstable/http";
 import {
   EnvironmentCloudEndpointUnavailableError,
-  EnvironmentAuthInvalidError,
   EnvironmentHttpBadRequestError,
   EnvironmentHttpConflictError,
   EnvironmentHttpForbiddenError,
   EnvironmentHttpInternalServerError,
   EnvironmentHttpUnauthorizedError,
 } from "@t3tools/contracts";
-import { stripPairingTokenFromUrl } from "@t3tools/shared/remote";
 import {
-  type RelayEnvironmentConnectResponse as RelayEnvironmentConnectResponseType,
   type RelayEnvironmentLinkResponse as RelayEnvironmentLinkResponseType,
-  RelayEnvironmentConnectScope,
-  RelayEnvironmentStatusScope,
-  type RelayDpopAccessTokenScope,
-  type RelayClientEnvironmentRecord,
-  type RelayEnvironmentStatusResponse as RelayEnvironmentStatusResponseType,
   type RelayManagedEndpointProviderKind,
 } from "@t3tools/contracts/relay";
-import { exchangeRemoteDpopAccessToken } from "@t3tools/client-runtime/authorization";
-import { fetchRemoteEnvironmentDescriptor } from "@t3tools/client-runtime/environment";
 import { findErrorTraceId } from "@t3tools/client-runtime/errors";
-import {
-  dpopFailureMessage,
-  ManagedRelay,
-  relayProtectedErrorMessage,
-} from "@t3tools/client-runtime/relay";
+import { ManagedRelay, relayProtectedErrorMessage } from "@t3tools/client-runtime/relay";
 import { makeEnvironmentHttpApiClient } from "@t3tools/client-runtime/rpc";
 
-import { authClientMetadata } from "../../lib/authClientMetadata";
 import type { SavedRemoteConnection } from "../../lib/connection";
-import * as MobilePreferences from "../../persistence/mobile-preferences";
 import * as MobileStorage from "../../persistence/mobile-storage";
 import { resolveCloudPublicConfig } from "./publicConfig";
 
-const RELAY_STATUS_AND_CONNECT_SCOPES = [
-  RelayEnvironmentStatusScope,
-  RelayEnvironmentConnectScope,
-] satisfies ReadonlyArray<RelayDpopAccessTokenScope>;
-
 function readRelayUrl(): string | null {
   return resolveCloudPublicConfig().relay.url;
 }
@@ -53,12 +32,6 @@ export class CloudEnvironmentLinkError extends Data.TaggedError("CloudEnvironmen
   readonly traceId?: string;
 }> {}
 
-export interface CloudEnvironmentRecordWithStatus {
-  readonly environment: RelayClientEnvironmentRecord;
-  readonly status: RelayEnvironmentStatusResponseType | null;
-  readonly statusError: string | null;
-}
-
 const isEnvironmentCloudApiError = Schema.is(
   Schema.Union([
     EnvironmentHttpBadRequestError,
@@ -69,24 +42,19 @@ const isEnvironmentCloudApiError = Schema.is(
     EnvironmentCloudEndpointUnavailableError,
   ]),
 );
-const isEnvironmentAuthInvalidError = Schema.is(EnvironmentAuthInvalidError);
 
 const MANAGED_ENDPOINT_PROVIDER_KIND =
   "cloudflare_tunnel" satisfies RelayManagedEndpointProviderKind;
 
-function cloudEnvironmentLinkError(message: string, options?: { readonly dpop?: boolean }) {
+function cloudEnvironmentLinkError(message: string) {
   return (cause: unknown) => {
     const environmentError = findEnvironmentCloudApiError(cause);
     const traceId = findErrorTraceId(cause);
-    const dpopAuthError = options?.dpop ? findEnvironmentAuthInvalidError(cause) : null;
     const detail = environmentError
       ? `${message.replace(/[.:]$/, "")}: ${environmentError.message}`
       : withDevCause(message, cause);
     return new CloudEnvironmentLinkError({
-      message:
-        dpopAuthError?.reason === "invalid_credential"
-          ? dpopFailureMessage(detail, dpopAuthError.dpopFailureReason)
-          : detail,
+      message: detail,
       cause,
       ...(traceId === null ? {} : { traceId }),
     });
@@ -143,16 +111,6 @@ function findEnvironmentCloudApiError(cause: unknown): { readonly message: strin
   return "cause" in cause ? findEnvironmentCloudApiError(cause.cause) : null;
 }
 
-function findEnvironmentAuthInvalidError(cause: unknown): EnvironmentAuthInvalidError | null {
-  if (isEnvironmentAuthInvalidError(cause)) {
-    return cause;
-  }
-  if (typeof cause !== "object" || cause === null) {
-    return null;
-  }
-  return "cause" in cause ? findEnvironmentAuthInvalidError(cause.cause) : null;
-}
-
 function requireRelayUrl(): Effect.Effect<string, CloudEnvironmentLinkError> {
   const relayUrl = readRelayUrl();
   return relayUrl
@@ -186,54 +144,6 @@ function ensureLinkedEnvironmentMatches(input: {
   return Effect.void;
 }
 
-function endpointMatches(
-  left: RelayClientEnvironmentRecord["endpoint"],
-  right: RelayClientEnvironmentRecord["endpoint"],
-): boolean {
-  return (
-    left.httpBaseUrl === right.httpBaseUrl &&
-    left.wsBaseUrl === right.wsBaseUrl &&
-    left.providerKind === right.providerKind
-  );
-}
-
-function ensureStatusMatchesEnvironment(input: {
-  readonly environment: RelayClientEnvironmentRecord;
-  readonly status: RelayEnvironmentStatusResponseType;
-}): Effect.Effect<void, CloudEnvironmentLinkError> {
-  if (input.status.environmentId !== input.environment.environmentId) {
-    return new CloudEnvironmentLinkError({
-      message: "Relay returned status for a different environment.",
-    });
-  }
-  if (!endpointMatches(input.status.endpoint, input.environment.endpoint)) {
-    return new CloudEnvironmentLinkError({
-      message: "Relay returned status for a different endpoint.",
-    });
-  }
-  if (
-    input.status.descriptor &&
-    input.status.descriptor.environmentId !== input.environment.environmentId
-  ) {
-    return new CloudEnvironmentLinkError({
-      message: "Relay returned status descriptor for a different environment.",
-    });
-  }
-  return Effect.void;
-}
-
-function ensureConnectEndpointMatchesEnvironment(input: {
-  readonly environment: RelayClientEnvironmentRecord;
-  readonly connect: RelayEnvironmentConnectResponseType;
-}): Effect.Effect<void, CloudEnvironmentLinkError> {
-  if (!endpointMatches(input.connect.endpoint, input.environment.endpoint)) {
-    return new CloudEnvironmentLinkError({
-      message: "Relay returned credentials for a different endpoint.",
-    });
-  }
-  return Effect.void;
-}
-
 interface LinkEnvironmentToCloudInput {
   readonly connection: SavedRemoteConnection;
   readonly clerkToken: string;
@@ -328,250 +238,3 @@ export function linkEnvironmentToCloudWithPreference(
       );
   });
 }
-
-export function linkEnvironmentToCloud(
-  input: LinkEnvironmentToCloudInput,
-): Effect.Effect<
-  void,
-  CloudEnvironmentLinkError,
-  LinkEnvironmentToCloudRequirements | MobilePreferences.MobilePreferencesStore
-> {
-  return MobilePreferences.MobilePreferencesStore.pipe(
-    Effect.flatMap((preferencesStore) => preferencesStore.load),
-    Effect.mapError(cloudEnvironmentLinkError("Could not load mobile notification preferences.")),
-    Effect.flatMap((preferences) =>
-      linkEnvironmentToCloudWithPreference({
-        ...input,
-        liveActivitiesEnabled: preferences.liveActivitiesEnabled !== false,
-      }),
-    ),
-  );
-}
-
-export function listCloudEnvironments(input: {
-  readonly clerkToken: string;
-}): Effect.Effect<
-  ReadonlyArray<RelayClientEnvironmentRecord>,
-  CloudEnvironmentLinkError,
-  ManagedRelay.ManagedRelayClient
-> {
-  return Effect.gen(function* () {
-    const relayUrl = yield* requireRelayUrl();
-    const relayClient = yield* ManagedRelay.ManagedRelayClient;
-
-    return yield* relayClient
-      .listEnvironments({
-        clerkToken: input.clerkToken,
-      })
-      .pipe(Effect.mapError(decodedRelayClientError(`${relayUrl}/v1/environments failed`)));
-  });
-}
-
-export function getCloudEnvironmentStatus(input: {
-  readonly clerkToken: string;
-  readonly environment: RelayClientEnvironmentRecord;
-  readonly relayScopes?: ReadonlyArray<RelayDpopAccessTokenScope>;
-}): Effect.Effect<
-  RelayEnvironmentStatusResponseType,
-  CloudEnvironmentLinkError,
-  ManagedRelay.ManagedRelayClient
-> {
-  return Effect.gen(function* () {
-    const relayUrl = yield* requireRelayUrl();
-    const relayClient = yield* ManagedRelay.ManagedRelayClient;
-    const status = yield* relayClient
-      .getEnvironmentStatus({
-        clerkToken: input.clerkToken,
-        scopes: input.relayScopes ?? [RelayEnvironmentStatusScope],
-        environmentId: input.environment.environmentId,
-      })
-      .pipe(
-        Effect.mapError(
-          decodedRelayClientError(
-            `${relayUrl}/v1/environments/${encodeURIComponent(input.environment.environmentId)}/status failed`,
-          ),
-        ),
-      );
-    yield* ensureStatusMatchesEnvironment({ environment: input.environment, status });
-    return status;
-  });
-}
-
-export function loadCloudEnvironmentStatuses(input: {
-  readonly clerkToken: string;
-  readonly environments: ReadonlyArray<RelayClientEnvironmentRecord>;
-}): Effect.Effect<
-  ReadonlyArray<CloudEnvironmentRecordWithStatus>,
-  CloudEnvironmentLinkError,
-  ManagedRelay.ManagedRelayClient
-> {
-  return Effect.forEach(
-    input.environments,
-    (environment) =>
-      getCloudEnvironmentStatus({
-        clerkToken: input.clerkToken,
-        environment,
-        relayScopes: RELAY_STATUS_AND_CONNECT_SCOPES,
-      }).pipe(
-        Effect.match({
-          onFailure: (error) => ({
-            environment,
-            status: null,
-            statusError: error.message,
-          }),
-          onSuccess: (status) => ({
-            environment,
-            status,
-            statusError: null,
-          }),
-        }),
-      ),
-    { concurrency: "unbounded" },
-  );
-}
-
-export function listCloudEnvironmentsWithStatus(input: {
-  readonly clerkToken: string;
-}): Effect.Effect<
-  ReadonlyArray<CloudEnvironmentRecordWithStatus>,
-  CloudEnvironmentLinkError,
-  ManagedRelay.ManagedRelayClient
-> {
-  return Effect.gen(function* () {
-    const environments = yield* listCloudEnvironments(input);
-    return yield* loadCloudEnvironmentStatuses({
-      clerkToken: input.clerkToken,
-      environments,
-    });
-  });
-}
-
-const loadAgentAwarenessDeviceId = Effect.fn("mobile.cloud.loadAgentAwarenessDeviceId")(
-  function* () {
-    const storage = yield* MobileStorage.MobileStorage;
-    return yield* storage.loadOrCreateAgentAwarenessDeviceId.pipe(
-      Effect.mapError(cloudEnvironmentLinkError("Could not load the mobile device id.")),
-    );
-  },
-);
-
-const connectRelayManagedEnvironment = Effect.fn("mobile.cloud.connectRelayManagedEnvironment")(
-  function* (input: {
-    readonly clerkToken: string;
-    readonly environmentId: RelayClientEnvironmentRecord["environmentId"];
-    readonly expectedEnvironment?: RelayClientEnvironmentRecord;
-  }) {
-    yield* Effect.annotateCurrentSpan({ "environment.id": input.environmentId });
-    const relayUrl = yield* requireRelayUrl();
-    const relayClient = yield* ManagedRelay.ManagedRelayClient;
-
-    const deviceId = yield* loadAgentAwarenessDeviceId();
-    const connect = yield* relayClient
-      .connectEnvironment({
-        clerkToken: input.clerkToken,
-        scopes: [RelayEnvironmentConnectScope],
-        environmentId: input.environmentId,
-        deviceId,
-      })
-      .pipe(
-        Effect.mapError(
-          decodedRelayClientError(
-            `${relayUrl}/v1/environments/${encodeURIComponent(input.environmentId)}/connect failed`,
-          ),
-        ),
-      );
-    if (connect.environmentId !== input.environmentId) {
-      return yield* new CloudEnvironmentLinkError({
-        message: "Relay returned credentials for a different environment.",
-      });
-    }
-    if (input.expectedEnvironment) {
-      yield* ensureConnectEndpointMatchesEnvironment({
-        environment: input.expectedEnvironment,
-        connect,
-      });
-    }
-
-    const descriptor = yield* fetchRemoteEnvironmentDescriptor({
-      httpBaseUrl: connect.endpoint.httpBaseUrl,
-    }).pipe(
-      Effect.mapError(
-        cloudEnvironmentLinkError("Could not fetch the connected environment descriptor."),
-      ),
-    );
-    if (descriptor.environmentId !== connect.environmentId) {
-      return yield* new CloudEnvironmentLinkError({
-        message: "Connected endpoint descriptor does not match the selected environment.",
-      });
-    }
-    const signer = yield* ManagedRelay.ManagedRelayDpopSigner;
-    const bootstrapDpop = yield* signer
-      .createProof({
-        method: "POST",
-        url: new URL("/oauth/token", connect.endpoint.httpBaseUrl).toString(),
-      })
-      .pipe(Effect.mapError(cloudEnvironmentLinkError("Could not create bootstrap DPoP proof.")));
-    const bootstrap = yield* exchangeRemoteDpopAccessToken({
-      httpBaseUrl: connect.endpoint.httpBaseUrl,
-      credential: connect.credential,
-      dpopProof: bootstrapDpop,
-      clientMetadata: authClientMetadata(),
-    }).pipe(
-      Effect.mapError(
-        cloudEnvironmentLinkError("Could not exchange a managed endpoint DPoP access token.", {
-          dpop: true,
-        }),
-      ),
-    );
-    const pairingUrl = new URL(connect.endpoint.httpBaseUrl);
-    pairingUrl.hash = new URLSearchParams([["token", connect.credential]]).toString();
-
-    return {
-      environmentId: descriptor.environmentId,
-      environmentLabel: descriptor.label,
-      pairingUrl: stripPairingTokenFromUrl(pairingUrl).toString(),
-      displayUrl: connect.endpoint.httpBaseUrl,
-      httpBaseUrl: connect.endpoint.httpBaseUrl,
-      wsBaseUrl: connect.endpoint.wsBaseUrl,
-      bearerToken: null,
-      authenticationMethod: "dpop",
-      dpopAccessToken: bootstrap.access_token,
-      relayManaged: true,
-    } satisfies SavedRemoteConnection;
-  },
-);
-
-export function connectCloudEnvironment(input: {
-  readonly clerkToken: string;
-  readonly environment: RelayClientEnvironmentRecord;
-}): Effect.Effect<
-  SavedRemoteConnection,
-  CloudEnvironmentLinkError,
-  | HttpClient.HttpClient
-  | ManagedRelay.ManagedRelayClient
-  | ManagedRelay.ManagedRelayDpopSigner
-  | MobileStorage.MobileStorage
-> {
-  return connectRelayManagedEnvironment({
-    clerkToken: input.clerkToken,
-    environmentId: input.environment.environmentId,
-    expectedEnvironment: input.environment,
-  });
-}
-
-export function refreshCloudEnvironmentConnection(input: {
-  readonly clerkToken: string;
-  readonly connection: SavedRemoteConnection;
-}): Effect.Effect<
-  SavedRemoteConnection,
-  CloudEnvironmentLinkError,
-  | HttpClient.HttpClient
-  | ManagedRelay.ManagedRelayClient
-  | ManagedRelay.ManagedRelayDpopSigner
-  | MobileStorage.MobileStorage
-> {
-  return connectRelayManagedEnvironment({
-    clerkToken: input.clerkToken,
-    environmentId: input.connection.environmentId,
-  });
-}
diff --git a/apps/mobile/src/features/review/reviewPerf.ts b/apps/mobile/src/features/review/reviewPerf.ts
index 2ae1095b1c6a..2613ff0c3dbb 100644
--- a/apps/mobile/src/features/review/reviewPerf.ts
+++ b/apps/mobile/src/features/review/reviewPerf.ts
@@ -42,33 +42,6 @@ export function measureReviewWork<T>(name: string, callback: () => T): T {
   }
 }
 
-export async function measureReviewAsyncWork<T>(
-  name: string,
-  callback: () => Promise<T>,
-): Promise<T> {
-  if (!isReviewPerfEnabled()) {
-    return callback();
-  }
-
-  const perf = getPerformance();
-  const marker = `${REVIEW_PERF_PREFIX}.${name}.${reviewPerfSequence++}`;
-  const startMark = `${marker}.start`;
-  const endMark = `${marker}.end`;
-  const startedAt = perf?.now?.() ?? Date.now();
-
-  perf?.mark?.(startMark);
-  try {
-    return await callback();
-  } finally {
-    const durationMs = (perf?.now?.() ?? Date.now()) - startedAt;
-    perf?.mark?.(endMark);
-    perf?.measure?.(`${REVIEW_PERF_PREFIX}.${name}`, startMark, endMark);
-    perf?.clearMarks?.(startMark);
-    perf?.clearMarks?.(endMark);
-    console.log(`[review-perf] ${name}`, { durationMs: Number(durationMs.toFixed(2)) });
-  }
-}
-
 export function markReviewEvent(name: string, details?: Record<string, unknown>): void {
   if (!isReviewPerfEnabled()) {
     return;
diff --git a/apps/mobile/src/features/review/shikiReviewHighlighter.ts b/apps/mobile/src/features/review/shikiReviewHighlighter.ts
index 52e0b83be34d..3050f1f67ee8 100644
--- a/apps/mobile/src/features/review/shikiReviewHighlighter.ts
+++ b/apps/mobile/src/features/review/shikiReviewHighlighter.ts
@@ -15,14 +15,12 @@ import * as Schema from "effect/Schema";
 import {
   resolveReviewHighlighterEngine,
   resolveReviewHighlighterEnginePreference,
-  type ReviewHighlighterEngine,
 } from "./reviewHighlighterEngine";
 import { createIncrementalSnippet } from "./incrementalSnippet";
 import type { ReviewRenderableLineRow } from "./reviewModel";
 import { applyDiffRangesToTokens, computeWordAltDiffRanges } from "./reviewWordDiffs";
 
 export type ReviewDiffTheme = "light" | "dark";
-export type { ReviewHighlighterEngine };
 
 export class ReviewHighlighterEngineInitializationError extends Schema.TaggedError<ReviewHighlighterEngineInitializationError>()(
   "ReviewHighlighterEngineInitializationError",
@@ -181,7 +179,6 @@ const languageAliases: Record<string, string> = {
   txt: "text",
 };
 let highlighterPromise: Promise<HighlighterCore> | null = null;
-let activeHighlighterEnginePromise: Promise<ReviewHighlighterEngine> | null = null;
 
 type LoadedLanguageModule = {
   default: Parameters<HighlighterCore["loadLanguage"]>[0];
@@ -254,10 +251,7 @@ async function getHighlighter(): Promise<HighlighterCore> {
               engine: nativeEngineModule.createNativeEngine(),
             });
             logReviewHighlighterDiagnostic("using native engine");
-            return {
-              highlighter,
-              engine: "native" as const,
-            };
+            return highlighter;
           }
         } catch (error) {
           nativeInitializationError = new ReviewHighlighterEngineInitializationError({
@@ -308,55 +302,18 @@ async function getHighlighter(): Promise<HighlighterCore> {
       logReviewHighlighterDiagnostic("using javascript engine", {
         resolvedEngine: engine,
       });
-      return {
-        highlighter,
-        engine,
-      };
+      return highlighter;
     })();
 
-    highlighterPromise = configuredHighlighterPromise
-      .then((result) => result.highlighter)
-      .catch((error) => {
-        highlighterPromise = null;
-        activeHighlighterEnginePromise = null;
-        throw error;
-      });
-    activeHighlighterEnginePromise = configuredHighlighterPromise
-      .then((result) => result.engine)
-      .catch((error) => {
-        activeHighlighterEnginePromise = null;
-        throw error;
-      });
+    highlighterPromise = configuredHighlighterPromise.catch((error) => {
+      highlighterPromise = null;
+      throw error;
+    });
   }
 
   return highlighterPromise;
 }
 
-export async function getActiveReviewHighlighterEngine(): Promise<ReviewHighlighterEngine> {
-  await getHighlighter();
-  return activeHighlighterEnginePromise ?? Promise.resolve("javascript");
-}
-
-export async function prepareReviewHighlighter(): Promise<void> {
-  await getHighlighter();
-}
-
-export async function prepareReviewHighlighterLanguages(
-  languages: ReadonlyArray<string>,
-): Promise<void> {
-  const highlighter = await getHighlighter();
-  await Promise.all(
-    languages.map(async (language) => {
-      const candidate = resolveLanguageAlias(language);
-      if (candidate === "text" || !(candidate in languageImports)) {
-        return;
-      }
-
-      await loadSingleLanguage(highlighter, candidate);
-    }),
-  );
-}
-
 function resolveLanguageAlias(language: string): string {
   const normalized = language.toLowerCase();
   return languageAliases[normalized] ?? normalized;
diff --git a/apps/server/integration/OrchestrationEngineHarness.integration.ts b/apps/server/integration/OrchestrationEngineHarness.integration.ts
index ace2b0fc43bf..0df54be2f701 100644
--- a/apps/server/integration/OrchestrationEngineHarness.integration.ts
+++ b/apps/server/integration/OrchestrationEngineHarness.integration.ts
@@ -28,11 +28,9 @@ import * as CheckpointStore from "../src/checkpointing/CheckpointStore.ts";
 import { TextGeneration } from "../src/textGeneration/TextGeneration.ts";
 import { OrchestrationCommandReceiptRepositoryLive } from "../src/persistence/Layers/OrchestrationCommandReceipts.ts";
 import { OrchestrationEventStoreLive } from "../src/persistence/Layers/OrchestrationEventStore.ts";
-import { ProjectionCheckpointRepositoryLive } from "../src/persistence/Layers/ProjectionCheckpoints.ts";
 import { ProjectionPendingApprovalRepositoryLive } from "../src/persistence/Layers/ProjectionPendingApprovals.ts";
 import * as ProviderSessionRuntime from "../src/persistence/ProviderSessionRuntime.ts";
 import { makeSqlitePersistenceLive } from "../src/persistence/Layers/Sqlite.ts";
-import { ProjectionCheckpointRepository } from "../src/persistence/Services/ProjectionCheckpoints.ts";
 import { ProjectionPendingApprovalRepository } from "../src/persistence/Services/ProjectionPendingApprovals.ts";
 import { makeAdapterRegistryMock } from "../src/provider/testUtils/providerAdapterRegistryMock.ts";
 import { ProviderAdapterRegistry } from "../src/provider/Services/ProviderAdapterRegistry.ts";
@@ -189,7 +187,6 @@ export interface OrchestrationIntegrationHarness {
   readonly snapshotQuery: ProjectionSnapshotQuery["Service"];
   readonly providerService: ProviderService["Service"];
   readonly checkpointStore: CheckpointStore.CheckpointStore["Service"];
-  readonly checkpointRepository: ProjectionCheckpointRepository["Service"];
   readonly pendingApprovalRepository: ProjectionPendingApprovalRepository["Service"];
   readonly waitForThread: (
     threadId: string,
@@ -313,7 +310,6 @@ export const makeOrchestrationIntegrationHarness = (
     const runtimeServicesLayer = Layer.mergeAll(
       projectionSnapshotQueryLayer,
       orchestrationLayer.pipe(Layer.provide(projectionSnapshotQueryLayer)),
-      ProjectionCheckpointRepositoryLive,
       ProjectionPendingApprovalRepositoryLive,
       checkpointStoreLayer,
       providerLayer,
@@ -463,10 +459,6 @@ export const makeOrchestrationIntegrationHarness = (
     const checkpointStore = yield* tryRuntimePromise("load CheckpointStore service", () =>
       runtime.runPromise(Effect.service(CheckpointStore.CheckpointStore)),
     ).pipe(Effect.orDie);
-    const checkpointRepository = yield* tryRuntimePromise(
-      "load ProjectionCheckpointRepository service",
-      () => runtime.runPromise(Effect.service(ProjectionCheckpointRepository)),
-    ).pipe(Effect.orDie);
     const pendingApprovalRepository = yield* tryRuntimePromise(
       "load ProjectionPendingApprovalRepository service",
       () => runtime.runPromise(Effect.service(ProjectionPendingApprovalRepository)),
@@ -612,7 +604,6 @@ export const makeOrchestrationIntegrationHarness = (
       snapshotQuery,
       providerService,
       checkpointStore,
-      checkpointRepository,
       pendingApprovalRepository,
       waitForThread,
       waitForDomainEvent,
diff --git a/apps/server/integration/orchestrationEngine.integration.test.ts b/apps/server/integration/orchestrationEngine.integration.test.ts
index abe00f16bb81..68b566e2ee4a 100644
--- a/apps/server/integration/orchestrationEngine.integration.test.ts
+++ b/apps/server/integration/orchestrationEngine.integration.test.ts
@@ -20,7 +20,6 @@ import {
 import { assert, it } from "@effect/vitest";
 import * as Clock from "effect/Clock";
 import * as Effect from "effect/Effect";
-import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 
 import type { TestTurnResponse } from "./TestProviderAdapter.integration.ts";
@@ -247,14 +246,7 @@ it.live("runs a single turn end-to-end and persists checkpoint state in sqlite +
       );
       assert.equal(thread.checkpoints[0]?.status, "ready");
       assert.equal(thread.checkpoints[0]?.checkpointTurnCount, 1);
-
-      const checkpointRows = yield* harness.checkpointRepository.listByThreadId({
-        threadId: THREAD_ID,
-      });
-      assert.equal(checkpointRows.length, 1);
-      assert.equal(checkpointRows[0]?.checkpointTurnCount, 1);
-      assert.equal(checkpointRows[0]?.status, "ready");
-      assert.deepEqual(checkpointRows[0]?.files, []);
+      assert.deepEqual(thread.checkpoints[0]?.files, []);
 
       const ref0 = checkpointRefForThreadTurn(THREAD_ID, 0);
       const ref1 = checkpointRefForThreadTurn(THREAD_ID, 1);
@@ -498,11 +490,8 @@ it.live("runs multi-turn file edits and persists checkpoint diffs", () =>
         true,
       );
 
-      const checkpointRows = yield* harness.checkpointRepository.listByThreadId({
-        threadId: THREAD_ID,
-      });
       assert.deepEqual(
-        checkpointRows.map((row) => row.checkpointTurnCount),
+        secondTurnThread.checkpoints.map((row) => row.checkpointTurnCount),
         [1, 2],
       );
 
@@ -688,14 +677,7 @@ it.live("records failed turn runtime state and checkpoint status as error", () =
       assert.equal(thread.session?.status, "error");
       assert.equal(thread.checkpoints[0]?.status, "error");
 
-      const checkpointRow = yield* harness.checkpointRepository.getByThreadAndTurnCount({
-        threadId: THREAD_ID,
-        checkpointTurnCount: 1,
-      });
-      assert.equal(Option.isSome(checkpointRow), true);
-      if (Option.isSome(checkpointRow)) {
-        assert.equal(checkpointRow.value.status, "error");
-      }
+      assert.equal(thread.checkpoints[0]?.checkpointTurnCount, 1);
       assert.equal(
         gitRefExists(harness.workspaceDir, checkpointRefForThreadTurn(THREAD_ID, 1)),
         true,
@@ -878,11 +860,6 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git
         false,
       );
       assert.deepEqual(harness.adapterHarness!.getRollbackCalls(THREAD_ID), [1]);
-
-      const checkpointRows = yield* harness.checkpointRepository.listByThreadId({
-        threadId: THREAD_ID,
-      });
-      assert.equal(checkpointRows.length, 1);
     }),
   ),
 );
diff --git a/apps/server/src/orchestration/Errors.ts b/apps/server/src/orchestration/Errors.ts
index dccb8b4be0f7..5e6376072ce1 100644
--- a/apps/server/src/orchestration/Errors.ts
+++ b/apps/server/src/orchestration/Errors.ts
@@ -4,30 +4,6 @@ import * as Schema from "effect/Schema";
 
 import type { ProjectionRepositoryError } from "../persistence/Errors.ts";
 
-export class OrchestrationCommandJsonParseError extends Schema.TaggedError<OrchestrationCommandJsonParseError>()(
-  "OrchestrationCommandJsonParseError",
-  {
-    detail: Schema.String,
-    cause: Schema.optional(Schema.Defect()),
-  },
-) {
-  override get message(): string {
-    return `Invalid orchestration command JSON: ${this.detail}`;
-  }
-}
-
-export class OrchestrationCommandDecodeError extends Schema.TaggedError<OrchestrationCommandDecodeError>()(
-  "OrchestrationCommandDecodeError",
-  {
-    issue: Schema.String,
-    cause: Schema.optional(Schema.Defect()),
-  },
-) {
-  override get message(): string {
-    return `Invalid orchestration command payload: ${this.issue}`;
-  }
-}
-
 export class OrchestrationCommandInvariantError extends Schema.TaggedError<OrchestrationCommandInvariantError>()(
   "OrchestrationCommandInvariantError",
   {
@@ -100,31 +76,12 @@ export class OrchestrationProjectorDecodeError extends Schema.TaggedError<Orches
   }
 }
 
-export class OrchestrationListenerCallbackError extends Schema.TaggedError<OrchestrationListenerCallbackError>()(
-  "OrchestrationListenerCallbackError",
-  {
-    listener: Schema.Literals(["read-model", "domain-event"]),
-    detail: Schema.String,
-    cause: Schema.optional(Schema.Defect()),
-  },
-) {
-  override get message(): string {
-    return `Orchestration ${this.listener} listener failed: ${this.detail}`;
-  }
-}
-
 export type OrchestrationDispatchError =
   | ProjectionRepositoryError
   | OrchestrationCommandRejection
   | OrchestrationCommandIdConflictError
   | OrchestrationCommandPreviouslyRejectedError
-  | OrchestrationProjectorDecodeError
-  | OrchestrationListenerCallbackError;
-
-export type OrchestrationEngineError =
-  | OrchestrationDispatchError
-  | OrchestrationCommandJsonParseError
-  | OrchestrationCommandDecodeError;
+  | OrchestrationProjectorDecodeError;
 
 export function toProjectorDecodeError(eventType: string) {
   return (error: Schema.SchemaError): OrchestrationProjectorDecodeError =>
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
index 03bf17329286..1e7058742e25 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
@@ -8,6 +8,7 @@ import {
   MessageId,
   NonNegativeInt,
   OrchestrationCheckpointFile,
+  OrchestrationCheckpointStatus,
   OrchestrationProposedPlanId,
   OrchestrationReadModel,
   OrchestrationThreadSearchSource,
@@ -52,7 +53,6 @@ import {
   toPersistenceSqlError,
   type ProjectionRepositoryError,
 } from "../../persistence/Errors.ts";
-import { ProjectionCheckpoint } from "../../persistence/Services/ProjectionCheckpoints.ts";
 import { ThreadBackgroundLivenessService } from "../ThreadBackgroundLiveness.ts";
 import { ThreadPlanProgressService } from "../ThreadPlanProgress.ts";
 import { ProjectionProject } from "../../persistence/Services/ProjectionProjects.ts";
@@ -151,11 +151,16 @@ const ProjectionThreadRuntimeContextDbRowSchema = Schema.Struct({
   title: Schema.String,
   session: Schema.NullOr(ProjectionThreadSessionDbRowSchema),
 });
-const ProjectionCheckpointDbRowSchema = ProjectionCheckpoint.mapFields(
-  Struct.assign({
-    files: Schema.fromJsonString(Schema.Array(OrchestrationCheckpointFile)),
-  }),
-);
+const ProjectionCheckpointDbRowSchema = Schema.Struct({
+  threadId: ThreadId,
+  turnId: TurnId,
+  checkpointTurnCount: NonNegativeInt,
+  checkpointRef: CheckpointRef,
+  status: OrchestrationCheckpointStatus,
+  files: Schema.fromJsonString(Schema.Array(OrchestrationCheckpointFile)),
+  assistantMessageId: Schema.NullOr(MessageId),
+  completedAt: IsoDateTime,
+});
 const ProjectionLatestTurnDbRowSchema = Schema.Struct({
   threadId: ProjectionThread.fields.threadId,
   turnId: TurnId,
diff --git a/apps/server/src/persistence/Errors.test.ts b/apps/server/src/persistence/Errors.test.ts
index dfa35020df33..5b9d37b3a655 100644
--- a/apps/server/src/persistence/Errors.test.ts
+++ b/apps/server/src/persistence/Errors.test.ts
@@ -42,7 +42,7 @@ it.effect("names a real SQLite condition without copying query data", () =>
     assert.equal(error.cause, cause);
     assert.notInclude(error.message, payload);
     assert.notInclude(error.message, "private_column");
-  }).pipe(Effect.provide(NodeSqliteClient.layerMemory())),
+  }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: ":memory:" }))),
 );
 
 it("reads the condition through a wrapping driver error", () => {
diff --git a/apps/server/src/persistence/Errors.ts b/apps/server/src/persistence/Errors.ts
index 4625b368d8f2..1e3c9027879d 100644
--- a/apps/server/src/persistence/Errors.ts
+++ b/apps/server/src/persistence/Errors.ts
@@ -124,42 +124,8 @@ export function toPersistenceDecodeError(operation: string) {
 export const isPersistenceError = (u: unknown) =>
   isPersistenceSqlError(u) || isPersistenceDecodeError(u);
 
-// ===============================
-// Provider Session Repository Errors
-// ===============================
-
-export class ProviderSessionRepositoryValidationError extends Schema.TaggedError<ProviderSessionRepositoryValidationError>()(
-  "ProviderSessionRepositoryValidationError",
-  {
-    operation: Schema.String,
-    issue: Schema.String,
-    cause: Schema.optional(Schema.Defect()),
-  },
-) {
-  override get message(): string {
-    return `Provider session repository validation failed in ${this.operation}: ${this.issue}`;
-  }
-}
-
-export class ProviderSessionRepositoryPersistenceError extends Schema.TaggedError<ProviderSessionRepositoryPersistenceError>()(
-  "ProviderSessionRepositoryPersistenceError",
-  {
-    operation: Schema.String,
-    detail: Schema.String,
-    cause: Schema.optional(Schema.Defect()),
-  },
-) {
-  override get message(): string {
-    return `Provider session repository persistence error in ${this.operation}: ${this.detail}`;
-  }
-}
-
 export type OrchestrationEventStoreError = PersistenceSqlError | PersistenceDecodeError;
 
-export type ProviderSessionRepositoryError =
-  | ProviderSessionRepositoryValidationError
-  | ProviderSessionRepositoryPersistenceError;
-
 export type OrchestrationCommandReceiptRepositoryError =
   | PersistenceSqlError
   | PersistenceDecodeError;
diff --git a/apps/server/src/persistence/Layers/ProjectionCheckpoints.ts b/apps/server/src/persistence/Layers/ProjectionCheckpoints.ts
deleted file mode 100644
index cfa5658d0e9c..000000000000
--- a/apps/server/src/persistence/Layers/ProjectionCheckpoints.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import { OrchestrationCheckpointFile } from "@t3tools/contracts";
-import * as SqlClient from "effect/unstable/sql/SqlClient";
-import * as SqlSchema from "effect/unstable/sql/SqlSchema";
-import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
-import * as Schema from "effect/Schema";
-import * as Struct from "effect/Struct";
-
-import { toPersistenceDecodeError, toPersistenceSqlError } from "../Errors.ts";
-import {
-  DeleteByThreadIdInput,
-  GetByThreadAndTurnCountInput,
-  ListByThreadIdInput,
-  ProjectionCheckpoint,
-  ProjectionCheckpointRepository,
-  type ProjectionCheckpointRepositoryShape,
-} from "../Services/ProjectionCheckpoints.ts";
-
-const ProjectionCheckpointDbRowSchema = ProjectionCheckpoint.mapFields(
-  Struct.assign({
-    files: Schema.fromJsonString(Schema.Array(OrchestrationCheckpointFile)),
-  }),
-);
-
-function toPersistenceSqlOrDecodeError(sqlOperation: string, decodeOperation: string) {
-  return (cause: unknown) =>
-    Schema.isSchemaError(cause)
-      ? toPersistenceDecodeError(decodeOperation)(cause)
-      : toPersistenceSqlError(sqlOperation)(cause);
-}
-
-const makeProjectionCheckpointRepository = Effect.gen(function* () {
-  const sql = yield* SqlClient.SqlClient;
-
-  const clearCheckpointConflict = SqlSchema.void({
-    Request: GetByThreadAndTurnCountInput,
-    execute: ({ threadId, checkpointTurnCount }) =>
-      sql`
-        UPDATE projection_turns
-        SET
-          checkpoint_turn_count = NULL,
-          checkpoint_ref = NULL,
-          checkpoint_status = NULL,
-          checkpoint_files_json = '[]'
-        WHERE thread_id = ${threadId}
-          AND checkpoint_turn_count = ${checkpointTurnCount}
-      `,
-  });
-
-  const upsertProjectionCheckpointRow = SqlSchema.void({
-    Request: ProjectionCheckpointDbRowSchema,
-    execute: (row) =>
-      sql`
-        INSERT INTO projection_turns (
-          thread_id,
-          turn_id,
-          pending_message_id,
-          assistant_message_id,
-          state,
-          requested_at,
-          started_at,
-          completed_at,
-          checkpoint_turn_count,
-          checkpoint_ref,
-          checkpoint_status,
-          checkpoint_files_json
-        )
-        VALUES (
-          ${row.threadId},
-          ${row.turnId},
-          NULL,
-          ${row.assistantMessageId},
-          ${row.status === "error" ? "error" : "completed"},
-          ${row.completedAt},
-          ${row.completedAt},
-          ${row.completedAt},
-          ${row.checkpointTurnCount},
-          ${row.checkpointRef},
-          ${row.status},
-          ${row.files}
-        )
-        ON CONFLICT (thread_id, turn_id)
-        DO UPDATE SET
-          assistant_message_id = excluded.assistant_message_id,
-          state = excluded.state,
-          completed_at = excluded.completed_at,
-          checkpoint_turn_count = excluded.checkpoint_turn_count,
-          checkpoint_ref = excluded.checkpoint_ref,
-          checkpoint_status = excluded.checkpoint_status,
-          checkpoint_files_json = excluded.checkpoint_files_json
-      `,
-  });
-
-  const listProjectionCheckpointRows = SqlSchema.findAll({
-    Request: ListByThreadIdInput,
-    Result: ProjectionCheckpointDbRowSchema,
-    execute: ({ threadId }) =>
-      sql`
-        SELECT
-          thread_id AS "threadId",
-          turn_id AS "turnId",
-          checkpoint_turn_count AS "checkpointTurnCount",
-          checkpoint_ref AS "checkpointRef",
-          checkpoint_status AS "status",
-          checkpoint_files_json AS "files",
-          assistant_message_id AS "assistantMessageId",
-          completed_at AS "completedAt"
-        FROM projection_turns
-        WHERE thread_id = ${threadId}
-          AND checkpoint_turn_count IS NOT NULL
-        ORDER BY checkpoint_turn_count ASC
-      `,
-  });
-
-  const getProjectionCheckpointRow = SqlSchema.findOneOption({
-    Request: GetByThreadAndTurnCountInput,
-    Result: ProjectionCheckpointDbRowSchema,
-    execute: ({ threadId, checkpointTurnCount }) =>
-      sql`
-        SELECT
-          thread_id AS "threadId",
-          turn_id AS "turnId",
-          checkpoint_turn_count AS "checkpointTurnCount",
-          checkpoint_ref AS "checkpointRef",
-          checkpoint_status AS "status",
-          checkpoint_files_json AS "files",
-          assistant_message_id AS "assistantMessageId",
-          completed_at AS "completedAt"
-        FROM projection_turns
-        WHERE thread_id = ${threadId}
-          AND checkpoint_turn_count = ${checkpointTurnCount}
-      `,
-  });
-
-  const deleteProjectionCheckpointRows = SqlSchema.void({
-    Request: DeleteByThreadIdInput,
-    execute: ({ threadId }) =>
-      sql`
-        UPDATE projection_turns
-        SET
-          checkpoint_turn_count = NULL,
-          checkpoint_ref = NULL,
-          checkpoint_status = NULL,
-          checkpoint_files_json = '[]'
-        WHERE thread_id = ${threadId}
-          AND checkpoint_turn_count IS NOT NULL
-      `,
-  });
-
-  const upsertCheckpointRow = (row: Schema.Schema.Type<typeof ProjectionCheckpointDbRowSchema>) =>
-    sql.withTransaction(
-      clearCheckpointConflict({
-        threadId: row.threadId,
-        checkpointTurnCount: row.checkpointTurnCount,
-      }).pipe(Effect.flatMap(() => upsertProjectionCheckpointRow(row))),
-    );
-
-  const upsert: ProjectionCheckpointRepositoryShape["upsert"] = (row) =>
-    upsertCheckpointRow(row).pipe(
-      Effect.mapError(
-        toPersistenceSqlOrDecodeError(
-          "ProjectionCheckpointRepository.upsert:query",
-          "ProjectionCheckpointRepository.upsert:encodeRequest",
-        ),
-      ),
-    );
-
-  const listByThreadId: ProjectionCheckpointRepositoryShape["listByThreadId"] = (input) =>
-    listProjectionCheckpointRows(input).pipe(
-      Effect.mapError(
-        toPersistenceSqlOrDecodeError(
-          "ProjectionCheckpointRepository.listByThreadId:query",
-          "ProjectionCheckpointRepository.listByThreadId:decodeRows",
-        ),
-      ),
-      Effect.map((rows) => rows as ReadonlyArray<Schema.Schema.Type<typeof ProjectionCheckpoint>>),
-    );
-
-  const getByThreadAndTurnCount: ProjectionCheckpointRepositoryShape["getByThreadAndTurnCount"] = (
-    input,
-  ) =>
-    getProjectionCheckpointRow(input).pipe(
-      Effect.mapError(
-        toPersistenceSqlOrDecodeError(
-          "ProjectionCheckpointRepository.getByThreadAndTurnCount:query",
-          "ProjectionCheckpointRepository.getByThreadAndTurnCount:decodeRow",
-        ),
-      ),
-      Effect.flatMap((rowOption) =>
-        Option.match(rowOption, {
-          onNone: () => Effect.succeed(Option.none()),
-          onSome: (row) =>
-            Effect.succeed(Option.some(row as Schema.Schema.Type<typeof ProjectionCheckpoint>)),
-        }),
-      ),
-    );
-
-  const deleteByThreadId: ProjectionCheckpointRepositoryShape["deleteByThreadId"] = (input) =>
-    deleteProjectionCheckpointRows(input).pipe(
-      Effect.mapError(
-        toPersistenceSqlError("ProjectionCheckpointRepository.deleteByThreadId:query"),
-      ),
-    );
-
-  return {
-    upsert,
-    listByThreadId,
-    getByThreadAndTurnCount,
-    deleteByThreadId,
-  } satisfies ProjectionCheckpointRepositoryShape;
-});
-
-export const ProjectionCheckpointRepositoryLive = Layer.effect(
-  ProjectionCheckpointRepository,
-  makeProjectionCheckpointRepository,
-);
diff --git a/apps/server/src/persistence/Layers/ProjectionPendingApprovals.ts b/apps/server/src/persistence/Layers/ProjectionPendingApprovals.ts
index d5631cb0a62c..883198402ee9 100644
--- a/apps/server/src/persistence/Layers/ProjectionPendingApprovals.ts
+++ b/apps/server/src/persistence/Layers/ProjectionPendingApprovals.ts
@@ -7,7 +7,6 @@ import * as Schema from "effect/Schema";
 import { toPersistenceSqlError } from "../Errors.ts";
 import {
   GetProjectionPendingApprovalInput,
-  DeleteProjectionPendingApprovalInput,
   ListProjectionPendingApprovalsInput,
   ProjectionPendingApproval,
   ProjectionPendingApprovalRepository,
@@ -97,15 +96,6 @@ const makeProjectionPendingApprovalRepository = Effect.gen(function* () {
       `,
   });
 
-  const deleteProjectionPendingApprovalRow = SqlSchema.void({
-    Request: DeleteProjectionPendingApprovalInput,
-    execute: ({ requestId }) =>
-      sql`
-        DELETE FROM projection_pending_approvals
-        WHERE request_id = ${requestId}
-      `,
-  });
-
   const deleteProjectionPendingApprovalRowsByThread = SqlSchema.void({
     Request: ListProjectionPendingApprovalsInput,
     execute: ({ threadId }) =>
@@ -143,15 +133,6 @@ const makeProjectionPendingApprovalRepository = Effect.gen(function* () {
       ),
     );
 
-  const deleteByRequestId: ProjectionPendingApprovalRepositoryShape["deleteByRequestId"] = (
-    input,
-  ) =>
-    deleteProjectionPendingApprovalRow(input).pipe(
-      Effect.mapError(
-        toPersistenceSqlError("ProjectionPendingApprovalRepository.deleteByRequestId:query"),
-      ),
-    );
-
   const deleteByThreadId: ProjectionPendingApprovalRepositoryShape["deleteByThreadId"] = (input) =>
     deleteProjectionPendingApprovalRowsByThread(input).pipe(
       Effect.mapError(
@@ -164,7 +145,6 @@ const makeProjectionPendingApprovalRepository = Effect.gen(function* () {
     listByThreadId,
     countPendingByThreadId,
     getByRequestId,
-    deleteByRequestId,
     deleteByThreadId,
   } satisfies ProjectionPendingApprovalRepositoryShape;
 });
diff --git a/apps/server/src/persistence/Layers/ProjectionProjects.ts b/apps/server/src/persistence/Layers/ProjectionProjects.ts
index f34f81294124..c4f07dc4912b 100644
--- a/apps/server/src/persistence/Layers/ProjectionProjects.ts
+++ b/apps/server/src/persistence/Layers/ProjectionProjects.ts
@@ -9,7 +9,6 @@ import * as Struct from "effect/Struct";
 import { ModelSelection, ProjectIconOverride, ProjectScript } from "@t3tools/contracts";
 import { toPersistenceSqlError } from "../Errors.ts";
 import {
-  DeleteProjectionProjectInput,
   GetProjectionProjectInput,
   ProjectionProject,
   ProjectionProjectRepository,
@@ -24,7 +23,6 @@ const ProjectionProjectDbRow = ProjectionProject.mapFields(
     scripts: Schema.fromJsonString(Schema.Array(ProjectScript)),
   }),
 );
-type ProjectionProjectDbRow = typeof ProjectionProjectDbRow.Type;
 
 const makeProjectionProjectRepository = Effect.gen(function* () {
   const sql = yield* SqlClient.SqlClient;
@@ -100,38 +98,6 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
       `,
   });
 
-  const listProjectionProjectRows = SqlSchema.findAll({
-    Request: Schema.Void,
-    Result: ProjectionProjectDbRow,
-    execute: () =>
-      sql`
-        SELECT
-          project_id AS "projectId",
-          title,
-          workspace_root AS "workspaceRoot",
-          default_model_selection_json AS "defaultModelSelection",
-          default_thread_env_mode AS "defaultThreadEnvMode",
-          auto_pull AS "autoPull",
-          favicon_path AS "faviconPath",
-          project_icon_json AS "projectIcon",
-          scripts_json AS "scripts",
-          created_at AS "createdAt",
-          updated_at AS "updatedAt",
-          deleted_at AS "deletedAt"
-        FROM projection_projects
-        ORDER BY created_at ASC, project_id ASC
-      `,
-  });
-
-  const deleteProjectionProjectRow = SqlSchema.void({
-    Request: DeleteProjectionProjectInput,
-    execute: ({ projectId }) =>
-      sql`
-        DELETE FROM projection_projects
-        WHERE project_id = ${projectId}
-      `,
-  });
-
   const upsert: ProjectionProjectRepositoryShape["upsert"] = (row) =>
     upsertProjectionProjectRow(row).pipe(
       Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.upsert:query")),
@@ -143,22 +109,9 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
       Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.getById:query")),
     );
 
-  const listAll: ProjectionProjectRepositoryShape["listAll"] = () =>
-    listProjectionProjectRows().pipe(
-      Effect.map((rows) => rows.map((row) => ({ ...row, autoPull: row.autoPull === 1 }))),
-      Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.listAll:query")),
-    );
-
-  const deleteById: ProjectionProjectRepositoryShape["deleteById"] = (input) =>
-    deleteProjectionProjectRow(input).pipe(
-      Effect.mapError(toPersistenceSqlError("ProjectionProjectRepository.deleteById:query")),
-    );
-
   return {
     upsert,
     getById,
-    listAll,
-    deleteById,
   } satisfies ProjectionProjectRepositoryShape;
 });
 
diff --git a/apps/server/src/persistence/Layers/ProjectionRepositories.test.ts b/apps/server/src/persistence/Layers/ProjectionRepositories.test.ts
index b7b2fdefba2f..4be65bd5650c 100644
--- a/apps/server/src/persistence/Layers/ProjectionRepositories.test.ts
+++ b/apps/server/src/persistence/Layers/ProjectionRepositories.test.ts
@@ -518,9 +518,6 @@ projectionRepositoriesLayer("Projection repositories", (it) => {
       assert.deepStrictEqual(Option.getOrNull(persisted)?.linkedPullRequest, linkedPullRequest);
       assert.deepStrictEqual(Option.getOrNull(persisted)?.branchPullRequest, branchPullRequest);
 
-      const listed = yield* threads.listByProjectId({ projectId: linkedPullRequest.projectId });
-      assert.deepStrictEqual(listed[0]?.branchPullRequest, branchPullRequest);
-
       const row = Option.getOrNull(persisted);
       if (row === null) return yield* Effect.die("Expected linked thread row to exist.");
       yield* threads.upsert({ ...row, linkedPullRequest: null });
diff --git a/apps/server/src/persistence/Layers/ProjectionState.ts b/apps/server/src/persistence/Layers/ProjectionState.ts
index a6fb7f3be4dd..383ab7d9fee8 100644
--- a/apps/server/src/persistence/Layers/ProjectionState.ts
+++ b/apps/server/src/persistence/Layers/ProjectionState.ts
@@ -1,4 +1,3 @@
-import { NonNegativeInt } from "@t3tools/contracts";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import * as SqlSchema from "effect/unstable/sql/SqlSchema";
 import * as Effect from "effect/Effect";
@@ -14,10 +13,6 @@ import {
   ProjectionState,
 } from "../Services/ProjectionState.ts";
 
-const MinLastAppliedSequenceRowSchema = Schema.Struct({
-  minLastAppliedSequence: Schema.NullOr(NonNegativeInt),
-});
-
 const makeProjectionStateRepository = Effect.gen(function* () {
   const sql = yield* SqlClient.SqlClient;
 
@@ -90,17 +85,6 @@ const makeProjectionStateRepository = Effect.gen(function* () {
       `,
   });
 
-  const readMinLastAppliedSequence = SqlSchema.findOne({
-    Request: Schema.Void,
-    Result: MinLastAppliedSequenceRowSchema,
-    execute: () =>
-      sql`
-        SELECT
-          MIN(last_applied_sequence) AS "minLastAppliedSequence"
-        FROM projection_state
-      `,
-  });
-
   const upsert: ProjectionStateRepositoryShape["upsert"] = (row) =>
     upsertProjectionStateRow(row).pipe(
       Effect.mapError(toPersistenceSqlError("ProjectionStateRepository.upsert:query")),
@@ -121,20 +105,11 @@ const makeProjectionStateRepository = Effect.gen(function* () {
       Effect.mapError(toPersistenceSqlError("ProjectionStateRepository.listAll:query")),
     );
 
-  const minLastAppliedSequence: ProjectionStateRepositoryShape["minLastAppliedSequence"] = () =>
-    readMinLastAppliedSequence(undefined).pipe(
-      Effect.mapError(
-        toPersistenceSqlError("ProjectionStateRepository.minLastAppliedSequence:query"),
-      ),
-      Effect.map((row) => row.minLastAppliedSequence),
-    );
-
   return {
     upsert,
     upsertMany,
     getByProjector,
     listAll,
-    minLastAppliedSequence,
   } satisfies ProjectionStateRepositoryShape;
 });
 
diff --git a/apps/server/src/persistence/Layers/ProjectionThreads.ts b/apps/server/src/persistence/Layers/ProjectionThreads.ts
index 4feaf3a185b9..af36578f286e 100644
--- a/apps/server/src/persistence/Layers/ProjectionThreads.ts
+++ b/apps/server/src/persistence/Layers/ProjectionThreads.ts
@@ -7,9 +7,7 @@ import * as Struct from "effect/Struct";
 
 import { toPersistenceSqlError } from "../Errors.ts";
 import {
-  DeleteProjectionThreadInput,
   GetProjectionThreadInput,
-  ListProjectionThreadsByProjectInput,
   ProjectionThread,
   ProjectionThreadRepository,
   type ProjectionThreadRepositoryShape,
@@ -24,7 +22,6 @@ const ProjectionThreadDbRow = ProjectionThread.mapFields(
     branchPullRequest: Schema.NullOr(Schema.fromJsonString(ThreadLinkedPullRequest)),
   }),
 );
-type ProjectionThreadDbRow = typeof ProjectionThreadDbRow.Type;
 
 const makeProjectionThreadRepository = Effect.gen(function* () {
   const sql = yield* SqlClient.SqlClient;
@@ -172,57 +169,6 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
       `,
   });
 
-  const listProjectionThreadRows = SqlSchema.findAll({
-    Request: ListProjectionThreadsByProjectInput,
-    Result: ProjectionThreadDbRow,
-    execute: ({ projectId }) =>
-      sql`
-        SELECT
-          thread_id AS "threadId",
-          project_id AS "projectId",
-          title,
-          title_state_json AS "titleState",
-          model_selection_json AS "modelSelection",
-          runtime_mode AS "runtimeMode",
-          interaction_mode AS "interactionMode",
-          branch,
-          worktree_path AS "worktreePath",
-          linked_pull_request_json AS "linkedPullRequest",
-          branch_pull_request_json AS "branchPullRequest",
-          latest_turn_id AS "latestTurnId",
-          created_at AS "createdAt",
-          updated_at AS "updatedAt",
-          archived_at AS "archivedAt",
-          settled_override AS "settledOverride",
-          settled_at AS "settledAt",
-          unsettled_at AS "unsettledAt",
-          snoozed_until AS "snoozedUntil",
-          snoozed_at AS "snoozedAt",
-          pinned_at AS "pinnedAt",
-          pin_order_key AS "pinOrderKey",
-          active_order_key AS "activeOrderKey",
-          title_regeneration_request_id AS "titleRegenerationRequestId",
-          title_regeneration_started_at AS "titleRegenerationStartedAt",
-          latest_user_message_at AS "latestUserMessageAt",
-          pending_approval_count AS "pendingApprovalCount",
-          pending_user_input_count AS "pendingUserInputCount",
-          has_actionable_proposed_plan AS "hasActionableProposedPlan",
-          deleted_at AS "deletedAt"
-        FROM projection_threads
-        WHERE project_id = ${projectId}
-        ORDER BY created_at ASC, thread_id ASC
-      `,
-  });
-
-  const deleteProjectionThreadRow = SqlSchema.void({
-    Request: DeleteProjectionThreadInput,
-    execute: ({ threadId }) =>
-      sql`
-        DELETE FROM projection_threads
-        WHERE thread_id = ${threadId}
-      `,
-  });
-
   const upsert: ProjectionThreadRepositoryShape["upsert"] = (row) =>
     upsertProjectionThreadRow(row).pipe(
       Effect.mapError(toPersistenceSqlError("ProjectionThreadRepository.upsert:query")),
@@ -233,21 +179,9 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
       Effect.mapError(toPersistenceSqlError("ProjectionThreadRepository.getById:query")),
     );
 
-  const listByProjectId: ProjectionThreadRepositoryShape["listByProjectId"] = (input) =>
-    listProjectionThreadRows(input).pipe(
-      Effect.mapError(toPersistenceSqlError("ProjectionThreadRepository.listByProjectId:query")),
-    );
-
-  const deleteById: ProjectionThreadRepositoryShape["deleteById"] = (input) =>
-    deleteProjectionThreadRow(input).pipe(
-      Effect.mapError(toPersistenceSqlError("ProjectionThreadRepository.deleteById:query")),
-    );
-
   return {
     upsert,
     getById,
-    listByProjectId,
-    deleteById,
   } satisfies ProjectionThreadRepositoryShape;
 });
 
diff --git a/apps/server/src/persistence/Migrations/016_CanonicalizeModelSelections.test.ts b/apps/server/src/persistence/Migrations/016_CanonicalizeModelSelections.test.ts
index fff5a738622d..ca32b1bddd41 100644
--- a/apps/server/src/persistence/Migrations/016_CanonicalizeModelSelections.test.ts
+++ b/apps/server/src/persistence/Migrations/016_CanonicalizeModelSelections.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("016_CanonicalizeModelSelections", (it) => {
   it.effect(
diff --git a/apps/server/src/persistence/Migrations/019_ProjectionSnapshotLookupIndexes.test.ts b/apps/server/src/persistence/Migrations/019_ProjectionSnapshotLookupIndexes.test.ts
index 040a9fa47b92..248c74b43b34 100644
--- a/apps/server/src/persistence/Migrations/019_ProjectionSnapshotLookupIndexes.test.ts
+++ b/apps/server/src/persistence/Migrations/019_ProjectionSnapshotLookupIndexes.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("019_ProjectionSnapshotLookupIndexes", (it) => {
   it.effect("creates indexes for targeted projection lookup filters", () =>
diff --git a/apps/server/src/persistence/Migrations/024_BackfillProjectionThreadShellSummary.test.ts b/apps/server/src/persistence/Migrations/024_BackfillProjectionThreadShellSummary.test.ts
index 49585fb36f37..73c579a13366 100644
--- a/apps/server/src/persistence/Migrations/024_BackfillProjectionThreadShellSummary.test.ts
+++ b/apps/server/src/persistence/Migrations/024_BackfillProjectionThreadShellSummary.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("024_BackfillProjectionThreadShellSummary", (it) => {
   it.effect("backfills thread shell summary fields and clears stale projected approvals", () =>
diff --git a/apps/server/src/persistence/Migrations/025_CleanupInvalidProjectionPendingApprovals.test.ts b/apps/server/src/persistence/Migrations/025_CleanupInvalidProjectionPendingApprovals.test.ts
index efdf88bf6c3b..7e65f4c04f72 100644
--- a/apps/server/src/persistence/Migrations/025_CleanupInvalidProjectionPendingApprovals.test.ts
+++ b/apps/server/src/persistence/Migrations/025_CleanupInvalidProjectionPendingApprovals.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("025_CleanupInvalidProjectionPendingApprovals", (it) => {
   it.effect("removes pending-approval rows that do not come from approval requests", () =>
diff --git a/apps/server/src/persistence/Migrations/026_CanonicalizeModelSelectionOptions.test.ts b/apps/server/src/persistence/Migrations/026_CanonicalizeModelSelectionOptions.test.ts
index 558183e216cc..5dd053cfe77c 100644
--- a/apps/server/src/persistence/Migrations/026_CanonicalizeModelSelectionOptions.test.ts
+++ b/apps/server/src/persistence/Migrations/026_CanonicalizeModelSelectionOptions.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("026_CanonicalizeModelSelectionOptions", (it) => {
   it.effect("converts legacy object-shape options into array-shape on projections and events", () =>
diff --git a/apps/server/src/persistence/Migrations/027_028_ProviderInstanceIdColumns.test.ts b/apps/server/src/persistence/Migrations/027_028_ProviderInstanceIdColumns.test.ts
index b5e4f5cf3a22..aa99f0c862a2 100644
--- a/apps/server/src/persistence/Migrations/027_028_ProviderInstanceIdColumns.test.ts
+++ b/apps/server/src/persistence/Migrations/027_028_ProviderInstanceIdColumns.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("027_028_ProviderInstanceIdColumns", (it) => {
   it.effect("continues when provider_session_runtime was partially migrated", () =>
diff --git a/apps/server/src/persistence/Migrations/029_ProjectionThreadDetailOrderingIndexes.test.ts b/apps/server/src/persistence/Migrations/029_ProjectionThreadDetailOrderingIndexes.test.ts
index 7078450c96ec..cd246d16ee87 100644
--- a/apps/server/src/persistence/Migrations/029_ProjectionThreadDetailOrderingIndexes.test.ts
+++ b/apps/server/src/persistence/Migrations/029_ProjectionThreadDetailOrderingIndexes.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("029_ProjectionThreadDetailOrderingIndexes", (it) => {
   it.effect("creates indexes matching thread detail ordering queries", () =>
diff --git a/apps/server/src/persistence/Migrations/031_AuthAuthorizationScopes.test.ts b/apps/server/src/persistence/Migrations/031_AuthAuthorizationScopes.test.ts
index 63eba11aac71..60b0079d79f9 100644
--- a/apps/server/src/persistence/Migrations/031_AuthAuthorizationScopes.test.ts
+++ b/apps/server/src/persistence/Migrations/031_AuthAuthorizationScopes.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("031_AuthAuthorizationScopes", (it) => {
   it.effect("invalidates role-based auth records and installs scoped auth tables", () =>
diff --git a/apps/server/src/persistence/Migrations/035_ProjectionThreadTitleRegeneration.test.ts b/apps/server/src/persistence/Migrations/035_ProjectionThreadTitleRegeneration.test.ts
index 0e7f54812c21..cf0ecff3253a 100644
--- a/apps/server/src/persistence/Migrations/035_ProjectionThreadTitleRegeneration.test.ts
+++ b/apps/server/src/persistence/Migrations/035_ProjectionThreadTitleRegeneration.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("035_ProjectionThreadTitleRegeneration", (it) => {
   it.effect("adds pending title regeneration columns", () =>
diff --git a/apps/server/src/persistence/Migrations/040_ProjectionProjectFaviconPath.test.ts b/apps/server/src/persistence/Migrations/040_ProjectionProjectFaviconPath.test.ts
index 427288125007..524831e891ab 100644
--- a/apps/server/src/persistence/Migrations/040_ProjectionProjectFaviconPath.test.ts
+++ b/apps/server/src/persistence/Migrations/040_ProjectionProjectFaviconPath.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("040_ProjectionProjectFaviconPath", (it) => {
   it.effect("adds the nullable favicon path to project projections", () =>
diff --git a/apps/server/src/persistence/Migrations/041_AuthSessionClientConnection.test.ts b/apps/server/src/persistence/Migrations/041_AuthSessionClientConnection.test.ts
index b19f1ce7cf20..4f106de404a0 100644
--- a/apps/server/src/persistence/Migrations/041_AuthSessionClientConnection.test.ts
+++ b/apps/server/src/persistence/Migrations/041_AuthSessionClientConnection.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("041_AuthSessionClientConnection", (it) => {
   it.effect("adds nullable client surface and app version columns to auth sessions", () =>
diff --git a/apps/server/src/persistence/Migrations/042_ProjectionThreadLinkedPullRequest.test.ts b/apps/server/src/persistence/Migrations/042_ProjectionThreadLinkedPullRequest.test.ts
index 02e7f2f6c59f..a4ed1653a962 100644
--- a/apps/server/src/persistence/Migrations/042_ProjectionThreadLinkedPullRequest.test.ts
+++ b/apps/server/src/persistence/Migrations/042_ProjectionThreadLinkedPullRequest.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("042_ProjectionThreadLinkedPullRequest", (it) => {
   it.effect("adds the linked pull request column", () =>
diff --git a/apps/server/src/persistence/Migrations/046_RepairAutomaticSettlementTimestamps.test.ts b/apps/server/src/persistence/Migrations/046_RepairAutomaticSettlementTimestamps.test.ts
index f562fa655a11..de7c6f01f659 100644
--- a/apps/server/src/persistence/Migrations/046_RepairAutomaticSettlementTimestamps.test.ts
+++ b/apps/server/src/persistence/Migrations/046_RepairAutomaticSettlementTimestamps.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 const MODEL_SELECTION = '{"instanceId":"codex","model":"gpt-5.6-sol"}';
 
diff --git a/apps/server/src/persistence/Migrations/047_ProjectionProjectIcon.test.ts b/apps/server/src/persistence/Migrations/047_ProjectionProjectIcon.test.ts
index da3f7cd366d9..c601bb0077fe 100644
--- a/apps/server/src/persistence/Migrations/047_ProjectionProjectIcon.test.ts
+++ b/apps/server/src/persistence/Migrations/047_ProjectionProjectIcon.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("047_ProjectionProjectIcon", (it) => {
   it.effect("adds the nullable project icon JSON to project projections", () =>
diff --git a/apps/server/src/persistence/Migrations/049_ProjectionThreadsActiveOrderKey.test.ts b/apps/server/src/persistence/Migrations/049_ProjectionThreadsActiveOrderKey.test.ts
index 138d25754d7e..938ab25d0f8a 100644
--- a/apps/server/src/persistence/Migrations/049_ProjectionThreadsActiveOrderKey.test.ts
+++ b/apps/server/src/persistence/Migrations/049_ProjectionThreadsActiveOrderKey.test.ts
@@ -6,13 +6,15 @@ import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 import { runMigrations } from "../Migrations.ts";
 import migrateActiveOrderKey from "./049_ProjectionThreadsActiveOrderKey.ts";
 
-it.layer(NodeSqliteClient.layerMemory())("049_ProjectionThreadsActiveOrderKey", (it) => {
-  it.effect("migrates old threads without changing their timestamps or assigning an order", () =>
-    Effect.gen(function* () {
-      const sql = yield* SqlClient.SqlClient;
-      yield* runMigrations({ toMigrationInclusive: 48 });
-      const now = "2026-01-01T00:00:00.000Z";
-      yield* sql`
+it.layer(NodeSqliteClient.layer({ filename: ":memory:" }))(
+  "049_ProjectionThreadsActiveOrderKey",
+  (it) => {
+    it.effect("migrates old threads without changing their timestamps or assigning an order", () =>
+      Effect.gen(function* () {
+        const sql = yield* SqlClient.SqlClient;
+        yield* runMigrations({ toMigrationInclusive: 48 });
+        const now = "2026-01-01T00:00:00.000Z";
+        yield* sql`
         INSERT INTO projection_threads (
           thread_id, project_id, title, model_selection_json, runtime_mode,
           created_at, updated_at
@@ -21,24 +23,25 @@ it.layer(NodeSqliteClient.layerMemory())("049_ProjectionThreadsActiveOrderKey",
           '{"instanceId":"codex","model":"gpt-5.4"}', 'full-access', ${now}, ${now}
         )
       `;
-      yield* runMigrations({ toMigrationInclusive: 49 });
-      const migrated = yield* sql<{ readonly activeOrderKey: string | null }>`
+        yield* runMigrations({ toMigrationInclusive: 49 });
+        const migrated = yield* sql<{ readonly activeOrderKey: string | null }>`
         SELECT active_order_key AS "activeOrderKey" FROM projection_threads WHERE thread_id = 'thread-1'
       `;
-      assert.deepEqual(migrated, [{ activeOrderKey: null }]);
-      // Recovery may run the same migration against a database that already
-      // has the column, including a placement written after the upgrade.
-      yield* sql`UPDATE projection_threads SET active_order_key = 'gm' WHERE thread_id = 'thread-1'`;
-      yield* migrateActiveOrderKey;
-      const rows = yield* sql<{
-        readonly activeOrderKey: string | null;
-        readonly createdAt: string;
-        readonly updatedAt: string;
-      }>`
+        assert.deepEqual(migrated, [{ activeOrderKey: null }]);
+        // Recovery may run the same migration against a database that already
+        // has the column, including a placement written after the upgrade.
+        yield* sql`UPDATE projection_threads SET active_order_key = 'gm' WHERE thread_id = 'thread-1'`;
+        yield* migrateActiveOrderKey;
+        const rows = yield* sql<{
+          readonly activeOrderKey: string | null;
+          readonly createdAt: string;
+          readonly updatedAt: string;
+        }>`
         SELECT active_order_key AS "activeOrderKey", created_at AS "createdAt", updated_at AS "updatedAt"
         FROM projection_threads WHERE thread_id = 'thread-1'
       `;
-      assert.deepEqual(rows, [{ activeOrderKey: "gm", createdAt: now, updatedAt: now }]);
-    }),
-  );
-});
+        assert.deepEqual(rows, [{ activeOrderKey: "gm", createdAt: now, updatedAt: now }]);
+      }),
+    );
+  },
+);
diff --git a/apps/server/src/persistence/Migrations/050_ProjectionThreadPullRequests.test.ts b/apps/server/src/persistence/Migrations/050_ProjectionThreadPullRequests.test.ts
index 61d9f0618e9c..7f3bc58d1cc1 100644
--- a/apps/server/src/persistence/Migrations/050_ProjectionThreadPullRequests.test.ts
+++ b/apps/server/src/persistence/Migrations/050_ProjectionThreadPullRequests.test.ts
@@ -9,7 +9,7 @@ import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
 const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 interface PullRequestRow {
   readonly threadId: string;
@@ -156,26 +156,29 @@ layer("050_ProjectionThreadPullRequests", (it) => {
   );
 });
 
-it.layer(Layer.fresh(NodeSqliteClient.layerMemory()))("050 Azure legacy links", (it) => {
-  it.effect("keeps legacy Azure repositories distinct across organizations", () =>
-    Effect.gen(function* () {
-      const sql = yield* SqlClient.SqlClient;
-      yield* runMigrations({ toMigrationInclusive: 49 });
-      for (const organization of ["org-a", "org-b"]) {
-        yield* sql`
+it.layer(Layer.fresh(NodeSqliteClient.layer({ filename: ":memory:" })))(
+  "050 Azure legacy links",
+  (it) => {
+    it.effect("keeps legacy Azure repositories distinct across organizations", () =>
+      Effect.gen(function* () {
+        const sql = yield* SqlClient.SqlClient;
+        yield* runMigrations({ toMigrationInclusive: 49 });
+        for (const organization of ["org-a", "org-b"]) {
+          yield* sql`
           INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, linked_pull_request_json, created_at, updated_at)
           VALUES (${organization}, ${organization}, 'Azure', '{"instanceId":"codex","model":"gpt-5.4"}',
             ${encodeJson({ projectId: organization, repository: "web", number: 7, url: `https://dev.azure.com/${organization}/project/_git/web/pullrequest/7` })},
             '2026-03-01T00:00:00.000Z', '2026-03-01T00:00:00.000Z')
         `;
-      }
-      yield* runMigrations({ toMigrationInclusive: 50 });
-      const rows =
-        yield* sql`SELECT host, repository, number FROM projection_thread_pull_requests ORDER BY repository`;
-      assert.deepStrictEqual(rows, [
-        { host: "dev.azure.com", repository: "org-a/project/_git/web", number: 7 },
-        { host: "dev.azure.com", repository: "org-b/project/_git/web", number: 7 },
-      ]);
-    }),
-  );
-});
+        }
+        yield* runMigrations({ toMigrationInclusive: 50 });
+        const rows =
+          yield* sql`SELECT host, repository, number FROM projection_thread_pull_requests ORDER BY repository`;
+        assert.deepStrictEqual(rows, [
+          { host: "dev.azure.com", repository: "org-a/project/_git/web", number: 7 },
+          { host: "dev.azure.com", repository: "org-b/project/_git/web", number: 7 },
+        ]);
+      }),
+    );
+  },
+);
diff --git a/apps/server/src/persistence/Migrations/051_ProjectionThreadMessageContext.test.ts b/apps/server/src/persistence/Migrations/051_ProjectionThreadMessageContext.test.ts
index c3cdfa1b9dcd..a0e59217cd30 100644
--- a/apps/server/src/persistence/Migrations/051_ProjectionThreadMessageContext.test.ts
+++ b/apps/server/src/persistence/Migrations/051_ProjectionThreadMessageContext.test.ts
@@ -6,7 +6,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { runMigrations } from "../Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("051_ProjectionThreadMessageContext", (it) => {
   it.effect("accepts context added by an earlier development migration", () =>
diff --git a/apps/server/src/persistence/Services/ProjectionCheckpoints.ts b/apps/server/src/persistence/Services/ProjectionCheckpoints.ts
deleted file mode 100644
index 7796ebec2a88..000000000000
--- a/apps/server/src/persistence/Services/ProjectionCheckpoints.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * ProjectionCheckpointRepository - Projection repository interface for checkpoints.
- *
- * Owns persistence operations for projected checkpoint summaries in thread
- * timelines.
- *
- * @module ProjectionCheckpointRepository
- */
-import {
-  CheckpointRef,
-  IsoDateTime,
-  MessageId,
-  NonNegativeInt,
-  OrchestrationCheckpointFile,
-  OrchestrationCheckpointStatus,
-  ThreadId,
-  TurnId,
-} from "@t3tools/contracts";
-import * as Option from "effect/Option";
-import * as Context from "effect/Context";
-import * as Schema from "effect/Schema";
-import type * as Effect from "effect/Effect";
-
-import type { ProjectionRepositoryError } from "../Errors.ts";
-
-export const ProjectionCheckpoint = Schema.Struct({
-  threadId: ThreadId,
-  turnId: TurnId,
-  checkpointTurnCount: NonNegativeInt,
-  checkpointRef: CheckpointRef,
-  status: OrchestrationCheckpointStatus,
-  files: Schema.Array(OrchestrationCheckpointFile),
-  assistantMessageId: Schema.NullOr(MessageId),
-  completedAt: IsoDateTime,
-});
-export type ProjectionCheckpoint = typeof ProjectionCheckpoint.Type;
-
-export const ListByThreadIdInput = Schema.Struct({
-  threadId: ThreadId,
-});
-export type ListByThreadIdInput = typeof ListByThreadIdInput.Type;
-
-export const GetByThreadAndTurnCountInput = Schema.Struct({
-  threadId: ThreadId,
-  checkpointTurnCount: NonNegativeInt,
-});
-export type GetByThreadAndTurnCountInput = typeof GetByThreadAndTurnCountInput.Type;
-
-export const DeleteByThreadIdInput = Schema.Struct({
-  threadId: ThreadId,
-});
-export type DeleteByThreadIdInput = typeof DeleteByThreadIdInput.Type;
-
-/**
- * ProjectionCheckpointRepositoryShape - Service API for projected checkpoints.
- */
-export interface ProjectionCheckpointRepositoryShape {
-  /**
-   * Insert or replace a projected checkpoint row.
-   *
-   * Upserts by composite key `(threadId, checkpointTurnCount)`.
-   */
-  readonly upsert: (row: ProjectionCheckpoint) => Effect.Effect<void, ProjectionRepositoryError>;
-
-  /**
-   * List projected checkpoints for a thread.
-   *
-   * Returned in ascending checkpoint turn-count order.
-   */
-  readonly listByThreadId: (
-    input: ListByThreadIdInput,
-  ) => Effect.Effect<ReadonlyArray<ProjectionCheckpoint>, ProjectionRepositoryError>;
-
-  /**
-   * Read a projected checkpoint by thread and turn-count key.
-   */
-  readonly getByThreadAndTurnCount: (
-    input: GetByThreadAndTurnCountInput,
-  ) => Effect.Effect<Option.Option<ProjectionCheckpoint>, ProjectionRepositoryError>;
-
-  /**
-   * Delete projected checkpoint rows by thread.
-   */
-  readonly deleteByThreadId: (
-    input: DeleteByThreadIdInput,
-  ) => Effect.Effect<void, ProjectionRepositoryError>;
-}
-
-/**
- * ProjectionCheckpointRepository - Service tag for checkpoint projection persistence.
- */
-export class ProjectionCheckpointRepository extends Context.Service<
-  ProjectionCheckpointRepository,
-  ProjectionCheckpointRepositoryShape
->()("t3/persistence/Services/ProjectionCheckpoints/ProjectionCheckpointRepository") {}
diff --git a/apps/server/src/persistence/Services/ProjectionPendingApprovals.ts b/apps/server/src/persistence/Services/ProjectionPendingApprovals.ts
index 43a829de6390..9b9e090af760 100644
--- a/apps/server/src/persistence/Services/ProjectionPendingApprovals.ts
+++ b/apps/server/src/persistence/Services/ProjectionPendingApprovals.ts
@@ -42,11 +42,6 @@ export const GetProjectionPendingApprovalInput = Schema.Struct({
 });
 export type GetProjectionPendingApprovalInput = typeof GetProjectionPendingApprovalInput.Type;
 
-export const DeleteProjectionPendingApprovalInput = Schema.Struct({
-  requestId: ApprovalRequestId,
-});
-export type DeleteProjectionPendingApprovalInput = typeof DeleteProjectionPendingApprovalInput.Type;
-
 /**
  * ProjectionPendingApprovalRepositoryShape - Service API for pending approvals.
  */
@@ -81,13 +76,6 @@ export interface ProjectionPendingApprovalRepositoryShape {
     input: GetProjectionPendingApprovalInput,
   ) => Effect.Effect<Option.Option<ProjectionPendingApproval>, ProjectionRepositoryError>;
 
-  /**
-   * Delete a pending approval row by request id.
-   */
-  readonly deleteByRequestId: (
-    input: DeleteProjectionPendingApprovalInput,
-  ) => Effect.Effect<void, ProjectionRepositoryError>;
-
   /**
    * Delete every pending approval row for a thread.
    */
diff --git a/apps/server/src/persistence/Services/ProjectionProjects.ts b/apps/server/src/persistence/Services/ProjectionProjects.ts
index e5d1f6ba1f1d..3228855fc8ec 100644
--- a/apps/server/src/persistence/Services/ProjectionProjects.ts
+++ b/apps/server/src/persistence/Services/ProjectionProjects.ts
@@ -42,11 +42,6 @@ export const GetProjectionProjectInput = Schema.Struct({
 });
 export type GetProjectionProjectInput = typeof GetProjectionProjectInput.Type;
 
-export const DeleteProjectionProjectInput = Schema.Struct({
-  projectId: ProjectId,
-});
-export type DeleteProjectionProjectInput = typeof DeleteProjectionProjectInput.Type;
-
 /**
  * ProjectionProjectRepositoryShape - Service API for projected project records.
  */
@@ -64,23 +59,6 @@ export interface ProjectionProjectRepositoryShape {
   readonly getById: (
     input: GetProjectionProjectInput,
   ) => Effect.Effect<Option.Option<ProjectionProject>, ProjectionRepositoryError>;
-
-  /**
-   * List all projected project rows.
-   *
-   * Returned in deterministic creation order.
-   */
-  readonly listAll: () => Effect.Effect<
-    ReadonlyArray<ProjectionProject>,
-    ProjectionRepositoryError
-  >;
-
-  /**
-   * Soft-delete a projected project row by id.
-   */
-  readonly deleteById: (
-    input: DeleteProjectionProjectInput,
-  ) => Effect.Effect<void, ProjectionRepositoryError>;
 }
 
 /**
diff --git a/apps/server/src/persistence/Services/ProjectionState.ts b/apps/server/src/persistence/Services/ProjectionState.ts
index 9372acdeeb65..52dbc4cf637c 100644
--- a/apps/server/src/persistence/Services/ProjectionState.ts
+++ b/apps/server/src/persistence/Services/ProjectionState.ts
@@ -53,13 +53,6 @@ export interface ProjectionStateRepositoryShape {
    * List all projector cursor rows.
    */
   readonly listAll: () => Effect.Effect<ReadonlyArray<ProjectionState>, ProjectionRepositoryError>;
-
-  /**
-   * Read the minimum applied sequence across all projectors.
-   *
-   * Returns `null` when no projector state rows exist.
-   */
-  readonly minLastAppliedSequence: () => Effect.Effect<number | null, ProjectionRepositoryError>;
 }
 
 /**
diff --git a/apps/server/src/persistence/Services/ProjectionThreads.ts b/apps/server/src/persistence/Services/ProjectionThreads.ts
index 2c8186a321c0..895fe596db24 100644
--- a/apps/server/src/persistence/Services/ProjectionThreads.ts
+++ b/apps/server/src/persistence/Services/ProjectionThreads.ts
@@ -65,16 +65,6 @@ export const GetProjectionThreadInput = Schema.Struct({
 });
 export type GetProjectionThreadInput = typeof GetProjectionThreadInput.Type;
 
-export const DeleteProjectionThreadInput = Schema.Struct({
-  threadId: ThreadId,
-});
-export type DeleteProjectionThreadInput = typeof DeleteProjectionThreadInput.Type;
-
-export const ListProjectionThreadsByProjectInput = Schema.Struct({
-  projectId: ProjectId,
-});
-export type ListProjectionThreadsByProjectInput = typeof ListProjectionThreadsByProjectInput.Type;
-
 /**
  * ProjectionThreadRepositoryShape - Service API for projected thread records.
  */
@@ -92,22 +82,6 @@ export interface ProjectionThreadRepositoryShape {
   readonly getById: (
     input: GetProjectionThreadInput,
   ) => Effect.Effect<Option.Option<ProjectionThread>, ProjectionRepositoryError>;
-
-  /**
-   * List projected threads for a project.
-   *
-   * Returned in deterministic creation order.
-   */
-  readonly listByProjectId: (
-    input: ListProjectionThreadsByProjectInput,
-  ) => Effect.Effect<ReadonlyArray<ProjectionThread>, ProjectionRepositoryError>;
-
-  /**
-   * Soft-delete a projected thread row by id.
-   */
-  readonly deleteById: (
-    input: DeleteProjectionThreadInput,
-  ) => Effect.Effect<void, ProjectionRepositoryError>;
 }
 
 /**
diff --git a/apps/server/src/provider/acp/XAiAcpExtension.ts b/apps/server/src/provider/acp/XAiAcpExtension.ts
index 620545569aaa..08bbd674e9b0 100644
--- a/apps/server/src/provider/acp/XAiAcpExtension.ts
+++ b/apps/server/src/provider/acp/XAiAcpExtension.ts
@@ -110,10 +110,6 @@ interface XAiAskUserQuestionCancelledResponse {
   readonly outcome: "cancelled";
 }
 
-export type XAiAskUserQuestionResponse =
-  | XAiAskUserQuestionAcceptedResponse
-  | XAiAskUserQuestionCancelledResponse;
-
 interface NormalizedXAiAnswer {
   readonly questionText: string;
   readonly selectedLabels: ReadonlyArray<string>;
diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.ts
index 512e55a64cbb..2618020d388d 100644
--- a/apps/server/src/server.test.ts
+++ b/apps/server/src/server.test.ts
@@ -123,10 +123,7 @@ import * as Keybindings from "./keybindings.ts";
 import * as ExternalLauncher from "./process/externalLauncher.ts";
 import * as RemoteOpenTargets from "./environment/RemoteOpenTargets.ts";
 import * as OrchestrationEngine from "./orchestration/Services/OrchestrationEngine.ts";
-import {
-  OrchestrationListenerCallbackError,
-  OrchestrationThreadSettleBlockedError,
-} from "./orchestration/Errors.ts";
+import { OrchestrationThreadSettleBlockedError } from "./orchestration/Errors.ts";
 import * as ProjectionSnapshotQuery from "./orchestration/Services/ProjectionSnapshotQuery.ts";
 import { ThreadDeletionReactor } from "./orchestration/Services/ThreadDeletionReactor.ts";
 import * as PullRequestSyncReactor from "./orchestration/PullRequestSyncReactor.ts";
@@ -7358,8 +7355,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
                 Effect.flatMap(() =>
                   command.commandId === failedCommandId
                     ? Effect.fail(
-                        new OrchestrationListenerCallbackError({
-                          listener: "domain-event",
+                        new PersistenceSqlError({
+                          operation: "OrchestrationEventStore.append:query",
                           detail: "thread creation failed",
                         }),
                       )
@@ -10682,8 +10679,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               effects.push(`dispatch:${command.type}`);
               if (command.type === "thread.session.stop") {
                 return Effect.fail(
-                  new OrchestrationListenerCallbackError({
-                    listener: "domain-event",
+                  new PersistenceSqlError({
+                    operation: "OrchestrationEventStore.append:query",
                     detail: "simulated archive stop failure",
                   }),
                 );
@@ -11629,8 +11626,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
                 setupActivityAppendAttempt += 1;
                 if (setupActivityAppendAttempt === 2) {
                   return Effect.fail(
-                    new OrchestrationListenerCallbackError({
-                      listener: "domain-event",
+                    new PersistenceSqlError({
+                      operation: "OrchestrationEventStore.append:query",
                       detail: "failed to append setup-script.started activity",
                     }),
                   );
@@ -12155,8 +12152,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               dispatchedCommands.push(command);
               if (command.type === "thread.delete") {
                 return Effect.fail(
-                  new OrchestrationListenerCallbackError({
-                    listener: "domain-event",
+                  new PersistenceSqlError({
+                    operation: "OrchestrationEventStore.append:query",
                     detail: "thread cleanup exploded",
                   }),
                 );
diff --git a/apps/server/src/textGeneration/TextGeneration.ts b/apps/server/src/textGeneration/TextGeneration.ts
index 27fc28df7bf7..37634cea7e4e 100644
--- a/apps/server/src/textGeneration/TextGeneration.ts
+++ b/apps/server/src/textGeneration/TextGeneration.ts
@@ -10,8 +10,6 @@ import * as SourceControlProviderRegistry from "../sourceControl/SourceControlPr
 import * as ThreadTitleLinks from "./ThreadTitleLinks.ts";
 import type { TextGenerationPolicy } from "./TextGenerationPolicy.ts";
 
-export type TextGenerationProvider = "codex" | "claudeAgent" | "cursor" | "grok" | "opencode";
-
 export interface CommitMessageGenerationInput {
   cwd: string;
   branch: string | null;
diff --git a/apps/server/src/workspace/WorkspaceSearchIndex.ts b/apps/server/src/workspace/WorkspaceSearchIndex.ts
index cac501aede0c..a387dd189b3b 100644
--- a/apps/server/src/workspace/WorkspaceSearchIndex.ts
+++ b/apps/server/src/workspace/WorkspaceSearchIndex.ts
@@ -107,12 +107,6 @@ export class WorkspaceSearchIndexDestroyFailed extends Schema.TaggedError<Worksp
   }
 }
 
-export type WorkspaceSearchIndexError =
-  | WorkspaceSearchIndexCreateFailed
-  | WorkspaceSearchIndexScanTimedOut
-  | WorkspaceSearchIndexSearchFailed
-  | WorkspaceSearchIndexRefreshFailed;
-
 export class WorkspaceSearchIndex extends Context.Service<
   WorkspaceSearchIndex,
   {
diff --git a/apps/web/src/cloud/managedAuth.test.ts b/apps/web/src/cloud/managedAuth.test.ts
index aa29a59677eb..63001bdb184d 100644
--- a/apps/web/src/cloud/managedAuth.test.ts
+++ b/apps/web/src/cloud/managedAuth.test.ts
@@ -1,11 +1,11 @@
 import { managedRelaySessionAtom, setManagedRelaySession } from "@t3tools/client-runtime/relay";
+import * as Effect from "effect/Effect";
 import { afterEach, describe, expect, it, vi } from "vite-plus/test";
 
 import { appAtomRegistry } from "../rpc/atomRegistry";
 import {
   activateManagedRelayAuthentication,
   deactivateManagedRelayAuthentication,
-  readManagedRelayClerkToken,
 } from "./managedAuth";
 
 vi.mock("@clerk/react", () => ({
@@ -32,13 +32,16 @@ describe("managed relay authentication", () => {
   it("clears all token access synchronously before account cleanup can fail", async () => {
     activateManagedRelayAuthentication("account-1", async () => "account-1-token");
     expect(appAtomRegistry.get(managedRelaySessionAtom)?.accountId).toBe("account-1");
-    expect(await readManagedRelayClerkToken()).toBe("account-1-token");
+    const token = await Effect.fromNullishOr(appAtomRegistry.get(managedRelaySessionAtom)).pipe(
+      Effect.flatMap((session) => session.readClerkToken()),
+      Effect.runPromise,
+    );
+    expect(token).toBe("account-1-token");
 
     deactivateManagedRelayAuthentication();
     const cleanup = Promise.reject(new Error("Persistence removal failed.")).catch(() => undefined);
 
     expect(appAtomRegistry.get(managedRelaySessionAtom)).toBeNull();
-    expect(await readManagedRelayClerkToken()).toBeNull();
     await cleanup;
   });
 
diff --git a/apps/web/src/cloud/managedAuth.tsx b/apps/web/src/cloud/managedAuth.tsx
index 2f631214501b..f9bf1c966f40 100644
--- a/apps/web/src/cloud/managedAuth.tsx
+++ b/apps/web/src/cloud/managedAuth.tsx
@@ -14,14 +14,7 @@ import { appAtomRegistry } from "../rpc/atomRegistry";
 import { useAtomCommand } from "../state/use-atom-command";
 import { resolveRelayClerkTokenOptions } from "./publicConfig";
 
-let relayTokenProvider: (() => Promise<string | null>) | null = null;
-
-export async function readManagedRelayClerkToken(): Promise<string | null> {
-  return relayTokenProvider?.() ?? null;
-}
-
 export function deactivateManagedRelayAuthentication(): void {
-  relayTokenProvider = null;
   setManagedRelaySession(appAtomRegistry, null);
 }
 
@@ -29,7 +22,6 @@ export function activateManagedRelayAuthentication(
   accountId: string,
   readClerkToken: () => Promise<string | null>,
 ): void {
-  relayTokenProvider = readClerkToken;
   setManagedRelaySession(appAtomRegistry, {
     accountId,
     readClerkToken,
diff --git a/apps/web/src/components/ChatView.logic.test.ts b/apps/web/src/components/ChatView.logic.test.ts
index 799bd0bde7f4..a2897ce3ddb0 100644
--- a/apps/web/src/components/ChatView.logic.test.ts
+++ b/apps/web/src/components/ChatView.logic.test.ts
@@ -32,7 +32,6 @@ import {
   usePreviewMiniPlayerStore,
 } from "../previewMiniPlayerStore";
 import {
-  MAX_HIDDEN_MOUNTED_PREVIEW_THREADS,
   MAX_HIDDEN_MOUNTED_TERMINAL_THREADS,
   agentControlledBrowserCloseConfirmation,
   branchMismatchKey,
@@ -52,7 +51,6 @@ import {
   shouldRefocusComposerOnWindowFocus,
   isBranchMismatchDismissedForSession,
   reconcileMountedTerminalThreadIds,
-  reconcileRetainedMountedThreadIds,
   recallCheckoutIsRepo,
   rememberCheckoutIsRepo,
   resolveBackgroundDraftWorkspaceOptions,
@@ -1887,50 +1885,6 @@ describe("reconcileMountedTerminalThreadIds", () => {
   });
 });
 
-describe("reconcileRetainedMountedThreadIds", () => {
-  it("retains hidden open threads and adds the active open thread", () => {
-    expect(
-      reconcileRetainedMountedThreadIds({
-        currentThreadIds: [ThreadId.make("thread-hidden")],
-        openThreadIds: [ThreadId.make("thread-hidden")],
-        activeThreadId: ThreadId.make("thread-active"),
-        activeThreadOpen: true,
-        maxHiddenThreadCount: MAX_HIDDEN_MOUNTED_PREVIEW_THREADS,
-      }),
-    ).toEqual([ThreadId.make("thread-hidden"), ThreadId.make("thread-active")]);
-  });
-
-  it("can retain the active thread as hidden when it is inactive", () => {
-    expect(
-      reconcileRetainedMountedThreadIds({
-        currentThreadIds: [ThreadId.make("thread-active")],
-        openThreadIds: [ThreadId.make("thread-active")],
-        activeThreadId: ThreadId.make("thread-active"),
-        activeThreadOpen: false,
-        maxHiddenThreadCount: MAX_HIDDEN_MOUNTED_PREVIEW_THREADS,
-        retainInactiveActiveThread: true,
-      }),
-    ).toEqual([ThreadId.make("thread-active")]);
-  });
-
-  it("evicts the oldest hidden threads beyond the configured cap", () => {
-    const currentThreadIds = Array.from(
-      { length: MAX_HIDDEN_MOUNTED_PREVIEW_THREADS + 2 },
-      (_, index) => ThreadId.make(`thread-${index + 1}`),
-    );
-
-    expect(
-      reconcileRetainedMountedThreadIds({
-        currentThreadIds,
-        openThreadIds: currentThreadIds,
-        activeThreadId: null,
-        activeThreadOpen: false,
-        maxHiddenThreadCount: MAX_HIDDEN_MOUNTED_PREVIEW_THREADS,
-      }),
-    ).toEqual(currentThreadIds.slice(-MAX_HIDDEN_MOUNTED_PREVIEW_THREADS));
-  });
-});
-
 describe("shouldWriteThreadErrorToCurrentServerThread", () => {
   it("writes errors for a shell-derived active server thread", () => {
     const routeThreadRef = { environmentId, threadId };
diff --git a/apps/web/src/components/ChatView.logic.ts b/apps/web/src/components/ChatView.logic.ts
index bc68a9fcfa01..928d99c549a6 100644
--- a/apps/web/src/components/ChatView.logic.ts
+++ b/apps/web/src/components/ChatView.logic.ts
@@ -60,7 +60,7 @@ import {
 
 export const LAST_INVOKED_SCRIPT_BY_PROJECT_KEY = "t3code:last-invoked-script-by-project";
 export const MAX_HIDDEN_MOUNTED_TERMINAL_THREADS = 10;
-export const MAX_HIDDEN_MOUNTED_PREVIEW_THREADS = 3;
+
 export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;
 
 export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);
@@ -678,31 +678,15 @@ export function reconcileMountedTerminalThreadIds(input: {
   activeThreadId: string | null;
   activeThreadTerminalOpen: boolean;
   maxHiddenThreadCount?: number;
-}): string[] {
-  return reconcileRetainedMountedThreadIds({
-    currentThreadIds: input.currentThreadIds,
-    openThreadIds: input.openThreadIds,
-    activeThreadId: input.activeThreadId,
-    activeThreadOpen: input.activeThreadTerminalOpen,
-    maxHiddenThreadCount: input.maxHiddenThreadCount ?? MAX_HIDDEN_MOUNTED_TERMINAL_THREADS,
-  });
-}
-
-export function reconcileRetainedMountedThreadIds(input: {
-  currentThreadIds: ReadonlyArray<string>;
-  openThreadIds: ReadonlyArray<string>;
-  activeThreadId: string | null;
-  activeThreadOpen: boolean;
-  maxHiddenThreadCount: number;
-  retainInactiveActiveThread?: boolean;
 }): string[] {
   const openThreadIdSet = new Set(input.openThreadIds);
   const hiddenThreadIds = input.currentThreadIds.filter(
-    (threadId) =>
-      (threadId !== input.activeThreadId || input.retainInactiveActiveThread === true) &&
-      openThreadIdSet.has(threadId),
+    (threadId) => threadId !== input.activeThreadId && openThreadIdSet.has(threadId),
+  );
+  const maxHiddenThreadCount = Math.max(
+    0,
+    input.maxHiddenThreadCount ?? MAX_HIDDEN_MOUNTED_TERMINAL_THREADS,
   );
-  const maxHiddenThreadCount = Math.max(0, input.maxHiddenThreadCount);
   const nextThreadIds =
     hiddenThreadIds.length > maxHiddenThreadCount
       ? hiddenThreadIds.slice(-maxHiddenThreadCount)
@@ -710,7 +694,7 @@ export function reconcileRetainedMountedThreadIds(input: {
 
   if (
     input.activeThreadId &&
-    input.activeThreadOpen &&
+    input.activeThreadTerminalOpen &&
     !nextThreadIds.includes(input.activeThreadId)
   ) {
     nextThreadIds.push(input.activeThreadId);
diff --git a/apps/web/src/components/preview/PreviewPanelShell.test.ts b/apps/web/src/components/preview/PreviewPanelShell.test.ts
index 23deb066a2ab..765e0b0a1b02 100644
--- a/apps/web/src/components/preview/PreviewPanelShell.test.ts
+++ b/apps/web/src/components/preview/PreviewPanelShell.test.ts
@@ -1,8 +1,6 @@
-import { jsx } from "react/jsx-runtime";
-import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vite-plus/test";
 
-import { getPreviewPanelMaxWidth, PreviewPanelShell } from "./PreviewPanelShell";
+import { getPreviewPanelMaxWidth } from "./PreviewPanelShell";
 
 describe("getPreviewPanelMaxWidth", () => {
   it("allows the panel to use 70% of an ultra-wide viewport without a pixel ceiling", () => {
@@ -13,14 +11,6 @@ describe("getPreviewPanelMaxWidth", () => {
     expect(getPreviewPanelMaxWidth(2_001)).toBe(1_400);
   });
 
-  it("keeps inline panels inside their containing workspace", () => {
-    const markup = renderToStaticMarkup(
-      jsx(PreviewPanelShell, { mode: "inline", defaultWidth: 1_000, children: "Panel" }),
-    );
-
-    expect(markup).toContain("max-w-full");
-  });
-
   it("reserves the sibling column minimum when the flex row is known", () => {
     // Fullscreen 14" MacBook: viewport 1512, sidebar ~256 → row of 1256.
     // The 70% fraction (1058) would leave the chat column only ~198px;
diff --git a/apps/web/src/components/settings/settingsLayout.test.tsx b/apps/web/src/components/settings/settingsLayout.test.tsx
index 51bb90b33ab3..4195a359d1b4 100644
--- a/apps/web/src/components/settings/settingsLayout.test.tsx
+++ b/apps/web/src/components/settings/settingsLayout.test.tsx
@@ -1,12 +1,7 @@
 import { renderToStaticMarkup } from "react-dom/server";
 import { afterEach, describe, expect, it, vi } from "vite-plus/test";
 
-import {
-  scrollToSettingsTarget,
-  SettingsRow,
-  SettingsSearchTargetProvider,
-  SettingsUnavailableGroup,
-} from "./settingsLayout";
+import { scrollToSettingsTarget, SettingsRow, SettingsUnavailableGroup } from "./settingsLayout";
 
 afterEach(() => {
   vi.unstubAllGlobals();
@@ -27,19 +22,6 @@ describe("unavailable settings", () => {
 });
 
 describe("settings search targets", () => {
-  it("does not persist destination styling in the rendered row", () => {
-    const markup = renderToStaticMarkup(
-      <SettingsSearchTargetProvider targetId="word-wrap">
-        <SettingsRow id="word-wrap" title="Word wrap" description="Wrap long lines." />
-        <SettingsRow id="time-format" title="Time format" description="Choose a clock." />
-      </SettingsSearchTargetProvider>,
-    );
-
-    expect(markup).toContain('id="word-wrap" tabindex="-1"');
-    expect(markup).not.toContain("data-settings-search-target");
-    expect(markup).not.toContain("settings-search-target-pulse");
-  });
-
   it("scrolls directly to a section header and restarts the destination pulse", () => {
     const sectionScrollIntoView = vi.fn();
     const headerScrollIntoView = vi.fn();
diff --git a/apps/web/src/components/settings/settingsLayout.tsx b/apps/web/src/components/settings/settingsLayout.tsx
index 94938b637db7..c805e37f1bbd 100644
--- a/apps/web/src/components/settings/settingsLayout.tsx
+++ b/apps/web/src/components/settings/settingsLayout.tsx
@@ -57,7 +57,7 @@ const SettingsSearchTargetContext = createContext<SettingsSearchTargetContextVal
   onTargetHandled: noop,
 });
 
-export function SettingsSearchTargetProvider({
+function SettingsSearchTargetProvider({
   targetId,
   highlightTarget = true,
   onTargetHandled = noop,
diff --git a/apps/web/src/components/ui/alert-dialog.tsx b/apps/web/src/components/ui/alert-dialog.tsx
index 4f57e920118b..6e6c1ce2b210 100644
--- a/apps/web/src/components/ui/alert-dialog.tsx
+++ b/apps/web/src/components/ui/alert-dialog.tsx
@@ -9,16 +9,10 @@ import {
   DIALOG_POPUP_CLASS,
 } from "~/components/ui/dialog-styles";
 
-const AlertDialogCreateHandle = AlertDialogPrimitive.createHandle;
-
 const AlertDialog = AlertDialogPrimitive.Root;
 
 const AlertDialogPortal = AlertDialogPrimitive.Portal;
 
-function AlertDialogTrigger(props: AlertDialogPrimitive.Trigger.Props) {
-  return <AlertDialogPrimitive.Trigger data-slot="alert-dialog-trigger" {...props} />;
-}
-
 function AlertDialogBackdrop({ className, ...props }: AlertDialogPrimitive.Backdrop.Props) {
   return (
     <AlertDialogPrimitive.Backdrop
@@ -129,12 +123,10 @@ function AlertDialogClose(props: AlertDialogPrimitive.Close.Props) {
 }
 
 export {
-  AlertDialogCreateHandle,
   AlertDialog,
   AlertDialogPortal,
   AlertDialogBackdrop,
   AlertDialogBackdrop as AlertDialogOverlay,
-  AlertDialogTrigger,
   AlertDialogPopup,
   AlertDialogPopup as AlertDialogContent,
   AlertDialogHeader,
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index b81701e25925..49735c97e3d6 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -136,16 +136,6 @@ function AutocompleteItem({ className, children, ...props }: AutocompletePrimiti
   );
 }
 
-function AutocompleteSeparator({ className, ...props }: AutocompletePrimitive.Separator.Props) {
-  return (
-    <AutocompletePrimitive.Separator
-      className={cn("mx-2 my-1 h-px bg-border last:hidden", className)}
-      data-slot="autocomplete-separator"
-      {...props}
-    />
-  );
-}
-
 function AutocompleteGroup({ className, ...props }: AutocompletePrimitive.Group.Props) {
   return (
     <AutocompletePrimitive.Group
@@ -179,16 +169,6 @@ function AutocompleteEmpty({ className, ...props }: AutocompletePrimitive.Empty.
   );
 }
 
-function AutocompleteRow({ className, ...props }: AutocompletePrimitive.Row.Props) {
-  return (
-    <AutocompletePrimitive.Row className={className} data-slot="autocomplete-row" {...props} />
-  );
-}
-
-function AutocompleteValue({ ...props }: AutocompletePrimitive.Value.Props) {
-  return <AutocompletePrimitive.Value data-slot="autocomplete-value" {...props} />;
-}
-
 function AutocompleteList({ className, ...props }: AutocompletePrimitive.List.Props) {
   return (
     <ScrollArea scrollbarGutter scrollFade>
@@ -216,19 +196,6 @@ function AutocompleteClear({ className, ...props }: AutocompletePrimitive.Clear.
   );
 }
 
-function AutocompleteStatus({ className, ...props }: AutocompletePrimitive.Status.Props) {
-  return (
-    <AutocompletePrimitive.Status
-      className={cn(
-        "px-3 py-2 font-medium text-muted-foreground text-xs empty:m-0 empty:p-0",
-        className,
-      )}
-      data-slot="autocomplete-status"
-      {...props}
-    />
-  );
-}
-
 function AutocompleteCollection({ ...props }: AutocompletePrimitive.Collection.Props) {
   return <AutocompletePrimitive.Collection data-slot="autocomplete-collection" {...props} />;
 }
@@ -249,23 +216,16 @@ function AutocompleteTrigger({
   );
 }
 
-const useAutocompleteFilter = AutocompletePrimitive.useFilter;
-
 export {
   Autocomplete,
   AutocompleteInput,
   AutocompleteTrigger,
   AutocompletePopup,
   AutocompleteItem,
-  AutocompleteSeparator,
   AutocompleteGroup,
   AutocompleteGroupLabel,
   AutocompleteEmpty,
-  AutocompleteValue,
   AutocompleteList,
   AutocompleteClear,
-  AutocompleteStatus,
-  AutocompleteRow,
   AutocompleteCollection,
-  useAutocompleteFilter,
 };
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index 863726f32413..42a3b815e2ff 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -28,31 +28,6 @@ function Combobox<Value, Multiple extends boolean | undefined = false>(
   );
 }
 
-function ComboboxChipsInput({
-  className,
-  size,
-  ...props
-}: Omit<ComboboxPrimitive.Input.Props, "size"> & {
-  size?: "sm" | "default" | "lg" | number;
-  ref?: React.Ref<HTMLInputElement>;
-}) {
-  const sizeValue = (size ?? "default") as "sm" | "default" | "lg" | number;
-
-  return (
-    <ComboboxPrimitive.Input
-      className={cn(
-        "min-w-12 flex-1 text-base outline-none sm:text-sm [[data-slot=combobox-chip]+&]:ps-0.5",
-        sizeValue === "sm" ? "ps-1.5" : "ps-2",
-        className,
-      )}
-      data-size={typeof sizeValue === "string" ? sizeValue : undefined}
-      data-slot="combobox-chips-input"
-      size={typeof sizeValue === "number" ? sizeValue : undefined}
-      {...props}
-    />
-  );
-}
-
 function ComboboxInput({
   className,
   inputClassName,
@@ -240,36 +215,6 @@ function ComboboxItem({
   );
 }
 
-function ComboboxSeparator({ className, ...props }: ComboboxPrimitive.Separator.Props) {
-  return (
-    <ComboboxPrimitive.Separator
-      className={cn("mx-2 my-1 h-px bg-border last:hidden", className)}
-      data-slot="combobox-separator"
-      {...props}
-    />
-  );
-}
-
-function ComboboxGroup({ className, ...props }: ComboboxPrimitive.Group.Props) {
-  return (
-    <ComboboxPrimitive.Group
-      className={cn("[[role=group]+&]:mt-1.5", className)}
-      data-slot="combobox-group"
-      {...props}
-    />
-  );
-}
-
-function ComboboxGroupLabel({ className, ...props }: ComboboxPrimitive.GroupLabel.Props) {
-  return (
-    <ComboboxPrimitive.GroupLabel
-      className={cn("px-2 py-1.5 font-medium text-muted-foreground text-xs", className)}
-      data-slot="combobox-group-label"
-      {...props}
-    />
-  );
-}
-
 function ComboboxEmpty({ className, ...props }: ComboboxPrimitive.Empty.Props) {
   return (
     <ComboboxPrimitive.Empty
@@ -283,14 +228,6 @@ function ComboboxEmpty({ className, ...props }: ComboboxPrimitive.Empty.Props) {
   );
 }
 
-function ComboboxRow({ className, ...props }: ComboboxPrimitive.Row.Props) {
-  return <ComboboxPrimitive.Row className={className} data-slot="combobox-row" {...props} />;
-}
-
-function ComboboxValue({ ...props }: ComboboxPrimitive.Value.Props) {
-  return <ComboboxPrimitive.Value data-slot="combobox-value" {...props} />;
-}
-
 function ComboboxList({ className, ...props }: ComboboxPrimitive.List.Props) {
   return (
     <ScrollArea scrollbarGutter scrollFade>
@@ -334,102 +271,19 @@ function ComboboxStatus({ className, ...props }: ComboboxPrimitive.Status.Props)
   );
 }
 
-function ComboboxCollection(props: ComboboxPrimitive.Collection.Props) {
-  return <ComboboxPrimitive.Collection data-slot="combobox-collection" {...props} />;
-}
-
-function ComboboxChips({
-  className,
-  children,
-  startAddon,
-  ...props
-}: ComboboxPrimitive.Chips.Props & {
-  startAddon?: React.ReactNode;
-}) {
-  const { chipsRef } = React.use(ComboboxContext);
-
-  return (
-    <ComboboxPrimitive.Chips
-      className={cn(
-        "relative inline-flex min-h-9 w-full flex-wrap gap-1 rounded-lg border border-input bg-background not-dark:bg-clip-padding p-[calc(--spacing(1)-1px)] text-base shadow-xs/5 outline-none ring-ring/24 transition-shadow *:min-h-7 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] not-has-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_1px_--theme(--color-black/4%)] focus-within:border-ring focus-within:ring-[3px] has-disabled:pointer-events-none has-data-[size=lg]:min-h-10 has-data-[size=sm]:min-h-8 has-aria-invalid:border-destructive/36 has-autofill:bg-foreground/4 has-disabled:opacity-64 has-[:disabled,:focus-within,[aria-invalid]]:shadow-none focus-within:has-aria-invalid:border-destructive/64 focus-within:has-aria-invalid:ring-destructive/16 has-data-[size=lg]:*:min-h-8 has-data-[size=sm]:*:min-h-6 sm:min-h-8 sm:text-sm sm:has-data-[size=lg]:min-h-9 sm:has-data-[size=sm]:min-h-7 sm:*:min-h-6 sm:has-data-[size=lg]:*:min-h-7 sm:has-data-[size=sm]:*:min-h-5 dark:not-has-disabled:bg-input/32 dark:has-autofill:bg-foreground/8 dark:has-aria-invalid:ring-destructive/24 dark:not-has-disabled:not-focus-within:not-aria-invalid:before:shadow-[0_-1px_--theme(--color-white/6%)]",
-        className,
-      )}
-      data-slot="combobox-chips"
-      ref={chipsRef as React.Ref<HTMLDivElement> | null}
-      {...props}
-    >
-      {startAddon && (
-        <div
-          aria-hidden="true"
-          className="[&_svg]:-ms-0.5 [&_svg]:-me-1.5 flex shrink-0 items-center ps-2 opacity-80 has-[~[data-size=sm]]:has-[+[data-slot=combobox-chip]]:pe-1.5 has-[~[data-size=sm]]:ps-1.5 has-[+[data-slot=combobox-chip]]:pe-2 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none"
-          data-slot="combobox-start-addon"
-        >
-          {startAddon}
-        </div>
-      )}
-      {children}
-    </ComboboxPrimitive.Chips>
-  );
-}
-
-function ComboboxChip({ children, ...props }: ComboboxPrimitive.Chip.Props) {
-  const labelId = React.useId();
-
-  return (
-    <ComboboxPrimitive.Chip
-      className="flex items-center rounded-[calc(var(--radius-md)-1px)] bg-accent ps-2 font-medium text-accent-foreground text-sm outline-none sm:text-xs/(--text-xs--line-height) [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5"
-      data-slot="combobox-chip"
-      {...props}
-    >
-      <span id={labelId}>{children}</span>
-      <ComboboxChipRemove labelId={labelId} />
-    </ComboboxPrimitive.Chip>
-  );
-}
-
-function ComboboxChipRemove({
-  labelId,
-  ...props
-}: ComboboxPrimitive.ChipRemove.Props & { labelId: string }) {
-  const removeLabelId = `${labelId}-remove`;
-
-  return (
-    <ComboboxPrimitive.ChipRemove
-      aria-labelledby={`${removeLabelId} ${labelId}`}
-      className="h-full shrink-0 cursor-pointer px-1.5 opacity-80 hover:opacity-100 [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5"
-      data-slot="combobox-chip-remove"
-      {...props}
-    >
-      <span id={removeLabelId} className="sr-only">
-        Remove
-      </span>
-      <XIcon aria-hidden="true" />
-    </ComboboxPrimitive.ChipRemove>
-  );
-}
-
 const useComboboxFilter = ComboboxPrimitive.useFilter;
 
 export {
   Combobox,
-  ComboboxChipsInput,
   ComboboxInput,
   ComboboxSearchInput,
   ComboboxTrigger,
   ComboboxPopup,
   ComboboxItem,
-  ComboboxSeparator,
-  ComboboxGroup,
-  ComboboxGroupLabel,
   ComboboxEmpty,
-  ComboboxValue,
   ComboboxList,
   ComboboxListVirtualized,
   ComboboxClear,
   ComboboxStatus,
-  ComboboxRow,
-  ComboboxCollection,
-  ComboboxChips,
-  ComboboxChip,
   useComboboxFilter,
 };
diff --git a/apps/web/src/components/ui/command.tsx b/apps/web/src/components/ui/command.tsx
index c1952e9c6f36..f8e9b72b1b4c 100644
--- a/apps/web/src/components/ui/command.tsx
+++ b/apps/web/src/components/ui/command.tsx
@@ -7,13 +7,11 @@ import { cn } from "~/lib/utils";
 import {
   Autocomplete,
   AutocompleteCollection,
-  AutocompleteEmpty,
   AutocompleteGroup,
   AutocompleteGroupLabel,
   AutocompleteInput,
   AutocompleteItem,
   AutocompleteList,
-  AutocompleteSeparator,
 } from "~/components/ui/autocomplete";
 import { DIALOG_BACKDROP_CLASS, DIALOG_POPUP_CLASS } from "~/components/ui/dialog-styles";
 import { Button } from "~/components/ui/button";
@@ -22,8 +20,6 @@ const CommandDialog = CommandDialogPrimitive.Root;
 
 const CommandDialogPortal = CommandDialogPrimitive.Portal;
 
-const CommandCreateHandle = CommandDialogPrimitive.createHandle;
-
 function CommandDialogTrigger(props: CommandDialogPrimitive.Trigger.Props) {
   return <CommandDialogPrimitive.Trigger data-slot="command-dialog-trigger" {...props} />;
 }
@@ -135,16 +131,6 @@ function CommandList({ className, ...props }: React.ComponentProps<typeof Autoco
   );
 }
 
-function CommandEmpty({ className, ...props }: React.ComponentProps<typeof AutocompleteEmpty>) {
-  return (
-    <AutocompleteEmpty
-      className={cn("not-empty:py-6", className)}
-      data-slot="command-empty"
-      {...props}
-    />
-  );
-}
-
 function CommandPanel({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
@@ -187,19 +173,6 @@ function CommandItem({ className, ...props }: React.ComponentProps<typeof Autoco
   );
 }
 
-function CommandSeparator({
-  className,
-  ...props
-}: React.ComponentProps<typeof AutocompleteSeparator>) {
-  return (
-    <AutocompleteSeparator
-      className={cn("my-2", className)}
-      data-slot="command-separator"
-      {...props}
-    />
-  );
-}
-
 function CommandShortcut({ className, ...props }: React.ComponentProps<"kbd">) {
   return (
     <kbd
@@ -241,13 +214,11 @@ function CommandFooterAction({
 }
 
 export {
-  CommandCreateHandle,
   Command,
   CommandCollection,
   CommandDialog,
   CommandDialogPopup,
   CommandDialogTrigger,
-  CommandEmpty,
   CommandFooter,
   CommandFooterAction,
   CommandGroup,
@@ -256,6 +227,5 @@ export {
   CommandItem,
   CommandList,
   CommandPanel,
-  CommandSeparator,
   CommandShortcut,
 };
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index 1a7c96e00f40..22ce5637204f 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -13,8 +13,6 @@ import {
 } from "~/components/ui/dialog-styles";
 import { ScrollArea } from "~/components/ui/scroll-area";
 
-const DialogCreateHandle = DialogPrimitive.createHandle;
-
 const Dialog = DialogPrimitive.Root;
 
 const DialogPortal = DialogPrimitive.Portal;
@@ -184,7 +182,6 @@ function DialogPanel({
 }
 
 export {
-  DialogCreateHandle,
   Dialog,
   DialogTrigger,
   DialogPortal,
diff --git a/apps/web/src/components/ui/group.tsx b/apps/web/src/components/ui/group.tsx
index 6eedfdda9228..75d8fbe786aa 100644
--- a/apps/web/src/components/ui/group.tsx
+++ b/apps/web/src/components/ui/group.tsx
@@ -1,7 +1,4 @@
 "use client";
-
-import { mergeProps } from "@base-ui/react/merge-props";
-import { useRender } from "@base-ui/react/use-render";
 import { cva, type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 
@@ -48,21 +45,6 @@ function Group({
   );
 }
 
-function GroupText({ className, render, ...props }: useRender.ComponentProps<"div">) {
-  const defaultProps = {
-    className: cn(
-      "relative inline-flex items-center whitespace-nowrap gap-2 rounded-lg border border-input bg-muted not-dark:bg-clip-padding px-[calc(--spacing(3)-1px)] text-muted-foreground text-base sm:text-sm shadow-xs/5 outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] before:shadow-[0_1px_--theme(--color-black/6%)] dark:bg-input/64 dark:before:shadow-[0_-1px_--theme(--color-white/6%)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 [&_svg]:-mx-0.5",
-      className,
-    ),
-    "data-slot": "group-text",
-  };
-  return useRender({
-    defaultTagName: "div",
-    props: mergeProps(defaultProps, props),
-    render,
-  });
-}
-
 function GroupSeparator({
   className,
   orientation = "vertical",
@@ -85,8 +67,6 @@ function GroupSeparator({
 export {
   Group,
   Group as ButtonGroup,
-  GroupText,
-  GroupText as ButtonGroupText,
   GroupSeparator,
   GroupSeparator as ButtonGroupSeparator,
   groupVariants,
diff --git a/apps/web/src/components/ui/input-group.tsx b/apps/web/src/components/ui/input-group.tsx
index 04e34e5611ee..9a9228ede61d 100644
--- a/apps/web/src/components/ui/input-group.tsx
+++ b/apps/web/src/components/ui/input-group.tsx
@@ -5,7 +5,6 @@ import type * as React from "react";
 
 import { cn } from "~/lib/utils";
 import { Input, type InputProps } from "~/components/ui/input";
-import { Textarea, type TextareaProps } from "~/components/ui/textarea";
 
 const inputGroupVariants = cva(
   "relative inline-flex w-full min-w-0 items-center rounded-[var(--control-radius)] border text-base text-foreground ring-ring/24 transition-shadow has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:border-destructive/64 has-[input:focus-visible,textarea:focus-visible]:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/16 has-[textarea]:h-auto has-data-[align=block-end]:h-auto has-data-[align=block-start]:h-auto has-data-[align=block-end]:flex-col has-data-[align=block-start]:flex-col has-[input:focus-visible,textarea:focus-visible]:border-ring has-[input[aria-invalid],textarea[aria-invalid]]:border-destructive/36 has-autofill:bg-foreground/4 has-[input:disabled,textarea:disabled]:opacity-64 has-[input:disabled,textarea:disabled,input:focus-visible,textarea:focus-visible,input[aria-invalid],textarea[aria-invalid]]:shadow-none has-[input:focus-visible,textarea:focus-visible]:ring-[3px] sm:text-sm dark:has-autofill:bg-foreground/8 dark:has-[input[aria-invalid],textarea[aria-invalid]]:ring-destructive/24 has-data-[align=inline-start]:**:[[data-size=sm]_input]:ps-1.5 has-data-[align=inline-end]:**:[[data-size=sm]_input]:pe-1.5 *:[[data-slot=input-control],[data-slot=textarea-control]]:contents *:[[data-slot=input-control],[data-slot=textarea-control]]:before:hidden has-[[data-align=block-start],[data-align=block-end]]:**:[input]:h-auto has-data-[align=inline-start]:**:[input]:ps-2 has-data-[align=inline-end]:**:[input]:pe-2 has-data-[align=block-end]:**:[input]:pt-1.5 has-data-[align=block-start]:**:[input]:pb-1.5 **:[textarea]:min-h-20.5 **:[textarea]:resize-none **:[textarea]:py-[calc(--spacing(3)-1px)] **:[textarea]:max-sm:min-h-23.5 **:[textarea_button]:rounded-[calc(var(--control-radius)-1px)]",
@@ -90,24 +89,8 @@ function InputGroupAddon({
   );
 }
 
-function InputGroupText({ className, ...props }: React.ComponentProps<"span">) {
-  return (
-    <span
-      className={cn(
-        "[&_svg]:-mx-0.5 line-clamp-1 flex items-center gap-2 text-muted-foreground leading-none in-[[data-slot=input-group]:has([data-slot=input-control],[data-slot=textarea-control])]:[&_svg:not([class*='size-'])]:size-4.5 sm:in-[[data-slot=input-group]:has([data-slot=input-control],[data-slot=textarea-control])]:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none",
-        className,
-      )}
-      {...props}
-    />
-  );
-}
-
 function InputGroupInput({ className, ...props }: InputProps) {
   return <Input className={className} unstyled {...props} />;
 }
 
-function InputGroupTextarea({ className, ...props }: TextareaProps) {
-  return <Textarea className={className} unstyled {...props} />;
-}
-
-export { InputGroup, InputGroupAddon, InputGroupText, InputGroupInput, InputGroupTextarea };
+export { InputGroup, InputGroupAddon, InputGroupInput };
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index 6f35c1dc2784..ffcf0f374c87 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -7,12 +7,8 @@ import type * as React from "react";
 import { cn } from "~/lib/utils";
 import { buttonVariants } from "./button";
 
-const MenuCreateHandle = MenuPrimitive.createHandle;
-
 const Menu = MenuPrimitive.Root;
 
-const MenuPortal = MenuPrimitive.Portal;
-
 function MenuTrigger({ className, children, ...props }: MenuPrimitive.Trigger.Props) {
   return (
     <MenuPrimitive.Trigger className={className} data-slot="menu-trigger" {...props}>
@@ -304,12 +300,8 @@ function MenuSubPopup({
 }
 
 export {
-  MenuCreateHandle,
-  MenuCreateHandle as DropdownMenuCreateHandle,
   Menu,
   Menu as DropdownMenu,
-  MenuPortal,
-  MenuPortal as DropdownMenuPortal,
   MenuTrigger,
   MenuTrigger as DropdownMenuTrigger,
   MenuPopup,
diff --git a/apps/web/src/components/ui/number-field.tsx b/apps/web/src/components/ui/number-field.tsx
index 4b348f2ffed4..e1a758b0571d 100644
--- a/apps/web/src/components/ui/number-field.tsx
+++ b/apps/web/src/components/ui/number-field.tsx
@@ -4,13 +4,6 @@ import { NumberField as NumberFieldPrimitive } from "@base-ui/react/number-field
 import { MinusIcon, PlusIcon } from "lucide-react";
 import * as React from "react";
 import { cn } from "~/lib/utils";
-import { Label } from "~/components/ui/label";
-
-export const NumberFieldContext: React.Context<{
-  fieldId: string;
-} | null> = React.createContext<{
-  fieldId: string;
-} | null>(null);
 
 export function NumberField({
   id,
@@ -22,18 +15,14 @@ export function NumberField({
 }): React.ReactElement {
   const generatedId = React.useId();
   const fieldId = id ?? generatedId;
-  const contextValue = React.useMemo(() => ({ fieldId }), [fieldId]);
-
   return (
-    <NumberFieldContext value={contextValue}>
-      <NumberFieldPrimitive.Root
-        className={cn("flex w-full flex-col items-start gap-2", className)}
-        data-size={size}
-        data-slot="number-field"
-        id={fieldId}
-        {...props}
-      />
-    </NumberFieldContext>
+    <NumberFieldPrimitive.Root
+      className={cn("flex w-full flex-col items-start gap-2", className)}
+      data-size={size}
+      data-slot="number-field"
+      id={fieldId}
+      {...props}
+    />
   );
 }
 
@@ -105,52 +94,4 @@ export function NumberFieldInput({
   );
 }
 
-export function NumberFieldScrubArea({
-  className,
-  label,
-  ...props
-}: NumberFieldPrimitive.ScrubArea.Props & {
-  label: string;
-}): React.ReactElement {
-  const context = React.use(NumberFieldContext);
-
-  if (!context) {
-    throw new Error(
-      "NumberFieldScrubArea must be used within a NumberField component for accessibility.",
-    );
-  }
-
-  return (
-    <NumberFieldPrimitive.ScrubArea
-      className={cn("flex cursor-ew-resize", className)}
-      data-slot="number-field-scrub-area"
-      {...props}
-    >
-      <Label className="cursor-ew-resize" htmlFor={context.fieldId}>
-        {label}
-      </Label>
-      <NumberFieldPrimitive.ScrubAreaCursor className="drop-shadow-[0_1px_1px_#0008] filter">
-        <CursorGrowIcon />
-      </NumberFieldPrimitive.ScrubAreaCursor>
-    </NumberFieldPrimitive.ScrubArea>
-  );
-}
-
-export function CursorGrowIcon(props: React.ComponentProps<"svg">): React.ReactElement {
-  return (
-    <svg
-      aria-hidden="true"
-      fill="black"
-      height="14"
-      stroke="white"
-      viewBox="0 0 24 14"
-      width="26"
-      xmlns="http://www.w3.org/2000/svg"
-      {...props}
-    >
-      <path d="M19.5 5.5L6.49737 5.51844V2L1 6.9999L6.5 12L6.49737 8.5L19.5 8.5V12L25 6.9999L19.5 2V5.5Z" />
-    </svg>
-  );
-}
-
 export { NumberFieldPrimitive };
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
index 9534112e4e72..4bc76706ab2b 100644
--- a/apps/web/src/components/ui/popover.tsx
+++ b/apps/web/src/components/ui/popover.tsx
@@ -91,16 +91,6 @@ function PopoverTitle({ className, ...props }: PopoverPrimitive.Title.Props) {
   );
 }
 
-function PopoverDescription({ className, ...props }: PopoverPrimitive.Description.Props) {
-  return (
-    <PopoverPrimitive.Description
-      className={cn("text-muted-foreground text-sm", className)}
-      data-slot="popover-description"
-      {...props}
-    />
-  );
-}
-
 export {
   PopoverCreateHandle,
   Popover,
@@ -108,6 +98,5 @@ export {
   PopoverPopup,
   PopoverPopup as PopoverContent,
   PopoverTitle,
-  PopoverDescription,
   PopoverClose,
 };
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index 46b2c8eb1ba0..a7ab17eb9289 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -1,10 +1,7 @@
 "use client";
-
-import { mergeProps } from "@base-ui/react/merge-props";
 import { Select as SelectPrimitive } from "@base-ui/react/select";
-import { useRender } from "@base-ui/react/use-render";
 import { cva, type VariantProps } from "class-variance-authority";
-import { ChevronDownIcon, ChevronsUpDownIcon, ChevronUpIcon } from "lucide-react";
+import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
 import type * as React from "react";
 
 import { cn } from "~/lib/utils";
@@ -37,41 +34,6 @@ const selectTriggerVariants = cva(
   },
 );
 
-const selectTriggerIconClassName = "-me-1 size-4.5 opacity-80 sm:size-4";
-
-interface SelectButtonProps extends useRender.ComponentProps<"button"> {
-  size?: VariantProps<typeof selectTriggerVariants>["size"];
-  variant?: VariantProps<typeof selectTriggerVariants>["variant"];
-}
-
-function SelectButton({ className, size, variant, render, children, ...props }: SelectButtonProps) {
-  const typeValue: React.ButtonHTMLAttributes<HTMLButtonElement>["type"] = render
-    ? undefined
-    : "button";
-
-  const defaultProps = {
-    children: (
-      <>
-        <span className="flex-1 truncate in-data-placeholder:text-placeholder">{children}</span>
-        {variant === "ghost" ? (
-          <ChevronDownIcon className="-me-1 size-3 opacity-50" />
-        ) : (
-          <ChevronsUpDownIcon className={selectTriggerIconClassName} />
-        )}
-      </>
-    ),
-    className: cn(selectTriggerVariants({ size, variant }), "min-w-none", className),
-    "data-slot": "select-button",
-    type: typeValue,
-  };
-
-  return useRender({
-    defaultTagName: "button",
-    props: mergeProps<"button">(defaultProps, props),
-    render,
-  });
-}
-
 function SelectTrigger({
   className,
   size = "default",
@@ -203,16 +165,6 @@ function SelectItem({
   );
 }
 
-function SelectSeparator({ className, ...props }: SelectPrimitive.Separator.Props) {
-  return (
-    <SelectPrimitive.Separator
-      className={cn("mx-2 my-1 h-px bg-border", className)}
-      data-slot="select-separator"
-      {...props}
-    />
-  );
-}
-
 function SelectGroup(props: SelectPrimitive.Group.Props) {
   return <SelectPrimitive.Group data-slot="select-group" {...props} />;
 }
@@ -230,13 +182,11 @@ function SelectGroupLabel(props: SelectPrimitive.GroupLabel.Props) {
 export {
   Select,
   SelectTrigger,
-  SelectButton,
   selectTriggerVariants,
   SelectValue,
   SelectPopup,
   SelectPopup as SelectContent,
   SelectItem,
-  SelectSeparator,
   SelectGroup,
   SelectGroupLabel,
 };
diff --git a/apps/web/src/components/ui/sheet.tsx b/apps/web/src/components/ui/sheet.tsx
index f7711da80038..0b68ff116484 100644
--- a/apps/web/src/components/ui/sheet.tsx
+++ b/apps/web/src/components/ui/sheet.tsx
@@ -5,20 +5,11 @@ import { XIcon } from "lucide-react";
 import type { CSSProperties } from "react";
 import { cn } from "~/lib/utils";
 import { Button } from "~/components/ui/button";
-import { ScrollArea } from "~/components/ui/scroll-area";
 
 const Sheet = SheetPrimitive.Root;
 
 const SheetPortal = SheetPrimitive.Portal;
 
-function SheetTrigger(props: SheetPrimitive.Trigger.Props) {
-  return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />;
-}
-
-function SheetClose(props: SheetPrimitive.Close.Props) {
-  return <SheetPrimitive.Close data-slot="sheet-close" {...props} />;
-}
-
 function SheetBackdrop({ className, ...props }: SheetPrimitive.Backdrop.Props) {
   return (
     <SheetPrimitive.Backdrop
@@ -146,28 +137,6 @@ function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
   );
 }
 
-function SheetFooter({
-  className,
-  variant = "default",
-  ...props
-}: React.ComponentProps<"div"> & {
-  variant?: "default" | "bare";
-}) {
-  return (
-    <div
-      className={cn(
-        "flex flex-col-reverse gap-2 px-6 sm:flex-row sm:justify-end",
-        variant === "default" && "border-t bg-muted/72 py-4",
-        variant === "bare" &&
-          "in-[[data-slot=sheet-popup]:has([data-slot=sheet-panel])]:pt-3 pt-4 pb-6",
-        className,
-      )}
-      data-slot="sheet-footer"
-      {...props}
-    />
-  );
-}
-
 function SheetTitle({ className, ...props }: SheetPrimitive.Title.Props) {
   return (
     <SheetPrimitive.Title
@@ -188,37 +157,14 @@ function SheetDescription({ className, ...props }: SheetPrimitive.Description.Pr
   );
 }
 
-function SheetPanel({
-  className,
-  scrollFade = true,
-  ...props
-}: React.ComponentProps<"div"> & { scrollFade?: boolean }) {
-  return (
-    <ScrollArea scrollFade={scrollFade}>
-      <div
-        className={cn(
-          "p-6 in-[[data-slot=sheet-popup]:has([data-slot=sheet-header])]:pt-1 in-[[data-slot=sheet-popup]:has([data-slot=sheet-footer]:not(.border-t))]:pb-1",
-          className,
-        )}
-        data-slot="sheet-panel"
-        {...props}
-      />
-    </ScrollArea>
-  );
-}
-
 export {
   Sheet,
-  SheetTrigger,
   SheetPortal,
-  SheetClose,
   SheetBackdrop,
   SheetBackdrop as SheetOverlay,
   SheetPopup,
   SheetPopup as SheetContent,
   SheetHeader,
-  SheetFooter,
   SheetTitle,
   SheetDescription,
-  SheetPanel,
 };
diff --git a/apps/web/src/components/ui/sidebar.test.tsx b/apps/web/src/components/ui/sidebar.test.tsx
index 784c5e087963..1a3113d5216a 100644
--- a/apps/web/src/components/ui/sidebar.test.tsx
+++ b/apps/web/src/components/ui/sidebar.test.tsx
@@ -1,23 +1,8 @@
-import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vite-plus/test";
 
-import {
-  SidebarMenuButton,
-  SidebarMenuSubButton,
-  SidebarProvider,
-  SidebarTrigger,
-} from "./sidebar";
 import { resolveSidebarState } from "./sidebarState";
 
-function renderSidebarButton(className?: string) {
-  return renderToStaticMarkup(
-    <SidebarProvider>
-      <SidebarMenuButton className={className}>Projects</SidebarMenuButton>
-    </SidebarProvider>,
-  );
-}
-
-describe("sidebar interactive cursors", () => {
+describe("responsive sidebar state", () => {
   it("uses mobile sheet visibility for the shared responsive state", () => {
     expect(resolveSidebarState({ isMobile: true, open: true, openMobile: false })).toBe(
       "collapsed",
@@ -27,73 +12,4 @@ describe("sidebar interactive cursors", () => {
       "expanded",
     );
   });
-
-  it("exposes collapsed state for shared titlebar inset styling", () => {
-    const html = renderToStaticMarkup(
-      <SidebarProvider defaultOpen={false}>
-        <div />
-      </SidebarProvider>,
-    );
-
-    expect(html).toContain('data-sidebar-state="collapsed"');
-  });
-
-  it("keeps the sidebar trigger interactive inside Electron drag regions", () => {
-    const html = renderToStaticMarkup(
-      <SidebarProvider>
-        <SidebarTrigger />
-      </SidebarProvider>,
-    );
-
-    expect(html).toContain("[-webkit-app-region:no-drag]");
-    expect(html).toContain("size-[var(--workspace-titlebar-control-size)]!");
-  });
-
-  it("uses shared geometry and icon constraints for menu buttons by default", () => {
-    const html = renderSidebarButton();
-
-    expect(html).toContain('data-slot="sidebar-menu-button"');
-    expect(html).toContain("h-8");
-    expect(html).toContain("rounded-[var(--control-radius)]");
-    expect(html).toContain("px-[var(--sidebar-row-content-inset)]");
-    expect(html).toContain("py-1.5");
-    expect(html).toContain("]:size-4");
-    expect(html).toContain("]:shrink-0");
-    expect(html).toContain("cursor-pointer");
-    expect(html).toContain("gap-[var(--sidebar-control-gap)]");
-    expect(html).toContain("text-[var(--sidebar-icon-color)]");
-    expect(html).not.toContain("[&amp;&gt;svg]:opacity-60");
-  });
-
-  it("applies the shared default treatment to icon-only menu buttons", () => {
-    const html = renderToStaticMarkup(
-      <SidebarProvider>
-        <SidebarMenuButton size="icon">
-          <span>+</span>
-        </SidebarMenuButton>
-      </SidebarProvider>,
-    );
-
-    expect(html).toContain("size-8");
-    expect(html).toContain("justify-center");
-    expect(html).toContain("p-0");
-    expect(html).toContain("font-medium");
-    expect(html).toContain("text-sidebar-muted-foreground/80");
-  });
-
-  it("lets project drag handles override the default pointer cursor", () => {
-    const html = renderSidebarButton("cursor-grab");
-
-    expect(html).toContain("cursor-grab");
-    expect(html).not.toContain("cursor-pointer");
-  });
-
-  it("uses a pointer cursor for submenu buttons", () => {
-    const html = renderToStaticMarkup(
-      <SidebarMenuSubButton render={<button type="button" />}>Show more</SidebarMenuSubButton>,
-    );
-
-    expect(html).toContain('data-slot="sidebar-menu-sub-button"');
-    expect(html).toContain("cursor-pointer");
-  });
 });
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index 307feda7abfc..32405fe72b06 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -5,9 +5,7 @@ import { PanelLeftCloseIcon, PanelLeftIcon } from "lucide-react";
 import * as React from "react";
 import { cn } from "~/lib/utils";
 import { Button } from "~/components/ui/button";
-import { Input } from "~/components/ui/input";
 import { ScrollArea } from "~/components/ui/scroll-area";
-import { Separator } from "~/components/ui/separator";
 import {
   Sheet,
   SheetDescription,
@@ -15,7 +13,6 @@ import {
   SheetPopup,
   SheetTitle,
 } from "~/components/ui/sheet";
-import { Skeleton } from "~/components/ui/skeleton";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
 import { useResizeDrag } from "~/hooks/useResizeDrag";
 import { useIsMobile } from "~/hooks/useMediaQuery";
@@ -544,17 +541,6 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
   );
 }
 
-function SidebarInput({ className, ...props }: React.ComponentProps<typeof Input>) {
-  return (
-    <Input
-      className={cn("h-8 w-full bg-background shadow-none", className)}
-      data-sidebar="input"
-      data-slot="sidebar-input"
-      {...props}
-    />
-  );
-}
-
 function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
@@ -577,17 +563,6 @@ function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
   );
 }
 
-function SidebarSeparator({ className, ...props }: React.ComponentProps<typeof Separator>) {
-  return (
-    <Separator
-      className={cn("mx-2 w-auto! bg-sidebar-border", className)}
-      data-sidebar="separator"
-      data-slot="sidebar-separator"
-      {...props}
-    />
-  );
-}
-
 function SidebarContent({
   className,
   fixedHeader,
@@ -635,55 +610,6 @@ function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
   );
 }
 
-function SidebarGroupLabel({ className, render, ...props }: useRender.ComponentProps<"div">) {
-  const defaultProps = {
-    className: cn(
-      "flex h-8 shrink-0 items-center rounded-lg px-2 font-medium text-sidebar-foreground text-xs outline-hidden ring-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
-      "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
-      className,
-    ),
-    "data-sidebar": "group-label",
-    "data-slot": "sidebar-group-label",
-  };
-
-  return useRender({
-    defaultTagName: "div",
-    props: mergeProps(defaultProps, props),
-    render,
-  });
-}
-
-function SidebarGroupAction({ className, render, ...props }: useRender.ComponentProps<"button">) {
-  const defaultProps = {
-    className: cn(
-      "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-lg p-0 text-sidebar-foreground outline-hidden ring-ring transition-transform hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-visible:ring-2 [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
-      // Increases the hit area of the button on mobile.
-      "after:-inset-2 after:absolute md:after:hidden",
-      "group-data-[collapsible=icon]:hidden",
-      className,
-    ),
-    "data-sidebar": "group-action",
-    "data-slot": "sidebar-group-action",
-  };
-
-  return useRender({
-    defaultTagName: "button",
-    props: mergeProps(defaultProps, props),
-    render,
-  });
-}
-
-function SidebarGroupContent({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      className={cn("w-full text-sm", className)}
-      data-sidebar="group-content"
-      data-slot="sidebar-group-content"
-      {...props}
-    />
-  );
-}
-
 function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
   return (
     <ul
@@ -782,58 +708,6 @@ function SidebarMenuButton({
   );
 }
 
-function SidebarMenuBadge({ className, ...props }: React.ComponentProps<"div">) {
-  return (
-    <div
-      className={cn(
-        "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-lg px-1 font-medium text-sidebar-foreground text-xs tabular-nums",
-        "peer-hover/menu-button:text-sidebar-foreground peer-data-[active=true]/menu-button:text-sidebar-foreground",
-        "peer-data-[size=sm]/menu-button:top-1",
-        "peer-data-[size=default]/menu-button:top-1.5",
-        "peer-data-[size=lg]/menu-button:top-2.5",
-        "group-data-[collapsible=icon]:hidden",
-        className,
-      )}
-      data-sidebar="menu-badge"
-      data-slot="sidebar-menu-badge"
-      {...props}
-    />
-  );
-}
-
-function SidebarMenuSkeleton({
-  className,
-  showIcon = false,
-  ...props
-}: React.ComponentProps<"div"> & {
-  showIcon?: boolean;
-}) {
-  // Random width between 50 to 90%. Intentionally wrapped in useMemo to avoid changing width on every render.
-  const width = React.useMemo(() => {
-    return `${Math.floor(Math.random() * 40) + 50}%`;
-  }, []);
-
-  return (
-    <div
-      className={cn("flex h-8 items-center gap-2 rounded-lg px-2", className)}
-      data-sidebar="menu-skeleton"
-      data-slot="sidebar-menu-skeleton"
-      {...props}
-    >
-      {showIcon && <Skeleton className="size-4 rounded-lg" data-sidebar="menu-skeleton-icon" />}
-      <Skeleton
-        className="h-4 max-w-(--skeleton-width) flex-1"
-        data-sidebar="menu-skeleton-text"
-        style={
-          {
-            "--skeleton-width": width,
-          } as React.CSSProperties
-        }
-      />
-    </div>
-  );
-}
-
 function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
   return (
     <ul
@@ -897,23 +771,16 @@ export {
   SidebarContent,
   SidebarFooter,
   SidebarGroup,
-  SidebarGroupAction,
-  SidebarGroupContent,
-  SidebarGroupLabel,
   SidebarHeader,
-  SidebarInput,
   SidebarInset,
   SidebarMenu,
-  SidebarMenuBadge,
   SidebarMenuButton,
   SidebarMenuItem,
-  SidebarMenuSkeleton,
   SidebarMenuSub,
   SidebarMenuSubButton,
   SidebarMenuSubItem,
   SidebarProvider,
   SidebarRail,
-  SidebarSeparator,
   SidebarTrigger,
   useSidebar,
   useSidebarVisibility,
diff --git a/apps/web/src/components/ui/table.tsx b/apps/web/src/components/ui/table.tsx
index d3600f86993f..d9ae0618071f 100644
--- a/apps/web/src/components/ui/table.tsx
+++ b/apps/web/src/components/ui/table.tsx
@@ -28,16 +28,6 @@ function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
   );
 }
 
-function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
-  return (
-    <tfoot
-      data-slot="table-footer"
-      className={cn("border-t bg-muted/50 font-medium [&>tr]:last:border-b-0", className)}
-      {...props}
-    />
-  );
-}
-
 function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
   return (
     <tr
@@ -74,14 +64,4 @@ function TableCell({ className, ...props }: React.ComponentProps<"td">) {
   );
 }
 
-function TableCaption({ className, ...props }: React.ComponentProps<"caption">) {
-  return (
-    <caption
-      data-slot="table-caption"
-      className={cn("mt-4 text-xs text-muted-foreground", className)}
-      {...props}
-    />
-  );
-}
-
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption };
+export { Table, TableHeader, TableBody, TableHead, TableRow, TableCell };
diff --git a/apps/web/src/components/ui/toggle-group.tsx b/apps/web/src/components/ui/toggle-group.tsx
index 23501ec7a96c..846a34a1086a 100644
--- a/apps/web/src/components/ui/toggle-group.tsx
+++ b/apps/web/src/components/ui/toggle-group.tsx
@@ -6,7 +6,6 @@ import type { VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 import { cn } from "~/lib/utils";
-import { Separator } from "~/components/ui/separator";
 import { Toggle as ToggleComponent, type toggleVariants } from "~/components/ui/toggle";
 
 const ToggleGroupContext = React.createContext<VariantProps<typeof toggleVariants>>({
@@ -76,23 +75,4 @@ function Toggle({
   );
 }
 
-function ToggleGroupSeparator({
-  className,
-  orientation = "vertical",
-  ...props
-}: {
-  className?: string;
-} & React.ComponentProps<typeof Separator>) {
-  return (
-    <Separator
-      className={cn(
-        "pointer-events-none relative bg-input before:absolute before:inset-0 dark:before:bg-input/32",
-        className,
-      )}
-      orientation={orientation}
-      {...props}
-    />
-  );
-}
-
-export { ToggleGroup, Toggle, Toggle as ToggleGroupItem, ToggleGroupSeparator };
+export { ToggleGroup, Toggle, Toggle as ToggleGroupItem };
diff --git a/apps/web/src/components/ui/tooltip.tsx b/apps/web/src/components/ui/tooltip.tsx
index 77b15a01e16b..c0aaea40ceae 100644
--- a/apps/web/src/components/ui/tooltip.tsx
+++ b/apps/web/src/components/ui/tooltip.tsx
@@ -2,8 +2,6 @@ import { Tooltip as TooltipPrimitive } from "@base-ui/react/tooltip";
 
 import { cn } from "~/lib/utils";
 
-const TooltipCreateHandle = TooltipPrimitive.createHandle;
-
 const TooltipProvider = TooltipPrimitive.Provider;
 
 const Tooltip = TooltipPrimitive.Root;
@@ -61,4 +59,4 @@ function TooltipPopup({
   );
 }
 
-export { TooltipCreateHandle, TooltipProvider, Tooltip, TooltipTrigger, TooltipPopup };
+export { TooltipProvider, Tooltip, TooltipTrigger, TooltipPopup };
diff --git a/apps/web/src/providerInstances.test.ts b/apps/web/src/providerInstances.test.ts
index 3e809e17f588..cfd834a56541 100644
--- a/apps/web/src/providerInstances.test.ts
+++ b/apps/web/src/providerInstances.test.ts
@@ -9,7 +9,6 @@ import {
   isProviderInstancePickerVisible,
   resolveDefaultProviderModelSelection,
   resolveSelectableProviderInstance,
-  resolveProviderDriverKindForInstanceSelection,
 } from "./providerInstances";
 
 function provider(input: {
@@ -362,44 +361,6 @@ describe("resolveSelectableProviderInstance", () => {
   });
 });
 
-describe("resolveProviderDriverKindForInstanceSelection", () => {
-  it("maps custom provider instance ids back to their driver kind", () => {
-    const providers = [
-      provider({ provider: ProviderDriverKind.make("codex"), instanceId: "codex" }),
-      provider({
-        provider: ProviderDriverKind.make("claudeAgent"),
-        instanceId: "claude_openrouter",
-        displayName: "Claude OpenRouter",
-      }),
-    ];
-    const entries = deriveProviderInstanceEntries(providers);
-
-    expect(
-      resolveProviderDriverKindForInstanceSelection(
-        entries,
-        providers,
-        ProviderInstanceId.make("claude_openrouter"),
-      ),
-    ).toBe("claudeAgent");
-  });
-
-  it("does not guess a provider kind when the instance selection is unknown", () => {
-    const providers = [
-      provider({ provider: ProviderDriverKind.make("codex"), instanceId: "codex", enabled: false }),
-      provider({ provider: ProviderDriverKind.make("claudeAgent"), instanceId: "claudeAgent" }),
-    ];
-    const entries = deriveProviderInstanceEntries(providers);
-
-    expect(
-      resolveProviderDriverKindForInstanceSelection(
-        entries,
-        providers,
-        ProviderInstanceId.make("removed_instance"),
-      ),
-    ).toBeUndefined();
-  });
-});
-
 describe("getDefaultProviderInstanceModel", () => {
   it("uses the instance's own models, not the default instance of the kind", () => {
     const providers = [
diff --git a/apps/web/src/providerInstances.ts b/apps/web/src/providerInstances.ts
index 9230ab0a489e..88ea8a257240 100644
--- a/apps/web/src/providerInstances.ts
+++ b/apps/web/src/providerInstances.ts
@@ -298,21 +298,3 @@ export function resolveDefaultProviderModelSelection(
   const model = getDefaultProviderInstanceModel(providers, instanceId);
   return model ? { instanceId, model } : null;
 }
-
-/**
- * Resolve an open model-selection routing key back to a driver kind.
- * Custom instance ids such as `claude_openrouter` are not themselves
- * driver-kind slugs, but the composer still needs the owning driver kind
- * for capabilities, options, icons, and turn dispatch metadata.
- */
-export function resolveProviderDriverKindForInstanceSelection(
-  entries: ReadonlyArray<ProviderInstanceEntry>,
-  providers: ReadonlyArray<ServerProvider>,
-  selection: ProviderInstanceId | ProviderDriverKind | null | undefined,
-): ProviderDriverKind | undefined {
-  const matchedEntry = entries.find((entry) => entry.instanceId === selection);
-  if (matchedEntry) {
-    return matchedEntry.driverKind;
-  }
-  return undefined;
-}
diff --git a/apps/web/src/types.ts b/apps/web/src/types.ts
index 41ed6560fe5c..381333fd29ab 100644
--- a/apps/web/src/types.ts
+++ b/apps/web/src/types.ts
@@ -5,7 +5,6 @@ import type {
   ChatUnknownAttachment as ContractChatUnknownAttachment,
   OrchestrationCheckpointFile,
   OrchestrationCheckpointSummary,
-  OrchestrationLatestTurn,
   OrchestrationMessage,
   OrchestrationProposedPlan,
   OrchestrationSession,
@@ -86,9 +85,5 @@ export type Project = EnvironmentProject;
 export type Thread = EnvironmentThread;
 export type ThreadShell = EnvironmentThreadShell;
 
-export interface ThreadTurnState {
-  latestTurn: OrchestrationLatestTurn | null;
-}
-
 export type SidebarThreadSummary = EnvironmentThreadShell;
 export type ThreadSession = OrchestrationSession;
diff --git a/apps/web/src/vite-plus-browser-matchers.d.ts b/apps/web/src/vite-plus-browser-matchers.d.ts
deleted file mode 100644
index 5f600145e4e1..000000000000
--- a/apps/web/src/vite-plus-browser-matchers.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { ExpectPollOptions } from "vite-plus/test";
-import type { Locator } from "vite-plus/test/browser";
-
-declare module "vite-plus/test" {
-  interface ExpectStatic {
-    element: (
-      element: HTMLElement | SVGElement | null | Locator,
-      options?: ExpectPollOptions,
-    ) => any;
-  }
-}
diff --git a/infra/relay/src/agentActivity/AgentActivityPublisher.test.ts b/infra/relay/src/agentActivity/AgentActivityPublisher.test.ts
index ae3d4e4ad24d..366e387f1e6f 100644
--- a/infra/relay/src/agentActivity/AgentActivityPublisher.test.ts
+++ b/infra/relay/src/agentActivity/AgentActivityPublisher.test.ts
@@ -84,7 +84,6 @@ function makeEnvironmentLinks(
 ): EnvironmentLinks.EnvironmentLinks["Service"] {
   return {
     upsert: () => Effect.void,
-    listUsersForEnvironment: () => Effect.succeed(["dev:julius"]),
     listDeliveryUsersForEnvironment: () =>
       Effect.succeed([
         {
@@ -93,7 +92,6 @@ function makeEnvironmentLinks(
           liveActivitiesEnabled: true,
         },
       ]),
-    listPublicKeysForEnvironment: () => Effect.succeed([]),
     listForUser: () => Effect.succeed([]),
     getForUser: () => Effect.succeed(null),
     revokeForUser: () => Effect.succeed(false),
diff --git a/infra/relay/src/agentActivity/ApnsClient.ts b/infra/relay/src/agentActivity/ApnsClient.ts
index 17a2fe197b16..93c47af02e36 100644
--- a/infra/relay/src/agentActivity/ApnsClient.ts
+++ b/infra/relay/src/agentActivity/ApnsClient.ts
@@ -9,7 +9,7 @@ import * as HttpClient from "effect/unstable/http/HttpClient";
 import * as HttpClientRequest from "effect/unstable/http/HttpClientRequest";
 import { ApnsEnvironment as ApnsEnvironmentSchema, type ApnsCredentials } from "../Config.ts";
 import type { ApnsLiveActivityAlert, ApnsNotificationPayload } from "./apnsDeliveryJobs.ts";
-import { ApnsJwtEncodingError, ApnsJwtSigningError } from "./apnsJwt.ts";
+import type { ApnsJwtEncodingError, ApnsJwtSigningError } from "./apnsJwt.ts";
 import * as ApnsProviderTokens from "./ApnsProviderTokens.ts";
 
 export { ApnsJwtEncodingError, ApnsJwtSigningError } from "./apnsJwt.ts";
@@ -71,12 +71,7 @@ export class ApnsHttpRequestError extends Schema.TaggedError<ApnsHttpRequestErro
   }
 }
 
-export const ApnsError = Schema.Union([
-  ApnsJwtEncodingError,
-  ApnsJwtSigningError,
-  ApnsHttpRequestError,
-]);
-export type ApnsError = typeof ApnsError.Type;
+export type ApnsError = ApnsJwtEncodingError | ApnsJwtSigningError | ApnsHttpRequestError;
 
 const decodeApnsErrorResponseJson = Schema.decodeUnknownOption(
   Schema.fromJsonString(
diff --git a/infra/relay/src/agentActivity/FcmDeliveries.test.ts b/infra/relay/src/agentActivity/FcmDeliveries.test.ts
index 73b90f99b0a1..8f061fca16ff 100644
--- a/infra/relay/src/agentActivity/FcmDeliveries.test.ts
+++ b/infra/relay/src/agentActivity/FcmDeliveries.test.ts
@@ -162,7 +162,6 @@ function harness() {
     }),
     Layer.succeed(EnvironmentLinks, {
       upsert: () => Effect.void,
-      listUsersForEnvironment: () => Effect.succeed(["user"]),
       listDeliveryUsersForEnvironment: (input) =>
         Effect.sync(() =>
           current.linked && !current.revokedEnvironments.includes(input.environmentId)
@@ -177,7 +176,6 @@ function harness() {
               ]
             : [],
         ),
-      listPublicKeysForEnvironment: () => Effect.succeed([]),
       listForUser: () => Effect.succeed([]),
       revokeForUser: () => Effect.succeed(false),
       getForUser: (input) =>
diff --git a/infra/relay/src/agentActivity/MobileRegistrations.test.ts b/infra/relay/src/agentActivity/MobileRegistrations.test.ts
index 74d5c3740a51..457a545f74b0 100644
--- a/infra/relay/src/agentActivity/MobileRegistrations.test.ts
+++ b/infra/relay/src/agentActivity/MobileRegistrations.test.ts
@@ -106,7 +106,6 @@ function makeEnvironmentLinks(
 ): EnvironmentLinks.EnvironmentLinks["Service"] {
   return {
     upsert: () => Effect.void,
-    listUsersForEnvironment: () => Effect.succeed(["dev:julius"]),
     listDeliveryUsersForEnvironment: () =>
       Effect.succeed([
         {
@@ -115,7 +114,6 @@ function makeEnvironmentLinks(
           liveActivitiesEnabled: true,
         },
       ]),
-    listPublicKeysForEnvironment: () => Effect.succeed([]),
     listForUser: () => Effect.succeed([]),
     getForUser: () => Effect.succeed(null),
     revokeForUser: () => Effect.succeed(false),
diff --git a/infra/relay/src/environments/EnvironmentConnector.test.ts b/infra/relay/src/environments/EnvironmentConnector.test.ts
index 7f536bafb375..da6f4acc192e 100644
--- a/infra/relay/src/environments/EnvironmentConnector.test.ts
+++ b/infra/relay/src/environments/EnvironmentConnector.test.ts
@@ -209,9 +209,7 @@ function makeLinks(
 ): EnvironmentLinks.EnvironmentLinks["Service"] {
   return {
     upsert: () => Effect.void,
-    listUsersForEnvironment: () => Effect.succeed([]),
     listDeliveryUsersForEnvironment: () => Effect.succeed([]),
-    listPublicKeysForEnvironment: () => Effect.succeed([environmentKeyPair.publicKey]),
     listForUser: () => Effect.succeed([]),
     getForUser: () =>
       Effect.succeed({
diff --git a/infra/relay/src/environments/EnvironmentLinker.test.ts b/infra/relay/src/environments/EnvironmentLinker.test.ts
index c0811e82d923..78412e6c138e 100644
--- a/infra/relay/src/environments/EnvironmentLinker.test.ts
+++ b/infra/relay/src/environments/EnvironmentLinker.test.ts
@@ -123,9 +123,7 @@ function testLayer(input?: {
         }),
         Layer.succeed(EnvironmentLinks.EnvironmentLinks, {
           upsert: input?.upsert ?? (() => Effect.void),
-          listUsersForEnvironment: () => Effect.succeed([]),
           listDeliveryUsersForEnvironment: () => Effect.succeed([]),
-          listPublicKeysForEnvironment: () => Effect.succeed([]),
           listForUser: () => Effect.succeed([]),
           getForUser: () => Effect.succeed(null),
           revokeForUser: () => Effect.succeed(false),
diff --git a/infra/relay/src/environments/EnvironmentLinks.test.ts b/infra/relay/src/environments/EnvironmentLinks.test.ts
index dccb9e39f60f..0a856bcaf7f5 100644
--- a/infra/relay/src/environments/EnvironmentLinks.test.ts
+++ b/infra/relay/src/environments/EnvironmentLinks.test.ts
@@ -66,7 +66,7 @@ describe("EnvironmentLinks", () => {
 
       expect(error).toMatchObject({
         _tag: "EnvironmentLinkUserListPersistenceError",
-        operation: "list-delivery-users",
+        message: "Environment link user query 'list-delivery-users' failed for environment 'env-1'",
         environmentId: "env-1",
       });
       expect(error.cause).toBe(cause);
@@ -78,7 +78,7 @@ describe("EnvironmentLinks", () => {
     );
   });
 
-  it.effect("selects users when either notifications or Live Activities are enabled", () => {
+  it.effect("selects notification or Live Activity users by environment key", () => {
     const whereConditions: Array<unknown> = [];
     const fakeDb = {
       select: (selection: unknown) => {
@@ -99,7 +99,12 @@ describe("EnvironmentLinks", () => {
 
     return Effect.gen(function* () {
       const links = yield* EnvironmentLinks.EnvironmentLinks;
-      expect(yield* links.listUsersForEnvironment({ environmentId: "env-1" })).toEqual([]);
+      expect(
+        yield* links.listDeliveryUsersForEnvironment({
+          environmentId: "env-1",
+          environmentPublicKey: "public-key-1",
+        }),
+      ).toEqual([]);
       expect(whereConditions).toHaveLength(1);
 
       const query = new PgDialect().sqlToQuery(whereConditions[0] as never);
@@ -107,8 +112,9 @@ describe("EnvironmentLinks", () => {
       expect(query.sql).toContain('"relay_environment_links"."revoked_at" is null');
       expect(query.sql).toContain('"relay_environment_links"."notifications_enabled" = $2');
       expect(query.sql).toContain('"relay_environment_links"."live_activities_enabled" = $3');
+      expect(query.sql).toContain('"relay_environment_links"."environment_public_key" = $4');
       expect(query.sql).toContain(" or ");
-      expect(query.params).toEqual(["env-1", true, true]);
+      expect(query.params).toEqual(["env-1", true, true, "public-key-1"]);
     }).pipe(
       Effect.provide(
         EnvironmentLinks.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, fakeDb))),
diff --git a/infra/relay/src/environments/EnvironmentLinks.ts b/infra/relay/src/environments/EnvironmentLinks.ts
index 58347245d64d..f41794d60538 100644
--- a/infra/relay/src/environments/EnvironmentLinks.ts
+++ b/infra/relay/src/environments/EnvironmentLinks.ts
@@ -41,25 +41,12 @@ export class EnvironmentLinkUpsertPersistenceError extends Schema.TaggedError<En
 export class EnvironmentLinkUserListPersistenceError extends Schema.TaggedError<EnvironmentLinkUserListPersistenceError>()(
   "EnvironmentLinkUserListPersistenceError",
   {
-    operation: Schema.Literals(["list-users", "list-delivery-users"]),
     environmentId: Schema.String,
     cause: Schema.Defect(),
   },
 ) {
   override get message(): string {
-    return `Environment link user query '${this.operation}' failed for environment '${this.environmentId}'`;
-  }
-}
-
-export class EnvironmentPublicKeyListPersistenceError extends Schema.TaggedError<EnvironmentPublicKeyListPersistenceError>()(
-  "EnvironmentPublicKeyListPersistenceError",
-  {
-    environmentId: Schema.String,
-    cause: Schema.Defect(),
-  },
-) {
-  override get message(): string {
-    return `Failed to list public keys for environment '${this.environmentId}'`;
+    return `Environment link user query 'list-delivery-users' failed for environment '${this.environmentId}'`;
   }
 }
 
@@ -110,9 +97,6 @@ export class EnvironmentLinks extends Context.Service<
       readonly proof: RelayEnvironmentLinkProofPayload;
       readonly endpoint: RelayManagedEndpoint;
     }) => Effect.Effect<void, EnvironmentLinkUpsertPersistenceError>;
-    readonly listUsersForEnvironment: (input: {
-      readonly environmentId: string;
-    }) => Effect.Effect<ReadonlyArray<string>, EnvironmentLinkUserListPersistenceError>;
     readonly listDeliveryUsersForEnvironment: (input: {
       readonly environmentId: string;
       readonly environmentPublicKey: string;
@@ -120,9 +104,6 @@ export class EnvironmentLinks extends Context.Service<
       ReadonlyArray<AgentAwarenessDeliveryUserRecord>,
       EnvironmentLinkUserListPersistenceError
     >;
-    readonly listPublicKeysForEnvironment: (input: {
-      readonly environmentId: string;
-    }) => Effect.Effect<ReadonlyArray<string>, EnvironmentPublicKeyListPersistenceError>;
     readonly listForUser: (input: {
       readonly userId: string;
     }) => Effect.Effect<
@@ -140,23 +121,17 @@ export class EnvironmentLinks extends Context.Service<
   }
 >()("t3code-relay/environments/EnvironmentLinks") {}
 
-function agentAwarenessDeliveryUserCondition(environmentId: string) {
+function agentAwarenessDeliveryUserKeyCondition(input: {
+  readonly environmentId: string;
+  readonly environmentPublicKey: string;
+}) {
   return and(
-    eq(relayEnvironmentLinks.environmentId, environmentId),
+    eq(relayEnvironmentLinks.environmentId, input.environmentId),
     isNull(relayEnvironmentLinks.revokedAt),
     or(
       eq(relayEnvironmentLinks.notificationsEnabled, true),
       eq(relayEnvironmentLinks.liveActivitiesEnabled, true),
     ),
-  );
-}
-
-function agentAwarenessDeliveryUserKeyCondition(input: {
-  readonly environmentId: string;
-  readonly environmentPublicKey: string;
-}) {
-  return and(
-    agentAwarenessDeliveryUserCondition(input.environmentId),
     eq(relayEnvironmentLinks.environmentPublicKey, input.environmentPublicKey),
   );
 }
@@ -220,27 +195,6 @@ const make = Effect.gen(function* () {
         );
     }),
 
-    listUsersForEnvironment: Effect.fn("relay.environment_links.list_users_for_environment")(
-      function* (input) {
-        yield* Effect.annotateCurrentSpan({ "relay.environment_id": input.environmentId });
-        return yield* db
-          .select({ userId: relayEnvironmentLinks.userId })
-          .from(relayEnvironmentLinks)
-          .where(agentAwarenessDeliveryUserCondition(input.environmentId))
-          .pipe(
-            Effect.map((rows) => rows.map((row) => row.userId)),
-            Effect.mapError(
-              (cause) =>
-                new EnvironmentLinkUserListPersistenceError({
-                  operation: "list-users",
-                  environmentId: input.environmentId,
-                  cause,
-                }),
-            ),
-          );
-      },
-    ),
-
     listDeliveryUsersForEnvironment: Effect.fn(
       "relay.environment_links.list_delivery_users_for_environment",
     )(function* (input) {
@@ -264,34 +218,6 @@ const make = Effect.gen(function* () {
           Effect.mapError(
             (cause) =>
               new EnvironmentLinkUserListPersistenceError({
-                operation: "list-delivery-users",
-                environmentId: input.environmentId,
-                cause,
-              }),
-          ),
-        );
-    }),
-
-    listPublicKeysForEnvironment: Effect.fn(
-      "relay.environment_links.list_public_keys_for_environment",
-    )(function* (input) {
-      yield* Effect.annotateCurrentSpan({ "relay.environment_id": input.environmentId });
-      return yield* db
-        .select({ environmentPublicKey: relayEnvironmentLinks.environmentPublicKey })
-        .from(relayEnvironmentLinks)
-        .where(
-          and(
-            eq(relayEnvironmentLinks.environmentId, input.environmentId),
-            isNull(relayEnvironmentLinks.revokedAt),
-          ),
-        )
-        .pipe(
-          Effect.map((rows) => [
-            ...new Set(rows.map((row) => row.environmentPublicKey).filter((key) => key.length > 0)),
-          ]),
-          Effect.mapError(
-            (cause) =>
-              new EnvironmentPublicKeyListPersistenceError({
                 environmentId: input.environmentId,
                 cause,
               }),
diff --git a/infra/relay/src/http/Api.test.ts b/infra/relay/src/http/Api.test.ts
index edaf1d08ed7a..af220de52619 100644
--- a/infra/relay/src/http/Api.test.ts
+++ b/infra/relay/src/http/Api.test.ts
@@ -319,9 +319,7 @@ function relayUnlinkTestLayer(input?: {
       EnvironmentLinks.EnvironmentLinks,
       EnvironmentLinks.EnvironmentLinks.of({
         upsert: () => Effect.die("unused upsert"),
-        listUsersForEnvironment: () => Effect.die("unused listUsersForEnvironment"),
         listDeliveryUsersForEnvironment: () => Effect.die("unused listDeliveryUsersForEnvironment"),
-        listPublicKeysForEnvironment: () => Effect.die("unused listPublicKeysForEnvironment"),
         listForUser: () => Effect.die("unused listForUser"),
         getForUser: input?.getForUser ?? (() => Effect.succeed(null)),
         revokeForUser: input?.revokeForUser ?? (() => Effect.succeed(false)),
diff --git a/infra/relay/src/http/Api.ts b/infra/relay/src/http/Api.ts
index 5a4d0c9ca40c..fbe867b7792a 100644
--- a/infra/relay/src/http/Api.ts
+++ b/infra/relay/src/http/Api.ts
@@ -1041,7 +1041,6 @@ const RelayCommonPersistenceError = Schema.Union([
   Devices.DeviceListPersistenceError,
   LiveActivities.LiveActivityRegistrationPersistenceError,
   EnvironmentLinks.EnvironmentLinkUserListPersistenceError,
-  EnvironmentLinks.EnvironmentPublicKeyListPersistenceError,
   EnvironmentLinks.EnvironmentLinkListPersistenceError,
   EnvironmentLinks.EnvironmentLinkLookupPersistenceError,
   EnvironmentLinks.EnvironmentLinkRevokePersistenceError,
diff --git a/packages/client-runtime/src/authorization/remote.test.ts b/packages/client-runtime/src/authorization/remote.test.ts
index 0df4bab35ed8..ec2861de91ea 100644
--- a/packages/client-runtime/src/authorization/remote.test.ts
+++ b/packages/client-runtime/src/authorization/remote.test.ts
@@ -10,7 +10,6 @@ import {
   appendClientConnectionParams,
   bootstrapRemoteBearerSession,
   exchangeRemoteDpopAccessToken,
-  fetchRemoteDpopSessionState,
   fetchRemoteSessionState,
   issueRemoteDpopWebSocketTicket,
   issueRemoteWebSocketTicket,
@@ -380,45 +379,6 @@ describe("remote environment authorization", () => {
     }),
   );
 
-  it.effect("loads remote session state with a DPoP-bound access token", () =>
-    Effect.gen(function* () {
-      const fetch = recordedFetch(
-        Response.json({
-          authenticated: true,
-          auth: {
-            policy: "remote-reachable",
-            bootstrapMethods: ["one-time-token"],
-            sessionMethods: ["dpop-access-token"],
-            sessionCookieName: "t3_session",
-          },
-          sessionMethod: "dpop-access-token",
-          scopes: [
-            "orchestration:read",
-            "orchestration:operate",
-            "terminal:operate",
-            "review:write",
-          ],
-          expiresAt: "2026-05-01T12:00:00.000Z",
-        }),
-      );
-
-      yield* fetchRemoteDpopSessionState({
-        httpBaseUrl: "https://remote.example.com/",
-        accessToken: "dpop-access-token",
-        dpopProof: "dpop-proof",
-      }).pipe(provideRemoteHttp(fetch.fetchFn));
-
-      expectFetchCall(fetch.calls, 1, {
-        url: "https://remote.example.com/api/auth/session",
-        method: "GET",
-        headers: {
-          authorization: "DPoP dpop-access-token",
-          dpop: "dpop-proof",
-        },
-      });
-    }),
-  );
-
   it.effect("fails hung fetch requests on the configured timeout", () =>
     Effect.gen(function* () {
       const fetch = hangingFetch();
diff --git a/packages/client-runtime/src/authorization/remote.ts b/packages/client-runtime/src/authorization/remote.ts
index be863e189a9e..425d95d3ac17 100644
--- a/packages/client-runtime/src/authorization/remote.ts
+++ b/packages/client-runtime/src/authorization/remote.ts
@@ -158,27 +158,6 @@ export const fetchRemoteSessionState = Effect.fn(
   );
 });
 
-export const fetchRemoteDpopSessionState = Effect.fn(
-  "clientRuntime.authorization.fetchRemoteDpopSessionState",
-)(function* (input: {
-  readonly httpBaseUrl: string;
-  readonly accessToken: string;
-  readonly dpopProof: string;
-  readonly timeoutMs?: number;
-}) {
-  const client = yield* makeEnvironmentHttpApiGroupClient(input.httpBaseUrl, "auth");
-  return yield* executeEnvironmentHttpRequest(
-    environmentEndpointUrl(input.httpBaseUrl, "/api/auth/session"),
-    input.timeoutMs ?? DEFAULT_REMOTE_REQUEST_TIMEOUT_MS,
-    client.session({
-      headers: {
-        authorization: `DPoP ${input.accessToken}`,
-        dpop: input.dpopProof,
-      },
-    }),
-  );
-});
-
 export const issueRemoteWebSocketTicket = Effect.fn(
   "clientRuntime.authorization.issueRemoteWebSocketTicket",
 )(function* (input: {
diff --git a/packages/contracts/src/environment.ts b/packages/contracts/src/environment.ts
index 825dca87b631..70888f2988e6 100644
--- a/packages/contracts/src/environment.ts
+++ b/packages/contracts/src/environment.ts
@@ -189,14 +189,6 @@ export const ExecutionEnvironmentDescriptor = Schema.Struct({
 });
 export type ExecutionEnvironmentDescriptor = typeof ExecutionEnvironmentDescriptor.Type;
 
-export const EnvironmentConnectionState = Schema.Literals([
-  "connecting",
-  "connected",
-  "disconnected",
-  "error",
-]);
-export type EnvironmentConnectionState = typeof EnvironmentConnectionState.Type;
-
 export const RepositoryIdentityLocator = Schema.Struct({
   source: Schema.Literal("git-remote"),
   remoteName: TrimmedNonEmptyString,
@@ -228,9 +220,3 @@ export const ScopedThreadRef = Schema.Struct({
   threadId: ThreadId,
 });
 export type ScopedThreadRef = typeof ScopedThreadRef.Type;
-
-export const ScopedThreadSessionRef = Schema.Struct({
-  environmentId: EnvironmentId,
-  threadId: ThreadId,
-});
-export type ScopedThreadSessionRef = typeof ScopedThreadSessionRef.Type;
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index e1af4f936141..7e738b97786b 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -1,92 +1,15 @@
-import type {
-  VcsCreateRefInput,
-  VcsCreateRefResult,
-  VcsCreateWorktreeInput,
-  VcsCreateWorktreeResult,
-  VcsInitInput,
-  VcsListRefsInput,
-  VcsListRefsResult,
-  VcsPullInput,
-  VcsPullResult,
-  VcsRemoveWorktreeInput,
-  VcsSwitchRefInput,
-  VcsSwitchRefResult,
-  GitPreparePullRequestThreadInput,
-  GitPreparePullRequestThreadResult,
-  GitPullRequestRefInput,
-  GitResolvePullRequestResult,
-  VcsStatusInput,
-  VcsStatusResult,
-} from "./git.ts";
-import type {
-  ReviewDiffFileContentsInput,
-  ReviewDiffFileContentsResult,
-  ReviewDiffPreviewInput,
-  ReviewDiffPreviewResult,
-} from "./review.ts";
-import type { FilesystemBrowseInput, FilesystemBrowseResult } from "./filesystem.ts";
-import type { AssetCreateUrlInput, AssetCreateUrlResult } from "./assets.ts";
-import type {
-  ProjectListEntriesInput,
-  ProjectListEntriesResult,
-  ProjectReadFileInput,
-  ProjectReadFileResult,
-  ProjectSearchEntriesInput,
-  ProjectSearchEntriesResult,
-  ProjectWriteFileInput,
-  ProjectWriteFileResult,
-} from "./project.ts";
-import type {
-  TerminalAttachInput,
-  TerminalAttachStreamEvent,
-  TerminalClearInput,
-  TerminalCloseInput,
-  TerminalMetadataStreamEvent,
-  TerminalOpenInput,
-  TerminalResizeInput,
-  TerminalRestartInput,
-  TerminalSessionSnapshot,
-  TerminalWriteInput,
-} from "./terminal.ts";
 import * as Schema from "effect/Schema";
-import type {
-  DiscoveredLocalServerList,
-  PreviewCloseInput,
-  PreviewEvent,
-  PreviewListInput,
-  PreviewListResult,
-  PreviewNavigateInput,
-  PreviewOpenInput,
-  PreviewRefreshInput,
-  PreviewReportStatusInput,
-  PreviewResizeInput,
-  PreviewSessionSnapshot,
-} from "./preview.ts";
+
 import {
   PreviewAutomationClickInput,
   PreviewAutomationEvaluateInput,
-  PreviewAutomationHost,
-  PreviewAutomationHostFocus,
   PreviewAutomationPressInput,
-  PreviewAutomationResponse,
   PreviewAutomationScrollInput,
   PreviewAutomationSnapshot,
   PreviewAutomationStatus,
-  PreviewAutomationStreamEvent,
   PreviewAutomationTypeInput,
   PreviewAutomationWaitForInput,
 } from "./previewAutomation.ts";
-import type {
-  ClientOrchestrationCommand,
-  OrchestrationGetFullThreadDiffInput,
-  OrchestrationGetFullThreadDiffResult,
-  OrchestrationGetTurnDiffInput,
-  OrchestrationGetTurnDiffResult,
-  OrchestrationShellSnapshot,
-  OrchestrationShellStreamItem,
-  OrchestrationSubscribeThreadInput,
-  OrchestrationThreadStreamItem,
-} from "./orchestration.ts";
 import { SnapShotSource } from "./orchestration.ts";
 import { EnvironmentId, TrimmedNonEmptyString } from "./baseSchemas.ts";
 import { BrowserProfileId } from "./browserProfile.ts";
@@ -100,14 +23,7 @@ import { AdvertisedEndpoint } from "./remoteAccess.ts";
 import { ExecutionEnvironmentDescriptor } from "./environment.ts";
 import { type ClientSettings, type QuitConfirmationMode, SnapShotShortcut } from "./settings.ts";
 import type { EditorId } from "./editor.ts";
-import type {
-  SourceControlCloneRepositoryInput,
-  SourceControlCloneRepositoryResult,
-  SourceControlPublishRepositoryInput,
-  SourceControlPublishRepositoryResult,
-  SourceControlRepositoryInfo,
-  SourceControlRepositoryLookupInput,
-} from "./sourceControl.ts";
+
 import type {
   DesktopAppActivationRequest,
   DesktopAppActivationResponse,
@@ -694,19 +610,6 @@ export interface DesktopPreviewFavicon {
   capturedAt: number;
 }
 
-export const DesktopPreviewFaviconSchema: Schema.Codec<DesktopPreviewFavicon> = Schema.Struct({
-  dataUrl: Schema.String.check(
-    Schema.isMaxLength(FAVICON_DATA_URL_MAX_LENGTH),
-    Schema.isPattern(/^data:image\/png;base64,[a-z0-9+/]+={0,2}$/i),
-  ),
-  pageUrl: Schema.String.check(Schema.isMaxLength(2_048)),
-  capturedAt: Schema.Number.check(
-    Schema.isFinite(),
-    Schema.isGreaterThanOrEqualTo(0),
-    Schema.isLessThanOrEqualTo(FAVICON_CAPTURED_AT_MAX),
-  ),
-});
-
 export interface DesktopPreviewTabState {
   tabId: string;
   webContentsId: number | null;
@@ -746,27 +649,6 @@ export const DesktopPreviewAutomationStatusSchema = Schema.Struct({
 });
 export type DesktopPreviewAutomationStatus = typeof DesktopPreviewAutomationStatusSchema.Type;
 
-export const DesktopPreviewNavStatusSchema = Schema.Union([
-  Schema.Struct({ kind: Schema.Literal("Idle") }),
-  Schema.Struct({
-    kind: Schema.Literal("Loading"),
-    url: Schema.String,
-    title: Schema.String,
-  }),
-  Schema.Struct({
-    kind: Schema.Literal("Success"),
-    url: Schema.String,
-    title: Schema.String,
-  }),
-  Schema.Struct({
-    kind: Schema.Literal("LoadFailed"),
-    url: Schema.String,
-    title: Schema.String,
-    code: Schema.Number,
-    description: Schema.String,
-  }),
-]);
-
 export interface DesktopPreviewPointerEvent {
   tabId: string;
   phase: "move" | "click";
@@ -1474,135 +1356,3 @@ export interface LocalApi {
     setClientSettings: (settings: ClientSettings) => Promise<void>;
   };
 }
-
-/**
- * APIs bound to a specific backend environment connection.
- *
- * These operations must always be routed with explicit environment context.
- * They represent remote stateful capabilities such as orchestration, terminal,
- * project, VCS, and provider operations. In multi-environment mode, each environment gets
- * its own instance of this surface, and callers should resolve it by
- * `environmentId` rather than reaching through the local desktop bridge.
- */
-export interface EnvironmentApi {
-  terminal: {
-    open: (input: typeof TerminalOpenInput.Encoded) => Promise<TerminalSessionSnapshot>;
-    attach: (
-      input: typeof TerminalAttachInput.Encoded,
-      callback: (event: TerminalAttachStreamEvent) => void,
-      options?: {
-        onResubscribe?: () => void;
-      },
-    ) => () => void;
-    write: (input: typeof TerminalWriteInput.Encoded) => Promise<void>;
-    resize: (input: typeof TerminalResizeInput.Encoded) => Promise<void>;
-    clear: (input: typeof TerminalClearInput.Encoded) => Promise<void>;
-    restart: (input: typeof TerminalRestartInput.Encoded) => Promise<TerminalSessionSnapshot>;
-    close: (input: typeof TerminalCloseInput.Encoded) => Promise<void>;
-    onMetadata: (
-      callback: (event: TerminalMetadataStreamEvent) => void,
-      options?: {
-        onResubscribe?: () => void;
-      },
-    ) => () => void;
-  };
-  projects: {
-    listEntries: (input: ProjectListEntriesInput) => Promise<ProjectListEntriesResult>;
-    readFile: (input: ProjectReadFileInput) => Promise<ProjectReadFileResult>;
-    searchEntries: (input: ProjectSearchEntriesInput) => Promise<ProjectSearchEntriesResult>;
-    writeFile: (input: ProjectWriteFileInput) => Promise<ProjectWriteFileResult>;
-  };
-  filesystem: {
-    browse: (input: FilesystemBrowseInput) => Promise<FilesystemBrowseResult>;
-  };
-  assets: {
-    createUrl: (input: AssetCreateUrlInput) => Promise<AssetCreateUrlResult>;
-  };
-  sourceControl: {
-    lookupRepository: (
-      input: SourceControlRepositoryLookupInput,
-    ) => Promise<SourceControlRepositoryInfo>;
-    cloneRepository: (
-      input: SourceControlCloneRepositoryInput,
-    ) => Promise<SourceControlCloneRepositoryResult>;
-    publishRepository: (
-      input: SourceControlPublishRepositoryInput,
-    ) => Promise<SourceControlPublishRepositoryResult>;
-  };
-  vcs: {
-    listRefs: (input: VcsListRefsInput) => Promise<VcsListRefsResult>;
-    createWorktree: (input: VcsCreateWorktreeInput) => Promise<VcsCreateWorktreeResult>;
-    removeWorktree: (input: VcsRemoveWorktreeInput) => Promise<void>;
-    createRef: (input: VcsCreateRefInput) => Promise<VcsCreateRefResult>;
-    switchRef: (input: VcsSwitchRefInput) => Promise<VcsSwitchRefResult>;
-    init: (input: VcsInitInput) => Promise<void>;
-    pull: (input: VcsPullInput) => Promise<VcsPullResult>;
-    refreshStatus: (input: VcsStatusInput) => Promise<VcsStatusResult>;
-    onStatus: (
-      input: VcsStatusInput,
-      callback: (status: VcsStatusResult) => void,
-      options?: {
-        onResubscribe?: () => void;
-      },
-    ) => () => void;
-  };
-  git: {
-    resolvePullRequest: (input: GitPullRequestRefInput) => Promise<GitResolvePullRequestResult>;
-    preparePullRequestThread: (
-      input: GitPreparePullRequestThreadInput,
-    ) => Promise<GitPreparePullRequestThreadResult>;
-  };
-  review: {
-    getDiffPreview: (input: ReviewDiffPreviewInput) => Promise<ReviewDiffPreviewResult>;
-    getDiffFileContents: (
-      input: ReviewDiffFileContentsInput,
-    ) => Promise<ReviewDiffFileContentsResult>;
-  };
-  orchestration: {
-    dispatchCommand: (command: ClientOrchestrationCommand) => Promise<{ sequence: number }>;
-    getTurnDiff: (input: OrchestrationGetTurnDiffInput) => Promise<OrchestrationGetTurnDiffResult>;
-    getFullThreadDiff: (
-      input: OrchestrationGetFullThreadDiffInput,
-    ) => Promise<OrchestrationGetFullThreadDiffResult>;
-    getArchivedShellSnapshot: () => Promise<OrchestrationShellSnapshot>;
-    subscribeShell: (
-      callback: (event: OrchestrationShellStreamItem) => void,
-      options?: {
-        onResubscribe?: () => void;
-      },
-    ) => () => void;
-    subscribeThread: (
-      input: OrchestrationSubscribeThreadInput,
-      callback: (event: OrchestrationThreadStreamItem) => void,
-      options?: {
-        onResubscribe?: () => void;
-      },
-    ) => () => void;
-  };
-  preview: {
-    open: (input: typeof PreviewOpenInput.Encoded) => Promise<PreviewSessionSnapshot>;
-    navigate: (input: typeof PreviewNavigateInput.Encoded) => Promise<PreviewSessionSnapshot>;
-    resize: (input: typeof PreviewResizeInput.Encoded) => Promise<PreviewSessionSnapshot>;
-    refresh: (input: typeof PreviewRefreshInput.Encoded) => Promise<void>;
-    close: (input: typeof PreviewCloseInput.Encoded) => Promise<void>;
-    list: (input: typeof PreviewListInput.Encoded) => Promise<PreviewListResult>;
-    reportStatus: (input: typeof PreviewReportStatusInput.Encoded) => Promise<void>;
-    automation: {
-      connect: (
-        input: PreviewAutomationHost,
-        callback: (event: PreviewAutomationStreamEvent) => void,
-        options?: { onResubscribe?: () => void },
-      ) => () => void;
-      respond: (response: PreviewAutomationResponse) => Promise<void>;
-      focusHost: (input: PreviewAutomationHostFocus) => Promise<void>;
-    };
-    onEvent: (
-      callback: (event: PreviewEvent) => void,
-      options?: { onResubscribe?: () => void },
-    ) => () => void;
-    subscribePorts: (
-      callback: (servers: DiscoveredLocalServerList) => void,
-      options?: { onResubscribe?: () => void },
-    ) => () => void;
-  };
-}
diff --git a/packages/contracts/src/orchestration.ts b/packages/contracts/src/orchestration.ts
index f477efd09c44..cf3aad4ba73d 100644
--- a/packages/contracts/src/orchestration.ts
+++ b/packages/contracts/src/orchestration.ts
@@ -2208,26 +2208,6 @@ export const ProviderSessionRuntimeStatus = Schema.Literals([
 ]);
 export type ProviderSessionRuntimeStatus = typeof ProviderSessionRuntimeStatus.Type;
 
-const ProjectionThreadTurnStatus = Schema.Literals([
-  "running",
-  "completed",
-  "interrupted",
-  "error",
-]);
-export type ProjectionThreadTurnStatus = typeof ProjectionThreadTurnStatus.Type;
-
-const ProjectionCheckpointRow = Schema.Struct({
-  threadId: ThreadId,
-  turnId: TurnId,
-  checkpointTurnCount: NonNegativeInt,
-  checkpointRef: CheckpointRef,
-  status: OrchestrationCheckpointStatus,
-  files: Schema.Array(OrchestrationCheckpointFile),
-  assistantMessageId: Schema.NullOr(MessageId),
-  completedAt: IsoDateTime,
-});
-export type ProjectionCheckpointRow = typeof ProjectionCheckpointRow.Type;
-
 export const ProjectionPendingApprovalStatus = Schema.Literals(["pending", "resolved"]);
 export type ProjectionPendingApprovalStatus = typeof ProjectionPendingApprovalStatus.Type;
 
diff --git a/packages/contracts/src/providerRuntime.test.ts b/packages/contracts/src/providerRuntime.test.ts
index 9ba30b235fc1..f7404c66ed6a 100644
--- a/packages/contracts/src/providerRuntime.test.ts
+++ b/packages/contracts/src/providerRuntime.test.ts
@@ -1,19 +1,11 @@
-import { describe, expect, expectTypeOf, it } from "vite-plus/test";
+import { describe, expect, it } from "vite-plus/test";
 import * as Schema from "effect/Schema";
 
-import {
-  classifyTaskAgentKind,
-  ProviderRuntimeEvent,
-  type ProviderRuntimeEventType,
-} from "./providerRuntime.ts";
+import { classifyTaskAgentKind, ProviderRuntimeEvent } from "./providerRuntime.ts";
 
 const decodeRuntimeEvent = Schema.decodeUnknownSync(ProviderRuntimeEvent);
 
 describe("ProviderRuntimeEvent", () => {
-  it("includes every runtime event in the public event type", () => {
-    expectTypeOf<ProviderRuntimeEvent["type"]>().toEqualTypeOf<ProviderRuntimeEventType>();
-  });
-
   it("requires input and output totals for complete turn usage", () => {
     const completeEvent = {
       type: "turn.completed",
diff --git a/packages/contracts/src/providerRuntime.ts b/packages/contracts/src/providerRuntime.ts
index af1baac74f9d..01a8f9ad8f83 100644
--- a/packages/contracts/src/providerRuntime.ts
+++ b/packages/contracts/src/providerRuntime.ts
@@ -148,59 +148,6 @@ export const CanonicalRequestType = Schema.Literals([
 ]);
 export type CanonicalRequestType = typeof CanonicalRequestType.Type;
 
-const ProviderRuntimeEventType = Schema.Literals([
-  "session.started",
-  "session.configured",
-  "session.state.changed",
-  "session.exited",
-  "thread.started",
-  "thread.state.changed",
-  "thread.metadata.updated",
-  "thread.token-usage.updated",
-  "thread.realtime.started",
-  "thread.realtime.item-added",
-  "thread.realtime.audio.delta",
-  "thread.realtime.error",
-  "thread.realtime.closed",
-  "turn.started",
-  "turn.completed",
-  "turn.aborted",
-  "turn.plan.updated",
-  "turn.proposed.delta",
-  "turn.proposed.completed",
-  "turn.diff.updated",
-  "item.started",
-  "item.updated",
-  "item.completed",
-  "content.delta",
-  "request.opened",
-  "request.resolved",
-  "user-input.requested",
-  "user-input.resolved",
-  "task.started",
-  "task.progress",
-  "task.updated",
-  "task.completed",
-  "hook.started",
-  "hook.progress",
-  "hook.completed",
-  "tool.progress",
-  "tool.summary",
-  "tool.denied",
-  "auth.status",
-  "account.updated",
-  "account.rate-limits.updated",
-  "mcp.status.updated",
-  "mcp.oauth.completed",
-  "model.rerouted",
-  "config.warning",
-  "deprecation.notice",
-  "files.persisted",
-  "runtime.warning",
-  "runtime.error",
-]);
-export type ProviderRuntimeEventType = typeof ProviderRuntimeEventType.Type;
-
 const SessionStartedType = Schema.Literal("session.started");
 const SessionConfiguredType = Schema.Literal("session.configured");
 const SessionStateChangedType = Schema.Literal("session.state.changed");
diff --git a/packages/effect-codex-app-server/scripts/generate.ts b/packages/effect-codex-app-server/scripts/generate.ts
index e5d4db7da52d..48509db8cc21 100644
--- a/packages/effect-codex-app-server/scripts/generate.ts
+++ b/packages/effect-codex-app-server/scripts/generate.ts
@@ -413,7 +413,7 @@ function addAsyncQuestionFields(value: Schema.Json): Schema.Json {
     return {
       ...value,
       properties: {
-        ...properties,
+        ...Object.fromEntries(Object.entries(properties).filter(([key]) => key !== "type")),
         delivery: { anyOf: [{ type: "string", enum: ["async"] }, { type: "null" }] },
         questions: {
           anyOf: [
@@ -433,6 +433,7 @@ function addAsyncQuestionFields(value: Schema.Json): Schema.Json {
             { type: "null" },
           ],
         },
+        type: itemType,
       },
     };
   }
@@ -760,7 +761,8 @@ const generateFiles = Effect.fn("generateFiles")(function* () {
   for (const [name, schema] of Object.entries(aggregateSchemas).toSorted(([left], [right]) =>
     left.localeCompare(right),
   )) {
-    generator.addSchema(name, addAsyncQuestionFields(schema) as never);
+    aggregateSchemas[name] = addAsyncQuestionFields(schema);
+    generator.addSchema(name, aggregateSchemas[name] as never);
   }
 
   const generatedEntries = new Map<string, string>();
diff --git a/packages/shared/src/nodeSqliteClient.test.ts b/packages/shared/src/nodeSqliteClient.test.ts
index 6738892a9792..25b0ba2d38e8 100644
--- a/packages/shared/src/nodeSqliteClient.test.ts
+++ b/packages/shared/src/nodeSqliteClient.test.ts
@@ -5,7 +5,7 @@ import * as SqlClient from "effect/unstable/sql/SqlClient";
 
 import * as SqliteClient from "./nodeSqliteClient.ts";
 
-const layer = it.layer(SqliteClient.layerMemory());
+const layer = it.layer(SqliteClient.layer({ filename: ":memory:" }));
 
 layer("NodeSqliteClient", (it) => {
   it.effect("runs prepared queries and returns positional values", () =>
diff --git a/packages/shared/src/nodeSqliteClient.ts b/packages/shared/src/nodeSqliteClient.ts
index d156d4cc3e5f..71ba11884626 100644
--- a/packages/shared/src/nodeSqliteClient.ts
+++ b/packages/shared/src/nodeSqliteClient.ts
@@ -36,11 +36,6 @@ export interface SqliteClientConfig {
   readonly transformQueryNames?: ((str: string) => string) | undefined;
 }
 
-export interface SqliteMemoryClientConfig extends Omit<
-  SqliteClientConfig,
-  "filename" | "readonly"
-> {}
-
 export class UnsupportedNodeSqliteVersionError extends Schema.TaggedError<UnsupportedNodeSqliteVersionError>()(
   "UnsupportedNodeSqliteVersionError",
   {
@@ -86,9 +81,8 @@ const checkNodeSqliteCompat = () => {
   return Effect.void;
 };
 
-const makeWithDatabase = Effect.fn("makeWithDatabase")(function* (
+const make = Effect.fn("makeWithDatabase")(function* (
   options: SqliteClientConfig,
-  openDatabase: () => NodeSqlite.DatabaseSync,
 ): Effect.fn.Return<Client.SqlClient, SqlError, Scope.Scope | Reactivity.Reactivity> {
   yield* checkNodeSqliteCompat();
 
@@ -100,7 +94,11 @@ const makeWithDatabase = Effect.fn("makeWithDatabase")(function* (
   const makeConnection = Effect.gen(function* () {
     const scope = yield* Effect.scope;
     const db = yield* Effect.try({
-      try: openDatabase,
+      try: () =>
+        new NodeSqlite.DatabaseSync(options.filename, {
+          readOnly: options.readonly ?? false,
+          allowExtension: options.allowExtension ?? false,
+        }),
       catch: (cause) =>
         new SqlError({
           reason: classifySqliteError(cause, {
@@ -281,39 +279,5 @@ const makeWithDatabase = Effect.fn("makeWithDatabase")(function* (
   });
 });
 
-const make = (
-  options: SqliteClientConfig,
-): Effect.Effect<Client.SqlClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
-  makeWithDatabase(
-    options,
-    () =>
-      new NodeSqlite.DatabaseSync(options.filename, {
-        readOnly: options.readonly ?? false,
-        allowExtension: options.allowExtension ?? false,
-      }),
-  );
-
-const makeMemory = (
-  config: SqliteMemoryClientConfig = {},
-): Effect.Effect<Client.SqlClient, SqlError, Scope.Scope | Reactivity.Reactivity> =>
-  makeWithDatabase(
-    {
-      ...config,
-      filename: ":memory:",
-      readonly: false,
-    },
-    () => {
-      const database = new NodeSqlite.DatabaseSync(":memory:", {
-        allowExtension: config.allowExtension ?? false,
-      });
-      return database;
-    },
-  );
-
 export const layer = (config: SqliteClientConfig): Layer.Layer<Client.SqlClient, SqlError> =>
   Layer.effect(Client.SqlClient, make(config)).pipe(Layer.provide(Reactivity.layer));
-
-export const layerMemory = (
-  config: SqliteMemoryClientConfig = {},
-): Layer.Layer<Client.SqlClient, SqlError> =>
-  Layer.effect(Client.SqlClient, makeMemory(config)).pipe(Layer.provide(Reactivity.layer));
diff --git a/packages/shared/src/shell.ts b/packages/shared/src/shell.ts
index 07ac73f8c6a7..11a45907cc1d 100644
--- a/packages/shared/src/shell.ts
+++ b/packages/shared/src/shell.ts
@@ -11,7 +11,6 @@ import * as Path from "effect/Path";
 
 import { HostProcessEnvironment, HostProcessPlatform } from "./hostProcess.ts";
 import * as Context from "effect/Context";
-
 const SHELL_ENV_NAME_PATTERN = /^[A-Z0-9_]+$/;
 const WINDOWS_PATH_DELIMITER = ";";
 const POSIX_PATH_DELIMITER = ":";
diff --git a/packages/tailscale/src/tailscale.ts b/packages/tailscale/src/tailscale.ts
index 3594742f274e..096176aa42f8 100644
--- a/packages/tailscale/src/tailscale.ts
+++ b/packages/tailscale/src/tailscale.ts
@@ -111,13 +111,11 @@ export class TailscaleCommandTimeoutError extends Schema.TaggedError<TailscaleCo
   }
 }
 
-export const TailscaleCommandError = Schema.Union([
-  TailscaleCommandSpawnError,
-  TailscaleCommandOutputError,
-  TailscaleCommandExitError,
-  TailscaleCommandTimeoutError,
-]);
-export type TailscaleCommandError = typeof TailscaleCommandError.Type;
+export type TailscaleCommandError =
+  | TailscaleCommandSpawnError
+  | TailscaleCommandOutputError
+  | TailscaleCommandExitError
+  | TailscaleCommandTimeoutError;
 
 export class TailscaleStatusParseError extends Schema.TaggedError<TailscaleStatusParseError>()(
   "TailscaleStatusParseError",
diff --git a/scripts/dev-runner.ts b/scripts/dev-runner.ts
index d11f8244bfeb..5a44c7c1845e 100644
--- a/scripts/dev-runner.ts
+++ b/scripts/dev-runner.ts
@@ -190,17 +190,6 @@ export class DevRunnerHostNotProxiableError extends Schema.TaggedError<DevRunner
   }
 }
 
-export const DevRunnerError = Schema.Union([
-  DevRunnerConfigurationError,
-  DevRunnerHostNotProxiableError,
-  DevRunnerInvalidPortOffsetError,
-  DevRunnerPortExhaustedError,
-  DevRunnerProcessError,
-  DevRunnerProcessExitError,
-]);
-export type DevRunnerError = typeof DevRunnerError.Type;
-export const isDevRunnerError = Schema.is(DevRunnerError);
-
 const optionalStringConfig = (name: string): Config.Config<string | undefined> =>
   Config.String(name).pipe(
     Config.option,
diff --git a/scripts/lib/dev-share.ts b/scripts/lib/dev-share.ts
index f4806d77602d..94a1c462043f 100644
--- a/scripts/lib/dev-share.ts
+++ b/scripts/lib/dev-share.ts
@@ -110,13 +110,10 @@ export class DevServeFailedError extends Schema.TaggedError<DevServeFailedError>
   }
 }
 
-export const DevShareError = Schema.Union([
-  TailscaleUnavailableError,
-  TailnetNameMissingError,
-  DevServeFailedError,
-]);
-export type DevShareError = typeof DevShareError.Type;
-export const isDevShareError = Schema.is(DevShareError);
+export type DevShareError =
+  | TailscaleUnavailableError
+  | TailnetNameMissingError
+  | DevServeFailedError;
 
 /**
  * Removes any mapping for `webPort`, reporting whether the port is now clear.
diff --git a/scripts/mobile-showcase.ts b/scripts/mobile-showcase.ts
index 6b6adebeb779..ccce919a7443 100644
--- a/scripts/mobile-showcase.ts
+++ b/scripts/mobile-showcase.ts
@@ -26,8 +26,6 @@ import showcaseConfig, {
 import {
   SHOWCASE_ENVIRONMENTS,
   SHOWCASE_PROJECTS,
-  SHOWCASE_TERMINAL_ID,
-  SHOWCASE_THREAD_ID,
   seedShowcaseEnvironment,
 } from "./mobile-showcase-environment.ts";
 
@@ -668,17 +666,6 @@ function buildShowcasePairingUrl(host: string, port: number, credential: string)
   return url.toString();
 }
 
-export function showcaseSceneUrl(scene: ShowcaseScene, environmentId: string): string {
-  if (scene === "threads") return `${APP_SCHEME}://`;
-  if (scene === "environments") return `${APP_SCHEME}://settings/environments`;
-  const threadPath = `threads/${encodeURIComponent(environmentId)}/${SHOWCASE_THREAD_ID}`;
-  if (scene === "thread") return `${APP_SCHEME}://${threadPath}`;
-  if (scene === "terminal") {
-    return `${APP_SCHEME}://${threadPath}/terminal?terminalId=${SHOWCASE_TERMINAL_ID}`;
-  }
-  return `${APP_SCHEME}://${threadPath}/review`;
-}
-
 export function encodeAndroidPairingUrls(pairingUrls: ReadonlyArray<string>): string {
   return `json-uri:${encodeURIComponent(JSON.stringify(pairingUrls))}`;
 }
diff --git a/scripts/notify-discord-release.test.ts b/scripts/notify-discord-release.test.ts
index 7ca108f31884..dba0c6cd5dac 100644
--- a/scripts/notify-discord-release.test.ts
+++ b/scripts/notify-discord-release.test.ts
@@ -3,11 +3,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { HttpClient, HttpClientError, HttpClientResponse } from "effect/unstable/http";
 
-import {
-  buildDiscordReleaseAnnouncement,
-  isDiscordReleaseAnnouncementError,
-  postDiscordWebhook,
-} from "./notify-discord-release.ts";
+import { buildDiscordReleaseAnnouncement, postDiscordWebhook } from "./notify-discord-release.ts";
 
 const latestAnnouncement = {
   target: "latest",
@@ -135,7 +131,6 @@ it.effect("preserves webhook request context and the full client cause chain", (
     assert.equal(error.cause, clientError);
     assert.equal((error.cause as HttpClientError.HttpClientError).cause, requestCause);
     assert.ok(!error.message.includes(requestCause.message));
-    assert.equal(isDiscordReleaseAnnouncementError(error), true);
   });
 });
 
@@ -169,6 +164,5 @@ it.effect("preserves a non-success response error with structured status context
     }
     assert.equal(error.cause.reason._tag, "StatusCodeError");
     assert.ok(!error.message.includes(error.cause.message));
-    assert.equal(isDiscordReleaseAnnouncementError(error), true);
   });
 });
diff --git a/scripts/notify-discord-release.ts b/scripts/notify-discord-release.ts
index 8f9f1d7a33b6..67cf556d4725 100644
--- a/scripts/notify-discord-release.ts
+++ b/scripts/notify-discord-release.ts
@@ -90,13 +90,6 @@ export class DiscordReleaseWebhookResponseError extends Schema.TaggedError<Disco
   }
 }
 
-export const DiscordReleaseAnnouncementError = Schema.Union([
-  DiscordReleaseWebhookRequestError,
-  DiscordReleaseWebhookResponseError,
-]);
-export type DiscordReleaseAnnouncementError = typeof DiscordReleaseAnnouncementError.Type;
-export const isDiscordReleaseAnnouncementError = Schema.is(DiscordReleaseAnnouncementError);
-
 const targetLabels = {
   prerelease: "Prerelease",
   latest: "Latest",
diff --git a/scripts/sync-reference-repos.ts b/scripts/sync-reference-repos.ts
index 2cb13d42683b..e56c5fe9e4b4 100644
--- a/scripts/sync-reference-repos.ts
+++ b/scripts/sync-reference-repos.ts
@@ -91,14 +91,11 @@ export class ReferenceRepoGitSubtreeError extends Schema.TaggedError<ReferenceRe
   }
 }
 
-export const ReferenceRepoSyncError = Schema.Union([
-  ReferenceRepoSelectionError,
-  ReferenceRepoVersionSourceError,
-  ReferenceRepoVersionResolutionError,
-  ReferenceRepoGitSubtreeError,
-]);
-export type ReferenceRepoSyncError = typeof ReferenceRepoSyncError.Type;
-export const isReferenceRepoSyncError = Schema.is(ReferenceRepoSyncError);
+export type ReferenceRepoSyncError =
+  | ReferenceRepoSelectionError
+  | ReferenceRepoVersionSourceError
+  | ReferenceRepoVersionResolutionError
+  | ReferenceRepoGitSubtreeError;
 
 const decodeJsonSource = Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.Unknown));
 const decodeYamlSource = Schema.decodeEffect(fromYaml(Schema.Unknown));

From cb3d95c17487f3d834a5537f7c3aa0106bc9b5ec Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 19:03:56 -0700
Subject: [PATCH 09/25] fix(server): release oversized pull request diff cache
 entries (#12523)

---
 .../pullRequest/PullRequestService.test.ts    | 68 ++++++++++++++++++-
 .../src/pullRequest/PullRequestService.ts     | 21 +++++-
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/apps/server/src/pullRequest/PullRequestService.test.ts b/apps/server/src/pullRequest/PullRequestService.test.ts
index 8e9262a08104..9d563d3965c3 100644
--- a/apps/server/src/pullRequest/PullRequestService.test.ts
+++ b/apps/server/src/pullRequest/PullRequestService.test.ts
@@ -5382,7 +5382,7 @@ it.effect("keeps the diff cached across a file being ticked off", () =>
     yield* service.diff(reference);
     yield* service.filesViewed(reference);
 
-    // The press forgets only the reader's own ticks: a diff of any size survives it.
+    // The press forgets only the reader's own ticks; cached diffs survive it.
     assert.strictEqual(diffReads, 1);
     assert.strictEqual(viewedReads, 2);
 
@@ -5397,6 +5397,72 @@ it.effect("keeps the diff cached across a file being ticked off", () =>
   }),
 );
 
+it.effect("returns large diff slices intact without retaining them in either cache", () =>
+  Effect.gen(function* () {
+    let reads = 0;
+    const patch = "\u{1f4bb}".repeat(140_000);
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getDiff: () =>
+            Effect.sync(() => {
+              reads += 1;
+              return { patch, truncated: false, nextCursor: "2" };
+            }),
+        }),
+      ],
+    });
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    for (const input of [
+      reference,
+      { ...reference, cursor: "2" },
+      { ...reference, commit: "a".repeat(40) },
+    ]) {
+      const before = reads;
+      assert.deepStrictEqual(yield* service.diff(input), {
+        patch,
+        truncated: false,
+        nextCursor: "2",
+      });
+      assert.deepStrictEqual(yield* service.diff(input), {
+        patch,
+        truncated: false,
+        nextCursor: "2",
+      });
+      assert.strictEqual(reads, before + 2);
+    }
+  }),
+);
+
+it.effect("caches a small replacement after releasing a large diff", () =>
+  Effect.gen(function* () {
+    let reads = 0;
+    const largePatch = "x".repeat(300_000);
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getDiff: () =>
+            Effect.sync(() => {
+              reads += 1;
+              return {
+                patch: reads === 1 ? largePatch : "@@ small replacement",
+                truncated: false,
+                nextCursor: null,
+              };
+            }),
+        }),
+      ],
+    });
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    assert.strictEqual((yield* service.diff(reference)).patch, largePatch);
+    assert.strictEqual((yield* service.diff(reference)).patch, "@@ small replacement");
+    assert.strictEqual((yield* service.diff(reference)).patch, "@@ small replacement");
+    assert.strictEqual(reads, 2);
+  }),
+);
+
 const environmentViewedProvider = (
   revisions: Map<string, string>,
   asked: Array<ReadonlyArray<string>>,
diff --git a/apps/server/src/pullRequest/PullRequestService.ts b/apps/server/src/pullRequest/PullRequestService.ts
index 2cc1180bb826..a653ef94c713 100644
--- a/apps/server/src/pullRequest/PullRequestService.ts
+++ b/apps/server/src/pullRequest/PullRequestService.ts
@@ -151,6 +151,10 @@ const LIST_CACHE_CAPACITY = 64;
 const LIST_STATS_CACHE_CAPACITY = 32;
 const DETAIL_CACHE_CAPACITY = 128;
 const DIFF_CACHE_CAPACITY = 128;
+// Each diff cache can retain at most 64 MiB of patch text, counting UTF-16 storage.
+const MAX_CACHED_DIFF_PATCH_BYTES = 512 * 1024;
+const canCacheDiff = (value: PullRequestDiffResult) =>
+  value.patch.length * 2 <= MAX_CACHED_DIFF_PATCH_BYTES;
 const FILES_VIEWED_CACHE_CAPACITY = 128;
 const VIEWER_CACHE_CAPACITY = 32;
 
@@ -2507,6 +2511,7 @@ export const make = Effect.gen(function* () {
     const record = (key: string, value: PullRequestDiffResult) =>
       Effect.map(Clock.currentTimeMillis, (at) => {
         held.delete(key);
+        if (!canCacheDiff(value)) return;
         if (held.size >= DIFF_CACHE_CAPACITY) {
           const oldest = held.keys().next().value;
           if (oldest !== undefined) held.delete(oldest);
@@ -2977,7 +2982,21 @@ export const make = Effect.gen(function* () {
         ? (lastGoodSummary.peek(refCacheKey(input))?.updatedAt ?? null)
         : null,
     ]);
-    return staleDiff(key, Cache.get(diffCache, key));
+    const read = Cache.get(diffCache, key).pipe(
+      Effect.tap((value) =>
+        canCacheDiff(value)
+          ? Effect.void
+          : Cache.getSuccess(diffCache, key).pipe(
+              Effect.flatMap((current) =>
+                Option.isSome(current) && current.value === value
+                  ? Cache.invalidate(diffCache, key)
+                  : Effect.void,
+              ),
+              Effect.uninterruptible,
+            ),
+      ),
+    );
+    return staleDiff(key, read);
   };
 
   const filesViewedCache = yield* Cache.makeWith(

From 823119350ee29cca434b1295aa5c560f4c9ef98a Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 20:36:50 -0700
Subject: [PATCH 10/25] feat(mobile): view and control agent devices (#12531)

---
 apps/mobile/metro.config.js                   |  29 +-
 .../mobile/scripts/generate-device-stream.mts |  39 +++
 apps/mobile/src/Stack.tsx                     |  11 +
 apps/mobile/src/components/AppSymbol.tsx      |   3 +
 .../devices/DevicePreviewRouteScreen.tsx      | 309 ++++++++++++++++++
 .../features/devices/DeviceStreamWebView.tsx  | 109 ++++++
 .../devices/device-preview-button.tsx         |  41 +++
 .../devices/device-stream-document.test.ts    |  49 +++
 .../devices/device-stream-document.ts         |  41 +++
 .../features/devices/device-stream.browser.ts | 223 +++++++++++++
 .../devices/threadDevicePreviews.test.ts      | 106 ++++++
 .../features/devices/threadDevicePreviews.ts  |  28 ++
 .../features/threads/ThreadDetailScreen.tsx   |  25 ++
 .../threads/floating-working-control.tsx      |  52 ++-
 apps/mobile/src/state/device.ts               |  44 +++
 .../src/types/mobile-device-stream.d.ts       |   4 +
 .../device/DeviceStreamView.test.tsx          |   2 +-
 .../components/device/DeviceStreamView.tsx    |   2 +-
 .../components/device/deviceStream.test.ts    | 167 +++++++++-
 .../preview/ThreadPreviewMiniPlayer.tsx       |   2 +-
 .../preview/previewMiniPlayerLayout.ts        |   2 +-
 docs/user/devices.md                          |   9 +-
 knip.jsonc                                    |   9 +-
 packages/client-runtime/package.json          |   8 +
 .../client-runtime/src/device/hubAccess.ts    |  18 +
 .../client-runtime/src/device/stream.ts       |  51 ++-
 .../src/state/deviceHubAccess.ts              |  21 +-
 27 files changed, 1344 insertions(+), 60 deletions(-)
 create mode 100644 apps/mobile/scripts/generate-device-stream.mts
 create mode 100644 apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx
 create mode 100644 apps/mobile/src/features/devices/DeviceStreamWebView.tsx
 create mode 100644 apps/mobile/src/features/devices/device-preview-button.tsx
 create mode 100644 apps/mobile/src/features/devices/device-stream-document.test.ts
 create mode 100644 apps/mobile/src/features/devices/device-stream-document.ts
 create mode 100644 apps/mobile/src/features/devices/device-stream.browser.ts
 create mode 100644 apps/mobile/src/features/devices/threadDevicePreviews.test.ts
 create mode 100644 apps/mobile/src/features/devices/threadDevicePreviews.ts
 create mode 100644 apps/mobile/src/state/device.ts
 create mode 100644 apps/mobile/src/types/mobile-device-stream.d.ts
 create mode 100644 packages/client-runtime/src/device/hubAccess.ts
 rename apps/web/src/components/device/deviceStream.ts => packages/client-runtime/src/device/stream.ts (93%)

diff --git a/apps/mobile/metro.config.js b/apps/mobile/metro.config.js
index 02a6e2c8666c..9025dc4f6b28 100644
--- a/apps/mobile/metro.config.js
+++ b/apps/mobile/metro.config.js
@@ -17,6 +17,7 @@ const licenseGeneratorSource = path.join(
 );
 const escapedWorkspaceRoot = workspaceRoot.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const mobileShikiRoot = path.dirname(require.resolve("shiki/package.json", { paths: [__dirname] }));
+const generatedDeviceStreamRoot = path.join(__dirname, ".generated", "device-stream");
 const resolveShikiDependencyRoot = (packageName) => {
   const entryPath = require.resolve(packageName, { paths: [mobileShikiRoot] });
   let currentDir = path.dirname(entryPath);
@@ -46,6 +47,7 @@ config.resolver = {
   extraNodeModules: {
     ...config.resolver?.extraNodeModules,
     "@t3tools/mobile-third-party-licenses": generatedLicenseModuleRoot,
+    "@t3tools/mobile-device-stream": generatedDeviceStreamRoot,
     shiki: mobileShikiRoot,
     "@shikijs/core": resolveShikiDependencyRoot("@shikijs/core"),
     "@shikijs/engine-javascript": resolveShikiDependencyRoot("@shikijs/engine-javascript"),
@@ -93,7 +95,32 @@ async function generateMobileThirdPartyLicenses() {
   ]);
 }
 
-module.exports = generateMobileThirdPartyLicenses().then(() =>
+async function prepareDeviceStream() {
+  const { generateDeviceStreamScript } = await import(
+    pathToFileURL(path.join(__dirname, "scripts", "generate-device-stream.mts")).href
+  );
+  await generateDeviceStreamScript();
+  if (process.env.NODE_ENV !== "production") {
+    let rebuild = Promise.resolve();
+    for (const [directory, files] of [
+      [path.join(__dirname, "src/features/devices"), ["device-stream.browser.ts"]],
+      [
+        path.join(workspaceRoot, "packages/client-runtime/src/device"),
+        ["stream.ts", "hubAccess.ts"],
+      ],
+    ]) {
+      // The generated module participates in Metro's normal Fast Refresh.
+      fs.watch(directory, { persistent: false }, (_event, filename) => {
+        if (filename && !files.includes(String(filename))) return;
+        rebuild = rebuild.then(generateDeviceStreamScript).catch((error) => {
+          console.error("Could not rebuild the device stream:", error);
+        });
+      });
+    }
+  }
+}
+
+module.exports = Promise.all([generateMobileThirdPartyLicenses(), prepareDeviceStream()]).then(() =>
   withUniwindConfig(config, {
     cssEntryFile: "./global.css",
     extraThemes,
diff --git a/apps/mobile/scripts/generate-device-stream.mts b/apps/mobile/scripts/generate-device-stream.mts
new file mode 100644
index 000000000000..249bbab6ca58
--- /dev/null
+++ b/apps/mobile/scripts/generate-device-stream.mts
@@ -0,0 +1,39 @@
+import * as NodeFSP from "node:fs/promises";
+import * as NodePath from "node:path";
+import * as NodeURL from "node:url";
+import { build } from "vite-plus";
+
+const mobileRoot = NodePath.resolve(NodePath.dirname(NodeURL.fileURLToPath(import.meta.url)), "..");
+
+/** Metro embeds the shared browser transport as a small script in the native WebView. */
+export async function generateDeviceStreamScript() {
+  const result = await build({
+    configFile: false,
+    logLevel: "silent",
+    build: {
+      write: false,
+      target: "es2022",
+      minify: true,
+      lib: {
+        entry: NodePath.join(mobileRoot, "src/features/devices/device-stream.browser.ts"),
+        name: "T3DeviceStream",
+        formats: ["iife"],
+      },
+    },
+  });
+  const bundles = Array.isArray(result) ? result : [result];
+  const chunk = bundles
+    .flatMap((bundle) => ("output" in bundle ? bundle.output : []))
+    .find((output) => output.type === "chunk");
+  if (!chunk) throw new Error("Device stream build did not emit a script.");
+  const root = NodePath.join(mobileRoot, ".generated/device-stream");
+  await NodeFSP.mkdir(root, { recursive: true });
+  for (const [name, contents] of [
+    ["index.js", `module.exports = ${JSON.stringify(chunk.code)};\n`],
+    ["package.json", '{"main":"index.js"}\n'],
+  ] as const) {
+    const destination = NodePath.join(root, name);
+    const previous = await NodeFSP.readFile(destination, "utf8").catch(() => null);
+    if (previous !== contents) await NodeFSP.writeFile(destination, contents);
+  }
+}
diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx
index c750e366c1d3..adad6f8e1f18 100644
--- a/apps/mobile/src/Stack.tsx
+++ b/apps/mobile/src/Stack.tsx
@@ -30,6 +30,7 @@ import {
 import { ReviewCommentComposerSheet } from "./features/review/ReviewCommentComposerSheet";
 import { ReviewSheet } from "./features/review/ReviewSheet";
 import { ThreadTerminalRouteScreen } from "./features/terminal/ThreadTerminalRouteScreen";
+import { DevicePreviewRouteScreen } from "./features/devices/DevicePreviewRouteScreen";
 import { GitBranchesSheet } from "./features/threads/git/GitBranchesSheet";
 import { GitCommitSheet } from "./features/threads/git/GitCommitSheet";
 import { GitConfirmSheet } from "./features/threads/git/GitConfirmSheet";
@@ -449,6 +450,7 @@ const WORKSPACE_OVERLAY_ROUTES = new Set([
   "SettingsLegal",
   "SettingsSheet",
   "ThreadReviewComment",
+  "ThreadDevicePreview",
   "ThreadSettingsSheet",
 ]);
 
@@ -595,6 +597,15 @@ export const RootStack = createNativeStackNavigator({
       linking: `${THREAD_LINKING_PREFIX}/terminal`,
       options: SOLID_HEADER_OPTIONS,
     }),
+    ThreadDevicePreview: createNativeStackScreen({
+      screen: DevicePreviewRouteScreen,
+      linking: `${THREAD_LINKING_PREFIX}/devices`,
+      options: {
+        presentation: "fullScreenModal",
+        headerShown: false,
+        gestureEnabled: false,
+      },
+    }),
     ThreadReview: createNativeStackScreen({
       screen: ReviewSheet,
       linking: `${THREAD_LINKING_PREFIX}/review`,
diff --git a/apps/mobile/src/components/AppSymbol.tsx b/apps/mobile/src/components/AppSymbol.tsx
index 6002dc48cd91..5540d5b5dfb8 100644
--- a/apps/mobile/src/components/AppSymbol.tsx
+++ b/apps/mobile/src/components/AppSymbol.tsx
@@ -60,6 +60,7 @@ import IconGitBranch from "@tabler/icons-react-native/IconGitBranch";
 import IconGitMerge from "@tabler/icons-react-native/IconGitMerge";
 import IconGitPullRequest from "@tabler/icons-react-native/IconGitPullRequest";
 import IconHammer from "@tabler/icons-react-native/IconHammer";
+import IconHome from "@tabler/icons-react-native/IconHome";
 import IconInfoCircle from "@tabler/icons-react-native/IconInfoCircle";
 import IconKeyboard from "@tabler/icons-react-native/IconKeyboard";
 import IconKeyboardHide from "@tabler/icons-react-native/IconKeyboardHide";
@@ -161,6 +162,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   gearshape: IconSettings,
   globe: IconWorld,
   hammer: IconHammer,
+  house: IconHome,
   "info.circle": IconInfoCircle,
   internaldrive: IconDatabase,
   keyboard: IconKeyboard,
@@ -194,6 +196,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   "sidebar.right": IconLayoutSidebarRight,
   "slider.horizontal.3": IconAdjustmentsHorizontal,
   "square.and.pencil": IconEdit,
+  "square.on.square": IconCopy,
   "square.grid.2x2": IconApps,
   "square.split.2x1": IconLayoutColumns,
   star: IconStar,
diff --git a/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx b/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx
new file mode 100644
index 000000000000..2d85a71f1470
--- /dev/null
+++ b/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx
@@ -0,0 +1,309 @@
+import { useIsFocused, useNavigation, type StaticScreenProps } from "@react-navigation/native";
+import { createNativeStackNavigator } from "@react-navigation/native-stack";
+import { EnvironmentId, ThreadId } from "@t3tools/contracts";
+import * as Cause from "effect/Cause";
+import { useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
+import { ActivityIndicator, Alert, AppState, Platform, Pressable, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import { AppText } from "../../components/AppText";
+import { ScreenHeader, type ScreenHeaderMenuItem } from "../../components/ScreenHeader";
+import { NativeHeaderToolbar } from "../../native/StackHeader";
+import { deviceEnvironment, refreshDeviceHubAccess, useDeviceHubAccess } from "../../state/device";
+import { useEnvironmentQuery } from "../../state/query";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
+import { DeviceStreamWebView, type DeviceStreamRef } from "./DeviceStreamWebView";
+import {
+  selectedThreadDevicePreview,
+  threadDevicePreviews,
+  type ThreadDevicePreview,
+} from "./threadDevicePreviews";
+
+const DevicePreviewStack = createNativeStackNavigator<{ DevicePreview: undefined }>();
+
+type DevicePreviewRouteScreenProps = StaticScreenProps<{
+  readonly environmentId: string;
+  readonly threadId: string;
+}>;
+
+/** The nested native stack supplies the navigation bar inside the modal. */
+export function DevicePreviewRouteScreen({ route }: DevicePreviewRouteScreenProps) {
+  const navigation = useNavigation();
+  const onClose = useCallback(() => navigation.goBack(), [navigation]);
+  return (
+    <View collapsable={false} className="flex-1 bg-sheet">
+      <DevicePreviewStack.Navigator
+        screenOptions={{
+          headerShown: Platform.OS === "ios",
+          headerBackVisible: false,
+          headerShadowVisible: false,
+          headerTransparent: false,
+          headerTitleStyle: { fontSize: 17, fontWeight: "600" },
+        }}
+      >
+        <DevicePreviewStack.Screen name="DevicePreview">
+          {() => (
+            <DevicePreviewScreen
+              environmentId={EnvironmentId.make(route.params.environmentId)}
+              threadId={ThreadId.make(route.params.threadId)}
+              onClose={onClose}
+            />
+          )}
+        </DevicePreviewStack.Screen>
+      </DevicePreviewStack.Navigator>
+    </View>
+  );
+}
+
+function DevicePreviewScreen({
+  environmentId,
+  threadId,
+  onClose,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly threadId: ThreadId;
+  readonly onClose: () => void;
+}) {
+  const insets = useSafeAreaInsets();
+  const { themeVariables } = useAppearancePreferences();
+  const focused = useIsFocused();
+  const [foreground, setForeground] = useState(AppState.currentState === "active");
+  const [selectedKey, setSelectedKey] = useState<string | null>(null);
+  const [inputConnected, setInputConnected] = useState(false);
+  const [streamAttempt, setStreamAttempt] = useState(0);
+  const [shuttingDown, setShuttingDown] = useState(false);
+  const shutdown = useAtomCommand(deviceEnvironment.shutdown, { reportFailure: false });
+  const streamRef = useRef<DeviceStreamRef>(null);
+  const state = useEnvironmentQuery(deviceEnvironment.state({ environmentId, input: {} }));
+  const previews = useMemo(
+    () => threadDevicePreviews(state.data, threadId),
+    [state.data, threadId],
+  );
+  const preview = selectedThreadDevicePreview(previews, selectedKey);
+  const onInputConnected = useCallback(
+    async (connected: boolean) => setInputConnected(connected),
+    [],
+  );
+  useEffect(() => {
+    const subscription = AppState.addEventListener("change", (state) =>
+      setForeground(state === "active"),
+    );
+    return () => subscription.remove();
+  }, []);
+  useEffect(() => {
+    if (focused && state.data !== null && previews.length === 0) onClose();
+  }, [focused, state.data, previews.length, onClose]);
+
+  const shutDownDevice = async () => {
+    if (!preview || shuttingDown) return;
+    setShuttingDown(true);
+    try {
+      const result = await shutdown({
+        environmentId,
+        input: {
+          hostId: preview.session.hostId,
+          deviceId: preview.session.deviceId,
+          platform: preview.session.platform,
+        },
+      });
+      if (result._tag === "Failure") {
+        Alert.alert("Could not shut down device", String(Cause.squash(result.cause)));
+      }
+    } finally {
+      setShuttingDown(false);
+    }
+  };
+
+  const controls: ScreenHeaderMenuItem[] = [
+    {
+      id: "reload",
+      title: "Reload stream",
+      icon: "arrow.clockwise",
+      disabled: !preview || shuttingDown,
+      onPress: () => {
+        setInputConnected(false);
+        setStreamAttempt((attempt) => attempt + 1);
+      },
+    },
+    ...(preview?.session.platform === "android"
+      ? [
+          {
+            id: "back",
+            title: "Back",
+            icon: "arrow.left",
+            disabled: !inputConnected,
+            onPress: () => streamRef.current?.back(),
+          },
+        ]
+      : []),
+    {
+      id: "app-switcher",
+      title: "App switcher",
+      icon: "square.on.square",
+      disabled: !inputConnected,
+      onPress: () => streamRef.current?.appSwitcher(),
+    },
+    ...(preview?.session.platform === "ios"
+      ? [
+          {
+            id: "rotate",
+            title: "Rotate device",
+            icon: "arrow.clockwise",
+            disabled: !inputConnected,
+            onPress: () => streamRef.current?.rotate(),
+          },
+        ]
+      : []),
+    {
+      id: "shutdown",
+      title: shuttingDown ? "Shutting down…" : "Shut down device",
+      icon: "power",
+      disabled: !preview || shuttingDown,
+      onPress: () => void shutDownDevice(),
+    },
+  ];
+  return (
+    <View className="flex-1 bg-sheet" style={{ paddingBottom: insets.bottom }}>
+      <ScreenHeader
+        title={preview?.name ?? "Devices"}
+        sidebar={false}
+        onBack={onClose}
+        options={{ headerBackVisible: false }}
+        actions={[
+          {
+            accessibilityLabel: "Home",
+            icon: "house",
+            disabled: !inputConnected,
+            onPress: () => streamRef.current?.home(),
+          },
+        ]}
+        menus={[
+          {
+            title: "Device options",
+            icon: "ellipsis",
+            items: [
+              ...(previews.length > 1
+                ? [
+                    {
+                      id: "devices",
+                      title: "Devices",
+                      inline: true,
+                      items: previews.map((device) => ({
+                        id: device.key,
+                        title: device.name,
+                        subtitle: device.description,
+                        selected: device.key === preview?.key,
+                        onPress: () => setSelectedKey(device.key),
+                      })),
+                    },
+                  ]
+                : []),
+              ...controls,
+            ],
+          },
+        ]}
+      />
+      {Platform.OS === "ios" ? (
+        <NativeHeaderToolbar placement="left">
+          <NativeHeaderToolbar.Button
+            icon="xmark"
+            accessibilityLabel="Close device preview"
+            onPress={onClose}
+            separateBackground
+          />
+        </NativeHeaderToolbar>
+      ) : null}
+      {preview && focused && foreground ? (
+        <OpenDevicePreview
+          key={`${preview.key}:${streamAttempt}`}
+          environmentId={environmentId}
+          preview={preview}
+          streamRef={streamRef}
+          onInputConnected={onInputConnected}
+        />
+      ) : (
+        <View className="flex-1 items-center justify-center gap-4 px-6">
+          {state.error ? (
+            <>
+              <AppText selectable className="text-center text-sm text-foreground-muted">
+                {state.error}
+              </AppText>
+              <Pressable
+                accessibilityRole="button"
+                className="rounded-full bg-subtle px-6 py-3"
+                onPress={state.refresh}
+              >
+                <AppText>Retry</AppText>
+              </Pressable>
+            </>
+          ) : focused && foreground ? (
+            <ActivityIndicator color={themeVariables["--color-icon"]} />
+          ) : null}
+        </View>
+      )}
+    </View>
+  );
+}
+
+function OpenDevicePreview({
+  environmentId,
+  preview,
+  streamRef,
+  onInputConnected,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly preview: ThreadDevicePreview;
+  readonly streamRef: RefObject<DeviceStreamRef | null>;
+  readonly onInputConnected: (connected: boolean) => Promise<void>;
+}) {
+  const { session } = preview;
+  const { themeVariables } = useAppearancePreferences();
+  const { access, error, refresh } = useDeviceHubAccess(environmentId, session.hostId);
+  const onUnauthorized = useCallback(
+    async () => refreshDeviceHubAccess(environmentId),
+    [environmentId],
+  );
+  useEffect(() => {
+    refreshDeviceHubAccess(environmentId);
+    return () => void onInputConnected(false);
+  }, [environmentId, onInputConnected]);
+  return access ? (
+    <DeviceStreamWebView
+      ref={streamRef}
+      access={access}
+      platform={session.platform}
+      deviceId={session.deviceId}
+      colors={{
+        background: themeVariables["--color-sheet-solid"],
+        foreground: themeVariables["--color-foreground"],
+        muted: themeVariables["--color-foreground-muted"],
+        buttonBackground: themeVariables["--color-subtle"],
+      }}
+      onUnauthorized={onUnauthorized}
+      onInputConnected={onInputConnected}
+    />
+  ) : (
+    <View className="flex-1 items-center justify-center gap-4 px-6">
+      {error ? (
+        <>
+          <AppText selectable className="text-center text-sm text-foreground-muted">
+            {error}
+          </AppText>
+          <Pressable
+            accessibilityRole="button"
+            className="rounded-full bg-subtle px-6 py-3"
+            onPress={refresh}
+          >
+            <AppText>Retry</AppText>
+          </Pressable>
+        </>
+      ) : (
+        <>
+          <ActivityIndicator color={themeVariables["--color-icon"]} />
+          <AppText className="text-sm text-foreground-muted">Connecting to device...</AppText>
+        </>
+      )}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/devices/DeviceStreamWebView.tsx b/apps/mobile/src/features/devices/DeviceStreamWebView.tsx
new file mode 100644
index 000000000000..9a5cef83ae3f
--- /dev/null
+++ b/apps/mobile/src/features/devices/DeviceStreamWebView.tsx
@@ -0,0 +1,109 @@
+import deviceStreamScript from "@t3tools/mobile-device-stream";
+import { useImperativeHandle, useLayoutEffect, useMemo, useRef, useState, type Ref } from "react";
+import { Platform } from "react-native";
+import { WebView } from "react-native-webview";
+
+import {
+  deviceStreamDocument,
+  deviceStreamMessage,
+  type DeviceStreamConfiguration,
+} from "./device-stream-document";
+
+export interface DeviceStreamRef {
+  home: () => void;
+  back: () => void;
+  appSwitcher: () => void;
+  rotate: () => void;
+}
+
+type NativeStreamBridge = {
+  readonly ref?: Ref<DeviceStreamRef>;
+  readonly onUnauthorized: () => Promise<void>;
+  readonly onInputConnected: (connected: boolean) => Promise<void>;
+};
+
+export function DeviceStreamWebView({
+  ref,
+  ...props
+}: DeviceStreamConfiguration & NativeStreamBridge) {
+  const [attempt, setAttempt] = useState(0);
+  const configuration = JSON.stringify({
+    access: props.access,
+    platform: props.platform,
+    deviceId: props.deviceId,
+    colors: props.colors,
+  });
+  return (
+    <DeviceStreamDocumentView
+      key={`${attempt}:${configuration}`}
+      ref={ref}
+      configuration={configuration}
+      background={props.colors.background}
+      onUnauthorized={props.onUnauthorized}
+      onInputConnected={props.onInputConnected}
+      onRetry={() => setAttempt((attempt) => attempt + 1)}
+    />
+  );
+}
+
+function DeviceStreamDocumentView({
+  ref,
+  configuration,
+  background,
+  onUnauthorized,
+  onInputConnected,
+  onRetry,
+}: NativeStreamBridge & {
+  readonly configuration: string;
+  readonly background: string;
+  readonly onRetry: () => void;
+}) {
+  const webView = useRef<WebView>(null);
+  const source = useMemo(
+    () => ({
+      html: deviceStreamDocument(configuration, deviceStreamScript),
+      // Android WebCodecs needs a secure document; streams still use the environment's URLs.
+      baseUrl: Platform.OS === "android" ? "https://localhost/" : "file:///",
+    }),
+    [configuration],
+  );
+  const command = (button: keyof DeviceStreamRef) => {
+    webView.current?.injectJavaScript(
+      `window.T3DeviceStream?.command(${JSON.stringify(button)}); true;`,
+    );
+  };
+  useImperativeHandle(ref, () => ({
+    home: () => command("home"),
+    back: () => command("back"),
+    appSwitcher: () => command("appSwitcher"),
+    rotate: () => command("rotate"),
+  }));
+  useLayoutEffect(() => {
+    const view = webView.current;
+    return () => view?.injectJavaScript("window.T3DeviceStream?.stop(); true;");
+  }, []);
+  return (
+    <WebView
+      ref={webView}
+      source={source}
+      originWhitelist={["*"]}
+      scrollEnabled={false}
+      bounces={false}
+      mixedContentMode="always"
+      allowUniversalAccessFromFileURLs
+      contentInsetAdjustmentBehavior="never"
+      setSupportMultipleWindows={false}
+      style={{ flex: 1, backgroundColor: background }}
+      onLoadStart={() => void onInputConnected(false)}
+      onShouldStartLoadWithRequest={(request) =>
+        request.url === "about:blank" || request.url === source.baseUrl
+      }
+      onMessage={(event) => {
+        const message = deviceStreamMessage(event.nativeEvent.data);
+        if (message?.type === "unauthorized") void onUnauthorized();
+        else if (message?.type === "input") void onInputConnected(message.connected);
+        else if (message?.type === "retry") onRetry();
+      }}
+    />
+  );
+}
diff --git a/apps/mobile/src/features/devices/device-preview-button.tsx b/apps/mobile/src/features/devices/device-preview-button.tsx
new file mode 100644
index 000000000000..01e789946711
--- /dev/null
+++ b/apps/mobile/src/features/devices/device-preview-button.tsx
@@ -0,0 +1,41 @@
+import { Pressable, View } from "react-native";
+
+import { AppText } from "../../components/AppText";
+import { SymbolView } from "../../components/AppSymbol";
+
+export function DevicePreviewButton(props: {
+  readonly count: number;
+  readonly onPress: () => void;
+  readonly compact?: boolean;
+}) {
+  const compact = props.compact ?? true;
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel={props.count === 1 ? "View device" : `View ${props.count} devices`}
+      accessibilityHint="Watch and control devices open in this thread"
+      onPress={props.onPress}
+      className={
+        compact
+          ? "size-11 shrink-0 items-center justify-center rounded-full active:bg-subtle"
+          : "h-11 shrink-0 flex-row items-center justify-center gap-2 rounded-full px-4 active:bg-subtle"
+      }
+    >
+      <SymbolView
+        name={{ ios: "iphone", android: "smartphone" }}
+        size={20}
+        tintColorClassName="accent-icon"
+        type="monochrome"
+      />
+      {!compact ? (
+        <AppText className="font-t3-medium text-xs text-foreground">
+          {props.count === 1 ? "One device open" : `${props.count} devices open`}
+        </AppText>
+      ) : props.count > 1 ? (
+        <View className="absolute right-0.5 top-0.5 min-w-4 items-center rounded-full bg-primary px-1">
+          <AppText className="text-2xs font-t3-bold text-primary-foreground">{props.count}</AppText>
+        </View>
+      ) : null}
+    </Pressable>
+  );
+}
diff --git a/apps/mobile/src/features/devices/device-stream-document.test.ts b/apps/mobile/src/features/devices/device-stream-document.test.ts
new file mode 100644
index 000000000000..ffc08667a147
--- /dev/null
+++ b/apps/mobile/src/features/devices/device-stream-document.test.ts
@@ -0,0 +1,49 @@
+import * as NodeVM from "node:vm";
+import { describe, expect, it } from "vite-plus/test";
+
+import { deviceStreamDocument, deviceStreamMessage } from "./device-stream-document";
+
+describe("native device stream document", () => {
+  it("keeps ticket and device values from terminating the embedded script", () => {
+    const deviceId = '</script><script>alert("device")</script>';
+    const configuration = JSON.stringify({ deviceId, ticket: "<ticket>" });
+    const html = deviceStreamDocument(
+      configuration,
+      "var T3DeviceStream={start(input){return input}};",
+    );
+    const script = html.match(/<script>([\s\S]*)<\/script>/)?.[1];
+    expect(html.match(/<script>/g)).toHaveLength(1);
+    const input: unknown = NodeVM.runInNewContext(script!);
+    expect(input).toEqual({ deviceId, ticket: "<ticket>" });
+  });
+
+  it("preserves script strings containing an HTML closing delimiter", () => {
+    const html = deviceStreamDocument("{}", 'var text="</script>";');
+    expect(html.match(/<\/script>/g)).toHaveLength(1);
+    expect(html).toContain('var text="<\\/script>";');
+  });
+});
+
+describe("native device stream messages", () => {
+  it("accepts authentication renewal and input connection changes", () => {
+    expect(deviceStreamMessage('{"type":"unauthorized"}')).toEqual({ type: "unauthorized" });
+    expect(deviceStreamMessage('{"type":"input","connected":true}')).toEqual({
+      type: "input",
+      connected: true,
+    });
+    expect(deviceStreamMessage('{"type":"input","connected":false}')).toEqual({
+      type: "input",
+      connected: false,
+    });
+    expect(deviceStreamMessage('{"type":"retry"}')).toEqual({ type: "retry" });
+  });
+
+  it.each([
+    "invalid JSON",
+    "null",
+    '"input"',
+    "{}",
+    '{"type":"input","connected":"yes"}',
+    '{"type":"unknown"}',
+  ])("ignores invalid bridge messages: %s", (data) => expect(deviceStreamMessage(data)).toBeNull());
+});
diff --git a/apps/mobile/src/features/devices/device-stream-document.ts b/apps/mobile/src/features/devices/device-stream-document.ts
new file mode 100644
index 000000000000..a919e43218c3
--- /dev/null
+++ b/apps/mobile/src/features/devices/device-stream-document.ts
@@ -0,0 +1,41 @@
+import type { DeviceHubAccess } from "@t3tools/client-runtime/device/hub-access";
+import type { DevicePlatform } from "@t3tools/contracts";
+
+export interface DeviceStreamConfiguration {
+  readonly access: DeviceHubAccess;
+  readonly platform: DevicePlatform;
+  readonly deviceId: string;
+  readonly colors: {
+    readonly background: string;
+    readonly foreground: string;
+    readonly muted: string;
+    readonly buttonBackground: string;
+  };
+}
+
+export function deviceStreamDocument(configuration: string, script: string) {
+  // Tickets and device names are data, including any HTML delimiter characters.
+  const safeConfiguration = configuration.replace(/</g, "\\u003c");
+  const safeScript = script.replace(/<\/script/gi, "<\\/script");
+  return `<!doctype html><html><head><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"></head><body><script>${safeScript}\nT3DeviceStream.start(${safeConfiguration});</script></body></html>`;
+}
+
+export function deviceStreamMessage(data: string) {
+  try {
+    const message: unknown = JSON.parse(data);
+    if (typeof message !== "object" || message === null || !("type" in message)) return null;
+    if (message.type === "unauthorized" || message.type === "retry") {
+      return { type: message.type } as const;
+    }
+    if (
+      message.type === "input" &&
+      "connected" in message &&
+      typeof message.connected === "boolean"
+    ) {
+      return { type: message.type, connected: message.connected } as const;
+    }
+  } catch {
+    // Ignore messages that are not part of the stream bridge.
+  }
+  return null;
+}
diff --git a/apps/mobile/src/features/devices/device-stream.browser.ts b/apps/mobile/src/features/devices/device-stream.browser.ts
new file mode 100644
index 000000000000..727ea3e8fceb
--- /dev/null
+++ b/apps/mobile/src/features/devices/device-stream.browser.ts
@@ -0,0 +1,223 @@
+import {
+  createDeviceStreamClient,
+  type DeviceScreenSize,
+} from "@t3tools/client-runtime/device/stream";
+
+import type { DeviceStreamConfiguration } from "./device-stream-document";
+
+declare global {
+  interface Window {
+    ReactNativeWebView: { postMessage: (message: string) => void };
+  }
+}
+
+let activeClient: ReturnType<typeof createDeviceStreamClient> | null = null;
+let activeImage: HTMLImageElement | null = null;
+
+export function stop() {
+  activeClient?.stop();
+  activeClient = null;
+  activeImage?.removeAttribute("src");
+  activeImage = null;
+}
+
+export function command(button: "home" | "back" | "appSwitcher" | "rotate") {
+  if (button === "rotate") activeClient?.rotate();
+  else activeClient?.pressButton(button);
+}
+
+/** Bundled into the existing native WebView without React or Expo's web runtime. */
+export function start(configuration: DeviceStreamConfiguration) {
+  stop();
+  // oxlint-disable-next-line unicorn/require-post-message-target-origin -- The native WebView bridge takes one string.
+  const post = (message: object) => window.ReactNativeWebView.postMessage(JSON.stringify(message));
+  const { colors, platform } = configuration;
+  Object.assign(document.documentElement.style, { height: "100%", overflow: "hidden" });
+  Object.assign(document.body.style, {
+    margin: "0",
+    height: "100%",
+    overflow: "hidden",
+    background: colors.background,
+    color: colors.foreground,
+    fontFamily: "system-ui",
+  });
+  const container = document.createElement("div");
+  Object.assign(container.style, {
+    position: "fixed",
+    inset: "0",
+    containerType: "size",
+    display: "flex",
+    alignItems: "center",
+    justifyContent: "center",
+  });
+  const frame = document.createElement("div");
+  frame.setAttribute("role", "application");
+  frame.setAttribute(
+    "aria-label",
+    platform === "ios" ? "iOS Simulator screen" : "Android Emulator screen",
+  );
+  frame.tabIndex = 0;
+  Object.assign(frame.style, {
+    position: "relative",
+    touchAction: "none",
+    userSelect: "none",
+    webkitUserSelect: "none",
+    webkitTouchCallout: "none",
+    outline: "none",
+  });
+  const canvas = document.createElement("canvas");
+  const image = document.createElement("img");
+  image.alt = "";
+  image.draggable = false;
+  image.style.display = "none";
+  const overlay = document.createElement("div");
+  overlay.setAttribute("role", "status");
+  Object.assign(overlay.style, {
+    position: "fixed",
+    inset: "0",
+    display: "flex",
+    flexDirection: "column",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: "16px",
+    padding: "24px",
+    textAlign: "center",
+    background: colors.background,
+  });
+  const detail = document.createElement("span");
+  const retry = document.createElement("button");
+  retry.textContent = "Retry";
+  Object.assign(retry.style, {
+    padding: "12px 24px",
+    borderRadius: "20px",
+    border: "0",
+    background: colors.buttonBackground,
+    color: colors.foreground,
+    font: "inherit",
+    display: "none",
+  });
+  retry.addEventListener("click", () => post({ type: "retry" }));
+  overlay.append(detail, retry);
+  const inputStatus = document.createElement("div");
+  inputStatus.setAttribute("role", "status");
+  inputStatus.textContent = "Reconnecting device controls...";
+  Object.assign(inputStatus.style, {
+    position: "fixed",
+    bottom: "12px",
+    left: "0",
+    right: "0",
+    textAlign: "center",
+    pointerEvents: "none",
+    fontSize: "13px",
+    color: colors.muted,
+    background: colors.background,
+  });
+  frame.append(canvas, image);
+  container.append(frame);
+  document.body.replaceChildren(container, overlay, inputStatus);
+
+  let pointerId: number | null = null;
+  let inputConnected = false;
+  let streaming = false;
+  const layout = (screen: DeviceScreenSize | null) => {
+    const landscape =
+      screen?.orientation === "landscape_left" || screen?.orientation === "landscape_right";
+    const aspect = screen
+      ? landscape
+        ? Math.max(screen.width, screen.height) / Math.min(screen.width, screen.height)
+        : Math.min(screen.width, screen.height) / Math.max(screen.width, screen.height)
+      : 9 / 19.5;
+    const rotation =
+      platform === "ios" && screen && screen.width <= screen.height
+        ? screen.orientation === "landscape_left"
+          ? 90
+          : screen.orientation === "landscape_right"
+            ? -90
+            : screen.orientation === "portrait_upside_down"
+              ? 180
+              : 0
+        : 0;
+    const sideways = Math.abs(rotation) === 90;
+    frame.style.width = `min(100cqw, ${aspect * 100}cqh)`;
+    frame.style.height = `min(100cqh, ${100 / aspect}cqw)`;
+    for (const media of [canvas, image]) {
+      Object.assign(media.style, {
+        position: "absolute",
+        width: sideways ? `${100 / aspect}%` : "100%",
+        height: sideways ? `${100 * aspect}%` : "100%",
+        left: "50%",
+        top: "50%",
+        transform: `translate(-50%, -50%) rotate(${rotation}deg)`,
+        pointerEvents: "none",
+      });
+    }
+  };
+  layout(null);
+  const unauthorized = () => {
+    if (activeClient === client) post({ type: "unauthorized" });
+  };
+  const client = createDeviceStreamClient(
+    { ...configuration, preferMjpeg: platform === "ios" },
+    canvas,
+    {
+      onStatus: (status, message) => {
+        streaming = status === "streaming";
+        overlay.style.display = streaming ? "none" : "flex";
+        inputStatus.style.display = streaming && !inputConnected ? "block" : "none";
+        detail.textContent =
+          status === "error" ? (message ?? "Device stream failed.") : "Connecting to device...";
+        retry.style.display = status === "error" ? "block" : "none";
+      },
+      onScreen: layout,
+      onMjpegFallback: (url) => {
+        canvas.style.display = "none";
+        image.style.display = "block";
+        image.src = url;
+      },
+      onUnauthorized: unauthorized,
+      onInputConnected: (connected) => {
+        inputConnected = connected;
+        inputStatus.style.display = streaming && !connected ? "block" : "none";
+        post({ type: "input", connected });
+      },
+    },
+  );
+  activeClient = client;
+  activeImage = image;
+  image.addEventListener("error", unauthorized);
+  const touch = (event: PointerEvent, phase: "begin" | "move" | "end") => {
+    const rect = frame.getBoundingClientRect();
+    client.sendTouch(
+      phase,
+      Math.max(0, Math.min(1, (event.clientX - rect.left) / rect.width)),
+      Math.max(0, Math.min(1, (event.clientY - rect.top) / rect.height)),
+    );
+  };
+  frame.addEventListener("pointerdown", (event) => {
+    if (!inputConnected || pointerId !== null) return;
+    event.preventDefault();
+    pointerId = event.pointerId;
+    frame.setPointerCapture(event.pointerId);
+    frame.focus();
+    touch(event, "begin");
+  });
+  frame.addEventListener("pointermove", (event) => {
+    if (pointerId === event.pointerId) touch(event, "move");
+  });
+  const endTouch = (event: PointerEvent) => {
+    if (pointerId !== event.pointerId) return;
+    pointerId = null;
+    touch(event, "end");
+  };
+  frame.addEventListener("pointerup", endTouch);
+  frame.addEventListener("pointercancel", endTouch);
+  frame.addEventListener("lostpointercapture", endTouch);
+  frame.addEventListener("keydown", (event) => {
+    event.preventDefault();
+    client.sendKey(event, "down");
+  });
+  frame.addEventListener("keyup", (event) => client.sendKey(event, "up"));
+  window.addEventListener("pagehide", stop, { once: true });
+  post({ type: "input", connected: false });
+  client.start();
+}
diff --git a/apps/mobile/src/features/devices/threadDevicePreviews.test.ts b/apps/mobile/src/features/devices/threadDevicePreviews.test.ts
new file mode 100644
index 000000000000..90582dbdc572
--- /dev/null
+++ b/apps/mobile/src/features/devices/threadDevicePreviews.test.ts
@@ -0,0 +1,106 @@
+import { ThreadId, type DeviceServiceState } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import { selectedThreadDevicePreview, threadDevicePreviews } from "./threadDevicePreviews";
+
+const threadId = ThreadId.make("thread");
+const state: DeviceServiceState = {
+  hosts: [
+    {
+      id: "local",
+      kind: "local",
+      label: "Local",
+      platforms: [],
+      hubInstalled: true,
+      agentDeviceInstalled: true,
+    },
+    {
+      id: "remote",
+      kind: "ssh",
+      label: "Mac mini",
+      platforms: [],
+      hubInstalled: true,
+      agentDeviceInstalled: true,
+    },
+  ],
+  hostStatus: "ready",
+  hostStatuses: {},
+  devices: [
+    {
+      hostId: "local",
+      id: "emulator-5554",
+      platform: "android",
+      name: "Pixel 9",
+      version: "Android 16",
+      booted: true,
+      physical: false,
+    },
+    {
+      hostId: "remote",
+      id: "emulator-5554",
+      platform: "android",
+      name: "Pixel 8",
+      version: "Android 15",
+      booted: true,
+      physical: false,
+    },
+  ],
+  sessions: [
+    {
+      threadId,
+      hostId: "local",
+      deviceId: "emulator-5554",
+      platform: "android",
+      openedAt: "2026-09-18T00:00:00Z",
+    },
+    {
+      threadId,
+      hostId: "remote",
+      deviceId: "emulator-5554",
+      platform: "android",
+      openedAt: "2026-09-18T00:01:00Z",
+    },
+    {
+      threadId: ThreadId.make("another-thread"),
+      hostId: "local",
+      deviceId: "iphone",
+      platform: "ios",
+      openedAt: "2026-09-18T00:02:00Z",
+    },
+  ],
+  onboardingCompleted: true,
+  agentAccessEnabled: true,
+  hubBasePath: "/api/device-hub",
+  revision: 1,
+};
+
+describe("thread device previews", () => {
+  it("keeps device names and selection distinct when hosts have the same Android serial", () => {
+    const previews = threadDevicePreviews(state, threadId);
+    expect(previews.map((preview) => preview.name)).toEqual(["Pixel 9", "Pixel 8"]);
+    expect(new Set(previews.map((preview) => preview.key)).size).toBe(2);
+    expect(selectedThreadDevicePreview(previews, previews[1]!.key)?.description).toBe(
+      "Android 15 · Mac mini",
+    );
+  });
+
+  it("selects another open device when the agent closes the selected session", () => {
+    const previews = threadDevicePreviews(state, threadId);
+    const selectedKey = previews[1]!.key;
+    const afterClose = threadDevicePreviews({ ...state, sessions: [state.sessions[0]!] }, threadId);
+    expect(selectedThreadDevicePreview(afterClose, selectedKey)?.name).toBe("Pixel 9");
+    expect(selectedThreadDevicePreview([], selectedKey)).toBeNull();
+  });
+
+  it("can view an open session before device discovery metadata arrives", () => {
+    const previews = threadDevicePreviews({ ...state, hosts: [], devices: [] }, threadId);
+    expect(previews[0]?.name).toBe("Android Emulator");
+    expect(previews[0]?.session.deviceId).toBe("emulator-5554");
+    expect(previews[0]?.description).toBe("");
+  });
+
+  it("offers no devices before state arrives or in a thread without sessions", () => {
+    expect(threadDevicePreviews(null, threadId)).toEqual([]);
+    expect(threadDevicePreviews(state, ThreadId.make("empty-thread"))).toEqual([]);
+  });
+});
diff --git a/apps/mobile/src/features/devices/threadDevicePreviews.ts b/apps/mobile/src/features/devices/threadDevicePreviews.ts
new file mode 100644
index 000000000000..aaf87ca9784e
--- /dev/null
+++ b/apps/mobile/src/features/devices/threadDevicePreviews.ts
@@ -0,0 +1,28 @@
+import type { DeviceServiceState, ThreadId } from "@t3tools/contracts";
+
+/** Host identity is part of the selection because Android serials repeat across hosts. */
+export function threadDevicePreviews(state: DeviceServiceState | null, threadId: ThreadId) {
+  return (state?.sessions ?? [])
+    .filter((session) => session.threadId === threadId)
+    .map((session) => {
+      const device = state?.devices.find(
+        (device) => device.hostId === session.hostId && device.id === session.deviceId,
+      );
+      const host = state?.hosts.find((host) => host.id === session.hostId);
+      return {
+        key: JSON.stringify([session.hostId, session.deviceId]),
+        session,
+        name: device?.name ?? (session.platform === "ios" ? "iOS Simulator" : "Android Emulator"),
+        description: [device?.version, host?.label].filter(Boolean).join(" · "),
+      };
+    });
+}
+
+export type ThreadDevicePreview = ReturnType<typeof threadDevicePreviews>[number];
+
+export function selectedThreadDevicePreview(
+  previews: ReadonlyArray<ThreadDevicePreview>,
+  selectedKey: string | null,
+) {
+  return previews.find((preview) => preview.key === selectedKey) ?? previews[0] ?? null;
+}
diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
index e7b4650e2117..ad0872ea9116 100644
--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
@@ -13,6 +13,7 @@ import { useKeyboardChatComposerInset, useKeyboardScrollToEnd } from "@legendapp
 import { resolveProviderSkillsForCwd } from "@t3tools/client-runtime/providerSkills";
 import type { LegendListRef } from "@legendapp/list/react-native";
 import { HeaderHeightContext } from "@react-navigation/elements";
+import { useNavigation } from "@react-navigation/native";
 import type {
   ApprovalRequestId,
   EnvironmentId,
@@ -72,6 +73,9 @@ import type { DraftComposerAttachment } from "../../lib/composerImages";
 import { CHAT_CONTENT_MAX_WIDTH, type LayoutVariant } from "../../lib/layout";
 import { IOS_NAV_BAR_HEIGHT } from "../../lib/layoutMetrics";
 import { editPendingThreadMessage } from "../../state/edit-pending-thread-message";
+import { deviceEnvironment } from "../../state/device";
+import { useEnvironmentQuery } from "../../state/query";
+import { threadDevicePreviews } from "../devices/threadDevicePreviews";
 import type { QueuedThreadMessage } from "../../state/thread-outbox-model";
 import { scopedThreadKey } from "../../lib/scopedEntities";
 import type {
@@ -259,6 +263,21 @@ const USER_INPUT_TOGGLE_TIMING = {
 };
 
 export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: ThreadDetailScreenProps) {
+  const navigation = useNavigation();
+  const deviceState = useEnvironmentQuery(
+    deviceEnvironment.state({ environmentId: props.environmentId, input: {} }),
+  );
+  const devicePreviews = useMemo(
+    () => threadDevicePreviews(deviceState.data, props.selectedThread.id),
+    [deviceState.data, props.selectedThread.id],
+  );
+  const openDevicePreview = useCallback(() => {
+    Keyboard.dismiss();
+    navigation.navigate("ThreadDevicePreview", {
+      environmentId: props.environmentId,
+      threadId: props.selectedThread.id,
+    });
+  }, [navigation, props.environmentId, props.selectedThread.id]);
   const insets = useSafeAreaInsets();
   const isKeyboardVisible = useKeyboardState((state) => state.isVisible);
   const liveKeyboardHeight = useKeyboardState((state) => state.height);
@@ -390,6 +409,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
   // stable when reconnecting hands off to syncing and then to a running turn.
   const showFloatingStatus =
     showWorkingControl ||
+    devicePreviews.length > 0 ||
     props.connectionStateLabel !== "connected" ||
     props.queuedMessages.length > 0 ||
     props.selectedThreadFeed.some(
@@ -936,6 +956,11 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
               <FloatingWorkingControl
                 colorScheme={isDarkMode ? "dark" : "light"}
                 status={floatingStatus}
+                devicePreview={
+                  devicePreviews.length > 0
+                    ? { count: devicePreviews.length, onPress: openDevicePreview }
+                    : null
+                }
                 showScrollToEnd={showScrollToEndButton}
                 onScrollToEnd={handleScrollToEnd}
               />
diff --git a/apps/mobile/src/features/threads/floating-working-control.tsx b/apps/mobile/src/features/threads/floating-working-control.tsx
index 89cf39e89e39..d124b1386768 100644
--- a/apps/mobile/src/features/threads/floating-working-control.tsx
+++ b/apps/mobile/src/features/threads/floating-working-control.tsx
@@ -24,6 +24,7 @@ import { AppText as Text } from "../../components/AppText";
 import { SymbolView } from "../../components/AppSymbol";
 import { ControlPill } from "../../components/ControlPill";
 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
+import { DevicePreviewButton } from "../devices/device-preview-button";
 import type { FloatingWorkingStatus } from "./floating-working-status";
 import { ShimmeringWorkContent } from "./thread-work-log";
 
@@ -63,12 +64,18 @@ export const FLOATING_WORKING_CONTROL_COVERAGE = CONTROL_OVERLAY_OFFSET + CONTRO
 export function FloatingWorkingControl(props: {
   readonly colorScheme: "light" | "dark";
   readonly status: FloatingWorkingStatus | null;
+  readonly devicePreview: { readonly count: number; readonly onPress: () => void } | null;
   readonly showScrollToEnd: boolean;
   readonly onScrollToEnd: () => void;
 }) {
   const { width: windowWidth } = useWindowDimensions();
   const [overlayWidth, setOverlayWidth] = useState(windowWidth);
-  const labelWidth = Math.max(0, Math.min(overlayWidth, windowWidth) - CONTROL_HEIGHT - 16);
+  const deviceControlWidth = props.devicePreview !== null ? CONTROL_HEIGHT : 0;
+  const hasCapsule = props.status !== null || props.devicePreview !== null;
+  const labelWidth = Math.max(
+    0,
+    Math.min(overlayWidth, windowWidth) - CONTROL_HEIGHT - 16 - deviceControlWidth,
+  );
   const separationProgress = useSharedValue(props.showScrollToEnd ? 1 : 0);
 
   useEffect(() => {
@@ -111,25 +118,30 @@ export function FloatingWorkingControl(props: {
   }));
   // Zero until the first measurement lands, so the capsule never paints around
   // a label it has not sized to yet.
-  const capsuleSizerStyle = useAnimatedStyle(() => ({ width: capsuleWidth.value ?? 0 }));
+  const capsuleSizerStyle = useAnimatedStyle(() => ({
+    width: (capsuleWidth.value ?? 0) + deviceControlWidth,
+  }));
 
-  if (props.status === null && !props.showScrollToEnd) {
+  if (!hasCapsule && !props.showScrollToEnd) {
     return null;
   }
 
   // Only the connection label is a button (tap to reconnect); the others
   // pass touches through to the feed like before.
   const statusInteractive = props.status?.kind === "connection";
+  const capsuleInteractive = statusInteractive || props.devicePreview !== null;
   // The host stays centered on the capsule, but its measurement constraint
   // comes from the overlay, independent of the capsule's current width.
-  const statusContent =
-    props.status !== null ? (
+  const capsuleContent =
+    props.status === null && props.devicePreview !== null ? (
+      <DevicePreviewButton {...props.devicePreview} compact={false} />
+    ) : props.status !== null ? (
       <>
         <Animated.View className="h-11" style={capsuleSizerStyle} />
         <View
-          pointerEvents="box-none"
+          pointerEvents={statusInteractive ? "box-none" : "none"}
           className="absolute h-11 items-center justify-center"
-          style={{ width: labelWidth }}
+          style={{ width: labelWidth, transform: [{ translateX: -deviceControlWidth / 2 }] }}
         >
           <FloatingStatusLabel
             key={
@@ -141,6 +153,18 @@ export function FloatingWorkingControl(props: {
             onLayout={handleLabelLayout}
           />
         </View>
+        {props.devicePreview !== null ? (
+          <>
+            <View
+              pointerEvents="none"
+              className="absolute h-4 w-px bg-border"
+              style={{ right: deviceControlWidth }}
+            />
+            <View className="absolute right-0">
+              <DevicePreviewButton {...props.devicePreview} />
+            </View>
+          </>
+        ) : null}
       </>
     ) : null;
 
@@ -153,7 +177,7 @@ export function FloatingWorkingControl(props: {
       entering={NATIVE_LIQUID_GLASS_SUPPORTED ? undefined : CONTROL_ENTERING}
       exiting={NATIVE_LIQUID_GLASS_SUPPORTED ? undefined : CONTROL_EXITING}
     >
-      {props.status !== null && NATIVE_LIQUID_GLASS_SUPPORTED ? (
+      {hasCapsule && NATIVE_LIQUID_GLASS_SUPPORTED ? (
         <UniwindGlassContainer
           spacing={GLASS_MERGE_SPACING}
           pointerEvents="box-none"
@@ -162,12 +186,12 @@ export function FloatingWorkingControl(props: {
           <AnimatedGlassView
             colorScheme={props.colorScheme}
             glassEffectStyle="regular"
-            isInteractive={statusInteractive}
-            pointerEvents={statusInteractive ? "box-none" : "none"}
+            isInteractive={capsuleInteractive}
+            pointerEvents={capsuleInteractive ? "box-none" : "none"}
             className="h-11 items-center justify-center overflow-hidden rounded-full"
             style={capsuleStyle}
           >
-            {statusContent}
+            {capsuleContent}
           </AnimatedGlassView>
 
           <AnimatedGlassView
@@ -185,14 +209,14 @@ export function FloatingWorkingControl(props: {
             </Animated.View>
           </AnimatedGlassView>
         </UniwindGlassContainer>
-      ) : props.status !== null ? (
+      ) : hasCapsule ? (
         <View pointerEvents="box-none" className="flex-row items-center gap-4">
           <Animated.View
-            pointerEvents={statusInteractive ? "box-none" : "none"}
+            pointerEvents={capsuleInteractive ? "box-none" : "none"}
             className="h-11 items-center justify-center overflow-hidden rounded-full border border-border bg-card shadow-md shadow-black/10"
             style={capsuleStyle}
           >
-            {statusContent}
+            {capsuleContent}
           </Animated.View>
 
           <Animated.View
diff --git a/apps/mobile/src/state/device.ts b/apps/mobile/src/state/device.ts
new file mode 100644
index 000000000000..f989d3c5b745
--- /dev/null
+++ b/apps/mobile/src/state/device.ts
@@ -0,0 +1,44 @@
+import { createDeviceEnvironmentAtoms } from "@t3tools/client-runtime/state/device";
+import { resolveDeviceHubAccess } from "@t3tools/client-runtime/state/deviceHubAccess";
+import type { EnvironmentId } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import { Atom } from "effect/unstable/reactivity";
+import { useMemo } from "react";
+
+import { connectionAtomRuntime } from "../connection/runtime";
+import { appAtomRegistry } from "./atom-registry";
+import { useEnvironmentQuery } from "./query";
+import { environmentSession, usePreparedConnection } from "./session";
+
+export const deviceEnvironment = createDeviceEnvironmentAtoms(connectionAtomRuntime);
+
+const deviceHubAccessAtom = Atom.family((environmentId: EnvironmentId) =>
+  connectionAtomRuntime
+    .atom((get) => {
+      const prepared = Option.getOrNull(
+        get(environmentSession.preparedConnectionValueAtom(environmentId)),
+      );
+      return prepared === null
+        ? Effect.never
+        : resolveDeviceHubAccess({ prepared, hubBasePath: "/api/device-hub" });
+    })
+    .pipe(Atom.setIdleTTL(60_000), Atom.withLabel(`mobile-device-hub-access:${environmentId}`)),
+);
+
+export function refreshDeviceHubAccess(environmentId: EnvironmentId) {
+  appAtomRegistry.refresh(deviceHubAccessAtom(environmentId));
+}
+
+export function useDeviceHubAccess(environmentId: EnvironmentId, hostId: string) {
+  const prepared = usePreparedConnection(environmentId);
+  const query = useEnvironmentQuery(deviceHubAccessAtom(environmentId));
+  const access = useMemo(
+    () =>
+      query.data && query.error === null && Option.isSome(prepared)
+        ? { ...query.data, query: { ...query.data.query, hostId } }
+        : null,
+    [query.data, query.error, prepared, hostId],
+  );
+  return { access, error: query.error, refresh: query.refresh };
+}
diff --git a/apps/mobile/src/types/mobile-device-stream.d.ts b/apps/mobile/src/types/mobile-device-stream.d.ts
new file mode 100644
index 000000000000..eddedfac361c
--- /dev/null
+++ b/apps/mobile/src/types/mobile-device-stream.d.ts
@@ -0,0 +1,4 @@
+declare module "@t3tools/mobile-device-stream" {
+  const script: string;
+  export default script;
+}
diff --git a/apps/web/src/components/device/DeviceStreamView.test.tsx b/apps/web/src/components/device/DeviceStreamView.test.tsx
index 9c8a1197926a..785560783131 100644
--- a/apps/web/src/components/device/DeviceStreamView.test.tsx
+++ b/apps/web/src/components/device/DeviceStreamView.test.tsx
@@ -8,7 +8,7 @@ vi.mock("~/state/device", () => ({
   refreshDeviceHubAccess: vi.fn(),
 }));
 const access = { httpBase: "http://test", wsBase: "ws://test", query: {}, credentials: true };
-vi.mock("./deviceStream", () => ({
+vi.mock("@t3tools/client-runtime/device/stream", () => ({
   createDeviceStreamClient: (
     _target: unknown,
     _canvas: unknown,
diff --git a/apps/web/src/components/device/DeviceStreamView.tsx b/apps/web/src/components/device/DeviceStreamView.tsx
index 994ee1d6d1ec..60e8414fb060 100644
--- a/apps/web/src/components/device/DeviceStreamView.tsx
+++ b/apps/web/src/components/device/DeviceStreamView.tsx
@@ -11,7 +11,7 @@ import {
   type DeviceScreenSize,
   type DeviceStreamClient,
   type DeviceStreamStatus,
-} from "./deviceStream";
+} from "@t3tools/client-runtime/device/stream";
 
 const AX_POLL_INTERVAL_MS = 2_000;
 
diff --git a/apps/web/src/components/device/deviceStream.test.ts b/apps/web/src/components/device/deviceStream.test.ts
index 362bd44fedba..13a57d44ffcf 100644
--- a/apps/web/src/components/device/deviceStream.test.ts
+++ b/apps/web/src/components/device/deviceStream.test.ts
@@ -6,7 +6,7 @@ import {
   avcCodecString,
   parseSemuPacket,
   scanAccessUnit,
-} from "./deviceStream";
+} from "@t3tools/client-runtime/device/stream";
 
 const envelope = (tag: number, payload: number[]) => {
   const length = 1 + payload.length;
@@ -43,6 +43,171 @@ describe("AvccDemuxer", () => {
   });
 });
 
+describe("native device stream transport", () => {
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+  });
+
+  function setup(platform: "ios" | "android") {
+    vi.useFakeTimers();
+    vi.stubGlobal("VideoDecoder", vi.fn());
+    vi.stubGlobal("EncodedVideoChunk", vi.fn());
+    let resolveOpened!: (socket: FakeSocket) => void;
+    const waitForSocket = () =>
+      new Promise<FakeSocket>((resolve) => {
+        resolveOpened = resolve;
+      });
+    const opened = waitForSocket();
+    class FakeSocket {
+      static OPEN = 1;
+      readyState = 1;
+      binaryType = "";
+      onopen: (() => void) | null = null;
+      onclose: ((event: { code: number; reason: string }) => void) | null = null;
+      send = vi.fn();
+      close = vi.fn();
+      readonly url: string;
+      constructor(url: string) {
+        this.url = url;
+        resolveOpened(this);
+      }
+    }
+    vi.stubGlobal("WebSocket", FakeSocket);
+    const fetch = vi.fn(() => Promise.resolve(new Response("frame")));
+    vi.stubGlobal("fetch", fetch);
+    const events = {
+      onStatus: vi.fn(),
+      onScreen: vi.fn(),
+      onUnauthorized: vi.fn(),
+      onMjpegFallback: vi.fn(),
+      onInputConnected: vi.fn(),
+    };
+    const client = createDeviceStreamClient(
+      {
+        platform,
+        deviceId: "test device",
+        preferMjpeg: platform === "ios",
+        access: {
+          httpBase: "https://environment.test/api/device-hub",
+          wsBase: "wss://environment.test/api/device-hub",
+          credentials: false,
+          query: { wsTicket: "stream-ticket", hostId: "ssh-host" },
+        },
+      },
+      { getContext: () => null } as unknown as HTMLCanvasElement,
+      events,
+    );
+    return { client, opened, waitForSocket, events, fetch };
+  }
+
+  it("uses authenticated iOS MJPEG and forwards controls without a cross-origin video fetch", async () => {
+    const { client, opened, events, fetch } = setup("ios");
+    client.start();
+    const socket = await opened;
+    const imageUrl = new URL(events.onMjpegFallback.mock.calls[0]![0] as string);
+    expect(imageUrl.pathname).toContain("test%20device/stream.mjpeg");
+    expect(imageUrl.searchParams.get("wsTicket")).toBe("stream-ticket");
+    expect(imageUrl.searchParams.get("hostId")).toBe("ssh-host");
+    expect(fetch).toHaveBeenCalledTimes(1);
+    socket.onopen?.();
+    client.pressButton("home");
+    client.sendTouch("begin", 0.25, 0.75);
+    const messages = socket.send.mock.calls.slice(1).map(([bytes]) => {
+      const packet = bytes as Uint8Array;
+      return {
+        tag: packet[0],
+        body: JSON.parse(new TextDecoder().decode(packet.subarray(1))) as unknown,
+      };
+    });
+    expect(messages).toEqual([
+      { tag: 0x04, body: { button: "home" } },
+      { tag: 0x03, body: { type: "begin", x: 0.25, y: 0.75 } },
+    ]);
+    client.stop();
+    expect(socket.close).toHaveBeenCalledTimes(1);
+    expect(vi.getTimerCount()).toBe(0);
+  });
+
+  it("forwards Android gestures and device controls through the ticketed host socket", async () => {
+    const { client, opened } = setup("android");
+    client.start();
+    const socket = await opened;
+    const url = new URL(socket.url);
+    expect(url.searchParams.get("device")).toBe("test device");
+    expect(url.searchParams.get("wsTicket")).toBe("stream-ticket");
+    expect(url.searchParams.get("hostId")).toBe("ssh-host");
+    client.sendTouch("begin", 0.2, 0.8);
+    client.sendTouch("move", 0.2, 0.4);
+    client.sendTouch("end", 0.2, 0.1);
+    client.pressButton("home");
+    client.pressButton("appSwitcher");
+    expect(
+      socket.send.mock.calls.map(([message]) => JSON.parse(message as string) as unknown),
+    ).toEqual([
+      { type: "touch", action: "down", x: 0.2, y: 0.8 },
+      { type: "touch", action: "move", x: 0.2, y: 0.4 },
+      { type: "touch", action: "up", x: 0.2, y: 0.1 },
+      { type: "home" },
+      { type: "recents" },
+    ]);
+    client.stop();
+    expect(socket.close).toHaveBeenCalledTimes(1);
+  });
+
+  it("renews an expired Android ticket when the HTTP upgrade is rejected instead of retrying it forever", async () => {
+    const { client, opened, events } = setup("android");
+    client.start();
+    const socket = await opened;
+    socket.onclose?.({ code: 1006, reason: "" });
+    expect(events.onUnauthorized).toHaveBeenCalledTimes(1);
+    expect(vi.getTimerCount()).toBe(0);
+    client.stop();
+  });
+
+  it.each(["ios", "android"] as const)(
+    "keeps a restarted %s stream connected when the discarded socket closes late",
+    async (platform) => {
+      const { client, opened, waitForSocket, events } = setup(platform);
+      client.start();
+      const discarded = await opened;
+      client.stop();
+      const reopened = waitForSocket();
+      client.start();
+      const replacement = await reopened;
+      replacement.onopen?.();
+      replacement.send.mockClear();
+      events.onInputConnected.mockClear();
+
+      discarded.onclose?.({ code: 1006, reason: "" });
+
+      expect(events.onUnauthorized).not.toHaveBeenCalled();
+      expect(events.onInputConnected).not.toHaveBeenCalled();
+      expect(replacement.close).not.toHaveBeenCalled();
+      client.pressButton("home");
+      expect(replacement.send).toHaveBeenCalledTimes(1);
+      client.stop();
+      expect(replacement.close).toHaveBeenCalledTimes(1);
+      expect(vi.getTimerCount()).toBe(0);
+    },
+  );
+
+  it.each(["ios", "android"] as const)(
+    "does not renew credentials or reconnect a stopped %s stream",
+    async (platform) => {
+      const { client, opened, events } = setup(platform);
+      client.start();
+      const socket = await opened;
+      events.onInputConnected.mockClear();
+      client.stop();
+      socket.onclose?.({ code: 1006, reason: "" });
+      expect(events.onUnauthorized).not.toHaveBeenCalled();
+      expect(events.onInputConnected).not.toHaveBeenCalled();
+      expect(vi.getTimerCount()).toBe(0);
+    },
+  );
+});
+
 describe("serve-emu frames", () => {
   it("strips the SEMU header and reads the keyframe flag and timestamp", () => {
     const buffer = new ArrayBuffer(16 + 3);
diff --git a/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx b/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx
index 5249fe37401a..3e42c39715ee 100644
--- a/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx
+++ b/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx
@@ -35,7 +35,7 @@ import { useRightPanelStore } from "~/rightPanelStore";
 import { useDeviceState } from "~/state/device";
 
 import { DeviceStreamView } from "../device/DeviceStreamView";
-import type { DeviceScreenSize } from "../device/deviceStream";
+import type { DeviceScreenSize } from "@t3tools/client-runtime/device/stream";
 import { previewBridge } from "./previewBridge";
 import {
   clampPreviewMiniPlayerPosition,
diff --git a/apps/web/src/components/preview/previewMiniPlayerLayout.ts b/apps/web/src/components/preview/previewMiniPlayerLayout.ts
index 13ba26f06fca..faa529ae91c2 100644
--- a/apps/web/src/components/preview/previewMiniPlayerLayout.ts
+++ b/apps/web/src/components/preview/previewMiniPlayerLayout.ts
@@ -7,7 +7,7 @@ import {
 } from "~/browser/browserViewportLayout";
 import type { PreviewMiniPlayerPosition, PreviewMiniPlayerSize } from "~/previewMiniPlayerStore";
 
-import type { DeviceScreenSize } from "../device/deviceStream";
+import type { DeviceScreenSize } from "@t3tools/client-runtime/device/stream";
 
 export const PREVIEW_MINI_PLAYER_EDGE_GAP = 12;
 export const PREVIEW_MINI_PLAYER_CORNER_RADIUS = 12;
diff --git a/docs/user/devices.md b/docs/user/devices.md
index f40d11904459..b388688bae29 100644
--- a/docs/user/devices.md
+++ b/docs/user/devices.md
@@ -55,8 +55,13 @@ back from the device after a change.
 When an agent opens a device, it floats over the chat in web and desktop clients
 connected to the thread, the same way an agent-driven browser does. Turn off
 **Auto-show floating preview** in **Settings → Integrations → Browser** to open a
-right-panel tab instead. Mobile clients show device activity in the thread
-timeline. Agents drive the device through the `agent-device` command line. T3
+right-panel tab instead. In the mobile app, open the agent's thread and tap the
+device button above the composer to watch the live screen and control it.
+If the thread has several devices open, choose one in the viewer. Closing the
+viewer stops streaming and leaves the device available to the agent. Device
+activity also appears in the thread timeline.
+
+Agents drive the device through the `agent-device` command line. T3
 Code installs and starts it only after **Agent device access** is enabled. iOS
 taps build a small test runner on first use, which takes a couple of minutes
 once per server. Restart an existing agent session after granting access so it
diff --git a/knip.jsonc b/knip.jsonc
index a06e0885a2f8..5e87b4d5bc55 100644
--- a/knip.jsonc
+++ b/knip.jsonc
@@ -58,8 +58,13 @@
       "ignoreIssues": { "src/components/ui/*.tsx": ["exports", "nsExports", "duplicates"] },
     },
     "apps/mobile": {
-      // Expo loads local config plugins by string; Metro handles platform variants.
-      "entry": ["index.ts!", "plugins/*.cjs"],
+      // Expo loads plugins by string; Metro embeds the browser entry in the native WebView.
+      "entry": [
+        "index.ts!",
+        "plugins/*.cjs",
+        "scripts/generate-device-stream.mts",
+        "src/features/devices/device-stream.browser.ts!",
+      ],
       // Fonts are configured as asset paths; Expo autolinks the native packages.
       "ignoreDependencies": [
         "@expo-google-fonts/dm-sans",
diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json
index 65e13c251edc..63dfc4ab344c 100644
--- a/packages/client-runtime/package.json
+++ b/packages/client-runtime/package.json
@@ -3,6 +3,14 @@
   "private": true,
   "type": "module",
   "exports": {
+    "./device/stream": {
+      "types": "./src/device/stream.ts",
+      "default": "./src/device/stream.ts"
+    },
+    "./device/hub-access": {
+      "types": "./src/device/hubAccess.ts",
+      "default": "./src/device/hubAccess.ts"
+    },
     "./worktree-setup": {
       "types": "./src/worktreeSetup.ts",
       "default": "./src/worktreeSetup.ts"
diff --git a/packages/client-runtime/src/device/hubAccess.ts b/packages/client-runtime/src/device/hubAccess.ts
new file mode 100644
index 000000000000..9c010a2583f7
--- /dev/null
+++ b/packages/client-runtime/src/device/hubAccess.ts
@@ -0,0 +1,18 @@
+/** Credentials for media requests that cannot set bearer or DPoP headers. */
+export interface DeviceHubAccess {
+  /** Absolute environment URL ending in `/api/device-hub`. */
+  readonly httpBase: string;
+  /** Same base with the `ws(s)` scheme. */
+  readonly wsBase: string;
+  /** Empty for cookie sessions; includes a short-lived ticket for bearer and DPoP sessions. */
+  readonly query: Readonly<Record<string, string>>;
+  /** Whether requests must include session cookies. */
+  readonly credentials: boolean;
+}
+
+export const withDeviceHubQuery = (url: string, access: DeviceHubAccess): string => {
+  const entries = Object.entries(access.query);
+  if (entries.length === 0) return url;
+  const separator = url.includes("?") ? "&" : "?";
+  return `${url}${separator}${new URLSearchParams(entries).toString()}`;
+};
diff --git a/apps/web/src/components/device/deviceStream.ts b/packages/client-runtime/src/device/stream.ts
similarity index 93%
rename from apps/web/src/components/device/deviceStream.ts
rename to packages/client-runtime/src/device/stream.ts
index d6ae632202dd..02aa46c67e1d 100644
--- a/apps/web/src/components/device/deviceStream.ts
+++ b/packages/client-runtime/src/device/stream.ts
@@ -1,3 +1,6 @@
+// @effect-diagnostics globalFetch:off globalTimers:off - This browser and WebView transport runs without an Effect runtime.
+/* oxlint-disable unicorn/prefer-add-event-listener -- Each client owns its sockets and their handlers. */
+
 /**
  * Framework-free client for expo-device-hub's per-device streams, reached
  * through the T3 proxy. One class handles both platforms because the hub
@@ -16,8 +19,7 @@
  * The decoder only runs while frames arrive and the viewer is attached; a
  * hidden panel calls `stop()` so an idle device costs nothing on the GPU.
  */
-import type { DeviceHubAccess } from "@t3tools/client-runtime/state/deviceHubAccess";
-import { withDeviceHubQuery } from "@t3tools/client-runtime/state/deviceHubAccess";
+import { type DeviceHubAccess, withDeviceHubQuery } from "./hubAccess.ts";
 import type { DevicePlatform } from "@t3tools/contracts";
 
 export type DeviceStreamStatus = "connecting" | "streaming" | "error";
@@ -47,6 +49,8 @@ export interface DeviceStreamTarget {
   readonly platform: DevicePlatform;
   readonly deviceId: string;
   readonly access: DeviceHubAccess;
+  /** Native iOS WebViews can use MJPEG without cross-origin fetch or secure-context support. */
+  readonly preferMjpeg?: boolean;
 }
 
 export type DeviceHardwareButton = "home" | "back" | "recents" | "power" | "appSwitcher";
@@ -280,7 +284,7 @@ export function createDeviceStreamClient(
   const httpUrl = (path: string) =>
     withDeviceHubQuery(`${access.httpBase}${vendor}${path}`, access);
   const wsUrl = (path: string) => withDeviceHubQuery(`${access.wsBase}${vendor}${path}`, access);
-  const useWebCodecs = isWebCodecsSupported();
+  const useWebCodecs = isWebCodecsSupported() && !(platform === "ios" && target.preferMjpeg);
 
   let stopped = true;
   let socket: WebSocket | null = null;
@@ -526,14 +530,20 @@ export function createDeviceStreamClient(
       }
     };
     ws.onclose = (event) => {
-      if (socket === ws) socket = null;
-      if (!stopped) {
-        events.onInputConnected(
-          false,
-          event.reason || (event.code === 1006 ? "input socket refused" : `closed ${event.code}`),
-        );
-      }
-      if (event.code === 1008 || event.code === 4401) return handleUnauthorized();
+      if (socket !== ws) return;
+      socket = null;
+      if (stopped) return;
+      events.onInputConnected(
+        false,
+        event.reason || (event.code === 1006 ? "input socket refused" : `closed ${event.code}`),
+      );
+      // A rejected HTTP upgrade surfaces as 1006, including an expired stream ticket.
+      if (
+        event.code === 1008 ||
+        event.code === 4401 ||
+        (event.code === 1006 && access.query.wsTicket)
+      )
+        return handleUnauthorized();
       scheduleRetry("input", () => void connectIosInput());
     };
     ws.onerror = () => ws.close();
@@ -580,14 +590,19 @@ export function createDeviceStreamClient(
       decode(isKey, packet.data, packet.timestamp);
     };
     ws.onclose = (event) => {
-      if (socket === ws) socket = null;
+      if (socket !== ws) return;
+      socket = null;
       closeDecoder();
-      if (!stopped) events.onInputConnected(false, event.reason || `closed ${event.code}`);
-      if (event.code === 1008 || event.code === 4401) return handleUnauthorized();
-      if (!stopped) {
-        setStatus("connecting", event.reason || undefined);
-        scheduleRetry("input", connectAndroid);
-      }
+      if (stopped) return;
+      events.onInputConnected(false, event.reason || `closed ${event.code}`);
+      if (
+        event.code === 1008 ||
+        event.code === 4401 ||
+        (event.code === 1006 && access.query.wsTicket)
+      )
+        return handleUnauthorized();
+      setStatus("connecting", event.reason || undefined);
+      scheduleRetry("input", connectAndroid);
     };
     ws.onerror = () => ws.close();
   };
diff --git a/packages/client-runtime/src/state/deviceHubAccess.ts b/packages/client-runtime/src/state/deviceHubAccess.ts
index 4c87aa538ac1..9ab65b25e634 100644
--- a/packages/client-runtime/src/state/deviceHubAccess.ts
+++ b/packages/client-runtime/src/state/deviceHubAccess.ts
@@ -20,19 +20,11 @@ import { environmentEndpointUrl } from "../environment/endpoint.ts";
 import { ManagedRelayDpopSigner } from "../relay/managedRelay.ts";
 import type { RemoteEnvironmentRequestError } from "../rpc/http.ts";
 import { executeAuthenticatedEnvironmentHttpRequest } from "./environmentHttpAuth.ts";
+import type { DeviceHubAccess } from "../device/hubAccess.ts";
 
-const TICKET_TIMEOUT_MS = 8_000;
+export { type DeviceHubAccess, withDeviceHubQuery } from "../device/hubAccess.ts";
 
-export interface DeviceHubAccess {
-  /** Absolute origin-relative base, e.g. `https://env.example/api/device-hub`. */
-  readonly httpBase: string;
-  /** Same base with the `ws(s)` scheme. */
-  readonly wsBase: string;
-  /** Query parameters to append to every hub request; empty for cookie sessions. */
-  readonly query: Readonly<Record<string, string>>;
-  /** Whether requests must include cookies (same-origin session). */
-  readonly credentials: boolean;
-}
+const TICKET_TIMEOUT_MS = 8_000;
 
 export const resolveDeviceHubAccess = Effect.fn("clientRuntime.state.resolveDeviceHubAccess")(
   function* (input: {
@@ -64,10 +56,3 @@ export const resolveDeviceHubAccess = Effect.fn("clientRuntime.state.resolveDevi
     };
   },
 );
-
-export const withDeviceHubQuery = (url: string, access: DeviceHubAccess): string => {
-  const entries = Object.entries(access.query);
-  if (entries.length === 0) return url;
-  const separator = url.includes("?") ? "&" : "?";
-  return `${url}${separator}${new URLSearchParams(entries).toString()}`;
-};

From 5378f87f99175bded2b9241876319567875aca03 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 20:37:20 -0700
Subject: [PATCH 11/25] fix(preview): recover host registration after request
 timeouts (#12535)

---
 .../src/mcp/PreviewAutomationBroker.test.ts   | 134 ++++++++++++++-
 .../server/src/mcp/PreviewAutomationBroker.ts |  64 +++++---
 .../client-runtime/src/rpc/client.test.ts     | 153 ++++++++++++++++++
 packages/client-runtime/src/rpc/client.ts     |  13 +-
 4 files changed, 336 insertions(+), 28 deletions(-)

diff --git a/apps/server/src/mcp/PreviewAutomationBroker.test.ts b/apps/server/src/mcp/PreviewAutomationBroker.test.ts
index 0371c97c5fd9..ef552f9b04d0 100644
--- a/apps/server/src/mcp/PreviewAutomationBroker.test.ts
+++ b/apps/server/src/mcp/PreviewAutomationBroker.test.ts
@@ -10,18 +10,22 @@ import {
   PreviewTabId,
   ProviderInstanceId,
   ThreadId,
+  WS_METHODS,
+  WsRpcGroup,
   type PreviewAutomationHost,
   type PreviewAutomationRequest,
   type PreviewAutomationStreamEvent,
 } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
-import * as Cause from "effect/Cause";
 import * as Deferred from "effect/Deferred";
 import * as Fiber from "effect/Fiber";
 import * as Result from "effect/Result";
+import * as Scheduler from "effect/Scheduler";
 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
+import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
+import * as RpcTest from "effect/unstable/rpc/RpcTest";
 
 import * as PreviewAutomationBroker from "./PreviewAutomationBroker.ts";
 
@@ -1118,7 +1122,19 @@ it.effect("evicts an unanswered host and lets later calls use a healthy runtime"
       const otherReceived = yield* Deferred.make<void>();
       const otherCompleted = yield* Deferred.make<void>();
       const oldTab = PreviewTabId.make("tab-on-frozen-host");
-      const events = yield* broker.connect(makeHost());
+      const group = RpcGroup.make(
+        ...Array.from(WsRpcGroup.requests.values()).filter(
+          (rpc) => rpc._tag === WS_METHODS.previewAutomationConnect,
+        ),
+      );
+      const client = yield* RpcTest.makeClient(group).pipe(
+        Effect.provide(
+          group.toLayer({
+            [WS_METHODS.previewAutomationConnect]: (host) => Stream.unwrap(broker.connect(host)),
+          }),
+        ),
+      );
+      const events = client[WS_METHODS.previewAutomationConnect](makeHost());
       const consumer = yield* Stream.runForEach(events, (event) => {
         if (event.type === "connected") return Deferred.succeed(connected, event.connectionId);
         const request = { ...event.request, connectionId: event.connectionId };
@@ -1183,10 +1199,7 @@ it.effect("evicts an unanswered host and lets later calls use a healthy runtime"
         _tag: "PreviewAutomationClientDisconnectedError",
       });
       const consumerExit = yield* Fiber.await(consumer);
-      expect(Exit.isFailure(consumerExit)).toBe(true);
-      if (Exit.isFailure(consumerExit)) {
-        expect(Cause.hasInterruptsOnly(consumerExit.cause)).toBe(true);
-      }
+      expect(Exit.isSuccess(consumerExit)).toBe(true);
 
       // Late traffic from the evicted connection cannot restore its assignment.
       yield* broker.respond({
@@ -1209,6 +1222,115 @@ it.effect("evicts an unanswered host and lets later calls use a healthy runtime"
   ),
 );
 
+it.effect("discards buffered actions before completing an evicted host stream", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const broker = yield* makeBroker;
+      const connected = yield* Deferred.make<void>();
+      const received = yield* Deferred.make<void>();
+      const actionRouted = yield* Deferred.make<void>();
+      const releaseConsumer = yield* Deferred.make<void>();
+      const operations: string[] = [];
+      const consumer = yield* Stream.runForEach(yield* broker.connect(makeHost()), (event) => {
+        if (event.type === "connected") return Deferred.succeed(connected, undefined);
+        operations.push(event.request.operation);
+        return Deferred.succeed(received, undefined).pipe(
+          Effect.andThen(Deferred.await(releaseConsumer)),
+        );
+      }).pipe(Effect.forkScoped);
+      yield* Deferred.await(connected);
+      const timedOut = yield* broker
+        .invoke<void>({ scope, operation: "snapshot", input: {}, timeoutMs: 1_000 })
+        .pipe(Effect.flip, Effect.forkScoped);
+      yield* Deferred.await(received);
+      const buffered = yield* broker
+        .invoke<void>({
+          scope,
+          operation: "click",
+          input: {},
+          timeoutMs: 10_000,
+          onTargetTab: () => {
+            Deferred.doneUnsafe(actionRouted, Effect.void);
+          },
+        })
+        .pipe(Effect.flip, Effect.forkScoped);
+      yield* Deferred.await(actionRouted);
+      yield* TestClock.adjust(1_000);
+      expect(yield* Fiber.join(timedOut)).toMatchObject({ _tag: "PreviewAutomationTimeoutError" });
+      expect(yield* Fiber.join(buffered)).toMatchObject({
+        _tag: "PreviewAutomationClientDisconnectedError",
+      });
+      yield* Deferred.succeed(releaseConsumer, undefined);
+      expect(Exit.isSuccess(yield* Fiber.await(consumer))).toBe(true);
+      expect(operations).toEqual(["snapshot"]);
+    }),
+  ),
+);
+
+it.effect("rejects a routed action when its generation is evicted before delivery", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const broker = yield* makeBroker;
+      const connected = yield* Deferred.make<void>();
+      const received = yield* Deferred.make<void>();
+      const actionRouted = yield* Deferred.make<void>();
+      const operations: string[] = [];
+      const consumer = yield* Stream.runForEach(yield* broker.connect(makeHost()), (event) => {
+        if (event.type === "connected") return Deferred.succeed(connected, undefined);
+        operations.push(event.request.operation);
+        return Deferred.succeed(received, undefined);
+      }).pipe(Effect.forkScoped);
+      yield* Deferred.await(connected);
+      const timedOut = yield* broker
+        .invoke<void>({ scope, operation: "snapshot", input: {}, timeoutMs: 1_000 })
+        .pipe(Effect.flip, Effect.forkScoped);
+      yield* Deferred.await(received);
+
+      // Suspend only this invocation in the gap between route selection and delivery.
+      const tasks: Array<() => void> = [];
+      let paused = false;
+      const dispatcher: Scheduler.SchedulerDispatcher = {
+        scheduleTask: (task) => tasks.push(task),
+        flush: () => {
+          let task: (() => void) | undefined;
+          while ((task = tasks.shift()) !== undefined) task();
+        },
+      };
+      const scheduler: Scheduler.Scheduler = {
+        executionMode: "async",
+        makeDispatcher: () => dispatcher,
+        shouldYield: () => paused,
+      };
+      const action = yield* broker
+        .invoke<void>({
+          scope,
+          operation: "click",
+          input: {},
+          onTargetTab: () => {
+            paused = true;
+            Deferred.doneUnsafe(actionRouted, Effect.void);
+          },
+        })
+        .pipe(
+          Effect.flip,
+          Effect.provideService(Scheduler.Scheduler, scheduler),
+          Effect.forkScoped,
+        );
+      yield* Deferred.await(actionRouted);
+      yield* TestClock.adjust(1_000);
+      expect(yield* Fiber.join(timedOut)).toMatchObject({ _tag: "PreviewAutomationTimeoutError" });
+      expect(Exit.isSuccess(yield* Fiber.await(consumer))).toBe(true);
+
+      paused = false;
+      dispatcher.flush();
+      expect(yield* Fiber.join(action)).toMatchObject({
+        _tag: "PreviewAutomationClientDisconnectedError",
+      });
+      expect(operations).toEqual(["snapshot"]);
+    }),
+  ),
+);
+
 it.effect("keeps a host that responds with an operation timeout", () =>
   Effect.scoped(
     Effect.gen(function* () {
diff --git a/apps/server/src/mcp/PreviewAutomationBroker.ts b/apps/server/src/mcp/PreviewAutomationBroker.ts
index 418835ae81d9..527f71f5915d 100644
--- a/apps/server/src/mcp/PreviewAutomationBroker.ts
+++ b/apps/server/src/mcp/PreviewAutomationBroker.ts
@@ -26,6 +26,7 @@ import {
   type PreviewAutomationStreamEvent,
 } from "@t3tools/contracts";
 import * as Context from "effect/Context";
+import type * as Cause from "effect/Cause";
 import * as Crypto from "effect/Crypto";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
@@ -73,7 +74,7 @@ interface ClientConnection {
   readonly supportedOperations: ReadonlySet<PreviewAutomationOperation>;
   readonly focused: boolean;
   readonly focusOrder: number;
-  readonly queue: Queue.Queue<PreviewAutomationStreamEvent>;
+  readonly queue: Queue.Queue<PreviewAutomationStreamEvent, Cause.Done>;
 }
 
 interface PendingRequest {
@@ -326,32 +327,47 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
   const closeConnection = Effect.fn("PreviewAutomationBroker.closeConnection")(function* (
     queue: ClientConnection["queue"],
     disconnected: ReadonlyArray<PendingRequest>,
+    completeStream = false,
   ) {
+    if (completeStream) {
+      // Discard this generation's commands and complete the RPC stream so a
+      // responsive desktop can re-register after a timeout eviction.
+      yield* Queue.clear(queue);
+      yield* Queue.end(queue);
+    } else {
+      // Replaced registrations must not reconnect and displace their successor.
+      yield* Queue.shutdown(queue);
+    }
     yield* Effect.forEach(
       disconnected,
       ({ deferred, context }) =>
         Deferred.fail(deferred, new PreviewAutomationClientDisconnectedError(context)),
       { discard: true },
     );
-    yield* Queue.shutdown(queue);
   });
 
   const disconnect = Effect.fn("PreviewAutomationBroker.disconnect")(function* (
     clientId: string,
     queue: ClientConnection["queue"],
+    completeStream = false,
   ) {
-    const disconnected = yield* SynchronizedRef.modify(state, (current) => {
+    yield* SynchronizedRef.modifyEffect(state, (current) => {
+      // Retired generations were already closed by their replacement or eviction.
+      if (current.clients.get(clientId)?.queue !== queue) {
+        return Effect.succeed([undefined, current] as const);
+      }
       const removed = removeConnectionFromState(current, clientId, queue);
-      return [removed.disconnected, removed.state] as const;
+      return closeConnection(queue, removed.disconnected, completeStream).pipe(
+        Effect.as([undefined, removed.state] as const),
+      );
     });
-    yield* closeConnection(queue, disconnected);
   });
 
   const acquireConnection = Effect.fn("PreviewAutomationBroker.acquireConnection")(function* (
     host: PreviewAutomationHost,
   ) {
     const clientId = host.clientId;
-    const queue = yield* Queue.unbounded<PreviewAutomationStreamEvent>();
+    const queue = yield* Queue.unbounded<PreviewAutomationStreamEvent, Cause.Done>();
     const connectionId = yield* crypto.randomUUIDv4.pipe(Effect.orDie);
     yield* Queue.offer(queue, { type: "connected", connectionId });
     const connection: ClientConnection = {
@@ -553,18 +569,28 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
       return { ...next, pending };
     });
     const awaitResponse = Effect.fn("PreviewAutomationBroker.awaitResponse")(function* () {
-      const offered = yield* Queue.offer(connection.queue, {
-        type: "request",
-        connectionId: connection.connectionId,
-        request: {
-          requestId,
-          threadId: input.scope.threadId,
-          tabId: requestContext.tabId,
-          tabIdExplicit: input.tabId !== undefined,
-          operation: input.operation,
-          input: input.input,
-          timeoutMs,
-        },
+      const offered = yield* SynchronizedRef.modifyEffect(state, (current) => {
+        // A route can outlive its generation while another request evicts it.
+        // Serialize the live-generation check and offer with queue closure.
+        if (
+          current.clients.get(connection.clientId)?.queue !== connection.queue ||
+          !current.pending.has(requestId)
+        ) {
+          return Effect.succeed([false, current] as const);
+        }
+        return Queue.offer(connection.queue, {
+          type: "request",
+          connectionId: connection.connectionId,
+          request: {
+            requestId,
+            threadId: input.scope.threadId,
+            tabId: requestContext.tabId,
+            tabIdExplicit: input.tabId !== undefined,
+            operation: input.operation,
+            input: input.input,
+            timeoutMs,
+          },
+        }).pipe(Effect.map((offered) => [offered, current] as const));
       });
       if (!offered) {
         const completion = yield* Deferred.poll(deferred);
@@ -579,7 +605,7 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
           Effect.gen(function* () {
             // An unanswered request invalidates this connection. Do not replay
             // actions: the client may have applied them before becoming unreachable.
-            yield* disconnect(connection.clientId, connection.queue);
+            yield* disconnect(connection.clientId, connection.queue, true);
             return yield* new PreviewAutomationTimeoutError(requestContext);
           }),
         onSome: (value) => Effect.succeed(value as A),
diff --git a/packages/client-runtime/src/rpc/client.test.ts b/packages/client-runtime/src/rpc/client.test.ts
index 9e4e8a600d55..032603f28a96 100644
--- a/packages/client-runtime/src/rpc/client.test.ts
+++ b/packages/client-runtime/src/rpc/client.test.ts
@@ -1,6 +1,9 @@
 import {
   DEFAULT_SERVER_SETTINGS,
   EnvironmentId,
+  PreviewTabId,
+  ThreadId,
+  type PreviewAutomationStreamEvent,
   type RelayClientInstallProgressEvent,
   type ServerConfigStreamEvent,
   type ServerLifecycleStreamEvent,
@@ -88,6 +91,156 @@ const makeHarness = Effect.fn("TestEnvironmentRpc.makeHarness")(function* () {
 });
 
 describe("environment RPC", () => {
+  it.effect("registers a fresh preview host after completion without replaying requests", () =>
+    Effect.gen(function* () {
+      const firstCompleted = yield* Deferred.make<void>();
+      const reconnected = yield* Deferred.make<void>();
+      const requests: string[] = [];
+      const connections: string[] = [];
+      let attempts = 0;
+      const client = {
+        [WS_METHODS.previewAutomationConnect]: () =>
+          Stream.suspend(() => {
+            attempts += 1;
+            const connected: PreviewAutomationStreamEvent = {
+              type: "connected",
+              connectionId: `connection-${attempts}`,
+            };
+            return attempts === 1
+              ? Stream.make(connected, {
+                  type: "request",
+                  connectionId: connected.connectionId,
+                  request: {
+                    requestId: "timed-out-action",
+                    operation: "click",
+                    threadId: ThreadId.make("thread-1"),
+                    tabId: PreviewTabId.make("tab-1"),
+                    input: {},
+                    timeoutMs: 1_000,
+                  },
+                } satisfies PreviewAutomationStreamEvent).pipe(
+                  Stream.ensuring(Deferred.succeed(firstCompleted, undefined)),
+                )
+              : Stream.succeed(connected).pipe(Stream.concat(Stream.never));
+          }),
+      } as unknown as WsRpcProtocolClient;
+      const { activeSession, supervisor } = yield* makeHarness();
+      yield* SubscriptionRef.set(activeSession, Option.some(session(client)));
+      const consumer = yield* subscribe(WS_METHODS.previewAutomationConnect, {
+        clientId: "preview-host",
+        environmentId: TARGET.environmentId,
+      }).pipe(
+        Stream.runForEach((event) => {
+          if (event.type === "request") {
+            requests.push(event.request.requestId);
+            return Effect.void;
+          }
+          connections.push(event.connectionId);
+          return connections.length === 2 ? Deferred.succeed(reconnected, undefined) : Effect.void;
+        }),
+        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+        Effect.forkChild,
+      );
+      yield* Deferred.await(firstCompleted);
+      yield* TestClock.adjust(999);
+      expect(attempts).toBe(1);
+      yield* TestClock.adjust(1);
+      expect(attempts).toBe(2);
+      yield* Deferred.await(reconnected);
+      expect(connections).toEqual(["connection-1", "connection-2"]);
+      expect(requests).toEqual(["timed-out-action"]);
+      yield* Fiber.interrupt(consumer);
+    }),
+  );
+
+  it.effect("does not re-register an unmounted preview host during the recovery delay", () =>
+    Effect.gen(function* () {
+      const completed = yield* Deferred.make<void>();
+      let attempts = 0;
+      const client = {
+        [WS_METHODS.previewAutomationConnect]: () =>
+          Stream.suspend(() => {
+            attempts += 1;
+            return Stream.empty.pipe(Stream.ensuring(Deferred.succeed(completed, undefined)));
+          }),
+      } as unknown as WsRpcProtocolClient;
+      const { activeSession, supervisor } = yield* makeHarness();
+      yield* SubscriptionRef.set(activeSession, Option.some(session(client)));
+      const consumer = yield* subscribe(WS_METHODS.previewAutomationConnect, {
+        clientId: "preview-host",
+        environmentId: TARGET.environmentId,
+      }).pipe(
+        Stream.runDrain,
+        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+        Effect.forkChild,
+      );
+      yield* Deferred.await(completed);
+      yield* Fiber.interrupt(consumer);
+      yield* TestClock.adjust(10_000);
+      expect(attempts).toBe(1);
+    }),
+  );
+
+  it.effect.each(["completion", "transport failure"] as const)(
+    "keeps preview recovery tied to the active session after %s",
+    (reason) =>
+      Effect.gen(function* () {
+        const completed = yield* Deferred.make<void>();
+        const nextConnected = yield* Deferred.make<void>();
+        let oldAttempts = 0;
+        let nextAttempts = 0;
+        const firstClient = {
+          [WS_METHODS.previewAutomationConnect]: () =>
+            Stream.suspend(() => {
+              oldAttempts += 1;
+              return (
+                reason === "completion"
+                  ? Stream.empty
+                  : Stream.fail(
+                      new RpcClientError.RpcClientError({
+                        reason: new RpcClientError.RpcClientDefect({
+                          message: "socket closed",
+                          cause: new Error("socket closed"),
+                        }),
+                      }),
+                    )
+              ).pipe(Stream.ensuring(Deferred.succeed(completed, undefined)));
+            }),
+        } as unknown as WsRpcProtocolClient;
+        const nextClient = {
+          [WS_METHODS.previewAutomationConnect]: () =>
+            Stream.suspend(() => {
+              nextAttempts += 1;
+              return Stream.fromEffect(Deferred.succeed(nextConnected, undefined)).pipe(
+                Stream.drain,
+                Stream.concat(Stream.never),
+              );
+            }),
+        } as unknown as WsRpcProtocolClient;
+        const { activeSession, supervisor } = yield* makeHarness();
+        yield* SubscriptionRef.set(activeSession, Option.some(session(firstClient)));
+        const consumer = yield* subscribe(WS_METHODS.previewAutomationConnect, {
+          clientId: "preview-host",
+          environmentId: TARGET.environmentId,
+        }).pipe(
+          Stream.runDrain,
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.forkChild,
+        );
+        yield* Deferred.await(completed);
+        if (reason === "transport failure") {
+          yield* TestClock.adjust(10_000);
+          expect(oldAttempts).toBe(1);
+        }
+        yield* SubscriptionRef.set(activeSession, Option.some(session(nextClient)));
+        yield* Deferred.await(nextConnected);
+        yield* TestClock.adjust(10_000);
+        expect(oldAttempts).toBe(1);
+        expect(nextAttempts).toBe(1);
+        yield* Fiber.interrupt(consumer);
+      }),
+  );
+
   it.effect("reuses the session config stream instead of opening a duplicate subscription", () =>
     Effect.gen(function* () {
       const event: ServerConfigStreamEvent = {
diff --git a/packages/client-runtime/src/rpc/client.ts b/packages/client-runtime/src/rpc/client.ts
index e80a2f0f4b12..4f725378ffbf 100644
--- a/packages/client-runtime/src/rpc/client.ts
+++ b/packages/client-runtime/src/rpc/client.ts
@@ -5,6 +5,7 @@ import type * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
+import * as Schedule from "effect/Schedule";
 import * as Stream from "effect/Stream";
 import * as SubscriptionRef from "effect/SubscriptionRef";
 import { RpcClientError } from "effect/unstable/rpc";
@@ -233,9 +234,15 @@ function subscribeDynamicMapped<TTag extends EnvironmentSubscriptionRpcTag, A>(
                         method: tag,
                         input,
                       });
-                      return mapStream(session, method(input)).pipe(
-                        Stream.ensuring(completeObservation),
-                      );
+                      const stream = mapStream(session, method(input));
+                      // An evicted preview host completes its registration stream.
+                      // Re-register only after completion; failures still follow the
+                      // session recovery policy and browser actions are never replayed.
+                      return (
+                        tag === WS_METHODS.previewAutomationConnect
+                          ? stream.pipe(Stream.repeat(Schedule.spaced("1 second")))
+                          : stream
+                      ).pipe(Stream.ensuring(completeObservation));
                     }),
                   ).pipe(
                     Stream.tapCause((cause) =>

From 0f1b572b9865256dd61e245b4dd09f6a7b15f0e1 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 21:12:32 -0700
Subject: [PATCH 12/25] fix(mobile): align built-in theme colors with desktop
 (#12534)

---
 apps/mobile/clerk-theme.json                  |  54 +-
 ...rated-uniwind-default-theme-variables.json | 276 ++++----
 apps/mobile/generated-uniwind-themes.css      | 646 +++++++++++++-----
 apps/mobile/global.css                        | 222 ------
 .../modules/t3markdowntext/T3ContextChip.kt   |  10 +-
 .../plugins/withAndroidModernAlertDialog.cjs  |  31 +-
 .../scripts/generate-uniwind-themes.mts       |  90 +--
 .../scripts/generate-uniwind-themes.test.ts   |  24 +-
 .../src/components/AndroidScreenHeader.tsx    |  12 +-
 apps/mobile/src/components/AppText.tsx        |  12 +-
 .../src/components/ComposerContextSheet.tsx   |   8 +-
 apps/mobile/src/components/ControlPill.tsx    |   4 +-
 apps/mobile/src/components/FilePreview.tsx    |   2 +-
 apps/mobile/src/components/GlassBackdrop.tsx  |  18 +-
 apps/mobile/src/components/GlassSurface.tsx   |  13 +-
 .../src/components/MaterialButton.android.tsx |   2 +-
 apps/mobile/src/components/MaterialButton.tsx |  28 +-
 .../MaterialConfirmDialog.android.tsx         |  13 +-
 .../MaterialFloatingActionButton.android.tsx  |   8 +-
 .../MaterialFloatingActionButton.tsx          |  10 +-
 .../components/MaterialIconButton.android.tsx |   3 +-
 .../src/components/MaterialIconButton.tsx     |  34 +-
 .../src/components/MaterialSearchField.tsx    |   6 +-
 apps/mobile/src/components/RowPressable.tsx   |   8 +-
 .../src/components/ScreenHeader.android.tsx   |   8 +-
 .../src/components/SegmentedControl.tsx       |   4 +-
 .../connection/ConnectionStatusDot.tsx        |  27 +-
 .../src/features/connection/connectionTone.ts |   4 +-
 .../devices/DevicePreviewRouteScreen.tsx      |  12 +-
 .../devices/device-stream-document.ts         |   2 +
 .../features/devices/device-stream.browser.ts |   4 +-
 .../src/features/files/SourceFileSurface.tsx  |   6 +-
 .../src/features/keyboard/CommandPalette.tsx  |  38 +-
 .../features/projects/AddProjectScreen.tsx    |   2 +-
 .../src/features/review/ReviewSheet.tsx       |   8 +-
 .../review/nativeReviewDiffAdapter.test.ts    |  21 +-
 .../review/nativeReviewDiffAdapter.ts         |  11 +-
 .../SettingsOpenSourceLicensesRouteScreen.tsx |   8 +-
 .../sections/ThemeAppearanceSection.tsx       |   6 +-
 .../components/AutoSettleDaysField.ios.tsx    |   6 +-
 .../settings/components/SettingsActionRow.tsx |   1 +
 .../SettingsProjectOverridesSection.tsx       |   2 +-
 .../settings/components/SettingsRow.tsx       |   1 +
 .../settings/components/SettingsSection.tsx   |   6 +-
 .../features/terminal/terminalTheme.test.ts   |  20 +-
 .../src/features/terminal/terminalTheme.ts    |  19 +-
 .../threads/CustomSnoozeSheet.shared.tsx      |   2 +-
 .../threads/NewTaskContextPickerScreens.tsx   |   8 +-
 .../threads/ThreadArrangementSheet.tsx        |   2 +-
 .../src/features/threads/ThreadComposer.tsx   |   8 +-
 .../threads/ThreadCreationFailedCard.tsx      |   8 +-
 .../src/features/threads/ThreadFeed.tsx       |  18 +-
 .../threads/ThreadNavigationSidebar.tsx       |  30 +-
 .../threads/ThreadSettingsRows.android.tsx    |   2 +-
 .../features/threads/ThreadSettingsSheet.tsx  |   6 +-
 .../threads/floating-working-control.tsx      |   6 +-
 .../features/threads/git/GitCommitSheet.tsx   |  14 +-
 .../threads/sidebar-navigation-shell.tsx      |   2 +-
 .../features/threads/thread-list-items.tsx    | 171 +++--
 .../features/threads/thread-list-v2-items.tsx | 149 ++--
 .../thread-list-v2-row-appearance.android.ts  |  24 +-
 .../thread-list-v2-row-appearance.test.ts     |  37 +
 .../threads/thread-list-v2-row-appearance.ts  |  26 +-
 .../features/threads/thread-search-match.tsx  |  30 +-
 .../src/features/threads/thread-work-log.tsx  |   6 +-
 .../features/threads/threadPresentation.ts    |  30 +-
 .../features/threads/worktree-setup-card.tsx  |  54 +-
 .../voice-input/ComposerDictationControl.tsx  |   2 +-
 .../src/lib/materialYouTheme.android.ts       |  12 +
 apps/mobile/src/lib/materialYouTheme.test.ts  |   1 +
 .../src/lib/mobileTheme.test-support.ts       |  17 +-
 apps/mobile/src/lib/mobileTheme.test.ts       | 157 ++++-
 apps/mobile/src/lib/mobileTheme.ts            | 149 ++--
 .../src/lib/mobileThemeVariables.test.ts      |  69 +-
 apps/mobile/src/lib/mobileThemeVariables.ts   |  29 +-
 .../src/lib/nativeComposerTheme.test.ts       |  32 +
 apps/mobile/src/lib/nativeComposerTheme.ts    |  19 +
 .../src/lib/useMobileNavigationTheme.ts       |  17 +-
 .../native/SelectableMarkdownText.android.tsx |   4 +-
 .../src/native/T3ComposerEditor.ios.tsx       |  15 +-
 .../src/native/T3ComposerEditor.native.tsx    |  15 +-
 apps/web/src/themePalette.test.ts             |  15 +
 apps/web/src/themePalette.ts                  | 129 +---
 packages/shared/src/themePalettes.ts          | 129 +++-
 84 files changed, 1913 insertions(+), 1281 deletions(-)
 create mode 100644 apps/mobile/src/features/threads/thread-list-v2-row-appearance.test.ts
 create mode 100644 apps/mobile/src/lib/nativeComposerTheme.test.ts
 create mode 100644 apps/mobile/src/lib/nativeComposerTheme.ts

diff --git a/apps/mobile/clerk-theme.json b/apps/mobile/clerk-theme.json
index 119927a04d60..f854f52a0d49 100644
--- a/apps/mobile/clerk-theme.json
+++ b/apps/mobile/clerk-theme.json
@@ -1,36 +1,36 @@
 {
   "colors": {
-    "primary": "#262626",
-    "background": "#F2F2F7",
-    "input": "#FFFFFF",
-    "danger": "#DC2626",
+    "primary": "#1b4ed8",
+    "background": "#fcfcfc",
+    "input": "#ffffff",
+    "danger": "#c10007",
     "success": "#059669",
-    "warning": "#D97706",
-    "foreground": "#262626",
-    "mutedForeground": "#737373",
-    "primaryForeground": "#FFFFFF",
-    "inputForeground": "#262626",
-    "neutral": "#F5F5F5",
-    "border": "#E5E5EA",
-    "ring": "#A3A3A3",
-    "muted": "#F2F2F7",
+    "warning": "#bb4d00",
+    "foreground": "#27272a",
+    "mutedForeground": "#71717b",
+    "primaryForeground": "#ffffff",
+    "inputForeground": "#27272a",
+    "neutral": "#fafafa",
+    "border": "#e4e4e7",
+    "ring": "#1b4ed8",
+    "muted": "#fafafa",
     "shadow": "#000000"
   },
   "darkColors": {
-    "primary": "#F5F5F5",
-    "background": "#0E0E0E",
-    "input": "#171717",
-    "danger": "#FCA5A5",
-    "success": "#34D399",
-    "warning": "#FBBF24",
-    "foreground": "#F5F5F5",
-    "mutedForeground": "#A3A3A3",
-    "primaryForeground": "#0A0A0A",
-    "inputForeground": "#F5F5F5",
-    "neutral": "#1C1C1C",
-    "border": "#2A2A2A",
-    "ring": "#525252",
-    "muted": "#0E0E0E",
+    "primary": "#346bf1",
+    "background": "#0a0a0a",
+    "input": "#111111",
+    "danger": "#ff6467",
+    "success": "#34d399",
+    "warning": "#ffb900",
+    "foreground": "#f5f5f5",
+    "mutedForeground": "#818181",
+    "primaryForeground": "#ffffff",
+    "inputForeground": "#f5f5f5",
+    "neutral": "#111111",
+    "border": "#191919",
+    "ring": "#346bf1",
+    "muted": "#111111",
     "shadow": "#000000"
   },
   "design": {
diff --git a/apps/mobile/generated-uniwind-default-theme-variables.json b/apps/mobile/generated-uniwind-default-theme-variables.json
index 02430b86aae3..961a0df24cd4 100644
--- a/apps/mobile/generated-uniwind-default-theme-variables.json
+++ b/apps/mobile/generated-uniwind-default-theme-variables.json
@@ -1,156 +1,180 @@
 {
   "light": {
-    "--color-screen": "#f2f2f7",
-    "--color-sheet": "rgba(242, 242, 247, 0.98)",
-    "--color-sheet-solid": "#f2f2f7",
+    "--color-screen": "#fcfcfc",
+    "--color-sheet": "rgba(252, 252, 252, 0.98)",
+    "--color-sheet-solid": "#fcfcfc",
     "--color-card": "#ffffff",
-    "--color-card-alt": "#f5f5f5",
+    "--color-grouped-card": "#f4f4f5",
+    "--color-card-alt": "#fcfcfc",
     "--color-card-translucent": "rgba(255, 255, 255, 0.8)",
-    "--color-thread-canvas": "#f5f5f5",
+    "--color-thread-canvas": "#fcfcfc",
     "--color-thread-selected": "#ffffff",
-    "--color-thread-selected-foreground": "#262626",
-    "--color-thread-selected-foreground-muted": "#737373",
-    "--color-composer-panel": "rgba(245, 245, 245, 0.88)",
-    "--color-composer-surface": "rgba(255, 255, 255, 0.94)",
-    "--color-composer-border": "rgba(0, 0, 0, 0.1)",
-    "--color-foreground": "#262626",
-    "--color-foreground-secondary": "#525252",
-    "--color-foreground-muted": "#737373",
-    "--color-foreground-tertiary": "#8e8e93",
-    "--color-border": "rgba(0, 0, 0, 0.08)",
-    "--color-border-subtle": "rgba(0, 0, 0, 0.06)",
-    "--color-separator": "rgba(0, 0, 0, 0.04)",
-    "--color-subtle": "rgba(0, 0, 0, 0.04)",
-    "--color-subtle-strong": "rgba(0, 0, 0, 0.08)",
-    "--color-inline-skill-background": "rgba(217, 70, 239, 0.12)",
-    "--color-inline-skill-border": "rgba(217, 70, 239, 0.25)",
-    "--color-inline-skill-foreground": "#a21caf",
-    "--color-primary": "#262626",
+    "--color-thread-selected-foreground": "#27272a",
+    "--color-thread-selected-foreground-muted": "#71717b",
+    "--color-thread-hover": "#fcfcfc",
+    "--color-row-hover": "#f4f4f5",
+    "--color-composer-panel": "rgba(252, 252, 252, 0.88)",
+    "--color-composer-surface": "rgba(244, 244, 245, 0.94)",
+    "--color-composer-border": "rgba(228, 228, 231, 0.8)",
+    "--color-foreground": "#27272a",
+    "--color-foreground-secondary": "#6f6f79",
+    "--color-foreground-muted": "#6f6f79",
+    "--color-foreground-tertiary": "#71717b",
+    "--color-border": "#e4e4e7",
+    "--color-focus": "#1b4ed8",
+    "--color-border-subtle": "rgba(228, 228, 231, 0.7)",
+    "--color-separator": "rgba(228, 228, 231, 0.55)",
+    "--color-subtle": "#fafafa",
+    "--color-subtle-strong": "#fafafa",
+    "--color-inline-skill-background": "#f4f4f5",
+    "--color-inline-skill-border": "rgba(27, 78, 216, 0.42)",
+    "--color-inline-skill-foreground": "#18181b",
+    "--color-primary": "#1b4ed8",
     "--color-primary-foreground": "#ffffff",
+    "--color-primary-text": "#1b4ed8",
     "--color-primary-shadow": "#000000",
-    "--color-secondary": "#ffffff",
-    "--color-secondary-foreground": "#262626",
-    "--color-secondary-border": "rgba(0, 0, 0, 0.08)",
-    "--color-switch-active-track": "#34c759",
+    "--color-secondary": "#fafafa",
+    "--color-secondary-foreground": "#27272a",
+    "--color-secondary-border": "#e4e4e7",
+    "--color-switch-active-track": "#1b4ed8",
     "--color-switch-active-thumb": "#ffffff",
-    "--color-switch-inactive-track": "rgba(0, 0, 0, 0.08)",
-    "--color-switch-inactive-thumb": "#8e8e93",
-    "--color-warning": "#fffbeb",
-    "--color-warning-border": "#fde68a",
-    "--color-warning-foreground": "#b45309",
-    "--color-danger": "#fef2f2",
-    "--color-danger-border": "rgba(239, 68, 68, 0.12)",
-    "--color-danger-foreground": "#dc2626",
+    "--color-switch-inactive-track": "#fafafa",
+    "--color-switch-inactive-thumb": "#71717b",
+    "--color-warning": "#fcf4e8",
+    "--color-warning-border": "rgba(254, 154, 0, 0.32)",
+    "--color-warning-foreground": "#bb4d00",
+    "--color-danger": "#fcebec",
+    "--color-danger-border": "rgba(251, 44, 54, 0.32)",
+    "--color-danger-foreground": "#c10007",
+    "--color-update": "#e0e6f7",
+    "--color-update-foreground": "#1b4ed8",
     "--color-input": "#ffffff",
-    "--color-input-border": "rgba(0, 0, 0, 0.1)",
-    "--color-sidebar-search": "rgba(118, 118, 128, 0.12)",
-    "--color-placeholder": "#737373",
-    "--color-icon": "#262626",
-    "--color-icon-muted": "#525252",
-    "--color-icon-subtle": "#a3a3a3",
-    "--color-header": "rgba(255, 255, 255, 0.97)",
-    "--color-header-border": "rgba(0, 0, 0, 0.06)",
-    "--color-glass-surface": "rgba(255, 255, 255, 0.72)",
-    "--color-glass-tint": "rgba(255, 255, 255, 0.18)",
-    "--color-status-bar": "#f2f2f7",
-    "--color-md-body": "#111111",
-    "--color-md-strong": "#000000",
-    "--color-md-link": "#2563eb",
-    "--color-md-blockquote-border": "rgba(0, 0, 0, 0.08)",
-    "--color-md-blockquote-bg": "rgba(0, 0, 0, 0.02)",
-    "--color-md-code-bg": "rgba(0, 0, 0, 0.04)",
-    "--color-md-code-text": "#262626",
-    "--color-md-user-code-bg": "rgba(0, 0, 0, 0.04)",
-    "--color-md-user-code-text": "#262626",
-    "--color-md-user-fence-bg": "rgba(0, 0, 0, 0.06)",
-    "--color-md-user-fence-text": "#262626",
-    "--color-md-hr": "rgba(0, 0, 0, 0.08)",
-    "--color-user-bubble": "#ffffff",
-    "--color-user-bubble-foreground": "#262626",
-    "--color-user-bubble-foreground-muted": "rgba(38, 38, 38, 0.78)",
-    "--color-user-bubble-skill-foreground": "#2563eb",
+    "--color-input-border": "#d4d4d8",
+    "--color-sidebar-search": "#f4f4f5",
+    "--color-placeholder": "#6f6f79",
+    "--color-icon": "#27272a",
+    "--color-icon-muted": "#71717b",
+    "--color-icon-subtle": "#71717b",
+    "--color-header": "rgba(252, 252, 252, 0.97)",
+    "--color-header-foreground": "#27272a",
+    "--color-header-border": "#e4e4e7",
+    "--color-glass-surface": "rgba(255, 255, 255, 0.74)",
+    "--color-glass-fallback": "rgba(244, 244, 245, 0.94)",
+    "--color-glass-tint": "rgba(255, 255, 255, 0.22)",
+    "--color-status-bar": "#fcfcfc",
+    "--color-md-body": "#27272a",
+    "--color-md-strong": "#27272a",
+    "--color-md-link": "#1b4ed8",
+    "--color-md-blockquote-border": "#e4e4e7",
+    "--color-md-blockquote-bg": "#fafafa",
+    "--color-md-code-bg": "#ffffff",
+    "--color-md-code-text": "#27272a",
+    "--color-md-user-code-bg": "rgba(39, 39, 42, 0.18)",
+    "--color-md-user-code-text": "#27272a",
+    "--color-md-user-fence-bg": "rgba(0, 0, 0, 0.16)",
+    "--color-md-user-fence-text": "#27272a",
+    "--color-md-hr": "#e4e4e7",
+    "--color-user-bubble": "#efeff1",
+    "--color-user-bubble-foreground": "#27272a",
+    "--color-user-bubble-foreground-muted": "rgba(39, 39, 42, 0.78)",
+    "--color-user-bubble-skill-foreground": "#1b4ed8",
     "--color-backdrop": "rgba(0, 0, 0, 0.22)",
-    "--color-drawer": "rgba(255, 255, 255, 0.99)",
+    "--color-drawer": "#fafafa",
+    "--color-drawer-foreground": "#27272a",
+    "--color-drawer-foreground-muted": "#71717b",
+    "--color-drawer-border": "#e4e4e7",
     "--color-drawer-shadow": "rgba(0, 0, 0, 0.12)",
-    "--color-dot-separator": "rgba(0, 0, 0, 0.2)",
-    "--color-wordmark": "#262626",
-    "--color-chevron": "rgba(0, 0, 0, 0.2)"
+    "--color-dot-separator": "rgba(113, 113, 123, 0.35)",
+    "--color-wordmark": "#27272a",
+    "--color-chevron": "rgba(113, 113, 123, 0.42)"
   },
   "dark": {
     "--color-screen": "#0a0a0a",
-    "--color-sheet": "rgba(14, 14, 14, 0.98)",
-    "--color-sheet-solid": "#0e0e0e",
-    "--color-card": "#171717",
-    "--color-card-alt": "#1c1c1c",
+    "--color-sheet": "rgba(10, 10, 10, 0.98)",
+    "--color-sheet-solid": "#0a0a0a",
+    "--color-card": "#111111",
+    "--color-grouped-card": "#1a1b1b",
+    "--color-card-alt": "#111111",
     "--color-card-translucent": "rgba(17, 17, 17, 0.8)",
-    "--color-thread-canvas": "#1c1c1c",
-    "--color-thread-selected": "#171717",
-    "--color-thread-selected-foreground": "#f5f5f5",
-    "--color-thread-selected-foreground-muted": "#8e8e93",
-    "--color-composer-panel": "rgba(28, 28, 28, 0.92)",
-    "--color-composer-surface": "rgba(23, 23, 23, 0.9)",
-    "--color-composer-border": "rgba(255, 255, 255, 0.08)",
+    "--color-thread-canvas": "#0a0a0a",
+    "--color-thread-selected": "#1a1b1b",
+    "--color-thread-selected-foreground": "#f1f3f7",
+    "--color-thread-selected-foreground-muted": "#a3a3a3",
+    "--color-thread-hover": "#131313",
+    "--color-row-hover": "#141414",
+    "--color-composer-panel": "rgba(10, 10, 10, 0.92)",
+    "--color-composer-surface": "rgba(26, 27, 27, 0.9)",
+    "--color-composer-border": "rgba(25, 25, 25, 0.8)",
     "--color-foreground": "#f5f5f5",
-    "--color-foreground-secondary": "#a3a3a3",
-    "--color-foreground-muted": "#8e8e93",
-    "--color-foreground-tertiary": "#636366",
-    "--color-border": "rgba(255, 255, 255, 0.06)",
-    "--color-border-subtle": "rgba(255, 255, 255, 0.04)",
-    "--color-separator": "rgba(255, 255, 255, 0.03)",
-    "--color-subtle": "rgba(255, 255, 255, 0.04)",
-    "--color-subtle-strong": "rgba(255, 255, 255, 0.08)",
-    "--color-inline-skill-background": "rgba(217, 70, 239, 0.12)",
-    "--color-inline-skill-border": "rgba(217, 70, 239, 0.25)",
-    "--color-inline-skill-foreground": "#f0abfc",
-    "--color-primary": "#f5f5f5",
-    "--color-primary-foreground": "#0a0a0a",
+    "--color-foreground-secondary": "#838383",
+    "--color-foreground-muted": "#838383",
+    "--color-foreground-tertiary": "#818181",
+    "--color-border": "#191919",
+    "--color-focus": "#346bf1",
+    "--color-border-subtle": "rgba(25, 25, 25, 0.7)",
+    "--color-separator": "rgba(25, 25, 25, 0.55)",
+    "--color-subtle": "#111111",
+    "--color-subtle-strong": "#111111",
+    "--color-inline-skill-background": "#141414",
+    "--color-inline-skill-border": "rgba(52, 107, 241, 0.42)",
+    "--color-inline-skill-foreground": "#f5f5f5",
+    "--color-primary": "#346bf1",
+    "--color-primary-foreground": "#ffffff",
+    "--color-primary-text": "#4b7cf3",
     "--color-primary-shadow": "#000000",
-    "--color-secondary": "rgba(255, 255, 255, 0.04)",
+    "--color-secondary": "#111111",
     "--color-secondary-foreground": "#f5f5f5",
-    "--color-secondary-border": "rgba(255, 255, 255, 0.06)",
-    "--color-switch-active-track": "#30d158",
+    "--color-secondary-border": "#191919",
+    "--color-switch-active-track": "#346bf1",
     "--color-switch-active-thumb": "#ffffff",
-    "--color-switch-inactive-track": "rgba(255, 255, 255, 0.06)",
-    "--color-switch-inactive-thumb": "#8e8e93",
-    "--color-warning": "rgba(69, 26, 3, 0.4)",
-    "--color-warning-border": "rgba(120, 53, 15, 0.6)",
-    "--color-warning-foreground": "#fcd34d",
-    "--color-danger": "rgba(239, 68, 68, 0.14)",
-    "--color-danger-border": "rgba(248, 113, 113, 0.18)",
-    "--color-danger-foreground": "#fca5a5",
-    "--color-input": "#141414",
-    "--color-input-border": "rgba(255, 255, 255, 0.08)",
-    "--color-sidebar-search": "rgba(118, 118, 128, 0.24)",
-    "--color-placeholder": "#8e8e93",
+    "--color-switch-inactive-track": "#111111",
+    "--color-switch-inactive-thumb": "#818181",
+    "--color-warning": "#312108",
+    "--color-warning-border": "rgba(254, 154, 0, 0.32)",
+    "--color-warning-foreground": "#ffb900",
+    "--color-danger": "#301214",
+    "--color-danger-border": "rgba(251, 65, 74, 0.32)",
+    "--color-danger-foreground": "#ff6467",
+    "--color-update": "#121b34",
+    "--color-update-foreground": "#51a2ff",
+    "--color-input": "#111111",
+    "--color-input-border": "#1e1e1e",
+    "--color-sidebar-search": "#0a0a0a",
+    "--color-placeholder": "#838383",
     "--color-icon": "#f5f5f5",
-    "--color-icon-muted": "#a3a3a3",
-    "--color-icon-subtle": "#8e8e93",
+    "--color-icon-muted": "#818181",
+    "--color-icon-subtle": "#818181",
     "--color-header": "rgba(10, 10, 10, 0.97)",
-    "--color-header-border": "rgba(255, 255, 255, 0.06)",
-    "--color-glass-surface": "rgba(23, 23, 23, 0.78)",
-    "--color-glass-tint": "rgba(23, 23, 23, 0.24)",
+    "--color-header-foreground": "#f5f5f5",
+    "--color-header-border": "#191919",
+    "--color-glass-surface": "rgba(17, 17, 17, 0.74)",
+    "--color-glass-fallback": "rgba(26, 27, 27, 0.9)",
+    "--color-glass-tint": "rgba(17, 17, 17, 0.22)",
     "--color-status-bar": "#0a0a0a",
-    "--color-md-body": "#e5e5e5",
+    "--color-md-body": "#f5f5f5",
     "--color-md-strong": "#f5f5f5",
-    "--color-md-link": "#60a5fa",
-    "--color-md-blockquote-border": "rgba(255, 255, 255, 0.1)",
-    "--color-md-blockquote-bg": "rgba(255, 255, 255, 0.03)",
-    "--color-md-code-bg": "rgba(255, 255, 255, 0.06)",
-    "--color-md-code-text": "#e5e5e5",
-    "--color-md-user-code-bg": "rgba(255, 255, 255, 0.06)",
-    "--color-md-user-code-text": "#e5e5e5",
-    "--color-md-user-fence-bg": "rgba(255, 255, 255, 0.09)",
-    "--color-md-user-fence-text": "#e5e5e5",
-    "--color-md-hr": "rgba(255, 255, 255, 0.08)",
-    "--color-user-bubble": "#171717",
+    "--color-md-link": "#3b70f1",
+    "--color-md-blockquote-border": "#191919",
+    "--color-md-blockquote-bg": "#111111",
+    "--color-md-code-bg": "#111111",
+    "--color-md-code-text": "#f5f5f5",
+    "--color-md-user-code-bg": "rgba(245, 245, 245, 0.18)",
+    "--color-md-user-code-text": "#f5f5f5",
+    "--color-md-user-fence-bg": "rgba(0, 0, 0, 0.28)",
+    "--color-md-user-fence-text": "#f5f5f5",
+    "--color-md-hr": "#191919",
+    "--color-user-bubble": "#161616",
     "--color-user-bubble-foreground": "#f5f5f5",
     "--color-user-bubble-foreground-muted": "rgba(245, 245, 245, 0.78)",
-    "--color-user-bubble-skill-foreground": "#60a5fa",
+    "--color-user-bubble-skill-foreground": "#4678f2",
     "--color-backdrop": "rgba(0, 0, 0, 0.48)",
-    "--color-drawer": "rgba(14, 14, 14, 0.99)",
+    "--color-drawer": "#000000",
+    "--color-drawer-foreground": "#f1f3f7",
+    "--color-drawer-foreground-muted": "#a3a3a3",
+    "--color-drawer-border": "#141414",
     "--color-drawer-shadow": "rgba(0, 0, 0, 0.32)",
-    "--color-dot-separator": "rgba(255, 255, 255, 0.2)",
+    "--color-dot-separator": "rgba(129, 129, 129, 0.35)",
     "--color-wordmark": "#f5f5f5",
-    "--color-chevron": "rgba(255, 255, 255, 0.2)"
+    "--color-chevron": "rgba(129, 129, 129, 0.42)"
   }
 }
diff --git a/apps/mobile/generated-uniwind-themes.css b/apps/mobile/generated-uniwind-themes.css
index 84c445cf1cb1..2a1ce3629306 100644
--- a/apps/mobile/generated-uniwind-themes.css
+++ b/apps/mobile/generated-uniwind-themes.css
@@ -2,6 +2,93 @@
 @layer theme {
   :root {
     @variant light {
+      --color-screen: #fcfcfc;
+      --color-sheet: rgba(252, 252, 252, 0.98);
+      --color-sheet-solid: #fcfcfc;
+      --color-card: #ffffff;
+      --color-grouped-card: #f4f4f5;
+      --color-card-alt: #fcfcfc;
+      --color-card-translucent: rgba(255, 255, 255, 0.8);
+      --color-thread-canvas: #fcfcfc;
+      --color-thread-selected: #ffffff;
+      --color-thread-selected-foreground: #27272a;
+      --color-thread-selected-foreground-muted: #71717b;
+      --color-thread-hover: #fcfcfc;
+      --color-row-hover: #f4f4f5;
+      --color-composer-panel: rgba(252, 252, 252, 0.88);
+      --color-composer-surface: rgba(244, 244, 245, 0.94);
+      --color-composer-border: rgba(228, 228, 231, 0.8);
+      --color-foreground: #27272a;
+      --color-foreground-secondary: #6f6f79;
+      --color-foreground-muted: #6f6f79;
+      --color-foreground-tertiary: #71717b;
+      --color-border: #e4e4e7;
+      --color-focus: #1b4ed8;
+      --color-border-subtle: rgba(228, 228, 231, 0.7);
+      --color-separator: rgba(228, 228, 231, 0.55);
+      --color-subtle: #fafafa;
+      --color-subtle-strong: #fafafa;
+      --color-inline-skill-background: #f4f4f5;
+      --color-inline-skill-border: rgba(27, 78, 216, 0.42);
+      --color-inline-skill-foreground: #18181b;
+      --color-primary: #1b4ed8;
+      --color-primary-foreground: #ffffff;
+      --color-primary-text: #1b4ed8;
+      --color-primary-shadow: #000000;
+      --color-secondary: #fafafa;
+      --color-secondary-foreground: #27272a;
+      --color-secondary-border: #e4e4e7;
+      --color-switch-active-track: #1b4ed8;
+      --color-switch-active-thumb: #ffffff;
+      --color-switch-inactive-track: #fafafa;
+      --color-switch-inactive-thumb: #71717b;
+      --color-warning: #fcf4e8;
+      --color-warning-border: rgba(254, 154, 0, 0.32);
+      --color-warning-foreground: #bb4d00;
+      --color-danger: #fcebec;
+      --color-danger-border: rgba(251, 44, 54, 0.32);
+      --color-danger-foreground: #c10007;
+      --color-update: #e0e6f7;
+      --color-update-foreground: #1b4ed8;
+      --color-input: #ffffff;
+      --color-input-border: #d4d4d8;
+      --color-sidebar-search: #f4f4f5;
+      --color-placeholder: #6f6f79;
+      --color-icon: #27272a;
+      --color-icon-muted: #71717b;
+      --color-icon-subtle: #71717b;
+      --color-header: rgba(252, 252, 252, 0.97);
+      --color-header-foreground: #27272a;
+      --color-header-border: #e4e4e7;
+      --color-glass-surface: rgba(255, 255, 255, 0.74);
+      --color-glass-fallback: rgba(244, 244, 245, 0.94);
+      --color-glass-tint: rgba(255, 255, 255, 0.22);
+      --color-status-bar: #fcfcfc;
+      --color-md-body: #27272a;
+      --color-md-strong: #27272a;
+      --color-md-link: #1b4ed8;
+      --color-md-blockquote-border: #e4e4e7;
+      --color-md-blockquote-bg: #fafafa;
+      --color-md-code-bg: #ffffff;
+      --color-md-code-text: #27272a;
+      --color-md-user-code-bg: rgba(39, 39, 42, 0.18);
+      --color-md-user-code-text: #27272a;
+      --color-md-user-fence-bg: rgba(0, 0, 0, 0.16);
+      --color-md-user-fence-text: #27272a;
+      --color-md-hr: #e4e4e7;
+      --color-user-bubble: #efeff1;
+      --color-user-bubble-foreground: #27272a;
+      --color-user-bubble-foreground-muted: rgba(39, 39, 42, 0.78);
+      --color-user-bubble-skill-foreground: #1b4ed8;
+      --color-backdrop: rgba(0, 0, 0, 0.22);
+      --color-drawer: #fafafa;
+      --color-drawer-foreground: #27272a;
+      --color-drawer-foreground-muted: #71717b;
+      --color-drawer-border: #e4e4e7;
+      --color-drawer-shadow: rgba(0, 0, 0, 0.12);
+      --color-dot-separator: rgba(113, 113, 123, 0.35);
+      --color-wordmark: #27272a;
+      --color-chevron: rgba(113, 113, 123, 0.42);
       --color-adaptive-amber-50-950-a40: oklch(98.7% 0.022 95.277);
       --color-adaptive-amber-200-900-a60: oklch(92.4% 0.12 95.746);
       --color-adaptive-amber-500-a12-a16: oklch(76.9% 0.188 70.08 / 12%);
@@ -59,14 +146,101 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 12%);
       --color-adaptive-zinc-500-400: oklch(55.2% 0.016 285.938);
       --color-adaptive-zinc-600-300: oklch(44.2% 0.017 285.786);
-      --color-clerk-page: #f2f2f7;
-      --color-clerk-foreground: #262626;
-      --color-clerk-foreground-muted: #737373;
-      --color-clerk-border: rgba(229, 229, 234, 0.06);
-      --color-clerk-danger: #dc2626;
+      --color-clerk-page: #fcfcfc;
+      --color-clerk-foreground: #27272a;
+      --color-clerk-foreground-muted: #71717b;
+      --color-clerk-border: #e4e4e7;
+      --color-clerk-danger: #c10007;
     }
 
     @variant dark {
+      --color-screen: #0a0a0a;
+      --color-sheet: rgba(10, 10, 10, 0.98);
+      --color-sheet-solid: #0a0a0a;
+      --color-card: #111111;
+      --color-grouped-card: #1a1b1b;
+      --color-card-alt: #111111;
+      --color-card-translucent: rgba(17, 17, 17, 0.8);
+      --color-thread-canvas: #0a0a0a;
+      --color-thread-selected: #1a1b1b;
+      --color-thread-selected-foreground: #f1f3f7;
+      --color-thread-selected-foreground-muted: #a3a3a3;
+      --color-thread-hover: #131313;
+      --color-row-hover: #141414;
+      --color-composer-panel: rgba(10, 10, 10, 0.92);
+      --color-composer-surface: rgba(26, 27, 27, 0.9);
+      --color-composer-border: rgba(25, 25, 25, 0.8);
+      --color-foreground: #f5f5f5;
+      --color-foreground-secondary: #838383;
+      --color-foreground-muted: #838383;
+      --color-foreground-tertiary: #818181;
+      --color-border: #191919;
+      --color-focus: #346bf1;
+      --color-border-subtle: rgba(25, 25, 25, 0.7);
+      --color-separator: rgba(25, 25, 25, 0.55);
+      --color-subtle: #111111;
+      --color-subtle-strong: #111111;
+      --color-inline-skill-background: #141414;
+      --color-inline-skill-border: rgba(52, 107, 241, 0.42);
+      --color-inline-skill-foreground: #f5f5f5;
+      --color-primary: #346bf1;
+      --color-primary-foreground: #ffffff;
+      --color-primary-text: #4b7cf3;
+      --color-primary-shadow: #000000;
+      --color-secondary: #111111;
+      --color-secondary-foreground: #f5f5f5;
+      --color-secondary-border: #191919;
+      --color-switch-active-track: #346bf1;
+      --color-switch-active-thumb: #ffffff;
+      --color-switch-inactive-track: #111111;
+      --color-switch-inactive-thumb: #818181;
+      --color-warning: #312108;
+      --color-warning-border: rgba(254, 154, 0, 0.32);
+      --color-warning-foreground: #ffb900;
+      --color-danger: #301214;
+      --color-danger-border: rgba(251, 65, 74, 0.32);
+      --color-danger-foreground: #ff6467;
+      --color-update: #121b34;
+      --color-update-foreground: #51a2ff;
+      --color-input: #111111;
+      --color-input-border: #1e1e1e;
+      --color-sidebar-search: #0a0a0a;
+      --color-placeholder: #838383;
+      --color-icon: #f5f5f5;
+      --color-icon-muted: #818181;
+      --color-icon-subtle: #818181;
+      --color-header: rgba(10, 10, 10, 0.97);
+      --color-header-foreground: #f5f5f5;
+      --color-header-border: #191919;
+      --color-glass-surface: rgba(17, 17, 17, 0.74);
+      --color-glass-fallback: rgba(26, 27, 27, 0.9);
+      --color-glass-tint: rgba(17, 17, 17, 0.22);
+      --color-status-bar: #0a0a0a;
+      --color-md-body: #f5f5f5;
+      --color-md-strong: #f5f5f5;
+      --color-md-link: #3b70f1;
+      --color-md-blockquote-border: #191919;
+      --color-md-blockquote-bg: #111111;
+      --color-md-code-bg: #111111;
+      --color-md-code-text: #f5f5f5;
+      --color-md-user-code-bg: rgba(245, 245, 245, 0.18);
+      --color-md-user-code-text: #f5f5f5;
+      --color-md-user-fence-bg: rgba(0, 0, 0, 0.28);
+      --color-md-user-fence-text: #f5f5f5;
+      --color-md-hr: #191919;
+      --color-user-bubble: #161616;
+      --color-user-bubble-foreground: #f5f5f5;
+      --color-user-bubble-foreground-muted: rgba(245, 245, 245, 0.78);
+      --color-user-bubble-skill-foreground: #4678f2;
+      --color-backdrop: rgba(0, 0, 0, 0.48);
+      --color-drawer: #000000;
+      --color-drawer-foreground: #f1f3f7;
+      --color-drawer-foreground-muted: #a3a3a3;
+      --color-drawer-border: #141414;
+      --color-drawer-shadow: rgba(0, 0, 0, 0.32);
+      --color-dot-separator: rgba(129, 129, 129, 0.35);
+      --color-wordmark: #f5f5f5;
+      --color-chevron: rgba(129, 129, 129, 0.42);
       --color-adaptive-amber-50-950-a40: oklch(27.9% 0.077 45.635 / 40%);
       --color-adaptive-amber-200-900-a60: oklch(41.4% 0.112 45.904 / 60%);
       --color-adaptive-amber-500-a12-a16: oklch(76.9% 0.188 70.08 / 16%);
@@ -124,32 +298,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
-      --color-clerk-page: #0e0e0e;
+      --color-clerk-page: #0a0a0a;
       --color-clerk-foreground: #f5f5f5;
-      --color-clerk-foreground-muted: #a3a3a3;
-      --color-clerk-border: rgba(42, 42, 42, 0.06);
-      --color-clerk-danger: #fca5a5;
+      --color-clerk-foreground-muted: #818181;
+      --color-clerk-border: #191919;
+      --color-clerk-danger: #ff6467;
     }
 
     @variant t3-chat-light {
       --color-screen: #fdf7fd;
       --color-sheet: rgba(253, 247, 253, 0.98);
       --color-sheet-solid: #fdf7fd;
-      --color-card: #fdfafd;
-      --color-card-alt: #faf3fb;
-      --color-card-translucent: rgba(253, 250, 253, 0.8);
-      --color-thread-canvas: #faf3fb;
-      --color-thread-selected: #fdfafd;
-      --color-thread-selected-foreground: #501854;
+      --color-card: #faf3fb;
+      --color-grouped-card: #faf3fb;
+      --color-card-alt: #fdfafd;
+      --color-card-translucent: rgba(250, 243, 251, 0.8);
+      --color-thread-canvas: #fdf7fd;
+      --color-thread-selected: #f8f8f7;
+      --color-thread-selected-foreground: #454554;
       --color-thread-selected-foreground-muted: #ac1668;
-      --color-composer-panel: rgba(250, 243, 251, 0.88);
-      --color-composer-surface: rgba(253, 250, 253, 0.94);
+      --color-thread-hover: #f8f8f7;
+      --color-row-hover: #eccfe3;
+      --color-composer-panel: rgba(253, 247, 253, 0.88);
+      --color-composer-surface: rgba(250, 243, 251, 0.94);
       --color-composer-border: rgba(238, 225, 237, 0.54);
       --color-foreground: #501854;
       --color-foreground-secondary: #ac1668;
       --color-foreground-muted: #8d1255;
       --color-foreground-tertiary: #ac1668;
       --color-border: #eee1ed;
+      --color-focus: #db2777;
       --color-border-subtle: rgba(238, 225, 237, 0.7);
       --color-separator: rgba(238, 225, 237, 0.55);
       --color-subtle: #eaa7cb;
@@ -159,6 +337,7 @@
       --color-inline-skill-foreground: #454554;
       --color-primary: #db2777;
       --color-primary-foreground: #ffffff;
+      --color-primary-text: #d32572;
       --color-primary-shadow: #000000;
       --color-secondary: #f1c4e6;
       --color-secondary-foreground: #77347c;
@@ -173,7 +352,9 @@
       --color-danger: #fde4f1;
       --color-danger-border: rgba(247, 8, 108, 0.32);
       --color-danger-foreground: #9d174d;
-      --color-input: #fdfafd;
+      --color-update: #fadfef;
+      --color-update-foreground: #ac1668;
+      --color-input: #faf3fb;
       --color-input-border: #e7c1dc;
       --color-sidebar-search: #f8f8f7;
       --color-placeholder: #8b5f90;
@@ -181,13 +362,15 @@
       --color-icon-muted: #ac1668;
       --color-icon-subtle: #ac1668;
       --color-header: rgba(253, 247, 253, 0.97);
+      --color-header-foreground: #501854;
       --color-header-border: #efbdeb;
       --color-glass-surface: rgba(255, 255, 255, 0.74);
+      --color-glass-fallback: rgba(250, 243, 251, 0.94);
       --color-glass-tint: rgba(255, 255, 255, 0.22);
       --color-status-bar: #fdf7fd;
       --color-md-body: #501854;
       --color-md-strong: #501854;
-      --color-md-link: #db2777;
+      --color-md-link: #d62675;
       --color-md-blockquote-border: #eee1ed;
       --color-md-blockquote-bg: #eaa7cb;
       --color-md-code-bg: #f5ecf9;
@@ -202,7 +385,10 @@
       --color-user-bubble-foreground-muted: rgba(73, 44, 97, 0.78);
       --color-user-bubble-skill-foreground: #c12269;
       --color-backdrop: rgba(0, 0, 0, 0.22);
-      --color-drawer: rgba(242, 225, 244, 0.99);
+      --color-drawer: #f2e1f4;
+      --color-drawer-foreground: #454554;
+      --color-drawer-foreground-muted: #ac1668;
+      --color-drawer-border: #eceae9;
       --color-drawer-shadow: rgba(0, 0, 0, 0.12);
       --color-dot-separator: rgba(172, 22, 104, 0.35);
       --color-wordmark: #501854;
@@ -264,32 +450,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 12%);
       --color-adaptive-zinc-500-400: oklch(55.2% 0.016 285.938);
       --color-adaptive-zinc-600-300: oklch(44.2% 0.017 285.786);
-      --color-clerk-page: #f2f2f7;
-      --color-clerk-foreground: #262626;
-      --color-clerk-foreground-muted: #737373;
-      --color-clerk-border: rgba(229, 229, 234, 0.06);
-      --color-clerk-danger: #dc2626;
+      --color-clerk-page: #fcfcfc;
+      --color-clerk-foreground: #27272a;
+      --color-clerk-foreground-muted: #71717b;
+      --color-clerk-border: #e4e4e7;
+      --color-clerk-danger: #c10007;
     }
 
     @variant t3-chat-dark {
       --color-screen: #1f1a24;
       --color-sheet: rgba(31, 26, 36, 0.98);
       --color-sheet-solid: #1f1a24;
-      --color-card: #2c2631;
-      --color-card-alt: #29232d;
-      --color-card-translucent: rgba(44, 38, 49, 0.8);
-      --color-thread-canvas: #29232d;
-      --color-thread-selected: #2c2631;
-      --color-thread-selected-foreground: #f9f8fb;
+      --color-card: #29232d;
+      --color-grouped-card: #29232d;
+      --color-card-alt: #2c2631;
+      --color-card-translucent: rgba(41, 35, 45, 0.8);
+      --color-thread-canvas: #1f1a24;
+      --color-thread-selected: #261922;
+      --color-thread-selected-foreground: #f4f4f5;
       --color-thread-selected-foreground-muted: #e7d0dd;
-      --color-composer-panel: rgba(41, 35, 45, 0.92);
-      --color-composer-surface: rgba(44, 38, 49, 0.9);
+      --color-thread-hover: #261922;
+      --color-row-hover: #463753;
+      --color-composer-panel: rgba(31, 26, 36, 0.92);
+      --color-composer-surface: rgba(41, 35, 45, 0.9);
       --color-composer-border: rgba(39, 36, 44, 0.46);
       --color-foreground: #f9f8fb;
       --color-foreground-secondary: #e7d0dd;
       --color-foreground-muted: #e7d0dd;
       --color-foreground-tertiary: #e7d0dd;
       --color-border: #27242c;
+      --color-focus: #db2777;
       --color-border-subtle: rgba(39, 36, 44, 0.7);
       --color-separator: rgba(39, 36, 44, 0.55);
       --color-subtle: #423a45;
@@ -299,6 +489,7 @@
       --color-inline-skill-foreground: #f8f1f5;
       --color-primary: #a3004c;
       --color-primary-foreground: #fbd0e8;
+      --color-primary-text: #cc729c;
       --color-primary-shadow: #000000;
       --color-secondary: #362d3d;
       --color-secondary-foreground: #d4c7e1;
@@ -313,7 +504,9 @@
       --color-danger: #331a2b;
       --color-danger-border: rgba(157, 23, 77, 0.32);
       --color-danger-foreground: #fbd0e8;
-      --color-input: #2c2631;
+      --color-update: #37152b;
+      --color-update-foreground: #fbd0e8;
+      --color-input: #29232d;
       --color-input-border: #302029;
       --color-sidebar-search: #261922;
       --color-placeholder: #968d9f;
@@ -321,13 +514,15 @@
       --color-icon-muted: #d4c7e1;
       --color-icon-subtle: #e7d0dd;
       --color-header: rgba(31, 26, 36, 0.97);
+      --color-header-foreground: #f9f8fb;
       --color-header-border: #27242c;
       --color-glass-surface: rgba(16, 10, 14, 0.74);
+      --color-glass-fallback: rgba(41, 35, 45, 0.9);
       --color-glass-tint: rgba(16, 10, 14, 0.22);
       --color-status-bar: #1f1a24;
       --color-md-body: #f9f8fb;
       --color-md-strong: #f9f8fb;
-      --color-md-link: #a3004c;
+      --color-md-link: #c66290;
       --color-md-blockquote-border: #27242c;
       --color-md-blockquote-bg: #423a45;
       --color-md-code-bg: #1f1a24;
@@ -342,7 +537,10 @@
       --color-user-bubble-foreground-muted: rgba(242, 235, 250, 0.78);
       --color-user-bubble-skill-foreground: #cb709a;
       --color-backdrop: rgba(0, 0, 0, 0.48);
-      --color-drawer: rgba(23, 16, 24, 0.99);
+      --color-drawer: #171018;
+      --color-drawer-foreground: #f4f4f5;
+      --color-drawer-foreground-muted: #e7d0dd;
+      --color-drawer-border: #322028;
       --color-drawer-shadow: rgba(0, 0, 0, 0.32);
       --color-dot-separator: rgba(231, 208, 221, 0.35);
       --color-wordmark: #f9f8fb;
@@ -404,32 +602,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
-      --color-clerk-page: #0e0e0e;
+      --color-clerk-page: #0a0a0a;
       --color-clerk-foreground: #f5f5f5;
-      --color-clerk-foreground-muted: #a3a3a3;
-      --color-clerk-border: rgba(42, 42, 42, 0.06);
-      --color-clerk-danger: #fca5a5;
+      --color-clerk-foreground-muted: #818181;
+      --color-clerk-border: #191919;
+      --color-clerk-danger: #ff6467;
     }
 
     @variant grove-light {
       --color-screen: #f3f7f4;
       --color-sheet: rgba(243, 247, 244, 0.98);
       --color-sheet-solid: #f3f7f4;
-      --color-card: #ecefed;
-      --color-card-alt: #f3f7f4;
-      --color-card-translucent: rgba(236, 239, 237, 0.8);
+      --color-card: #f3f7f4;
+      --color-grouped-card: #f3f7f4;
+      --color-card-alt: #ecefed;
+      --color-card-translucent: rgba(243, 247, 244, 0.8);
       --color-thread-canvas: #f3f7f4;
-      --color-thread-selected: #ecefed;
+      --color-thread-selected: #bad7c9;
       --color-thread-selected-foreground: #241523;
-      --color-thread-selected-foreground-muted: #746c73;
+      --color-thread-selected-foreground-muted: #5d585e;
+      --color-thread-hover: #cae0d5;
+      --color-row-hover: #d5e6dd;
       --color-composer-panel: rgba(243, 247, 244, 0.88);
-      --color-composer-surface: rgba(236, 239, 237, 0.94);
+      --color-composer-surface: rgba(243, 247, 244, 0.94);
       --color-composer-border: rgba(203, 213, 209, 0.54);
       --color-foreground: #241523;
-      --color-foreground-secondary: #746c73;
+      --color-foreground-secondary: #726a71;
       --color-foreground-muted: #6e696f;
       --color-foreground-tertiary: #746c73;
       --color-border: #cbd5d1;
+      --color-focus: #1b7d50;
       --color-border-subtle: rgba(203, 213, 209, 0.7);
       --color-separator: rgba(203, 213, 209, 0.55);
       --color-subtle: #e6f0ea;
@@ -437,13 +639,14 @@
       --color-inline-skill-background: #d5e6dd;
       --color-inline-skill-border: rgba(27, 125, 80, 0.42);
       --color-inline-skill-foreground: #241523;
-      --color-primary: #1b7d50;
+      --color-primary: #8f6410;
       --color-primary-foreground: #fffaff;
+      --color-primary-text: #8f6410;
       --color-primary-shadow: #000000;
       --color-secondary: #e2ede7;
       --color-secondary-foreground: #241523;
       --color-secondary-border: #cbd5d1;
-      --color-switch-active-track: #1b7d50;
+      --color-switch-active-track: #8f6410;
       --color-switch-active-thumb: #fffaff;
       --color-switch-inactive-track: #e2ede7;
       --color-switch-inactive-thumb: #6e696f;
@@ -453,7 +656,9 @@
       --color-danger: #f4e7e5;
       --color-danger-border: rgba(251, 44, 54, 0.32);
       --color-danger-foreground: #c10007;
-      --color-input: #ecefed;
+      --color-update: #d0e3da;
+      --color-update-foreground: #125134;
+      --color-input: #f3f7f4;
       --color-input-border: #becbc5;
       --color-sidebar-search: #d3dcd8;
       --color-placeholder: #716971;
@@ -461,13 +666,15 @@
       --color-icon-muted: #746c73;
       --color-icon-subtle: #746c73;
       --color-header: rgba(243, 247, 244, 0.97);
+      --color-header-foreground: #241523;
       --color-header-border: #d5e6dd;
       --color-glass-surface: rgba(231, 233, 232, 0.74);
+      --color-glass-fallback: rgba(243, 247, 244, 0.94);
       --color-glass-tint: rgba(231, 233, 232, 0.22);
       --color-status-bar: #f3f7f4;
       --color-md-body: #241523;
       --color-md-strong: #241523;
-      --color-md-link: #1b7d50;
+      --color-md-link: #8f6410;
       --color-md-blockquote-border: #cbd5d1;
       --color-md-blockquote-bg: #e6f0ea;
       --color-md-code-bg: #eef1ef;
@@ -482,7 +689,10 @@
       --color-user-bubble-foreground-muted: rgba(36, 21, 35, 0.78);
       --color-user-bubble-skill-foreground: #815a0e;
       --color-backdrop: rgba(0, 0, 0, 0.22);
-      --color-drawer: rgba(226, 237, 231, 0.99);
+      --color-drawer: #e2ede7;
+      --color-drawer-foreground: #241523;
+      --color-drawer-foreground-muted: #645f64;
+      --color-drawer-border: #cbd3d0;
       --color-drawer-shadow: rgba(0, 0, 0, 0.12);
       --color-dot-separator: rgba(116, 108, 115, 0.35);
       --color-wordmark: #241523;
@@ -544,32 +754,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 12%);
       --color-adaptive-zinc-500-400: oklch(55.2% 0.016 285.938);
       --color-adaptive-zinc-600-300: oklch(44.2% 0.017 285.786);
-      --color-clerk-page: #f2f2f7;
-      --color-clerk-foreground: #262626;
-      --color-clerk-foreground-muted: #737373;
-      --color-clerk-border: rgba(229, 229, 234, 0.06);
-      --color-clerk-danger: #dc2626;
+      --color-clerk-page: #fcfcfc;
+      --color-clerk-foreground: #27272a;
+      --color-clerk-foreground-muted: #71717b;
+      --color-clerk-border: #e4e4e7;
+      --color-clerk-danger: #c10007;
     }
 
     @variant grove-dark {
       --color-screen: #1b2821;
       --color-sheet: rgba(27, 40, 33, 0.98);
       --color-sheet-solid: #1b2821;
-      --color-card: #36413c;
-      --color-card-alt: #1b2821;
-      --color-card-translucent: rgba(54, 65, 60, 0.8);
+      --color-card: #1b2821;
+      --color-grouped-card: #1b2821;
+      --color-card-alt: #36413c;
+      --color-card-translucent: rgba(27, 40, 33, 0.8);
       --color-thread-canvas: #1b2821;
-      --color-thread-selected: #36413c;
+      --color-thread-selected: #2f5641;
       --color-thread-selected-foreground: #fffaff;
-      --color-thread-selected-foreground-muted: #919595;
+      --color-thread-selected-foreground-muted: #bbc0bf;
+      --color-thread-hover: #2a4938;
+      --color-row-hover: #325c46;
       --color-composer-panel: rgba(27, 40, 33, 0.92);
-      --color-composer-surface: rgba(54, 65, 60, 0.9);
+      --color-composer-surface: rgba(27, 40, 33, 0.9);
       --color-composer-border: rgba(65, 95, 79, 0.46);
       --color-foreground: #fffaff;
-      --color-foreground-secondary: #919595;
-      --color-foreground-muted: #9da5a2;
+      --color-foreground-secondary: #a6aaaa;
+      --color-foreground-muted: #a3aba8;
       --color-foreground-tertiary: #919595;
       --color-border: #415f4f;
+      --color-focus: #69d69a;
       --color-border-subtle: rgba(65, 95, 79, 0.7);
       --color-separator: rgba(65, 95, 79, 0.55);
       --color-subtle: #253e31;
@@ -577,13 +791,14 @@
       --color-inline-skill-background: #325c46;
       --color-inline-skill-border: rgba(105, 214, 154, 0.42);
       --color-inline-skill-foreground: #fffaff;
-      --color-primary: #69d69a;
+      --color-primary: #e3b34e;
       --color-primary-foreground: #241523;
+      --color-primary-text: #e3b34e;
       --color-primary-shadow: #000000;
       --color-secondary: #2a4b39;
       --color-secondary-foreground: #fffaff;
       --color-secondary-border: #415f4f;
-      --color-switch-active-track: #69d69a;
+      --color-switch-active-track: #e3b34e;
       --color-switch-active-thumb: #241523;
       --color-switch-inactive-track: #2a4b39;
       --color-switch-inactive-thumb: #9da5a2;
@@ -593,7 +808,9 @@
       --color-danger: #3f2c28;
       --color-danger-border: rgba(251, 65, 74, 0.32);
       --color-danger-foreground: #ff6668;
-      --color-input: #36413c;
+      --color-update: #345f48;
+      --color-update-foreground: #9ee4be;
+      --color-input: #1b2821;
       --color-input-border: #4f725f;
       --color-sidebar-search: #45554d;
       --color-placeholder: #a9abab;
@@ -601,13 +818,15 @@
       --color-icon-muted: #919595;
       --color-icon-subtle: #919595;
       --color-header: rgba(27, 40, 33, 0.97);
+      --color-header-foreground: #fffaff;
       --color-header-border: #36654c;
       --color-glass-surface: rgba(68, 77, 73, 0.74);
+      --color-glass-fallback: rgba(27, 40, 33, 0.9);
       --color-glass-tint: rgba(68, 77, 73, 0.22);
       --color-status-bar: #1b2821;
       --color-md-body: #fffaff;
       --color-md-strong: #fffaff;
-      --color-md-link: #69d69a;
+      --color-md-link: #e3b34e;
       --color-md-blockquote-border: #415f4f;
       --color-md-blockquote-bg: #253e31;
       --color-md-code-bg: #28342e;
@@ -622,7 +841,10 @@
       --color-user-bubble-foreground-muted: rgba(255, 250, 255, 0.78);
       --color-user-bubble-skill-foreground: #eed295;
       --color-backdrop: rgba(0, 0, 0, 0.48);
-      --color-drawer: rgba(33, 54, 43, 0.99);
+      --color-drawer: #21362b;
+      --color-drawer-foreground: #fffaff;
+      --color-drawer-foreground-muted: #aab0af;
+      --color-drawer-border: #6f7a75;
       --color-drawer-shadow: rgba(0, 0, 0, 0.32);
       --color-dot-separator: rgba(145, 149, 149, 0.35);
       --color-wordmark: #fffaff;
@@ -684,32 +906,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
-      --color-clerk-page: #0e0e0e;
+      --color-clerk-page: #0a0a0a;
       --color-clerk-foreground: #f5f5f5;
-      --color-clerk-foreground-muted: #a3a3a3;
-      --color-clerk-border: rgba(42, 42, 42, 0.06);
-      --color-clerk-danger: #fca5a5;
+      --color-clerk-foreground-muted: #818181;
+      --color-clerk-border: #191919;
+      --color-clerk-danger: #ff6467;
     }
 
     @variant ocean-light {
       --color-screen: #f5f7f8;
       --color-sheet: rgba(245, 247, 248, 0.98);
       --color-sheet-solid: #f5f7f8;
-      --color-card: #edeff1;
-      --color-card-alt: #f5f7f8;
-      --color-card-translucent: rgba(237, 239, 241, 0.8);
+      --color-card: #f5f7f8;
+      --color-grouped-card: #f5f7f8;
+      --color-card-alt: #edeff1;
+      --color-card-translucent: rgba(245, 247, 248, 0.8);
       --color-thread-canvas: #f5f7f8;
-      --color-thread-selected: #edeff1;
+      --color-thread-selected: #bed4e5;
       --color-thread-selected-foreground: #241523;
-      --color-thread-selected-foreground-muted: #746c75;
+      --color-thread-selected-foreground-muted: #5e5862;
+      --color-thread-hover: #cdddea;
+      --color-row-hover: #d8e4ee;
       --color-composer-panel: rgba(245, 247, 248, 0.88);
-      --color-composer-surface: rgba(237, 239, 241, 0.94);
+      --color-composer-surface: rgba(245, 247, 248, 0.94);
       --color-composer-border: rgba(205, 212, 220, 0.54);
       --color-foreground: #241523;
-      --color-foreground-secondary: #746c75;
+      --color-foreground-secondary: #726a73;
       --color-foreground-muted: #6f6873;
       --color-foreground-tertiary: #746c75;
       --color-border: #cdd4dc;
+      --color-focus: #2672af;
       --color-border-subtle: rgba(205, 212, 220, 0.7);
       --color-separator: rgba(205, 212, 220, 0.55);
       --color-subtle: #e8eff4;
@@ -717,13 +943,14 @@
       --color-inline-skill-background: #d8e4ee;
       --color-inline-skill-border: rgba(38, 114, 175, 0.42);
       --color-inline-skill-foreground: #241523;
-      --color-primary: #2672af;
+      --color-primary: #0a6f75;
       --color-primary-foreground: #fffaff;
+      --color-primary-text: #0a6f75;
       --color-primary-shadow: #000000;
       --color-secondary: #e4ecf2;
       --color-secondary-foreground: #241523;
       --color-secondary-border: #cdd4dc;
-      --color-switch-active-track: #2672af;
+      --color-switch-active-track: #0a6f75;
       --color-switch-active-thumb: #fffaff;
       --color-switch-inactive-track: #e4ecf2;
       --color-switch-inactive-thumb: #6f6873;
@@ -733,7 +960,9 @@
       --color-danger: #f5e6e9;
       --color-danger-border: rgba(251, 44, 54, 0.32);
       --color-danger-foreground: #c10007;
-      --color-input: #edeff1;
+      --color-update: #d4e1ed;
+      --color-update-foreground: #194a72;
+      --color-input: #f5f7f8;
       --color-input-border: #c0c9d4;
       --color-sidebar-search: #d5dbe2;
       --color-placeholder: #716972;
@@ -741,13 +970,15 @@
       --color-icon-muted: #746c75;
       --color-icon-subtle: #746c75;
       --color-header: rgba(245, 247, 248, 0.97);
+      --color-header-foreground: #241523;
       --color-header-border: #d8e4ee;
       --color-glass-surface: rgba(232, 233, 235, 0.74);
+      --color-glass-fallback: rgba(245, 247, 248, 0.94);
       --color-glass-tint: rgba(232, 233, 235, 0.22);
       --color-status-bar: #f5f7f8;
       --color-md-body: #241523;
       --color-md-strong: #241523;
-      --color-md-link: #2672af;
+      --color-md-link: #0a6f75;
       --color-md-blockquote-border: #cdd4dc;
       --color-md-blockquote-bg: #e8eff4;
       --color-md-code-bg: #f0f1f3;
@@ -762,7 +993,10 @@
       --color-user-bubble-foreground-muted: rgba(36, 21, 35, 0.78);
       --color-user-bubble-skill-foreground: #0a6c72;
       --color-backdrop: rgba(0, 0, 0, 0.22);
-      --color-drawer: rgba(228, 236, 242, 0.99);
+      --color-drawer: #e4ecf2;
+      --color-drawer-foreground: #241523;
+      --color-drawer-foreground-muted: #655e69;
+      --color-drawer-border: #cdd2d9;
       --color-drawer-shadow: rgba(0, 0, 0, 0.12);
       --color-dot-separator: rgba(116, 108, 117, 0.35);
       --color-wordmark: #241523;
@@ -824,32 +1058,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 12%);
       --color-adaptive-zinc-500-400: oklch(55.2% 0.016 285.938);
       --color-adaptive-zinc-600-300: oklch(44.2% 0.017 285.786);
-      --color-clerk-page: #f2f2f7;
-      --color-clerk-foreground: #262626;
-      --color-clerk-foreground-muted: #737373;
-      --color-clerk-border: rgba(229, 229, 234, 0.06);
-      --color-clerk-danger: #dc2626;
+      --color-clerk-page: #fcfcfc;
+      --color-clerk-foreground: #27272a;
+      --color-clerk-foreground-muted: #71717b;
+      --color-clerk-border: #e4e4e7;
+      --color-clerk-danger: #c10007;
     }
 
     @variant ocean-dark {
       --color-screen: #17212b;
       --color-sheet: rgba(23, 33, 43, 0.98);
       --color-sheet-solid: #17212b;
-      --color-card: #333b45;
-      --color-card-alt: #17212b;
-      --color-card-translucent: rgba(51, 59, 69, 0.8);
+      --color-card: #17212b;
+      --color-grouped-card: #17212b;
+      --color-card-alt: #333b45;
+      --color-card-translucent: rgba(23, 33, 43, 0.8);
       --color-thread-canvas: #17212b;
-      --color-thread-selected: #333b45;
+      --color-thread-selected: #2f495f;
       --color-thread-selected-foreground: #fffaff;
-      --color-thread-selected-foreground-muted: #8d8f97;
+      --color-thread-selected-foreground-muted: #b0b4ba;
+      --color-thread-hover: #283e50;
+      --color-row-hover: #324e66;
       --color-composer-panel: rgba(23, 33, 43, 0.92);
-      --color-composer-surface: rgba(51, 59, 69, 0.9);
+      --color-composer-surface: rgba(23, 33, 43, 0.9);
       --color-composer-border: rgba(64, 85, 103, 0.46);
       --color-foreground: #fffaff;
-      --color-foreground-secondary: #8d8f97;
-      --color-foreground-muted: #969ca6;
+      --color-foreground-secondary: #a2a3aa;
+      --color-foreground-muted: #9ea4ad;
       --color-foreground-tertiary: #8d8f97;
       --color-border: #405567;
+      --color-focus: #70b9ee;
       --color-border-subtle: rgba(64, 85, 103, 0.7);
       --color-separator: rgba(64, 85, 103, 0.55);
       --color-subtle: #233544;
@@ -857,13 +1095,14 @@
       --color-inline-skill-background: #324e66;
       --color-inline-skill-border: rgba(112, 185, 238, 0.42);
       --color-inline-skill-foreground: #fffaff;
-      --color-primary: #70b9ee;
+      --color-primary: #5bd0d6;
       --color-primary-foreground: #241523;
+      --color-primary-text: #5bd0d6;
       --color-primary-shadow: #000000;
       --color-secondary: #293f52;
       --color-secondary-foreground: #fffaff;
       --color-secondary-border: #405567;
-      --color-switch-active-track: #70b9ee;
+      --color-switch-active-track: #5bd0d6;
       --color-switch-active-thumb: #241523;
       --color-switch-inactive-track: #293f52;
       --color-switch-inactive-thumb: #969ca6;
@@ -873,7 +1112,9 @@
       --color-danger: #3c2630;
       --color-danger-border: rgba(251, 65, 74, 0.32);
       --color-danger-foreground: #ff6467;
-      --color-input: #333b45;
+      --color-update: #345269;
+      --color-update-foreground: #a2d2f4;
+      --color-input: #17212b;
       --color-input-border: #4f677b;
       --color-sidebar-search: #424e5a;
       --color-placeholder: #a4a4ac;
@@ -881,13 +1122,15 @@
       --color-icon-muted: #8d8f97;
       --color-icon-subtle: #8d8f97;
       --color-header: rgba(23, 33, 43, 0.97);
+      --color-header-foreground: #fffaff;
       --color-header-border: #36566f;
       --color-glass-surface: rgba(65, 72, 81, 0.74);
+      --color-glass-fallback: rgba(23, 33, 43, 0.9);
       --color-glass-tint: rgba(65, 72, 81, 0.22);
       --color-status-bar: #17212b;
       --color-md-body: #fffaff;
       --color-md-strong: #fffaff;
-      --color-md-link: #70b9ee;
+      --color-md-link: #5bd0d6;
       --color-md-blockquote-border: #405567;
       --color-md-blockquote-bg: #233544;
       --color-md-code-bg: #252e38;
@@ -902,7 +1145,10 @@
       --color-user-bubble-foreground-muted: rgba(255, 250, 255, 0.78);
       --color-user-bubble-skill-foreground: #75d8dd;
       --color-backdrop: rgba(0, 0, 0, 0.48);
-      --color-drawer: rgba(30, 45, 59, 0.99);
+      --color-drawer: #1e2d3b;
+      --color-drawer-foreground: #fffaff;
+      --color-drawer-foreground-muted: #a2a5ae;
+      --color-drawer-border: #6d757f;
       --color-drawer-shadow: rgba(0, 0, 0, 0.32);
       --color-dot-separator: rgba(141, 143, 151, 0.35);
       --color-wordmark: #fffaff;
@@ -964,32 +1210,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
-      --color-clerk-page: #0e0e0e;
+      --color-clerk-page: #0a0a0a;
       --color-clerk-foreground: #f5f5f5;
-      --color-clerk-foreground-muted: #a3a3a3;
-      --color-clerk-border: rgba(42, 42, 42, 0.06);
-      --color-clerk-danger: #fca5a5;
+      --color-clerk-foreground-muted: #818181;
+      --color-clerk-border: #191919;
+      --color-clerk-danger: #ff6467;
     }
 
     @variant ember-light {
       --color-screen: #f9f7f5;
       --color-sheet: rgba(249, 247, 245, 0.98);
       --color-sheet-solid: #f9f7f5;
-      --color-card: #f1efee;
-      --color-card-alt: #f9f7f5;
-      --color-card-translucent: rgba(241, 239, 238, 0.8);
+      --color-card: #f9f7f5;
+      --color-grouped-card: #f9f7f5;
+      --color-card-alt: #f1efee;
+      --color-card-translucent: rgba(249, 247, 245, 0.8);
       --color-thread-canvas: #f9f7f5;
-      --color-thread-selected: #f1efee;
+      --color-thread-selected: #e5ccc0;
       --color-thread-selected-foreground: #241523;
-      --color-thread-selected-foreground-muted: #766c74;
+      --color-thread-selected-foreground-muted: #62575d;
+      --color-thread-hover: #ead8cf;
+      --color-row-hover: #eee0d9;
       --color-composer-panel: rgba(249, 247, 245, 0.88);
-      --color-composer-surface: rgba(241, 239, 238, 0.94);
+      --color-composer-surface: rgba(249, 247, 245, 0.94);
       --color-composer-border: rgba(221, 210, 206, 0.54);
       --color-foreground: #241523;
-      --color-foreground-secondary: #766c74;
+      --color-foreground-secondary: #746a72;
       --color-foreground-muted: #74686f;
       --color-foreground-tertiary: #766c74;
       --color-border: #ddd2ce;
+      --color-focus: #ae552a;
       --color-border-subtle: rgba(221, 210, 206, 0.7);
       --color-separator: rgba(221, 210, 206, 0.55);
       --color-subtle: #f4ede9;
@@ -997,13 +1247,14 @@
       --color-inline-skill-background: #eee0d9;
       --color-inline-skill-border: rgba(174, 85, 42, 0.42);
       --color-inline-skill-foreground: #241523;
-      --color-primary: #ae552a;
+      --color-primary: #b23535;
       --color-primary-foreground: #fffaff;
+      --color-primary-text: #b23535;
       --color-primary-shadow: #000000;
       --color-secondary: #f3eae5;
       --color-secondary-foreground: #241523;
       --color-secondary-border: #ddd2ce;
-      --color-switch-active-track: #ae552a;
+      --color-switch-active-track: #b23535;
       --color-switch-active-thumb: #fffaff;
       --color-switch-inactive-track: #f3eae5;
       --color-switch-inactive-thumb: #74686f;
@@ -1013,7 +1264,9 @@
       --color-danger: #f9e7e6;
       --color-danger-border: rgba(251, 44, 54, 0.32);
       --color-danger-foreground: #c10007;
-      --color-input: #f1efee;
+      --color-update: #edddd5;
+      --color-update-foreground: #71381b;
+      --color-input: #f9f7f5;
       --color-input-border: #d4c6c1;
       --color-sidebar-search: #e2d9d6;
       --color-placeholder: #736971;
@@ -1021,13 +1274,15 @@
       --color-icon-muted: #766c74;
       --color-icon-subtle: #766c74;
       --color-header: rgba(249, 247, 245, 0.97);
+      --color-header-foreground: #241523;
       --color-header-border: #eee0d9;
       --color-glass-surface: rgba(236, 233, 233, 0.74);
+      --color-glass-fallback: rgba(249, 247, 245, 0.94);
       --color-glass-tint: rgba(236, 233, 233, 0.22);
       --color-status-bar: #f9f7f5;
       --color-md-body: #241523;
       --color-md-strong: #241523;
-      --color-md-link: #ae552a;
+      --color-md-link: #b23535;
       --color-md-blockquote-border: #ddd2ce;
       --color-md-blockquote-bg: #f4ede9;
       --color-md-code-bg: #f3f1f0;
@@ -1042,7 +1297,10 @@
       --color-user-bubble-foreground-muted: rgba(36, 21, 35, 0.78);
       --color-user-bubble-skill-foreground: #b13535;
       --color-backdrop: rgba(0, 0, 0, 0.22);
-      --color-drawer: rgba(243, 234, 229, 0.99);
+      --color-drawer: #f3eae5;
+      --color-drawer-foreground: #241523;
+      --color-drawer-foreground-muted: #6a5d64;
+      --color-drawer-border: #dad0ce;
       --color-drawer-shadow: rgba(0, 0, 0, 0.12);
       --color-dot-separator: rgba(118, 108, 116, 0.35);
       --color-wordmark: #241523;
@@ -1104,32 +1362,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 12%);
       --color-adaptive-zinc-500-400: oklch(55.2% 0.016 285.938);
       --color-adaptive-zinc-600-300: oklch(44.2% 0.017 285.786);
-      --color-clerk-page: #f2f2f7;
-      --color-clerk-foreground: #262626;
-      --color-clerk-foreground-muted: #737373;
-      --color-clerk-border: rgba(229, 229, 234, 0.06);
-      --color-clerk-danger: #dc2626;
+      --color-clerk-page: #fcfcfc;
+      --color-clerk-foreground: #27272a;
+      --color-clerk-foreground-muted: #71717b;
+      --color-clerk-border: #e4e4e7;
+      --color-clerk-danger: #c10007;
     }
 
     @variant ember-dark {
       --color-screen: #291e1a;
       --color-sheet: rgba(41, 30, 26, 0.98);
       --color-sheet-solid: #291e1a;
-      --color-card: #433835;
-      --color-card-alt: #291e1a;
-      --color-card-translucent: rgba(67, 56, 53, 0.8);
+      --color-card: #291e1a;
+      --color-grouped-card: #291e1a;
+      --color-card-alt: #433835;
+      --color-card-translucent: rgba(41, 30, 26, 0.8);
       --color-thread-canvas: #291e1a;
-      --color-thread-selected: #433835;
+      --color-thread-selected: #5d3f2d;
       --color-thread-selected-foreground: #fffaff;
-      --color-thread-selected-foreground-muted: #968e8f;
+      --color-thread-selected-foreground-muted: #b9b1b0;
+      --color-thread-hover: #4f3528;
+      --color-row-hover: #644330;
       --color-composer-panel: rgba(41, 30, 26, 0.92);
-      --color-composer-surface: rgba(67, 56, 53, 0.9);
+      --color-composer-surface: rgba(41, 30, 26, 0.9);
       --color-composer-border: rgba(102, 76, 63, 0.46);
       --color-foreground: #fffaff;
-      --color-foreground-secondary: #968e8f;
-      --color-foreground-muted: #a59996;
+      --color-foreground-secondary: #a8a2a2;
+      --color-foreground-muted: #aca19f;
       --color-foreground-tertiary: #968e8f;
       --color-border: #664c3f;
+      --color-focus: #f09a64;
       --color-border-subtle: rgba(102, 76, 63, 0.7);
       --color-separator: rgba(102, 76, 63, 0.55);
       --color-subtle: #432e23;
@@ -1137,13 +1399,14 @@
       --color-inline-skill-background: #644330;
       --color-inline-skill-border: rgba(240, 154, 100, 0.42);
       --color-inline-skill-foreground: #fffaff;
-      --color-primary: #f09a64;
+      --color-primary: #f78a7a;
       --color-primary-foreground: #241523;
+      --color-primary-text: #f78a7a;
       --color-primary-shadow: #000000;
       --color-secondary: #513728;
       --color-secondary-foreground: #fffaff;
       --color-secondary-border: #664c3f;
-      --color-switch-active-track: #f09a64;
+      --color-switch-active-track: #f78a7a;
       --color-switch-active-thumb: #241523;
       --color-switch-inactive-track: #513728;
       --color-switch-inactive-thumb: #a59996;
@@ -1153,7 +1416,9 @@
       --color-danger: #4a2321;
       --color-danger-border: rgba(251, 65, 74, 0.32);
       --color-danger-foreground: #ff6467;
-      --color-input: #433835;
+      --color-update: #684631;
+      --color-update-foreground: #f5bd9a;
+      --color-input: #291e1a;
       --color-input-border: #7a5d4d;
       --color-sidebar-search: #584943;
       --color-placeholder: #aba3a5;
@@ -1161,13 +1426,15 @@
       --color-icon-muted: #968e8f;
       --color-icon-subtle: #968e8f;
       --color-header: rgba(41, 30, 26, 0.97);
+      --color-header-foreground: #fffaff;
       --color-header-border: #6e4934;
       --color-glass-surface: rgba(79, 69, 67, 0.74);
+      --color-glass-fallback: rgba(41, 30, 26, 0.9);
       --color-glass-tint: rgba(79, 69, 67, 0.22);
       --color-status-bar: #291e1a;
       --color-md-body: #fffaff;
       --color-md-strong: #fffaff;
-      --color-md-link: #f09a64;
+      --color-md-link: #f78a7a;
       --color-md-blockquote-border: #664c3f;
       --color-md-blockquote-bg: #432e23;
       --color-md-code-bg: #362b27;
@@ -1182,7 +1449,10 @@
       --color-user-bubble-foreground-muted: rgba(255, 250, 255, 0.78);
       --color-user-bubble-skill-foreground: #fab6ad;
       --color-backdrop: rgba(0, 0, 0, 0.48);
-      --color-drawer: rgba(57, 40, 31, 0.99);
+      --color-drawer: #39281f;
+      --color-drawer-foreground: #fffaff;
+      --color-drawer-foreground-muted: #aca2a1;
+      --color-drawer-border: #7e716e;
       --color-drawer-shadow: rgba(0, 0, 0, 0.32);
       --color-dot-separator: rgba(150, 142, 143, 0.35);
       --color-wordmark: #fffaff;
@@ -1244,32 +1514,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
-      --color-clerk-page: #0e0e0e;
+      --color-clerk-page: #0a0a0a;
       --color-clerk-foreground: #f5f5f5;
-      --color-clerk-foreground-muted: #a3a3a3;
-      --color-clerk-border: rgba(42, 42, 42, 0.06);
-      --color-clerk-danger: #fca5a5;
+      --color-clerk-foreground-muted: #818181;
+      --color-clerk-border: #191919;
+      --color-clerk-danger: #ff6467;
     }
 
     @variant iris-light {
       --color-screen: #f8f7f9;
       --color-sheet: rgba(248, 247, 249, 0.98);
       --color-sheet-solid: #f8f7f9;
-      --color-card: #f0eff2;
-      --color-card-alt: #f8f7f9;
-      --color-card-translucent: rgba(240, 239, 242, 0.8);
+      --color-card: #f8f7f9;
+      --color-grouped-card: #f8f7f9;
+      --color-card-alt: #f0eff2;
+      --color-card-translucent: rgba(248, 247, 249, 0.8);
       --color-thread-canvas: #f8f7f9;
-      --color-thread-selected: #f0eff2;
+      --color-thread-selected: #d4cce8;
       --color-thread-selected-foreground: #241523;
-      --color-thread-selected-foreground-muted: #766c76;
+      --color-thread-selected-foreground-muted: #605662;
+      --color-thread-hover: #ded8ed;
+      --color-row-hover: #e5e0f0;
       --color-composer-panel: rgba(248, 247, 249, 0.88);
-      --color-composer-surface: rgba(240, 239, 242, 0.94);
+      --color-composer-surface: rgba(248, 247, 249, 0.94);
       --color-composer-border: rgba(214, 209, 222, 0.54);
       --color-foreground: #241523;
-      --color-foreground-secondary: #766c76;
+      --color-foreground-secondary: #746a74;
       --color-foreground-muted: #726874;
       --color-foreground-tertiary: #766c76;
       --color-border: #d6d1de;
+      --color-focus: #7253b9;
       --color-border-subtle: rgba(214, 209, 222, 0.7);
       --color-separator: rgba(214, 209, 222, 0.55);
       --color-subtle: #f0edf6;
@@ -1277,13 +1551,14 @@
       --color-inline-skill-background: #e5e0f0;
       --color-inline-skill-border: rgba(114, 83, 185, 0.42);
       --color-inline-skill-foreground: #241523;
-      --color-primary: #7253b9;
+      --color-primary: #a82c87;
       --color-primary-foreground: #fffaff;
+      --color-primary-text: #a82c87;
       --color-primary-shadow: #000000;
       --color-secondary: #edeaf4;
       --color-secondary-foreground: #241523;
       --color-secondary-border: #d6d1de;
-      --color-switch-active-track: #7253b9;
+      --color-switch-active-track: #a82c87;
       --color-switch-active-thumb: #fffaff;
       --color-switch-inactive-track: #edeaf4;
       --color-switch-inactive-thumb: #726874;
@@ -1293,7 +1568,9 @@
       --color-danger: #f8e6ea;
       --color-danger-border: rgba(251, 44, 54, 0.32);
       --color-danger-foreground: #c10007;
-      --color-input: #f0eff2;
+      --color-update: #e2ddef;
+      --color-update-foreground: #4a3678;
+      --color-input: #f8f7f9;
       --color-input-border: #ccc5d6;
       --color-sidebar-search: #ddd9e3;
       --color-placeholder: #736973;
@@ -1301,13 +1578,15 @@
       --color-icon-muted: #766c76;
       --color-icon-subtle: #766c76;
       --color-header: rgba(248, 247, 249, 0.97);
+      --color-header-foreground: #241523;
       --color-header-border: #e5e0f0;
       --color-glass-surface: rgba(235, 233, 237, 0.74);
+      --color-glass-fallback: rgba(248, 247, 249, 0.94);
       --color-glass-tint: rgba(235, 233, 237, 0.22);
       --color-status-bar: #f8f7f9;
       --color-md-body: #241523;
       --color-md-strong: #241523;
-      --color-md-link: #7253b9;
+      --color-md-link: #a82c87;
       --color-md-blockquote-border: #d6d1de;
       --color-md-blockquote-bg: #f0edf6;
       --color-md-code-bg: #f2f1f4;
@@ -1322,7 +1601,10 @@
       --color-user-bubble-foreground-muted: rgba(36, 21, 35, 0.78);
       --color-user-bubble-skill-foreground: #a82c87;
       --color-backdrop: rgba(0, 0, 0, 0.22);
-      --color-drawer: rgba(237, 234, 244, 0.99);
+      --color-drawer: #edeaf4;
+      --color-drawer-foreground: #241523;
+      --color-drawer-foreground-muted: #685d6a;
+      --color-drawer-border: #d5d0db;
       --color-drawer-shadow: rgba(0, 0, 0, 0.12);
       --color-dot-separator: rgba(118, 108, 118, 0.35);
       --color-wordmark: #241523;
@@ -1384,32 +1666,36 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 12%);
       --color-adaptive-zinc-500-400: oklch(55.2% 0.016 285.938);
       --color-adaptive-zinc-600-300: oklch(44.2% 0.017 285.786);
-      --color-clerk-page: #f2f2f7;
-      --color-clerk-foreground: #262626;
-      --color-clerk-foreground-muted: #737373;
-      --color-clerk-border: rgba(229, 229, 234, 0.06);
-      --color-clerk-danger: #dc2626;
+      --color-clerk-page: #fcfcfc;
+      --color-clerk-foreground: #27272a;
+      --color-clerk-foreground-muted: #71717b;
+      --color-clerk-border: #e4e4e7;
+      --color-clerk-danger: #c10007;
     }
 
     @variant iris-dark {
       --color-screen: #1d1929;
       --color-sheet: rgba(29, 25, 41, 0.98);
       --color-sheet-solid: #1d1929;
-      --color-card: #383443;
-      --color-card-alt: #1d1929;
-      --color-card-translucent: rgba(56, 52, 67, 0.8);
+      --color-card: #1d1929;
+      --color-grouped-card: #1d1929;
+      --color-card-alt: #383443;
+      --color-card-translucent: rgba(29, 25, 41, 0.8);
       --color-thread-canvas: #1d1929;
-      --color-thread-selected: #383443;
+      --color-thread-selected: #3f345e;
       --color-thread-selected-foreground: #fffaff;
-      --color-thread-selected-foreground-muted: #8e8a95;
+      --color-thread-selected-foreground-muted: #a6a2ae;
+      --color-thread-hover: #352c4f;
+      --color-row-hover: #433765;
       --color-composer-panel: rgba(29, 25, 41, 0.92);
-      --color-composer-surface: rgba(56, 52, 67, 0.9);
+      --color-composer-surface: rgba(29, 25, 41, 0.9);
       --color-composer-border: rgba(77, 67, 102, 0.46);
       --color-foreground: #fffaff;
-      --color-foreground-secondary: #8e8a95;
-      --color-foreground-muted: #9690a1;
+      --color-foreground-secondary: #a09da6;
+      --color-foreground-muted: #a19cab;
       --color-foreground-tertiary: #8e8a95;
       --color-border: #4d4366;
+      --color-focus: #9d7df2;
       --color-border-subtle: rgba(77, 67, 102, 0.7);
       --color-separator: rgba(77, 67, 102, 0.55);
       --color-subtle: #2d2643;
@@ -1417,13 +1703,14 @@
       --color-inline-skill-background: #433765;
       --color-inline-skill-border: rgba(157, 125, 242, 0.42);
       --color-inline-skill-foreground: #fffaff;
-      --color-primary: #9d7df2;
+      --color-primary: #f099d8;
       --color-primary-foreground: #241523;
+      --color-primary-text: #f099d8;
       --color-primary-shadow: #000000;
       --color-secondary: #362d51;
       --color-secondary-foreground: #fffaff;
       --color-secondary-border: #4d4366;
-      --color-switch-active-track: #9d7df2;
+      --color-switch-active-track: #f099d8;
       --color-switch-active-thumb: #241523;
       --color-switch-inactive-track: #362d51;
       --color-switch-inactive-thumb: #9690a1;
@@ -1433,7 +1720,9 @@
       --color-danger: #40202e;
       --color-danger-border: rgba(251, 65, 74, 0.32);
       --color-danger-foreground: #ff6467;
-      --color-input: #383443;
+      --color-update: #463969;
+      --color-update-foreground: #bfabf7;
+      --color-input: #1d1929;
       --color-input-border: #5d527b;
       --color-sidebar-search: #494459;
       --color-placeholder: #a29ea8;
@@ -1441,13 +1730,15 @@
       --color-icon-muted: #8e8a95;
       --color-icon-subtle: #8e8a95;
       --color-header: rgba(29, 25, 41, 0.97);
+      --color-header-foreground: #fffaff;
       --color-header-border: #4a3c70;
       --color-glass-surface: rgba(69, 66, 80, 0.74);
+      --color-glass-fallback: rgba(29, 25, 41, 0.9);
       --color-glass-tint: rgba(69, 66, 80, 0.22);
       --color-status-bar: #1d1929;
       --color-md-body: #fffaff;
       --color-md-strong: #fffaff;
-      --color-md-link: #9d7df2;
+      --color-md-link: #f099d8;
       --color-md-blockquote-border: #4d4366;
       --color-md-blockquote-bg: #2d2643;
       --color-md-code-bg: #2a2736;
@@ -1462,7 +1753,10 @@
       --color-user-bubble-foreground-muted: rgba(255, 250, 255, 0.78);
       --color-user-bubble-skill-foreground: #f099d8;
       --color-backdrop: rgba(0, 0, 0, 0.48);
-      --color-drawer: rgba(39, 33, 57, 0.99);
+      --color-drawer: #272139;
+      --color-drawer-foreground: #fffaff;
+      --color-drawer-foreground-muted: #9b97a4;
+      --color-drawer-border: #736d7e;
       --color-drawer-shadow: rgba(0, 0, 0, 0.32);
       --color-dot-separator: rgba(142, 138, 149, 0.35);
       --color-wordmark: #fffaff;
@@ -1524,11 +1818,11 @@
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
-      --color-clerk-page: #0e0e0e;
+      --color-clerk-page: #0a0a0a;
       --color-clerk-foreground: #f5f5f5;
-      --color-clerk-foreground-muted: #a3a3a3;
-      --color-clerk-border: rgba(42, 42, 42, 0.06);
-      --color-clerk-danger: #fca5a5;
+      --color-clerk-foreground-muted: #818181;
+      --color-clerk-border: #191919;
+      --color-clerk-danger: #ff6467;
     }
   }
 }
diff --git a/apps/mobile/global.css b/apps/mobile/global.css
index 2f686e3a1fa9..730b9e1a97f3 100644
--- a/apps/mobile/global.css
+++ b/apps/mobile/global.css
@@ -8,228 +8,6 @@
     @variant android {
       --font-mono: "monospace";
     }
-
-    @variant light {
-      /* Page backgrounds */
-      --color-screen: #f2f2f7;
-      --color-sheet: rgba(242, 242, 247, 0.98);
-      --color-sheet-solid: #f2f2f7;
-
-      /* Card / surface */
-      --color-card: #ffffff;
-      --color-card-alt: #f5f5f5;
-      --color-card-translucent: rgba(255, 255, 255, 0.8);
-      --color-thread-canvas: #f5f5f5;
-      --color-thread-selected: #ffffff;
-      --color-thread-selected-foreground: #262626;
-      --color-thread-selected-foreground-muted: #737373;
-      --color-composer-panel: rgba(245, 245, 245, 0.88);
-      --color-composer-surface: rgba(255, 255, 255, 0.94);
-      --color-composer-border: rgba(0, 0, 0, 0.1);
-
-      /* Text */
-      --color-foreground: #262626;
-      --color-foreground-secondary: #525252;
-      --color-foreground-muted: #737373;
-      --color-foreground-tertiary: #8e8e93;
-
-      /* Borders & separators */
-      --color-border: rgba(0, 0, 0, 0.08);
-      --color-border-subtle: rgba(0, 0, 0, 0.06);
-      --color-separator: rgba(0, 0, 0, 0.04);
-
-      /* Subtle backgrounds (badges, pills, overlays) */
-      --color-subtle: rgba(0, 0, 0, 0.04);
-      --color-subtle-strong: rgba(0, 0, 0, 0.08);
-      --color-inline-skill-background: rgba(217, 70, 239, 0.12);
-      --color-inline-skill-border: rgba(217, 70, 239, 0.25);
-      --color-inline-skill-foreground: #a21caf;
-
-      /* Primary action */
-      --color-primary: #262626;
-      --color-primary-foreground: #ffffff;
-      --color-primary-shadow: #000000;
-
-      /* Secondary action */
-      --color-secondary: #ffffff;
-      --color-secondary-foreground: #262626;
-      --color-secondary-border: rgba(0, 0, 0, 0.08);
-      --color-switch-active-track: #34c759;
-      --color-switch-active-thumb: #ffffff;
-      --color-switch-inactive-track: rgba(0, 0, 0, 0.08);
-      --color-switch-inactive-thumb: #8e8e93;
-
-      /* Warning */
-      --color-warning: #fffbeb;
-      --color-warning-border: #fde68a;
-      --color-warning-foreground: #b45309;
-
-      /* Danger */
-      --color-danger: #fef2f2;
-      --color-danger-border: rgba(239, 68, 68, 0.12);
-      --color-danger-foreground: #dc2626;
-
-      /* Inputs */
-      --color-input: #ffffff;
-      --color-input-border: rgba(0, 0, 0, 0.1);
-      --color-sidebar-search: rgba(118, 118, 128, 0.12);
-      --color-placeholder: #737373;
-
-      /* Icons */
-      --color-icon: #262626;
-      --color-icon-muted: #525252;
-      --color-icon-subtle: #a3a3a3;
-
-      /* Header / glass chrome */
-      --color-header: rgba(255, 255, 255, 0.97);
-      --color-header-border: rgba(0, 0, 0, 0.06);
-      --color-glass-surface: rgba(255, 255, 255, 0.72);
-      --color-glass-tint: rgba(255, 255, 255, 0.18);
-
-      /* StatusBar */
-      --color-status-bar: #f2f2f7;
-
-      /* Markdown */
-      --color-md-body: #111111;
-      --color-md-strong: #000000;
-      --color-md-link: #2563eb;
-      --color-md-blockquote-border: rgba(0, 0, 0, 0.08);
-      --color-md-blockquote-bg: rgba(0, 0, 0, 0.02);
-      --color-md-code-bg: rgba(0, 0, 0, 0.04);
-      --color-md-code-text: #262626;
-      --color-md-user-code-bg: rgba(0, 0, 0, 0.04);
-      --color-md-user-code-text: #262626;
-      --color-md-user-fence-bg: rgba(0, 0, 0, 0.06);
-      --color-md-user-fence-text: #262626;
-      --color-md-hr: rgba(0, 0, 0, 0.08);
-
-      /* User bubble: a raised card on the thread canvas, matching web's message surface */
-      --color-user-bubble: #ffffff;
-      --color-user-bubble-foreground: #262626;
-      --color-user-bubble-foreground-muted: rgba(38, 38, 38, 0.78);
-      --color-user-bubble-skill-foreground: #2563eb;
-
-      /* Drawer / modal backdrop */
-      --color-backdrop: rgba(0, 0, 0, 0.22);
-      --color-drawer: rgba(255, 255, 255, 0.99);
-      --color-drawer-shadow: rgba(0, 0, 0, 0.12);
-
-      /* Misc */
-      --color-dot-separator: rgba(0, 0, 0, 0.2);
-      --color-wordmark: #262626;
-      --color-chevron: rgba(0, 0, 0, 0.2);
-    }
-
-    @variant dark {
-      /* Page backgrounds */
-      --color-screen: #0a0a0a;
-      --color-sheet: rgba(14, 14, 14, 0.98);
-      --color-sheet-solid: #0e0e0e;
-
-      /* Card / surface */
-      --color-card: #171717;
-      --color-card-alt: #1c1c1c;
-      --color-card-translucent: rgba(17, 17, 17, 0.8);
-      --color-thread-canvas: #1c1c1c;
-      --color-thread-selected: #171717;
-      --color-thread-selected-foreground: #f5f5f5;
-      --color-thread-selected-foreground-muted: #8e8e93;
-      --color-composer-panel: rgba(28, 28, 28, 0.92);
-      --color-composer-surface: rgba(23, 23, 23, 0.9);
-      --color-composer-border: rgba(255, 255, 255, 0.08);
-
-      /* Text */
-      --color-foreground: #f5f5f5;
-      --color-foreground-secondary: #a3a3a3;
-      --color-foreground-muted: #8e8e93;
-      --color-foreground-tertiary: #636366;
-
-      /* Borders & separators */
-      --color-border: rgba(255, 255, 255, 0.06);
-      --color-border-subtle: rgba(255, 255, 255, 0.04);
-      --color-separator: rgba(255, 255, 255, 0.03);
-
-      /* Subtle backgrounds (badges, pills, overlays) */
-      --color-subtle: rgba(255, 255, 255, 0.04);
-      --color-subtle-strong: rgba(255, 255, 255, 0.08);
-      --color-inline-skill-background: rgba(217, 70, 239, 0.12);
-      --color-inline-skill-border: rgba(217, 70, 239, 0.25);
-      --color-inline-skill-foreground: #f0abfc;
-
-      /* Primary action */
-      --color-primary: #f5f5f5;
-      --color-primary-foreground: #0a0a0a;
-      --color-primary-shadow: #000000;
-
-      /* Secondary action */
-      --color-secondary: rgba(255, 255, 255, 0.04);
-      --color-secondary-foreground: #f5f5f5;
-      --color-secondary-border: rgba(255, 255, 255, 0.06);
-      --color-switch-active-track: #30d158;
-      --color-switch-active-thumb: #ffffff;
-      --color-switch-inactive-track: rgba(255, 255, 255, 0.06);
-      --color-switch-inactive-thumb: #8e8e93;
-
-      /* Warning */
-      --color-warning: rgba(69, 26, 3, 0.4);
-      --color-warning-border: rgba(120, 53, 15, 0.6);
-      --color-warning-foreground: #fcd34d;
-
-      /* Danger */
-      --color-danger: rgba(239, 68, 68, 0.14);
-      --color-danger-border: rgba(248, 113, 113, 0.18);
-      --color-danger-foreground: #fca5a5;
-
-      /* Inputs */
-      --color-input: #141414;
-      --color-input-border: rgba(255, 255, 255, 0.08);
-      --color-sidebar-search: rgba(118, 118, 128, 0.24);
-      --color-placeholder: #8e8e93;
-
-      /* Icons */
-      --color-icon: #f5f5f5;
-      --color-icon-muted: #a3a3a3;
-      --color-icon-subtle: #8e8e93;
-
-      /* Header / glass chrome */
-      --color-header: rgba(10, 10, 10, 0.97);
-      --color-header-border: rgba(255, 255, 255, 0.06);
-      --color-glass-surface: rgba(23, 23, 23, 0.78);
-      --color-glass-tint: rgba(23, 23, 23, 0.24);
-
-      /* StatusBar */
-      --color-status-bar: #0a0a0a;
-
-      /* Markdown */
-      --color-md-body: #e5e5e5;
-      --color-md-strong: #f5f5f5;
-      --color-md-link: #60a5fa;
-      --color-md-blockquote-border: rgba(255, 255, 255, 0.1);
-      --color-md-blockquote-bg: rgba(255, 255, 255, 0.03);
-      --color-md-code-bg: rgba(255, 255, 255, 0.06);
-      --color-md-code-text: #e5e5e5;
-      --color-md-user-code-bg: rgba(255, 255, 255, 0.06);
-      --color-md-user-code-text: #e5e5e5;
-      --color-md-user-fence-bg: rgba(255, 255, 255, 0.09);
-      --color-md-user-fence-text: #e5e5e5;
-      --color-md-hr: rgba(255, 255, 255, 0.08);
-
-      /* User bubble: a raised card on the thread canvas, matching web's message surface */
-      --color-user-bubble: #171717;
-      --color-user-bubble-foreground: #f5f5f5;
-      --color-user-bubble-foreground-muted: rgba(245, 245, 245, 0.78);
-      --color-user-bubble-skill-foreground: #60a5fa;
-
-      /* Drawer / modal backdrop */
-      --color-backdrop: rgba(0, 0, 0, 0.48);
-      --color-drawer: rgba(14, 14, 14, 0.99);
-      --color-drawer-shadow: rgba(0, 0, 0, 0.32);
-
-      /* Misc */
-      --color-dot-separator: rgba(255, 255, 255, 0.2);
-      --color-wordmark: #f5f5f5;
-      --color-chevron: rgba(255, 255, 255, 0.2);
-    }
   }
 }
 
diff --git a/apps/mobile/modules/t3-markdown-text/android/src/main/java/expo/modules/t3markdowntext/T3ContextChip.kt b/apps/mobile/modules/t3-markdown-text/android/src/main/java/expo/modules/t3markdowntext/T3ContextChip.kt
index 09b49c956407..df0dd88724e0 100644
--- a/apps/mobile/modules/t3-markdown-text/android/src/main/java/expo/modules/t3markdowntext/T3ContextChip.kt
+++ b/apps/mobile/modules/t3-markdown-text/android/src/main/java/expo/modules/t3markdowntext/T3ContextChip.kt
@@ -114,7 +114,15 @@ class T3ContextChip(
     fun color(
       value: String,
       fallback: Int
-    ): Int = runCatching { Color.parseColor(value) }.getOrDefault(fallback)
+    ): Int = runCatching {
+      // React Native hex colors put alpha last; Android's parser puts it first.
+      val androidColor = if (value.length == 9 && value.startsWith("#")) {
+        "#${value.takeLast(2)}${value.substring(1, 7)}"
+      } else {
+        value
+      }
+      Color.parseColor(androidColor)
+    }.getOrDefault(fallback)
 
     private fun blend(accent: Int, base: Int, weight: Float): Int = Color.rgb(
       (Color.red(accent) * weight + Color.red(base) * (1 - weight)).toInt(),
diff --git a/apps/mobile/plugins/withAndroidModernAlertDialog.cjs b/apps/mobile/plugins/withAndroidModernAlertDialog.cjs
index 8c8b2b800060..1a677e35e802 100644
--- a/apps/mobile/plugins/withAndroidModernAlertDialog.cjs
+++ b/apps/mobile/plugins/withAndroidModernAlertDialog.cjs
@@ -1,5 +1,6 @@
 const fs = require("node:fs");
 const path = require("node:path");
+const themeVariables = require("../generated-uniwind-default-theme-variables.json");
 const {
   AndroidConfig,
   withAndroidColors,
@@ -11,9 +12,10 @@ const {
 // React Native's Alert renders an AppCompat AlertDialog on Android, which
 // inherits the dated framework dialog chrome (square gray panel, teal
 // all-caps buttons) from the app theme. These resources restyle it with the
-// app's uniwind tokens from global.css: --color-card panel, --color-foreground
-// text, --color-primary buttons, DM Sans type. The @font resources referenced
-// here are embedded by the expo-font plugin config in app.config.ts.
+// generated default palette: card panel, foreground text, readable primary
+// buttons, DM Sans type. Alert exposes no runtime custom-palette API, so these
+// build-time resources use the stock palette for each native appearance.
+// The fonts are embedded by the expo-font plugin config in app.config.ts.
 
 // AppCompat's default dialog window background is an inset rounded rect, so
 // the replacement keeps the same 16dp inset to preserve the dialog's margins.
@@ -30,21 +32,18 @@ const DIALOG_BACKGROUND_DRAWABLE = `<?xml version="1.0" encoding="utf-8"?>
 </inset>
 `;
 
-const COLORS = {
-  light: {
-    background: "#FFFFFF", // --color-card
-    text: "#262626", // --color-foreground
-    secondaryText: "#525252", // --color-foreground-secondary
-    buttonText: "#262626", // --color-primary
-  },
-  night: {
-    background: "#171717",
-    text: "#F5F5F5",
-    secondaryText: "#A3A3A3",
-    buttonText: "#F5F5F5",
-  },
+const colorsFor = (appearance) => {
+  const variables = themeVariables[appearance];
+  return {
+    background: variables["--color-card"],
+    text: variables["--color-foreground"],
+    secondaryText: variables["--color-foreground-secondary"],
+    buttonText: variables["--color-primary-text"],
+  };
 };
 
+const COLORS = { light: colorsFor("light"), night: colorsFor("dark") };
+
 function assignStyleItem(style, name, value) {
   style.item = style.item ?? [];
   const existing = style.item.find((item) => item.$?.name === name);
diff --git a/apps/mobile/scripts/generate-uniwind-themes.mts b/apps/mobile/scripts/generate-uniwind-themes.mts
index a51728458082..94643c3e413f 100644
--- a/apps/mobile/scripts/generate-uniwind-themes.mts
+++ b/apps/mobile/scripts/generate-uniwind-themes.mts
@@ -5,17 +5,15 @@ import * as NodePath from "node:path";
 import tailwindColors from "tailwindcss/colors";
 import { BUILT_IN_THEME_IDS, type BuiltInThemeId } from "@t3tools/shared/themePalettes";
 
-import clerkTheme from "../clerk-theme.json" with { type: "json" };
 import {
+  createMobileThemeVariables,
+  getMobileThemeColors,
   getMobileThemeVariables,
-  MOBILE_THEME_VARIABLE_NAMES,
-  themeColorWithAlpha,
+  DEFAULT_MOBILE_THEME_ID,
   type MobileThemeAppearance,
-  type MobileThemeVariables,
 } from "../src/lib/mobileTheme.ts";
 
 const APPEARANCES = ["light", "dark"] as const;
-const GLOBAL_CSS_PATH = NodePath.resolve(import.meta.dirname, "../global.css");
 const GENERATED_CSS_PATH = NodePath.resolve(import.meta.dirname, "../generated-uniwind-themes.css");
 const GENERATED_NAMES_PATH = NodePath.resolve(
   import.meta.dirname,
@@ -25,6 +23,7 @@ const GENERATED_DEFAULT_VARIABLES_PATH = NodePath.resolve(
   import.meta.dirname,
   "../generated-uniwind-default-theme-variables.json",
 );
+const GENERATED_CLERK_THEME_PATH = NodePath.resolve(import.meta.dirname, "../clerk-theme.json");
 
 type TailwindColorFamily = keyof typeof tailwindColors;
 type TailwindColorShade = 50 | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | 950;
@@ -159,13 +158,38 @@ const variablesFor = (themeId: BuiltInThemeId, appearance: MobileThemeAppearance
 
 // Clerk's native screens use one build-time palette per appearance. Custom
 // profile pages must match it even when the rest of the app uses a named theme.
+const clerkColorsFor = (appearance: MobileThemeAppearance) => {
+  // Native authentication uses plain cards, rather than tonal settings groups.
+  const variables = createMobileThemeVariables(
+    getMobileThemeColors(DEFAULT_MOBILE_THEME_ID, appearance),
+    appearance,
+  );
+  return {
+    primary: variables["--color-primary"],
+    background: variables["--color-sheet-solid"],
+    input: variables["--color-input"],
+    danger: variables["--color-danger-foreground"],
+    success: appearance === "dark" ? "#34d399" : "#059669",
+    warning: variables["--color-warning-foreground"],
+    foreground: variables["--color-foreground"],
+    mutedForeground: variables["--color-foreground-muted"],
+    primaryForeground: variables["--color-primary-foreground"],
+    inputForeground: variables["--color-foreground"],
+    neutral: variables["--color-secondary"],
+    border: variables["--color-border"],
+    ring: variables["--color-focus"],
+    muted: variables["--color-subtle"],
+    shadow: variables["--color-primary-shadow"],
+  };
+};
+
 const clerkVariablesFor = (appearance: MobileThemeAppearance) => {
-  const colors = appearance === "dark" ? clerkTheme.darkColors : clerkTheme.colors;
+  const colors = clerkColorsFor(appearance);
   return {
     "--color-clerk-page": colors.background.toLowerCase(),
     "--color-clerk-foreground": colors.foreground.toLowerCase(),
     "--color-clerk-foreground-muted": colors.mutedForeground.toLowerCase(),
-    "--color-clerk-border": themeColorWithAlpha(colors.border, 0.06),
+    "--color-clerk-border": colors.border,
     "--color-clerk-danger": colors.danger.toLowerCase(),
   };
 };
@@ -181,6 +205,7 @@ export const renderUniwindThemesCSS = () => {
   const variants = [
     ...APPEARANCES.map((appearance) =>
       renderVariant(appearance, {
+        ...getMobileThemeVariables(DEFAULT_MOBILE_THEME_ID, appearance),
         ...adaptiveVariablesFor(appearance),
         ...clerkVariablesFor(appearance),
       }),
@@ -202,50 +227,27 @@ export const renderUniwindThemesCSS = () => {
   ].join("\n");
 };
 
-const readVariantBody = (css: string, appearance: MobileThemeAppearance): string => {
-  const marker = `@variant ${appearance} {`;
-  const markerIndex = css.indexOf(marker);
-  if (markerIndex === -1) throw new Error(`Could not find ${marker} in global.css.`);
-
-  const openingBraceIndex = css.indexOf("{", markerIndex);
-  let depth = 0;
-  for (let index = openingBraceIndex; index < css.length; index += 1) {
-    if (css[index] === "{") depth += 1;
-    if (css[index] !== "}") continue;
-    depth -= 1;
-    if (depth === 0) return css.slice(openingBraceIndex + 1, index);
-  }
-  throw new Error(`Could not find the end of ${marker} in global.css.`);
-};
-
-export const readDefaultThemeVariables = (css: string) =>
-  Object.fromEntries(
-    APPEARANCES.map((appearance) => {
-      const body = readVariantBody(css, appearance);
-      const variables = Object.fromEntries(
-        MOBILE_THEME_VARIABLE_NAMES.map((name) => {
-          const match = new RegExp(`^\\s*${name}:\\s*([^;]+);`, "mu").exec(body);
-          if (!match?.[1]) {
-            throw new Error(`Default ${appearance} theme is missing ${name}.`);
-          }
-          return [name, match[1].trim()];
-        }),
-      ) as MobileThemeVariables;
-      return [appearance, variables];
-    }),
-  ) as Readonly<Record<MobileThemeAppearance, MobileThemeVariables>>;
-
-export const renderDefaultThemeVariablesJSON = (css: string) =>
-  `${JSON.stringify(readDefaultThemeVariables(css), null, 2)}\n`;
+export const renderDefaultThemeVariablesJSON = () =>
+  `${JSON.stringify(
+    Object.fromEntries(
+      APPEARANCES.map((appearance) => [
+        appearance,
+        getMobileThemeVariables(DEFAULT_MOBILE_THEME_ID, appearance),
+      ]),
+    ),
+    null,
+    2,
+  )}\n`;
 
 export const getGeneratedUniwindThemeOutputs = (): ReadonlyArray<
   readonly [filename: string, contents: string]
 > => [
   [GENERATED_CSS_PATH, renderUniwindThemesCSS()],
   [GENERATED_NAMES_PATH, `${JSON.stringify(customThemeNames, null, 2)}\n`],
+  [GENERATED_DEFAULT_VARIABLES_PATH, renderDefaultThemeVariablesJSON()],
   [
-    GENERATED_DEFAULT_VARIABLES_PATH,
-    renderDefaultThemeVariablesJSON(NodeFS.readFileSync(GLOBAL_CSS_PATH, "utf8")),
+    GENERATED_CLERK_THEME_PATH,
+    `${JSON.stringify({ colors: clerkColorsFor("light"), darkColors: clerkColorsFor("dark"), design: { borderRadius: 18 } }, null, 2)}\n`,
   ],
 ];
 
diff --git a/apps/mobile/scripts/generate-uniwind-themes.test.ts b/apps/mobile/scripts/generate-uniwind-themes.test.ts
index 31663b8de2ff..a225b7087c86 100644
--- a/apps/mobile/scripts/generate-uniwind-themes.test.ts
+++ b/apps/mobile/scripts/generate-uniwind-themes.test.ts
@@ -5,9 +5,10 @@ import { describe, expect, it } from "vite-plus/test";
 import {
   customThemeNames,
   getGeneratedUniwindThemeOutputs,
-  readDefaultThemeVariables,
+  renderDefaultThemeVariablesJSON,
   renderUniwindThemesCSS,
 } from "./generate-uniwind-themes.mts";
+import { readDefaultMobileThemeVariables } from "../src/lib/mobileTheme.test-support";
 
 describe("generate mobile Uniwind themes", () => {
   it("keeps the committed outputs current", () => {
@@ -44,12 +45,15 @@ describe("generate mobile Uniwind themes", () => {
     }
   });
 
-  it("generates the default runtime bridge from the authored CSS", () => {
-    const css = NodeFS.readFileSync(NodePath.resolve(import.meta.dirname, "../global.css"), "utf8");
-    const variables = readDefaultThemeVariables(css);
+  it("keeps the default runtime bridge and generated CSS on the same palette", () => {
+    const variables = JSON.parse(renderDefaultThemeVariablesJSON());
 
-    expect(variables.light["--color-screen"]).toBe("#f2f2f7");
+    expect(variables.light).toEqual(readDefaultMobileThemeVariables("light"));
+    expect(variables.dark).toEqual(readDefaultMobileThemeVariables("dark"));
+    expect(variables.light["--color-screen"]).toBe("#fcfcfc");
+    expect(variables.light["--color-drawer"]).toBe("#fafafa");
     expect(variables.dark["--color-screen"]).toBe("#0a0a0a");
+    expect(variables.dark["--color-drawer"]).toBe("#000000");
     expect(Object.keys(variables.light)).toEqual(Object.keys(variables.dark));
   });
 
@@ -77,11 +81,11 @@ describe("generate mobile Uniwind themes", () => {
         ),
         name,
       ).toEqual({
-        "--color-clerk-page": isDark ? "#0e0e0e" : "#f2f2f7",
-        "--color-clerk-foreground": isDark ? "#f5f5f5" : "#262626",
-        "--color-clerk-foreground-muted": isDark ? "#a3a3a3" : "#737373",
-        "--color-clerk-border": isDark ? "rgba(42, 42, 42, 0.06)" : "rgba(229, 229, 234, 0.06)",
-        "--color-clerk-danger": isDark ? "#fca5a5" : "#dc2626",
+        "--color-clerk-page": isDark ? "#0a0a0a" : "#fcfcfc",
+        "--color-clerk-foreground": isDark ? "#f5f5f5" : "#27272a",
+        "--color-clerk-foreground-muted": isDark ? "#818181" : "#71717b",
+        "--color-clerk-border": isDark ? "#191919" : "#e4e4e7",
+        "--color-clerk-danger": isDark ? "#ff6467" : "#c10007",
       });
     }
   });
diff --git a/apps/mobile/src/components/AndroidScreenHeader.tsx b/apps/mobile/src/components/AndroidScreenHeader.tsx
index 2695eee5f01f..537f628b4b3c 100644
--- a/apps/mobile/src/components/AndroidScreenHeader.tsx
+++ b/apps/mobile/src/components/AndroidScreenHeader.tsx
@@ -25,7 +25,13 @@ export function AndroidHeaderIconButton(props: {
   readonly disabled?: boolean;
   readonly selected?: boolean;
 }) {
-  return <MaterialIconButton {...props} variant={props.selected ? "tonal" : "standard"} />;
+  return (
+    <MaterialIconButton
+      {...props}
+      tintColorClassName="accent-header-foreground"
+      variant={props.selected ? "tonal" : "standard"}
+    />
+  );
 }
 
 export function AndroidScreenHeader(props: {
@@ -65,6 +71,7 @@ export function AndroidScreenHeader(props: {
           <MaterialIconButton
             accessibilityLabel="Navigate up"
             icon="arrow.left"
+            tintColorClassName="accent-header-foreground"
             onPress={props.onBack}
           />
         ) : null}
@@ -72,7 +79,7 @@ export function AndroidScreenHeader(props: {
         {props.leading}
 
         <View className={cn("min-w-0 flex-1", !props.onBack && "pl-1")}>
-          <Text numberOfLines={1} style={titleTypography} className="text-foreground">
+          <Text numberOfLines={1} style={titleTypography} className="text-header-foreground">
             {props.title}
           </Text>
           {props.subtitle ? (
@@ -114,6 +121,7 @@ export function AndroidScreenHeader(props: {
               <MaterialIconButton
                 accessibilityLabel="More actions"
                 icon="ellipsis"
+                tintColorClassName="accent-header-foreground"
                 onPress={open}
               />
             )}
diff --git a/apps/mobile/src/components/AppText.tsx b/apps/mobile/src/components/AppText.tsx
index 805cdb66a3b4..6f96f4246953 100644
--- a/apps/mobile/src/components/AppText.tsx
+++ b/apps/mobile/src/components/AppText.tsx
@@ -18,7 +18,7 @@ export function AppText({ className, ...props }: AppTextProps) {
   return (
     <RNText
       className={cn("font-sans text-foreground", className)}
-      selectionColorClassName={Platform.OS === "android" ? "accent-primary/32" : undefined}
+      selectionColorClassName={Platform.OS === "android" ? "accent-focus/32" : undefined}
       {...props}
     />
   );
@@ -42,13 +42,9 @@ export function AppTextInput({ className, ref, ...props }: AppTextInputProps) {
         className,
       )}
       placeholderTextColorClassName="accent-placeholder"
-      selectionColorClassName={
-        Platform.OS === "android" ? "accent-primary/32" : "accent-foreground-secondary"
-      }
-      cursorColorClassName={
-        Platform.OS === "android" ? "accent-primary" : "accent-foreground-secondary"
-      }
-      selectionHandleColorClassName={Platform.OS === "android" ? "accent-primary" : undefined}
+      selectionColorClassName={"accent-focus/32"}
+      cursorColorClassName={"accent-focus"}
+      selectionHandleColorClassName={Platform.OS === "android" ? "accent-focus" : undefined}
       {...props}
     />
   );
diff --git a/apps/mobile/src/components/ComposerContextSheet.tsx b/apps/mobile/src/components/ComposerContextSheet.tsx
index 9fd307c9f520..9bdc10dced99 100644
--- a/apps/mobile/src/components/ComposerContextSheet.tsx
+++ b/apps/mobile/src/components/ComposerContextSheet.tsx
@@ -187,11 +187,9 @@ export function ComposerContextSheet(props: {
       onRequestClose={props.onClose}
     >
       <View
-        style={{
-          flex: 1,
-          justifyContent: "flex-end",
-          backgroundColor: Platform.OS === "android" ? "#00000066" : undefined,
-        }}
+        className={
+          Platform.OS === "android" ? "flex-1 justify-end bg-backdrop" : "flex-1 justify-end"
+        }
       >
         {Platform.OS === "android" ? (
           <Pressable
diff --git a/apps/mobile/src/components/ControlPill.tsx b/apps/mobile/src/components/ControlPill.tsx
index 1a1a84c31bc8..d8217ab67df5 100644
--- a/apps/mobile/src/components/ControlPill.tsx
+++ b/apps/mobile/src/components/ControlPill.tsx
@@ -72,7 +72,9 @@ export function ControlPill(props: {
       ? props.disabled
         ? "text-foreground-muted"
         : "text-primary-foreground"
-      : "",
+      : variant === "danger"
+        ? "text-danger-foreground"
+        : "text-foreground",
   );
 
   if (
diff --git a/apps/mobile/src/components/FilePreview.tsx b/apps/mobile/src/components/FilePreview.tsx
index a255f50ccd21..337699e8a61e 100644
--- a/apps/mobile/src/components/FilePreview.tsx
+++ b/apps/mobile/src/components/FilePreview.tsx
@@ -46,7 +46,7 @@ function DocumentPreview(props: {
   }, [uri, name, props.source.mimeType, props.source.kind]);
   return (
     <Modal transparent animationType="fade" onRequestClose={props.onRequestClose}>
-      <View className="flex-1 items-center justify-center bg-black/40 p-6">
+      <View className="flex-1 items-center justify-center bg-backdrop p-6">
         <View className="w-full max-w-sm gap-4 rounded-2xl bg-sheet-solid p-6">
           <Text className="font-t3-semibold text-foreground">Opening document…</Text>
           <Text className="text-foreground-muted" numberOfLines={2}>
diff --git a/apps/mobile/src/components/GlassBackdrop.tsx b/apps/mobile/src/components/GlassBackdrop.tsx
index 27104f535dc8..ea909f091738 100644
--- a/apps/mobile/src/components/GlassBackdrop.tsx
+++ b/apps/mobile/src/components/GlassBackdrop.tsx
@@ -6,12 +6,13 @@ import { themeColorWithAlpha } from "../lib/mobileTheme";
 
 /** Frosted backdrop for containers that clip their children to their shape. */
 export function GlassBackdrop(props: { readonly fallbackColor?: ColorValue }) {
-  const { themeAppearance } = useAppearancePreferences();
+  const { themeAppearance, themeVariables } = useAppearancePreferences();
   const supportsBlur = Platform.OS === "ios";
-  const colorStyle =
-    props.fallbackColor === undefined
-      ? undefined
-      : { backgroundColor: themeColorWithAlpha(String(props.fallbackColor), 1) };
+  const color = props.fallbackColor ?? themeVariables["--color-glass-fallback"];
+  const colorStyle = {
+    backgroundColor:
+      supportsBlur || typeof color !== "string" ? color : themeColorWithAlpha(color, 1),
+  };
 
   return (
     <>
@@ -25,11 +26,8 @@ export function GlassBackdrop(props: { readonly fallbackColor?: ColorValue }) {
       ) : null}
       <View
         pointerEvents="none"
-        className="absolute inset-0 bg-card"
-        style={[
-          colorStyle,
-          { opacity: supportsBlur ? (themeAppearance === "dark" ? 0.25 : 0.55) : 1 },
-        ]}
+        className="absolute inset-0 bg-glass-fallback"
+        style={colorStyle}
       />
     </>
   );
diff --git a/apps/mobile/src/components/GlassSurface.tsx b/apps/mobile/src/components/GlassSurface.tsx
index bfbfff2c66cc..4d899f18a4a0 100644
--- a/apps/mobile/src/components/GlassSurface.tsx
+++ b/apps/mobile/src/components/GlassSurface.tsx
@@ -1,16 +1,10 @@
 import { GlassView, isGlassEffectAPIAvailable } from "expo-glass-effect";
 import type { ReactNode, Ref } from "react";
-import {
-  Platform,
-  useColorScheme,
-  View,
-  type ColorValue,
-  type ViewProps,
-  type ViewStyle,
-} from "react-native";
+import { Platform, View, type ColorValue, type ViewProps, type ViewStyle } from "react-native";
 import { withUniwind } from "uniwind";
 
 import { cn } from "../lib/cn";
+import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import { GlassBackdrop } from "./GlassBackdrop";
 
 // Explicit mappings keep the native glassEffectStyle enum out of style-array conversion.
@@ -45,7 +39,8 @@ export function GlassSurface({
   style,
   ...props
 }: GlassSurfaceProps) {
-  const isDarkMode = useColorScheme() === "dark";
+  const { themeAppearance } = useAppearancePreferences();
+  const isDarkMode = themeAppearance === "dark";
   const supportsGlass = Platform.OS === "ios" && isGlassEffectAPIAvailable();
   const hasShadow = chrome !== "none" && Platform.OS !== "android";
   const surfaceStyle: ViewStyle = {
diff --git a/apps/mobile/src/components/MaterialButton.android.tsx b/apps/mobile/src/components/MaterialButton.android.tsx
index b5a8417fc799..f2df6464f103 100644
--- a/apps/mobile/src/components/MaterialButton.android.tsx
+++ b/apps/mobile/src/components/MaterialButton.android.tsx
@@ -35,7 +35,7 @@ export function MaterialButton(props: MaterialButtonProps) {
       : tone === "danger"
         ? colors["--color-danger-foreground"]
         : tone === "text"
-          ? colors["--color-primary"]
+          ? colors["--color-primary-text"]
           : colors["--color-secondary-foreground"];
   return (
     <View
diff --git a/apps/mobile/src/components/MaterialButton.tsx b/apps/mobile/src/components/MaterialButton.tsx
index f0ad4cb8f55c..2649d762f9fa 100644
--- a/apps/mobile/src/components/MaterialButton.tsx
+++ b/apps/mobile/src/components/MaterialButton.tsx
@@ -1,5 +1,6 @@
 import { Pressable } from "react-native";
 import { AppText } from "./AppText";
+import { cn } from "../lib/cn";
 
 export interface MaterialButtonProps {
   readonly label: string;
@@ -10,15 +11,36 @@ export interface MaterialButtonProps {
   readonly fullWidth?: boolean;
 }
 
+const TONE_CLASS_NAMES = {
+  primary: ["bg-primary", "text-primary-foreground"],
+  secondary: ["bg-secondary", "text-secondary-foreground"],
+  danger: ["bg-danger", "text-danger-foreground"],
+  text: ["bg-transparent", "text-primary-text"],
+} as const;
+
 export function MaterialButton(props: MaterialButtonProps) {
+  const [containerClassName, labelClassName] = TONE_CLASS_NAMES[props.tone ?? "secondary"];
+  const disabled = Boolean(props.disabled || props.loading);
   return (
     <Pressable
       accessibilityRole="button"
-      disabled={props.disabled}
+      accessibilityState={{ disabled }}
+      disabled={disabled}
       onPress={props.onPress}
-      className="min-h-12 justify-center rounded-full bg-secondary px-6"
+      className={cn(
+        "min-h-12 justify-center rounded-full px-6 active:opacity-70",
+        props.fullWidth ? "w-full" : "self-start",
+        disabled ? "bg-subtle-strong" : containerClassName,
+      )}
     >
-      <AppText>{props.label}</AppText>
+      <AppText
+        className={cn(
+          "text-center font-t3-medium",
+          disabled ? "text-foreground-muted" : labelClassName,
+        )}
+      >
+        {props.label}
+      </AppText>
     </Pressable>
   );
 }
diff --git a/apps/mobile/src/components/MaterialConfirmDialog.android.tsx b/apps/mobile/src/components/MaterialConfirmDialog.android.tsx
index 3e65d7185ecc..35057ce10f5f 100644
--- a/apps/mobile/src/components/MaterialConfirmDialog.android.tsx
+++ b/apps/mobile/src/components/MaterialConfirmDialog.android.tsx
@@ -58,9 +58,9 @@ export function MaterialConfirmDialog(props: MaterialConfirmDialogProps) {
               colors={{
                 focusedTextColor: colors["--color-foreground"],
                 unfocusedTextColor: colors["--color-foreground"],
-                focusedIndicatorColor: colors["--color-primary"],
+                focusedIndicatorColor: colors["--color-focus"],
                 unfocusedIndicatorColor: colors["--color-border"],
-                cursorColor: colors["--color-primary"],
+                cursorColor: colors["--color-focus"],
               }}
             >
               <OutlinedTextField.Label>
@@ -74,7 +74,10 @@ export function MaterialConfirmDialog(props: MaterialConfirmDialogProps) {
           </AlertDialog.Text>
         ) : null}
         <AlertDialog.DismissButton>
-          <TextButton onClick={props.onCancel} colors={{ contentColor: colors["--color-primary"] }}>
+          <TextButton
+            onClick={props.onCancel}
+            colors={{ contentColor: colors["--color-primary-text"] }}
+          >
             <Text style={bodyTypography}>{props.request.cancelText ?? "Cancel"}</Text>
           </TextButton>
         </AlertDialog.DismissButton>
@@ -84,7 +87,9 @@ export function MaterialConfirmDialog(props: MaterialConfirmDialogProps) {
             enabled={!props.confirmDisabled}
             colors={{
               contentColor:
-                colors[props.request.destructive ? "--color-danger" : "--color-primary"],
+                colors[
+                  props.request.destructive ? "--color-danger-foreground" : "--color-primary-text"
+                ],
             }}
           >
             <Text style={bodyTypography}>{props.request.confirmText}</Text>
diff --git a/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx b/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx
index 3978712683c0..2882d0d91ec0 100644
--- a/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx
+++ b/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx
@@ -25,9 +25,9 @@ export function MaterialFloatingActionButton(props: {
   const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
   const typography = useScaledTextRole("footnote");
   const primary = props.tone === "primary";
-  const containerColor = colors[primary ? "--color-primary" : "--color-thread-selected"];
+  const containerColor = colors[primary ? "--color-primary" : "--color-secondary"];
   const contentColor =
-    colors[primary ? "--color-primary-foreground" : "--color-thread-selected-foreground"];
+    colors[primary ? "--color-primary-foreground" : "--color-secondary-foreground"];
   const Component =
     props.variant === "extended"
       ? ExtendedFloatingActionButton
@@ -76,9 +76,7 @@ export function MaterialFloatingActionButton(props: {
         <SymbolView
           name={props.icon}
           size={iconSize}
-          tintColorClassName={
-            primary ? "accent-primary-foreground" : "accent-thread-selected-foreground"
-          }
+          tintColorClassName={primary ? "accent-primary-foreground" : "accent-secondary-foreground"}
         />
       </View>
     </View>
diff --git a/apps/mobile/src/components/MaterialFloatingActionButton.tsx b/apps/mobile/src/components/MaterialFloatingActionButton.tsx
index eeed5fd1d138..53230804a4e5 100644
--- a/apps/mobile/src/components/MaterialFloatingActionButton.tsx
+++ b/apps/mobile/src/components/MaterialFloatingActionButton.tsx
@@ -15,7 +15,7 @@ export function MaterialFloatingActionButton(
       onPress={props.onPress}
       className={cn(
         "min-h-14 min-w-14 flex-row items-center justify-center gap-2 rounded-2xl px-4",
-        props.tone === "primary" ? "bg-primary" : "bg-thread-selected",
+        props.tone === "primary" ? "bg-primary" : "bg-secondary",
         props.className,
       )}
       style={props.style}
@@ -24,18 +24,14 @@ export function MaterialFloatingActionButton(
         name={props.icon}
         size={24}
         tintColorClassName={
-          props.tone === "primary"
-            ? "accent-primary-foreground"
-            : "accent-thread-selected-foreground"
+          props.tone === "primary" ? "accent-primary-foreground" : "accent-secondary-foreground"
         }
       />
       {props.variant === "extended" && props.expanded !== false ? (
         <AppText
           className={cn(
             "text-sm",
-            props.tone === "primary"
-              ? "text-primary-foreground"
-              : "text-thread-selected-foreground",
+            props.tone === "primary" ? "text-primary-foreground" : "text-secondary-foreground",
           )}
         >
           {props.label}
diff --git a/apps/mobile/src/components/MaterialIconButton.android.tsx b/apps/mobile/src/components/MaterialIconButton.android.tsx
index 9cc6f5dc6ce0..21284249f79d 100644
--- a/apps/mobile/src/components/MaterialIconButton.android.tsx
+++ b/apps/mobile/src/components/MaterialIconButton.android.tsx
@@ -17,6 +17,7 @@ export function MaterialIconButton(props: {
   readonly disabled?: boolean;
   readonly selected?: boolean;
   readonly variant?: "standard" | "primary" | "tonal" | "danger";
+  readonly tintColorClassName?: string;
 }) {
   const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
   const variant = props.variant ?? "standard";
@@ -40,7 +41,7 @@ export function MaterialIconButton(props: {
         ? "accent-danger-foreground"
         : variant === "tonal"
           ? "accent-secondary-foreground"
-          : "accent-foreground";
+          : (props.tintColorClassName ?? "accent-foreground");
   return (
     <View
       accessible
diff --git a/apps/mobile/src/components/MaterialIconButton.tsx b/apps/mobile/src/components/MaterialIconButton.tsx
index 852889140ad5..a788fdd5ea35 100644
--- a/apps/mobile/src/components/MaterialIconButton.tsx
+++ b/apps/mobile/src/components/MaterialIconButton.tsx
@@ -1,7 +1,15 @@
+import { cn } from "../lib/cn";
 import { Pressable } from "react-native";
 
 import { SymbolView, type AppSymbolName } from "./AppSymbol";
 
+const VARIANT_CLASS_NAMES = {
+  standard: ["", "accent-foreground"],
+  primary: ["rounded-full bg-primary", "accent-primary-foreground"],
+  danger: ["rounded-full bg-danger", "accent-danger-foreground"],
+  tonal: ["rounded-full bg-secondary", "accent-secondary-foreground"],
+} as const;
+
 export function MaterialIconButton(props: {
   readonly accessibilityLabel: string;
   readonly icon: AppSymbolName;
@@ -9,15 +17,35 @@ export function MaterialIconButton(props: {
   readonly disabled?: boolean;
   readonly selected?: boolean;
   readonly variant?: "standard" | "primary" | "tonal" | "danger";
+  readonly tintColorClassName?: string;
 }) {
+  const variant = props.variant ?? "standard";
+  const [containerClassName, iconTintClassName] = VARIANT_CLASS_NAMES[variant];
   return (
     <Pressable
-      {...props}
+      onPress={props.onPress}
+      disabled={props.disabled}
+      accessibilityLabel={props.accessibilityLabel}
       accessibilityRole="button"
       accessibilityState={{ disabled: Boolean(props.disabled), selected: props.selected }}
-      className="size-12 items-center justify-center"
+      className={cn(
+        "size-12 items-center justify-center",
+        props.disabled && variant !== "standard"
+          ? "rounded-full bg-subtle-strong"
+          : containerClassName,
+      )}
     >
-      <SymbolView name={props.icon} size={24} tintColorClassName="accent-foreground" />
+      <SymbolView
+        name={props.icon}
+        size={24}
+        tintColorClassName={
+          props.disabled
+            ? "accent-icon-subtle"
+            : variant === "standard"
+              ? (props.tintColorClassName ?? iconTintClassName)
+              : iconTintClassName
+        }
+      />
     </Pressable>
   );
 }
diff --git a/apps/mobile/src/components/MaterialSearchField.tsx b/apps/mobile/src/components/MaterialSearchField.tsx
index 5ed3945039d1..ab96440f5f09 100644
--- a/apps/mobile/src/components/MaterialSearchField.tsx
+++ b/apps/mobile/src/components/MaterialSearchField.tsx
@@ -30,9 +30,9 @@ export function MaterialSearchField({
         returnKeyType="search"
         placeholder={placeholder}
         placeholderTextColorClassName="accent-placeholder"
-        selectionColorClassName="accent-primary/32"
-        cursorColorClassName="accent-primary"
-        selectionHandleColorClassName="accent-primary"
+        selectionColorClassName="accent-focus/32"
+        cursorColorClassName="accent-focus"
+        selectionHandleColorClassName="accent-focus"
         className="min-w-0 flex-1 py-2 font-sans text-base text-foreground"
         value={value}
         onChangeText={onChangeText}
diff --git a/apps/mobile/src/components/RowPressable.tsx b/apps/mobile/src/components/RowPressable.tsx
index bd52fbe74f11..959a1a8aba97 100644
--- a/apps/mobile/src/components/RowPressable.tsx
+++ b/apps/mobile/src/components/RowPressable.tsx
@@ -9,22 +9,24 @@ import { useHoverGesture } from "../lib/useHoverGesture";
 export function RowPressable({
   children,
   className,
-  interactionClassName = "bg-primary",
+  interactionClassName = "bg-row-hover",
+  interactionOpacity = 1,
   ...props
 }: Omit<ComponentProps<typeof Pressable>, "children"> & {
   readonly children: ReactNode;
   readonly interactionClassName?: string;
+  readonly interactionOpacity?: number;
 }) {
   const { hovered, hoverGesture } = useHoverGesture(props.disabled ?? false);
   return (
     <GestureDetector gesture={hoverGesture}>
       <Pressable {...props} className={cn("relative overflow-hidden", className)}>
-        {({ pressed }) => (
+        {() => (
           <>
             <View
               pointerEvents="none"
               className={cn("absolute inset-0", interactionClassName)}
-              style={{ opacity: props.disabled || !hovered ? 0 : pressed ? 0.2 : 0.1 }}
+              style={{ opacity: props.disabled || !hovered ? 0 : interactionOpacity }}
             />
             {children}
           </>
diff --git a/apps/mobile/src/components/ScreenHeader.android.tsx b/apps/mobile/src/components/ScreenHeader.android.tsx
index f7b70e695ad9..61a38c3a00c2 100644
--- a/apps/mobile/src/components/ScreenHeader.android.tsx
+++ b/apps/mobile/src/components/ScreenHeader.android.tsx
@@ -53,7 +53,7 @@ export function ScreenHeader(props: ScreenHeaderProps) {
           <SymbolView
             name={menu.icon}
             size={16}
-            tintColorClassName="accent-icon"
+            tintColorClassName="accent-header-foreground"
             type="monochrome"
           />
         </Pressable>
@@ -95,7 +95,7 @@ export function ScreenHeader(props: ScreenHeaderProps) {
                 <SymbolView
                   name="chevron.left"
                   size={24}
-                  tintColorClassName="accent-foreground"
+                  tintColorClassName="accent-header-foreground"
                   type="monochrome"
                 />
               </Pressable>
@@ -104,7 +104,7 @@ export function ScreenHeader(props: ScreenHeaderProps) {
               <SymbolView
                 name="magnifyingglass"
                 size={17}
-                tintColorClassName="accent-icon"
+                tintColorClassName="accent-header-foreground"
                 type="monochrome"
               />
               <TextInput
@@ -114,7 +114,7 @@ export function ScreenHeader(props: ScreenHeaderProps) {
                 value={search.value}
                 placeholder={search.placeholder}
                 placeholderTextColorClassName="accent-placeholder"
-                className="flex-1 py-2 text-base font-sans text-foreground"
+                className="flex-1 py-2 text-base font-sans text-header-foreground"
               />
             </View>
             {menuView}
diff --git a/apps/mobile/src/components/SegmentedControl.tsx b/apps/mobile/src/components/SegmentedControl.tsx
index 607062e0579e..e1e61cda26df 100644
--- a/apps/mobile/src/components/SegmentedControl.tsx
+++ b/apps/mobile/src/components/SegmentedControl.tsx
@@ -40,7 +40,7 @@ export function SegmentedControl<Value extends number | string>(
         layout={LinearTransition.duration(200)
           .easing(Easing.out(Easing.cubic))
           .reduceMotion(ReduceMotion.System)}
-        className="absolute inset-y-0 rounded-full bg-subtle-strong"
+        className="absolute inset-y-0 rounded-full bg-secondary"
         style={{
           width: `${100 / props.options.length}%`,
           start: `${
@@ -70,7 +70,7 @@ export function SegmentedControl<Value extends number | string>(
             <Text
               className={cn(
                 compact ? "text-xs" : "text-sm",
-                active ? "font-t3-medium text-foreground" : "text-foreground-muted",
+                active ? "font-t3-medium text-secondary-foreground" : "text-foreground-muted",
               )}
             >
               {option.label}
diff --git a/apps/mobile/src/features/connection/ConnectionStatusDot.tsx b/apps/mobile/src/features/connection/ConnectionStatusDot.tsx
index 43c61249a748..6c01bc8824ae 100644
--- a/apps/mobile/src/features/connection/ConnectionStatusDot.tsx
+++ b/apps/mobile/src/features/connection/ConnectionStatusDot.tsx
@@ -10,10 +10,16 @@ import Animated, {
 } from "react-native-reanimated";
 
 import type { RemoteClientConnectionState } from "../../lib/connection";
+import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
+import { themeColorWithAlpha, type MobileThemeVariables } from "../../lib/mobileTheme";
 
 export type ConnectionStatusDotState = RemoteClientConnectionState;
 
-function statusDotTone(state: ConnectionStatusDotState): {
+function statusDotTone(
+  state: ConnectionStatusDotState,
+  theme: MobileThemeVariables,
+  dark: boolean,
+): {
   readonly dotColor: string;
   readonly haloColor: string;
 } {
@@ -23,25 +29,25 @@ function statusDotTone(state: ConnectionStatusDotState): {
     case "available":
     case "unsupported":
       return {
-        dotColor: "#9ca3af",
-        haloColor: "rgba(156,163,175,0.42)",
+        dotColor: theme["--color-icon-muted"],
+        haloColor: themeColorWithAlpha(theme["--color-icon-muted"], 0.42),
       };
     case "connected":
       return {
-        dotColor: "#34d399",
-        haloColor: "rgba(52,211,153,0.48)",
+        dotColor: dark ? "#34d399" : "#059669",
+        haloColor: themeColorWithAlpha(dark ? "#34d399" : "#059669", 0.48),
       };
     case "connecting":
     case "reconnecting":
       return {
-        dotColor: "#f59e0b",
-        haloColor: "rgba(245,158,11,0.5)",
+        dotColor: theme["--color-warning-foreground"],
+        haloColor: themeColorWithAlpha(theme["--color-warning-foreground"], 0.5),
       };
     case "offline":
     case "error":
       return {
-        dotColor: "#ef4444",
-        haloColor: "rgba(239,68,68,0.48)",
+        dotColor: theme["--color-danger-foreground"],
+        haloColor: themeColorWithAlpha(theme["--color-danger-foreground"], 0.48),
       };
   }
 }
@@ -78,7 +84,8 @@ export function ConnectionStatusDot(props: {
   readonly size?: number;
 }) {
   const pulseProgress = usePulseAnimation(props.pulse);
-  const tone = statusDotTone(props.state);
+  const { themeAppearance, themeVariables } = useAppearancePreferences();
+  const tone = statusDotTone(props.state, themeVariables, themeAppearance === "dark");
   const dotSize = props.size ?? 10;
   const haloSize = dotSize + 4;
   const containerSize = haloSize + 4;
diff --git a/apps/mobile/src/features/connection/connectionTone.ts b/apps/mobile/src/features/connection/connectionTone.ts
index 05a654085675..a2d85096e351 100644
--- a/apps/mobile/src/features/connection/connectionTone.ts
+++ b/apps/mobile/src/features/connection/connectionTone.ts
@@ -18,8 +18,8 @@ export function connectionTone(state: RemoteClientConnectionState): StatusTone {
     case "connecting":
       return {
         label: "Connecting",
-        pillClassName: "bg-primary/10",
-        textClassName: "text-foreground-secondary",
+        pillClassName: "bg-update",
+        textClassName: "text-update-foreground",
       };
     case "unsupported":
       return {
diff --git a/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx b/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx
index 2d85a71f1470..82b2b90fecad 100644
--- a/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx
+++ b/apps/mobile/src/features/devices/DevicePreviewRouteScreen.tsx
@@ -231,10 +231,10 @@ function DevicePreviewScreen({
               </AppText>
               <Pressable
                 accessibilityRole="button"
-                className="rounded-full bg-subtle px-6 py-3"
+                className="rounded-full border border-secondary-border bg-secondary px-6 py-3"
                 onPress={state.refresh}
               >
-                <AppText>Retry</AppText>
+                <AppText className="text-secondary-foreground">Retry</AppText>
               </Pressable>
             </>
           ) : focused && foreground ? (
@@ -278,7 +278,9 @@ function OpenDevicePreview({
         background: themeVariables["--color-sheet-solid"],
         foreground: themeVariables["--color-foreground"],
         muted: themeVariables["--color-foreground-muted"],
-        buttonBackground: themeVariables["--color-subtle"],
+        buttonBackground: themeVariables["--color-secondary"],
+        buttonForeground: themeVariables["--color-secondary-foreground"],
+        buttonBorder: themeVariables["--color-secondary-border"],
       }}
       onUnauthorized={onUnauthorized}
       onInputConnected={onInputConnected}
@@ -292,10 +294,10 @@ function OpenDevicePreview({
           </AppText>
           <Pressable
             accessibilityRole="button"
-            className="rounded-full bg-subtle px-6 py-3"
+            className="rounded-full border border-secondary-border bg-secondary px-6 py-3"
             onPress={refresh}
           >
-            <AppText>Retry</AppText>
+            <AppText className="text-secondary-foreground">Retry</AppText>
           </Pressable>
         </>
       ) : (
diff --git a/apps/mobile/src/features/devices/device-stream-document.ts b/apps/mobile/src/features/devices/device-stream-document.ts
index a919e43218c3..f3b753d5e99c 100644
--- a/apps/mobile/src/features/devices/device-stream-document.ts
+++ b/apps/mobile/src/features/devices/device-stream-document.ts
@@ -10,6 +10,8 @@ export interface DeviceStreamConfiguration {
     readonly foreground: string;
     readonly muted: string;
     readonly buttonBackground: string;
+    readonly buttonForeground: string;
+    readonly buttonBorder: string;
   };
 }
 
diff --git a/apps/mobile/src/features/devices/device-stream.browser.ts b/apps/mobile/src/features/devices/device-stream.browser.ts
index 727ea3e8fceb..efa81d9a043a 100644
--- a/apps/mobile/src/features/devices/device-stream.browser.ts
+++ b/apps/mobile/src/features/devices/device-stream.browser.ts
@@ -90,9 +90,9 @@ export function start(configuration: DeviceStreamConfiguration) {
   Object.assign(retry.style, {
     padding: "12px 24px",
     borderRadius: "20px",
-    border: "0",
+    border: `1px solid ${colors.buttonBorder}`,
     background: colors.buttonBackground,
-    color: colors.foreground,
+    color: colors.buttonForeground,
     font: "inherit",
     display: "none",
   });
diff --git a/apps/mobile/src/features/files/SourceFileSurface.tsx b/apps/mobile/src/features/files/SourceFileSurface.tsx
index 761849725839..c7c2310ba936 100644
--- a/apps/mobile/src/features/files/SourceFileSurface.tsx
+++ b/apps/mobile/src/features/files/SourceFileSurface.tsx
@@ -74,7 +74,7 @@ const HighlightedSourceLine = memo(function HighlightedSourceLine(props: {
       </NativeText>
       <NativeText
         selectable
-        selectionColorClassName={Platform.OS === "android" ? "accent-primary/32" : undefined}
+        selectionColorClassName={Platform.OS === "android" ? "accent-focus/32" : undefined}
         numberOfLines={props.wordBreak ? undefined : 1}
         className="flex-1 font-normal text-foreground"
         style={{
@@ -105,7 +105,7 @@ const HighlightedSourceLine = memo(function HighlightedSourceLine(props: {
                     key={`${start}:${token.content.length}:${token.color ?? ""}`}
                     selectable
                     selectionColorClassName={
-                      Platform.OS === "android" ? "accent-primary/32" : undefined
+                      Platform.OS === "android" ? "accent-focus/32" : undefined
                     }
                     style={{
                       color: token.color ?? undefined,
@@ -279,7 +279,7 @@ function JavaScriptSourceFileSurface(props: SourceFileSurfaceProps) {
     <MarkdownTextPrimitive
       uiTextView
       selectable
-      selectionColorClassName={Platform.OS === "android" ? "accent-primary/32" : undefined}
+      selectionColorClassName={Platform.OS === "android" ? "accent-focus/32" : undefined}
       style={{
         color: foreground,
         fontFamily: REVIEW_MONO_FONT_FAMILY,
diff --git a/apps/mobile/src/features/keyboard/CommandPalette.tsx b/apps/mobile/src/features/keyboard/CommandPalette.tsx
index a79e99fc212a..32344ef3fdac 100644
--- a/apps/mobile/src/features/keyboard/CommandPalette.tsx
+++ b/apps/mobile/src/features/keyboard/CommandPalette.tsx
@@ -20,6 +20,7 @@ import { GlassSurface } from "../../components/GlassSurface";
 import { RowPressable } from "../../components/RowPressable";
 import { AppText as Text } from "../../components/AppText";
 import { SymbolView, type AppSymbolName } from "../../components/AppSymbol";
+import { cn } from "../../lib/cn";
 import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
 import { T3KeyboardCommands } from "../../native/T3KeyboardCommands";
 import { useProjects, useThreadShell, useThreadShells } from "../../state/entities";
@@ -27,6 +28,7 @@ import { useThreadSearch } from "../../state/queries";
 import { useWorkspaceState } from "../../state/workspace";
 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
+import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
 import { ThreadSearchMatchExcerpt } from "../threads/thread-search-match";
 import {
   filterCommandPaletteItems,
@@ -74,35 +76,53 @@ function PaletteRow(props: {
   readonly searchQuery: string;
   readonly onSelect: () => void;
 }) {
+  const foregroundClassName = props.selected
+    ? "text-thread-selected-foreground"
+    : "text-foreground";
+  const mutedForegroundClassName = props.selected
+    ? "text-thread-selected-foreground-muted"
+    : "text-foreground-muted";
   return (
     <RowPressable
       accessibilityRole="button"
+      interactionOpacity={props.selected ? 0 : 1}
       accessibilityState={{ selected: props.selected }}
       onPress={props.onSelect}
       className={
         props.selected
-          ? "mx-2 flex-row items-center gap-3 rounded-xl bg-primary/10 px-3"
+          ? "mx-2 flex-row items-center gap-3 rounded-xl bg-thread-selected px-3"
           : "mx-2 flex-row items-center gap-3 rounded-xl px-3"
       }
       style={{ height: ROW_HEIGHT }}
     >
       <View className="w-7 items-center">
-        <SymbolView name={itemIcon(props.item)} size={20} tintColorClassName="accent-icon" />
+        <SymbolView
+          name={itemIcon(props.item)}
+          size={20}
+          tintColorClassName={props.selected ? "accent-thread-selected-foreground" : "accent-icon"}
+        />
       </View>
       <View className="flex-1">
-        <Text numberOfLines={1} className="text-base">
+        <Text numberOfLines={1} className={cn("text-base", foregroundClassName)}>
           {props.item.title}
         </Text>
         {props.searchMatch ? (
-          <ThreadSearchMatchExcerpt match={props.searchMatch} query={props.searchQuery} compact />
+          <ThreadSearchMatchExcerpt
+            match={props.searchMatch}
+            query={props.searchQuery}
+            selected={props.selected}
+            compact
+          />
         ) : props.item.detail ? (
-          <Text numberOfLines={1} className="text-sm text-foreground-muted">
+          <Text numberOfLines={1} className={cn("text-sm", mutedForegroundClassName)}>
             {props.item.detail}
           </Text>
         ) : null}
       </View>
       {props.index < 9 ? (
-        <NativeText className="w-8 shrink-0 text-right text-sm tabular-nums text-foreground-muted">
+        <NativeText
+          className={cn("w-8 shrink-0 text-right text-sm tabular-nums", mutedForegroundClassName)}
+        >
           ⌘{props.index + 1}
         </NativeText>
       ) : null}
@@ -117,6 +137,7 @@ export function CommandPalette(props: {
   readonly onCommand: (command: HardwareKeyboardCommand) => void;
 }) {
   const navigation = useNavigation();
+  const { themeVariables } = useAppearancePreferences();
   const { selectThread } = useAdaptiveWorkspaceLayout();
   const runCommand = props.onCommand;
   const projects = useProjects();
@@ -392,14 +413,15 @@ export function CommandPalette(props: {
             className="flex-1 items-center justify-center p-4"
           >
             <Pressable
-              className="absolute inset-0 bg-black/15"
+              className="absolute inset-0 bg-backdrop"
               accessibilityLabel="Close command palette"
               onPress={() => close()}
             />
             <GlassSurface
               accessibilityViewIsModal
-              className="bg-sheet/70"
+              className="bg-sheet"
               tintColorClassName="accent-sheet/20"
+              fallbackColor={themeVariables["--color-sheet"]}
               style={{
                 width: Math.min(600, width - 32),
                 height: Math.min(520, height - 80),
diff --git a/apps/mobile/src/features/projects/AddProjectScreen.tsx b/apps/mobile/src/features/projects/AddProjectScreen.tsx
index 4da58b3309ef..84a2938785de 100644
--- a/apps/mobile/src/features/projects/AddProjectScreen.tsx
+++ b/apps/mobile/src/features/projects/AddProjectScreen.tsx
@@ -129,7 +129,7 @@ function SectionTitle(props: { readonly children: string }) {
     <Text
       className={
         Platform.OS === "android"
-          ? "px-4 text-sm font-t3-medium text-primary"
+          ? "px-4 text-sm font-t3-medium text-primary-text"
           : "px-1 text-2xs font-t3-bold tracking-[0.7px] uppercase text-foreground-muted"
       }
     >
diff --git a/apps/mobile/src/features/review/ReviewSheet.tsx b/apps/mobile/src/features/review/ReviewSheet.tsx
index cb55570f9116..2fac5376e5b1 100644
--- a/apps/mobile/src/features/review/ReviewSheet.tsx
+++ b/apps/mobile/src/features/review/ReviewSheet.tsx
@@ -262,7 +262,7 @@ const ReviewFileNavigatorRow = memo(function ReviewFileNavigatorRow(props: {
         Platform.OS === "android"
           ? cn(
               "mt-1 min-h-12 justify-center rounded-[20px] px-3 py-2 active:bg-subtle",
-              selected && "bg-thread-selected",
+              selected && "bg-subtle-strong",
             )
           : selected
             ? "mt-1 min-h-12 justify-center rounded-xl bg-subtle-strong px-3 py-2"
@@ -281,8 +281,10 @@ const ReviewFileNavigatorRow = memo(function ReviewFileNavigatorRow(props: {
         {file.path}
       </Text>
       <View className="mt-1 flex-row gap-2">
-        <Text className="text-2xs font-t3-bold text-emerald-600">+{file.additions}</Text>
-        <Text className="text-2xs font-t3-bold text-rose-600">-{file.deletions}</Text>
+        <Text className="text-2xs font-t3-bold text-adaptive-emerald-700-300">
+          +{file.additions}
+        </Text>
+        <Text className="text-2xs font-t3-bold text-adaptive-rose-700-300">-{file.deletions}</Text>
       </View>
     </Pressable>
   );
diff --git a/apps/mobile/src/features/review/nativeReviewDiffAdapter.test.ts b/apps/mobile/src/features/review/nativeReviewDiffAdapter.test.ts
index 21c86a2beab4..6f55fef7c2a7 100644
--- a/apps/mobile/src/features/review/nativeReviewDiffAdapter.test.ts
+++ b/apps/mobile/src/features/review/nativeReviewDiffAdapter.test.ts
@@ -97,6 +97,19 @@ function appTheme(themeId: MobileThemeId, appearance: MobileThemeAppearance) {
     : getMobileThemeVariables(themeId, appearance);
 }
 
+function contrastRatio(first: string, second: string): number {
+  const luminance = (hex: string) => {
+    const [red, green, blue] = [1, 3, 5].map((offset) => {
+      const channel = Number.parseInt(hex.slice(offset, offset + 2), 16) / 255;
+      return channel <= 0.04045 ? channel / 12.92 : ((channel + 0.055) / 1.055) ** 2.4;
+    });
+    return 0.2126 * red! + 0.7152 * green! + 0.0722 * blue!;
+  };
+  const a = luminance(first);
+  const b = luminance(second);
+  return (Math.max(a, b) + 0.05) / (Math.min(a, b) + 0.05);
+}
+
 describe("getCachedNativeReviewDiffData", () => {
   it.each([true, false])(
     "preserves available diff rows before a notice (has excerpt: %s)",
@@ -251,6 +264,10 @@ describe("createNativeReviewDiffTheme", () => {
         for (const color of Object.values(theme)) {
           expect(color, `${themeId}/${appearance}`).toMatch(/^#[\da-f]{6}$/i);
         }
+        expect(
+          contrastRatio(theme.hunkText, theme.hunkBackground),
+          `${themeId}/${appearance} hunk text`,
+        ).toBeGreaterThanOrEqual(4.5);
       }
     }
   });
@@ -261,7 +278,7 @@ describe("createNativeReviewDiffTheme", () => {
       const variables = {
         ...appTheme("material-you", appearance),
         "--color-screen": "#101214FF",
-        "--color-sheet": "#20222480",
+        "--color-md-code-bg": "#20222480",
         "--color-md-code-text": "#E3E2E6FF",
         "--color-foreground-muted": "#C7C5D080",
         "--color-border": "#44464F80",
@@ -273,7 +290,7 @@ describe("createNativeReviewDiffTheme", () => {
       expect(theme.text).toBe("#e3e2e6");
       expect(theme.mutedText).toBe("#707076");
       expect(theme.border).toBe("#2e3036");
-      expect(theme.hunkText).toBe("#a8c7fa");
+      expect(contrastRatio(theme.hunkText, theme.hunkBackground)).toBeGreaterThanOrEqual(4.5);
       for (const color of Object.values(theme)) {
         expect(color).toMatch(/^#[\da-f]{6}$/i);
       }
diff --git a/apps/mobile/src/features/review/nativeReviewDiffAdapter.ts b/apps/mobile/src/features/review/nativeReviewDiffAdapter.ts
index b35d561a249d..8bea04c524dd 100644
--- a/apps/mobile/src/features/review/nativeReviewDiffAdapter.ts
+++ b/apps/mobile/src/features/review/nativeReviewDiffAdapter.ts
@@ -177,20 +177,19 @@ export function createNativeReviewDiffTheme(
     appTheme["--color-screen"],
     scheme === "dark" ? "#000000" : "#ffffff",
   );
-  const background = opaqueNativeHexColor(appTheme["--color-sheet"], screen);
+  const background = opaqueNativeHexColor(appTheme["--color-md-code-bg"], screen);
   const nativeColor = (color: string) => opaqueNativeHexColor(color, background);
 
   if (scheme === "dark") {
     return {
-      // Match the app surface (--color-sheet) so code views blend with the rest of
-      // the app instead of using a distinct code-editor background.
+      // Code surfaces share the desktop palette rather than the sheet behind them.
       background,
       text: nativeColor(appTheme["--color-md-code-text"]),
       mutedText: nativeColor(appTheme["--color-foreground-muted"]),
       headerBackground: background,
       border: nativeColor(appTheme["--color-border"]),
       hunkBackground: nativeColor(appTheme["--color-subtle-strong"]),
-      hunkText: nativeColor(appTheme["--color-primary"]),
+      hunkText: nativeColor(appTheme["--color-foreground"]),
       addBackground: "#0d2f28",
       deleteBackground: "#391415",
       addBar: "#00cab1",
@@ -201,15 +200,13 @@ export function createNativeReviewDiffTheme(
   }
 
   return {
-    // Match the app surface (--color-sheet) so code views blend with the rest of the
-    // app instead of using a distinct code-editor background.
     background,
     text: nativeColor(appTheme["--color-md-code-text"]),
     mutedText: nativeColor(appTheme["--color-foreground-muted"]),
     headerBackground: background,
     border: nativeColor(appTheme["--color-border"]),
     hunkBackground: nativeColor(appTheme["--color-subtle-strong"]),
-    hunkText: nativeColor(appTheme["--color-primary"]),
+    hunkText: nativeColor(appTheme["--color-foreground"]),
     addBackground: "#e5f8f5",
     deleteBackground: "#ffe6e7",
     addBar: "#00cab1",
diff --git a/apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx
index efeca40e0ff1..6ab20d03854f 100644
--- a/apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx
@@ -44,7 +44,7 @@ function LicenseRow(props: {
       accessibilityLabel={`${props.entry.name}, ${props.entry.license}`}
       accessibilityRole="button"
       onPress={props.onPress}
-      className="border-b border-border bg-card px-5 py-4 active:bg-card-alt"
+      className="border-b border-border bg-grouped-card px-5 py-4 active:bg-card-alt"
     >
       <View className="flex-row items-start gap-3">
         <View className="min-w-0 flex-1 gap-1">
@@ -235,11 +235,11 @@ export function SettingsOpenSourceLicenseRouteScreen({ route }: LicenseDetailPro
               onPress={() => void Linking.openURL(sourceUrl)}
               className="min-h-12 flex-row items-center gap-2 self-start py-2 active:opacity-60"
             >
-              <Text className="font-t3-medium text-primary">Project source</Text>
+              <Text className="font-t3-medium text-primary-text">Project source</Text>
               <SymbolView
                 name="arrow.up.right"
                 size={16}
-                tintColorClassName={"accent-primary"}
+                tintColorClassName={"accent-primary-text"}
                 type="monochrome"
                 weight="semibold"
               />
@@ -247,7 +247,7 @@ export function SettingsOpenSourceLicenseRouteScreen({ route }: LicenseDetailPro
           ) : null}
         </View>
 
-        <View className="overflow-hidden rounded-[24px] border-continuous bg-card p-4">
+        <View className="overflow-hidden rounded-[24px] border-continuous bg-grouped-card p-4">
           <Text selectable className="font-mono text-base leading-normal text-foreground">
             {entry.noticeText}
           </Text>
diff --git a/apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx b/apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx
index 788d04b047ba..b3b76bda3a18 100644
--- a/apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx
+++ b/apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx
@@ -151,7 +151,7 @@ function ThemeCard(props: {
   );
 
   return (
-    <View className="min-w-36 flex-1 basis-[47%] gap-3 rounded-[24px] border border-border bg-card px-2 py-4">
+    <View className="min-w-36 flex-1 basis-[47%] gap-3 rounded-[24px] border border-border bg-grouped-card px-2 py-4">
       <Pressable
         accessibilityHint="Sets both light and dark appearances"
         accessibilityLabel={`${props.label} theme`}
@@ -259,7 +259,9 @@ function ModeCard(props: {
       accessibilityState={{ checked: props.selected, disabled: props.disabled }}
       className={cn(
         "min-w-0 flex-1 gap-2 rounded-[24px] p-2 active:scale-[0.97]",
-        props.selected ? "border-2 border-primary bg-subtle" : "border border-border bg-card",
+        props.selected
+          ? "border-2 border-primary bg-subtle"
+          : "border border-border bg-grouped-card",
       )}
       disabled={props.disabled}
       onPress={props.onPress}
diff --git a/apps/mobile/src/features/settings/components/AutoSettleDaysField.ios.tsx b/apps/mobile/src/features/settings/components/AutoSettleDaysField.ios.tsx
index 2c77aa55571d..d7734f5a923c 100644
--- a/apps/mobile/src/features/settings/components/AutoSettleDaysField.ios.tsx
+++ b/apps/mobile/src/features/settings/components/AutoSettleDaysField.ios.tsx
@@ -44,7 +44,7 @@ export function AutoSettleDaysField(props: AutoSettleDaysFieldProps) {
               disabled(props.disabled),
               accessibilityLabel(`Days before auto-settle: ${props.value}`),
               frame({ minWidth: 64, minHeight: 44 }),
-              foregroundStyle(colors["--color-primary"]),
+              foregroundStyle(colors["--color-primary-text"]),
               font({ size: appearance.baseFontSize }),
             ]}
           >
@@ -78,7 +78,7 @@ export function AutoSettleDaysField(props: AutoSettleDaysFieldProps) {
               <Button
                 label="Cancel"
                 onPress={() => setOpen(false)}
-                modifiers={[foregroundStyle(colors["--color-primary"])]}
+                modifiers={[foregroundStyle(colors["--color-primary-text"])]}
               />
               <Button
                 label="Done"
@@ -86,7 +86,7 @@ export function AutoSettleDaysField(props: AutoSettleDaysFieldProps) {
                   setOpen(false);
                   if (!props.disabled && draft !== props.value) props.onValueChange(draft);
                 }}
-                modifiers={[foregroundStyle(colors["--color-primary"])]}
+                modifiers={[foregroundStyle(colors["--color-primary-text"])]}
               />
             </HStack>
           </VStack>
diff --git a/apps/mobile/src/features/settings/components/SettingsActionRow.tsx b/apps/mobile/src/features/settings/components/SettingsActionRow.tsx
index 9cf58effe506..98d5033ccbe3 100644
--- a/apps/mobile/src/features/settings/components/SettingsActionRow.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsActionRow.tsx
@@ -31,6 +31,7 @@ export function SettingsActionRow(props: {
   if (Platform.OS === "android") {
     return (
       <MaterialListRow
+        className="bg-grouped-card"
         title={props.label}
         titleClassName={textClassName}
         leading={icon}
diff --git a/apps/mobile/src/features/settings/components/SettingsProjectOverridesSection.tsx b/apps/mobile/src/features/settings/components/SettingsProjectOverridesSection.tsx
index c364e09e36e9..b89ab845434a 100644
--- a/apps/mobile/src/features/settings/components/SettingsProjectOverridesSection.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsProjectOverridesSection.tsx
@@ -23,7 +23,7 @@ export function SettingsProjectOverridesSection(props: {
             onPress={props.onClear}
             className="px-2 py-2 active:opacity-70"
           >
-            <Text className="text-sm font-t3-medium text-primary">Use defaults</Text>
+            <Text className="text-sm font-t3-medium text-primary-text">Use defaults</Text>
           </Pressable>
         ) : null}
       </View>
diff --git a/apps/mobile/src/features/settings/components/SettingsRow.tsx b/apps/mobile/src/features/settings/components/SettingsRow.tsx
index 2aa457ceecaf..53bf1b55b452 100644
--- a/apps/mobile/src/features/settings/components/SettingsRow.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsRow.tsx
@@ -24,6 +24,7 @@ export function SettingsRow(props: {
   if (Platform.OS === "android") {
     return (
       <MaterialListRow
+        className="bg-grouped-card"
         title={props.label}
         subtitle={props.valuePosition === "trailing" ? undefined : props.value}
         accessibilityLabel={[props.label, props.value].filter(Boolean).join(", ")}
diff --git a/apps/mobile/src/features/settings/components/SettingsSection.tsx b/apps/mobile/src/features/settings/components/SettingsSection.tsx
index 05276b767fc4..082fea82475e 100644
--- a/apps/mobile/src/features/settings/components/SettingsSection.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsSection.tsx
@@ -15,7 +15,7 @@ export function SettingsSection(props: {
           <Text
             className={
               Platform.OS === "android"
-                ? "px-4 text-sm font-t3-medium text-primary"
+                ? "px-4 text-sm font-t3-medium text-primary-text"
                 : "px-2 text-sm font-t3-medium text-foreground-muted"
             }
           >
@@ -27,8 +27,8 @@ export function SettingsSection(props: {
       <View
         className={
           Platform.OS === "android"
-            ? "overflow-hidden rounded-[28px] bg-card"
-            : "overflow-hidden rounded-[24px] border-continuous bg-card"
+            ? "overflow-hidden rounded-[28px] bg-grouped-card"
+            : "overflow-hidden rounded-[24px] border-continuous bg-grouped-card"
         }
       >
         {props.children}
diff --git a/apps/mobile/src/features/terminal/terminalTheme.test.ts b/apps/mobile/src/features/terminal/terminalTheme.test.ts
index 478ddc96d960..bf29f45abf11 100644
--- a/apps/mobile/src/features/terminal/terminalTheme.test.ts
+++ b/apps/mobile/src/features/terminal/terminalTheme.test.ts
@@ -6,20 +6,20 @@ import { themeColorToNativeColor } from "../../lib/mobileTheme";
 import { buildGhosttyThemeConfig, getMobileTerminalTheme } from "./terminalTheme";
 
 describe("getMobileTerminalTheme", () => {
-  it("preserves the default light terminal palette", () => {
+  it("uses the shared default light terminal colors", () => {
     expect(getMobileTerminalTheme("t3-code", "light")).toMatchObject({
-      background: "#f2f2f7",
-      foreground: "#6C6C71",
-      cursorForeground: "#009fff",
-      cursorBackground: "#f2f2f7",
+      background: "#fcfcfc",
+      foreground: "#27272a",
+      cursorForeground: "#26384e",
+      cursorBackground: "#fcfcfc",
     });
   });
 
-  it("preserves the default dark terminal palette", () => {
+  it("uses the shared default dark terminal colors", () => {
     expect(getMobileTerminalTheme("t3-code", "dark")).toMatchObject({
       background: "#0a0a0a",
-      foreground: "#adadb1",
-      cursorForeground: "#009fff",
+      foreground: "#f5f5f5",
+      cursorForeground: "#b4cbff",
       cursorBackground: "#0a0a0a",
     });
   });
@@ -48,8 +48,8 @@ describe("buildGhosttyThemeConfig", () => {
     const config = buildGhosttyThemeConfig(getMobileTerminalTheme("t3-code", "dark"));
 
     expect(config).toContain("background = #0a0a0a");
-    expect(config).toContain("foreground = #adadb1");
-    expect(config).toContain("cursor-color = #009fff");
+    expect(config).toContain("foreground = #f5f5f5");
+    expect(config).toContain("cursor-color = #b4cbff");
     expect(config).toContain("palette = 0=#141415");
     expect(config).toContain("palette = 15=#c6c6c8");
     expect(config.endsWith("\n")).toBe(true);
diff --git a/apps/mobile/src/features/terminal/terminalTheme.ts b/apps/mobile/src/features/terminal/terminalTheme.ts
index f7d96b668615..450efd1c5881 100644
--- a/apps/mobile/src/features/terminal/terminalTheme.ts
+++ b/apps/mobile/src/features/terminal/terminalTheme.ts
@@ -1,10 +1,5 @@
 import {
-  BUILT_IN_THEMES,
-  T3_CHAT_THEME,
-  getThemeColorsForAppearance,
-} from "@t3tools/shared/themePalettes";
-
-import {
+  getMobileThemeColors,
   getMobileThemeVariables,
   themeColorToNativeColor,
   type MobileThemeId,
@@ -44,12 +39,12 @@ type TerminalPalette = readonly [
 
 const PIERRE_LIGHT_THEME: TerminalTheme = {
   // Pierre terminal palette with the app's shared screen background.
-  background: "#f2f2f7",
+  background: "#fcfcfc",
   foreground: "#6C6C71",
   mutedForeground: "#8E8E95",
   border: "#eeeeef",
   cursorForeground: "#009fff",
-  cursorBackground: "#f2f2f7",
+  cursorBackground: "#fcfcfc",
   palette: [
     "#1F1F21",
     "#ff2e3f",
@@ -107,11 +102,9 @@ export function getMobileTerminalTheme(
   scheme: TerminalAppearanceScheme,
 ): TerminalTheme {
   const base = getPierreTerminalTheme(scheme);
-  if (themeId === "t3-code" || themeId === "material-you") return base;
-
-  const theme = BUILT_IN_THEMES.find((candidate) => candidate.id === themeId) ?? T3_CHAT_THEME;
-  const palette = getThemeColorsForAppearance(theme, scheme) ?? theme.colors;
-  const colors = getMobileThemeVariables(themeId, scheme);
+  const paletteId = themeId === "material-you" ? "t3-code" : themeId;
+  const palette = getMobileThemeColors(paletteId, scheme);
+  const colors = getMobileThemeVariables(paletteId, scheme);
   const background = themeColorToNativeColor(palette.terminalBackground);
   return {
     ...base,
diff --git a/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx b/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx
index 5fc60bc05dfd..d3ced2ce53c6 100644
--- a/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx
+++ b/apps/mobile/src/features/threads/CustomSnoozeSheet.shared.tsx
@@ -31,7 +31,7 @@ export function CustomSnoozeSheet(props: {
   return (
     <Modal visible transparent animationType="fade" onRequestClose={props.onClose}>
       <KeyboardAvoidingView
-        className="flex-1 items-center justify-center bg-black/40 px-6"
+        className="flex-1 items-center justify-center bg-backdrop px-6"
         behavior={Platform.OS === "ios" ? "padding" : undefined}
       >
         <ScrollView
diff --git a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
index b677a9353eba..7edb07f4e3d8 100644
--- a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
+++ b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
@@ -66,7 +66,7 @@ function SelectionRow(props: {
         }
         trailing={
           props.selected ? (
-            <SymbolView name="checkmark" size={20} tintColorClassName="accent-primary" />
+            <SymbolView name="checkmark" size={20} tintColorClassName="accent-focus" />
           ) : null
         }
         accessibilityRole="radio"
@@ -482,9 +482,9 @@ export function NewTaskBranchPickerRouteScreen() {
             autoCorrect={false}
             accessibilityLabel="Find a branch"
             className="h-12 rounded-full border border-input-border bg-input px-4 font-sans text-base text-foreground"
-            selectionColorClassName="accent-primary/32"
-            cursorColorClassName="accent-primary"
-            selectionHandleColorClassName="accent-primary"
+            selectionColorClassName="accent-focus/32"
+            cursorColorClassName="accent-focus"
+            selectionHandleColorClassName="accent-focus"
             onChangeText={flow.setBranchQuery}
             placeholder="Find a branch"
             placeholderTextColorClassName="accent-placeholder"
diff --git a/apps/mobile/src/features/threads/ThreadArrangementSheet.tsx b/apps/mobile/src/features/threads/ThreadArrangementSheet.tsx
index 5c9eb7e54a56..65816f3873f9 100644
--- a/apps/mobile/src/features/threads/ThreadArrangementSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadArrangementSheet.tsx
@@ -379,7 +379,7 @@ export function ThreadArrangementSheet(props: { onClose: () => void }) {
               onPress={props.onClose}
               className="min-h-11 justify-center px-3"
             >
-              <Text className="text-base text-primary">Done</Text>
+              <Text className="text-base text-primary-text">Done</Text>
             </Pressable>
           </View>
           <Text className="px-5 pb-3 text-sm text-foreground-muted">
diff --git a/apps/mobile/src/features/threads/ThreadComposer.tsx b/apps/mobile/src/features/threads/ThreadComposer.tsx
index 7fd517c4f3bc..c747a4ed8171 100644
--- a/apps/mobile/src/features/threads/ThreadComposer.tsx
+++ b/apps/mobile/src/features/threads/ThreadComposer.tsx
@@ -244,12 +244,8 @@ export function ComposerSurface(props: {
     >
       <AnimatedGlassSurface
         chrome="none"
-        fallbackColor={
-          Platform.OS === "android" ? colors["--color-composer-surface"] : colors["--color-card"]
-        }
-        fallbackClassName={
-          Platform.OS === "android" ? "border border-composer-border" : "border border-border"
-        }
+        fallbackColor={colors["--color-composer-surface"]}
+        fallbackClassName="border border-composer-border"
         glassEffectStyle="regular"
         // The composer is a passive material containing interactive controls.
         // Keep native glass out of the interactive content's layout path.
diff --git a/apps/mobile/src/features/threads/ThreadCreationFailedCard.tsx b/apps/mobile/src/features/threads/ThreadCreationFailedCard.tsx
index dce4cb3797b7..436475db601a 100644
--- a/apps/mobile/src/features/threads/ThreadCreationFailedCard.tsx
+++ b/apps/mobile/src/features/threads/ThreadCreationFailedCard.tsx
@@ -13,14 +13,14 @@ export function ThreadCreationFailedCard(props: {
   readonly onEditTask: () => void;
 }) {
   return (
-    <View className="gap-2.5 rounded-[20px] border border-adaptive-neutral-200-white-a6 bg-adaptive-neutral-100-900 p-4">
-      <Text className="font-t3-bold text-2xs uppercase tracking-[1.1px] text-adaptive-rose-700-300">
+    <View className="gap-2.5 rounded-[20px] border border-border-subtle bg-card-alt p-4">
+      <Text className="font-t3-bold text-2xs uppercase tracking-[1.1px] text-danger-foreground">
         Could not start task
       </Text>
-      <Text className="font-sans text-sm leading-normal text-adaptive-neutral-600-400">
+      <Text className="font-sans text-sm leading-normal text-foreground-secondary">
         {props.reason}
       </Text>
-      <Text className="font-sans text-xs leading-normal text-adaptive-neutral-600-400">
+      <Text className="font-sans text-xs leading-normal text-foreground-secondary">
         Your prompt was kept in the project draft.
       </Text>
       <View className="flex-row">
diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index a860612cb922..20848cd2ad10 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -888,7 +888,7 @@ function MarkdownCodeBlock(props: {
       >
         <NativeText
           selectable
-          selectionColorClassName={Platform.OS === "android" ? "accent-primary/32" : undefined}
+          selectionColorClassName={Platform.OS === "android" ? "accent-focus/32" : undefined}
           className="font-mono"
           style={{
             color: props.textColor,
@@ -1400,7 +1400,7 @@ function renderFeedEntry(
         accessibilityState={{ expanded: entry.expanded }}
         onPress={() => props.onToggleTurnFold(entry.turnId)}
         hitSlop={4}
-        className="mb-1 min-h-11 flex-row items-center gap-2 border-b border-adaptive-neutral-200-a80-white-a8 px-2"
+        className="mb-1 min-h-11 flex-row items-center gap-2 border-b border-border-subtle px-2"
         style={{
           minHeight: Math.max(TURN_FOLD_HEIGHT - 3.5, props.workRowSizing.estimatedRowHeight),
         }}
@@ -1467,7 +1467,7 @@ function renderFeedEntry(
         accessibilityLabel={label}
         className="mb-3 flex-row items-center gap-3 px-1 py-1"
       >
-        <View className="h-px flex-1 bg-adaptive-neutral-200-a80-white-a8" />
+        <View className="h-px flex-1 bg-subtle" />
         <View className="shrink-0 flex-row items-center gap-1.5">
           <SymbolView
             name="arrow.down.right.and.arrow.up.left"
@@ -1477,7 +1477,7 @@ function renderFeedEntry(
           />
           <Text className="font-t3-medium text-xs text-foreground-muted">{label}</Text>
         </View>
-        <View className="h-px flex-1 bg-adaptive-neutral-200-a80-white-a8" />
+        <View className="h-px flex-1 bg-subtle" />
       </View>
     );
   }
@@ -1599,8 +1599,8 @@ function renderFeedEntry(
                       mimeType={attachment.mimeType}
                       className={
                         inlineAttachmentIds.size
-                          ? "h-24 w-24 rounded-[14px] bg-white/15"
-                          : "aspect-[1.3] w-full rounded-[14px] bg-white/15"
+                          ? "h-24 w-24 rounded-[14px] bg-user-bubble-foreground/15"
+                          : "aspect-[1.3] w-full rounded-[14px] bg-user-bubble-foreground/15"
                       }
                       onPressPreview={props.onPressPreview}
                     />
@@ -1636,7 +1636,7 @@ function renderFeedEntry(
             ) : null}
           </View>
           <View className="mt-1 flex-row items-center justify-end gap-1 pr-0.5">
-            <Text className="font-t3-medium text-xs tabular-nums text-adaptive-neutral-600-400">
+            <Text className="font-t3-medium text-xs tabular-nums text-foreground-secondary">
               {entry.pendingMessage && !entry.acknowledged ? "Pending" : timestampLabel}
             </Text>
             {entry.pendingMessage &&
@@ -1715,7 +1715,7 @@ function renderFeedEntry(
               attachmentId={attachment.id}
               name={attachment.name}
               mimeType={attachment.mimeType}
-              className="mt-1.5 aspect-[1.3] w-full rounded-[18px] bg-adaptive-neutral-200-800"
+              className="mt-1.5 aspect-[1.3] w-full rounded-[18px] bg-subtle-strong"
               onPressPreview={props.onPressPreview}
             />
           ) : isFileAttachment(attachment) ? (
@@ -1739,7 +1739,7 @@ function renderFeedEntry(
               buttonSize={28}
               iconSize={13}
             />
-            <Text className="font-t3-medium text-xs tabular-nums text-adaptive-neutral-600-400">
+            <Text className="font-t3-medium text-xs tabular-nums text-foreground-secondary">
               {timestampLabel}
             </Text>
           </View>
diff --git a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
index f6ea5dcf48ea..bf957ad54195 100644
--- a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
+++ b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
@@ -152,7 +152,7 @@ function ThreadNavigationSidebarPane(
   props: ThreadNavigationSidebarProps & { readonly nativeChrome: boolean },
 ) {
   const { themeVariables: materialTheme } = useAppearancePreferences();
-  const screenColor = materialTheme["--color-screen"];
+  const drawerColor = materialTheme["--color-drawer"];
 
   const insets = useSafeAreaInsets();
   const projects = useProjects();
@@ -935,7 +935,7 @@ function ThreadNavigationSidebarPane(
                 }),
               )}
               searchQuery={props.searchQuery}
-              pane={Platform.OS === "android" ? "screen" : "sidebar"}
+              pane="sidebar"
               selected={
                 scopedThreadKey(thread.environmentId, thread.id) === props.selectedThreadKey
               }
@@ -976,7 +976,7 @@ function ThreadNavigationSidebarPane(
               disabled={!shelfPreferencesLoaded}
               expanded={item.expanded}
               onToggle={toggleSnoozedShelf}
-              pane={Platform.OS === "android" ? "screen" : "sidebar"}
+              pane="sidebar"
             />
           );
         case "v2-settled-shelf":
@@ -986,17 +986,21 @@ function ThreadNavigationSidebarPane(
               disabled={!shelfPreferencesLoaded}
               expanded={item.expanded}
               onToggle={toggleSettledShelf}
-              pane={Platform.OS === "android" ? "screen" : "sidebar"}
+              pane="sidebar"
             />
           );
         case "v2-show-more":
           return (
-            <ThreadListV2ShowMoreRow hiddenCount={item.hiddenCount} onPress={showMoreSettled} />
+            <ThreadListV2ShowMoreRow
+              pane="sidebar"
+              hiddenCount={item.hiddenCount}
+              onPress={showMoreSettled}
+            />
           );
         case "header":
           return (
             <ThreadListGroupHeader
-              variant={Platform.OS === "android" ? "compact" : "sidebar"}
+              variant="sidebar"
               collapsed={item.collapsed}
               isFirst={item.isFirst}
               groupKey={item.group.key}
@@ -1014,7 +1018,7 @@ function ThreadNavigationSidebarPane(
         case "pending-task":
           return (
             <PendingTaskListRow
-              variant={Platform.OS === "android" ? "compact" : "sidebar"}
+              variant="sidebar"
               pendingTask={item.pendingTask}
               environmentLabel={
                 savedConnectionsById[item.pendingTask.environmentId]?.environmentLabel ?? null
@@ -1064,7 +1068,7 @@ function ThreadNavigationSidebarPane(
         case "show-more":
           return (
             <ThreadListShowMoreRow
-              variant={Platform.OS === "android" ? "compact" : "sidebar"}
+              variant="sidebar"
               hiddenCount={item.hiddenCount}
               canShowLess={item.canShowLess}
               groupKey={item.groupKey}
@@ -1168,8 +1172,8 @@ function ThreadNavigationSidebarPane(
     <Text
       className={
         Platform.OS === "android"
-          ? "px-4 py-4 text-center text-sm text-foreground-muted"
-          : "px-2 py-4 text-sm text-foreground-muted"
+          ? "px-4 py-4 text-center text-sm text-drawer-foreground-muted"
+          : "px-2 py-4 text-sm text-drawer-foreground-muted"
       }
     >
       {catalogState.isLoadingConnections
@@ -1277,7 +1281,7 @@ function ThreadNavigationSidebarPane(
                 marginTop: stickyHeaderHeight,
                 marginHorizontal: 4,
                 paddingBottom: insets.bottom,
-                backgroundColor: screenColor,
+                backgroundColor: drawerColor,
                 borderTopLeftRadius: 28,
                 borderTopRightRadius: 28,
                 overflow: "hidden",
@@ -1374,7 +1378,7 @@ function ThreadNavigationSidebarPane(
             <SymbolView
               name="magnifyingglass"
               size={15}
-              tintColorClassName="accent-foreground-muted"
+              tintColorClassName="accent-drawer-foreground-muted"
               type="monochrome"
             />
             <TextInput
@@ -1390,7 +1394,7 @@ function ThreadNavigationSidebarPane(
               cursorColorClassName={undefined}
               selectionHandleColorClassName={undefined}
               returnKeyType="search"
-              className="h-[34px] flex-1 px-0 py-0 font-sans text-base text-foreground"
+              className="h-[34px] flex-1 px-0 py-0 font-sans text-base text-drawer-foreground"
               value={props.searchQuery}
             />
           </View>
diff --git a/apps/mobile/src/features/threads/ThreadSettingsRows.android.tsx b/apps/mobile/src/features/threads/ThreadSettingsRows.android.tsx
index 98b414ef55d3..52bee64271e4 100644
--- a/apps/mobile/src/features/threads/ThreadSettingsRows.android.tsx
+++ b/apps/mobile/src/features/threads/ThreadSettingsRows.android.tsx
@@ -12,7 +12,7 @@ export function ModelRow(props: ModelRowProps) {
       {...props}
       labelNumberOfLines={2}
       minimumHeight={56}
-      selectedClassName={props.selected ? "bg-thread-selected" : undefined}
+      selectedClassName={props.selected ? "bg-secondary" : undefined}
       leadingSelection={<MaterialRadioIndicator selected={props.selected} />}
     />
   );
diff --git a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
index 7be5dc4bbdbc..dc989a4de2d9 100644
--- a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
@@ -896,9 +896,9 @@ function ThreadSettingsMainContent(props: {
                   onChangeText={session.setSearchQuery}
                   placeholder="Find a model"
                   placeholderTextColorClassName="accent-placeholder"
-                  selectionColorClassName="accent-primary/32"
-                  cursorColorClassName="accent-primary"
-                  selectionHandleColorClassName="accent-primary"
+                  selectionColorClassName="accent-focus/32"
+                  cursorColorClassName="accent-focus"
+                  selectionHandleColorClassName="accent-focus"
                   value={session.searchQuery}
                 />
                 {session.searchQuery.length > 0 ? (
diff --git a/apps/mobile/src/features/threads/floating-working-control.tsx b/apps/mobile/src/features/threads/floating-working-control.tsx
index d124b1386768..9542b510b43f 100644
--- a/apps/mobile/src/features/threads/floating-working-control.tsx
+++ b/apps/mobile/src/features/threads/floating-working-control.tsx
@@ -213,7 +213,7 @@ export function FloatingWorkingControl(props: {
         <View pointerEvents="box-none" className="flex-row items-center gap-4">
           <Animated.View
             pointerEvents={capsuleInteractive ? "box-none" : "none"}
-            className="h-11 items-center justify-center overflow-hidden rounded-full border border-border bg-card shadow-md shadow-black/10"
+            className="h-11 items-center justify-center overflow-hidden rounded-full border border-border bg-glass-fallback shadow-md shadow-black/10"
             style={capsuleStyle}
           >
             {capsuleContent}
@@ -228,7 +228,7 @@ export function FloatingWorkingControl(props: {
             <ControlPill
               accessibilityLabel="Scroll to end"
               activateOnPressIn
-              className="h-11 w-11 border border-border bg-card shadow-md shadow-black/10"
+              className="h-11 w-11 border border-border bg-glass-fallback shadow-md shadow-black/10"
               disabled={!props.showScrollToEnd}
               icon={{ ios: "chevron.down", android: "keyboard_arrow_down" }}
               onPress={props.onScrollToEnd}
@@ -248,7 +248,7 @@ export function FloatingWorkingControl(props: {
         <ControlPill
           accessibilityLabel="Scroll to end"
           activateOnPressIn
-          className="h-11 w-11 border border-border bg-card shadow-md shadow-black/10"
+          className="h-11 w-11 border border-border bg-glass-fallback shadow-md shadow-black/10"
           icon={{ ios: "chevron.down", android: "keyboard_arrow_down" }}
           onPress={props.onScrollToEnd}
         />
diff --git a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
index 7a64ac562b61..7f70a39d9372 100644
--- a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
@@ -164,7 +164,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
                     <Text
                       className={
                         Platform.OS === "android"
-                          ? "text-primary text-sm font-t3-medium"
+                          ? "text-primary-text text-sm font-t3-medium"
                           : "text-foreground text-2xs font-t3-bold uppercase"
                       }
                     >
@@ -183,7 +183,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
                   <Text
                     className={
                       Platform.OS === "android"
-                        ? "text-primary text-sm font-t3-medium"
+                        ? "text-primary-text text-sm font-t3-medium"
                         : "text-foreground text-2xs font-t3-bold uppercase"
                     }
                   >
@@ -204,10 +204,12 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
                     <Text className="text-foreground flex-1 text-sm font-medium" numberOfLines={1}>
                       {file.path}
                     </Text>
-                    <Text className="text-xs font-t3-bold text-emerald-500">
+                    <Text className="text-xs font-t3-bold text-adaptive-emerald-700-300">
                       +{file.insertions}
                     </Text>
-                    <Text className="text-xs font-t3-bold text-rose-500">-{file.deletions}</Text>
+                    <Text className="text-xs font-t3-bold text-adaptive-rose-700-300">
+                      -{file.deletions}
+                    </Text>
                   </View>
                 ))}
                 {selectedFiles.length > selectedFilePreview.length ? (
@@ -286,10 +288,10 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
                           ) : null}
                         </View>
                         <View className="items-end gap-1">
-                          <Text className="text-xs font-t3-bold text-emerald-500">
+                          <Text className="text-xs font-t3-bold text-adaptive-emerald-700-300">
                             +{file.insertions}
                           </Text>
-                          <Text className="text-xs font-t3-bold text-rose-500">
+                          <Text className="text-xs font-t3-bold text-adaptive-rose-700-300">
                             -{file.deletions}
                           </Text>
                         </View>
diff --git a/apps/mobile/src/features/threads/sidebar-navigation-shell.tsx b/apps/mobile/src/features/threads/sidebar-navigation-shell.tsx
index e9e204e47770..1198b06cb6a4 100644
--- a/apps/mobile/src/features/threads/sidebar-navigation-shell.tsx
+++ b/apps/mobile/src/features/threads/sidebar-navigation-shell.tsx
@@ -52,7 +52,7 @@ const SidebarStack = createNativeStackNavigator();
  * navigation hooks used for header configuration inside the pane.
  */
 export function SidebarNavigationShell(props: { readonly children: ReactNode }) {
-  const navigationTheme = useMobileNavigationTheme();
+  const navigationTheme = useMobileNavigationTheme("sidebar");
 
   return (
     <NavigationIndependentTree>
diff --git a/apps/mobile/src/features/threads/thread-list-items.tsx b/apps/mobile/src/features/threads/thread-list-items.tsx
index 5ab2251875ce..04d30a26a901 100644
--- a/apps/mobile/src/features/threads/thread-list-items.tsx
+++ b/apps/mobile/src/features/threads/thread-list-items.tsx
@@ -157,7 +157,7 @@ export const ThreadListGroupHeader = memo(function ThreadListGroupHeader(props:
           className={
             compact
               ? "flex-shrink text-base font-t3-bold tracking-[0.2px] text-foreground-muted"
-              : "flex-shrink text-sm font-t3-bold tracking-[0.2px] text-foreground-muted"
+              : "flex-shrink text-sm font-t3-bold tracking-[0.2px] text-drawer-foreground-muted"
           }
           numberOfLines={1}
         >
@@ -167,7 +167,7 @@ export const ThreadListGroupHeader = memo(function ThreadListGroupHeader(props:
           className={
             compact
               ? "flex-1 text-sm font-t3-medium text-foreground-tertiary"
-              : "flex-1 text-xs font-t3-medium text-foreground-tertiary"
+              : "flex-1 text-xs font-t3-medium text-drawer-foreground-muted"
           }
         >
           {props.threadCount}
@@ -241,7 +241,7 @@ export const ThreadListShowMoreRow = memo(function ThreadListShowMoreRow(props:
           className={
             compact
               ? "text-sm font-t3-medium text-foreground-muted"
-              : "text-xs font-t3-medium text-foreground-muted"
+              : "text-xs font-t3-medium text-drawer-foreground-muted"
           }
         >
           {label}
@@ -320,7 +320,14 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
     </View>
   ) : (
     <View className="rounded-full bg-subtle px-1.5 py-0.5">
-      <Text className="text-3xs font-t3-bold text-foreground-muted">Pending</Text>
+      <Text
+        className={cn(
+          "text-3xs font-t3-bold text-foreground-muted",
+          !compact && "text-drawer-foreground-muted",
+        )}
+      >
+        Pending
+      </Text>
     </View>
   );
 
@@ -330,21 +337,21 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
         <SymbolView
           name={isDraft ? "square.and.pencil" : "tray.and.arrow.up"}
           size={10}
-          tintColorClassName={compact ? "accent-icon-subtle" : "accent-foreground-muted"}
+          tintColorClassName={compact ? "accent-icon-subtle" : "accent-drawer-foreground-muted"}
           type="monochrome"
         />
         {props.environmentLabel && props.environmentMachine ? (
           <EnvironmentMachineSymbol
             kind={props.environmentMachine}
             size={compact ? 12 : 10}
-            tintColorClassName={compact ? "accent-icon-subtle" : "accent-foreground-muted"}
+            tintColorClassName={compact ? "accent-icon-subtle" : "accent-drawer-foreground-muted"}
           />
         ) : null}
         <Text
           className={
             compact
               ? "shrink text-sm text-foreground-muted"
-              : "shrink text-xs text-foreground-muted"
+              : "shrink text-xs text-drawer-foreground-muted"
           }
           numberOfLines={1}
         >
@@ -369,13 +376,26 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
       <View className="pr-[18px] pt-[10px]" style={{ paddingLeft: THREAD_LIST_COMPACT_INSET }}>
         <View className={cn("gap-[3px] pb-[10px]", !props.isLast && "border-b border-separator")}>
           <View className="flex-row items-center justify-between gap-2">
-            <Text className="flex-1 text-lg font-t3-bold text-foreground" numberOfLines={1}>
+            <Text
+              className={cn(
+                "flex-1 text-lg font-t3-bold text-foreground",
+                !compact && "text-drawer-foreground",
+              )}
+              numberOfLines={1}
+            >
               {pendingTask.title}
             </Text>
             <View className="flex-row items-center gap-2">
               {statusPill}
               {timestamp !== null ? (
-                <Text className="text-base tabular-nums text-foreground-tertiary">{timestamp}</Text>
+                <Text
+                  className={cn(
+                    "text-base tabular-nums text-foreground-tertiary",
+                    !compact && "text-drawer-foreground-muted",
+                  )}
+                >
+                  {timestamp}
+                </Text>
               ) : null}
               <SymbolView
                 name="chevron.right"
@@ -395,6 +415,7 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
       accessibilityHint={accessibilityHint}
       accessibilityLabel={pendingTask.title}
       accessibilityRole="button"
+      interactionClassName="bg-thread-hover"
       onPress={() => onSelectPendingTask(pendingTask)}
       style={{
         borderRadius: SIDEBAR_ROW_RADIUS,
@@ -406,13 +427,22 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
     >
       <View className="gap-[3px]">
         <View className="flex-row items-center justify-between gap-2">
-          <Text className="flex-1 text-base font-t3-medium text-foreground" numberOfLines={1}>
+          <Text
+            className="flex-1 text-base font-t3-medium text-drawer-foreground"
+            numberOfLines={1}
+          >
             {pendingTask.title}
           </Text>
           <View className="flex-row items-center gap-2">
             {statusPill}
             {timestamp !== null ? (
-              <Text className="text-xs tabular-nums text-foreground-muted" numberOfLines={1}>
+              <Text
+                className={cn(
+                  "text-xs tabular-nums text-foreground-muted",
+                  !compact && "text-drawer-foreground-muted",
+                )}
+                numberOfLines={1}
+              >
                 {timestamp}
               </Text>
             ) : null}
@@ -477,10 +507,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
   const theme = useUniwindTheme();
   const screenColor = theme["--color-screen"];
   const drawerColor = theme["--color-drawer"];
-  const selectedBackgroundColor = theme["--color-user-bubble"];
-  const materialSelectedBackgroundColor = theme["--color-thread-selected"];
-  const materialSelectedForegroundColor = theme["--color-thread-selected-foreground"];
-  const selectedForegroundColor = theme["--color-user-bubble-foreground"];
+  const selectedBackgroundColor = theme["--color-thread-selected"];
 
   const {
     thread,
@@ -508,24 +535,6 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
   );
 
   const backgroundColor = compact ? screenColor : drawerColor;
-  const effectiveSelectedBackground =
-    Platform.OS === "android" ? materialSelectedBackgroundColor : selectedBackgroundColor;
-  const effectiveSelectedForeground =
-    Platform.OS === "android" ? materialSelectedForegroundColor : selectedForegroundColor;
-  const effectiveStatus =
-    visuallySelected && status
-      ? {
-          ...status,
-          pillClassName:
-            Platform.OS === "android"
-              ? "bg-thread-selected-foreground/20"
-              : "bg-user-bubble-foreground/20",
-          textClassName:
-            Platform.OS === "android"
-              ? "text-thread-selected-foreground"
-              : "text-user-bubble-foreground",
-        }
-      : status;
 
   const handleDelete = useCallback(() => onDeleteThread(thread), [onDeleteThread, thread]);
   const handleArchive = useCallback(() => onArchiveThread(thread), [onArchiveThread, thread]);
@@ -580,11 +589,9 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
     [handleArchive, handleDelete, handleRegenerateTitle, handleRename, onNewThreadOnBranch, thread],
   );
 
-  const statusPill = effectiveStatus ? (
-    <View className={`${effectiveStatus.pillClassName} rounded-full px-1.5 py-0.5`}>
-      <Text className={`text-3xs font-t3-bold ${effectiveStatus.textClassName}`}>
-        {effectiveStatus.label}
-      </Text>
+  const statusPill = status ? (
+    <View className={`${status.pillClassName} rounded-full px-1.5 py-0.5`}>
+      <Text className={`text-3xs font-t3-bold ${status.textClassName}`}>{status.label}</Text>
     </View>
   ) : null;
 
@@ -601,10 +608,8 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
                   compact
                     ? "accent-icon-subtle"
                     : selected
-                      ? Platform.OS === "android"
-                        ? "accent-thread-selected-foreground-muted"
-                        : "accent-user-bubble-foreground-muted"
-                      : "accent-foreground-muted"
+                      ? "accent-thread-selected-foreground-muted"
+                      : "accent-drawer-foreground-muted"
                 }
               />
             ) : null}
@@ -613,10 +618,10 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
                 "shrink",
                 compact ? "text-sm" : "text-xs",
                 visuallySelected
-                  ? Platform.OS === "android"
-                    ? "text-thread-selected-foreground-muted"
-                    : "text-user-bubble-foreground-muted"
-                  : "text-foreground-muted",
+                  ? "text-thread-selected-foreground-muted"
+                  : compact
+                    ? "text-foreground-muted"
+                    : "text-drawer-foreground-muted",
               )}
               numberOfLines={1}
             >
@@ -633,30 +638,16 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
               <SymbolView
                 name="square.3.layers.3d"
                 size={compact ? 13 : 11}
-                tintColor={
-                  visuallySelected
-                    ? String(effectiveSelectedForeground)
-                    : pullRequestTintColor(pr, colorScheme)
-                }
+                tintColor={pullRequestTintColor(pr, colorScheme)}
               />
             ) : (
               <PullRequestIcon
                 size={compact ? 13 : 11}
-                color={
-                  visuallySelected
-                    ? String(effectiveSelectedForeground)
-                    : pullRequestTintColor(pr, colorScheme)
-                }
+                color={pullRequestTintColor(pr, colorScheme)}
               />
             )}
             <Text
-              className={`${compact ? "text-sm" : "text-xs"} font-t3-medium ${
-                visuallySelected
-                  ? Platform.OS === "android"
-                    ? "text-thread-selected-foreground"
-                    : "text-user-bubble-foreground"
-                  : pr.textClassName
-              }`}
+              className={`${compact ? "text-sm" : "text-xs"} font-t3-medium ${pr.textClassName}`}
             >
               {pr.label}
             </Text>
@@ -669,13 +660,8 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
     compact ? (
       <RowPressable
         key={`${thread.environmentId}:${thread.id}`}
-        interactionClassName={
-          visuallySelected
-            ? Platform.OS === "android"
-              ? "bg-thread-selected-foreground"
-              : "bg-user-bubble-foreground"
-            : "bg-primary"
-        }
+        interactionClassName="bg-row-hover"
+        interactionOpacity={visuallySelected ? 0 : 1}
         accessibilityHint="Swipe left for archive and delete actions"
         accessibilityLabel={threadAccessibilityLabel}
         accessibilityRole="button"
@@ -683,7 +669,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
         style={
           Platform.OS === "android"
             ? {
-                backgroundColor: visuallySelected ? effectiveSelectedBackground : backgroundColor,
+                backgroundColor: visuallySelected ? selectedBackgroundColor : backgroundColor,
                 borderRadius: 20,
               }
             : undefined
@@ -705,10 +691,10 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
                 className={cn(
                   "flex-1 text-lg font-t3-bold",
                   visuallySelected
-                    ? Platform.OS === "android"
-                      ? "text-thread-selected-foreground"
-                      : "text-user-bubble-foreground"
-                    : "text-foreground",
+                    ? "text-thread-selected-foreground"
+                    : compact
+                      ? "text-foreground"
+                      : "text-drawer-foreground",
                 )}
                 numberOfLines={1}
               >
@@ -723,10 +709,8 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
                   className={cn(
                     "text-base tabular-nums",
                     visuallySelected
-                      ? Platform.OS === "android"
-                        ? "text-thread-selected-foreground-muted"
-                        : "text-user-bubble-foreground-muted"
-                      : "text-foreground-tertiary",
+                      ? "text-thread-selected-foreground-muted"
+                      : "text-drawer-foreground-muted",
                   )}
                 >
                   {timestamp}
@@ -742,6 +726,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
             {props.searchMatch ? (
               <ThreadSearchMatchExcerpt
                 compact
+                sidebar={!compact}
                 match={props.searchMatch}
                 query={props.searchQuery ?? ""}
                 selected={visuallySelected}
@@ -754,13 +739,8 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
     ) : (
       <RowPressable
         key={`${thread.environmentId}:${thread.id}`}
-        interactionClassName={
-          visuallySelected
-            ? Platform.OS === "android"
-              ? "bg-thread-selected-foreground"
-              : "bg-user-bubble-foreground"
-            : "bg-primary"
-        }
+        interactionClassName="bg-thread-hover"
+        interactionOpacity={visuallySelected ? 0 : 1}
         accessibilityHint="Opens the thread"
         accessibilityLabel={threadAccessibilityLabel}
         accessibilityRole="button"
@@ -770,7 +750,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
           onSelectThread(thread);
         }}
         style={{
-          backgroundColor: visuallySelected ? effectiveSelectedBackground : backgroundColor,
+          backgroundColor: visuallySelected ? selectedBackgroundColor : backgroundColor,
           borderRadius: Platform.OS === "android" ? 20 : SIDEBAR_ROW_RADIUS,
           minHeight: 64,
           justifyContent: "center",
@@ -784,10 +764,10 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
               className={cn(
                 "flex-1 text-base font-t3-medium",
                 visuallySelected
-                  ? Platform.OS === "android"
-                    ? "text-thread-selected-foreground"
-                    : "text-user-bubble-foreground"
-                  : "text-foreground",
+                  ? "text-thread-selected-foreground"
+                  : compact
+                    ? "text-foreground"
+                    : "text-drawer-foreground",
               )}
               numberOfLines={1}
             >
@@ -802,10 +782,10 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
                 className={cn(
                   "text-xs tabular-nums",
                   visuallySelected
-                    ? Platform.OS === "android"
-                      ? "text-thread-selected-foreground-muted"
-                      : "text-user-bubble-foreground-muted"
-                    : "text-foreground-muted",
+                    ? "text-thread-selected-foreground-muted"
+                    : compact
+                      ? "text-foreground-muted"
+                      : "text-drawer-foreground-muted",
                 )}
                 numberOfLines={1}
               >
@@ -815,6 +795,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
           </View>
           {props.searchMatch ? (
             <ThreadSearchMatchExcerpt
+              sidebar={!compact}
               match={props.searchMatch}
               query={props.searchQuery ?? ""}
               selected={visuallySelected}
diff --git a/apps/mobile/src/features/threads/thread-list-v2-items.tsx b/apps/mobile/src/features/threads/thread-list-v2-items.tsx
index bd7b481c337f..797781d16a4c 100644
--- a/apps/mobile/src/features/threads/thread-list-v2-items.tsx
+++ b/apps/mobile/src/features/threads/thread-list-v2-items.tsx
@@ -64,7 +64,7 @@ const STATUS_LABEL_BY_STATUS: Partial<
   Record<ThreadListV2Status, { label: string; className: string }>
 > = {
   approval: { label: "Approval", className: "text-warning-foreground" },
-  input: { label: "Input", className: "text-foreground-secondary" },
+  input: { label: "Input", className: "text-adaptive-indigo-600-300" },
   working: { label: "Working", className: "text-adaptive-sky-600-400" },
   failed: { label: "Failed", className: "text-danger-foreground" },
 };
@@ -112,6 +112,7 @@ function ThreadListV2Section(props: {
   };
 }) {
   const snoozed = props.tone === "snoozed";
+  const sidebarPane = props.pane === "sidebar";
   const className = cn(
     "mb-1.5 mt-4 flex-row items-center gap-2.5",
     props.pane === "sidebar" ? "px-3" : "px-5",
@@ -121,17 +122,32 @@ function ThreadListV2Section(props: {
       <Text
         className={cn(
           "text-xs font-t3-medium",
-          snoozed ? "text-foreground-secondary" : "text-foreground-tertiary",
+          sidebarPane
+            ? "text-drawer-foreground-muted"
+            : snoozed
+              ? "text-foreground-secondary"
+              : "text-foreground-tertiary",
         )}
       >
         {props.label}
       </Text>
-      <View className={cn("h-px flex-1", snoozed ? "bg-primary/20" : "bg-border")} />
+      <View
+        className={cn(
+          "h-px flex-1",
+          snoozed ? "bg-primary/20" : sidebarPane ? "bg-drawer-border" : "bg-border",
+        )}
+      />
       {props.disclosure ? (
         <SymbolView
           name="chevron.down"
           size={10}
-          tintColorClassName={snoozed ? "accent-icon-muted" : "accent-foreground-muted"}
+          tintColorClassName={
+            sidebarPane
+              ? "accent-drawer-foreground-muted"
+              : snoozed
+                ? "accent-icon-muted"
+                : "accent-foreground-muted"
+          }
           type="monochrome"
           style={{ transform: [{ rotate: props.disclosure.expanded ? "180deg" : "0deg" }] }}
         />
@@ -209,6 +225,7 @@ export const ThreadListV2SettledShelfHeader = memo(function ThreadListV2SettledS
 });
 
 export const ThreadListV2ShowMoreRow = memo(function ThreadListV2ShowMoreRow(props: {
+  readonly pane?: "screen" | "sidebar";
   readonly hiddenCount: number;
   readonly onPress: () => void;
 }) {
@@ -220,7 +237,13 @@ export const ThreadListV2ShowMoreRow = memo(function ThreadListV2ShowMoreRow(pro
       className="mx-4 mt-2 items-center rounded-lg border border-dashed border-border py-2.5"
       style={({ pressed }) => ({ opacity: pressed ? 0.6 : 1 })}
     >
-      <Text className="text-xs font-t3-medium text-foreground-muted">
+      <Text
+        className={
+          props.pane === "sidebar"
+            ? "text-xs font-t3-medium text-drawer-foreground-muted"
+            : "text-xs font-t3-medium text-foreground-muted"
+        }
+      >
         Show more ({props.hiddenCount} settled hidden)
       </Text>
     </Pressable>
@@ -282,7 +305,13 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
             workspaceRoot={props.project.workspaceRoot}
           />
         ) : null}
-        <Text className="flex-1 text-sm font-t3-medium text-foreground-muted" numberOfLines={1}>
+        <Text
+          className={cn(
+            "flex-1 text-sm font-t3-medium text-foreground-muted",
+            sidebarPane && "text-drawer-foreground-muted",
+          )}
+          numberOfLines={1}
+        >
           {projectTitle}
         </Text>
         {isDraft ? (
@@ -296,33 +325,67 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
             <Text className="text-xs text-adaptive-amber-700-300">Draft</Text>
           </View>
         ) : (
-          <Text className="text-xs text-foreground-tertiary">Sends on reconnect</Text>
+          <Text
+            className={cn(
+              "text-xs text-foreground-tertiary",
+              sidebarPane && "text-drawer-foreground-muted",
+            )}
+          >
+            Sends on reconnect
+          </Text>
         )}
       </View>
       {/* One line, unlike the two an active row allows: a queued title is
           derived from the whole prompt rather than written as a title, so the
           second line is usually a stray word or emoji rather than meaning. */}
-      <Text className="mt-1 text-base font-t3-medium text-foreground" numberOfLines={1}>
+      <Text
+        className={cn(
+          "mt-1 text-base font-t3-medium text-foreground",
+          sidebarPane && "text-drawer-foreground",
+        )}
+        numberOfLines={1}
+      >
         {pendingTask.title}
       </Text>
       {branch || props.environmentLabel ? (
         <View className="mt-1 flex-row items-center gap-1">
-          <Text className="shrink text-xs text-foreground-muted" numberOfLines={1}>
+          <Text
+            className={cn(
+              "shrink text-xs text-foreground-muted",
+              sidebarPane && "text-drawer-foreground-muted",
+            )}
+            numberOfLines={1}
+          >
             {branch ? (
-              <Text className="text-xs text-foreground-muted" style={{ fontFamily: MONO_FONT }}>
+              <Text
+                className={cn(
+                  "text-xs text-foreground-muted",
+                  sidebarPane && "text-drawer-foreground-muted",
+                )}
+                style={{ fontFamily: MONO_FONT }}
+              >
                 {branch}
               </Text>
             ) : null}
             {branch && props.environmentLabel ? "  ·  " : null}
             {props.environmentLabel ? (
-              <Text className="text-xs text-foreground-tertiary">{props.environmentLabel}</Text>
+              <Text
+                className={cn(
+                  "text-xs text-foreground-tertiary",
+                  sidebarPane && "text-drawer-foreground-muted",
+                )}
+              >
+                {props.environmentLabel}
+              </Text>
             ) : null}
           </Text>
           {props.environmentLabel && props.environmentMachine ? (
             <EnvironmentMachineSymbol
               kind={props.environmentMachine}
               size={11}
-              tintColorClassName="accent-foreground-tertiary"
+              tintColorClassName={
+                sidebarPane ? "accent-drawer-foreground-muted" : "accent-foreground-tertiary"
+              }
             />
           ) : null}
         </View>
@@ -350,6 +413,7 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
           accessibilityRole="button"
           key={pendingTask.key}
           className={sidebarPane ? "bg-drawer" : "bg-screen"}
+          interactionClassName={sidebarPane ? "bg-thread-hover" : "bg-row-hover"}
           onPress={() => onSelectPendingTask(pendingTask)}
           style={
             sidebarPane
@@ -759,8 +823,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       ? `Opens the thread. Swipe left to ${primaryAction.label.toLowerCase()}.`
       : `Opens the thread. Swipe left for ${primaryAction.label.toLowerCase()} and snooze actions.`;
 
-  // The sidebar pane fills selected rows with the theme's message surface, so
-  // every piece of row text must use that surface's paired foreground.
+  // Sidebar rows use navigation foregrounds on their active and idle surfaces.
   const cardContent = (
     <>
       <View className="flex-row items-center gap-1.5">
@@ -776,7 +839,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         <Text
           className={cn(
             "flex-1 text-sm font-t3-medium",
-            selected ? selectedThreadRowColors.mutedForegroundClassName : "text-foreground-muted",
+            selected
+              ? selectedThreadRowColors.mutedForegroundClassName
+              : rowAppearance.mutedForegroundClassName,
           )}
           numberOfLines={1}
         >
@@ -787,16 +852,17 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
           <SymbolView
             name="pin"
             size={11}
-            tintColorClassName="accent-foreground-muted"
+            tintColorClassName={rowAppearance.mutedIconTintClassName}
             type="monochrome"
           />
         ) : null}
         <Text
           className={cn(
             "text-xs tabular-nums",
-            selected
-              ? selectedThreadRowColors.foregroundClassName
-              : (statusLabel?.className ?? "text-foreground-tertiary"),
+            statusLabel?.className ??
+              (selected
+                ? selectedThreadRowColors.foregroundClassName
+                : rowAppearance.tertiaryForegroundClassName),
           )}
         >
           {statusLabel?.label ?? timeLabel}
@@ -805,7 +871,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       <Text
         className={cn(
           "mt-1 text-base font-t3-medium",
-          selected ? selectedThreadRowColors.foregroundClassName : "text-foreground",
+          selected
+            ? selectedThreadRowColors.foregroundClassName
+            : rowAppearance.foregroundClassName,
         )}
         numberOfLines={2}
       >
@@ -814,6 +882,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       {props.searchMatch ? (
         <View className="mt-1">
           <ThreadSearchMatchExcerpt
+            sidebar={sidebarPane}
             match={props.searchMatch}
             query={props.searchQuery ?? ""}
             selected={selected}
@@ -846,7 +915,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
                 "shrink text-xs",
                 selected
                   ? selectedThreadRowColors.mutedForegroundClassName
-                  : "text-foreground-muted",
+                  : rowAppearance.mutedForegroundClassName,
               )}
               numberOfLines={1}
             >
@@ -856,7 +925,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
                     "text-xs",
                     selected
                       ? selectedThreadRowColors.mutedForegroundClassName
-                      : "text-foreground-muted",
+                      : rowAppearance.mutedForegroundClassName,
                   )}
                   style={{ fontFamily: MONO_FONT }}
                 >
@@ -870,7 +939,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
                     "text-xs",
                     selected
                       ? selectedThreadRowColors.mutedForegroundClassName
-                      : "text-foreground-tertiary",
+                      : rowAppearance.tertiaryForegroundClassName,
                   )}
                 >
                   {props.environmentLabel}
@@ -884,7 +953,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
                 tintColorClassName={
                   selected
                     ? selectedThreadRowColors.mutedIconTintClassName
-                    : "accent-foreground-tertiary"
+                    : rowAppearance.tertiaryIconTintClassName
                 }
               />
             ) : null}
@@ -899,24 +968,19 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
                 name={pr.kind === "stack" ? "square.3.layers.3d" : "arrow.triangle.pull"}
                 size={12}
                 tintColorClassName={
-                  selected
-                    ? selectedThreadRowColors.iconTintClassName
-                    : pr.state === null || pr.isDraft
-                      ? "accent-foreground-muted"
-                      : pr.state === "open"
-                        ? "accent-adaptive-emerald-600-400"
-                        : pr.state === "closed"
-                          ? "accent-adaptive-rose-600-400"
-                          : "accent-adaptive-violet-600-400"
+                  pr.state === null || pr.isDraft
+                    ? rowAppearance.mutedIconTintClassName
+                    : pr.state === "open"
+                      ? "accent-adaptive-emerald-600-400"
+                      : pr.state === "closed"
+                        ? "accent-adaptive-rose-600-400"
+                        : "accent-adaptive-violet-600-400"
                 }
               />
             ) : null}
             <Text
               accessibilityLabel={pr.accessibilityLabel}
-              className={cn(
-                "text-xs",
-                selected ? selectedThreadRowColors.foregroundClassName : pr.textClassName,
-              )}
+              className={cn("text-xs", pr.textClassName)}
               style={{ fontFamily: MONO_FONT }}
             >
               {pr.kind === "stack" || pr.others > 0 ? pr.label : `#${pr.label}`}
@@ -942,6 +1006,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       <RowPressable
         key={`${thread.environmentId}:${thread.id}`}
         interactionClassName={rowAppearance.interactionClassName}
+        interactionOpacity={rowAppearance.interactionOpacity}
         className={rowAppearance.className}
         accessibilityHint={swipeAccessibilityHint}
         accessibilityLabel={
@@ -974,6 +1039,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       <RowPressable
         key={`${thread.environmentId}:${thread.id}`}
         interactionClassName={rowAppearance.interactionClassName}
+        interactionOpacity={rowAppearance.interactionOpacity}
         accessibilityHint={swipeAccessibilityHint}
         accessibilityLabel={
           props.hasQueuedMessages ? `${thread.title}, messages queued to send` : thread.title
@@ -1009,7 +1075,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
             <Text
               className={cn(
                 "text-base",
-                selected ? selectedThreadRowColors.foregroundClassName : "text-foreground-muted",
+                selected
+                  ? selectedThreadRowColors.foregroundClassName
+                  : rowAppearance.mutedForegroundClassName,
               )}
               numberOfLines={1}
             >
@@ -1017,6 +1085,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
             </Text>
             {props.searchMatch ? (
               <ThreadSearchMatchExcerpt
+                sidebar={sidebarPane}
                 match={props.searchMatch}
                 query={props.searchQuery ?? ""}
                 selected={selected}
@@ -1030,8 +1099,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
               selected
                 ? selectedThreadRowColors.mutedForegroundClassName
                 : snoozedRow
-                  ? "text-foreground-secondary"
-                  : "text-foreground-tertiary",
+                  ? rowAppearance.mutedForegroundClassName
+                  : rowAppearance.tertiaryForegroundClassName,
             )}
             style={{ fontFamily: MONO_FONT }}
           >
diff --git a/apps/mobile/src/features/threads/thread-list-v2-row-appearance.android.ts b/apps/mobile/src/features/threads/thread-list-v2-row-appearance.android.ts
index 36f78011aa8e..8be6b240755d 100644
--- a/apps/mobile/src/features/threads/thread-list-v2-row-appearance.android.ts
+++ b/apps/mobile/src/features/threads/thread-list-v2-row-appearance.android.ts
@@ -22,8 +22,9 @@ export function getThreadListV2RowAppearance(
   selected: boolean,
 ) {
   const selectedBackgroundColor = theme["--color-thread-selected"];
+  const backgroundColor = theme[sidebarPane ? "--color-drawer" : "--color-screen"];
   const style: ViewStyle = {
-    backgroundColor: selected ? selectedBackgroundColor : theme["--color-screen"],
+    backgroundColor: selected ? selectedBackgroundColor : backgroundColor,
     borderRadius: 20,
   };
   const swipeContainerStyle: ViewStyle = {
@@ -35,12 +36,25 @@ export function getThreadListV2RowAppearance(
 
   return {
     className: undefined,
-    interactionClassName: selected ? "bg-thread-selected-foreground" : "bg-primary",
+    interactionClassName: sidebarPane ? "bg-thread-hover" : "bg-row-hover",
+    interactionOpacity: selected ? 0 : 1,
+    foregroundClassName: sidebarPane ? "text-drawer-foreground" : "text-foreground",
+    mutedForegroundClassName: sidebarPane
+      ? "text-drawer-foreground-muted"
+      : "text-foreground-muted",
+    tertiaryForegroundClassName: sidebarPane
+      ? "text-drawer-foreground-muted"
+      : "text-foreground-tertiary",
+    mutedIconTintClassName: sidebarPane
+      ? "accent-drawer-foreground-muted"
+      : "accent-foreground-muted",
+    tertiaryIconTintClassName: sidebarPane
+      ? "accent-drawer-foreground-muted"
+      : "accent-foreground-tertiary",
     style,
     cardStyle: sidebarPane ? { ...style, paddingHorizontal: 12, paddingVertical: 10 } : style,
     swipeContainerStyle,
-    swipeBackgroundColor: theme["--color-screen"],
-    providerIconSurfaceColor:
-      sidebarPane && selected ? selectedBackgroundColor : theme["--color-screen"],
+    swipeBackgroundColor: backgroundColor,
+    providerIconSurfaceColor: selected ? selectedBackgroundColor : backgroundColor,
   };
 }
diff --git a/apps/mobile/src/features/threads/thread-list-v2-row-appearance.test.ts b/apps/mobile/src/features/threads/thread-list-v2-row-appearance.test.ts
new file mode 100644
index 000000000000..0052629d03a5
--- /dev/null
+++ b/apps/mobile/src/features/threads/thread-list-v2-row-appearance.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it } from "vite-plus/test";
+import { MOBILE_THEME_IDS } from "@t3tools/shared/themePalettes";
+
+import { getMobileThemeVariables } from "../../lib/mobileTheme";
+import { getThreadListV2RowAppearance as iosAppearance } from "./thread-list-v2-row-appearance";
+import { getThreadListV2RowAppearance as androidAppearance } from "./thread-list-v2-row-appearance.android";
+
+describe.each([
+  ["ios", iosAppearance],
+  ["android", androidAppearance],
+] as const)("%s thread row colors", (_platform, appearanceFor) => {
+  it.each(MOBILE_THEME_IDS)(
+    "preserves active selection and uses neutral hover for %s",
+    (themeId) => {
+      for (const appearance of ["light", "dark"] as const) {
+        const theme = getMobileThemeVariables(themeId, appearance);
+        const idle = appearanceFor(theme, true, false);
+        const active = appearanceFor(theme, true, true);
+
+        expect(idle.style?.backgroundColor).toBe(theme["--color-drawer"]);
+        expect(idle.interactionClassName).toBe("bg-thread-hover");
+        expect(idle.interactionOpacity).toBe(1);
+        expect(active.style?.backgroundColor).toBe(theme["--color-thread-selected"]);
+        // Pointer feedback must not mix a second color into the active background.
+        expect(active.interactionOpacity).toBe(0);
+        expect(active.providerIconSurfaceColor).toBe(active.style?.backgroundColor);
+        expect(idle.foregroundClassName).toBe("text-drawer-foreground");
+        expect(idle.mutedForegroundClassName).toBe("text-drawer-foreground-muted");
+
+        const phone = appearanceFor(theme, false, false);
+        expect(phone.swipeBackgroundColor).toBe(theme["--color-screen"]);
+        expect(phone.interactionClassName).toBe("bg-row-hover");
+        expect(phone.foregroundClassName).toBe("text-foreground");
+      }
+    },
+  );
+});
diff --git a/apps/mobile/src/features/threads/thread-list-v2-row-appearance.ts b/apps/mobile/src/features/threads/thread-list-v2-row-appearance.ts
index a9c1bfb408ed..b73f87b86a2a 100644
--- a/apps/mobile/src/features/threads/thread-list-v2-row-appearance.ts
+++ b/apps/mobile/src/features/threads/thread-list-v2-row-appearance.ts
@@ -6,10 +6,10 @@ export const THREAD_LIST_V2_ROW_CONTENT_CLASS_NAME = "px-5 py-2.5";
 export const THREAD_LIST_V2_ROW_DIVIDERS = true;
 
 export const selectedThreadRowColors = {
-  foregroundClassName: "text-user-bubble-foreground",
-  mutedForegroundClassName: "text-user-bubble-foreground-muted",
-  iconTintClassName: "accent-user-bubble-foreground",
-  mutedIconTintClassName: "accent-user-bubble-foreground-muted",
+  foregroundClassName: "text-thread-selected-foreground",
+  mutedForegroundClassName: "text-thread-selected-foreground-muted",
+  iconTintClassName: "accent-thread-selected-foreground",
+  mutedIconTintClassName: "accent-thread-selected-foreground-muted",
 };
 
 export function getThreadListV2NewBranchMenuTitle(_branch: string) {
@@ -21,7 +21,7 @@ export function getThreadListV2RowAppearance(
   sidebarPane: boolean,
   selected: boolean,
 ) {
-  const selectedBackgroundColor = theme["--color-user-bubble"];
+  const selectedBackgroundColor = theme["--color-thread-selected"];
   const style: ViewStyle | undefined = sidebarPane
     ? {
         backgroundColor: selected ? selectedBackgroundColor : theme["--color-drawer"],
@@ -34,7 +34,21 @@ export function getThreadListV2RowAppearance(
 
   return {
     className: sidebarPane ? undefined : "bg-screen",
-    interactionClassName: selected && sidebarPane ? "bg-user-bubble-foreground" : "bg-primary",
+    interactionClassName: sidebarPane ? "bg-thread-hover" : "bg-row-hover",
+    interactionOpacity: selected ? 0 : 1,
+    foregroundClassName: sidebarPane ? "text-drawer-foreground" : "text-foreground",
+    mutedForegroundClassName: sidebarPane
+      ? "text-drawer-foreground-muted"
+      : "text-foreground-muted",
+    tertiaryForegroundClassName: sidebarPane
+      ? "text-drawer-foreground-muted"
+      : "text-foreground-tertiary",
+    mutedIconTintClassName: sidebarPane
+      ? "accent-drawer-foreground-muted"
+      : "accent-foreground-muted",
+    tertiaryIconTintClassName: sidebarPane
+      ? "accent-drawer-foreground-muted"
+      : "accent-foreground-tertiary",
     style,
     cardStyle: sidebarPane ? { ...style, paddingHorizontal: 12, paddingVertical: 10 } : undefined,
     swipeContainerStyle,
diff --git a/apps/mobile/src/features/threads/thread-search-match.tsx b/apps/mobile/src/features/threads/thread-search-match.tsx
index 618cf15ee142..553160dbdd8c 100644
--- a/apps/mobile/src/features/threads/thread-search-match.tsx
+++ b/apps/mobile/src/features/threads/thread-search-match.tsx
@@ -1,4 +1,3 @@
-import { Platform } from "react-native";
 import type { EnvironmentThreadSearchMatch } from "@t3tools/client-runtime/state/thread-search";
 
 import { AppText as Text } from "../../components/AppText";
@@ -49,6 +48,7 @@ export function ThreadSearchMatchExcerpt(props: {
   readonly query: string;
   readonly selected?: boolean;
   readonly compact?: boolean;
+  readonly sidebar?: boolean;
 }) {
   const isUser = props.match.source === "user";
   const parts = splitHighlightParts(props.match.snippet, props.query);
@@ -57,10 +57,10 @@ export function ThreadSearchMatchExcerpt(props: {
       className={cn(
         props.compact ? "text-sm" : "text-xs",
         props.selected
-          ? Platform.OS === "android"
-            ? "text-thread-selected-foreground-muted"
-            : "text-user-bubble-foreground-muted"
-          : "text-foreground-muted",
+          ? "text-thread-selected-foreground-muted"
+          : props.sidebar
+            ? "text-drawer-foreground-muted"
+            : "text-foreground-muted",
       )}
       numberOfLines={1}
     >
@@ -68,11 +68,11 @@ export function ThreadSearchMatchExcerpt(props: {
         className={cn(
           props.compact ? "text-sm font-t3-medium" : "text-xs font-t3-medium",
           props.selected
-            ? Platform.OS === "android"
-              ? "text-thread-selected-foreground"
-              : "text-user-bubble-foreground"
+            ? "text-thread-selected-foreground"
             : isUser
-              ? "text-foreground-secondary"
+              ? props.sidebar
+                ? "text-drawer-foreground-muted"
+                : "text-foreground-secondary"
               : "text-adaptive-emerald-600-400",
         )}
       >
@@ -84,12 +84,14 @@ export function ThreadSearchMatchExcerpt(props: {
             props.compact ? "text-sm" : "text-xs",
             part.highlighted && "font-t3-bold",
             props.selected
-              ? Platform.OS === "android"
-                ? "text-thread-selected-foreground"
-                : "text-user-bubble-foreground"
+              ? "text-thread-selected-foreground"
               : part.highlighted
-                ? "text-foreground"
-                : "text-foreground-muted",
+                ? props.sidebar
+                  ? "text-drawer-foreground"
+                  : "text-foreground"
+                : props.sidebar
+                  ? "text-drawer-foreground-muted"
+                  : "text-foreground-muted",
           )}
           key={part.start}
         >
diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx
index e5e7ad150703..d227a72a2c7e 100644
--- a/apps/mobile/src/features/threads/thread-work-log.tsx
+++ b/apps/mobile/src/features/threads/thread-work-log.tsx
@@ -882,7 +882,7 @@ const ThreadWorkLogRow = memo(function ThreadWorkLogRow(
           entering={WORK_LOG_DETAIL_ENTER_TRANSITION}
           exiting={WORK_LOG_DETAIL_EXIT_TRANSITION}
           layout={WORK_LOG_LAYOUT_TRANSITION}
-          className="ml-7 border-l border-adaptive-neutral-300-a60-white-a12 pb-1 pl-3 pt-0.5"
+          className="ml-7 border-l border-border pb-1 pl-3 pt-0.5"
         >
           {row.workEntry.questionAnswer ? (
             <QuestionAnswerHistory
@@ -1037,7 +1037,7 @@ export const ThreadAgentSpawnCard = memo(function ThreadAgentSpawnCard(props: {
           props.onToggle();
         }}
         onLongPress={props.onCopy}
-        className="rounded-xl border border-adaptive-neutral-200-a80-white-a8 bg-card px-2.5 py-2 active:bg-subtle"
+        className="rounded-xl border border-border-subtle bg-card px-2.5 py-2 active:bg-subtle"
       >
         <View className="flex-row items-center gap-2">
           <View className="h-6 w-6 shrink-0 items-center justify-center">
@@ -1094,7 +1094,7 @@ export const ThreadAgentSpawnCard = memo(function ThreadAgentSpawnCard(props: {
             entering={WORK_LOG_DETAIL_ENTER_TRANSITION}
             exiting={WORK_LOG_DETAIL_EXIT_TRANSITION}
             layout={WORK_LOG_LAYOUT_TRANSITION}
-            className="ml-8 mt-1.5 gap-1.5 border-l border-adaptive-neutral-300-a60-white-a12 pl-3"
+            className="ml-8 mt-1.5 gap-1.5 border-l border-border pl-3"
           >
             {summary.members.map((member) => (
               <View key={member.title} className="gap-px">
diff --git a/apps/mobile/src/features/threads/threadPresentation.ts b/apps/mobile/src/features/threads/threadPresentation.ts
index dcff521342c6..b5f286937e0c 100644
--- a/apps/mobile/src/features/threads/threadPresentation.ts
+++ b/apps/mobile/src/features/threads/threadPresentation.ts
@@ -12,10 +12,6 @@ export type ThreadStatusKind =
 
 export interface ThreadStatusPresentation extends StatusTone {
   readonly kind: ThreadStatusKind;
-  /** Foreground color for the leading status icon. */
-  readonly iconColor: string;
-  /** Background color for the leading status icon circle. */
-  readonly iconBackground: string;
   /** Whether the indicator represents in-flight activity. */
   readonly pulse: boolean;
 }
@@ -44,8 +40,6 @@ export function resolveThreadStatus(
       label: "Needs Approval",
       pillClassName: "bg-warning",
       textClassName: "text-warning-foreground",
-      iconColor: "#ff9f0a",
-      iconBackground: "rgba(255,159,10,0.22)",
       pulse: false,
     };
   }
@@ -54,10 +48,8 @@ export function resolveThreadStatus(
     return {
       kind: "awaiting-input",
       label: "Awaiting Input",
-      pillClassName: "bg-primary/10",
-      textClassName: "text-foreground-secondary",
-      iconColor: "#5e5ce6",
-      iconBackground: "rgba(94,92,230,0.22)",
+      pillClassName: "bg-adaptive-indigo-500-a12-a16",
+      textClassName: "text-adaptive-indigo-600-300",
       pulse: false,
     };
   }
@@ -66,10 +58,8 @@ export function resolveThreadStatus(
     return {
       kind: "working",
       label: "Working",
-      pillClassName: "bg-primary/10",
+      pillClassName: "bg-adaptive-sky-500-a12-a16",
       textClassName: "text-adaptive-sky-600-400",
-      iconColor: "#0a84ff",
-      iconBackground: "rgba(10,132,255,0.22)",
       pulse: true,
     };
   }
@@ -78,10 +68,8 @@ export function resolveThreadStatus(
     return {
       kind: "connecting",
       label: "Connecting",
-      pillClassName: "bg-primary/10",
-      textClassName: "text-foreground-secondary",
-      iconColor: "#0a84ff",
-      iconBackground: "rgba(10,132,255,0.22)",
+      pillClassName: "bg-adaptive-sky-500-a12-a16",
+      textClassName: "text-adaptive-sky-600-400",
       pulse: true,
     };
   }
@@ -92,8 +80,6 @@ export function resolveThreadStatus(
       label: "Error",
       pillClassName: "bg-danger",
       textClassName: "text-danger-foreground",
-      iconColor: "#ff453a",
-      iconBackground: "rgba(255,69,58,0.22)",
       pulse: false,
     };
   }
@@ -106,10 +92,8 @@ export function resolveThreadStatus(
     return {
       kind: "plan-ready",
       label: "Plan Ready",
-      pillClassName: "bg-primary/10",
-      textClassName: "text-foreground-secondary",
-      iconColor: "#bf5af2",
-      iconBackground: "rgba(191,90,242,0.22)",
+      pillClassName: "bg-adaptive-violet-500-a12-a16",
+      textClassName: "text-adaptive-violet-600-400",
       pulse: false,
     };
   }
diff --git a/apps/mobile/src/features/threads/worktree-setup-card.tsx b/apps/mobile/src/features/threads/worktree-setup-card.tsx
index 52154bcc8bcd..86b71992710f 100644
--- a/apps/mobile/src/features/threads/worktree-setup-card.tsx
+++ b/apps/mobile/src/features/threads/worktree-setup-card.tsx
@@ -72,7 +72,7 @@ export function WorktreeSetupCard(props: WorktreeSetupCardProps) {
         />
         {!handedOff ? (
           <Text
-            className="text-2xs text-adaptive-neutral-600-400"
+            className="text-2xs text-foreground-secondary"
             style={{ fontVariant: ["tabular-nums"] }}
           >
             {elapsed(snapshot.startedAt, snapshot.endedAt, now)}
@@ -99,25 +99,21 @@ export function WorktreeSetupCard(props: WorktreeSetupCardProps) {
             {backgroundSetup ? (
               <ActivityIndicator
                 size="small"
-                colorClassName="accent-adaptive-neutral-500-400"
+                colorClassName="accent-icon-muted"
                 style={{ width: 12, height: 12, transform: [{ scale: 0.65 }] }}
               />
             ) : failed ? (
               <SymbolView
                 name="exclamationmark.circle"
                 size={12}
-                tintColorClassName="accent-adaptive-rose-700-300"
+                tintColorClassName="accent-danger-foreground"
               />
             ) : null}
-            <Text numberOfLines={1} className="shrink text-2xs text-adaptive-neutral-600-400">
+            <Text numberOfLines={1} className="shrink text-2xs text-foreground-secondary">
               {backgroundSetup ? scriptName : "Details"}
             </Text>
             {!backgroundSetup ? (
-              <SymbolView
-                name="chevron.right"
-                size={10}
-                tintColorClassName="accent-adaptive-neutral-500-400"
-              />
+              <SymbolView name="chevron.right" size={10} tintColorClassName="accent-icon-muted" />
             ) : null}
           </View>
         </Pressable>
@@ -166,14 +162,19 @@ function HeaderLabel({
   failed?: boolean;
 }) {
   return active ? (
-    <ShimmeringWorkContent icon="clock" iconSubtleColor="#737373" label={label} showIcon={false} />
+    <ShimmeringWorkContent
+      icon="clock"
+      iconSubtleColor="transparent"
+      label={label}
+      showIcon={false}
+    />
   ) : (
     <Text
       numberOfLines={1}
       className={
         failed
-          ? "flex-1 text-sm text-adaptive-rose-700-300"
-          : "flex-1 text-sm text-adaptive-neutral-600-400"
+          ? "flex-1 text-sm text-danger-foreground"
+          : "flex-1 text-sm text-foreground-secondary"
       }
       style={{ fontVariant: ["tabular-nums"] }}
     >
@@ -232,7 +233,7 @@ function SetupDetailsSheet({
             </View>
           ))}
         {snapshot.phase === "failed" && snapshot.error ? (
-          <Text selectable className="ml-8 mt-2 text-xs text-adaptive-rose-700-300">
+          <Text selectable className="ml-8 mt-2 text-xs text-danger-foreground">
             {snapshot.error}
           </Text>
         ) : null}
@@ -303,7 +304,7 @@ function StageRow({
         {stage.status === "running" && animate ? (
           <ActivityIndicator
             size="small"
-            colorClassName="accent-adaptive-neutral-500-400"
+            colorClassName="accent-icon-muted"
             style={{ transform: [{ scale: 0.75 }] }}
           />
         ) : (
@@ -312,10 +313,10 @@ function StageRow({
             size={14}
             tintColorClassName={
               stage.status === "failed"
-                ? "accent-adaptive-rose-700-300"
+                ? "accent-danger-foreground"
                 : stage.status === "warning"
                   ? "accent-warning-foreground"
-                  : "accent-adaptive-neutral-500-400"
+                  : "accent-icon-muted"
             }
           />
         )}
@@ -323,7 +324,7 @@ function StageRow({
       {stage.status === "running" && animate ? (
         <ShimmeringWorkContent
           icon="clock"
-          iconSubtleColor="#737373"
+          iconSubtleColor="transparent"
           label={label}
           showIcon={false}
         />
@@ -332,24 +333,21 @@ function StageRow({
           numberOfLines={1}
           className={
             stage.status === "failed"
-              ? "flex-1 text-sm text-adaptive-rose-700-300"
-              : "flex-1 text-sm text-adaptive-neutral-600-400"
+              ? "flex-1 text-sm text-danger-foreground"
+              : "flex-1 text-sm text-foreground-secondary"
           }
         >
           {label}
         </Text>
       )}
       {detail ? (
-        <Text
-          numberOfLines={1}
-          className="max-w-[25%] shrink text-2xs text-adaptive-neutral-600-400"
-        >
+        <Text numberOfLines={1} className="max-w-[25%] shrink text-2xs text-foreground-secondary">
           {detail}
         </Text>
       ) : null}
       {stage.status !== "pending" && stage.status !== "skipped" ? (
         <Text
-          className="text-2xs text-adaptive-neutral-600-400"
+          className="text-2xs text-foreground-secondary"
           style={{ fontVariant: ["tabular-nums"] }}
         >
           {elapsed(stage.startedAt, stage.endedAt, now)}
@@ -368,8 +366,8 @@ function OutputTail({ lines, failed }: { lines: ReadonlyArray<string>; failed: b
       accessibilityLabel="Setup script output"
       className={
         failed
-          ? "mb-2 ml-8 rounded-md border border-adaptive-rose-700-300/20 bg-adaptive-rose-50-950 px-3 py-2"
-          : "mb-2 ml-8 rounded-md border border-border bg-adaptive-neutral-100-900 px-3 py-2"
+          ? "mb-2 ml-8 rounded-md border border-danger-border bg-danger px-3 py-2"
+          : "mb-2 ml-8 rounded-md border border-border bg-card-alt px-3 py-2"
       }
     >
       {OUTPUT_TAIL_SLOTS.map((slot) => (
@@ -379,8 +377,8 @@ function OutputTail({ lines, failed }: { lines: ReadonlyArray<string>; failed: b
           numberOfLines={1}
           className={
             failed
-              ? "text-2xs leading-5 text-adaptive-rose-700-300 ios:font-[family-name:Menlo] android:font-mono"
-              : "text-2xs leading-5 text-adaptive-neutral-600-400 ios:font-[family-name:Menlo] android:font-mono"
+              ? "text-2xs leading-5 text-danger-foreground ios:font-[family-name:Menlo] android:font-mono"
+              : "text-2xs leading-5 text-foreground-secondary ios:font-[family-name:Menlo] android:font-mono"
           }
         >
           {lines[lines.length - OUTPUT_TAIL_SLOTS.length + slot] || "\u00a0"}
diff --git a/apps/mobile/src/features/voice-input/ComposerDictationControl.tsx b/apps/mobile/src/features/voice-input/ComposerDictationControl.tsx
index 93838440ad69..602cbb158b54 100644
--- a/apps/mobile/src/features/voice-input/ComposerDictationControl.tsx
+++ b/apps/mobile/src/features/voice-input/ComposerDictationControl.tsx
@@ -300,7 +300,7 @@ export function ComposerDictationStatus(props: {
     <View className="relative h-11 min-w-0 flex-1 justify-center">
       {isError ? (
         <View className="min-w-0 flex-row items-center gap-1.5 px-2">
-          <Text className="min-w-0 flex-1 text-sm text-red-400" numberOfLines={2}>
+          <Text className="min-w-0 flex-1 text-sm text-danger-foreground" numberOfLines={2}>
             {props.presentation.statusLabel}
           </Text>
           <Pressable
diff --git a/apps/mobile/src/lib/materialYouTheme.android.ts b/apps/mobile/src/lib/materialYouTheme.android.ts
index ce16b23c89ec..311518428efb 100644
--- a/apps/mobile/src/lib/materialYouTheme.android.ts
+++ b/apps/mobile/src/lib/materialYouTheme.android.ts
@@ -36,12 +36,15 @@ export function materialYouPaletteToMobileThemeVariables(
     "--color-sheet": withAlpha(palette.surfaceContainerLow, 0.98),
     "--color-sheet-solid": palette.surfaceContainerLow,
     "--color-card": palette.surfaceContainer,
+    "--color-grouped-card": palette.surfaceContainer,
     "--color-card-alt": palette.surfaceContainerHigh,
     "--color-card-translucent": withAlpha(palette.surfaceContainer, 0.8),
     "--color-thread-canvas": palette.surfaceContainerLow,
     "--color-thread-selected": palette.surfaceContainer,
     "--color-thread-selected-foreground": palette.onSurface,
     "--color-thread-selected-foreground-muted": palette.onSurfaceVariant,
+    "--color-thread-hover": palette.surfaceContainerHigh,
+    "--color-row-hover": palette.surfaceContainerHigh,
     "--color-composer-panel": withAlpha(palette.surfaceContainerLow, dark ? 0.92 : 0.88),
     "--color-composer-surface": withAlpha(palette.surfaceContainerHigh, dark ? 0.9 : 0.94),
     "--color-composer-border": withAlpha(palette.outlineVariant, dark ? 0.34 : 0.46),
@@ -50,6 +53,7 @@ export function materialYouPaletteToMobileThemeVariables(
     "--color-foreground-muted": palette.onSurfaceVariant,
     "--color-foreground-tertiary": withAlpha(palette.onSurfaceVariant, 0.58),
     "--color-border": withAlpha(palette.outlineVariant, dark ? 0.5 : 0.65),
+    "--color-focus": palette.primary,
     "--color-border-subtle": withAlpha(palette.outlineVariant, dark ? 0.34 : 0.46),
     "--color-separator": withAlpha(palette.outlineVariant, dark ? 0.24 : 0.34),
     "--color-subtle": withAlpha(palette.onSurface, 0.05),
@@ -59,6 +63,7 @@ export function materialYouPaletteToMobileThemeVariables(
     "--color-inline-skill-foreground": palette.onTertiaryContainer,
     "--color-primary": palette.primary,
     "--color-primary-foreground": palette.onPrimary,
+    "--color-primary-text": palette.primary,
     "--color-primary-shadow": withAlpha(palette.scrim, dark ? 0.22 : 0.18),
     "--color-secondary": palette.secondaryContainer,
     "--color-secondary-foreground": palette.onSecondaryContainer,
@@ -70,6 +75,8 @@ export function materialYouPaletteToMobileThemeVariables(
     "--color-danger": palette.errorContainer,
     "--color-danger-border": withAlpha(palette.onErrorContainer, dark ? 0.42 : 0.5),
     "--color-danger-foreground": palette.onErrorContainer,
+    "--color-update": palette.primaryContainer,
+    "--color-update-foreground": palette.onPrimaryContainer,
     "--color-input": palette.surfaceContainerLowest,
     "--color-input-border": withAlpha(palette.outline, dark ? 0.42 : 0.5),
     "--color-sidebar-search": palette.surfaceContainerLowest,
@@ -78,8 +85,10 @@ export function materialYouPaletteToMobileThemeVariables(
     "--color-icon-muted": palette.onSurfaceVariant,
     "--color-icon-subtle": withAlpha(palette.onSurfaceVariant, 0.68),
     "--color-header": palette.surfaceContainerHigh,
+    "--color-header-foreground": palette.onSurface,
     "--color-header-border": withAlpha(palette.outlineVariant, dark ? 0.36 : 0.48),
     "--color-glass-surface": withAlpha(palette.surfaceContainerHigh, dark ? 0.78 : 0.72),
+    "--color-glass-fallback": withAlpha(palette.surfaceContainerHigh, dark ? 0.9 : 0.94),
     "--color-glass-tint": withAlpha(palette.primaryContainer, dark ? 0.24 : 0.18),
     "--color-status-bar": palette.surfaceContainerLow,
     "--color-md-body": materialTone(palette.onSurfaceVariant, dark ? 90 : 10),
@@ -100,6 +109,9 @@ export function materialYouPaletteToMobileThemeVariables(
     "--color-user-bubble-skill-foreground": userBubbleForeground,
     "--color-backdrop": withAlpha(palette.scrim, dark ? 0.48 : 0.22),
     "--color-drawer": palette.surface,
+    "--color-drawer-foreground": palette.onSurface,
+    "--color-drawer-foreground-muted": palette.onSurfaceVariant,
+    "--color-drawer-border": withAlpha(palette.outlineVariant, dark ? 0.36 : 0.48),
     "--color-drawer-shadow": withAlpha(palette.scrim, dark ? 0.32 : 0.12),
     "--color-dot-separator": withAlpha(palette.onSurface, 0.2),
     "--color-wordmark": palette.onSurface,
diff --git a/apps/mobile/src/lib/materialYouTheme.test.ts b/apps/mobile/src/lib/materialYouTheme.test.ts
index dc99f9badecd..d803a161ad87 100644
--- a/apps/mobile/src/lib/materialYouTheme.test.ts
+++ b/apps/mobile/src/lib/materialYouTheme.test.ts
@@ -54,6 +54,7 @@ describe("Material You system colors", () => {
     expect(variables["--color-thread-canvas"]).toBe(palette.surfaceContainerLow);
     expect(variables["--color-thread-selected"]).toBe(palette.surfaceContainer);
     expect(variables["--color-header"]).toBe(palette.surfaceContainerHigh);
+    expect(variables["--color-grouped-card"]).toBe(palette.surfaceContainer);
     expect(variables["--color-primary"]).toBe(palette.primary);
     expect(variables["--color-placeholder"]).toBe("#1C1B1F9E");
   });
diff --git a/apps/mobile/src/lib/mobileTheme.test-support.ts b/apps/mobile/src/lib/mobileTheme.test-support.ts
index 1e47b0f0ed41..c363c4a559c6 100644
--- a/apps/mobile/src/lib/mobileTheme.test-support.ts
+++ b/apps/mobile/src/lib/mobileTheme.test-support.ts
@@ -1,20 +1,29 @@
 import * as NodeFS from "node:fs";
 
-import type { MobileThemeAppearance, MobileThemeVariables } from "./mobileTheme";
+import {
+  MOBILE_THEME_VARIABLE_NAMES,
+  type MobileThemeAppearance,
+  type MobileThemeVariables,
+} from "./mobileTheme";
 
 export function readDefaultMobileThemeVariables(
   appearance: MobileThemeAppearance,
 ): MobileThemeVariables {
-  const stylesheet = NodeFS.readFileSync(new URL("../../global.css", import.meta.url), "utf8");
+  const stylesheet = NodeFS.readFileSync(
+    new URL("../../generated-uniwind-themes.css", import.meta.url),
+    "utf8",
+  );
   const variant = new RegExp(`@variant ${appearance} \\{([\\s\\S]*?)\\n    \\}`, "u").exec(
     stylesheet,
   )?.[1];
-  if (variant === undefined) throw new Error(`Missing default ${appearance} theme in global.css.`);
+  if (variant === undefined) throw new Error(`Missing generated default ${appearance} theme.`);
 
   return Object.fromEntries(
     Array.from(variant.matchAll(/(--color-[a-z0-9-]+):\s*([^;]+);/gu), ([, name, value]) => [
       name,
       (value ?? "").trim(),
-    ]),
+    ]).filter(([name]) =>
+      MOBILE_THEME_VARIABLE_NAMES.includes(name as (typeof MOBILE_THEME_VARIABLE_NAMES)[number]),
+    ),
   ) as MobileThemeVariables;
 }
diff --git a/apps/mobile/src/lib/mobileTheme.test.ts b/apps/mobile/src/lib/mobileTheme.test.ts
index 64c27e7d870f..1c7643f98957 100644
--- a/apps/mobile/src/lib/mobileTheme.test.ts
+++ b/apps/mobile/src/lib/mobileTheme.test.ts
@@ -1,12 +1,22 @@
 import { describe, expect, it } from "vite-plus/test";
-import { BUILT_IN_THEME_IDS, BUILT_IN_THEMES, T3_CHAT_THEME } from "@t3tools/shared/themePalettes";
+import {
+  BUILT_IN_THEME_IDS,
+  BUILT_IN_THEMES,
+  T3_CHAT_THEME,
+  T3_CODE_LIGHT_THEME_COLORS,
+  T3_CODE_DARK_THEME_COLORS,
+  MOBILE_THEME_IDS,
+  getThemeColorsForAppearance,
+} from "@t3tools/shared/themePalettes";
 import { readDefaultMobileThemeVariables } from "./mobileTheme.test-support";
+import { getMobileThemeRuntimeVariables } from "./mobileThemeVariables";
 
 import {
   createMobileThemePairPatch,
   createMobileThemeSelectionPatch,
   createMobileThemeVariables,
   DEFAULT_MOBILE_THEME_ID,
+  flattenThemeColor,
   getMobileThemePreviewColors,
   getMobileThemeVariables,
   normalizeMobileThemeId,
@@ -66,12 +76,86 @@ describe("mobile themes", () => {
     }
   });
 
-  it("preserves the existing mobile palette as the default", () => {
-    expect(readDefaultMobileThemeVariables("light")["--color-screen"]).toBe("#f2f2f7");
-    expect(readDefaultMobileThemeVariables("dark")["--color-screen"]).toBe("#0a0a0a");
-    expect(readDefaultMobileThemeVariables("light")["--color-user-bubble-skill-foreground"]).toBe(
-      "#2563eb",
-    );
+  it.each(MOBILE_THEME_IDS)("uses the web color roles for %s in both appearances", (themeId) => {
+    for (const appearance of ["light", "dark"] as const) {
+      const theme = BUILT_IN_THEMES.find((candidate) => candidate.id === themeId);
+      const colors = theme
+        ? getThemeColorsForAppearance(theme, appearance)!
+        : appearance === "dark"
+          ? T3_CODE_DARK_THEME_COLORS
+          : T3_CODE_LIGHT_THEME_COLORS;
+      const variables =
+        themeId === DEFAULT_MOBILE_THEME_ID
+          ? readDefaultMobileThemeVariables(appearance)
+          : getMobileThemeVariables(themeId, appearance);
+      expect(variables["--color-screen"]).toBe(themeColorToNativeColor(colors.canvas));
+      expect(variables["--color-thread-canvas"]).toBe(variables["--color-screen"]);
+      expect(variables["--color-drawer"]).toBe(themeColorToNativeColor(colors.sidebar));
+      expect(variables["--color-thread-hover"]).toBe(
+        themeColorToNativeColor(colors.sidebarRowHover),
+      );
+      expect(variables["--color-card"]).toBe(themeColorToNativeColor(colors.surface));
+      expect(variables["--color-composer-surface"]).toBe(
+        themeColorWithAlpha(
+          themeId === DEFAULT_MOBILE_THEME_ID
+            ? variables["--color-grouped-card"]
+            : themeColorToNativeColor(colors.surface),
+          appearance === "dark" ? 0.9 : 0.94,
+        ),
+      );
+      expect(variables["--color-thread-selected"]).toBe(
+        themeColorToNativeColor(colors.sidebarRowActive),
+      );
+      expect(variables["--color-thread-selected-foreground"]).toBe(
+        themeColorToNativeColor(colors.sidebarForeground),
+      );
+      expect(variables["--color-primary"]).toBe(themeColorToNativeColor(colors.messageAction));
+      if (themeId !== DEFAULT_MOBILE_THEME_ID) {
+        expect(variables["--color-user-bubble"]).toBe(
+          themeColorToNativeColor(colors.messageSurface),
+        );
+      }
+      expect(
+        contrastRatio(variables["--color-foreground"], variables["--color-screen"]),
+      ).toBeGreaterThanOrEqual(4.5);
+      for (const [foreground, surface] of [
+        ["--color-drawer-foreground", "--color-drawer"],
+        ["--color-drawer-foreground-muted", "--color-drawer"],
+        ["--color-drawer-foreground", "--color-thread-hover"],
+        ["--color-drawer-foreground-muted", "--color-thread-hover"],
+        ["--color-thread-selected-foreground-muted", "--color-thread-selected"],
+        ["--color-primary-foreground", "--color-primary"],
+        ["--color-primary-text", "--color-screen"],
+        ["--color-primary-text", "--color-card"],
+        ["--color-primary-text", "--color-card-alt"],
+        ["--color-primary-text", "--color-sheet-solid"],
+        ["--color-foreground", "--color-sheet-solid"],
+        ["--color-foreground-muted", "--color-sheet-solid"],
+        ["--color-primary-text", "--color-grouped-card"],
+        ["--color-foreground", "--color-grouped-card"],
+        ["--color-foreground-muted", "--color-grouped-card"],
+        ["--color-placeholder", "--color-grouped-card"],
+        ["--color-secondary-foreground", "--color-secondary"],
+        ["--color-user-bubble-foreground", "--color-user-bubble"],
+        ["--color-warning-foreground", "--color-warning"],
+        ["--color-danger-foreground", "--color-danger"],
+        ["--color-md-body", "--color-screen"],
+        ["--color-md-strong", "--color-screen"],
+        ["--color-md-link", "--color-screen"],
+        ["--color-md-code-text", "--color-md-code-bg"],
+      ] as const) {
+        expect(
+          contrastRatio(variables[foreground], variables[surface]),
+          `${appearance}: ${foreground} on ${surface}`,
+        ).toBeGreaterThanOrEqual(4.5);
+      }
+      expect(
+        contrastRatio(
+          variables["--color-thread-selected-foreground"],
+          variables["--color-thread-selected"],
+        ),
+      ).toBeGreaterThanOrEqual(4.5);
+    }
   });
 
   it("applies palette overrides on top of the selected built-in theme", () => {
@@ -83,6 +167,62 @@ describe("mobile themes", () => {
     expect(variables["--color-screen"]).toMatch(/^#/);
   });
 
+  it.each(["light", "dark"] as const)(
+    "separates default settings groups from their %s background",
+    (appearance) => {
+      const variables = getMobileThemeVariables("t3-code", appearance);
+      expect(
+        contrastRatio(variables["--color-grouped-card"], variables["--color-sheet-solid"]),
+      ).toBeGreaterThanOrEqual(1.06);
+      expect(variables["--color-grouped-card"]).not.toBe(variables["--color-card"]);
+      for (const platform of ["ios", "android"]) {
+        const runtime = getMobileThemeRuntimeVariables("t3-code", appearance, platform);
+        const sidebar = flattenThemeColor(runtime["--color-drawer"], runtime["--color-screen"]);
+        const chrome = flattenThemeColor(
+          runtime[platform === "android" ? "--color-header" : "--color-drawer"],
+          runtime["--color-screen"],
+        );
+        expect(relativeLuminance(sidebar)).toBeLessThan(
+          relativeLuminance(runtime["--color-thread-canvas"]),
+        );
+        expect(contrastRatio(chrome, runtime["--color-screen"])).toBeGreaterThanOrEqual(1.06);
+        const foregroundRoles =
+          platform === "android"
+            ? (["--color-header-foreground", "--color-foreground-muted"] as const)
+            : (["--color-drawer-foreground", "--color-drawer-foreground-muted"] as const);
+        for (const role of foregroundRoles) {
+          expect(contrastRatio(runtime[role], chrome)).toBeGreaterThanOrEqual(4.5);
+        }
+      }
+    },
+  );
+
+  it.each(["light", "dark"] as const)(
+    "slightly strengthens default %s messages and separates fallback materials",
+    (appearance) => {
+      const variables = getMobileThemeVariables("t3-code", appearance);
+      const desktop =
+        appearance === "dark" ? T3_CODE_DARK_THEME_COLORS : T3_CODE_LIGHT_THEME_COLORS;
+      const bubbleContrast = contrastRatio(
+        variables["--color-user-bubble"],
+        variables["--color-screen"],
+      );
+      expect(bubbleContrast).toBeGreaterThan(contrastRatio(desktop.messageSurface, desktop.canvas));
+      expect(bubbleContrast).toBeLessThan(1.2);
+      for (const role of ["--color-composer-surface", "--color-glass-fallback"] as const) {
+        const surface = flattenThemeColor(variables[role], variables["--color-screen"]);
+        expect(contrastRatio(surface, variables["--color-screen"])).toBeGreaterThanOrEqual(1.06);
+        for (const foreground of [
+          "--color-foreground",
+          "--color-placeholder",
+          "--color-primary-text",
+        ] as const) {
+          expect(contrastRatio(variables[foreground], surface)).toBeGreaterThanOrEqual(4.5);
+        }
+      }
+    },
+  );
+
   it("uses the same preview roles and standard artwork as desktop", () => {
     expect(getMobileThemePreviewColors(DEFAULT_MOBILE_THEME_ID, "light")).toEqual({
       canvas: "#fcfcfc",
@@ -153,7 +293,6 @@ describe("mobile themes", () => {
 
   it("maps semantic palette roles onto every mobile color variable", () => {
     const variables = createMobileThemeVariables(T3_CHAT_THEME.colors, "light");
-    expect(Object.keys(variables)).toHaveLength(75);
     expect(variables["--color-sheet-solid"]).toBe(
       themeColorToNativeColor(T3_CHAT_THEME.colors.chrome),
     );
@@ -219,8 +358,6 @@ describe("mobile themes", () => {
     }
   });
 
-  // The default palette lives in global.css rather than BUILT_IN_THEMES, so the loops above
-  // never reached it; it kept an unreadable hardcoded bubble until this covered it.
   it("keeps the default user bubble readable in both appearances", () => {
     for (const appearance of ["light", "dark"] as const) {
       const variables = readDefaultMobileThemeVariables(appearance);
diff --git a/apps/mobile/src/lib/mobileTheme.ts b/apps/mobile/src/lib/mobileTheme.ts
index 3b22ac8b5834..80453f61a011 100644
--- a/apps/mobile/src/lib/mobileTheme.ts
+++ b/apps/mobile/src/lib/mobileTheme.ts
@@ -1,10 +1,11 @@
 import {
   BUILT_IN_THEMES,
   T3_CHAT_THEME,
+  T3_CODE_LIGHT_THEME_COLORS,
+  T3_CODE_DARK_THEME_COLORS,
   getThemeColorsForAppearance,
   MOBILE_DEFAULT_THEME_ID,
   MOBILE_THEME_IDS as SHARED_MOBILE_THEME_IDS,
-  type BuiltInThemeId,
   type MobileThemeId as SharedMobileThemeId,
   type ThemeAppearance,
   type ThemeColors,
@@ -138,7 +139,7 @@ function withAlpha(color: string, alpha: number): string {
 }
 
 function rgbChannels(color: string): readonly [number, number, number] | null {
-  const match = /^#([\da-f]{2})([\da-f]{2})([\da-f]{2})$/i.exec(color);
+  const match = /^#([\da-f]{2})([\da-f]{2})([\da-f]{2})(?:[\da-f]{2})?$/i.exec(color);
   if (!match) return null;
   const [, red = "0", green = "0", blue = "0"] = match;
   return [Number.parseInt(red, 16), Number.parseInt(green, 16), Number.parseInt(blue, 16)];
@@ -150,6 +151,14 @@ function rgbChannels(color: string): readonly [number, number, number] | null {
  * colour asked for — so a translucent role like `--color-border` has to be flattened first.
  */
 export function flattenThemeColor(color: string, surface: string): string {
+  const alphaHex = /^#([\da-f]{6})([\da-f]{2})$/i.exec(color);
+  if (alphaHex) {
+    const channels = rgbChannels(color)!;
+    return flattenThemeColor(
+      `rgba(${channels[0]}, ${channels[1]}, ${channels[2]}, ${Number.parseInt(alphaHex[2]!, 16) / 255})`,
+      surface,
+    );
+  }
   const match = /^rgba?\(\s*(\d+)[,\s]+(\d+)[,\s]+(\d+)(?:[,\s/]+([\d.]+))?\s*\)$/i.exec(
     color.trim(),
   );
@@ -182,22 +191,21 @@ function contrastRatio(
   );
 }
 
-/** Preserve the theme's action hue while making it readable as skill text on a message bubble. */
-function readableMessageAccent(accent: string, surface: string): string {
+/** Preserve the color's hue while giving text 4.5:1 contrast on every supplied surface. */
+function readableTextColor(accent: string, surface: string | ReadonlyArray<string>): string {
   const accentChannels = rgbChannels(accent);
-  const surfaceChannels = rgbChannels(surface);
-  if (
-    !accentChannels ||
-    !surfaceChannels ||
-    contrastRatio(accentChannels, surfaceChannels) >= 4.5
-  ) {
+  const surfaceChannels = (typeof surface === "string" ? [surface] : surface)
+    .map(rgbChannels)
+    .filter((channels) => channels !== null);
+  const minimumContrast = (channels: readonly [number, number, number]) =>
+    Math.min(...surfaceChannels.map((surface) => contrastRatio(channels, surface)));
+  if (!accentChannels || surfaceChannels.length === 0 || minimumContrast(accentChannels) >= 4.5) {
     return accent;
   }
 
   const black = [0, 0, 0] as const;
   const white = [255, 255, 255] as const;
-  const target =
-    contrastRatio(black, surfaceChannels) >= contrastRatio(white, surfaceChannels) ? black : white;
+  const target = minimumContrast(black) >= minimumContrast(white) ? black : white;
   let readable: readonly [number, number, number] = target;
   let lowerAmount = 0;
   let upperAmount = 1;
@@ -208,7 +216,7 @@ function readableMessageAccent(accent: string, surface: string): string {
       Math.round(accentChannels[1] + (target[1] - accentChannels[1]) * amount),
       Math.round(accentChannels[2] + (target[2] - accentChannels[2]) * amount),
     ];
-    if (contrastRatio(candidate, surfaceChannels) >= 4.5) {
+    if (minimumContrast(candidate) >= 4.5) {
       readable = candidate;
       upperAmount = amount;
     } else {
@@ -227,30 +235,46 @@ export function themeColorWithAlpha(color: string, alpha: number): string {
   return rgb ? `rgba(${rgb[1]}, ${rgb[2]}, ${rgb[3]}, ${alpha})` : color;
 }
 
-export function createMobileThemeVariables(colors: ThemeColors, appearance: MobileThemeAppearance) {
+export function createMobileThemeVariables(
+  colors: ThemeColors,
+  appearance: MobileThemeAppearance,
+  groupedCardColor = colors.surface,
+) {
   const c = nativeColors(colors);
+  const groupedCard = themeColorToNativeColor(groupedCardColor);
+  const textSurfaces = [c.canvas, c.surface, c.surfaceRaised, c.chrome, groupedCard];
   return {
     "--color-screen": c.canvas,
     "--color-sheet": withAlpha(c.chrome, 0.98),
     "--color-sheet-solid": c.chrome,
-    "--color-card": c.surfaceRaised,
-    "--color-card-alt": c.surface,
-    "--color-card-translucent": withAlpha(c.surfaceRaised, 0.8),
-    "--color-thread-canvas": c.surface,
-    "--color-thread-selected": c.surfaceRaised,
-    "--color-thread-selected-foreground": c.text,
-    "--color-thread-selected-foreground-muted": c.textMuted,
-    "--color-composer-panel": themeColorWithAlpha(c.surface, appearance === "dark" ? 0.92 : 0.88),
+    "--color-card": c.surface,
+    "--color-grouped-card": groupedCard,
+    "--color-card-alt": c.surfaceRaised,
+    "--color-card-translucent": withAlpha(c.surface, 0.8),
+    "--color-thread-canvas": c.canvas,
+    "--color-thread-selected": c.sidebarRowActive,
+    "--color-thread-selected-foreground": c.sidebarForeground,
+    "--color-thread-selected-foreground-muted": readableTextColor(
+      c.sidebarMutedForeground,
+      c.sidebarRowActive,
+    ),
+    "--color-thread-hover": c.sidebarRowHover,
+    "--color-row-hover": c.toolbarControlHover,
+    "--color-composer-panel": themeColorWithAlpha(c.canvas, appearance === "dark" ? 0.92 : 0.88),
     "--color-composer-surface": themeColorWithAlpha(
-      c.surfaceRaised,
+      groupedCard,
       appearance === "dark" ? 0.9 : 0.94,
     ),
-    "--color-composer-border": themeColorWithAlpha(c.border, appearance === "dark" ? 0.46 : 0.54),
+    "--color-composer-border": themeColorWithAlpha(
+      c.border,
+      groupedCard === c.surface ? (appearance === "dark" ? 0.46 : 0.54) : 0.8,
+    ),
     "--color-foreground": c.text,
-    "--color-foreground-secondary": c.textMuted,
-    "--color-foreground-muted": c.mutedForeground,
+    "--color-foreground-secondary": readableTextColor(c.textMuted, textSurfaces),
+    "--color-foreground-muted": readableTextColor(c.mutedForeground, textSurfaces),
     "--color-foreground-tertiary": c.secondaryLabel,
     "--color-border": c.border,
+    "--color-focus": c.focus,
     "--color-border-subtle": withAlpha(c.border, 0.7),
     "--color-separator": withAlpha(c.border, 0.55),
     "--color-subtle": c.muted,
@@ -258,14 +282,15 @@ export function createMobileThemeVariables(colors: ThemeColors, appearance: Mobi
     "--color-inline-skill-background": c.accentSurface,
     "--color-inline-skill-border": withAlpha(c.accent, 0.42),
     "--color-inline-skill-foreground": c.accentSurfaceForeground,
-    "--color-primary": c.accent,
-    "--color-primary-foreground": c.accentForeground,
+    "--color-primary": c.messageAction,
+    "--color-primary-foreground": c.messageActionForeground,
+    "--color-primary-text": readableTextColor(c.messageAction, textSurfaces),
     "--color-primary-shadow": "#000000",
     "--color-secondary": c.secondary,
     "--color-secondary-foreground": c.secondaryForeground,
     "--color-secondary-border": c.border,
-    "--color-switch-active-track": c.accent,
-    "--color-switch-active-thumb": c.accentForeground,
+    "--color-switch-active-track": c.messageAction,
+    "--color-switch-active-thumb": c.messageActionForeground,
     "--color-switch-inactive-track": c.secondary,
     "--color-switch-inactive-thumb": c.mutedForeground,
     "--color-warning": c.warningSurface,
@@ -274,21 +299,25 @@ export function createMobileThemeVariables(colors: ThemeColors, appearance: Mobi
     "--color-danger": c.errorSurface,
     "--color-danger-border": withAlpha(c.error, 0.32),
     "--color-danger-foreground": c.errorForeground,
-    "--color-input": c.surfaceRaised,
+    "--color-update": c.updateSurface,
+    "--color-update-foreground": c.updateForeground,
+    "--color-input": c.surface,
     "--color-input-border": c.input,
     "--color-sidebar-search": c.sidebarControlSurface,
-    "--color-placeholder": c.placeholder,
+    "--color-placeholder": readableTextColor(c.placeholder, textSurfaces),
     "--color-icon": c.text,
     "--color-icon-muted": c.iconMuted,
     "--color-icon-subtle": c.secondaryLabel,
     "--color-header": withAlpha(c.toolbar, 0.97),
+    "--color-header-foreground": c.toolbarForeground,
     "--color-header-border": c.toolbarBorder,
     "--color-glass-surface": withAlpha(c.surfaceOverlay, 0.74),
+    "--color-glass-fallback": themeColorWithAlpha(groupedCard, appearance === "dark" ? 0.9 : 0.94),
     "--color-glass-tint": withAlpha(c.surfaceOverlay, 0.22),
     "--color-status-bar": c.canvas,
     "--color-md-body": c.text,
-    "--color-md-strong": c.toolbarForeground,
-    "--color-md-link": c.accent,
+    "--color-md-strong": c.text,
+    "--color-md-link": readableTextColor(c.messageAction, c.canvas),
     "--color-md-blockquote-border": c.border,
     "--color-md-blockquote-bg": c.muted,
     "--color-md-code-bg": c.codeBackground,
@@ -301,12 +330,15 @@ export function createMobileThemeVariables(colors: ThemeColors, appearance: Mobi
     "--color-user-bubble": c.messageSurface,
     "--color-user-bubble-foreground": c.messageForeground,
     "--color-user-bubble-foreground-muted": withAlpha(c.messageForeground, 0.78),
-    "--color-user-bubble-skill-foreground": readableMessageAccent(
-      c.messageAction,
-      c.messageSurface,
-    ),
+    "--color-user-bubble-skill-foreground": readableTextColor(c.messageAction, c.messageSurface),
     "--color-backdrop": withAlpha("#000000", appearance === "dark" ? 0.48 : 0.22),
-    "--color-drawer": withAlpha(c.sidebar, 0.99),
+    "--color-drawer": c.sidebar,
+    "--color-drawer-foreground": c.sidebarForeground,
+    "--color-drawer-foreground-muted": readableTextColor(c.sidebarMutedForeground, [
+      c.sidebar,
+      c.sidebarRowHover,
+    ]),
+    "--color-drawer-border": c.sidebarBorder,
     "--color-drawer-shadow": withAlpha("#000000", appearance === "dark" ? 0.32 : 0.12),
     "--color-dot-separator": withAlpha(c.textMuted, 0.35),
     "--color-wordmark": c.text,
@@ -318,14 +350,45 @@ export const MOBILE_THEME_VARIABLE_NAMES = Object.keys(
   createMobileThemeVariables(T3_CHAT_THEME.colors, "light"),
 ) as ReadonlyArray<MobileThemeVariable>;
 
+export function getMobileThemeColors(
+  themeId: SharedMobileThemeId,
+  appearance: MobileThemeAppearance,
+): ThemeColors {
+  if (themeId === DEFAULT_MOBILE_THEME_ID) {
+    return appearance === "dark" ? T3_CODE_DARK_THEME_COLORS : T3_CODE_LIGHT_THEME_COLORS;
+  }
+  const theme = BUILT_IN_THEMES.find((candidate) => candidate.id === themeId) ?? T3_CHAT_THEME;
+  return getThemeColorsForAppearance(theme, appearance) ?? theme.colors;
+}
+
 export function getMobileThemeVariables(
-  themeId: BuiltInThemeId,
+  themeId: SharedMobileThemeId,
   appearance: MobileThemeAppearance,
   overrides: Partial<MobileThemeVariables> | null = null,
 ): MobileThemeVariables {
-  const theme = BUILT_IN_THEMES.find((candidate) => candidate.id === themeId) ?? T3_CHAT_THEME;
-  const colors = getThemeColorsForAppearance(theme, appearance) ?? theme.colors;
-  const baseVariables = createMobileThemeVariables(colors, appearance);
+  const colors = getMobileThemeColors(themeId, appearance);
+  // Mobile settings groups and fallback materials use tonal fills where desktop
+  // uses outlined cards. Regular cards retain their shared desktop surface.
+  const groupedCard =
+    themeId === DEFAULT_MOBILE_THEME_ID
+      ? appearance === "light"
+        ? colors.toolbarControlHover
+        : colors.sidebarRowActive
+      : colors.surface;
+  const mobileColors =
+    themeId === DEFAULT_MOBILE_THEME_ID
+      ? {
+          ...colors,
+          messageSurface: flattenThemeColor(
+            themeColorWithAlpha(
+              appearance === "dark" ? colors.sidebarRowActive : colors.border,
+              0.3,
+            ),
+            colors.messageSurface,
+          ),
+        }
+      : colors;
+  const baseVariables = createMobileThemeVariables(mobileColors, appearance, groupedCard);
 
   // The complete base record guarantees that optional overrides cannot leave a token undefined.
   return overrides ? ({ ...baseVariables, ...overrides } as MobileThemeVariables) : baseVariables;
diff --git a/apps/mobile/src/lib/mobileThemeVariables.test.ts b/apps/mobile/src/lib/mobileThemeVariables.test.ts
index 6cd457d899dd..1fecf3074b44 100644
--- a/apps/mobile/src/lib/mobileThemeVariables.test.ts
+++ b/apps/mobile/src/lib/mobileThemeVariables.test.ts
@@ -5,11 +5,11 @@ import { getMobileThemeVariables, MOBILE_THEME_IDS, themeColorWithAlpha } from "
 import { getMobileThemeRuntimeVariables } from "./mobileThemeVariables";
 
 describe("mobile theme runtime variables", () => {
-  it("derives the standard runtime palette from global.css", () => {
-    expect(getMobileThemeRuntimeVariables("t3-code", "light", "ios")).toEqual(
+  it("matches the standard base palette to the generated stylesheet", () => {
+    expect(getMobileThemeRuntimeVariables("t3-code", "light", "web")).toEqual(
       readDefaultMobileThemeVariables("light"),
     );
-    expect(getMobileThemeRuntimeVariables("t3-code", "dark", "ios")).toEqual(
+    expect(getMobileThemeRuntimeVariables("t3-code", "dark", "web")).toEqual(
       readDefaultMobileThemeVariables("dark"),
     );
   });
@@ -27,18 +27,22 @@ describe("mobile theme runtime variables", () => {
     "keeps %s colors on Android with an opaque Material frame",
     (themeId) => {
       for (const appearance of ["light", "dark"] as const) {
-        const ios = getMobileThemeRuntimeVariables(themeId, appearance, "ios");
+        const base = getMobileThemeVariables(
+          themeId === "material-you" ? "t3-code" : themeId,
+          appearance,
+        );
         const android = getMobileThemeRuntimeVariables(themeId, appearance, "android");
         expect(android).toEqual({
-          ...ios,
+          ...base,
           "--color-header": themeColorWithAlpha(
-            ios[
+            base[
               themeId === "t3-code" || themeId === "material-you"
-                ? "--color-card"
+                ? "--color-row-hover"
                 : "--color-drawer"
             ],
             1,
           ),
+          "--color-header-foreground": base["--color-drawer-foreground"],
         });
         expect(android["--color-header"]).toMatch(/^rgba\(\d+, \d+, \d+, 1\)$/);
       }
@@ -46,13 +50,52 @@ describe("mobile theme runtime variables", () => {
   );
 
   it.each(["t3-code", "material-you"] as const)(
-    "keeps the %s default dark frame distinct from the rounded settings body",
+    "keeps the %s default Material frame distinct in both appearances",
+    (themeId) => {
+      for (const appearance of ["light", "dark"] as const) {
+        const variables = getMobileThemeRuntimeVariables(themeId, appearance, "android");
+        expect(variables["--color-header"]).toBe(
+          appearance === "light" ? "rgba(244, 244, 245, 1)" : "rgba(20, 20, 20, 1)",
+        );
+        for (const pane of ["--color-screen", "--color-sheet-solid", "--color-drawer"] as const) {
+          expect(variables["--color-header"]).not.toBe(themeColorWithAlpha(variables[pane], 1));
+        }
+      }
+    },
+  );
+
+  it.each(["t3-code", "material-you"] as const)(
+    "adapts %s iPad chrome without reversing the dark desktop hierarchy",
     (themeId) => {
-      const variables = getMobileThemeRuntimeVariables(themeId, "dark", "android");
-      expect(variables["--color-header"]).toBe("rgba(23, 23, 23, 1)");
-      expect(variables["--color-header"]).not.toBe(
-        themeColorWithAlpha(variables["--color-sheet-solid"], 1),
-      );
+      for (const appearance of ["light", "dark"] as const) {
+        const ios = getMobileThemeRuntimeVariables(themeId, appearance, "ios");
+        const android = getMobileThemeRuntimeVariables(themeId, appearance, "android");
+        if (appearance === "light") {
+          expect(ios["--color-drawer"]).toBe(android["--color-header"]);
+          expect(ios["--color-header"]).toBe(android["--color-header"]);
+          expect(ios["--color-header-foreground"]).toBe(ios["--color-drawer-foreground"]);
+        } else {
+          expect(ios).toEqual(getMobileThemeVariables("t3-code", appearance));
+          expect(ios["--color-drawer"]).toBe(android["--color-drawer"]);
+          expect(ios["--color-drawer"]).toBe("#000000");
+          expect(ios["--color-thread-canvas"]).toBe("#0a0a0a");
+        }
+        expect(themeColorWithAlpha(ios["--color-thread-hover"], 1)).not.toBe(
+          themeColorWithAlpha(ios["--color-drawer"], 1),
+        );
+        expect(themeColorWithAlpha(ios["--color-thread-hover"], 1)).not.toBe(
+          themeColorWithAlpha(ios["--color-thread-selected"], 1),
+        );
+        for (const role of [
+          "--color-screen",
+          "--color-thread-canvas",
+          "--color-card",
+          "--color-composer-surface",
+          "--color-grouped-card",
+        ] as const) {
+          expect(ios[role]).toBe(android[role]);
+        }
+      }
     },
   );
 });
diff --git a/apps/mobile/src/lib/mobileThemeVariables.ts b/apps/mobile/src/lib/mobileThemeVariables.ts
index a623c1df379c..15096c0fd1bc 100644
--- a/apps/mobile/src/lib/mobileThemeVariables.ts
+++ b/apps/mobile/src/lib/mobileThemeVariables.ts
@@ -14,8 +14,8 @@ const defaults = defaultThemeVariables as Readonly<
 
 /**
  * Complete palette for native and third-party APIs that cannot consume a
- * Uniwind className. The standard palette is generated from global.css; custom
- * palettes share the same source that generates their registered CSS themes.
+ * Uniwind className. Every palette shares the source that generates its
+ * registered CSS theme.
  */
 export function getMobileThemeRuntimeVariables(
   themeId: MobileThemeId,
@@ -26,16 +26,27 @@ export function getMobileThemeRuntimeVariables(
   const variables = usesDefaultPalette
     ? defaults[appearance]
     : getMobileThemeVariables(themeId, appearance);
+  // Android's frame surrounds the sidebar and chat panes. Light iPad sidebars
+  // reuse that stronger tonal fill; dark sidebars retain the shared black pane
+  // beneath the near-black chat canvas. System colors replace these roles later.
+  const frame = themeColorWithAlpha(
+    variables[usesDefaultPalette ? "--color-row-hover" : "--color-drawer"],
+    1,
+  );
+  if (platform === "ios" && usesDefaultPalette && appearance === "light") {
+    return {
+      ...variables,
+      "--color-header": frame,
+      "--color-header-foreground": variables["--color-drawer-foreground"],
+      "--color-drawer": frame,
+      "--color-drawer-foreground-muted": variables["--color-foreground-muted"],
+    };
+  }
   if (platform !== "android") return variables;
 
-  // Rounded panes share one opaque frame. The default dark drawer matches the
-  // settings body, so use its card tone to keep the rounded edge visible.
-  // System colors replace this with their own surfaceContainerHigh afterwards.
   return {
     ...variables,
-    "--color-header": themeColorWithAlpha(
-      variables[usesDefaultPalette ? "--color-card" : "--color-drawer"],
-      1,
-    ),
+    "--color-header": frame,
+    "--color-header-foreground": variables["--color-drawer-foreground"],
   };
 }
diff --git a/apps/mobile/src/lib/nativeComposerTheme.test.ts b/apps/mobile/src/lib/nativeComposerTheme.test.ts
new file mode 100644
index 000000000000..785293b96420
--- /dev/null
+++ b/apps/mobile/src/lib/nativeComposerTheme.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vite-plus/test";
+import { MOBILE_THEME_IDS } from "@t3tools/shared/themePalettes";
+
+import { getMobileThemeVariables } from "./mobileTheme";
+import { createNativeComposerTheme } from "./nativeComposerTheme";
+
+describe("native composer colors", () => {
+  it.each(MOBILE_THEME_IDS)("delivers parsable colors for %s in both appearances", (themeId) => {
+    for (const appearance of ["light", "dark"] as const) {
+      const variables = getMobileThemeVariables(themeId, appearance);
+      const theme = createNativeComposerTheme(variables);
+      for (const color of Object.values(theme)) expect(color).toMatch(/^#[\da-f]{6}$/i);
+      expect(theme.text).toBe(variables["--color-foreground"]);
+      expect(theme.skillBorder).not.toBe(theme.skillBackground);
+    }
+  });
+
+  it("flattens Material You alpha colors over the composer rather than falling back to defaults", () => {
+    const theme = createNativeComposerTheme({
+      ...getMobileThemeVariables("t3-code", "light"),
+      "--color-screen": "#ffffffff",
+      "--color-composer-surface": "#ffffffff",
+      "--color-subtle": "#0000000d",
+      "--color-placeholder": "#0000009e",
+      "--color-inline-skill-background": "#ffffffff",
+      "--color-inline-skill-border": "#00000080",
+    });
+    expect(theme.chipBackground).toBe("#f2f2f2");
+    expect(theme.placeholder).toBe("#616161");
+    expect(theme.skillBorder).toBe("#7f7f7f");
+  });
+});
diff --git a/apps/mobile/src/lib/nativeComposerTheme.ts b/apps/mobile/src/lib/nativeComposerTheme.ts
new file mode 100644
index 000000000000..80e252f0d234
--- /dev/null
+++ b/apps/mobile/src/lib/nativeComposerTheme.ts
@@ -0,0 +1,19 @@
+import { flattenThemeColor, type MobileThemeVariables } from "./mobileTheme";
+
+/** Native chip parsers need opaque hex instead of CSS rgba or platform-specific alpha order. */
+export function createNativeComposerTheme(theme: MobileThemeVariables) {
+  const surface = flattenThemeColor(theme["--color-composer-surface"], theme["--color-screen"]);
+  const chipBackground = flattenThemeColor(theme["--color-subtle"], surface);
+  const skillBackground = flattenThemeColor(theme["--color-inline-skill-background"], surface);
+  return {
+    text: flattenThemeColor(theme["--color-foreground"], surface),
+    placeholder: flattenThemeColor(theme["--color-placeholder"], surface),
+    chipBackground,
+    chipBorder: flattenThemeColor(theme["--color-border"], chipBackground),
+    chipText: flattenThemeColor(theme["--color-foreground"], chipBackground),
+    skillBackground,
+    skillBorder: flattenThemeColor(theme["--color-inline-skill-border"], skillBackground),
+    skillText: flattenThemeColor(theme["--color-inline-skill-foreground"], skillBackground),
+    fileTint: flattenThemeColor(theme["--color-icon-muted"], chipBackground),
+  };
+}
diff --git a/apps/mobile/src/lib/useMobileNavigationTheme.ts b/apps/mobile/src/lib/useMobileNavigationTheme.ts
index 7b7a1fdf3cf6..5565c7aefd0e 100644
--- a/apps/mobile/src/lib/useMobileNavigationTheme.ts
+++ b/apps/mobile/src/lib/useMobileNavigationTheme.ts
@@ -10,7 +10,7 @@ import { useUniwindTheme } from "./useUniwindTheme";
  * preferences provider applies the registered Uniwind theme first, then
  * publishes this matching navigation palette through React.
  */
-export function useMobileNavigationTheme(): Theme {
+export function useMobileNavigationTheme(surface: "screen" | "sidebar" = "screen"): Theme {
   const { themeAppearance: appearance } = useAppearancePreferences();
   const variables = useUniwindTheme();
   return useMemo(() => {
@@ -19,13 +19,16 @@ export function useMobileNavigationTheme(): Theme {
       ...base,
       colors: {
         ...base.colors,
-        primary: variables["--color-primary"],
-        background: variables["--color-screen"],
-        card: variables["--color-sheet-solid"],
-        text: variables["--color-foreground"],
-        border: variables["--color-header-border"],
+        primary: variables["--color-primary-text"],
+        background: variables[surface === "sidebar" ? "--color-drawer" : "--color-screen"],
+        card: variables[surface === "sidebar" ? "--color-drawer" : "--color-sheet-solid"],
+        text: variables[
+          surface === "sidebar" ? "--color-drawer-foreground" : "--color-header-foreground"
+        ],
+        border:
+          variables[surface === "sidebar" ? "--color-drawer-border" : "--color-header-border"],
         notification: variables["--color-danger-foreground"],
       },
     };
-  }, [appearance, variables]);
+  }, [appearance, surface, variables]);
 }
diff --git a/apps/mobile/src/native/SelectableMarkdownText.android.tsx b/apps/mobile/src/native/SelectableMarkdownText.android.tsx
index 35586489623d..17788da414ed 100644
--- a/apps/mobile/src/native/SelectableMarkdownText.android.tsx
+++ b/apps/mobile/src/native/SelectableMarkdownText.android.tsx
@@ -24,8 +24,8 @@ export function hasNativeSelectableMarkdownText(): boolean {
 
 export function SelectableMarkdownText(props: MobileSelectableMarkdownTextProps) {
   const theme = useUniwindTheme();
-  const selectionColor = themeColorWithAlpha(theme["--color-primary"], 0.32);
-  const selectionHandleColor = theme["--color-primary"];
+  const selectionColor = themeColorWithAlpha(theme["--color-focus"], 0.32);
+  const selectionHandleColor = theme["--color-focus"];
   const textStyle = useMemo(
     () => ({ selectionColor, selectionHandleColor, ...props.textStyle }),
     [props.textStyle, selectionColor, selectionHandleColor],
diff --git a/apps/mobile/src/native/T3ComposerEditor.ios.tsx b/apps/mobile/src/native/T3ComposerEditor.ios.tsx
index 30bc42f93e49..5b1a28d5df1c 100644
--- a/apps/mobile/src/native/T3ComposerEditor.ios.tsx
+++ b/apps/mobile/src/native/T3ComposerEditor.ios.tsx
@@ -22,7 +22,7 @@ import {
 } from "@t3tools/mobile-markdown-text/markdown";
 import { resolveMarkdownFileIcon } from "@t3tools/mobile-markdown-text/links";
 import { useUniwindTheme } from "../lib/useUniwindTheme";
-import { flattenThemeColor } from "../lib/mobileTheme";
+import { createNativeComposerTheme } from "../lib/nativeComposerTheme";
 import { useFontFamily } from "../lib/useFontFamily";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
 import {
@@ -257,18 +257,7 @@ export function ComposerEditor({
     },
     [],
   );
-  const themeJson = JSON.stringify({
-    text: theme["--color-foreground"],
-    placeholder: theme["--color-placeholder"],
-    chipBackground: theme["--color-subtle"],
-    // Native chip drawing parses opaque hex only, and this role is translucent.
-    chipBorder: flattenThemeColor(theme["--color-border"], theme["--color-user-bubble"]),
-    chipText: theme["--color-foreground"],
-    skillBackground: theme["--color-inline-skill-background"],
-    skillBorder: theme["--color-inline-skill-border"],
-    skillText: theme["--color-inline-skill-foreground"],
-    fileTint: theme["--color-icon-muted"],
-  });
+  const themeJson = JSON.stringify(createNativeComposerTheme(theme));
   const resolvedTextStyle = StyleSheet.flatten(textStyle) ?? {};
   return (
     <NativeView
diff --git a/apps/mobile/src/native/T3ComposerEditor.native.tsx b/apps/mobile/src/native/T3ComposerEditor.native.tsx
index 490f47bd8a25..7f18bae0570a 100644
--- a/apps/mobile/src/native/T3ComposerEditor.native.tsx
+++ b/apps/mobile/src/native/T3ComposerEditor.native.tsx
@@ -27,7 +27,7 @@ import { useNativePaste } from "../lib/useNativePaste";
 import { useFontFamily } from "../lib/useFontFamily";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import { useUniwindTheme } from "../lib/useUniwindTheme";
-import { flattenThemeColor } from "../lib/mobileTheme";
+import { createNativeComposerTheme } from "../lib/nativeComposerTheme";
 import {
   acknowledgeComposerNativeEvent,
   assumeComposerControlledState,
@@ -259,17 +259,8 @@ export function ComposerEditor({
   );
   const { systemColorsActive } = useAppearancePreferences();
   const themeJson = JSON.stringify({
-    selection: Platform.OS === "android" || systemColorsActive ? theme["--color-primary"] : null,
-    text: theme["--color-foreground"],
-    placeholder: theme["--color-placeholder"],
-    chipBackground: theme["--color-subtle"],
-    // Native chip drawing parses opaque hex only, and this role is translucent.
-    chipBorder: flattenThemeColor(theme["--color-border"], theme["--color-user-bubble"]),
-    chipText: theme["--color-foreground"],
-    skillBackground: theme["--color-inline-skill-background"],
-    skillBorder: theme["--color-inline-skill-border"],
-    skillText: theme["--color-inline-skill-foreground"],
-    fileTint: theme["--color-icon-muted"],
+    ...createNativeComposerTheme(theme),
+    selection: Platform.OS === "android" || systemColorsActive ? theme["--color-focus"] : null,
   });
   const resolvedTextStyle = StyleSheet.flatten(textStyle) ?? {};
   const regularFontFamily = useFontFamily("regular");
diff --git a/apps/web/src/themePalette.test.ts b/apps/web/src/themePalette.test.ts
index e1d9bfb74cab..de26d531c6f5 100644
--- a/apps/web/src/themePalette.test.ts
+++ b/apps/web/src/themePalette.test.ts
@@ -103,6 +103,21 @@ describe("theme files", () => {
     });
   });
 
+  it("keeps the stock sidebar and chat on distinct surfaces in both appearances", () => {
+    expectThemeColors(getStandardThemeColors("light"), {
+      canvas: "#fcfcfc",
+      sidebar: "#fafafa",
+      sidebarRowActive: "#ffffff",
+      messageSurface: "#f4f4f5",
+    });
+    expectThemeColors(getStandardThemeColors("dark"), {
+      canvas: "#0a0a0a",
+      sidebar: "#000000",
+      sidebarRowActive: "#1a1b1b",
+      messageSurface: "#141414",
+    });
+  });
+
   it("derives readable, distinctive vivid palettes from exact seeds", () => {
     const seeds: ReadonlyArray<["light" | "dark", string, string]> = [
       ["light", "#f4f9f2", "#1d8a4e"],
diff --git a/apps/web/src/themePalette.ts b/apps/web/src/themePalette.ts
index 4de6dd7bd532..d4a1c4e8cc00 100644
--- a/apps/web/src/themePalette.ts
+++ b/apps/web/src/themePalette.ts
@@ -9,6 +9,8 @@ import {
   IRIS_THEME,
   OCEAN_THEME,
   T3_CHAT_THEME,
+  T3_CODE_LIGHT_THEME_COLORS,
+  T3_CODE_DARK_THEME_COLORS,
   RESERVED_THEME_IDS,
   THEME_COLOR_ROLES,
   type ThemeAppearance,
@@ -326,133 +328,6 @@ function legacyThemeMode(theme: ThemePreference): ThemeAppearance | null {
   return theme === LEGACY_T3_CHAT_DARK_THEME_ID ? "dark" : null;
 }
 
-/**
- * The palette T3 Code wears with no theme installed, captured from the app's
- * stock tokens (index.css) so a draft seeded from the default look paints the
- * pixels the user is already seeing. Alpha-bearing tokens are flattened over
- * their real backdrops (canvas, or the sidebar for its rows) because theme
- * colors are stored as opaque OKLCH tokens.
- */
-const T3_CODE_LIGHT_THEME_COLORS: ThemeColors = {
-  canvas: "#fcfcfc",
-  chrome: "#fcfcfc",
-  toolbar: "#fcfcfc",
-  toolbarForeground: "#27272a",
-  toolbarBorder: "#e4e4e7",
-  toolbarControl: "#ffffff",
-  toolbarControlForeground: "#27272a",
-  toolbarControlHover: "#f4f4f5",
-  surface: "#ffffff",
-  surfaceRaised: "#fcfcfc",
-  surfaceOverlay: "#ffffff",
-  text: "#27272a",
-  textMuted: "#71717b",
-  border: "#e4e4e7",
-  input: "#d4d4d8",
-  focus: "#1b4ed8",
-  accent: "#1b4ed8",
-  accentForeground: "#ffffff",
-  secondary: "#fafafa",
-  secondaryForeground: "#27272a",
-  muted: "#fafafa",
-  mutedForeground: "#71717b",
-  placeholder: "#71717b",
-  secondaryLabel: "#71717b",
-  iconMuted: "#71717b",
-  error: "#fb2c36",
-  errorForeground: "#c10007",
-  errorSurface: "#fcebec",
-  warning: "#fe9a00",
-  warningForeground: "#bb4d00",
-  warningSurface: "#fcf4e8",
-  update: "#1b4ed8",
-  updateForeground: "#1b4ed8",
-  updateSurface: "#e0e6f7",
-  accentSurface: "#f4f4f5",
-  accentSurfaceForeground: "#18181b",
-  messageSurface: "#f4f4f5",
-  messageForeground: "#27272a",
-  messageAction: "#1b4ed8",
-  messageActionForeground: "#ffffff",
-  messageActionHover: "#3160db",
-  codeBackground: "#ffffff",
-  codeForeground: "#27272a",
-  sidebar: "#fafafa",
-  sidebarForeground: "#27272a",
-  sidebarMutedForeground: "#71717b",
-  sidebarControlSurface: "#f4f4f5",
-  sidebarRowHover: "#fcfcfc",
-  sidebarRowActive: "#ffffff",
-  sidebarRowSelected: "#ffffff",
-  sidebarBorder: "#e4e4e7",
-  terminalBackground: "#fcfcfc",
-  terminalForeground: "#27272a",
-  terminalCursor: "#26384e",
-  terminalSelection: "#d0d6dd",
-  terminalScrollbar: "#d6d6d6",
-  terminalScrollbarHover: "#bdbdbd",
-};
-
-const T3_CODE_DARK_THEME_COLORS: ThemeColors = {
-  canvas: "#0a0a0a",
-  chrome: "#0a0a0a",
-  toolbar: "#0a0a0a",
-  toolbarForeground: "#f5f5f5",
-  toolbarBorder: "#191919",
-  toolbarControl: "#111111",
-  toolbarControlForeground: "#f5f5f5",
-  toolbarControlHover: "#141414",
-  surface: "#111111",
-  surfaceRaised: "#111111",
-  surfaceOverlay: "#111111",
-  text: "#f5f5f5",
-  textMuted: "#818181",
-  border: "#191919",
-  input: "#1e1e1e",
-  focus: "#346bf1",
-  accent: "#346bf1",
-  accentForeground: "#ffffff",
-  secondary: "#111111",
-  secondaryForeground: "#f5f5f5",
-  muted: "#111111",
-  mutedForeground: "#818181",
-  placeholder: "#818181",
-  secondaryLabel: "#818181",
-  iconMuted: "#818181",
-  error: "#fb414a",
-  errorForeground: "#ff6467",
-  errorSurface: "#301214",
-  warning: "#fe9a00",
-  warningForeground: "#ffb900",
-  warningSurface: "#312108",
-  update: "#346bf1",
-  updateForeground: "#51a2ff",
-  updateSurface: "#121b34",
-  accentSurface: "#141414",
-  accentSurfaceForeground: "#f5f5f5",
-  messageSurface: "#141414",
-  messageForeground: "#f5f5f5",
-  messageAction: "#346bf1",
-  messageActionForeground: "#ffffff",
-  messageActionHover: "#3061d9",
-  codeBackground: "#111111",
-  codeForeground: "#f5f5f5",
-  sidebar: "#000000",
-  sidebarForeground: "#f1f3f7",
-  sidebarMutedForeground: "#a3a3a3",
-  sidebarControlSurface: "#0a0a0a",
-  sidebarRowHover: "#131313",
-  sidebarRowActive: "#1a1b1b",
-  sidebarRowSelected: "#111111",
-  sidebarBorder: "#141414",
-  terminalBackground: "#0a0a0a",
-  terminalForeground: "#f5f5f5",
-  terminalCursor: "#b4cbff",
-  terminalSelection: "#343a47",
-  terminalScrollbar: "#222222",
-  terminalScrollbarHover: "#363636",
-};
-
 /**
  * The standard T3 Code look as a theme palette, for seeding a new theme when
  * no theme is installed. Distinct from {@link getDefaultThemeColors}, which
diff --git a/packages/shared/src/themePalettes.ts b/packages/shared/src/themePalettes.ts
index 73b73a4de91e..b26244c04641 100644
--- a/packages/shared/src/themePalettes.ts
+++ b/packages/shared/src/themePalettes.ts
@@ -1,6 +1,6 @@
 export const BUILT_IN_THEME_IDS = ["t3-chat", "grove", "ocean", "ember", "iris"] as const;
 
-/** The mobile app's own hand-tuned palette, which is not part of the built-in library. */
+/** The standard T3 Code palette, kept separate from the optional built-in theme library. */
 export const MOBILE_DEFAULT_THEME_ID = "t3-code";
 
 /**
@@ -121,6 +121,133 @@ export type ThemeDefinition = Readonly<{
   managed?: boolean;
 }>;
 
+/**
+ * The palette T3 Code wears with no theme installed, captured from the app's
+ * stock tokens (index.css) so a draft seeded from the default look paints the
+ * pixels the user is already seeing. Alpha-bearing tokens are flattened over
+ * their real backdrops (canvas, or the sidebar for its rows) because theme
+ * colors are stored as opaque OKLCH tokens.
+ */
+export const T3_CODE_LIGHT_THEME_COLORS: ThemeColors = {
+  canvas: "#fcfcfc",
+  chrome: "#fcfcfc",
+  toolbar: "#fcfcfc",
+  toolbarForeground: "#27272a",
+  toolbarBorder: "#e4e4e7",
+  toolbarControl: "#ffffff",
+  toolbarControlForeground: "#27272a",
+  toolbarControlHover: "#f4f4f5",
+  surface: "#ffffff",
+  surfaceRaised: "#fcfcfc",
+  surfaceOverlay: "#ffffff",
+  text: "#27272a",
+  textMuted: "#71717b",
+  border: "#e4e4e7",
+  input: "#d4d4d8",
+  focus: "#1b4ed8",
+  accent: "#1b4ed8",
+  accentForeground: "#ffffff",
+  secondary: "#fafafa",
+  secondaryForeground: "#27272a",
+  muted: "#fafafa",
+  mutedForeground: "#71717b",
+  placeholder: "#71717b",
+  secondaryLabel: "#71717b",
+  iconMuted: "#71717b",
+  error: "#fb2c36",
+  errorForeground: "#c10007",
+  errorSurface: "#fcebec",
+  warning: "#fe9a00",
+  warningForeground: "#bb4d00",
+  warningSurface: "#fcf4e8",
+  update: "#1b4ed8",
+  updateForeground: "#1b4ed8",
+  updateSurface: "#e0e6f7",
+  accentSurface: "#f4f4f5",
+  accentSurfaceForeground: "#18181b",
+  messageSurface: "#f4f4f5",
+  messageForeground: "#27272a",
+  messageAction: "#1b4ed8",
+  messageActionForeground: "#ffffff",
+  messageActionHover: "#3160db",
+  codeBackground: "#ffffff",
+  codeForeground: "#27272a",
+  sidebar: "#fafafa",
+  sidebarForeground: "#27272a",
+  sidebarMutedForeground: "#71717b",
+  sidebarControlSurface: "#f4f4f5",
+  sidebarRowHover: "#fcfcfc",
+  sidebarRowActive: "#ffffff",
+  sidebarRowSelected: "#ffffff",
+  sidebarBorder: "#e4e4e7",
+  terminalBackground: "#fcfcfc",
+  terminalForeground: "#27272a",
+  terminalCursor: "#26384e",
+  terminalSelection: "#d0d6dd",
+  terminalScrollbar: "#d6d6d6",
+  terminalScrollbarHover: "#bdbdbd",
+};
+
+export const T3_CODE_DARK_THEME_COLORS: ThemeColors = {
+  canvas: "#0a0a0a",
+  chrome: "#0a0a0a",
+  toolbar: "#0a0a0a",
+  toolbarForeground: "#f5f5f5",
+  toolbarBorder: "#191919",
+  toolbarControl: "#111111",
+  toolbarControlForeground: "#f5f5f5",
+  toolbarControlHover: "#141414",
+  surface: "#111111",
+  surfaceRaised: "#111111",
+  surfaceOverlay: "#111111",
+  text: "#f5f5f5",
+  textMuted: "#818181",
+  border: "#191919",
+  input: "#1e1e1e",
+  focus: "#346bf1",
+  accent: "#346bf1",
+  accentForeground: "#ffffff",
+  secondary: "#111111",
+  secondaryForeground: "#f5f5f5",
+  muted: "#111111",
+  mutedForeground: "#818181",
+  placeholder: "#818181",
+  secondaryLabel: "#818181",
+  iconMuted: "#818181",
+  error: "#fb414a",
+  errorForeground: "#ff6467",
+  errorSurface: "#301214",
+  warning: "#fe9a00",
+  warningForeground: "#ffb900",
+  warningSurface: "#312108",
+  update: "#346bf1",
+  updateForeground: "#51a2ff",
+  updateSurface: "#121b34",
+  accentSurface: "#141414",
+  accentSurfaceForeground: "#f5f5f5",
+  messageSurface: "#141414",
+  messageForeground: "#f5f5f5",
+  messageAction: "#346bf1",
+  messageActionForeground: "#ffffff",
+  messageActionHover: "#3061d9",
+  codeBackground: "#111111",
+  codeForeground: "#f5f5f5",
+  sidebar: "#000000",
+  sidebarForeground: "#f1f3f7",
+  sidebarMutedForeground: "#a3a3a3",
+  sidebarControlSurface: "#0a0a0a",
+  sidebarRowHover: "#131313",
+  sidebarRowActive: "#1a1b1b",
+  sidebarRowSelected: "#111111",
+  sidebarBorder: "#141414",
+  terminalBackground: "#0a0a0a",
+  terminalForeground: "#f5f5f5",
+  terminalCursor: "#b4cbff",
+  terminalSelection: "#343a47",
+  terminalScrollbar: "#222222",
+  terminalScrollbarHover: "#363636",
+};
+
 export const T3_CHAT_THEME: ThemeDefinition = {
   id: "t3-chat",
   label: "T3 Chat",

From 82059df1523d070b00ab6f45159115f626a4977e Mon Sep 17 00:00:00 2001
From: Yordis Prieto <yordis.prieto@gmail.com>
Date: Sat, 19 Sep 2026 00:33:50 -0400
Subject: [PATCH 13/25] feat(desktop): export main process telemetry over OTLP
 (#12520)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
---
 .../src/app/DesktopObservability.test.ts      | 191 +++++++++++++++++-
 apps/desktop/src/app/DesktopObservability.ts  | 169 +++++++++++-----
 docs/operations/observability.md              |   7 +
 3 files changed, 311 insertions(+), 56 deletions(-)

diff --git a/apps/desktop/src/app/DesktopObservability.test.ts b/apps/desktop/src/app/DesktopObservability.test.ts
index cd90e7951b8d..eacf99740f3b 100644
--- a/apps/desktop/src/app/DesktopObservability.test.ts
+++ b/apps/desktop/src/app/DesktopObservability.test.ts
@@ -4,7 +4,10 @@ import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Metric from "effect/Metric";
 import * as Schema from "effect/Schema";
+import * as HttpClient from "effect/unstable/http/HttpClient";
+import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
 
 import * as DesktopConfig from "./DesktopConfig.ts";
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
@@ -49,7 +52,11 @@ const environmentInput = (baseDir: string) =>
     runningUnderArm64Translation: false,
   }) satisfies DesktopEnvironment.MakeDesktopEnvironmentInput;
 
-const makeEnvironmentLayer = (baseDir: string, isDevelopment = true) =>
+const makeEnvironmentLayer = (
+  baseDir: string,
+  isDevelopment = true,
+  env: Readonly<Record<string, string | undefined>> = {},
+) =>
   DesktopEnvironment.layer(environmentInput(baseDir)).pipe(
     Layer.provide(
       Layer.mergeAll(
@@ -57,11 +64,57 @@ const makeEnvironmentLayer = (baseDir: string, isDevelopment = true) =>
         DesktopConfig.layerTest({
           T3CODE_HOME: baseDir,
           VITE_DEV_SERVER_URL: isDevelopment ? "http://127.0.0.1:5733" : undefined,
+          ...env,
         }),
       ),
     ),
   );
 
+interface ExportedRequest {
+  readonly url: string;
+  readonly headers: Readonly<Record<string, string>>;
+  readonly body: string;
+}
+
+/** Answers every export with a 200 and keeps what was posted for assertions. */
+const collectorLayer = (requests: Array<ExportedRequest>) =>
+  Layer.succeed(
+    HttpClient.HttpClient,
+    HttpClient.make((request) =>
+      Effect.sync(() => {
+        requests.push({
+          url: request.url,
+          headers: request.headers,
+          body:
+            request.body._tag === "Uint8Array" ? new TextDecoder().decode(request.body.body) : "",
+        });
+        return HttpClientResponse.fromWeb(request, new Response(null, { status: 200 }));
+      }),
+    ),
+  );
+
+const encodeObservabilitySettingsFile = Schema.encodeSync(
+  Schema.fromJsonString(
+    Schema.Struct({ observability: Schema.Record(Schema.String, Schema.String) }),
+  ),
+);
+
+const writeObservabilitySettings = Effect.fn(function* (
+  environmentLayer: ReturnType<typeof makeEnvironmentLayer>,
+  observability: Readonly<Record<string, string>>,
+) {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const { path, serverSettingsPath } = yield* Effect.gen(function* () {
+    const environment = yield* DesktopEnvironment.DesktopEnvironment;
+    return environment;
+  }).pipe(Effect.provide(environmentLayer));
+  yield* fileSystem.makeDirectory(path.dirname(serverSettingsPath), { recursive: true });
+  yield* fileSystem.writeFileString(
+    serverSettingsPath,
+    encodeObservabilitySettingsFile({ observability }),
+  );
+});
+
 describe("DesktopObservability", () => {
   it("advances a retained output offset instead of repeatedly copying a full head chunk", () => {
     const maxBufferedBytes = 1024 * 1024;
@@ -328,4 +381,140 @@ describe("DesktopObservability", () => {
       Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici)),
     ),
   );
+
+  it.effect("exports main process log records to the configured logs endpoint", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
+        T3CODE_OTLP_LOGS_URL: "https://collector.example.com/v1/logs",
+        T3CODE_OTLP_HEADERS: "x-scope=desktop",
+      });
+      const tracePath = yield* Effect.gen(function* () {
+        const environment = yield* DesktopEnvironment.DesktopEnvironment;
+        return environment.path.join(environment.logDir, "desktop.trace.ndjson");
+      }).pipe(Effect.provide(environmentLayer));
+
+      yield* Effect.scoped(
+        Effect.logInfo("desktop log export").pipe(
+          Effect.withSpan("desktop-log-export-test"),
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.lengthOf(requests, 1);
+      const [request] = requests;
+      assert.strictEqual(request?.url, "https://collector.example.com/v1/logs");
+      assert.include(request?.body ?? "", "desktop log export");
+      assert.include(request?.body ?? "", "service.runtime");
+      assert.strictEqual(request?.headers["x-scope"], "desktop");
+
+      // The log record is the export now, so the same message must not also
+      // ride along as an event on the span.
+      const record = (yield* fileSystem.readFileString(tracePath))
+        .trim()
+        .split("\n")
+        .filter((line) => line.length > 0)
+        .map((line) => decodeTraceRecordLine(line))
+        .find((entry) => entry.name === "desktop-log-export-test");
+      assert.notEqual(record, undefined);
+      assert.lengthOf(record?.events ?? [], 0);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+    );
+  });
+
+  it.effect("exports main process metrics to the configured metrics endpoint", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
+        T3CODE_OTLP_METRICS_URL: "https://collector.example.com/v1/metrics",
+      });
+
+      yield* Effect.scoped(
+        Metric.update(Metric.counter("desktop_metrics_export_test_total"), 1).pipe(
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.lengthOf(requests, 1);
+      assert.strictEqual(requests[0]?.url, "https://collector.example.com/v1/metrics");
+      assert.include(requests[0]?.body ?? "", "desktop_metrics_export_test_total");
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+    );
+  });
+
+  it.effect("reads every signal endpoint from Settings when the environment names none", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir);
+      yield* writeObservabilitySettings(environmentLayer, {
+        otlpLogsUrl: "https://settings.example.com/v1/logs",
+        otlpMetricsUrl: "https://settings.example.com/v1/metrics",
+      });
+
+      yield* Effect.scoped(
+        Effect.gen(function* () {
+          yield* Effect.logInfo("desktop log export from settings");
+          yield* Metric.update(Metric.counter("desktop_settings_export_test_total"), 1);
+        }).pipe(
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.deepEqual(requests.map((request) => request.url).toSorted(), [
+        "https://settings.example.com/v1/logs",
+        "https://settings.example.com/v1/metrics",
+      ]);
+      assert.include(
+        requests.find((request) => request.url.endsWith("/v1/logs"))?.body ?? "",
+        "desktop log export from settings",
+      );
+      assert.include(
+        requests.find((request) => request.url.endsWith("/v1/metrics"))?.body ?? "",
+        "desktop_settings_export_test_total",
+      );
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+    );
+  });
+
+  it.effect("stays off the network when no endpoint is configured", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+
+      yield* Effect.scoped(
+        Effect.logInfo("desktop log stays local").pipe(
+          Effect.withSpan("desktop-offline-test"),
+          Effect.provide(
+            DesktopObservability.layer.pipe(Layer.provideMerge(makeEnvironmentLayer(baseDir))),
+          ),
+        ),
+      );
+
+      assert.lengthOf(requests, 0);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+    );
+  });
 });
diff --git a/apps/desktop/src/app/DesktopObservability.ts b/apps/desktop/src/app/DesktopObservability.ts
index 19ed351dffb7..62e3d865a273 100644
--- a/apps/desktop/src/app/DesktopObservability.ts
+++ b/apps/desktop/src/app/DesktopObservability.ts
@@ -4,7 +4,10 @@ import {
   makeTraceSink,
   otlpSerializationLayer,
 } from "@t3tools/shared/observability";
-import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serverSettings";
+import {
+  parsePersistedServerObservabilitySettings,
+  type PersistedServerObservabilitySettings,
+} from "@t3tools/shared/serverSettings";
 import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
@@ -21,7 +24,7 @@ import * as Scope from "effect/Scope";
 import * as Semaphore from "effect/Semaphore";
 import * as SynchronizedRef from "effect/SynchronizedRef";
 import * as Tracer from "effect/Tracer";
-import { OtlpExporter, OtlpTracer } from "effect/unstable/observability";
+import { OtlpExporter, OtlpLogger, OtlpMetrics, OtlpTracer } from "effect/unstable/observability";
 
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
 
@@ -326,28 +329,37 @@ const makeRotatingLogFileWriter = Effect.fn("makeRotatingLogFileWriter")(functio
   } satisfies RotatingLogFileWriter;
 });
 
-const readPersistedOtlpTracesUrl: Effect.Effect<
-  Option.Option<string>,
+const noPersistedObservabilitySettings: PersistedServerObservabilitySettings = {
+  otlpTracesUrl: undefined,
+  otlpMetricsUrl: undefined,
+  otlpLogsUrl: undefined,
+};
+
+const readPersistedObservabilitySettings: Effect.Effect<
+  PersistedServerObservabilitySettings,
   never,
   FileSystem.FileSystem | DesktopEnvironment.DesktopEnvironment
 > = Effect.gen(function* () {
   const fileSystem = yield* FileSystem.FileSystem;
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const raw = yield* fileSystem.readFileString(environment.serverSettingsPath).pipe(Effect.option);
-  if (Option.isNone(raw)) {
-    return Option.none();
-  }
-
-  const parsed = parsePersistedServerObservabilitySettings(raw.value);
-  return Option.fromNullishOr(parsed.otlpTracesUrl);
+  return Option.isNone(raw)
+    ? noPersistedObservabilitySettings
+    : parsePersistedServerObservabilitySettings(raw.value);
 });
 
-const resolveOtlpTracesUrl = Effect.gen(function* () {
+/**
+ * Settings is read once for all three signals, so the main process cannot
+ * resolve traces against one revision of the file and logs against another.
+ */
+const resolveOtlpEndpoints = Effect.gen(function* () {
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
-  if (Option.isSome(environment.otlpTracesUrl)) {
-    return environment.otlpTracesUrl;
-  }
-  return yield* readPersistedOtlpTracesUrl;
+  const persisted = yield* readPersistedObservabilitySettings;
+  return {
+    traces: Option.getOrUndefined(environment.otlpTracesUrl) ?? persisted.otlpTracesUrl,
+    metrics: Option.getOrUndefined(environment.otlpMetricsUrl) ?? persisted.otlpMetricsUrl,
+    logs: Option.getOrUndefined(environment.otlpLogsUrl) ?? persisted.otlpLogsUrl,
+  };
 });
 
 const writeDevelopmentConsoleOutput = (
@@ -567,53 +579,100 @@ const backendOutputLogFactoryLayer = Layer.effect(
   }),
 );
 
-const desktopLoggerLayer = Layer.mergeAll(
-  Logger.layer([Logger.consolePretty(), Logger.tracerLogger], { mergeWithExisting: false }),
-  Layer.succeed(References.MinimumLogLevel, "Info"),
-);
-
-const tracerLayer = Layer.unwrap(
+/**
+ * Logs, traces, and metrics for the main process, assembled together because
+ * they share one read of the environment and Settings, and because a process
+ * gets exactly one logger set.
+ */
+const telemetryLayer = Layer.unwrap(
   Effect.gen(function* () {
     const environment = yield* DesktopEnvironment.DesktopEnvironment;
-    const otlpTracesUrl = yield* resolveOtlpTracesUrl;
-    const tracePath = environment.path.join(environment.logDir, "desktop.trace.ndjson");
-    const sink = yield* makeTraceSink({
-      filePath: tracePath,
-      maxBytes: DESKTOP_LOG_FILE_MAX_BYTES,
-      maxFiles: DESKTOP_LOG_FILE_MAX_FILES,
-      batchWindowMs: DESKTOP_TRACE_BATCH_WINDOW_MS,
-    });
-    const delegate = Option.isNone(otlpTracesUrl)
-      ? undefined
-      : yield* OtlpTracer.make({
-          url: otlpTracesUrl.value,
-          exportInterval: `${environment.otlpExportIntervalMs} millis`,
-          headers: Option.getOrUndefined(environment.otlpHeaders),
-          resource: {
-            serviceName: "desktop",
-            attributes: {
-              "service.runtime": "desktop",
-              "service.mode": environment.isDevelopment ? "development" : "packaged",
-            },
-          },
-        }).pipe(Effect.provide(otlpSerializationLayer(environment.otlpProtocol)));
-    const tracer = yield* makeLocalFileTracer({
-      filePath: tracePath,
-      maxBytes: DESKTOP_LOG_FILE_MAX_BYTES,
-      maxFiles: DESKTOP_LOG_FILE_MAX_FILES,
-      batchWindowMs: DESKTOP_TRACE_BATCH_WINDOW_MS,
-      sink,
-      ...(delegate ? { delegate } : {}),
-    });
+    const endpoints = yield* resolveOtlpEndpoints;
+    const headers = Option.getOrUndefined(environment.otlpHeaders);
+    const serializationLayer = otlpSerializationLayer(environment.otlpProtocol);
+    const resource = {
+      serviceName: "desktop",
+      attributes: {
+        "service.runtime": "desktop",
+        "service.mode": environment.isDevelopment ? "development" : "packaged",
+      },
+    };
 
-    return Layer.succeed(Tracer.Tracer, tracer);
+    // `Logger.layer` writes the whole logger set rather than adding to it, so
+    // every logger the main process wants has to be named in this one call.
+    // Splitting the OTLP logger back out into a layer of its own silently
+    // drops either it or the console output.
+    //
+    // Swapping `Logger.tracerLogger` out for the OTLP logger matches the
+    // server: both reach a collector, but the tracer logger covers only
+    // messages logged inside a recorded span and files them under traces,
+    // while the OTLP logger carries every message as a log record stamped
+    // with its trace and span ids. Keeping both would export every in-span
+    // message twice.
+    const loggerLayer = Logger.layer(
+      endpoints.logs === undefined
+        ? [Logger.consolePretty(), Logger.tracerLogger]
+        : [
+            Logger.consolePretty(),
+            OtlpLogger.make({
+              url: endpoints.logs,
+              exportInterval: `${environment.otlpExportIntervalMs} millis`,
+              headers,
+              resource,
+            }),
+          ],
+      { mergeWithExisting: false },
+    ).pipe(Layer.provide(OtlpExporter.layerFlusher), Layer.provide(serializationLayer));
+
+    const tracerLayer = Layer.unwrap(
+      Effect.gen(function* () {
+        const tracePath = environment.path.join(environment.logDir, "desktop.trace.ndjson");
+        const sink = yield* makeTraceSink({
+          filePath: tracePath,
+          maxBytes: DESKTOP_LOG_FILE_MAX_BYTES,
+          maxFiles: DESKTOP_LOG_FILE_MAX_FILES,
+          batchWindowMs: DESKTOP_TRACE_BATCH_WINDOW_MS,
+        });
+        const delegate =
+          endpoints.traces === undefined
+            ? undefined
+            : yield* OtlpTracer.make({
+                url: endpoints.traces,
+                exportInterval: `${environment.otlpExportIntervalMs} millis`,
+                headers,
+                resource,
+              }).pipe(Effect.provide(serializationLayer));
+        const tracer = yield* makeLocalFileTracer({
+          filePath: tracePath,
+          maxBytes: DESKTOP_LOG_FILE_MAX_BYTES,
+          maxFiles: DESKTOP_LOG_FILE_MAX_FILES,
+          batchWindowMs: DESKTOP_TRACE_BATCH_WINDOW_MS,
+          sink,
+          ...(delegate ? { delegate } : {}),
+        });
+
+        return Layer.succeed(Tracer.Tracer, tracer);
+      }),
+    ).pipe(Layer.provide(OtlpExporter.layerFlusher));
+
+    const metricsLayer =
+      endpoints.metrics === undefined
+        ? Layer.empty
+        : OtlpMetrics.layer({
+            url: endpoints.metrics,
+            exportInterval: `${environment.otlpExportIntervalMs} millis`,
+            headers,
+            resource,
+          }).pipe(Layer.provide(serializationLayer));
+
+    return Layer.mergeAll(loggerLayer, tracerLayer, metricsLayer);
   }),
-).pipe(Layer.provide(OtlpExporter.layerFlusher));
+);
 
 export const layer = Layer.mergeAll(
   backendOutputLogFactoryLayer,
-  desktopLoggerLayer,
-  tracerLayer,
+  telemetryLayer,
+  Layer.succeed(References.MinimumLogLevel, "Info"),
   Layer.succeed(Tracer.MinimumTraceLevel, "Info"),
   Layer.succeed(References.TracerTimingEnabled, true),
 );
diff --git a/docs/operations/observability.md b/docs/operations/observability.md
index 215b1706aeef..c7be6b936c45 100644
--- a/docs/operations/observability.md
+++ b/docs/operations/observability.md
@@ -522,6 +522,13 @@ It provides:
 - optional OTLP log exporter
 - Effect trace-level and timing refs
 
+The desktop main process is a second producer, assembled in
+`apps/desktop/src/app/DesktopObservability.ts`. It reads the same `T3CODE_OTLP_*` names and the same
+Settings entries as the backend it supervises, and covers work the backend cannot see: app startup,
+window and menu handling, backend supervision, and updates. It reports as service `desktop`
+regardless of `T3CODE_OTLP_SERVICE_NAME`, so a collector shows it alongside the backend rather than
+mixed into it.
+
 ### Env Vars
 
 Local trace file:

From efb96939fbb135b9f4de3bff19447200b178b23a Mon Sep 17 00:00:00 2001
From: James C <134711311+Exotic209093@users.noreply.github.com>
Date: Sat, 19 Sep 2026 05:36:30 +0100
Subject: [PATCH 14/25] fix(codex): surface app permission requests as
 approvable (#7861)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
---
 apps/mobile/src/components/AppSymbol.tsx      |   2 +
 .../src/features/threads/thread-work-log.tsx  |   2 +
 apps/mobile/src/lib/threadActivity.ts         |   5 +-
 .../Layers/ProviderRuntimeIngestion.ts        |   9 +-
 .../src/provider/Layers/CodexAdapter.test.ts  |  42 ++++++++
 .../src/provider/Layers/CodexAdapter.ts       |  18 ++++
 .../CodexCollabRuntime.integration.test.ts    | 102 ++++++++++++++++++
 .../provider/Layers/CodexSessionRuntime.ts    |  73 +++++++++++++
 .../testFixtures/codexCollabMockPeer.mjs      |  48 ++++++++-
 .../chat/ComposerPendingApprovalPanel.tsx     |   8 +-
 apps/web/src/session-logic.ts                 |   3 +-
 .../client-runtime/src/pendingRequests.ts     |   2 +
 packages/contracts/src/orchestration.ts       |   1 +
 packages/contracts/src/providerRuntime.ts     |   1 +
 .../effect-codex-app-server/src/errors.ts     |   1 +
 15 files changed, 308 insertions(+), 9 deletions(-)

diff --git a/apps/mobile/src/components/AppSymbol.tsx b/apps/mobile/src/components/AppSymbol.tsx
index 5540d5b5dfb8..345ace389cc7 100644
--- a/apps/mobile/src/components/AppSymbol.tsx
+++ b/apps/mobile/src/components/AppSymbol.tsx
@@ -64,6 +64,7 @@ import IconHome from "@tabler/icons-react-native/IconHome";
 import IconInfoCircle from "@tabler/icons-react-native/IconInfoCircle";
 import IconKeyboard from "@tabler/icons-react-native/IconKeyboard";
 import IconKeyboardHide from "@tabler/icons-react-native/IconKeyboardHide";
+import IconLock from "@tabler/icons-react-native/IconLock";
 import IconLayoutColumns from "@tabler/icons-react-native/IconLayoutColumns";
 import IconLayoutSidebar from "@tabler/icons-react-native/IconLayoutSidebar";
 import IconLayoutSidebarRight from "@tabler/icons-react-native/IconLayoutSidebarRight";
@@ -240,6 +241,7 @@ const ANDROID_ICON_BY_MATERIAL_NAME = {
   keyboard_arrow_down: IconChevronDown,
   keyboard_arrow_up: IconChevronUp,
   keyboard_hide: IconKeyboardHide,
+  lock: IconLock,
   more_vert: IconDotsVertical,
   merge: IconGitMerge,
   public: IconWorld,
diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx
index d227a72a2c7e..a2053a2a67b3 100644
--- a/apps/mobile/src/features/threads/thread-work-log.tsx
+++ b/apps/mobile/src/features/threads/thread-work-log.tsx
@@ -363,6 +363,8 @@ function workRowSymbolName(icon: ThreadFeedActivity["icon"]): AppSymbolName {
       return { ios: "globe", android: "public" };
     case "hammer":
       return { ios: "hammer", android: "construction" };
+    case "lock":
+      return { ios: "lock", android: "lock" };
     case "message":
       return { ios: "bubble.left", android: "chat_bubble" };
     case "warning":
diff --git a/apps/mobile/src/lib/threadActivity.ts b/apps/mobile/src/lib/threadActivity.ts
index 887be4a9272d..8f000b1b55fc 100644
--- a/apps/mobile/src/lib/threadActivity.ts
+++ b/apps/mobile/src/lib/threadActivity.ts
@@ -68,6 +68,7 @@ export interface ThreadFeedActivity {
     | "eye"
     | "globe"
     | "hammer"
+    | "lock"
     | "message"
     | "warning"
     | "wrench"
@@ -971,6 +972,7 @@ function workEntryIcon(entry: DerivedWorkLogEntry): ThreadFeedActivity["icon"] {
   if (entry.requestKind === "command") return "command";
   if (entry.requestKind === "file-read") return "eye";
   if (entry.requestKind === "file-change") return "edit";
+  if (entry.requestKind === "permission") return "lock";
   if (entry.itemType === "command_execution" || entry.command) return "command";
   if (entry.itemType === "file_change" || (entry.changedFiles?.length ?? 0) > 0) return "edit";
   if (entry.itemType === "web_search") return "globe";
@@ -1439,7 +1441,8 @@ function extractWorkLogRequestKind(
   if (
     payload?.requestKind === "command" ||
     payload?.requestKind === "file-read" ||
-    payload?.requestKind === "file-change"
+    payload?.requestKind === "file-change" ||
+    payload?.requestKind === "permission"
   ) {
     return payload.requestKind;
   }
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
index 84cb34a4e783..0db70e491235 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
@@ -14,6 +14,7 @@ import {
   type OrchestrationCheckpointSummary,
   type OrchestrationThreadActivity,
   type ProjectId,
+  type ProviderRequestKind,
   type ProviderRuntimeEvent,
   type ResponseStreamingMode,
   RuntimeRequestId,
@@ -400,7 +401,7 @@ function sessionStatusAllowsActiveTurn(
 
 function requestKindFromCanonicalRequestType(
   requestType: string | undefined,
-): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
+): ProviderRequestKind | undefined {
   switch (requestType) {
     case "command_execution_approval":
     case "exec_command_approval":
@@ -412,6 +413,8 @@ function requestKindFromCanonicalRequestType(
       return "file-change";
     case "mcp_elicitation_approval":
       return "mcp-elicitation";
+    case "permission_approval":
+      return "permission";
     default:
       return undefined;
   }
@@ -494,7 +497,9 @@ export function runtimeEventToActivities(
                   ? "File-change approval requested"
                   : requestKind === "mcp-elicitation"
                     ? "App access approval requested"
-                    : "Approval requested",
+                    : requestKind === "permission"
+                      ? "App permission approval requested"
+                      : "Approval requested",
           payload: {
             requestId: toApprovalRequestId(event.requestId),
             ...(requestKind ? { requestKind } : {}),
diff --git a/apps/server/src/provider/Layers/CodexAdapter.test.ts b/apps/server/src/provider/Layers/CodexAdapter.test.ts
index 48aff6cd707e..9f464bdaa177 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.test.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.test.ts
@@ -1719,6 +1719,48 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
     }),
   );
 
+  it.effect("maps app permission approval requests to permission_approval request types", () =>
+    Effect.gen(function* () {
+      const { adapter, runtime } = yield* startLifecycleRuntime();
+      const firstEventFiber = yield* Stream.runHead(adapter.streamEvents).pipe(Effect.forkChild);
+
+      yield* runtime.emit({
+        id: asEventId("evt-app-permission-request"),
+        kind: "request",
+        provider: ProviderDriverKind.make("codex"),
+        threadId: asThreadId("thread-1"),
+        createdAt: "2026-01-01T00:00:00.000Z",
+        method: "item/permissions/requestApproval",
+        requestId: ApprovalRequestId.make("req-perm-1"),
+        requestKind: "permission",
+        turnId: asTurnId("turn-1"),
+        itemId: asItemId("app_1"),
+        payload: {
+          cwd: "/tmp/project",
+          itemId: "app_1",
+          permissions: { network: { enabled: true } },
+          reason: "Fetch data from api.example.com",
+          startedAtMs: 1_778_000_000_000,
+          threadId: "thread-1",
+          turnId: "turn-1",
+        },
+      } satisfies ProviderEvent);
+
+      const firstEvent = yield* Fiber.join(firstEventFiber);
+
+      NodeAssert.equal(firstEvent._tag, "Some");
+      if (firstEvent._tag !== "Some") {
+        return;
+      }
+      NodeAssert.equal(firstEvent.value.type, "request.opened");
+      if (firstEvent.value.type !== "request.opened") {
+        return;
+      }
+      NodeAssert.equal(firstEvent.value.payload.requestType, "permission_approval");
+      NodeAssert.equal(firstEvent.value.payload.detail, "Fetch data from api.example.com");
+    }),
+  );
+
   it.effect("maps session/closed lifecycle events to canonical session.exited runtime events", () =>
     Effect.gen(function* () {
       const { adapter, runtime } = yield* startLifecycleRuntime();
diff --git a/apps/server/src/provider/Layers/CodexAdapter.ts b/apps/server/src/provider/Layers/CodexAdapter.ts
index ba61d14f5cf5..0ecc9693ab04 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.ts
@@ -832,6 +832,8 @@ function toRequestTypeFromMethod(method: string): CanonicalRequestType {
       return "file_change_approval";
     case "mcpServer/elicitation/request":
       return "mcp_elicitation_approval";
+    case "item/permissions/requestApproval":
+      return "permission_approval";
     case "applyPatchApproval":
       return "apply_patch_approval";
     case "execCommandApproval":
@@ -857,6 +859,8 @@ function toRequestTypeFromKind(kind: ProviderRequestKind | undefined): Canonical
       return "file_change_approval";
     case "mcp-elicitation":
       return "mcp_elicitation_approval";
+    case "permission":
+      return "permission_approval";
     default:
       return "unknown";
   }
@@ -1366,6 +1370,20 @@ function mapToRuntimeEvents(
         }
         case "mcpServer/elicitation/request":
           return elicitation?.message;
+        case "item/permissions/requestApproval": {
+          const payload = readPayload(
+            EffectCodexSchema.ServerRequest__PermissionsRequestApprovalParams,
+            event.payload,
+          );
+          const requestedPaths = [
+            ...(payload?.permissions.fileSystem?.read ?? []),
+            ...(payload?.permissions.fileSystem?.write ?? []),
+          ];
+          return (
+            nonEmptyDetail(payload?.reason) ??
+            (requestedPaths.length > 0 ? `Access: ${requestedPaths.join(", ")}` : undefined)
+          );
+        }
         case "applyPatchApproval": {
           const payload = readPayload(
             EffectCodexSchema.ServerRequest__ApplyPatchApprovalParams,
diff --git a/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts b/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
index 02b7a45f33ad..2a9fb56c186a 100644
--- a/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
+++ b/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
@@ -605,6 +605,108 @@ describe("CodexSessionRuntime collab integration", () => {
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
 
+  // it.live: the runtime talks to a real child process; under it.effect's
+  // TestClock the internal timers freeze and the join never completes.
+  it.live("Stop answers a parked app-permission approval with a withheld grant", () =>
+    Effect.gen(function* () {
+      // Interrupting a turn whose app-permission prompt is still parked must
+      // settle that prompt: the handler resumes with "cancel", the peer gets
+      // an empty grant (permission withheld), and nothing hangs until close.
+      const script = {
+        rootThreadId: ROOT,
+        holdTurnOpen: true,
+        notifications: [],
+        serverRequests: [
+          {
+            method: "item/permissions/requestApproval",
+            label: "perm-1",
+            params: {
+              cwd: "/tmp/project",
+              itemId: "app_1",
+              permissions: { network: { enabled: true } },
+              reason: "Fetch data from api.example.com",
+              startedAtMs: 1_778_000_000_000,
+              threadId: "${threadId}",
+              turnId: "${turnId}",
+            },
+          },
+        ],
+      };
+      // @effect-diagnostics-next-line preferSchemaOverJson:off
+      NodeFS.writeFileSync(scriptPath, JSON.stringify(script), "utf8");
+      const responsesPath = `${scriptPath}.approvalResponses`;
+      NodeFS.rmSync(responsesPath, { force: true });
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          NodeFS.rmSync(scriptPath, { force: true });
+          NodeFS.rmSync(responsesPath, { force: true });
+        }),
+      );
+
+      const runtime = yield* makeCodexSessionRuntime({
+        threadId: ThreadId.make("thread-codex-permission-stop"),
+        binaryPath: peerPath,
+        cwd: "/tmp",
+        runtimeMode: "full-access",
+        environment: { ...process.env, T3_CODEX_COLLAB_SCRIPT: scriptPath },
+      });
+
+      // One consumer for the whole stream: `events` is a plain queue stream,
+      // so two forks would compete for events and each could starve the
+      // other's filter. Signal the two milestones through Deferreds instead.
+      const requestedReady = yield* Deferred.make<ProviderEvent>();
+      const settledReady = yield* Deferred.make<ProviderEvent>();
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) => {
+          if (event.method === "item/permissions/requestApproval") {
+            return Deferred.succeed(requestedReady, event);
+          }
+          if (event.method === "serverRequest/resolved" && event.requestKind === "permission") {
+            return Deferred.succeed(settledReady, event);
+          }
+          return Effect.void;
+        }),
+        Effect.forkScoped,
+      );
+
+      yield* runtime.start();
+      yield* runtime.sendTurn({ input: "use the connected app" });
+      const requested = yield* Deferred.await(requestedReady).pipe(
+        Effect.timeoutOption("15 seconds"),
+      );
+      assert.isTrue(requested._tag === "Some", "permission approval request never arrived");
+
+      yield* runtime.interruptTurn();
+
+      // The peer emits serverRequest/resolved only AFTER recording the
+      // runtime's answer, so awaiting this receipt makes reading the sidecar
+      // race-free. The runtime correlates that receipt back to the canonical
+      // request (requestKind + requestId) — the same event chain the adapter
+      // folds into approval.resolved, so the card actually closes.
+      const settled = yield* Deferred.await(settledReady).pipe(Effect.timeoutOption("15 seconds"));
+      assert.isTrue(settled._tag === "Some", "interrupt did not settle the parked approval");
+      const settledEvent = settled._tag === "Some" ? settled.value : undefined;
+      assert.isDefined(settledEvent);
+      assert.isDefined(
+        settledEvent?.requestId,
+        "receipt must correlate back to the canonical approval request",
+      );
+
+      const recorded = NodeFS.readFileSync(responsesPath, "utf8")
+        .trim()
+        .split("\n")
+        .map((line) => JSON.parse(line) as { id: number; label: string; result: unknown });
+      assert.equal(recorded.length, 1);
+      const answer = recorded[0];
+      assert.isDefined(answer);
+      assert.equal(answer.label, "perm-1");
+      // Cancelled approvals withhold the grant: an empty permission profile.
+      assert.deepEqual(answer.result, { permissions: {} });
+
+      yield* runtime.close;
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
   it.live("Stop targets the active turn when Codex has accepted a queued follow-up", () =>
     Effect.gen(function* () {
       const activeTurnId = "019fe3e8-f908-7f31-8d51-283f4a47897a";
diff --git a/apps/server/src/provider/Layers/CodexSessionRuntime.ts b/apps/server/src/provider/Layers/CodexSessionRuntime.ts
index c8aa069cb2b7..674d23327b65 100644
--- a/apps/server/src/provider/Layers/CodexSessionRuntime.ts
+++ b/apps/server/src/provider/Layers/CodexSessionRuntime.ts
@@ -2232,6 +2232,69 @@ export const makeCodexSessionRuntime = (
       }),
     );
 
+    yield* client.handleServerRequest("item/permissions/requestApproval", (payload) =>
+      Effect.gen(function* () {
+        const requestId = ApprovalRequestId.make(
+          yield* randomUUIDv4("app-permission-approval-request"),
+        );
+        const turnId = TurnId.make(payload.turnId);
+        const itemId = ProviderItemId.make(payload.itemId);
+        const decision = yield* Deferred.make<ProviderApprovalDecision>();
+
+        yield* Ref.update(pendingApprovalsRef, (current) => {
+          const next = new Map(current);
+          next.set(requestId, {
+            requestId,
+            jsonRpcId: payload.itemId,
+            requestKind: "permission",
+            turnId,
+            itemId,
+            decision,
+          });
+          return next;
+        });
+        yield* Ref.update(approvalCorrelationsRef, (current) => {
+          const next = new Map(current);
+          next.set(payload.itemId, {
+            requestId,
+            requestKind: "permission",
+            turnId,
+            itemId,
+          });
+          return next;
+        });
+
+        yield* emitEvent({
+          kind: "request",
+          threadId: options.threadId,
+          method: "item/permissions/requestApproval",
+          requestId,
+          requestKind: "permission",
+          ...(turnId ? { turnId } : {}),
+          ...(itemId ? { itemId } : {}),
+          payload,
+        });
+
+        const resolved = yield* Deferred.await(decision).pipe(
+          Effect.ensuring(
+            Ref.update(pendingApprovalsRef, (current) => {
+              const next = new Map(current);
+              next.delete(requestId);
+              return next;
+            }),
+          ),
+        );
+        // Approving grants the requested profile; denying answers with an
+        // empty grant so the app-server treats the permission as withheld.
+        const grantedPermissions =
+          resolved === "accept" || resolved === "acceptForSession" ? payload.permissions : {};
+        return {
+          permissions: grantedPermissions,
+          ...(resolved === "acceptForSession" ? { scope: "session" as const } : {}),
+        } satisfies EffectCodexSchema.PermissionsRequestApprovalResponse;
+      }),
+    );
+
     yield* client.handleServerRequest("item/tool/requestUserInput", (payload) =>
       Effect.gen(function* () {
         const requestId = ApprovalRequestId.make(yield* randomUUIDv4("user-input-request"));
@@ -2499,6 +2562,16 @@ export const makeCodexSessionRuntime = (
         Effect.gen(function* () {
           const providerThreadId = yield* readProviderThreadId;
           const session = yield* Ref.get(sessionRef);
+          // Settle parked approvals FIRST. The transport answers server
+          // requests inline on its stdin read loop, so a pending
+          // command/file/app-permission prompt blocks every incoming message,
+          // including the turn/interrupt response itself - cancelling after
+          // the RPC would deadlock Stop exactly when a card is open. Settling
+          // releases the handler, which answers the peer and unblocks the
+          // loop before the interrupts below are sent.
+          yield* settlePendingApprovals("cancel");
+          // Pending user-input prompts block the same way; settle them too.
+          yield* settlePendingUserInputs({});
           // Stop-everything: children are full threads with their own turns;
           // interrupting only the parent leaves the fleet running. Interrupt
           // each live child turn first, best-effort per child, BOUNDED: the
diff --git a/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs b/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
index fa567d75cf8a..440f1558a684 100644
--- a/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
+++ b/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
@@ -18,7 +18,9 @@ const script = JSON.parse(NodeFS.readFileSync(process.env.T3_CODEX_COLLAB_SCRIPT
 const write = (message) => process.stdout.write(`${JSON.stringify(message)}\n`);
 let turnStartCount = 0;
 let activeTurn;
-
+// Server->client requests the runtime must answer (approval prompts), keyed
+// by the numeric JSON-RPC id this peer allocated for them.
+const openServerRequests = new Map();
 const rl = NodeReadline.createInterface({ input: process.stdin });
 rl.on("line", (line) => {
   let message;
@@ -28,6 +30,30 @@ rl.on("line", (line) => {
     return;
   }
   const { id, method } = message;
+  if (openServerRequests.has(id)) {
+    // The runtime answered an approval request. Record the response so tests
+    // can assert settlement behavior, then emit serverRequest/resolved as a
+    // deterministic receipt (tests wait on the runtime's event stream rather
+    // than polling the sidecar file). Real codex identifies the resolved
+    // request by its item id — the key the runtime correlates on — so the
+    // receipt exercises the same path that closes the approval card in the
+    // UI.
+    const request = openServerRequests.get(id);
+    openServerRequests.delete(id);
+    NodeFS.appendFileSync(
+      `${process.env.T3_CODEX_COLLAB_SCRIPT}.approvalResponses`,
+      `${JSON.stringify({ id, label: request.label, result: message.result ?? null })}\n`,
+    );
+    write({
+      jsonrpc: "2.0",
+      method: "serverRequest/resolved",
+      params: {
+        threadId: script.rootThreadId,
+        requestId: request.itemId ?? request.label,
+      },
+    });
+    return;
+  }
   if (method === undefined && script.serverRequests?.some((request) => request.id === id)) {
     NodeFS.appendFileSync(
       `${process.env.T3_CODEX_COLLAB_SCRIPT}.responses`,
@@ -136,8 +162,24 @@ rl.on("line", (line) => {
     for (const notification of script.notifications) {
       write({ jsonrpc: "2.0", method: notification.method, params: notification.params });
     }
-    for (const request of script.serverRequests ?? []) {
-      write({ jsonrpc: "2.0", id: request.id, method: request.method, params: request.params });
+    for (const [index, request] of (script.serverRequests ?? []).entries()) {
+      if (request.id !== undefined) {
+        // Legacy form: caller-supplied JSON-RPC ids recorded in .responses.
+        write({ jsonrpc: "2.0", id: request.id, method: request.method, params: request.params });
+        continue;
+      }
+      // Scripted server->client requests (approval prompts). String values in
+      // params may reference "${threadId}" / "${turnId}" placeholders that are
+      // substituted with the ids this peer actually allocated.
+      const requestId = 9000 + index;
+      const label = request.label ?? `approval-${requestId}`;
+      openServerRequests.set(requestId, { label, itemId: request.params?.itemId });
+      const params = JSON.parse(
+        JSON.stringify(request.params)
+          .replaceAll("${threadId}", String(rootThreadId))
+          .replaceAll("${turnId}", String(turn.id)),
+      );
+      write({ jsonrpc: "2.0", id: requestId, method: request.method, params });
     }
     if (script.holdTurnOpen !== true) {
       write({
diff --git a/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx b/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
index 8065556cebc5..5f181e71783d 100644
--- a/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
@@ -21,7 +21,9 @@ export const ComposerPendingApprovalPanel = memo(function ComposerPendingApprova
         ? "Command approval"
         : approval.requestKind === "file-read"
           ? "File read approval"
-          : "File change approval";
+          : approval.requestKind === "permission"
+            ? "App permission approval"
+            : "File change approval";
   const detailAriaLabel =
     approval.requestKind === "mcp-elicitation"
       ? "App access request"
@@ -29,7 +31,9 @@ export const ComposerPendingApprovalPanel = memo(function ComposerPendingApprova
         ? "Command"
         : approval.requestKind === "file-read"
           ? "File to read"
-          : "File change";
+          : approval.requestKind === "permission"
+            ? "Permission request"
+            : "File change";
 
   return (
     <span
diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts
index d195306ae0a6..7da6567dbbed 100644
--- a/apps/web/src/session-logic.ts
+++ b/apps/web/src/session-logic.ts
@@ -1316,7 +1316,8 @@ function extractWorkLogRequestKind(
   if (
     payload?.requestKind === "command" ||
     payload?.requestKind === "file-read" ||
-    payload?.requestKind === "file-change"
+    payload?.requestKind === "file-change" ||
+    payload?.requestKind === "permission"
   ) {
     return payload.requestKind;
   }
diff --git a/packages/client-runtime/src/pendingRequests.ts b/packages/client-runtime/src/pendingRequests.ts
index 54cac57e1af4..51488559de86 100644
--- a/packages/client-runtime/src/pendingRequests.ts
+++ b/packages/client-runtime/src/pendingRequests.ts
@@ -59,6 +59,8 @@ export function requestKindFromRequestType(requestType: unknown): ProviderReques
       return "file-change";
     case "mcp_elicitation_approval":
       return "mcp-elicitation";
+    case "permission_approval":
+      return "permission";
     default:
       return null;
   }
diff --git a/packages/contracts/src/orchestration.ts b/packages/contracts/src/orchestration.ts
index cf3aad4ba73d..6ca7e25ca493 100644
--- a/packages/contracts/src/orchestration.ts
+++ b/packages/contracts/src/orchestration.ts
@@ -141,6 +141,7 @@ export const ProviderRequestKind = Schema.Literals([
   "file-read",
   "file-change",
   "mcp-elicitation",
+  "permission",
 ]);
 export type ProviderRequestKind = typeof ProviderRequestKind.Type;
 export const ProviderApprovalDecision = Schema.Literals([
diff --git a/packages/contracts/src/providerRuntime.ts b/packages/contracts/src/providerRuntime.ts
index 01a8f9ad8f83..309b61935485 100644
--- a/packages/contracts/src/providerRuntime.ts
+++ b/packages/contracts/src/providerRuntime.ts
@@ -141,6 +141,7 @@ export const CanonicalRequestType = Schema.Literals([
   "apply_patch_approval",
   "exec_command_approval",
   "mcp_elicitation_approval",
+  "permission_approval",
   "tool_user_input",
   "dynamic_tool_call",
   "auth_tokens_refresh",
diff --git a/packages/effect-codex-app-server/src/errors.ts b/packages/effect-codex-app-server/src/errors.ts
index 88fcedfb77b4..6e7569f64291 100644
--- a/packages/effect-codex-app-server/src/errors.ts
+++ b/packages/effect-codex-app-server/src/errors.ts
@@ -118,6 +118,7 @@ export const CodexAppServerIdentifierPurpose = Schema.Literals([
   "command-approval-request",
   "file-change-approval-request",
   "mcp-elicitation-request",
+  "app-permission-approval-request",
   "user-input-request",
 ]);
 export type CodexAppServerIdentifierPurpose = typeof CodexAppServerIdentifierPurpose.Type;

From a8693eb4ed3a66d72e6b814117e7beeaf0fb5f8b Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 21:38:48 -0700
Subject: [PATCH 15/25] chore(desktop): leave main process metrics export off
 until a metric exists (#12540)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .../src/app/DesktopObservability.test.ts      | 42 ++++---------------
 apps/desktop/src/app/DesktopObservability.ts  | 38 ++++++++++-------
 docs/operations/observability.md              |  3 +-
 3 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/apps/desktop/src/app/DesktopObservability.test.ts b/apps/desktop/src/app/DesktopObservability.test.ts
index eacf99740f3b..d7ccfc43b185 100644
--- a/apps/desktop/src/app/DesktopObservability.test.ts
+++ b/apps/desktop/src/app/DesktopObservability.test.ts
@@ -4,7 +4,6 @@ import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
-import * as Metric from "effect/Metric";
 import * as Schema from "effect/Schema";
 import * as HttpClient from "effect/unstable/http/HttpClient";
 import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
@@ -428,32 +427,6 @@ describe("DesktopObservability", () => {
     );
   });
 
-  it.effect("exports main process metrics to the configured metrics endpoint", () => {
-    const requests: Array<ExportedRequest> = [];
-    return Effect.gen(function* () {
-      const fileSystem = yield* FileSystem.FileSystem;
-      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
-        prefix: "t3-desktop-observability-test-",
-      });
-      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
-        T3CODE_OTLP_METRICS_URL: "https://collector.example.com/v1/metrics",
-      });
-
-      yield* Effect.scoped(
-        Metric.update(Metric.counter("desktop_metrics_export_test_total"), 1).pipe(
-          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
-        ),
-      );
-
-      assert.lengthOf(requests, 1);
-      assert.strictEqual(requests[0]?.url, "https://collector.example.com/v1/metrics");
-      assert.include(requests[0]?.body ?? "", "desktop_metrics_export_test_total");
-    }).pipe(
-      Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
-    );
-  });
-
   it.effect("reads every signal endpoint from Settings when the environment names none", () => {
     const requests: Array<ExportedRequest> = [];
     return Effect.gen(function* () {
@@ -463,30 +436,31 @@ describe("DesktopObservability", () => {
       });
       const environmentLayer = makeEnvironmentLayer(baseDir);
       yield* writeObservabilitySettings(environmentLayer, {
+        otlpTracesUrl: "https://settings.example.com/v1/traces",
         otlpLogsUrl: "https://settings.example.com/v1/logs",
+        // The main process records no metrics yet, so this endpoint must
+        // not produce a request.
         otlpMetricsUrl: "https://settings.example.com/v1/metrics",
       });
 
       yield* Effect.scoped(
-        Effect.gen(function* () {
-          yield* Effect.logInfo("desktop log export from settings");
-          yield* Metric.update(Metric.counter("desktop_settings_export_test_total"), 1);
-        }).pipe(
+        Effect.logInfo("desktop log export from settings").pipe(
+          Effect.withSpan("desktop-settings-export-test"),
           Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
         ),
       );
 
       assert.deepEqual(requests.map((request) => request.url).toSorted(), [
         "https://settings.example.com/v1/logs",
-        "https://settings.example.com/v1/metrics",
+        "https://settings.example.com/v1/traces",
       ]);
       assert.include(
         requests.find((request) => request.url.endsWith("/v1/logs"))?.body ?? "",
         "desktop log export from settings",
       );
       assert.include(
-        requests.find((request) => request.url.endsWith("/v1/metrics"))?.body ?? "",
-        "desktop_settings_export_test_total",
+        requests.find((request) => request.url.endsWith("/v1/traces"))?.body ?? "",
+        "desktop-settings-export-test",
       );
     }).pipe(
       Effect.scoped,
diff --git a/apps/desktop/src/app/DesktopObservability.ts b/apps/desktop/src/app/DesktopObservability.ts
index 62e3d865a273..96657215748b 100644
--- a/apps/desktop/src/app/DesktopObservability.ts
+++ b/apps/desktop/src/app/DesktopObservability.ts
@@ -24,7 +24,7 @@ import * as Scope from "effect/Scope";
 import * as Semaphore from "effect/Semaphore";
 import * as SynchronizedRef from "effect/SynchronizedRef";
 import * as Tracer from "effect/Tracer";
-import { OtlpExporter, OtlpLogger, OtlpMetrics, OtlpTracer } from "effect/unstable/observability";
+import { OtlpExporter, OtlpLogger, OtlpTracer } from "effect/unstable/observability";
 
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
 
@@ -349,7 +349,7 @@ const readPersistedObservabilitySettings: Effect.Effect<
 });
 
 /**
- * Settings is read once for all three signals, so the main process cannot
+ * Settings is read once for every signal, so the main process cannot
  * resolve traces against one revision of the file and logs against another.
  */
 const resolveOtlpEndpoints = Effect.gen(function* () {
@@ -580,9 +580,9 @@ const backendOutputLogFactoryLayer = Layer.effect(
 );
 
 /**
- * Logs, traces, and metrics for the main process, assembled together because
- * they share one read of the environment and Settings, and because a process
- * gets exactly one logger set.
+ * Logs and traces for the main process, assembled together because they share
+ * one read of the environment and Settings, and because a process gets exactly
+ * one logger set.
  */
 const telemetryLayer = Layer.unwrap(
   Effect.gen(function* () {
@@ -655,17 +655,23 @@ const telemetryLayer = Layer.unwrap(
       }),
     ).pipe(Layer.provide(OtlpExporter.layerFlusher));
 
-    const metricsLayer =
-      endpoints.metrics === undefined
-        ? Layer.empty
-        : OtlpMetrics.layer({
-            url: endpoints.metrics,
-            exportInterval: `${environment.otlpExportIntervalMs} millis`,
-            headers,
-            resource,
-          }).pipe(Layer.provide(serializationLayer));
-
-    return Layer.mergeAll(loggerLayer, tracerLayer, metricsLayer);
+    // Metrics stay off until the main process records one. `OtlpMetrics`
+    // exports on every interval even when the registry is empty, so wiring
+    // it up today would post an empty payload every ten seconds to any
+    // collector configured for the backend. Restore this when a desktop
+    // metric exists, and add it to the `Layer.mergeAll` below.
+    //
+    // const metricsLayer =
+    //   endpoints.metrics === undefined
+    //     ? Layer.empty
+    //     : OtlpMetrics.layer({
+    //         url: endpoints.metrics,
+    //         exportInterval: `${environment.otlpExportIntervalMs} millis`,
+    //         headers,
+    //         resource,
+    //       }).pipe(Layer.provide(serializationLayer));
+
+    return Layer.mergeAll(loggerLayer, tracerLayer);
   }),
 );
 
diff --git a/docs/operations/observability.md b/docs/operations/observability.md
index c7be6b936c45..adeb983d1bc7 100644
--- a/docs/operations/observability.md
+++ b/docs/operations/observability.md
@@ -527,7 +527,8 @@ The desktop main process is a second producer, assembled in
 Settings entries as the backend it supervises, and covers work the backend cannot see: app startup,
 window and menu handling, backend supervision, and updates. It reports as service `desktop`
 regardless of `T3CODE_OTLP_SERVICE_NAME`, so a collector shows it alongside the backend rather than
-mixed into it.
+mixed into it. It exports traces and logs only; the main process records no metrics, so the metrics
+endpoint applies to the backend alone.
 
 ### Env Vars
 

From 803f94e787faef498edecba5dbd07493ac8bc817 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 22:03:36 -0700
Subject: [PATCH 16/25] fix(release): drop placeholder allowBuilds entry that
 broke desktop builds (#12544)

---
 pnpm-workspace.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 0b4e86c2d5dd..7c7106bd7637 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -15,7 +15,6 @@ allowBuilds:
   electron: true
   electron-winstaller: false
   esbuild: true
-  msgpackr-extract: set this to true or false
   msw: false
   node-pty: true
   sharp: true

From 29a23fdf1481485593d7d90e195b7c8bf2a705a8 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Fri, 18 Sep 2026 23:58:18 -0700
Subject: [PATCH 17/25] fix(mobile): adapt workspace navigation and expand
 controls (#12551)

---
 apps/mobile/src/Stack.tsx                     | 61 ++++++++++++-------
 .../src/components/AndroidScreenHeader.tsx    |  8 +--
 apps/mobile/src/components/AppSymbol.tsx      |  4 +-
 apps/mobile/src/components/ScreenHeader.tsx   | 30 +++++----
 .../src/features/home/HomeRouteScreen.tsx     | 14 ++---
 .../layout/AdaptiveWorkspaceLayout.tsx        | 28 ++++-----
 .../layout/workspace-sidebar-toolbar.tsx      | 36 +----------
 .../features/settings/SettingsRouteScreen.tsx | 15 ++++-
 .../SettingsEnvironmentFilterHeader.tsx       |  6 +-
 .../settings/components/SettingsScreen.tsx    |  2 +-
 .../terminal/ThreadTerminalRouteScreen.tsx    |  5 +-
 .../features/threads/NewTaskRouteScreen.tsx   | 24 +++-----
 12 files changed, 109 insertions(+), 124 deletions(-)

diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx
index adad6f8e1f18..3de335cfd562 100644
--- a/apps/mobile/src/Stack.tsx
+++ b/apps/mobile/src/Stack.tsx
@@ -11,7 +11,14 @@ import {
   type NativeStackNavigationOptions,
 } from "@react-navigation/native-stack";
 import { useEffect, useRef } from "react";
-import { Platform, Pressable, ScrollView, StyleSheet, View } from "react-native";
+import {
+  Platform,
+  Pressable,
+  ScrollView,
+  StyleSheet,
+  View,
+  useWindowDimensions,
+} from "react-native";
 import { useResolveClassNames } from "uniwind";
 
 import { AppText as Text } from "./components/AppText";
@@ -93,6 +100,7 @@ import {
   transitionIncomingSharePresentation,
 } from "./features/sharing/incoming-share-presentation";
 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "./native/native-glass";
+import { deriveLayout } from "./lib/layout";
 import { nativeHeaderScrollEdgeEffects } from "./native/StackHeader";
 import { FORM_SHEET_PRESENTATION_OPTIONS } from "./native/sheet-surface";
 import { useThreadOutboxDrain } from "./state/use-thread-outbox-drain";
@@ -339,9 +347,8 @@ const SettingsSheetStack = createNativeStackNavigator({
 // the same deep-link URLs the nested config produced.
 const THREAD_LINKING_PREFIX = "threads/:environmentId/:threadId";
 
-// New-task / add-project flow: nested navigator inside the formSheet (Settings-sheet
-// pattern — a plain formSheet screen cannot render a stack header; the header and
-// in-sheet pushes come from this nested stack).
+// New-task / add-project flow: the nested navigator owns the header and pushes
+// whether the flow opens in the workspace or in a compact form sheet.
 const NewTaskSheetStack = createNativeStackNavigator({
   initialRouteName: "NewTask",
   screenOptions: {
@@ -570,7 +577,7 @@ function NotFoundScreen() {
   );
 }
 
-export const RootStack = createNativeStackNavigator({
+const RootStackConfig = createNativeStackNavigator({
   initialRouteName: "Home",
   layout: RootStackLayout,
   screenOptions: {
@@ -698,15 +705,6 @@ export const RootStack = createNativeStackNavigator({
       options: {
         gestureEnabled: true,
         headerShown: false,
-        // Android pushes settings as a regular full page with an in-screen
-        // back header; iOS keeps the detented form sheet.
-        ...(Platform.OS === "android"
-          ? { presentation: "card" as const }
-          : {
-              ...FORM_SHEET_PRESENTATION_OPTIONS,
-              sheetAllowedDetents: [0.92],
-              sheetGrabberVisible: true,
-            }),
       },
     }),
     SettingsLegal: createNativeStackScreen({
@@ -770,15 +768,6 @@ export const RootStack = createNativeStackNavigator({
       options: {
         gestureEnabled: true,
         headerShown: false,
-        // Android pushes the flow as a regular full page — the draft should
-        // read like a thread that just doesn't exist yet; iOS keeps the sheet.
-        ...(Platform.OS === "android"
-          ? { presentation: "card" as const }
-          : {
-              ...FORM_SHEET_PRESENTATION_OPTIONS,
-              sheetAllowedDetents: [0.92],
-              sheetGrabberVisible: true,
-            }),
       },
     }),
     NotFound: createNativeStackScreen({
@@ -787,6 +776,32 @@ export const RootStack = createNativeStackNavigator({
     }),
   },
 });
+
+export const RootStack = RootStackConfig.with(function AdaptiveRootStack({ Navigator }) {
+  const { width, height } = useWindowDimensions();
+  const usesWorkspaceFlowScreens =
+    Platform.OS === "android" || deriveLayout({ width, height }).usesSplitView;
+
+  return (
+    <Navigator
+      screenOptions={({ route }) => {
+        if (route.name !== "SettingsSheet" && route.name !== "NewTaskSheet") {
+          return {};
+        }
+
+        // Follow the workspace viewport as it resizes; compact iOS keeps sheets.
+        return usesWorkspaceFlowScreens
+          ? { presentation: "card" }
+          : {
+              ...FORM_SHEET_PRESENTATION_OPTIONS,
+              sheetAllowedDetents: [0.92],
+              sheetGrabberVisible: true,
+            };
+      }}
+    />
+  );
+});
+
 type RootStackType = typeof RootStack;
 
 const navigationPathConfig = {
diff --git a/apps/mobile/src/components/AndroidScreenHeader.tsx b/apps/mobile/src/components/AndroidScreenHeader.tsx
index 537f628b4b3c..6e2095009b3d 100644
--- a/apps/mobile/src/components/AndroidScreenHeader.tsx
+++ b/apps/mobile/src/components/AndroidScreenHeader.tsx
@@ -25,13 +25,7 @@ export function AndroidHeaderIconButton(props: {
   readonly disabled?: boolean;
   readonly selected?: boolean;
 }) {
-  return (
-    <MaterialIconButton
-      {...props}
-      tintColorClassName="accent-header-foreground"
-      variant={props.selected ? "tonal" : "standard"}
-    />
-  );
+  return <MaterialIconButton {...props} tintColorClassName="accent-header-foreground" />;
 }
 
 export function AndroidScreenHeader(props: {
diff --git a/apps/mobile/src/components/AppSymbol.tsx b/apps/mobile/src/components/AppSymbol.tsx
index 345ace389cc7..d85d9db7d780 100644
--- a/apps/mobile/src/components/AppSymbol.tsx
+++ b/apps/mobile/src/components/AppSymbol.tsx
@@ -19,7 +19,7 @@ import IconArrowUp from "@tabler/icons-react-native/IconArrowUp";
 import IconArrowUpCircle from "@tabler/icons-react-native/IconArrowUpCircle";
 import IconArrowUpRight from "@tabler/icons-react-native/IconArrowUpRight";
 import IconArrowUpRightCircle from "@tabler/icons-react-native/IconArrowUpRightCircle";
-import IconArrowsMaximize from "@tabler/icons-react-native/IconArrowsMaximize";
+import IconArrowsDiagonal2 from "@tabler/icons-react-native/IconArrowsDiagonal2";
 import IconArrowsMinimize from "@tabler/icons-react-native/IconArrowsMinimize";
 import IconBellRinging from "@tabler/icons-react-native/IconBellRinging";
 import IconBolt from "@tabler/icons-react-native/IconBolt";
@@ -122,7 +122,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   "arrow.turn.left.up": IconArrowBackUp,
   "arrow.up": IconArrowUp,
   "arrow.up.circle": IconArrowUpCircle,
-  "arrow.up.left.and.arrow.down.right": IconArrowsMaximize,
+  "arrow.up.left.and.arrow.down.right": IconArrowsDiagonal2,
   "arrow.down.right.and.arrow.up.left": IconArrowsMinimize,
   "arrow.up.right": IconArrowUpRight,
   "arrow.up.right.circle": IconArrowUpRightCircle,
diff --git a/apps/mobile/src/components/ScreenHeader.tsx b/apps/mobile/src/components/ScreenHeader.tsx
index b5e5d1a5dd12..6024ceec08d9 100644
--- a/apps/mobile/src/components/ScreenHeader.tsx
+++ b/apps/mobile/src/components/ScreenHeader.tsx
@@ -103,7 +103,7 @@ export function ScreenHeader(props: ScreenHeaderProps) {
           ...props.options,
         }}
       />
-      {props.sidebar !== false && layout.usesSplitView ? (
+      {layout.usesSplitView && (props.sidebar !== false || props.backInSplitView) ? (
         <NativeHeaderToolbar placement="left">
           {props.backInSplitView && (props.backInSplitView.onPress || props.onBack) ? (
             <ScreenHeaderButton
@@ -111,18 +111,22 @@ export function ScreenHeader(props: ScreenHeaderProps) {
               onPress={props.backInSplitView.onPress ?? props.onBack}
             />
           ) : null}
-          <ScreenHeaderButton
-            accessibilityLabel={
-              panes.primarySidebarVisible ? `Maximize ${props.title.toLowerCase()}` : "Show threads"
-            }
-            icon={
-              panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"
-            }
-            onPress={togglePrimarySidebar}
-            separateBackground={
-              props.backInSplitView ? props.backInSplitView.separateBackground : true
-            }
-          />
+          {props.sidebar !== false ? (
+            <ScreenHeaderButton
+              accessibilityLabel={
+                panes.primarySidebarVisible
+                  ? `Maximize ${props.title.toLowerCase()}`
+                  : "Show threads"
+              }
+              icon={
+                panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"
+              }
+              onPress={togglePrimarySidebar}
+              separateBackground={
+                props.backInSplitView ? props.backInSplitView.separateBackground : true
+              }
+            />
+          ) : null}
         </NativeHeaderToolbar>
       ) : null}
       {(props.actions?.length ||
diff --git a/apps/mobile/src/features/home/HomeRouteScreen.tsx b/apps/mobile/src/features/home/HomeRouteScreen.tsx
index 00060668ba5d..1ef8ea7b286b 100644
--- a/apps/mobile/src/features/home/HomeRouteScreen.tsx
+++ b/apps/mobile/src/features/home/HomeRouteScreen.tsx
@@ -11,10 +11,6 @@ import { useWorkspaceState } from "../../state/workspace";
 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
 import { WorkspaceEmptyDetail } from "../layout/WorkspaceEmptyDetail";
-import {
-  AndroidWorkspaceSidebarButton,
-  WorkspaceSidebarToolbar,
-} from "../layout/workspace-sidebar-toolbar";
 import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
 import { checkForAppUpdateOnLaunch, startAppUpdateForegroundRecheck } from "../updates/app-updates";
 import { AndroidHomeFabLayout } from "./AndroidHomeFab";
@@ -121,18 +117,16 @@ export function HomeRouteScreen() {
               : { title: "", headerTitle: "", unstable_headerLeftItems: () => [] }
           }
         />
-        <WorkspaceSidebarToolbar
-          afterSidebarButton={
+        {Platform.OS === "ios" ? (
+          <NativeHeaderToolbar placement="left">
             <NativeHeaderToolbar.Button
               accessibilityLabel="New task"
               icon="square.and.pencil"
               onPress={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
             />
-          }
-        />
-        {Platform.OS === "android" ? (
-          <AndroidScreenHeader title="Threads" leading={<AndroidWorkspaceSidebarButton />} />
+          </NativeHeaderToolbar>
         ) : null}
+        {Platform.OS === "android" ? <AndroidScreenHeader title="Threads" /> : null}
         <WorkspaceEmptyDetail
           onAddConnection={
             Platform.OS === "android" && !catalogState.hasConnections
diff --git a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
index 834301b80894..6c6133c7ef13 100644
--- a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
+++ b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
@@ -238,6 +238,7 @@ function AdaptiveWorkspaceLayoutContent(
   const navigation = useNavigation();
   const activeRoleOwner = useRef<symbol | null>(null);
   const [primarySidebarPreferredVisible, setPrimarySidebarPreferredVisible] = useState(true);
+  const showPrimarySidebar = pathname === "/" || primarySidebarPreferredVisible;
   const [supplementaryPanePreferredVisible, setSupplementaryPanePreferredVisible] = useState(true);
   const [supplementaryPanePreferredWidth, setSupplementaryPanePreferredWidth] = useState<
     number | null
@@ -262,17 +263,9 @@ function AdaptiveWorkspaceLayoutContent(
         viewportWidth: width,
         preferredWidth: fileInspectorPreferredWidth ?? undefined,
         reservedLeadingWidth:
-          shouldRenderPrimarySidebar && primarySidebarPreferredVisible
-            ? (layout.listPaneWidth ?? 0)
-            : 0,
+          shouldRenderPrimarySidebar && showPrimarySidebar ? (layout.listPaneWidth ?? 0) : 0,
       }),
-    [
-      fileInspectorPreferredWidth,
-      layout,
-      primarySidebarPreferredVisible,
-      shouldRenderPrimarySidebar,
-      width,
-    ],
+    [fileInspectorPreferredWidth, layout, showPrimarySidebar, shouldRenderPrimarySidebar, width],
   );
   const auxiliaryPaneRole: WorkspaceAuxiliaryPaneRole =
     focusedAuxiliaryPaneRole ?? (/\/files(?:\/|$)/.test(pathname) ? "inspector" : "supplementary");
@@ -289,7 +282,7 @@ function AdaptiveWorkspaceLayoutContent(
       deriveWorkspacePaneLayout({
         layout,
         viewportWidth: width,
-        primarySidebarPreferredVisible,
+        primarySidebarPreferredVisible: showPrimarySidebar,
         auxiliaryPanePreferredVisible,
         auxiliaryPaneRole,
         auxiliaryPanePreferredWidth: auxiliaryPanePreferredWidth ?? undefined,
@@ -299,7 +292,7 @@ function AdaptiveWorkspaceLayoutContent(
       auxiliaryPaneRole,
       auxiliaryPanePreferredWidth,
       layout,
-      primarySidebarPreferredVisible,
+      showPrimarySidebar,
       width,
     ],
   );
@@ -357,13 +350,16 @@ function AdaptiveWorkspaceLayoutContent(
     };
   }, []);
   const togglePrimarySidebar = useCallback(() => {
+    if (pathname === "/") {
+      return;
+    }
     if (!panes.primarySidebarVisible && panes.primarySidebarSuppressedByAuxiliary) {
       setFileInspectorPreferredVisible(false);
       setPrimarySidebarPreferredVisible(true);
       return;
     }
     setPrimarySidebarPreferredVisible((current) => !current);
-  }, [panes.primarySidebarSuppressedByAuxiliary, panes.primarySidebarVisible]);
+  }, [panes.primarySidebarSuppressedByAuxiliary, panes.primarySidebarVisible, pathname]);
   const revealPrimarySidebar = useCallback(() => {
     if (panes.primarySidebarSuppressedByAuxiliary) {
       setFileInspectorPreferredVisible(false);
@@ -374,7 +370,11 @@ function AdaptiveWorkspaceLayoutContent(
     togglePrimarySidebar();
     return true;
   }, [togglePrimarySidebar]);
-  useHardwareKeyboardCommand("toggleSidebar", handleToggleSidebarCommand);
+  const sidebarCommands = useMemo(
+    () => (pathname === "/" ? [] : (["toggleSidebar"] as const)),
+    [pathname],
+  );
+  useHardwareKeyboardCommand(sidebarCommands, handleToggleSidebarCommand);
   const showAuxiliaryPane = useCallback((role: WorkspaceAuxiliaryPaneRole) => {
     if (role === "inspector") {
       setFocusedAuxiliaryPaneRole("inspector");
diff --git a/apps/mobile/src/features/layout/workspace-sidebar-toolbar.tsx b/apps/mobile/src/features/layout/workspace-sidebar-toolbar.tsx
index 26677327575a..c5ef71422f4c 100644
--- a/apps/mobile/src/features/layout/workspace-sidebar-toolbar.tsx
+++ b/apps/mobile/src/features/layout/workspace-sidebar-toolbar.tsx
@@ -1,5 +1,3 @@
-import { NativeHeaderToolbar } from "../../native/StackHeader";
-import type { ReactNode } from "react";
 import { Platform } from "react-native";
 
 import { AndroidHeaderIconButton } from "../../components/AndroidScreenHeader";
@@ -12,39 +10,9 @@ export function AndroidWorkspaceSidebarButton() {
 
   return (
     <AndroidHeaderIconButton
-      accessibilityLabel={
-        panes.primarySidebarVisible ? "Hide thread sidebar" : "Show thread sidebar"
-      }
-      icon="sidebar.left"
-      selected={panes.primarySidebarVisible}
+      accessibilityLabel={panes.primarySidebarVisible ? "Maximize content" : "Show thread sidebar"}
+      icon={panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"}
       onPress={togglePrimarySidebar}
     />
   );
 }
-
-export function WorkspaceSidebarToolbar(
-  props: {
-    readonly children?: ReactNode;
-    readonly afterSidebarButton?: ReactNode;
-  } = {},
-) {
-  const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
-
-  if (Platform.OS === "android" || !layout.usesSplitView) {
-    return null;
-  }
-
-  return (
-    <NativeHeaderToolbar placement="left">
-      {props.children}
-      <NativeHeaderToolbar.Button
-        accessibilityLabel={
-          panes.primarySidebarVisible ? "Maximize content" : "Show thread sidebar"
-        }
-        icon={panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"}
-        onPress={togglePrimarySidebar}
-      />
-      {props.afterSidebarButton}
-    </NativeHeaderToolbar>
-  );
-}
diff --git a/apps/mobile/src/features/settings/SettingsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsRouteScreen.tsx
index c8a3b92abede..1b2aeb7cc891 100644
--- a/apps/mobile/src/features/settings/SettingsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsRouteScreen.tsx
@@ -6,7 +6,8 @@ import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-g
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { hasCloudPublicConfig } from "../cloud/publicConfig";
-import { WorkspaceSidebarToolbar } from "../layout/workspace-sidebar-toolbar";
+import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
+import { NativeHeaderToolbar } from "../../native/StackHeader";
 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
 import { SettingsRow } from "./components/SettingsRow";
 import { SettingsSection } from "./components/SettingsSection";
@@ -18,6 +19,8 @@ import {
 import { useSettingsEnvironmentFilter } from "./settings-environment-filter";
 
 export function SettingsRouteScreen() {
+  const navigation = useNavigation();
+  const { layout } = useAdaptiveWorkspaceLayout();
   const content = hasCloudPublicConfig() ? (
     <ConfiguredSettingsRouteScreen />
   ) : (
@@ -26,7 +29,15 @@ export function SettingsRouteScreen() {
 
   return (
     <>
-      <WorkspaceSidebarToolbar />
+      {Platform.OS === "ios" && layout.usesSplitView ? (
+        <NativeHeaderToolbar placement="left">
+          <NativeHeaderToolbar.Button
+            accessibilityLabel="Go back"
+            icon="chevron.left"
+            onPress={() => navigation.goBack()}
+          />
+        </NativeHeaderToolbar>
+      ) : null}
       <SettingsEnvironmentFilterHeader closeSettings />
       {Platform.OS === "android" ? (
         <SettingsScreen title="Settings" trailing={<AndroidSettingsEnvironmentFilter />}>
diff --git a/apps/mobile/src/features/settings/components/SettingsEnvironmentFilterHeader.tsx b/apps/mobile/src/features/settings/components/SettingsEnvironmentFilterHeader.tsx
index 3ba20a8b05c5..dbe468f620b4 100644
--- a/apps/mobile/src/features/settings/components/SettingsEnvironmentFilterHeader.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsEnvironmentFilterHeader.tsx
@@ -5,10 +5,13 @@ import { ControlPillMenu } from "../../../components/ControlPill";
 import { SymbolView } from "../../../components/AppSymbol";
 import { NativeStackScreenOptions } from "../../../native/StackHeader";
 import { withNativeGlassHeaderItem } from "../../layout/native-glass-header-items";
+import { useAdaptiveWorkspaceLayout } from "../../layout/AdaptiveWorkspaceLayout";
 import { useSettingsEnvironmentFilter } from "../settings-environment-filter";
 
 export function SettingsEnvironmentFilterHeader(props: { readonly closeSettings?: boolean }) {
   const navigation = useNavigation();
+  const { layout } = useAdaptiveWorkspaceLayout();
+  const closeSettings = props.closeSettings === true && !layout.usesSplitView;
   const {
     availableTargets,
     selectedTargets,
@@ -26,6 +29,7 @@ export function SettingsEnvironmentFilterHeader(props: { readonly closeSettings?
       ? "line.3.horizontal.decrease"
       : "line.3.horizontal.decrease.circle.fill";
   const filterVersion = JSON.stringify({
+    closeSettings,
     selection: selectedIds === null ? null : [...selectedIds].sort(),
     targets: availableTargets.map((entry) => [entry.environmentId, entry.label, entry.displayUrl]),
     project: selectedProjectKey,
@@ -94,7 +98,7 @@ export function SettingsEnvironmentFilterHeader(props: { readonly closeSettings?
               ],
             },
           }),
-          ...(props.closeSettings
+          ...(closeSettings
             ? [
                 withNativeGlassHeaderItem({
                   accessibilityLabel: "Close settings",
diff --git a/apps/mobile/src/features/settings/components/SettingsScreen.tsx b/apps/mobile/src/features/settings/components/SettingsScreen.tsx
index 4b865345843a..b8809d4a2a51 100644
--- a/apps/mobile/src/features/settings/components/SettingsScreen.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsScreen.tsx
@@ -23,7 +23,7 @@ export function SettingsScreen(
         title={props.title}
         actions={props.actions}
         trailing={Platform.OS === "android" ? props.trailing : undefined}
-        sidebar={Platform.OS === "android" && !props.formSheet}
+        sidebar={false}
         onBack={() => navigation.goBack()}
         hideBottomBorder={!props.formSheet}
       />
diff --git a/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx b/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
index 794cb9dce476..931e09c4ad16 100644
--- a/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
+++ b/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
@@ -100,9 +100,8 @@ function TerminalHeader(props: {
       subtitle={props.subtitle}
       onBack={props.onCloseTerminal}
       backInSplitView={{
-        accessibilityLabel: "Close terminal",
-        icon: "xmark",
-        separateBackground: true,
+        accessibilityLabel: "Back to chat",
+        icon: "chevron.left",
       }}
       menus={
         props.isEnvironmentReady
diff --git a/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx b/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
index 75210bc36331..f74542076be2 100644
--- a/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
@@ -98,28 +98,24 @@ function NewTaskHeader(props: {
       title={props.title}
       subtitle={props.subtitle ?? undefined}
       sidebar={false}
+      backInSplitView={{
+        accessibilityLabel: "Go back",
+        icon: "chevron.left",
+      }}
+      options={{ headerBackVisible: !layout.usesSplitView }}
       hideBottomBorder
       onBack={() => navigation.goBack()}
-      actions={[
-        ...(Platform.OS === "ios" && layout.usesSplitView
-          ? [
-              {
-                accessibilityLabel: "Close new task",
-                icon: "xmark" as const,
-                onPress: () => navigation.goBack(),
-              },
-            ]
-          : []),
-        ...(props.canAddProject
+      actions={
+        props.canAddProject
           ? [
               {
                 accessibilityLabel: "Add project",
-                icon: "plus" as const,
+                icon: "plus",
                 onPress: () => navigation.dispatch(StackActions.push("AddProject")),
               },
             ]
-          : []),
-      ]}
+          : []
+      }
       search={{
         value: props.searchText,
         onChangeText: props.onSearchTextChange,

From 7a326c244f72d6421c2f1cbf004d55806c631526 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Sat, 19 Sep 2026 00:24:32 -0700
Subject: [PATCH 18/25] chore(mobile): add dev client script with preview
 environment (#12558)

---
 apps/mobile/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index b32117c03155..dba137f30472 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -7,6 +7,7 @@
     "dev": "expo start",
     "dev:client": "APP_VARIANT=development expo start --dev-client --scheme t3code-dev --lan",
     "dev:client:reset": "APP_VARIANT=development expo start --dev-client --scheme t3code-dev --clear --lan",
+    "dev:client:preview-env": "eas env:exec preview 'EXPO_NO_DOTENV=1 APP_VARIANT=development expo start --dev-client --scheme t3code-dev --lan --port 0'",
     "dev:client:preview": "eas env:exec preview 'EXPO_NO_DOTENV=1 APP_VARIANT=preview expo start --dev-client --scheme t3code-preview --lan'",
     "start": "expo start",
     "start:dev": "APP_VARIANT=development expo start",

From 408ff8ae9bd7eb2e7e90cbfd8b3fcfe63641bf23 Mon Sep 17 00:00:00 2001
From: Bilal Bakr <62337003+Bil0000@users.noreply.github.com>
Date: Sat, 19 Sep 2026 10:50:22 +0300
Subject: [PATCH 19/25] fix: detect installed editors outside PATH (#12439)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
---
 apps/desktop/src/ipc/methods/window.test.ts   |  36 +++++
 apps/desktop/src/ipc/methods/window.ts        |  18 +--
 .../src/process/externalLauncher.test.ts      | 153 ++++++++++++++++++
 apps/server/src/process/externalLauncher.ts   |  40 ++---
 packages/shared/package.json                  |   4 +
 packages/shared/src/editor.ts                 | 127 +++++++++++++++
 6 files changed, 341 insertions(+), 37 deletions(-)
 create mode 100644 packages/shared/src/editor.ts

diff --git a/apps/desktop/src/ipc/methods/window.test.ts b/apps/desktop/src/ipc/methods/window.test.ts
index eca3db4ddf85..764056742372 100644
--- a/apps/desktop/src/ipc/methods/window.test.ts
+++ b/apps/desktop/src/ipc/methods/window.test.ts
@@ -1,4 +1,8 @@
 import { assert, describe, it } from "@effect/vitest";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
@@ -26,6 +30,7 @@ import {
   getWindowFullscreenState,
   pasteAsText,
   pickProjectFavicon,
+  probeRemoteEditors,
 } from "./window.ts";
 
 const readyWslConfig: DesktopBackendManager.DesktopBackendStartConfig = {
@@ -262,3 +267,34 @@ describe("pickProjectFavicon", () => {
     }),
   );
 });
+
+it.effect.skipIf(HostProcessPlatform.defaultValue() === "win32")(
+  "finds remote editors installed without PATH launchers",
+  () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-remote-editors-" });
+      for (const app of ["Cursor", "Visual Studio Code", "WebStorm"]) {
+        const executable = path.join(
+          home,
+          "Applications",
+          `${app}.app`,
+          app === "WebStorm" ? "Contents/MacOS/webstorm" : "Contents/Resources/app/bin/code",
+        );
+        yield* fs.makeDirectory(path.dirname(executable), { recursive: true });
+        yield* fs.writeFileString(executable, "#!/bin/sh\n");
+        yield* fs.chmod(executable, 0o755);
+      }
+      const editors = yield* probeRemoteEditors.handler(undefined).pipe(
+        Effect.provideService(HostProcessEnvironment, {
+          HOME: home,
+          PATH: path.join(home, "empty"),
+        }),
+        Effect.provideService(HostProcessPlatform, "darwin"),
+      );
+      assert.include(editors, "cursor");
+      assert.include(editors, "vscode");
+      assert.notInclude(editors, "webstorm");
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
diff --git a/apps/desktop/src/ipc/methods/window.ts b/apps/desktop/src/ipc/methods/window.ts
index 81361db37303..75f34ab07ab1 100644
--- a/apps/desktop/src/ipc/methods/window.ts
+++ b/apps/desktop/src/ipc/methods/window.ts
@@ -14,7 +14,8 @@ import {
   type PickedThemeFile,
 } from "@t3tools/contracts";
 import { WORKSPACE_IMAGE_PREVIEW_EXTENSIONS } from "@t3tools/shared/filePreview";
-import { isCommandAvailable } from "@t3tools/shared/shell";
+import { resolveEditorCommand } from "@t3tools/shared/editor";
+import * as HostProcess from "@t3tools/shared/hostProcess";
 import * as NodeOS from "node:os";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
@@ -333,20 +334,13 @@ export const probeRemoteEditors = DesktopIpc.makeIpcMethod({
   channel: IpcChannels.PROBE_REMOTE_EDITORS_CHANNEL,
   payload: Schema.Undefined,
   result: Schema.Array(EditorId),
-  // Probes THIS machine (where the renderer runs) for remote-capable editor
-  // CLIs, unlike the server's probe which walks the environment host's PATH.
-  // A Finder-launched app can miss PATH entries; an empty result makes the
-  // renderer fall back to VS Code only, so that fails soft.
   handler: Effect.fn("desktop.ipc.window.probeRemoteEditors")(function* () {
     const available: Array<EditorId> = [];
+    const env = yield* HostProcess.HostProcessEnvironment;
     for (const editorId of REMOTE_CAPABLE_EDITOR_IDS) {
-      const commands = EDITORS.find((editor) => editor.id === editorId)?.commands;
-      if (!commands) continue;
-      for (const command of commands) {
-        if (yield* isCommandAvailable(command, { env: process.env })) {
-          available.push(editorId);
-          break;
-        }
+      const editor = EDITORS.find((editor) => editor.id === editorId);
+      if (editor && Option.isSome(yield* resolveEditorCommand(editor, env))) {
+        available.push(editorId);
       }
     }
     return available;
diff --git a/apps/server/src/process/externalLauncher.test.ts b/apps/server/src/process/externalLauncher.test.ts
index b7092d70f0e2..f714a70f783d 100644
--- a/apps/server/src/process/externalLauncher.test.ts
+++ b/apps/server/src/process/externalLauncher.test.ts
@@ -922,6 +922,159 @@ it.effect("discovers editors through the service API", () =>
   }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
 );
 
+for (const { platform, installPath, editor, args } of [
+  {
+    platform: "darwin",
+    installPath: "Applications/Cursor.app/Contents/Resources/app/bin/code",
+    editor: "cursor",
+    args: ["--classic", "--goto", "/workspace with spaces/file.ts:12:4"],
+  },
+  {
+    platform: "darwin",
+    installPath: "Applications/Kiro.app/Contents/Resources/app/bin/code",
+    editor: "kiro",
+    args: ["--goto", "/workspace with spaces/file.ts:12:4"],
+  },
+  {
+    platform: "darwin",
+    installPath: "Applications/WebStorm.app/Contents/MacOS/webstorm",
+    editor: "webstorm",
+    args: ["--line", "12", "--column", "4", "/workspace with spaces/file.ts"],
+  },
+  {
+    platform: "darwin",
+    installPath: "Applications/Zed.app/Contents/MacOS/cli",
+    editor: "zed",
+    args: ["/workspace with spaces/file.ts:12:4"],
+  },
+  {
+    platform: "win32",
+    installPath: "Programs/Cursor/resources/app/bin/cursor.cmd",
+    editor: "cursor",
+    args: ['^"--classic^"', '^"--goto^"', '^"/workspace^ with^ spaces/file.ts:12:4^"'],
+  },
+  {
+    platform: "win32",
+    installPath: "Programs/Microsoft VS Code/bin/code.cmd",
+    editor: "vscode",
+    args: ['^"--goto^"', '^"/workspace^ with^ spaces/file.ts:12:4^"'],
+  },
+  {
+    platform: "win32",
+    installPath: "Programs/JetBrains/WebStorm 2026.2/bin/webstorm64.exe",
+    editor: "webstorm",
+    args: ["--line", "12", "--column", "4", "/workspace with spaces/file.ts"],
+  },
+  {
+    platform: "win32",
+    installPath: "Programs/WebStorm/bin/webstorm64.exe",
+    editor: "webstorm",
+    args: ["--line", "12", "--column", "4", "/workspace with spaces/file.ts"],
+  },
+  {
+    platform: "win32",
+    installPath: "Programs/Zed/bin/zed.exe",
+    editor: "zed",
+    args: ["/workspace with spaces/file.ts:12:4"],
+  },
+  {
+    platform: "linux",
+    installPath: ".local/share/JetBrains/Toolbox/scripts/idea",
+    editor: "idea",
+    args: ["--line", "12", "--column", "4", "/workspace with spaces/file.ts"],
+  },
+  {
+    platform: "linux",
+    installPath: ".local/bin/zed",
+    editor: "zed",
+    args: ["/workspace with spaces/file.ts:12:4"],
+  },
+] as const) {
+  it.effect.skipIf(windowsHost && platform !== "win32")(
+    `discovers and launches ${editor} outside PATH on ${platform}`,
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-editor installs-" });
+        const executable = path.join(home, installPath);
+        yield* fs.makeDirectory(path.dirname(executable), { recursive: true });
+        yield* fs.writeFileString(executable, "#!/bin/sh\n");
+        yield* fs.chmod(executable, 0o755);
+        let spawned: ChildProcess.StandardCommand | undefined;
+        yield* Effect.gen(function* () {
+          const launcher = yield* ExternalLauncher.ExternalLauncher;
+          assert.include(yield* launcher.resolveAvailableEditors(), editor);
+          yield* launcher.launchEditor({ editor, cwd: "/workspace with spaces/file.ts:12:4" });
+        }).pipe(
+          Effect.provide(
+            testLayer({
+              platform,
+              env: { HOME: home, LOCALAPPDATA: home, PATH: path.join(home, "empty") },
+              onSpawn: (command) => {
+                spawned = command;
+              },
+            }),
+          ),
+        );
+        assert.ok(spawned);
+        assert.equal(
+          spawned.command,
+          executable.endsWith(".cmd") ? `^"${executable.replaceAll(" ", "^ ")}^"` : executable,
+        );
+        assert.deepEqual(spawned.args, args);
+        assert.equal(spawned.options.shell, executable.endsWith(".cmd"));
+      }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+}
+
+it.effect.skipIf(windowsHost)("ignores unusable app bundles and keeps PATH launchers first", () =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-editor-priority-" });
+    const executable = path.join(home, "Applications/Cursor.app/Contents/Resources/app/bin/code");
+    const env = { HOME: home, PATH: path.join(home, "bin") };
+    const discover = Effect.gen(function* () {
+      const launcher = yield* ExternalLauncher.ExternalLauncher;
+      return yield* launcher.resolveAvailableEditors();
+    });
+    const before = yield* discover.pipe(Effect.provide(testLayer({ platform: "darwin", env })));
+    yield* fs.makeDirectory(executable, { recursive: true });
+    assert.deepEqual(
+      yield* discover.pipe(Effect.provide(testLayer({ platform: "darwin", env }))),
+      before,
+    );
+    yield* fs.remove(executable, { recursive: true });
+    yield* fs.writeFileString(executable, "#!/bin/sh\n");
+    yield* fs.chmod(executable, 0o644);
+    assert.deepEqual(
+      yield* discover.pipe(Effect.provide(testLayer({ platform: "darwin", env }))),
+      before,
+    );
+    yield* fs.chmod(executable, 0o755);
+    yield* fs.makeDirectory(env.PATH);
+    yield* fs.writeFileString(path.join(env.PATH, "cursor"), "#!/bin/sh\n");
+    yield* fs.chmod(path.join(env.PATH, "cursor"), 0o755);
+    let spawned: ChildProcess.StandardCommand | undefined;
+    yield* Effect.gen(function* () {
+      const launcher = yield* ExternalLauncher.ExternalLauncher;
+      yield* launcher.launchEditor({ editor: "cursor", cwd: "/workspace" });
+    }).pipe(
+      Effect.provide(
+        testLayer({
+          platform: "darwin",
+          env: { ...env, PATH: `${env.PATH}:/usr/bin` },
+          onSpawn: (command) => {
+            spawned = command;
+          },
+        }),
+      ),
+    );
+    assert.equal(spawned?.command, "cursor");
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
 it.effect("memoizes editor discovery and refreshes after the cache window", () => {
   let statCalls = 0;
   const fileInfo = { type: "File" } as FileSystem.File.Info;
diff --git a/apps/server/src/process/externalLauncher.ts b/apps/server/src/process/externalLauncher.ts
index 56d729b52fbb..29c25e790c61 100644
--- a/apps/server/src/process/externalLauncher.ts
+++ b/apps/server/src/process/externalLauncher.ts
@@ -18,6 +18,7 @@ import {
   type FileManagerRevealKind,
   type LaunchEditorInput,
 } from "@t3tools/contracts";
+import { resolveEditorCommand } from "@t3tools/shared/editor";
 import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell";
 import * as Clock from "effect/Clock";
@@ -109,6 +110,12 @@ const CommandLookupEnvConfig = Config.all({
   Path: Config.String("Path").pipe(Config.option),
   path: Config.String("path").pipe(Config.option),
   PATHEXT: Config.String("PATHEXT").pipe(Config.option),
+  HOME: Config.String("HOME").pipe(Config.option),
+  LOCALAPPDATA: Config.String("LOCALAPPDATA").pipe(Config.option),
+  ProgramFiles: Config.String("ProgramFiles").pipe(Config.option),
+  ProgramW6432: Config.String("ProgramW6432").pipe(Config.option),
+  XDG_DATA_HOME: Config.String("XDG_DATA_HOME").pipe(Config.option),
+  "ProgramFiles(x86)": Config.String("ProgramFiles(x86)").pipe(Config.option),
 }).pipe(Config.map(compactEnv));
 
 const readBrowserLaunchEnv = BrowserLaunchEnvConfig.pipe(Effect.orElseSucceed(() => ({})));
@@ -154,26 +161,6 @@ function resolveCommandEditorArgs(
   }
 }
 
-function resolveEditorArgs(
-  editor: (typeof EDITORS)[number],
-  target: string,
-): ReadonlyArray<string> {
-  const baseArgs = "baseArgs" in editor ? editor.baseArgs : [];
-  return [...baseArgs, ...resolveCommandEditorArgs(editor, target)];
-}
-
-const resolveAvailableCommand = Effect.fn("externalLauncher.resolveAvailableCommand")(function* (
-  commands: ReadonlyArray<string>,
-  env: NodeJS.ProcessEnv,
-): Effect.fn.Return<Option.Option<string>, never, FileSystem.FileSystem | Path.Path> {
-  for (const command of commands) {
-    if (yield* isCommandAvailable(command, { env })) {
-      return Option.some(command);
-    }
-  }
-  return Option.none();
-});
-
 function encodeUtf16LeBase64(input: string): string {
   const bytes = new Uint8Array(input.length * 2);
   for (let index = 0; index < input.length; index += 1) {
@@ -435,7 +422,7 @@ const buildAvailableEditors = Effect.fn("externalLauncher.buildAvailableEditors"
       continue;
     }
 
-    const command = yield* resolveAvailableCommand(editor.commands, env);
+    const command = yield* resolveEditorCommand(editor, env);
     if (Option.isSome(command)) {
       available.push(editor.id);
     }
@@ -538,15 +525,18 @@ const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
   }
 
   if (editorDef.commands) {
-    const command = Option.getOrElse(
-      yield* resolveAvailableCommand(editorDef.commands, env),
-      () => editorDef.commands[0],
+    const { command, baseArgs } = Option.getOrElse(
+      yield* resolveEditorCommand(editorDef, env),
+      () => ({
+        command: editorDef.commands[0],
+        baseArgs: "baseArgs" in editorDef ? editorDef.baseArgs : [],
+      }),
     );
     return {
       editor: editorDef.id,
       target: input.cwd,
       command,
-      args: resolveEditorArgs(editorDef, input.cwd),
+      args: [...baseArgs, ...resolveCommandEditorArgs(editorDef, input.cwd)],
     };
   }
 
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 97452f4d4a9f..1cd162593160 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -63,6 +63,10 @@
       "types": "./src/httpObservability.ts",
       "import": "./src/httpObservability.ts"
     },
+    "./editor": {
+      "types": "./src/editor.ts",
+      "import": "./src/editor.ts"
+    },
     "./shell": {
       "types": "./src/shell.ts",
       "import": "./src/shell.ts"
diff --git a/packages/shared/src/editor.ts b/packages/shared/src/editor.ts
new file mode 100644
index 000000000000..cc6def9d01e9
--- /dev/null
+++ b/packages/shared/src/editor.ts
@@ -0,0 +1,127 @@
+import type { EDITORS } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+
+import * as HostProcess from "./hostProcess.ts";
+import { isCommandAvailable } from "./shell.ts";
+
+type Editor = (typeof EDITORS)[number];
+
+const installNames: Partial<Record<Editor["id"], ReadonlyArray<string>>> = {
+  vscode: ["Visual Studio Code"],
+  "vscode-insiders": ["Visual Studio Code - Insiders"],
+  idea: ["IntelliJ IDEA", "IntelliJ IDEA CE", "IntelliJ IDEA Ultimate"],
+  pycharm: ["PyCharm", "PyCharm CE"],
+  rider: ["Rider", "JetBrains Rider"],
+};
+
+export const resolveEditorCommand = Effect.fn("editor.resolveEditorCommand")(function* (
+  editor: Editor,
+  env: NodeJS.ProcessEnv,
+) {
+  if (editor.commands === null) return Option.none();
+  const baseArgs = "baseArgs" in editor ? editor.baseArgs : [];
+  for (const command of editor.commands) {
+    if (yield* isCommandAvailable(command, { env })) return Option.some({ command, baseArgs });
+  }
+
+  const platform = yield* HostProcess.HostProcessPlatform;
+  const path = yield* Path.Path;
+  const fs = yield* FileSystem.FileSystem;
+  const home = env.HOME;
+  const names = installNames[editor.id] ?? [editor.label];
+  const command = editor.commands[0];
+  const jetbrains = editor.launchStyle === "line-column";
+  const candidates: string[] = [];
+
+  if (platform === "darwin") {
+    const roots = [...(home ? [path.join(home, "Applications")] : []), "/Applications"];
+    for (const root of roots) {
+      for (const name of names) {
+        const contents = path.join(root, `${name}.app`, "Contents");
+        candidates.push(
+          ...(jetbrains || editor.id === "zed"
+            ? [path.join(contents, "MacOS", editor.id === "zed" ? "cli" : command)]
+            : [
+                path.join(contents, "Resources/app/bin", command),
+                path.join(contents, "Resources/app/bin/code"),
+              ]),
+        );
+      }
+    }
+    if (home && jetbrains) {
+      candidates.push(
+        path.join(home, "Library/Application Support/JetBrains/Toolbox/scripts", command),
+      );
+    }
+  } else if (platform === "win32") {
+    const roots = [
+      ...(env.LOCALAPPDATA ? [path.join(env.LOCALAPPDATA, "Programs")] : []),
+      ...[env.ProgramFiles, env["ProgramFiles(x86)"], env.ProgramW6432].filter(
+        (root): root is string => !!root,
+      ),
+    ];
+    if (jetbrains) {
+      if (env.LOCALAPPDATA) {
+        candidates.push(path.join(env.LOCALAPPDATA, "JetBrains/Toolbox/scripts", `${command}.cmd`));
+      }
+      for (const directory of roots.flatMap((root) => [root, path.join(root, "JetBrains")])) {
+        const entries = yield* fs.readDirectory(directory).pipe(Effect.orElseSucceed(() => []));
+        for (const entry of entries) {
+          if (names.some((name) => entry === name || entry.startsWith(`${name} `))) {
+            candidates.push(path.join(directory, entry, "bin", `${command}64.exe`));
+            candidates.push(path.join(directory, entry, "bin", `${command}.exe`));
+          }
+        }
+      }
+    } else {
+      const name =
+        editor.id === "vscode"
+          ? "Microsoft VS Code"
+          : editor.id === "vscode-insiders"
+            ? "Microsoft VS Code Insiders"
+            : editor.label;
+      for (const root of roots) {
+        candidates.push(
+          path.join(root, name, "resources/app/bin", `${command}.cmd`),
+          path.join(root, name, "resources/app/bin/code.cmd"),
+          path.join(root, name, "bin", `${command}.cmd`),
+          path.join(root, name, "bin/code.cmd"),
+        );
+        if (editor.id === "zed") {
+          candidates.push(
+            path.join(root, name, "bin", "zed.exe"),
+            path.join(root, name, "zed.exe"),
+          );
+        }
+      }
+    }
+  } else if (platform === "linux") {
+    const dirs = [
+      ...(home ? [path.join(home, ".local/bin")] : []),
+      "/usr/local/bin",
+      "/usr/bin",
+      "/snap/bin",
+    ];
+    if (jetbrains) {
+      const dataHome = env.XDG_DATA_HOME || (home ? path.join(home, ".local/share") : undefined);
+      if (dataHome) dirs.push(path.join(dataHome, "JetBrains/Toolbox/scripts"));
+    }
+    for (const dir of dirs) {
+      for (const name of editor.commands) candidates.push(path.join(dir, name));
+    }
+  }
+
+  for (const candidate of candidates) {
+    if (yield* isCommandAvailable(candidate, { env })) {
+      return Option.some({
+        command: candidate,
+        baseArgs:
+          editor.id === "kiro" && (platform === "darwin" || platform === "win32") ? [] : baseArgs,
+      });
+    }
+  }
+  return Option.none();
+});

From dfbb11bdd7c3f1a5575cb55d3e3abb12be025727 Mon Sep 17 00:00:00 2001
From: Bilal Bakr <62337003+Bil0000@users.noreply.github.com>
Date: Sat, 19 Sep 2026 12:05:49 +0300
Subject: [PATCH 20/25] fix(web): show plain text in collapsed thought previews
 (#12377)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
---
 .../components/chat/MessagesTimeline.test.tsx | 92 +++++++++++++++++++
 .../src/components/chat/MessagesTimeline.tsx  | 33 ++++++-
 2 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsx
index 3bf5f482948d..dae27ccdba47 100644
--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx
@@ -1656,6 +1656,98 @@ describe("MessagesTimeline", () => {
     expect(markup).not.toContain("tool call failed");
   });
 
+  it.each(
+    (
+      [
+        [
+          "**Viewing image first** with *care*, ~~old~~ `code` and [context](https://example.com)",
+          "Viewing image first with care, old code and context",
+          1,
+        ],
+        ["first paragraph\n\nsecond paragraph", "first paragraph second paragraph", 0],
+        ["- first\n- second", "first second", 0],
+        ["first  \nsecond", "first second", 0],
+        ["![image description](image.png)", "image description", 0],
+        ["![](image.png)", "Thought", 0],
+        ["---", "Thought", 0],
+      ] as const
+    ).flatMap(([markdown, expected, strongCount]) =>
+      [false, true].map((streaming) => ({
+        markdown,
+        expected,
+        strongCount,
+        streaming,
+      })),
+    ),
+  )(
+    "shows a plain thought preview for $markdown, streaming=$streaming",
+    async ({ markdown, expected, strongCount, streaming }) => {
+      vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+      vi.stubGlobal("requestAnimationFrame", () => 0);
+      vi.stubGlobal("cancelAnimationFrame", () => {});
+      const turnId = TurnId.make("turn-thought");
+      const thought = buildAssistantTimelineEntry(markdown);
+      let renderer: ReactTestRenderer | undefined;
+      try {
+        await act(() => {
+          renderer = create(
+            <MessagesTimeline
+              {...buildProps()}
+              isWorking
+              runningTurnId={turnId}
+              timelineEntries={[
+                {
+                  id: "work-entry",
+                  kind: "work",
+                  createdAt: MESSAGE_CREATED_AT,
+                  entry: {
+                    id: "work",
+                    createdAt: MESSAGE_CREATED_AT,
+                    turnId,
+                    label: "Read image",
+                    tone: "tool",
+                    itemType: "command_execution",
+                    command: "cat image.png",
+                    toolLifecycleStatus: "completed",
+                  },
+                },
+                {
+                  ...thought,
+                  message: { ...thought.message, role: "reasoning", turnId, streaming },
+                },
+              ]}
+            />,
+          );
+        });
+        await act(() => renderer!.root.findByProps({ "aria-expanded": false }).props.onClick());
+        const text = renderer!.root.findByProps({
+          className: "relative min-w-0 flex-1 truncate text-secondary-label",
+        });
+        const preview = text.parent!;
+        expect(
+          text
+            .findAll(() => true)
+            .flatMap((node) => node.children)
+            .filter((child) => typeof child === "string")
+            .join(""),
+        ).toBe(
+          (streaming && expected === "Thought" ? "Thinking" : expected).repeat(streaming ? 2 : 1),
+        );
+        expect(
+          preview.findAll((node) =>
+            ["strong", "em", "del", "code", "a"].includes(String(node.type)),
+          ),
+        ).toHaveLength(0);
+        await act(() => preview.props.onClick());
+        expect(renderer!.root.findAllByType("strong")).toHaveLength(strongCount);
+        await act(() => preview.props.onClick());
+        expect(renderer!.root.findAllByType("strong")).toHaveLength(0);
+      } finally {
+        await act(() => renderer?.unmount());
+      }
+    },
+  );
+
   it("renders initial thinking as the shared live activity row", () => {
     const turnId = TurnId.make("turn-live");
     const markup = renderToStaticMarkup(
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 8305cb1d5283..42a45b991028 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -103,6 +103,9 @@ import {
 } from "../../lib/diffRendering";
 import { PREFERRED_HIGHLIGHTER } from "../../lib/syntaxHighlighting";
 import ChatMarkdown, { ChatMarkdownAssetImage } from "../ChatMarkdown";
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
+import type { Root, RootContent } from "mdast";
 import { T3Wordmark } from "../T3Wordmark";
 import {
   BotIcon,
@@ -2689,6 +2692,28 @@ function ThinkingTimelineRow() {
   );
 }
 
+function remarkThoughtPreview(fallback: string) {
+  return (tree: Root) => {
+    const plainText = (node: Root | RootContent): string => {
+      if (node.type === "html" || node.type === "definition") return "";
+      if ("alt" in node) return node.alt ?? "";
+      if ("value" in node) return node.value;
+      if ("children" in node) {
+        const separator = ["root", "blockquote", "list", "listItem", "table", "tableRow"].includes(
+          node.type,
+        )
+          ? " "
+          : "";
+        return node.children.map(plainText).join(separator);
+      }
+      return node.type === "break" ? " " : "";
+    };
+    tree.children = [
+      { type: "text", value: plainText(tree).replace(/\s+/g, " ").trim() || fallback },
+    ];
+  };
+}
+
 /**
  * Thinking inside a tool group has its own disclosure, preserved across recycling.
  * A group whose row already reads "Thought" (no visible tool) skips the header.
@@ -2722,7 +2747,13 @@ function ReasoningTraceBlock({
   }
   const label = streaming ? "Thinking" : "Thought";
   const collapsedPreview = messages.find((message) => message.text.trim().length > 0)?.text.trim();
-  const headerText = expanded ? label : (collapsedPreview ?? label);
+  const headerText = expanded ? (
+    label
+  ) : (
+    <ReactMarkdown remarkPlugins={[remarkGfm, [remarkThoughtPreview, label]]}>
+      {collapsedPreview ?? label}
+    </ReactMarkdown>
+  );
   return (
     <div className="flex flex-col">
       {showHeader ? (

From 9accc567670da5096e9a694c1adb0d35adb51d9d Mon Sep 17 00:00:00 2001
From: Alex Southwell <saphid@gmail.com>
Date: Sun, 20 Sep 2026 02:38:20 +1000
Subject: [PATCH 21/25] fix(web): wrap long titles in confirmation dialogs
 (#12571)

---
 apps/web/src/components/ConfirmDialogHost.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/ConfirmDialogHost.tsx b/apps/web/src/components/ConfirmDialogHost.tsx
index 7babc62fd2ea..322423c40a94 100644
--- a/apps/web/src/components/ConfirmDialogHost.tsx
+++ b/apps/web/src/components/ConfirmDialogHost.tsx
@@ -77,7 +77,7 @@ export function ConfirmDialogHost() {
     >
       <AlertDialogPopup className="max-w-lg">
         <AlertDialogHeader>
-          <AlertDialogTitle>{copy.title}</AlertDialogTitle>
+          <AlertDialogTitle className="wrap-anywhere">{copy.title}</AlertDialogTitle>
           {copy.description ? (
             <AlertDialogDescription className="whitespace-pre-line">
               {copy.description}

From b44c1ce5d25ee0d5a5be82e380618a886c19ea96 Mon Sep 17 00:00:00 2001
From: Dara Adedeji <76637177+SunkenInTime@users.noreply.github.com>
Date: Sat, 19 Sep 2026 12:46:03 -0400
Subject: [PATCH 22/25] fix(mobile): keep the Android composer placeholder on
 one line (#12605)

---
 .../t3composereditor/T3ComposerEditorView.kt  | 36 ++++++++++-
 .../ComposerPlaceholderTest.kt                | 59 +++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 apps/mobile/modules/t3-composer-editor/android/src/test/java/expo/modules/t3composereditor/ComposerPlaceholderTest.kt

diff --git a/apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt b/apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt
index a4720a461327..35d796b7876f 100644
--- a/apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt
+++ b/apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt
@@ -12,6 +12,7 @@ import android.text.Editable
 import android.text.InputType
 import android.text.InputFilter
 import android.text.Spanned
+import android.text.TextUtils
 import android.text.TextWatcher
 import android.text.style.ReplacementSpan
 import android.util.TypedValue
@@ -254,7 +255,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
   }
 
   fun setPlaceholder(placeholder: String) {
-    editor.hint = placeholder
+    editor.placeholder = placeholder
   }
 
   fun setClipboardFragment(fragment: String) {
@@ -267,12 +268,14 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
     } else {
       Typeface.DEFAULT
     }
+    editor.applyPlaceholder()
   }
 
   fun setFontSize(fontSize: Float) {
     editor.textSize = fontSize
     applyLineHeight()
     applyTokenSpans()
+    editor.applyPlaceholder()
   }
 
   fun setLineHeight(lineHeight: Float) {
@@ -587,6 +590,37 @@ internal class SelectionAwareEditText(context: Context) : EditText(context) {
   var maxInputChars = Int.MAX_VALUE
   var clipboardFragment = ""
 
+  /**
+   * Placeholder shown while the draft is empty. An editable TextView never ellipsizes its hint,
+   * so a long placeholder wraps once a wide system font or a large font scale (Samsung defaults)
+   * runs out of width, and the resting composer grows to two lines. The hint is instead cut to
+   * one line with an ellipsis for whatever width the editor is measured at.
+   */
+  var placeholder = ""
+    set(value) {
+      field = value
+      applyPlaceholder()
+    }
+
+  fun applyPlaceholder(availableWidth: Int = width - compoundPaddingLeft - compoundPaddingRight) {
+    val next =
+      if (availableWidth > 0) {
+        TextUtils.ellipsize(placeholder, paint, availableWidth.toFloat(), TextUtils.TruncateAt.END)
+      } else {
+        placeholder
+      }
+    if (hint?.toString() != next.toString()) hint = next
+  }
+
+  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    if (MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED) {
+      applyPlaceholder(
+        MeasureSpec.getSize(widthMeasureSpec) - compoundPaddingLeft - compoundPaddingRight
+      )
+    }
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+  }
+
   private fun deleteChip(backwards: Boolean): Boolean {
     val content = text
     val start = minOf(selectionStart, selectionEnd)
diff --git a/apps/mobile/modules/t3-composer-editor/android/src/test/java/expo/modules/t3composereditor/ComposerPlaceholderTest.kt b/apps/mobile/modules/t3-composer-editor/android/src/test/java/expo/modules/t3composereditor/ComposerPlaceholderTest.kt
new file mode 100644
index 000000000000..82bcbeb59a94
--- /dev/null
+++ b/apps/mobile/modules/t3-composer-editor/android/src/test/java/expo/modules/t3composereditor/ComposerPlaceholderTest.kt
@@ -0,0 +1,59 @@
+package expo.modules.t3composereditor
+
+import android.view.View
+import android.view.ViewGroup
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [36], manifest = Config.NONE)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class ComposerPlaceholderTest {
+  private val placeholder = "Ask the repo agent, or run a command…"
+  private val editor = SelectionAwareEditText(RuntimeEnvironment.getApplication()).apply {
+    layoutParams = ViewGroup.LayoutParams(
+      ViewGroup.LayoutParams.MATCH_PARENT,
+      ViewGroup.LayoutParams.MATCH_PARENT,
+    )
+    textSize = 16f
+    placeholder = this@ComposerPlaceholderTest.placeholder
+  }
+
+  private fun measureAt(width: Int) {
+    editor.measure(
+      View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+      View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+    )
+    editor.layout(0, 0, width, editor.measuredHeight)
+  }
+
+  @Test
+  fun narrowEditorCutsThePlaceholderToOneLine() {
+    val fullWidth = editor.paint.measureText(placeholder)
+    val width = (fullWidth / 2).toInt()
+    measureAt(width)
+
+    val hint = editor.hint.toString()
+    assertTrue(hint, hint.endsWith("…") && hint.length < placeholder.length)
+    assertTrue(hint, editor.paint.measureText(hint) <= width)
+  }
+
+  @Test
+  fun wideEditorKeepsTheWholePlaceholder() {
+    measureAt(editor.paint.measureText(placeholder).toInt() + 20)
+    assertEquals(placeholder, editor.hint.toString())
+  }
+
+  @Test
+  fun placeholderRecoversWhenTheEditorWidens() {
+    measureAt((editor.paint.measureText(placeholder) / 2).toInt())
+    measureAt(editor.paint.measureText(placeholder).toInt() + 20)
+    assertEquals(placeholder, editor.hint.toString())
+  }
+}

From 75a1cb2c1b352941d3dc0fd389ca7298575be939 Mon Sep 17 00:00:00 2001
From: Yordis Prieto <yordis.prieto@gmail.com>
Date: Sat, 19 Sep 2026 13:46:37 -0400
Subject: [PATCH 23/25] test(server): the fork migration guard builds its own
 in-memory database

Upstream removed the shared helper this test reached for, and the guard is
the one thing that must keep running for fork migrations to stay off the
shared ledger.

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
---
 apps/server/src/persistence/ForkMigrations.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/persistence/ForkMigrations.test.ts b/apps/server/src/persistence/ForkMigrations.test.ts
index b09169c8241d..9cc9e66414c0 100644
--- a/apps/server/src/persistence/ForkMigrations.test.ts
+++ b/apps/server/src/persistence/ForkMigrations.test.ts
@@ -48,7 +48,7 @@ describe("forkMigrationEntries", () => {
   });
 });
 
-const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layer({ filename: ":memory:" })));
 
 layer("fresh install", (it) => {
   it.effect("runs the fork chain on its own ledger without touching shared numbering", () =>

From 0842cdbcacff6829fe9ca41508c18763e736855c Mon Sep 17 00:00:00 2001
From: Yordis Prieto <yordis.prieto@gmail.com>
Date: Sat, 19 Sep 2026 13:46:38 -0400
Subject: [PATCH 24/25] docs(fork): 0022 stops promising metrics the desktop
 never records

Upstream shipped its own desktop exporter and settled two questions this
divergence had answered differently; the entry now describes what the fork
still carries.

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
---
 ...22-the-desktop-app-reports-its-own-work.md | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/fork/0022-the-desktop-app-reports-its-own-work.md b/docs/fork/0022-the-desktop-app-reports-its-own-work.md
index e6e9f10b772d..09856b82f10d 100644
--- a/docs/fork/0022-the-desktop-app-reports-its-own-work.md
+++ b/docs/fork/0022-the-desktop-app-reports-its-own-work.md
@@ -6,17 +6,18 @@
 ## What you can do now
 
 - See what the desktop app itself is doing. App startup, window and menu work,
-  backend supervision, and updates now reach your collector as traces, logs,
-  and metrics under the service name `desktop`, alongside the server work they
-  cause.
+  backend supervision, and updates now reach your collector as traces and logs
+  under the service name `t3-desktop`, alongside the server work they cause.
 - Configure it the way you configure everything else. The Electron main process
   reads the same `OTEL_*` endpoint variables as the server, in the same order,
   so a machine that points one of them at a collector points both. It had a
   trace exporter before, and only its own `T3CODE_OTLP_TRACES_URL` could reach
   it, which almost nobody sets.
-- Get logs and metrics from it, not only traces. A crash loop before the server
-  is even up used to leave nothing behind but a local file on the machine it
-  happened on.
+- Get logs from it, not only traces. A crash loop before the server is even up
+  used to leave nothing behind but a local file on the machine it happened on.
+  Metrics stay off while the main process records none, so a configured metrics
+  endpoint hears from the server and nobody else rather than receiving an empty
+  payload every interval.
 - Turn it off the same way. `OTEL_SDK_DISABLED=true` stops both processes.
 - Tell the two apart without trusting the environment. The main process reports
   as `t3-desktop`, joining `t3-server` and `t3-web`, and `service.runtime` on it
@@ -47,6 +48,14 @@ environment reading applied to the other process, which is why the reading moved
 into a shared package instead of being copied. Upstream taking 0018 gets this
 almost for free.
 
+Upstream has since shipped its own desktop exporter, so what remains here is
+the environment reading, the static service name, and the per-signal protocol,
+headers, and batching. Upstream's version settled two questions this one had
+answered differently, and both of its answers were adopted: metrics stay off
+until a desktop metric exists, and the OTLP log exporter replaces
+`Logger.tracerLogger` instead of joining it, which is what the fork's own
+server already did and which stops every in-span message being exported twice.
+
 The rebase burden is a single assembly point. The main process gets one logger
 set for its lifetime, so the OTLP log exporter has to be built in the same call
 that builds the console logger rather than merged in beside it. A sync that

From 6af6e9f11e861d115e8f0af483890f323f90391f Mon Sep 17 00:00:00 2001
From: Yordis Prieto <yordis.prieto@gmail.com>
Date: Sat, 19 Sep 2026 13:52:40 -0400
Subject: [PATCH 25/25] fix(web): drop the pull request composer target helper
 nobody calls

Upstream removed this helper and its call sites together; an earlier sync
kept the definition, which has held the unused-code check red on main ever
since.

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
---
 .../src/components/pullRequest/pullRequestDetail.logic.ts  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
index 3f3b7c3ca832..b18156d2dc7d 100644
--- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
+++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
@@ -236,13 +236,6 @@ export function pullRequestHandoffLabels(inThisThread: boolean) {
       };
 }
 
-export function pullRequestComposerTarget<T>(
-  context: "page" | "thread",
-  target: T | null | undefined,
-): T | null {
-  return context === "thread" ? (target ?? null) : null;
-}
-
 /**
  * Whether the open pull-request action group contains at least one action, which is what the
  * separator below it is drawn from. Taken as however many the menu has rather than one parameter