chore: sync upstream main

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);

apps/desktop/src/app/DesktopAppIdentity.test.ts

@@ -63,6 +63,7 @@ const makeElectronAppLayer = (calls: ElectronAppCalls) =>
  calls.setDockIcon.push(iconPath);
  }),
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
  } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/desktop/src/app/DesktopLifecycle.test.ts

@@ -0,0 +1,123 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Ref from "effect/Ref";
+
+import type * as Electron from "electron";
+
+import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronTheme from "../electron/ElectronTheme.ts";
+import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopLifecycle from "./DesktopLifecycle.ts";
+import * as DesktopShutdown from "./DesktopShutdown.ts";
+import * as DesktopState from "./DesktopState.ts";
+import * as DesktopWindow from "../window/DesktopWindow.ts";
+
+describe("DesktopLifecycle", () => {
+ for (const platform of ["darwin", "win32", "linux"] satisfies ReadonlyArray<NodeJS.Platform>) {
+ it.effect(`lets the updater's quit event proceed on ${platform}`, () => {
+ const appListeners = new Map<string, (...args: readonly unknown[]) => void>();
+
+ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
+ metadata: Effect.die("unexpected metadata read"),
+ name: Effect.succeed("T3 Code"),
+ whenReady: Effect.void,
+ quit: Effect.void,
+ exit: () => Effect.void,
+ relaunch: () => Effect.void,
+ setPath: () => Effect.void,
+ setName: () => Effect.void,
+ setAboutPanelOptions: () => Effect.void,
+ setAppUserModelId: () => Effect.void,
+ requestSingleInstanceLock: Effect.succeed(true),
+ isDefaultProtocolClient: () => Effect.succeed(false),
+ setAsDefaultProtocolClient: () => Effect.succeed(true),
+ setDesktopName: () => Effect.void,
+ setDockIcon: () => Effect.void,
+ appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete("before-quit-for-update");
+ }),
+ ).pipe(Effect.asVoid),
+ on: (eventName, listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ appListeners.set(
+ eventName,
+ listener as unknown as (...args: readonly unknown[]) => void,
+ );
+ }),
+ () =>
+ Effect.sync(() => {
+ appListeners.delete(eventName);
+ }),
+ ).pipe(Effect.asVoid),
+ } satisfies ElectronApp.ElectronApp["Service"]);
+
+ const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
+ shouldUseDarkColors: Effect.succeed(false),
+ setSource: () => Effect.void,
+ onUpdated: () => Effect.void,
+ });
+
+ const desktopWindowLayer = Layer.succeed(DesktopWindow.DesktopWindow, {
+ createMain: Effect.die("unexpected window creation"),
+ ensureMain: Effect.die("unexpected window creation"),
+ revealOrCreateMain: Effect.die("unexpected window creation"),
+ activate: Effect.void,
+ createMainIfBackendReady: Effect.void,
+ showConnectingSplash: Effect.void,
+ handleBackendReady: () => Effect.void,
+ handleBackendNotReady: Effect.void,
+ flushMainWindowBounds: Effect.void,
+ dispatchMenuAction: () => Effect.void,
+ syncAppearance: Effect.void,
+ });
+
+ const environmentLayer = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
+ platform,
+ isDevelopment: false,
+ } as DesktopEnvironment.DesktopEnvironment["Service"]);
+
+ const layer = DesktopLifecycle.layer.pipe(
+ Layer.provideMerge(electronAppLayer),
+ Layer.provideMerge(electronThemeLayer),
+ Layer.provideMerge(desktopWindowLayer),
+ Layer.provideMerge(environmentLayer),
+ Layer.provideMerge(DesktopShutdown.layer),
+ Layer.provideMerge(DesktopState.layer),
+ );
+
+ return Effect.scoped(
+ Effect.gen(function* () {
+ const lifecycle = yield* DesktopLifecycle.DesktopLifecycle;
+ yield* lifecycle.register;
+
+ appListeners.get("before-quit-for-update")?.();
+
+ let prevented = false;
+ const event = {
+ preventDefault: () => {
+ prevented = true;
+ },
+ } as Electron.Event;
+ appListeners.get("before-quit")?.(event);
+
+ assert.isFalse(
+ prevented,
+ "cancelling this event prevents the updater from completing its relaunch",
+ );
+
+ const state = yield* DesktopState.DesktopState;
+ assert.isTrue(yield* Ref.get(state.quitting));
+ }),
+ ).pipe(Effect.provide(layer));
+ });
+ }
+});

apps/desktop/src/app/DesktopLifecycle.ts

