@devries-cameron20 / t3code Mirror · read-only / commits / dbee5a0af0
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 06:00 UTC

fix(mobile,web): saves, account switches and registrations report their own outcome (#38911)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>

Julius Marminge committed Nov 19, 2026 at 12:11 UTC dbee5a0af04ea4a3db351669003d6281953d2c38
30 files changed +367 -276
apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts
+16
@@ -599,6 +599,22 @@ describe("makeRelayDeviceRegistrationRequest", () => {
599 }).pipe(Effect.provide(layerRelayTest));
600 });
601
602 + it.effect("leaves the signed-out status alone when an obsolete registration fails", () => {
603 + Constants.expoConfig!.extra = {
604 + relay: {
605 + url: "https://relay.example.test/",
606 + },
607 + };
608 + vi.mocked(loadOrCreateAgentAwarenessDeviceId).mockRejectedValue(new Error("storage failure"));
609 + setAgentAwarenessRelayTokenProvider(() => Promise.resolve("clerk-token-user-a"));
610 + setAgentAwarenessRelayTokenProvider(null);
611 +
612 + return Effect.gen(function* () {
613 + yield* runBackgroundOperations();
614 + expect(getAgentAwarenessRegistrationStatus()).toBe("unknown");
615 + }).pipe(Effect.provide(layerRelayTest));
616 + });
617 +
618 it.effect("does not re-register the same account when nothing has changed", () => {
619 Constants.expoConfig!.extra = {
620 relay: {
apps/mobile/src/features/agent-awareness/remoteRegistration.ts
+28 -29
@@ -660,7 +660,8 @@ function startPendingDeviceRegistration(): void {
660 );
661 if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
662 // Refresh failures leave the relay's accepted registration intact; preserve registered status.
663 - if (registrationStatus !== "registered") {
663 + // A sign-out or account switch meanwhile owns the status, so an obsolete run leaves it alone.
664 + if (generation === deviceRegistrationGeneration && registrationStatus !== "registered") {
665 setRegistrationStatus("failed");
666 }
667 logRegistrationError(next.context, squashAtomCommandFailure(result));
@@ -759,14 +760,6 @@ const registerDevice = Effect.fn("remoteRegistration.registerDevice")(function*
760 );
761 });
762
762 -function registerDeviceForCurrentUser(): Effect.Effect<
763 - void,
764 - AgentAwarenessRegistrationError,
765 - ManagedRelay.ManagedRelayClient
766 -> {
767 - return registerDevice(undefined);
768 -}
769 -
763 function ensurePushTokenListener(): void {
764 if (pushTokenSubscription || !canRegisterPushNotifications()) {
765 return;
@@ -842,31 +835,37 @@ export function refreshAgentAwarenessRegistration(): Effect.Effect<
835 never,
836 ManagedRelay.ManagedRelayClient
837 > {
845 - return registerDeviceForCurrentUser().pipe(
846 - Effect.catch((error) =>
847 - Effect.sync(() => {
848 - if (registrationStatus !== "registered") {
849 - setRegistrationStatus("failed");
850 - }
851 - logRegistrationError("device registration refresh failed", error);
852 - }),
853 - ),
854 - );
838 + return Effect.suspend(() => {
839 + const generation = deviceRegistrationGeneration;
840 + return registerDevice(undefined, generation).pipe(
841 + Effect.catch((error) =>
842 + Effect.sync(() => {
843 + if (generation === deviceRegistrationGeneration && registrationStatus !== "registered") {
844 + setRegistrationStatus("failed");
845 + }
846 + logRegistrationError("device registration refresh failed", error);
847 + }),
848 + ),
849 + );
850 + });
851 }
852
853 export function updateAgentAwarenessRegistrationPreferences(
854 preferencesOverride: Partial<Preferences>,
855 ): Effect.Effect<void, AgentAwarenessRegistrationError, ManagedRelay.ManagedRelayClient> {
860 - return registerDevice({ preferencesOverride }).pipe(
861 - Effect.tapError((error) =>
862 - Effect.sync(() => {
863 - if (registrationStatus !== "registered") {
864 - setRegistrationStatus("failed");
865 - }
866 - logRegistrationError("device preference registration refresh failed", error);
867 - }),
868 - ),
869 - );
856 + return Effect.suspend(() => {
857 + const generation = deviceRegistrationGeneration;
858 + return registerDevice({ preferencesOverride }, generation).pipe(
859 + Effect.tapError((error) =>
860 + Effect.sync(() => {
861 + if (generation === deviceRegistrationGeneration && registrationStatus !== "registered") {
862 + setRegistrationStatus("failed");
863 + }
864 + logRegistrationError("device preference registration refresh failed", error);
865 + }),
866 + ),
867 + );
868 + });
869 }
870
871 export function __resetAgentAwarenessRemoteRegistrationForTest(): void {
apps/mobile/src/features/diagnostics/SettingsDiagnosticsRouteScreen.tsx
+7 -7
@@ -3,9 +3,8 @@ import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScroll
3 import * as Application from "expo-application";
4 import Constants from "expo-constants";
5 import * as Updates from "expo-updates";
6 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
6 +import { useAtomValue } from "@effect/atom-react";
7 import * as Effect from "effect/Effect";
8 -import * as Exit from "effect/Exit";
8 import * as Schema from "effect/Schema";
9 import { AsyncResult, Atom } from "effect/reactivity";
10 import { T, useGT } from "gt-react-native";
@@ -16,7 +15,8 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
15 import { SymbolView } from "../../components/ui/AppSymbol";
16 import { AppText as Text } from "../../components/ui/AppText";
17 import { tryCopyTextWithHaptic } from "../../lib/copyTextWithHaptic";
19 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
18 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
19 +import { useAtomCommand } from "../../state/use-atom-command";
20 import { crashReportingAvailable, setCrashReportsEnabled } from "../observability/observe";
21 import { ListActionRow as SettingsActionRow } from "../../components/ui/ListActionRow";
22 import { SettingsScreen } from "../settings/components/SettingsScreen";
@@ -156,7 +156,7 @@ export function SettingsDiagnosticsRouteScreen() {
156
157 function CrashReportsSetting() {
158 const preferences = useAtomValue(mobilePreferencesAtom);
159 - const savePreferences = useAtomSet(updateMobilePreferencesAtom, { mode: "promiseExit" });
159 + const savePreferences = useAtomCommand(saveMobilePreferences, { reportFailure: false });
160 // One change at a time, so a slow save never turns sending back on after a later opt-out.
161 const [saving, setSaving] = useState(false);
162 const gt = useGT();
@@ -170,9 +170,9 @@ function CrashReportsSetting() {
170 // Sending stops before the save and starts only after it.
171 if (!value) void setCrashReportsEnabled(false);
172 savePreferences({ crashReportsEnabled: value })
173 - .then((exit) => {
174 - if (Exit.isFailure(exit)) {
175 - console.warn("[diagnostics] could not save the crash report setting", exit.cause);
173 + .then((result) => {
174 + if (result._tag === "Failure") {
175 + console.warn("[diagnostics] could not save the crash report setting", result.cause);
176 return value ? undefined : setCrashReportsEnabled(true);
177 }
178 return value ? setCrashReportsEnabled(true) : undefined;
apps/mobile/src/features/home/home-list-options.test.tsx
+6 -4
@@ -5,10 +5,12 @@ import { expect, it, vi } from "vite-plus/test";
5
6 const harness = vi.hoisted(() => ({ saved: [] as unknown[] }));
7
8 -vi.mock("../../state/preferences", () => ({ updateMobilePreferencesAtom: {} }));
9 -vi.mock("@effect/atom-react", async (importOriginal) => ({
10 - ...(await importOriginal<typeof import("@effect/atom-react")>()),
11 - useAtomSet: () => (value: unknown) => harness.saved.push(value),
8 +vi.mock("../../state/preferences", () => ({ saveMobilePreferences: {} }));
9 +vi.mock("../../state/use-atom-command", () => ({
10 + useAtomCommand: () => async (value: unknown) => {
11 + harness.saved.push(value);
12 + return { _tag: "Success", value: undefined };
13 + },
14 }));
15
16 import { HomeListOptionsProvider, useHomeListOptions } from "./home-list-options";
apps/mobile/src/features/home/home-list-options.ts
+5 -4
@@ -1,11 +1,12 @@
1 import type { EnvironmentId, SidebarProjectGroupingMode } from "@t3tools/contracts";
2 import { DEFAULT_SIDEBAR_PROJECT_SORT_ORDER } from "@t3tools/contracts";
3 -import { RegistryContext, useAtomSet, useAtomValue } from "@effect/atom-react";
3 +import { RegistryContext, useAtomValue } from "@effect/atom-react";
4 import { Atom } from "effect/reactivity";
5 import { createContext, createElement, useContext, useState, type PropsWithChildren } from "react";
6
7 import type { ThreadListFilters } from "../../persistence/mobile-preferences";
8 -import { updateMobilePreferencesAtom } from "../../state/preferences";
8 +import { saveMobilePreferences } from "../../state/preferences";
9 +import { useAtomCommand } from "../../state/use-atom-command";
10 import type { HomeProjectSortOrder } from "./homeThreadList";
11
12 export interface HomeListOptions {
@@ -48,7 +49,7 @@ export function HomeListOptionsProvider({
49 const registry = useContext(RegistryContext);
50 const [optionsAtom] = useState(() => Atom.make(defaultHomeListOptions(savedFilters)));
51 const options = useAtomValue(optionsAtom);
51 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
52 + const savePreferences = useAtomCommand(saveMobilePreferences);
53 // Only the scope persists; the sort order is per session. Updates read the
54 // registry, so several in one event each build on the last and save it.
55 const updateOptions = (patch: Partial<HomeListOptions>) => {
@@ -59,7 +60,7 @@ export function HomeListOptionsProvider({
60 next.selectedEnvironmentId !== current.selectedEnvironmentId ||
61 next.selectedProjectKey !== current.selectedProjectKey
62 ) {
62 - savePreferences({
63 + void savePreferences({
64 threadListFilters: {
65 environmentId: next.selectedEnvironmentId,
66 projectKey: next.selectedProjectKey,
apps/mobile/src/features/layout/workspace/SavedViewsMenu.tsx
+11 -10
@@ -1,4 +1,4 @@
1 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
1 +import { useAtomValue } from "@effect/atom-react";
2 import {
3 type SavedViewIdentity as SavedViewIdentitySchema,
4 savedViewNameError,
@@ -12,7 +12,8 @@ import { prompt as showTextInputDialog } from "../../../components/ui/Dialog";
12 import type { MenuProps } from "../../../components/ui/Menu.types";
13 import { uuidv4 } from "../../../lib/uuid";
14 import type { Preferences } from "../../../persistence/mobile-preferences";
15 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../state/preferences";
15 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../../state/preferences";
16 +import { useAtomCommand } from "../../../state/use-atom-command";
17 import { ListFilterMenu } from "./ListFilterMenu";
18
19 type SavedViewIdentity = typeof SavedViewIdentitySchema.Type;
@@ -40,7 +41,7 @@ export function SavedViewsMenu<Scope extends object>({
41 const gt = useGT();
42 const messages = useMessages();
43 const preferences = useAtomValue(mobilePreferencesAtom);
43 - const savePreferences = useAtomSet(updateMobilePreferencesAtom, { mode: "promise" });
44 + const savePreferences = useAtomCommand(saveMobilePreferences, { reportFailure: false });
45 const ready = AsyncResult.isSuccess(preferences) && !preferences.waiting;
46 const views: ReadonlyArray<View> = AsyncResult.isSuccess(preferences)
47 ? (read(preferences.value) ?? EMPTY_SAVED_VIEWS)
@@ -74,12 +75,13 @@ export function SavedViewsMenu<Scope extends object>({
75
76 async function persist(transform: (current: ReadonlyArray<View>) => ReadonlyArray<View>) {
77 setBusy(true);
77 - let saved = true;
78 - try {
79 - await savePreferences({
80 - transform: (current) => write(transform(read(current) ?? EMPTY_SAVED_VIEWS)),
81 - });
82 - } catch {
78 + const saved =
79 + (
80 + await savePreferences({
81 + transform: (current) => write(transform(read(current) ?? EMPTY_SAVED_VIEWS)),
82 + })
83 + )._tag === "Success";
84 + if (!saved) {
85 Alert.alert(
86 gt(
87 "{list, select, pullRequest {Could not save PR views} other {Could not save issue views}}",
@@ -89,7 +91,6 @@ export function SavedViewsMenu<Scope extends object>({
91 ),
92 gt("The device could not save your views. Try again."),
93 );
92 - saved = false;
94 }
95 setBusy(false);
96 return saved;
apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx
+5 -4
@@ -1,8 +1,9 @@
1 -import { RegistryContext, useAtomSet, useAtomValue } from "@effect/atom-react";
1 +import { RegistryContext, useAtomValue } from "@effect/atom-react";
2 import { AsyncResult, Atom } from "effect/reactivity";
3 import { createContext, use, useState, type Dispatch, type ReactNode } from "react";
4
5 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../state/preferences";
5 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../../state/preferences";
6 +import { useAtomCommand } from "../../../state/use-atom-command";
7 import {
8 isSharedSlotTab,
9 sharedSlotAbsentee,
@@ -88,11 +89,11 @@ export function WorkspaceTabsProvider(props: {
89 const registry = use(RegistryContext);
90 const [model] = useState(() => createWorkspaceTabsModel(props.initialTab));
91 const state = useAtomValue(model.resolved);
91 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
92 + const savePreferences = useAtomCommand(saveMobilePreferences);
93 const dispatch = (action: WorkspaceTabsAction) => {
94 registry.set(model.stored, workspaceTabsReducer(registry.get(model.resolved), action));
95 if (action.type === "select" && isSharedSlotTab(action.tab))
95 - savePreferences({ sharedSlotTab: action.tab });
96 + void savePreferences({ sharedSlotTab: action.tab });
97 };
98 const context = {
99 state,
apps/mobile/src/features/pull-requests/PullRequestMergeControls.tsx
+4 -4
@@ -1,6 +1,6 @@
1 import { errorDisplayMessage } from "@t3tools/client-runtime/errors";
2 import * as Dialog from "../../components/ui/Dialog";
3 -import { useAtomRefresh, useAtomSet, useAtomValue } from "@effect/atom-react";
3 +import { useAtomRefresh, useAtomValue } from "@effect/atom-react";
4 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
5 import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
6 import { changeRequestTermKind } from "../../lib/changeRequestTerm";
@@ -14,7 +14,7 @@ import { AppText as Text } from "../../components/ui/AppText";
14 import { Button } from "../../components/ui/Button";
15 import { SplitButton } from "../../components/ui/SplitButton";
16 import { useEnvironmentServerConfig } from "../../state/entities";
17 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
17 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
18 import { composerPullRequests } from "../../state/pull-requests";
19 import { useAtomCommand } from "../../state/use-atom-command";
20 import {
@@ -50,7 +50,7 @@ export function PullRequestMergeControls(props: {
50 const stateAction = usePullRequestAction(props.params, pr);
51 const preferences = useAtomValue(mobilePreferencesAtom);
52 const serverSettings = useEnvironmentServerConfig(target.environmentId)?.settings;
53 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
53 + const savePreferences = useAtomCommand(saveMobilePreferences);
54 const runAction = useAtomCommand(composerPullRequests.runAction, { reportFailure: false });
55 const refreshDetail = useAtomRefresh(composerPullRequests.detail(target));
56 const refreshActivity = useAtomRefresh(composerPullRequests.activity(target));
@@ -336,7 +336,7 @@ export function PullRequestMergeControls(props: {
336 const selected = methods.find((method) => method === id);
337 if (selected) {
338 setSelectedMethod(selected);
339 - savePreferences({ pullRequestMergeMethod: selected });
339 + void savePreferences({ pullRequestMergeMethod: selected });
340 } else if (id === autoAction && canAutoMerge) confirm(autoAction);
341 }}
342 />
apps/mobile/src/features/pull-requests/usePullRequestActivityFilter.ts
+5 -4
@@ -1,8 +1,9 @@
1 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
1 +import { useAtomValue } from "@effect/atom-react";
2 import { AsyncResult } from "effect/reactivity";
3 import { useState } from "react";
4 import type { PullRequestActivityVisibility } from "../../persistence/mobile-preferences";
5 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
5 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
6 +import { useAtomCommand } from "../../state/use-atom-command";
7 import { DEFAULT_ACTIVITY_FILTER, type ActivityFilter } from "./pullRequestActivityFilter";
8
9 const SHOW_EVERYTHING: PullRequestActivityVisibility = { bots: true, resolved: true };
@@ -13,7 +14,7 @@ const SHOW_EVERYTHING: PullRequestActivityVisibility = { bots: true, resolved: t
14 */
15 export function usePullRequestActivityFilter(link: string | undefined) {
16 const preferences = useAtomValue(mobilePreferencesAtom);
16 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
17 + const savePreferences = useAtomCommand(saveMobilePreferences);
18 const [view, setView] = useState(() => ({
19 kind: link === "commits" ? ("commits" as const) : DEFAULT_ACTIVITY_FILTER.kind,
20 newestFirst: DEFAULT_ACTIVITY_FILTER.newestFirst,
@@ -35,7 +36,7 @@ export function usePullRequestActivityFilter(link: string | undefined) {
36 filter,
37 setFilter: (next: ActivityFilter) => {
38 if (visibilityChanged(next)) {
38 - savePreferences({
39 + void savePreferences({
40 pullRequestActivityVisibility: { bots: next.bots, resolved: next.resolved },
41 });
42 }
apps/mobile/src/features/pull-requests/usePullRequestFileFilter.ts
+10 -5
@@ -1,13 +1,14 @@
1 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
1 +import { useAtomValue } from "@effect/atom-react";
2 import { AsyncResult } from "effect/reactivity";
3 import { useMemo } from "react";
4 import type { ReviewParsedDiff } from "../review/reviewModel";
5 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
5 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
6 +import { useAtomCommand } from "../../state/use-atom-command";
7 import { filterPullRequestTestFiles } from "./pullRequestFileFilters";
8
9 export function usePullRequestFileFilter(parsed: ReviewParsedDiff, includePath?: string) {
10 const preferences = useAtomValue(mobilePreferencesAtom);
10 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
11 + const savePreferences = useAtomCommand(saveMobilePreferences);
12 const hideTestFiles =
13 AsyncResult.isSuccess(preferences) && preferences.value.pullRequestHideTestFiles === true;
14 const visible = useMemo(
@@ -20,7 +21,11 @@ export function usePullRequestFileFilter(parsed: ReviewParsedDiff, includePath?:
21 parsed: visible,
22 hideTestFiles,
23 hiddenCount,
23 - toggle: () => savePreferences({ pullRequestHideTestFiles: !hideTestFiles }),
24 - showAll: () => savePreferences({ pullRequestHideTestFiles: false }),
24 + toggle: () => {
25 + void savePreferences({ pullRequestHideTestFiles: !hideTestFiles });
26 + },
27 + showAll: () => {
28 + void savePreferences({ pullRequestHideTestFiles: false });
29 + },
30 };
31 }
apps/mobile/src/features/pull-requests/usePullRequestListControls.ts
+15 -10
@@ -1,23 +1,24 @@
1 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
1 +import { useAtomValue } from "@effect/atom-react";
2 +import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
3 import { AsyncResult } from "effect/reactivity";
4
4 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
5 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
6 +import { useAtomCommand } from "../../state/use-atom-command";
7 import { DEFAULT_PR_LIST_CONTROLS, type PullRequestListControls } from "./pullRequestList";
8 import type { PullRequestSavedView } from "../../persistence/mobile-preferences";
9 import { pullRequestSavedViewPreferences } from "./pullRequestSavedViews";
10
11 export function usePullRequestListControls() {
12 const preferences = useAtomValue(mobilePreferencesAtom);
11 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
12 - const applyPreferences = useAtomSet(updateMobilePreferencesAtom, { mode: "promise" });
13 + const savePreferences = useAtomCommand(saveMobilePreferences, { reportFailure: false });
14 const saved = AsyncResult.isSuccess(preferences)
15 ? preferences.value.pullRequestListFilters
16 : undefined;
17 const environmentId = saved?.environmentId ?? null;
18 const controlsFor = (environment: string | null) =>
19 saved?.controls[environment ?? ""] ?? DEFAULT_PR_LIST_CONTROLS;
19 - const setEnvironmentId = (next: string | null) =>
20 - savePreferences({
20 + const setEnvironmentId = (next: string | null) => {
21 + void savePreferences({
22 transform: (current) => ({
23 pullRequestListFilters: {
24 controls: current.pullRequestListFilters?.controls ?? {},
@@ -25,8 +26,9 @@ export function usePullRequestListControls() {
26 },
27 }),
28 });
28 - const setControls = (environment: string | null, controls: PullRequestListControls) =>
29 - savePreferences({
29 + };
30 + const setControls = (environment: string | null, controls: PullRequestListControls) => {
31 + void savePreferences({
32 transform: (current) => ({
33 pullRequestListFilters: {
34 environmentId: current.pullRequestListFilters?.environmentId ?? null,
@@ -38,10 +40,13 @@ export function usePullRequestListControls() {
40 },
41 }),
42 });
41 - const applyView = (view: PullRequestSavedView) =>
42 - applyPreferences({
43 + };
44 + const applyView = async (view: PullRequestSavedView) => {
45 + const result = await savePreferences({
46 transform: (current) => pullRequestSavedViewPreferences(current, view),
47 });
48 + if (result._tag === "Failure") throw squashAtomCommandFailure(result);
49 + };
50 return { environmentId, controlsFor, setEnvironmentId, setControls, applyView } as const;
51 }
52
apps/mobile/src/features/settings/SettingsFollowUpRouteScreen.tsx
+7 -4
@@ -1,13 +1,14 @@
1 import { msg, T, useGT, useMessages, Var } from "gt-react-native";
2 import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
3 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
3 +import { useAtomValue } from "@effect/atom-react";
4 import { AsyncResult } from "effect/reactivity";
5 import { Platform } from "react-native";
6 import { useSafeAreaInsets } from "react-native-safe-area-context";
7
8 import { AppText as Text } from "../../components/ui/AppText";
9 import { DEFAULT_FOLLOW_UP_BEHAVIOR, type FollowUpBehavior } from "../../lib/followUpBehavior";
10 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
10 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
11 +import { useAtomCommand } from "../../state/use-atom-command";
12 import { ListChoiceRow as SettingsChoiceRow } from "../../components/ui/ListChoiceRow";
13 import { SettingsSection } from "./components/SettingsSection";
14 import { SettingsScreen } from "./components/SettingsScreen";
@@ -34,7 +35,7 @@ export function SettingsFollowUpRouteScreen() {
35 const m = useMessages();
36 const insets = useSafeAreaInsets();
37 const preferencesResult = useAtomValue(mobilePreferencesAtom);
37 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
38 + const savePreferences = useAtomCommand(saveMobilePreferences);
39 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
40 const selectedBehavior = AsyncResult.isSuccess(preferencesResult)
41 ? (preferencesResult.value.followUpBehavior ?? DEFAULT_FOLLOW_UP_BEHAVIOR)
@@ -57,7 +58,9 @@ export function SettingsFollowUpRouteScreen() {
58 selected={selectedBehavior === option.behavior}
59 separated={index > 0}
60 disabled={!preferencesReady}
60 - onPress={() => savePreferences({ followUpBehavior: option.behavior })}
61 + onPress={() => {
62 + void savePreferences({ followUpBehavior: option.behavior });
63 + }}
64 />
65 ))}
66 </SettingsSection>
apps/mobile/src/features/settings/SettingsKeyboardRouteScreen.tsx
+7 -4
@@ -1,6 +1,6 @@
1 import { msg, T, useGT, useMessages } from "gt-react-native";
2 import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
3 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
3 +import { useAtomValue } from "@effect/atom-react";
4 import { AsyncResult } from "effect/reactivity";
5 import { Platform } from "react-native";
6 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -10,7 +10,8 @@ import {
10 DEFAULT_COMPOSER_ENTER_BEHAVIOR,
11 type ComposerEnterBehavior,
12 } from "../../lib/composerEnterBehavior";
13 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
13 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
14 +import { useAtomCommand } from "../../state/use-atom-command";
15 import { ListChoiceRow as SettingsChoiceRow } from "../../components/ui/ListChoiceRow";
16 import { SettingsScreen } from "./components/SettingsScreen";
17 import { SettingsSection } from "./components/SettingsSection";
@@ -45,7 +46,7 @@ export function SettingsKeyboardRouteScreen() {
46 const m = useMessages();
47 const insets = useSafeAreaInsets();
48 const preferencesResult = useAtomValue(mobilePreferencesAtom);
48 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
49 + const savePreferences = useAtomCommand(saveMobilePreferences);
50 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
51 const selectedBehavior = AsyncResult.isSuccess(preferencesResult)
52 ? (preferencesResult.value.composerEnterBehavior ?? DEFAULT_COMPOSER_ENTER_BEHAVIOR)
@@ -69,7 +70,9 @@ export function SettingsKeyboardRouteScreen() {
70 selected={selectedBehavior === option.behavior}
71 separated={index > 0}
72 disabled={!preferencesReady}
72 - onPress={() => savePreferences({ composerEnterBehavior: option.behavior })}
73 + onPress={() => {
74 + void savePreferences({ composerEnterBehavior: option.behavior });
75 + }}
76 />
77 ))}
78 </SettingsSection>
apps/mobile/src/features/settings/SettingsLanguageRouteScreen.tsx
+7 -4
@@ -1,5 +1,5 @@
1 import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
2 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
2 +import { useAtomValue } from "@effect/atom-react";
3 import { AsyncResult } from "effect/reactivity";
4 import { useSafeAreaInsets } from "react-native-safe-area-context";
5
@@ -7,7 +7,8 @@ import { useGT } from "gt-react-native";
7 import { useLanguagePreference } from "../../i18n/I18nProvider";
8 import { SYSTEM_LANGUAGE, nativeLanguageName } from "@t3tools/client-runtime/locales";
9 import { SUPPORTED_LOCALES } from "../../i18n/locales";
10 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
10 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
11 +import { useAtomCommand } from "../../state/use-atom-command";
12 import { ListChoiceRow as SettingsChoiceRow } from "../../components/ui/ListChoiceRow";
13 import { SettingsRow } from "./components/SettingsRow";
14 import { SettingsSection } from "./components/SettingsSection";
@@ -35,7 +36,7 @@ export function SettingsLanguageRouteScreen() {
36 const gt = useGT();
37 const insets = useSafeAreaInsets();
38 const preferencesResult = useAtomValue(mobilePreferencesAtom);
38 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
39 + const savePreferences = useAtomCommand(saveMobilePreferences);
40 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
41 const language = useLanguagePreference();
42 const options = [
@@ -60,7 +61,9 @@ export function SettingsLanguageRouteScreen() {
61 selected={preferencesReady && language === option.language}
62 separated={index > 0}
63 disabled={!preferencesReady}
63 - onPress={() => savePreferences({ language: option.language })}
64 + onPress={() => {
65 + void savePreferences({ language: option.language });
66 + }}
67 />
68 ))}
69 </SettingsSection>
apps/mobile/src/features/settings/SettingsNavigationRouteScreen.tsx
+19 -16
@@ -1,5 +1,5 @@
1 import { useGT, useMessages } from "gt-react-native";
2 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
2 +import { useAtomValue } from "@effect/atom-react";
3 import { AsyncResult } from "effect/reactivity";
4 import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
5 import { Platform, View } from "react-native";
@@ -14,7 +14,8 @@ import { IconButton } from "../../components/ui/IconButton";
14 import { Button } from "../../components/ui/Button";
15 import { ScreenScrollView } from "../../components/ui/ScreenScrollView";
16 import { SymbolView } from "../../components/ui/AppSymbol";
17 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
17 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
18 +import { useAtomCommand } from "../../state/use-atom-command";
19 import {
20 NAVIGATION_TAB_ICONS,
21 WORKSPACE_TAB_LABELS,
@@ -38,7 +39,7 @@ export function SettingsNavigationRouteScreen() {
39 const preferences = useAtomValue(mobilePreferencesAtom);
40 const customizable = navigationCustomizationAvailable();
41 const ready = customizable && AsyncResult.isSuccess(preferences) && !preferences.waiting;
41 - const save = useAtomSet(updateMobilePreferencesAtom);
42 + const save = useAtomCommand(saveMobilePreferences);
43 return (
44 <SettingsScreen title={gt("Navigation tabs")}>
45 <ScreenScrollView
@@ -81,23 +82,23 @@ export function SettingsNavigationRouteScreen() {
82 : gt("Hide {tab}", { tab: m(WORKSPACE_TAB_LABELS[tab]) })
83 }
84 disabled={!ready}
84 - onPress={() =>
85 - save({
85 + onPress={() => {
86 + void save({
87 transform: (current) => ({
88 hiddenNavigationTabs: toggleNavigationTabVisibility(
89 current.hiddenNavigationTabs,
90 tab,
91 ),
92 }),
92 - })
93 - }
93 + });
94 + }}
95 />
96 <IconButton
97 icon="arrow.up"
98 accessibilityLabel={gt("Move {tab} up", { tab: m(WORKSPACE_TAB_LABELS[tab]) })}
99 disabled={!ready || index === 0}
99 - onPress={() =>
100 - save({
100 + onPress={() => {
101 + void save({
102 transform: (current) => ({
103 navigationTabOrder: moveNavigationTab(
104 resolveWorkspaceTabOrder(current.navigationTabOrder),
@@ -105,15 +106,15 @@ export function SettingsNavigationRouteScreen() {
106 index - 1,
107 ),
108 }),
108 - })
109 - }
109 + });
110 + }}
111 />
112 <IconButton
113 icon="arrow.down"
114 accessibilityLabel={gt("Move {tab} down", { tab: m(WORKSPACE_TAB_LABELS[tab]) })}
115 disabled={!ready || index === order.length - 1}
115 - onPress={() =>
116 - save({
116 + onPress={() => {
117 + void save({
118 transform: (current) => ({
119 navigationTabOrder: moveNavigationTab(
120 resolveWorkspaceTabOrder(current.navigationTabOrder),
@@ -121,8 +122,8 @@ export function SettingsNavigationRouteScreen() {
122 index + 1,
123 ),
124 }),
124 - })
125 - }
125 + });
126 + }}
127 />
128 </View>
129 ))}
@@ -131,7 +132,9 @@ export function SettingsNavigationRouteScreen() {
132 label={gt("Reset tabs")}
133 tone="text"
134 disabled={!ready}
134 - onPress={() => save({ navigationTabOrder: [], hiddenNavigationTabs: [] })}
135 + onPress={() => {
136 + void save({ navigationTabOrder: [], hiddenNavigationTabs: [] });
137 + }}
138 />
139 </ScreenScrollView>
140 </SettingsScreen>
apps/mobile/src/features/settings/SettingsNotificationsRouteScreen.tsx
+5 -4
@@ -58,7 +58,8 @@ import { refreshManagedRelayEnvironments } from "../cloud/managedRelayState";
58 import { hasCloudPublicConfig, resolveRelayClerkTokenOptions } from "../cloud/publicConfig";
59 import { makePermissionStatusAtom } from "../../lib/permissionStatusAtom";
60 import { runtime } from "../../lib/runtime";
61 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
61 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
62 +import { useAtomCommand } from "../../state/use-atom-command";
63 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
64 import { SettingsRow } from "./components/SettingsRow";
65 import { SettingsSection } from "./components/SettingsSection";
@@ -206,7 +207,7 @@ function ConfiguredSettingsNotificationsRouteScreen() {
207 const gt = useGT();
208 const m = useMessages();
209 const preferencesResult = useAtomValue(mobilePreferencesAtom);
209 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
210 + const savePreferences = useAtomCommand(saveMobilePreferences);
211 const agentAwarenessPushAvailable = supportsAgentAwarenessPush();
212 const agentAwarenessPlatform = resolveAgentAwarenessPlatformPresentation(Platform.OS, m);
213 const agentAwarenessSubtitle =
@@ -411,7 +412,7 @@ function ConfiguredSettingsNotificationsRouteScreen() {
412 return;
413 }
414
414 - savePreferences({ liveActivitiesEnabled: true });
415 + void savePreferences({ liveActivitiesEnabled: true });
416 refreshManagedRelayEnvironments();
417 setLiveActivityStatus("enabled");
418 // Environment linking can precede device registration; only registered devices can receive Live Activities.
@@ -501,7 +502,7 @@ function ConfiguredSettingsNotificationsRouteScreen() {
502 }
503 return;
504 }
504 - savePreferences({ liveActivitiesEnabled: false });
505 + void savePreferences({ liveActivitiesEnabled: false });
506 refreshManagedRelayEnvironments();
507 setLiveActivityStatus("disabled");
508 if (updateResult.value) {
apps/mobile/src/features/settings/SettingsProjectGroupingRouteScreen.tsx
+7 -4
@@ -1,6 +1,6 @@
1 import { msg, useGT, useMessages } from "gt-react-native";
2 import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
3 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
3 +import { useAtomValue } from "@effect/atom-react";
4 import type { SidebarProjectGroupingMode } from "@t3tools/contracts";
5 import { AsyncResult } from "effect/reactivity";
6 import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -10,7 +10,8 @@ import {
10 mobileProjectGroupingModePatch,
11 resolveMobileProjectGroupingSettings,
12 } from "../../state/project-grouping";
13 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
13 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
14 +import { useAtomCommand } from "../../state/use-atom-command";
15 import { ListChoiceRow as SettingsChoiceRow } from "../../components/ui/ListChoiceRow";
16 import { SettingsSection } from "./components/SettingsSection";
17 import { LanguageSettingsSection } from "./SettingsLanguageRouteScreen";
@@ -43,7 +44,7 @@ export function SettingsProjectGroupingRouteScreen() {
44 const m = useMessages();
45 const insets = useSafeAreaInsets();
46 const preferencesResult = useAtomValue(mobilePreferencesAtom);
46 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
47 + const savePreferences = useAtomCommand(saveMobilePreferences);
48 const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
49 const selectedMode = AsyncResult.isSuccess(preferencesResult)
50 ? resolveMobileProjectGroupingSettings(preferencesResult.value).sidebarProjectGroupingMode
@@ -68,7 +69,9 @@ export function SettingsProjectGroupingRouteScreen() {
69 selected={selectedMode === option.mode}
70 separated={index > 0}
71 disabled={!preferencesReady}
71 - onPress={() => savePreferences(mobileProjectGroupingModePatch(option.mode))}
72 + onPress={() => {
73 + void savePreferences(mobileProjectGroupingModePatch(option.mode));
74 + }}
75 />
76 ))}
77 </SettingsSection>
apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.test.tsx
+1 -1
@@ -42,7 +42,7 @@ vi.mock("@effect/atom-react", () => ({
42 }));
43 vi.mock("../../state/preferences", () => ({
44 mobilePreferencesAtom: {},
45 - updateMobilePreferencesAtom: {},
45 + saveMobilePreferences: {},
46 }));
47 vi.mock("./components/AutoSettleDaysField", () => ({ AutoSettleDaysField: () => null }));
48 vi.mock("./components/IssueTrackerSection", () => ({ IssueTrackerSection: () => null }));
apps/mobile/src/features/settings/SettingsVoiceRouteScreen.tsx
+9 -6
@@ -19,7 +19,8 @@ import {
19 type MicrophoneKind,
20 microphoneEntryKey,
21 } from "../../lib/microphonePriority";
22 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
22 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
23 +import { useAtomCommand } from "../../state/use-atom-command";
24 import { ListRowLayout } from "../../components/ui/ListRowLayout";
25 import { ListChoiceRow } from "../../components/ui/ListChoiceRow";
26 import * as Dialog from "../../components/ui/Dialog";
@@ -240,7 +241,7 @@ export function SettingsVoiceRouteScreen() {
241 const methodEnvironment = sheetEnvironment ?? grantEnvironment;
242 const insets = useSafeAreaInsets();
243 const preferencesResult = useAtomValue(mobilePreferencesAtom);
243 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
244 + const savePreferences = useAtomCommand(saveMobilePreferences);
245 const ready = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
246 const entries = deviceMicrophoneOrder(
247 AsyncResult.isSuccess(preferencesResult) ? preferencesResult.value.microphones : undefined,
@@ -254,8 +255,8 @@ export function SettingsVoiceRouteScreen() {
255 const [drops, setDrops] = useState(0);
256
257 // Transforms apply to the stored order, so a device recorded meanwhile is kept.
257 - const move = (key: string, steps: number) =>
258 - savePreferences({
258 + const move = (key: string, steps: number) => {
259 + void savePreferences({
260 transform: (current) => {
261 const next = [...deviceMicrophoneOrder(current.microphones)];
262 const from = next.findIndex((entry) => microphoneEntryKey(entry) === key);
@@ -266,14 +267,16 @@ export function SettingsVoiceRouteScreen() {
267 return { microphones: next };
268 },
269 });
269 - const forget = (key: string) =>
270 - savePreferences({
270 + };
271 + const forget = (key: string) => {
272 + void savePreferences({
273 transform: (current) => ({
274 microphones: deviceMicrophoneOrder(current.microphones).filter(
275 (entry) => microphoneEntryKey(entry) !== key,
276 ),
277 }),
278 });
279 + };
280 const dropSteps = (from: number, translation: number) =>
281 rowHeight === 0
282 ? 0
apps/mobile/src/features/settings/ThreadSettingsSections.tsx
+10 -6
@@ -8,7 +8,7 @@ import {
8 import { useEnvironmentsWithScope } from "../../state/session";
9 import { AutoSettleDaysField } from "./components/AutoSettleDaysField";
10 import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
11 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
11 +import { useAtomValue } from "@effect/atom-react";
12 import { AsyncResult } from "effect/reactivity";
13 import type { ComponentProps } from "react";
14 import { View } from "react-native";
@@ -18,7 +18,7 @@ import { DEFAULT_SERVER_SETTINGS } from "@t3tools/contracts";
18 import { supportsSharedSettingsSync } from "@t3tools/client-runtime/state/shared-settings";
19 import { AppText as Text } from "../../components/ui/AppText";
20 import { useEnvironments } from "../../state/environments";
21 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
21 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
22 import { serverEnvironment } from "../../state/server";
23 import { useAtomCommand } from "../../state/use-atom-command";
24 import { SettingsSection } from "./components/SettingsSection";
@@ -211,7 +211,7 @@ export function AutoSettleSettingsRows(props: {
211
212 export function WorkingSectionSettings() {
213 const gt = useGT();
214 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
214 + const savePreferences = useAtomCommand(saveMobilePreferences);
215 const preferences = useAtomValue(mobilePreferencesAtom);
216 const workingShelfEnabled =
217 AsyncResult.isSuccess(preferences) && preferences.value.workingShelfEnabled !== false;
@@ -223,7 +223,9 @@ export function WorkingSectionSettings() {
223 icon="bolt.circle"
224 label={gt("Working section")}
225 value={workingShelfEnabled}
226 - onValueChange={(value) => savePreferences({ workingShelfEnabled: value })}
226 + onValueChange={(value) => {
227 + void savePreferences({ workingShelfEnabled: value });
228 + }}
229 />
230 </SettingsSection>
231 <Text className="px-2 text-sm text-foreground-muted">
@@ -239,7 +241,7 @@ export function WorkingSectionSettings() {
241
242 export function NewThreadSettingsSection() {
243 const gt = useGT();
242 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
244 + const savePreferences = useAtomCommand(saveMobilePreferences);
245 const preferences = useAtomValue(mobilePreferencesAtom);
246 const useLastProject =
247 AsyncResult.isSuccess(preferences) && preferences.value.useLastProjectForNewThreads !== false;
@@ -251,7 +253,9 @@ export function NewThreadSettingsSection() {
253 label={gt("Use last project")}
254 subtitle={gt("Start new threads in the last project you used on this device.")}
255 value={useLastProject}
254 - onValueChange={(value) => savePreferences({ useLastProjectForNewThreads: value })}
256 + onValueChange={(value) => {
257 + void savePreferences({ useLastProjectForNewThreads: value });
258 + }}
259 />
260 </SettingsSection>
261 );
apps/mobile/src/features/settings/appearance/AppearancePreferencesProvider.tsx
+8 -5
@@ -7,7 +7,7 @@ import {
7 type AndroidNavigationStyle,
8 } from "../../../lib/androidNavigationStyle";
9
10 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
10 +import { useAtomValue } from "@effect/atom-react";
11 import { Atom, AsyncResult } from "effect/reactivity";
12
13 import { ScopedTheme, ScopedVariables, Uniwind } from "uniwind";
@@ -18,7 +18,8 @@ import {
18 type ResolvedAppearance,
19 } from "../../../lib/appearancePreferences";
20 import { appAtomRegistry } from "../../../state/atom-registry";
21 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../state/preferences";
21 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../../state/preferences";
22 +import { useAtomCommand } from "../../../state/use-atom-command";
23 import type { Preferences } from "../../../persistence/mobile-preferences";
24 import {
25 isSystemColorsAvailable,
@@ -187,7 +188,7 @@ export function installAppearanceRuntime(): () => void {
188
189 export function AppearancePreferencesProvider(props: { readonly children: ReactNode }) {
190 const preferencesResult = useAtomValue(mobilePreferencesAtom);
190 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
191 + const savePreferences = useAtomCommand(saveMobilePreferences);
192 const systemColorScheme = useColorScheme() === "dark" ? "dark" : "light";
193 const storedPreferences = AsyncResult.isSuccess(preferencesResult)
194 ? preferencesResult.value
@@ -224,11 +225,13 @@ export function AppearancePreferencesProvider(props: { readonly children: ReactN
225 );
226 const isReady = AsyncResult.isSuccess(preferencesResult);
227 const updatePreferences = (patch: Partial<Preferences>) => {
227 - startTransition(() => savePreferences(patch));
228 + startTransition(() => {
229 + void savePreferences(patch);
230 + });
231 };
232
233 const updateThemePreferences = (patch: Partial<Preferences>) => {
231 - savePreferences(patch);
234 + void savePreferences(patch);
235 };
236
237 const setThemeIdForAppearance = (appearance: MobileThemeAppearance, value: MobileThemeId) => {
apps/mobile/src/features/settings/appearance/sections/ToolCallsAppearanceSection.tsx
+7 -4
@@ -1,12 +1,13 @@
1 import { msg, T, useGT, useMessages } from "gt-react-native";
2 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
2 +import { useAtomValue } from "@effect/atom-react";
3 import type { ToolCallVisibility } from "@t3tools/contracts/settings";
4 import { AsyncResult } from "effect/reactivity";
5 import { View } from "react-native";
6
7 import { AppText as Text } from "../../../../components/ui/AppText";
8 import { ListChoiceRow } from "../../../../components/ui/ListChoiceRow";
9 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../../state/preferences";
9 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../../../state/preferences";
10 +import { useAtomCommand } from "../../../../state/use-atom-command";
11 import { SettingsSection } from "../../components/SettingsSection";
12
13 const TOOL_CALL_VISIBILITY_OPTIONS: ReadonlyArray<{
@@ -22,7 +23,7 @@ const TOOL_CALL_VISIBILITY_OPTIONS: ReadonlyArray<{
23 export function ToolCallsAppearanceSection() {
24 const gt = useGT();
25 const m = useMessages();
25 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
26 + const savePreferences = useAtomCommand(saveMobilePreferences);
27 const preferences = useAtomValue(mobilePreferencesAtom);
28 const selected = AsyncResult.isSuccess(preferences)
29 ? (preferences.value.toolCallVisibility ?? "showAll")
@@ -38,7 +39,9 @@ export function ToolCallsAppearanceSection() {
39 selected={selected === option.value}
40 separated={index > 0}
41 disabled={selected === null}
41 - onPress={() => savePreferences({ toolCallVisibility: option.value })}
42 + onPress={() => {
43 + void savePreferences({ toolCallVisibility: option.value });
44 + }}
45 />
46 ))}
47 </SettingsSection>
apps/mobile/src/features/settings/components/DatabaseStorageNotice.tsx
+8 -7
@@ -1,10 +1,11 @@
1 import { useGT } from "gt-react-native";
2 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
2 +import { useAtomValue } from "@effect/atom-react";
3 import { AsyncResult } from "effect/reactivity";
4
5 import { copyTextWithHaptic } from "../../../lib/copyTextWithHaptic";
6 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../state/preferences";
6 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../../state/preferences";
7 import { serverEnvironment } from "../../../state/server";
8 +import { useAtomCommand } from "../../../state/use-atom-command";
9 import type { SettingsTarget } from "../settings-environment-filter";
10 import { ListActionRow as SettingsActionRow } from "../../../components/ui/ListActionRow";
11 import { SettingsSection } from "./SettingsSection";
@@ -22,7 +23,7 @@ export function DatabaseStorageNotice({
23 ),
24 );
25 const preferences = useAtomValue(mobilePreferencesAtom);
25 - const updatePreferences = useAtomSet(updateMobilePreferencesAtom);
26 + const updatePreferences = useAtomCommand(saveMobilePreferences);
27 const dismissed = AsyncResult.isSuccess(preferences)
28 ? (preferences.value.dismissedDatabaseStorageNotices ?? [])
29 : [];
@@ -50,8 +51,8 @@ export function DatabaseStorageNotice({
51 <SettingsActionRow
52 icon="xmark"
53 label={gt("Dismiss")}
53 - onPress={() =>
54 - updatePreferences({
54 + onPress={() => {
55 + void updatePreferences({
56 transform: (current) => ({
57 dismissedDatabaseStorageNotices: [
58 ...new Set([
@@ -60,8 +61,8 @@ export function DatabaseStorageNotice({
61 ]),
62 ],
63 }),
63 - })
64 - }
64 + });
65 + }}
66 />
67 </SettingsSection>
68 );
apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx
+6 -2
@@ -18,7 +18,7 @@ import {
18 } from "../../lib/mobileTheme";
19 import { rootNavigationRef } from "../../lib/rootNavigation";
20 import { appAtomRegistry } from "../../state/atom-registry";
21 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
21 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
22 import { environmentProjects } from "../../state/projects";
23 import { enqueueThreadOutboxMessage } from "../../state/thread-outbox";
24 import { environmentThreadShells } from "../../state/threads";
@@ -288,7 +288,11 @@ export function installShowcaseCapture(
288 // already sees the theme applied. A failed save rolls the patch back, and
289 // the next step writes again.
290 if (requestedTheme !== null && !themeApplied && storedPreferences) {
291 - appAtomRegistry.set(updateMobilePreferencesAtom, createMobileThemePairPatch(requestedTheme));
291 + void runAtomCommand(
292 + appAtomRegistry,
293 + saveMobilePreferences,
294 + createMobileThemePairPatch(requestedTheme),
295 + );
296 }
297 const themeId = themeIds[resolveThemeAppearance(storedPreferences)];
298
apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts
+7 -6
@@ -1,11 +1,12 @@
1 -import { useAtomSet, useAtomValue } from "@effect/atom-react";
1 +import { useAtomValue } from "@effect/atom-react";
2 import { AsyncResult } from "effect/reactivity";
3
4 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
4 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
5 +import { useAtomCommand } from "../../state/use-atom-command";
6
7 export function useThreadListV2ShelfPreferences() {
8 const preferencesResult = useAtomValue(mobilePreferencesAtom);
8 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
9 + const savePreferences = useAtomCommand(saveMobilePreferences);
10 const loaded = AsyncResult.isSuccess(preferencesResult);
11 const snoozedShelfExpanded =
12 loaded && preferencesResult.value.threadListSnoozedShelfExpanded === true;
@@ -18,7 +19,7 @@ export function useThreadListV2ShelfPreferences() {
19 // Transforms read optimistic state so same-frame presses toggle twice.
20 const toggleSnoozedShelf = () => {
21 if (!loaded) return;
21 - savePreferences({
22 + void savePreferences({
23 transform: (current) => ({
24 threadListSnoozedShelfExpanded: current.threadListSnoozedShelfExpanded !== true,
25 }),
@@ -26,7 +27,7 @@ export function useThreadListV2ShelfPreferences() {
27 };
28 const toggleSettledShelf = () => {
29 if (!loaded) return;
29 - savePreferences({
30 + void savePreferences({
31 transform: (current) => ({
32 threadListSettledShelfExpanded: current.threadListSettledShelfExpanded !== true,
33 }),
@@ -34,7 +35,7 @@ export function useThreadListV2ShelfPreferences() {
35 };
36 const toggleWorkingShelf = () => {
37 if (!loaded) return;
37 - savePreferences({
38 + void savePreferences({
39 transform: (current) => ({
40 threadListWorkingShelfExpanded: current.threadListWorkingShelfExpanded !== true,
41 }),
apps/mobile/src/features/threads/useRememberThreadProject.ts
+6 -5
@@ -1,16 +1,15 @@
1 -import { useAtomSet } from "@effect/atom-react";
1 import { useFocusEffect } from "@react-navigation/native";
2 import { isScratchProject } from "@t3tools/client-runtime/state/projects";
3 +import { runAtomCommand } from "@t3tools/client-runtime/state/runtime";
4 import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
5 import { AsyncResult } from "effect/reactivity";
6 import { useCallback } from "react";
7
8 import { appAtomRegistry } from "../../state/atom-registry";
9 import { useEnvironmentServerConfig } from "../../state/entities";
10 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
10 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
11
12 export function useRememberThreadProject(project: EnvironmentProject | null) {
13 - const savePreferences = useAtomSet(updateMobilePreferencesAtom);
13 const serverConfig = useEnvironmentServerConfig(project?.environmentId ?? null);
14 const environmentId = project?.environmentId;
15 const projectId = project?.id;
@@ -26,7 +25,9 @@ export function useRememberThreadProject(project: EnvironmentProject | null) {
25 if (!AsyncResult.isSuccess(preferences)) return;
26 const last = preferences.value.lastThreadProject;
27 if (last?.environmentId === environmentId && last.projectId === projectId) return;
29 - savePreferences({ lastThreadProject: { environmentId, projectId } });
30 - }, [environmentId, projectId, remember, savePreferences]),
28 + void runAtomCommand(appAtomRegistry, saveMobilePreferences, {
29 + lastThreadProject: { environmentId, projectId },
30 + });
31 + }, [environmentId, projectId, remember]),
32 );
33 }
apps/mobile/src/features/voice-input/VoiceInputProvider.tsx
+4 -4
@@ -1,3 +1,4 @@
1 +import { runAtomCommand } from "@t3tools/client-runtime/state/runtime";
2 import { useAtomValue } from "@effect/atom-react";
3 import { AudioModule, RecordingPresets, type RecordingStatus } from "expo-audio";
4 import { File } from "expo-file-system";
@@ -15,7 +16,7 @@ import {
16 } from "../../lib/microphonePriority";
17 import { getLocalVoiceTranscriber } from "../../native/voiceTranscription";
18 import { createVoiceRecorder } from "../../native/voiceRecorder";
18 -import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
19 +import { mobilePreferencesAtom, saveMobilePreferences } from "../../state/preferences";
20 import { getNativeShowcaseScene } from "../showcase/nativeShowcaseScene";
21 import {
22 voiceInputBlocksSubmission,
@@ -77,9 +78,8 @@ const voiceInputAvailableAtom = Atom.make((get) => {
78 */
79 const voiceInputAtom = Atom.make((get) => {
80 const registry = get.registry;
80 - // Mounted so the recorder can read and remember microphones synchronously.
81 + // Mounted so the recorder can read known microphones synchronously.
82 get.mount(mobilePreferencesAtom);
82 - get.mount(updateMobilePreferencesAtom);
83 const audioLevels = makeMutable<ReadonlyArray<number>>(
84 Array<number>(VOICE_WAVEFORM_SAMPLE_COUNT).fill(0),
85 );
@@ -109,7 +109,7 @@ const voiceInputAtom = Atom.make((get) => {
109 const known = deviceMicrophoneOrder(preferences.value.microphones);
110 const order = rememberMicrophones(known, inputs);
111 if (order !== known) {
112 - registry.set(updateMobilePreferencesAtom, {
112 + void runAtomCommand(registry, saveMobilePreferences, {
113 transform: (current) => ({
114 microphones: rememberMicrophones(deviceMicrophoneOrder(current.microphones), inputs),
115 }),
apps/mobile/src/state/preferences.test.ts
+56 -24
@@ -1,10 +1,12 @@
1 import { describe, expect, it } from "@effect/vitest";
2 +import * as Deferred from "effect/Deferred";
3 import * as Effect from "effect/Effect";
4 +import * as Fiber from "effect/Fiber";
5 import * as Layer from "effect/Layer";
6 import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
7 import { vi } from "vite-plus/test";
8 import { ProviderInstanceId } from "@t3tools/contracts";
7 -import { RegistryContext, useAtomSet } from "@effect/atom-react";
9 +import { RegistryContext } from "@effect/atom-react";
10 import { createElement } from "react";
11 import { renderToString } from "react-dom/server";
12
@@ -26,6 +28,7 @@ vi.mock("../lib/runtime", async () => {
28 });
29
30 import { createMobilePreferencesState } from "./preferences";
31 +import { useAtomCommand } from "./use-atom-command";
32 import * as MobilePreferences from "../persistence/mobile-preferences";
33
34 function deferred<A>() {
@@ -72,9 +75,8 @@ describe("mobile preferences state", () => {
75 });
76 const registry = AtomRegistry.make();
77 const unmountPreferences = registry.mount(state.preferencesAtom);
75 - const unmountUpdate = registry.mount(state.updatePreferencesAtom);
78
77 - registry.set(state.updatePreferencesAtom, {
79 + const save = state.savePreferences.run(registry, {
80 collapsedProjectGroups: ["project:new"],
81 });
82 pendingLoad.resolve({
@@ -85,6 +87,7 @@ describe("mobile preferences state", () => {
87 const preferences = yield* AtomRegistry.getResult(registry, state.preferencesAtom, {
88 suspendOnWaiting: true,
89 });
90 + const saveResult = yield* Effect.promise(() => save);
91 expect(preferences).toEqual({
92 baseFontSize: 18,
93 collapsedProjectGroups: ["project:new"],
@@ -92,15 +95,14 @@ describe("mobile preferences state", () => {
95 expect(savePatch).toHaveBeenCalledWith({
96 collapsedProjectGroups: ["project:new"],
97 });
95 - expect(AsyncResult.isFailure(registry.get(state.updatePreferencesAtom))).toBe(false);
98 + expect(AsyncResult.isFailure(saveResult)).toBe(false);
99
97 - unmountUpdate();
100 unmountPreferences();
101 registry.dispose();
102 }),
103 );
104
103 - it.effect("keeps both favorites when the React setter sends updates before a render", () =>
105 + it.effect("keeps both favorites when the React command sends updates before a render", () =>
106 Effect.gen(function* () {
107 let persisted: MobilePreferences.Preferences = { modelFavorites: [] };
108 const state = makePreferencesState({
@@ -118,60 +120,90 @@ describe("mobile preferences state", () => {
120 });
121 const registry = AtomRegistry.make();
122 const unmountPreferences = registry.mount(state.preferencesAtom);
121 - const unmountUpdate = registry.mount(state.updatePreferencesAtom);
123 yield* AtomRegistry.getResult(registry, state.preferencesAtom, { suspendOnWaiting: true });
124
125 function useSavePreferences() {
125 - return useAtomSet(state.updatePreferencesAtom);
126 + return useAtomCommand(state.savePreferences, { reportFailure: false });
127 }
128 const setters: Array<ReturnType<typeof useSavePreferences>> = [];
129 function CaptureSetter() {
130 setters.push(useSavePreferences());
131 return null;
132 }
132 - // Use the React setter; registry.set bypasses bare-function update semantics.
133 renderToString(
134 createElement(RegistryContext.Provider, { value: registry }, createElement(CaptureSetter)),
135 );
136 const savePreferences = setters[0]!;
137 const provider = ProviderInstanceId.make("codex");
138 - savePreferences({
138 + const first = savePreferences({
139 transform: (current) => ({
140 modelFavorites: [...(current.modelFavorites ?? []), { provider, model: "astra" }],
141 }),
142 });
143 - savePreferences({
143 + const second = savePreferences({
144 transform: (current) => ({
145 modelFavorites: [...(current.modelFavorites ?? []), { provider, model: "sol" }],
146 }),
147 });
148 - yield* AtomRegistry.getResult(registry, state.updatePreferencesAtom, {
149 - suspendOnWaiting: true,
150 - });
148 + yield* Effect.promise(() => Promise.all([first, second]));
149
150 expect(persisted.modelFavorites).toEqual([
151 { provider, model: "astra" },
152 { provider, model: "sol" },
153 ]);
154
157 - savePreferences({
158 - transform: (current) => ({
159 - modelFavorites: (current.modelFavorites ?? []).filter(
160 - (favorite) => favorite.model !== "astra",
161 - ),
155 + yield* Effect.promise(() =>
156 + savePreferences({
157 + transform: (current) => ({
158 + modelFavorites: (current.modelFavorites ?? []).filter(
159 + (favorite) => favorite.model !== "astra",
160 + ),
161 + }),
162 }),
163 - });
164 - yield* AtomRegistry.getResult(registry, state.updatePreferencesAtom, {
165 - suspendOnWaiting: true,
166 - });
163 + );
164 expect(persisted.modelFavorites).toEqual([{ provider, model: "sol" }]);
165
169 - unmountUpdate();
166 unmountPreferences();
167 registry.dispose();
168 }),
169 );
170
171 + it.effect("clears the optimistic patch when a save is interrupted", () =>
172 + Effect.gen(function* () {
173 + const started = yield* Deferred.make<void>();
174 + const store = {
175 + load: Effect.succeed({ baseFontSize: 16 }),
176 + savePatch: () => Deferred.succeed(started, undefined).pipe(Effect.andThen(Effect.never)),
177 + };
178 + const state = makePreferencesState(store);
179 + const registry = AtomRegistry.make();
180 + const unmount = registry.mount(state.preferencesAtom);
181 + yield* AtomRegistry.getResult(registry, state.preferencesAtom, { suspendOnWaiting: true });
182 +
183 + const fiber = yield* Effect.forkChild(
184 + state.save({ baseFontSize: 20 }, registry).pipe(
185 + Effect.provide(
186 + Layer.succeed(
187 + MobilePreferences.MobilePreferencesStore,
188 + MobilePreferences.MobilePreferencesStore.of({
189 + ...store,
190 + update: () => Effect.die("unexpected"),
191 + }),
192 + ),
193 + ),
194 + ),
195 + );
196 + yield* Deferred.await(started);
197 + yield* Fiber.interrupt(fiber);
198 +
199 + expect(AsyncResult.getOrElse(registry.get(state.preferencesAtom), () => ({}))).toEqual({
200 + baseFontSize: 16,
201 + });
202 + unmount();
203 + registry.dispose();
204 + }),
205 + );
206 +
207 it.effect("falls back to empty preferences when secure storage cannot be read", () =>
208 Effect.gen(function* () {
209 const state = makePreferencesState({
apps/mobile/src/state/preferences.ts
+62 -73
@@ -1,5 +1,6 @@
1 +import { createRuntimeCommand } from "@t3tools/client-runtime/state/runtime";
2 import * as Effect from "effect/Effect";
2 -import { AsyncResult, Atom } from "effect/reactivity";
3 +import { AsyncResult, Atom, type AtomRegistry } from "effect/reactivity";
4
5 import * as MobilePreferences from "../persistence/mobile-preferences";
6 import * as Runtime from "../lib/runtime";
@@ -9,7 +10,6 @@ interface OptimisticPreferences {
10 readonly versions: Partial<Record<keyof MobilePreferences.Preferences, number>>;
11 }
12
12 -// useAtomSet treats bare functions as AsyncResult updates; wrap preference transforms in payloads.
13 type PreferencesUpdate =
14 | Partial<MobilePreferences.Preferences>
15 | {
@@ -56,81 +56,70 @@ export function createMobilePreferencesState(
56 }));
57 }).pipe(Atom.keepAlive, Atom.withLabel("mobile:preferences"));
58
59 - const updatePreferencesAtom = runtime
60 - .fn(
61 - (update: PreferencesUpdate, get) => {
62 - const currentPreferences = get(preferencesAtom);
63 - const patch =
64 - "transform" in update
65 - ? update.transform(
66 - AsyncResult.isSuccess(currentPreferences) ? currentPreferences.value : {},
67 - )
68 - : update;
69 - const version = ++nextPatchVersion;
70 - const current = get(optimisticPatchAtom);
71 - const versions = { ...current.versions };
72 - for (const key of Object.keys(patch) as Array<keyof MobilePreferences.Preferences>) {
73 - versions[key] = version;
74 - }
75 - get.set(optimisticPatchAtom, {
76 - values: { ...current.values, ...patch },
77 - versions,
78 - });
79 - return MobilePreferences.MobilePreferencesStore.pipe(
80 - Effect.flatMap((store) =>
81 - "transform" in update ? store.update(update.transform) : store.savePatch(patch),
82 - ),
83 - Effect.tap((saved) =>
84 - Effect.sync(() => {
85 - get.set(confirmedPreferencesAtom, saved);
86 - const optimistic = get(optimisticPatchAtom);
87 - const values = { ...optimistic.values } as Record<string, unknown>;
88 - const currentVersions = { ...optimistic.versions } as Record<string, unknown>;
89 - for (const key of Object.keys(patch) as Array<keyof MobilePreferences.Preferences>) {
90 - if (optimistic.versions[key] === version) {
91 - delete values[key];
92 - delete currentVersions[key];
93 - }
94 - }
95 - get.set(optimisticPatchAtom, {
96 - values: values as Partial<MobilePreferences.Preferences>,
97 - versions: currentVersions as Partial<
98 - Record<keyof MobilePreferences.Preferences, number>
99 - >,
100 - });
101 - }),
102 - ),
103 - Effect.tapError(() =>
104 - Effect.sync(() => {
105 - const optimistic = get(optimisticPatchAtom);
106 - const values = { ...optimistic.values } as Record<string, unknown>;
107 - const currentVersions = { ...optimistic.versions } as Record<string, unknown>;
108 - for (const key of Object.keys(patch) as Array<keyof MobilePreferences.Preferences>) {
109 - if (optimistic.versions[key] === version) {
110 - delete values[key];
111 - delete currentVersions[key];
112 - }
113 - }
114 - get.set(optimisticPatchAtom, {
115 - values: values as Partial<MobilePreferences.Preferences>,
116 - versions: currentVersions as Partial<
117 - Record<keyof MobilePreferences.Preferences, number>
118 - >,
119 - });
120 - }),
121 - ),
122 - );
123 - },
124 - // Storage serializes shared-blob updates; keep concurrent invocations alive to prevent cross-field interruption.
125 - { concurrent: true },
126 - )
127 - .pipe(Atom.keepAlive, Atom.withLabel("mobile:preferences:update"));
59 + const settlePatch = (
60 + registry: AtomRegistry.AtomRegistry,
61 + patch: Partial<MobilePreferences.Preferences>,
62 + version: number,
63 + ) => {
64 + const optimistic = registry.get(optimisticPatchAtom);
65 + const values = { ...optimistic.values } as Record<string, unknown>;
66 + const versions = { ...optimistic.versions } as Record<string, unknown>;
67 + for (const key of Object.keys(patch) as Array<keyof MobilePreferences.Preferences>) {
68 + if (optimistic.versions[key] === version) {
69 + delete values[key];
70 + delete versions[key];
71 + }
72 + }
73 + registry.set(optimisticPatchAtom, {
74 + values: values as Partial<MobilePreferences.Preferences>,
75 + versions: versions as Partial<Record<keyof MobilePreferences.Preferences, number>>,
76 + });
77 + };
78 +
79 + // The optimistic patch lands when a save starts, before the store finishes writing.
80 + const stage = (update: PreferencesUpdate, registry: AtomRegistry.AtomRegistry) => {
81 + const currentPreferences = registry.get(preferencesAtom);
82 + const patch =
83 + "transform" in update
84 + ? update.transform(
85 + AsyncResult.isSuccess(currentPreferences) ? currentPreferences.value : {},
86 + )
87 + : update;
88 + const version = ++nextPatchVersion;
89 + const current = registry.get(optimisticPatchAtom);
90 + const versions = { ...current.versions };
91 + for (const key of Object.keys(patch) as Array<keyof MobilePreferences.Preferences>) {
92 + versions[key] = version;
93 + }
94 + registry.set(optimisticPatchAtom, { values: { ...current.values, ...patch }, versions });
95 + return { patch, version } as const;
96 + };
97 +
98 + const save = Effect.fn("MobilePreferencesState.save")(function* (
99 + update: PreferencesUpdate,
100 + registry: AtomRegistry.AtomRegistry,
101 + ) {
102 + const store = yield* MobilePreferences.MobilePreferencesStore;
103 + const staged = yield* Effect.sync(() => stage(update, registry));
104 + return yield* (
105 + "transform" in update ? store.update(update.transform) : store.savePatch(staged.patch)
106 + ).pipe(
107 + Effect.tap((saved) => Effect.sync(() => registry.set(confirmedPreferencesAtom, saved))),
108 + Effect.ensuring(Effect.sync(() => settlePatch(registry, staged.patch, staged.version))),
109 + );
110 + });
111 +
112 + // One command gives every caller its own settled result, even when saves overlap.
113 + const savePreferences = createRuntimeCommand(runtime, {
114 + label: "mobile:preferences:save",
115 + execute: save,
116 + });
117
129 - return { preferencesAtom, updatePreferencesAtom } as const;
118 + return { preferencesAtom, save, savePreferences } as const;
119 }
120
121 const mobilePreferencesRuntime = Atom.runtime(Runtime.layer);
122 const mobilePreferencesState = createMobilePreferencesState(mobilePreferencesRuntime);
123
124 export const mobilePreferencesAtom = mobilePreferencesState.preferencesAtom;
136 -export const updateMobilePreferencesAtom = mobilePreferencesState.updatePreferencesAtom;
125 +export const saveMobilePreferences = mobilePreferencesState.savePreferences;
apps/web/src/cloud/managedAuth.tsx
+19 -16
@@ -8,6 +8,7 @@ import {
8 reportAtomCommandResult,
9 runAtomCommand,
10 settleAsyncResult,
11 + squashAtomCommandFailure,
12 } from "@t3tools/client-runtime/state/runtime";
13 import * as Effect from "effect/Effect";
14 import { useEffect, type ReactNode } from "react";
@@ -38,25 +39,27 @@ function clerkTokenReader(clerk: ClerkInstance): () => Promise<string | null> {
39 clerk.session ? await clerk.session.getToken(resolveRelayClerkTokenOptions()) : null;
40 }
41
42 +// A failed route removal fails the switch, so the next account never activates over the old routes.
43 +async function cleanUpManagedRelayAccount(): Promise<void> {
44 + const [removal, tokenReset] = await Promise.all([
45 + runAtomCommand(appAtomRegistry, environmentCatalog.removeRelayEnvironments, undefined, {
46 + reportFailure: false,
47 + reportDefect: false,
48 + }),
49 + settleAsyncResult(() =>
50 + runtime.runPromiseExit(
51 + ManagedRelay.ManagedRelayClient.pipe(Effect.flatMap((client) => client.resetTokenCache)),
52 + ),
53 + ),
54 + ]);
55 + reportAtomCommandResult(tokenReset, { label: "cloud account cleanup" });
56 + if (removal._tag !== "Success") throw squashAtomCommandFailure(removal);
57 +}
58 +
59 const managedRelayAccountService = createCloudAccountService<ClerkInstance>({
60 deactivate: deactivateManagedRelayAuthentication,
61 detach: deactivateManagedRelayAuthentication,
44 - cleanUp: async () => {
45 - const results = await Promise.all([
46 - runAtomCommand(appAtomRegistry, environmentCatalog.removeRelayEnvironments, undefined, {
47 - reportFailure: false,
48 - reportDefect: false,
49 - }),
50 - settleAsyncResult(() =>
51 - runtime.runPromiseExit(
52 - ManagedRelay.ManagedRelayClient.pipe(Effect.flatMap((client) => client.resetTokenCache)),
53 - ),
54 - ),
55 - ]);
56 - for (const result of results) {
57 - reportAtomCommandResult(result, { label: "cloud account cleanup" });
58 - }
59 - },
62 + cleanUp: cleanUpManagedRelayAccount,
63 activate: ({ source, accountId }) =>
64 activateManagedRelayAuthentication(accountId, clerkTokenReader(source)),
65 });