@@ -176,16 +176,28 @@ export const make = DesktopLifecycle.of({
  const context = yield* Effect.context<DesktopLifecycleRuntimeServices>();
  const runEffect = Effect.runPromiseWith(context);
  let quitAllowed = false;
+ let updaterQuitAllowed = false;
  yield* electronTheme.onUpdated(() => {
  void runEffect(
  desktopWindow.syncAppearance.pipe(Effect.withSpan("desktop.lifecycle.themeUpdated")),
  );
  });
+ yield* electronApp.onBeforeQuitForUpdate(() => {
+ // Electron's updater owns the remaining quit/install/relaunch sequence.
+ // Cancelling the following app "before-quit" event breaks that sequence,
+ // most visibly on macOS where the native updater performs the relaunch.
+ updaterQuitAllowed = true;
+ void runEffect(
+ logLifecycleInfo("allowing updater-controlled quit").pipe(
+ Effect.withSpan("desktop.lifecycle.beforeQuitForUpdate"),
+ ),
+ );
+ });
  yield* electronApp.on("before-quit", (event: Electron.Event) => {
  handleBeforeQuit(
  event,
  runEffect,
- () => quitAllowed,
+ () => quitAllowed || updaterQuitAllowed,
  () => {
  quitAllowed = true;
  },

apps/desktop/src/electron/ElectronApp.test.ts

@@ -4,6 +4,8 @@ import { beforeEach, vi } from "vite-plus/test";
 
 const {
  appendSwitchMock,
+ autoUpdaterOnMock,
+ autoUpdaterRemoveListenerMock,
  exitMock,
  getAppPathMock,
  getVersionMock,
@@ -23,6 +25,8 @@ const {
  whenReadyMock,
 } = vi.hoisted(() => ({
  appendSwitchMock: vi.fn(),
+ autoUpdaterOnMock: vi.fn(),
+ autoUpdaterRemoveListenerMock: vi.fn(),
  exitMock: vi.fn(),
  getAppPathMock: vi.fn(() => "/app"),
  getVersionMock: vi.fn(() => "1.2.3"),
@@ -43,6 +47,10 @@ const {
 }));
 
 vi.mock("electron", () => ({
+ autoUpdater: {
+ on: autoUpdaterOnMock,
+ removeListener: autoUpdaterRemoveListenerMock,
+ },
  app: {
  commandLine: {
  appendSwitch: appendSwitchMock,
@@ -77,6 +85,8 @@ import * as ElectronApp from "./ElectronApp.ts";
 describe("ElectronApp", () => {
  beforeEach(() => {
  appendSwitchMock.mockClear();
+ autoUpdaterOnMock.mockClear();
+ autoUpdaterRemoveListenerMock.mockClear();
  exitMock.mockClear();
  onMock.mockClear();
  quitMock.mockClear();
@@ -153,4 +163,22 @@ describe("ElectronApp", () => {
  assert.deepEqual(removeListenerMock.mock.calls, [["activate", listener]]);
  }).pipe(Effect.provide(ElectronApp.layer)),
  );
+
+ it.effect("scopes native updater quit listeners", () =>
+ Effect.gen(function* () {
+ const listener = vi.fn();
+
+ yield* Effect.scoped(
+ Effect.gen(function* () {
+ const electronApp = yield* ElectronApp.ElectronApp;
+ yield* electronApp.onBeforeQuitForUpdate(listener);
+ }),
+ );
+
+ assert.deepEqual(autoUpdaterOnMock.mock.calls, [["before-quit-for-update", listener]]);
+ assert.deepEqual(autoUpdaterRemoveListenerMock.mock.calls, [
+ ["before-quit-for-update", listener],
+ ]);
+ }).pipe(Effect.provide(ElectronApp.layer)),
+ );
 });

apps/desktop/src/electron/ElectronApp.ts

@@ -66,6 +66,9 @@ export class ElectronApp extends Context.Service<
  readonly setDesktopName: (desktopName: string) => Effect.Effect<void>;
  readonly setDockIcon: (iconPath: string) => Effect.Effect<void>;
  readonly appendCommandLineSwitch: (switchName: string, value?: string) => Effect.Effect<void>;
+ readonly onBeforeQuitForUpdate: (
+ listener: () => void,
+ ) => Effect.Effect<void, never, Scope.Scope>;
  readonly on: <Args extends ReadonlyArray<unknown>>(
  eventName: string,
  listener: (...args: Args) => void,
@@ -178,6 +181,16 @@ export const make = ElectronApp.of({
  }
  Electron.app.commandLine.appendSwitch(switchName, value);
  }),
+ onBeforeQuitForUpdate: (listener) =>
+ Effect.acquireRelease(
+ Effect.sync(() => {
+ Electron.autoUpdater.on("before-quit-for-update", listener);
+ }),
+ () =>
+ Effect.sync(() => {
+ Electron.autoUpdater.removeListener("before-quit-for-update", listener);
+ }),
+ ).pipe(Effect.asVoid),
  on: addScopedAppListener,
 });
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
  confirmThreadDelete: false,
  dismissedProviderUpdateNotificationKeys: [],
  diffIgnoreWhitespace: true,
+ environmentIdentificationMode: "artwork",
  favorites: [],
  glassOpacity: 80,
  providerModelPreferences: {},
@@ -30,6 +31,7 @@ const clientSettings: ClientSettings = {
  sidebarThreadSortOrder: "created_at",
  sidebarThreadPreviewCount: 6,
  sidebarV2Enabled: false,
+ sidebarV2ConfiguredByUser: false,
  timestampFormat: "24-hour",
  wordWrap: true,
 };

apps/desktop/src/window/DesktopApplicationMenu.test.ts

@@ -45,6 +45,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
  setDesktopName: () => Effect.void,
  setDockIcon: () => Effect.void,
  appendCommandLineSwitch: () => Effect.void,
+ onBeforeQuitForUpdate: () => Effect.void,
  on: () => Effect.void,
 } satisfies ElectronApp.ElectronApp["Service"]);
 

apps/mobile/src/features/connection/CloudEnvironmentRows.tsx

@@ -24,13 +24,7 @@ import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironment
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 import { type RelayEnvironmentView, useConnectionController } from "./useConnectionController";
 
-/**
- * "T3 Connect" section: every environment published to the signed-in account,
- * with connect switches, availability status, refresh, and loading/error
- * states. Shared between the Settings environments screen and the T3 Connect
- * onboarding sheet.
- */
-export function CloudEnvironmentRows(props: {
+interface CloudEnvironmentRowsProps {
  readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
  readonly onReconnectEnvironment: (environmentId: EnvironmentId) => void;
  readonly showcaseAvailableEnvironments?: ReadonlyArray<RelayEnvironmentView>;
@@ -41,8 +35,31 @@ export function CloudEnvironmentRows(props: {
  * pull-to-refresh).
  */
  readonly showHeader?: boolean;
-}) {
+}
+
+/**
+ * "T3 Connect" section: every environment published to the signed-in account,
+ * with connect switches, availability status, refresh, and loading/error
+ * states. Shared between the Settings environments screen and the T3 Connect
+ * onboarding sheet.
+ */
+export function CloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
+ // Showcase captures run without a Clerk publishable key, so `ClerkProvider`
+ // is never mounted and any `useAuth` call throws — the fixture states whether
+ // the rows are signed in instead of asking Clerk.
+ if (props.showcaseSignedIn !== undefined) {
+ return props.showcaseSignedIn ? <CloudEnvironmentRowsContent {...props} /> : null;
+ }
+ return <SignedInCloudEnvironmentRows {...props} />;
+}
+
+function SignedInCloudEnvironmentRows(props: CloudEnvironmentRowsProps) {
  const { isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
+ if (!isSignedIn) return null;
+ return <CloudEnvironmentRowsContent {...props} />;
+}
+
+function CloudEnvironmentRowsContent(props: CloudEnvironmentRowsProps) {
  const controller = useConnectionController();
  const iconColor = useThemeColor("--color-icon");
  const availableCloudEnvironments =
@@ -67,8 +84,6 @@ export function CloudEnvironmentRows(props: {
 
  const showHeader = props.showHeader ?? true;
 
- if (!(props.showcaseSignedIn ?? isSignedIn)) return null;
-
  return (
  <View collapsable={false} className={cn("gap-3", showHeader && "mt-5")}>
  {showHeader ? (

apps/mobile/src/features/home/HomeHeader.tsx

@@ -1,7 +1,5 @@
 import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { useCallback, useMemo, useRef } from "react";
 import { Platform, Pressable, Text as RNText, TextInput, View } from "react-native";
@@ -12,7 +10,7 @@ import { ControlPillMenu } from "../../components/ControlPill";
 import { SymbolView } from "../../components/AppSymbol";
 import { T3Wordmark } from "../../components/T3Wordmark";
 import { useThemeColor } from "../../lib/useThemeColor";
-import { mobilePreferencesAtom } from "../../state/preferences";
+import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
@@ -59,21 +57,14 @@ function checkedMenuState(checked: boolean) {
  return checked ? ("on" as const) : undefined;
 }
 
-/** Thread List v2 lays the list out in fixed creation order, so the
- sort/group filter controls would be silently ignored — hide them and
- key the "customized" icon state off the environment filter alone. */
-function useThreadListV2FilterGate() {
- const preferencesResult = useAtomValue(mobilePreferencesAtom);
- return (
- AsyncResult.isSuccess(preferencesResult) && preferencesResult.value.threadListV2Enabled === true
- );
-}
-
 function AndroidHomeHeader(props: HomeHeaderProps) {
  const insets = useSafeAreaInsets();
  const iconColor = useThemeColor("--color-icon");
  const mutedColor = useThemeColor("--color-foreground-muted");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);
@@ -291,7 +282,10 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
 function IosHomeHeader(props: HomeHeaderProps) {
  const searchBarRef = useRef<SearchBarCommands>(null);
  const iconColor = useThemeColor("--color-icon");
- const threadListV2Enabled = useThreadListV2FilterGate();
+ // Thread List v2 lays the list out in fixed creation order, so the
+ // sort/group filter controls would be silently ignored — hide them and
+ // key the "customized" icon state off the environment filter alone.
+ const threadListV2Enabled = useThreadListV2Enabled();
  const hasCustomListOptions = threadListV2Enabled
  ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
  : hasCustomHomeListOptions(props);