Skip to content

Commit b7aa17f

Browse files
committed
fix(clients): keep model preferences editable on older servers
Older servers silently discard the new model preference patches, and mobile migration can repeatedly resend saved favorites. Advertise support and keep local preferences on older servers. Skip unsupported migrations, preserve serialized edits, and only offer mobile visibility controls when the environment can save them.
1 parent 36636f8 commit b7aa17f

7 files changed

Lines changed: 218 additions & 26 deletions

File tree

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 74 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { DEFAULT_SERVER_SETTINGS } from "@t3tools/contracts";
33
import {
44
modelPreferencesMigrationPatch,
55
resolveModelPreferences,
6+
supportsServerModelPreferences,
67
} from "@t3tools/shared/serverSettings";
78
import type {
89
EnvironmentId,
@@ -14,7 +15,7 @@ import type {
1415
ServerSettings,
1516
} from "@t3tools/contracts";
1617
import type { LegendListRenderItemProps } from "@legendapp/list/react-native";
17-
import { RegistryContext, useAtomValue } from "@effect/atom-react";
18+
import { RegistryContext, useAtomSet, useAtomValue } from "@effect/atom-react";
1819
import { AnimatedLegendList } from "@legendapp/list/reanimated";
1920
import {
2021
getProviderOptionCurrentLabel,
@@ -74,7 +75,7 @@ import {
7475
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
7576
import { ChatGptSharingStatus } from "./ChatGptSharingStatus";
7677
import { environmentServerConfigsAtom, serverEnvironment } from "../../state/server";
77-
import { mobilePreferencesAtom } from "../../state/preferences";
78+
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
7879
import { useAtomCommand } from "../../state/use-atom-command";
7980
import { useNewTaskFlow } from "./new-task-flow-provider";
8081
import { MaterialScreenContent } from "../../components/MaterialScreenContent";
@@ -315,6 +316,7 @@ type ThreadSettingsSessionValue = {
315316
readonly toggleHidden: (option: ModelOption) => void;
316317
readonly pendingHiddenKeys: ReadonlySet<string>;
317318
readonly manageHidden: boolean;
319+
readonly canManageHidden: boolean;
318320
readonly setManageHidden: (value: boolean) => void;
319321
readonly runtimeMode: RuntimeMode;
320322
readonly runtimeModeChoices: ReturnType<typeof runtimeModeChoicesForSupportedModes>;
@@ -350,7 +352,13 @@ function ThreadSettingsSessionProvider(
350352
const configs = useAtomValue(environmentServerConfigsAtom);
351353
const config = props.environmentId ? configs.get(props.environmentId) : undefined;
352354
const settings = config?.settings;
353-
const [manageHidden, setManageHidden] = useState(false);
355+
const serverModelPreferences = supportsServerModelPreferences(
356+
settings,
357+
config?.environment.capabilities,
358+
);
359+
const saveLocalPreferences = useAtomSet(updateMobilePreferencesAtom);
360+
const [manageHiddenEnabled, setManageHidden] = useState(false);
361+
const manageHidden = serverModelPreferences && manageHiddenEnabled;
354362
const pendingHidden = useRef(new Set<string>());
355363
const pendingFavorites = useRef(
356364
new Map<string, { favorite: boolean; settings: ServerSettings; pending: boolean }>(),
@@ -381,10 +389,23 @@ function ThreadSettingsSessionProvider(
381389
}).favorites;
382390
const saveSettings = useAtomCommand(serverEnvironment.updateSettings, "model favorites update");
383391
useEffect(() => {
384-
if (!props.environmentId || !settings || !AsyncResult.isSuccess(preferences)) return;
392+
if (
393+
!props.environmentId ||
394+
!settings ||
395+
!serverModelPreferences ||
396+
!AsyncResult.isSuccess(preferences)
397+
)
398+
return;
385399
const patch = modelPreferencesMigrationPatch(settings, { favorites: legacyFavorites });
386400
if (patch) void saveSettings({ environmentId: props.environmentId, input: { patch } });
387-
}, [legacyFavorites, preferences, props.environmentId, saveSettings, settings]);
401+
}, [
402+
legacyFavorites,
403+
preferences,
404+
props.environmentId,
405+
saveSettings,
406+
settings,
407+
serverModelPreferences,
408+
]);
388409
const favoriteKeys = useMemo(
389410
() =>
390411
new Set(
@@ -395,10 +416,32 @@ function ThreadSettingsSessionProvider(
395416
const toggleFavorite = useCallback(
396417
async (option: ModelOption) => {
397418
if (!favoritesLoaded || !props.environmentId) return;
398-
const currentSettings = registry
399-
.get(environmentServerConfigsAtom)
400-
.get(props.environmentId)?.settings;
419+
const currentConfig = registry.get(environmentServerConfigsAtom).get(props.environmentId);
420+
const currentSettings = currentConfig?.settings;
401421
if (!currentSettings) return;
422+
if (
423+
!supportsServerModelPreferences(currentSettings, currentConfig?.environment.capabilities)
424+
) {
425+
void Haptics.selectionAsync();
426+
saveLocalPreferences({
427+
transform: (current) => {
428+
const favorites = current.modelFavorites ?? [];
429+
const provider = option.selection.instanceId;
430+
const model = option.selection.model;
431+
const exists = favorites.some(
432+
(favorite) => favorite.provider === provider && favorite.model === model,
433+
);
434+
return {
435+
modelFavorites: exists
436+
? favorites.filter(
437+
(favorite) => favorite.provider !== provider || favorite.model !== model,
438+
)
439+
: [...favorites, { provider, model }],
440+
};
441+
},
442+
});
443+
return;
444+
}
402445
const favorites = resolveModelPreferences(currentSettings, {
403446
favorites: legacyFavorites,
404447
}).favorites;
@@ -459,12 +502,20 @@ function ThreadSettingsSessionProvider(
459502
}
460503
}
461504
},
462-
[favoritesLoaded, legacyFavorites, props.environmentId, registry, saveSettings],
505+
[
506+
favoritesLoaded,
507+
legacyFavorites,
508+
props.environmentId,
509+
registry,
510+
saveLocalPreferences,
511+
saveSettings,
512+
],
463513
);
464514
const toggleHidden = useCallback(
465515
(option: ModelOption) => {
466516
if (
467517
!settings ||
518+
!serverModelPreferences ||
468519
!props.environmentId ||
469520
!option.canHide ||
470521
pendingHidden.current.has(option.key)
@@ -491,7 +542,7 @@ function ThreadSettingsSessionProvider(
491542
setPendingHiddenKeys(new Set(pendingHidden.current));
492543
});
493544
},
494-
[props.environmentId, saveSettings, settings],
545+
[props.environmentId, saveSettings, settings, serverModelPreferences],
495546
);
496547
const [showLegacyToggle, setShowLegacyToggle] = useState(false);
497548
const [providerFilter, setProviderFilter] = useState<string | null>(null);
@@ -611,6 +662,7 @@ function ThreadSettingsSessionProvider(
611662
providerInstanceId: props.providerInstanceId,
612663
providerGroups,
613664
manageHidden,
665+
canManageHidden: serverModelPreferences,
614666
setManageHidden,
615667
toggleHidden,
616668
pendingHiddenKeys,
@@ -660,6 +712,7 @@ function ThreadSettingsSessionProvider(
660712
props.onUpdateRuntimeMode,
661713
providerGroups,
662714
manageHidden,
715+
serverModelPreferences,
663716
toggleHidden,
664717
pendingHiddenKeys,
665718
runtimeModeChoices,
@@ -958,14 +1011,18 @@ function ThreadSettingsOptionsItem(props: {
9581011
</Animated.View>
9591012
</Animated.View>
9601013

961-
<Text className="px-5 pb-2 pt-7 text-sm font-t3-medium text-foreground-muted">Catalog</Text>
1014+
{(session.canManageHidden || (Platform.OS !== "ios" && session.hasLegacyModels)) && (
1015+
<Text className="px-5 pb-2 pt-7 text-sm font-t3-medium text-foreground-muted">Catalog</Text>
1016+
)}
9621017
<View className="mx-4 overflow-hidden rounded-2xl bg-grouped-card">
963-
<SwitchRow
964-
label="Manage hidden models"
965-
value={session.manageHidden}
966-
onValueChange={session.setManageHidden}
967-
isLast={Platform.OS === "ios" || !session.hasLegacyModels}
968-
/>
1018+
{session.canManageHidden && (
1019+
<SwitchRow
1020+
label="Manage hidden models"
1021+
value={session.manageHidden}
1022+
onValueChange={session.setManageHidden}
1023+
isLast={Platform.OS === "ios" || !session.hasLegacyModels}
1024+
/>
1025+
)}
9691026
{Platform.OS !== "ios" && session.hasLegacyModels ? (
9701027
<SwitchRow
9711028
isLast

‎apps/server/src/environment/ServerEnvironment.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ export const make = Effect.gen(function* () {
236236
worktreesDirectory: true,
237237
threadRestartContinuation: true,
238238
projectSettingsOverrides: true,
239+
modelPreferences: true,
239240
threadSnooze: true,
240241
environmentThemes: true,
241242
usageLimitSources: true,

‎apps/web/src/hooks/useSettings.favorites.test.tsx‎

Lines changed: 80 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { RegistryContext } from "@effect/atom-react";
1+
import { RegistryContext, useAtomValue } from "@effect/atom-react";
22
import {
33
DEFAULT_SERVER_SETTINGS,
44
EnvironmentId,
55
ProviderInstanceId,
66
type ServerSettings,
77
type ServerSettingsPatch,
88
} from "@t3tools/contracts";
9+
import { DEFAULT_CLIENT_SETTINGS } from "@t3tools/contracts/settings";
910
import * as Cause from "effect/Cause";
1011
import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
1112
import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";
@@ -15,22 +16,35 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test"
1516

1617
const state = vi.hoisted(() => ({
1718
settings: new Map<EnvironmentId, Atom.Writable<ServerSettings | null>>(),
19+
configs: new Map<EnvironmentId, Atom.Atom<unknown>>(),
20+
supportsModelPreferences: true,
1821
persist: vi.fn(),
22+
persistLocal: vi.fn(),
1923
}));
2024

2125
vi.mock("~/state/server", () => ({
2226
serverEnvironment: {
2327
settingsValueAtom: (id: EnvironmentId) => state.settings.get(id)!,
28+
configValueAtom: (id: EnvironmentId) => state.configs.get(id)!,
2429
updateSettings: Symbol("updateSettings"),
2530
},
2631
primaryServerSettingsAtom: undefined,
2732
}));
2833
vi.mock("~/state/use-atom-command", () => ({ useAtomCommand: () => state.persist }));
2934
vi.mock("~/localApi", () => ({
30-
ensureLocalApi: () => ({ persistence: { getClientSettings: async () => null } }),
35+
ensureLocalApi: () => ({
36+
persistence: { getClientSettings: async () => null, setClientSettings: state.persistLocal },
37+
}),
3138
}));
3239

33-
import { useToggleEnvironmentModelFavorite } from "./useSettings";
40+
import {
41+
__resetClientSettingsPersistenceForTests,
42+
__setClientSettingsForTests,
43+
getClientSettings,
44+
useMigrateModelPreferences,
45+
useToggleEnvironmentModelFavorite,
46+
useUpdateEnvironmentModelPreferences,
47+
} from "./useSettings";
3448

3549
const primaryId = EnvironmentId.make("primary");
3650
const remoteId = EnvironmentId.make("remote");
@@ -77,10 +91,21 @@ beforeEach(() => {
7791
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
7892
registry = AtomRegistry.make();
7993
state.settings.clear();
94+
state.configs.clear();
95+
state.supportsModelPreferences = true;
96+
state.persistLocal.mockReset().mockResolvedValue(undefined);
97+
__resetClientSettingsPersistenceForTests();
8098
durable = new Map();
8199
writes = [];
82100
for (const id of [primaryId, remoteId]) {
83101
state.settings.set(id, Atom.make<ServerSettings | null>(initialSettings));
102+
state.configs.set(
103+
id,
104+
Atom.make((get) => ({
105+
settings: get(state.settings.get(id)!),
106+
environment: { capabilities: { modelPreferences: state.supportsModelPreferences } },
107+
})),
108+
);
84109
durable.set(id, initialSettings);
85110
}
86111
state.persist.mockReset().mockImplementation(
@@ -117,6 +142,58 @@ afterEach(async () => {
117142
});
118143

119144
describe("environment favorite toggles", () => {
145+
it("keeps repeated favorite edits local when an older server cannot save them", async () => {
146+
state.supportsModelPreferences = false;
147+
registry.set(state.settings.get(remoteId)!, DEFAULT_SERVER_SETTINGS);
148+
__setClientSettingsForTests(DEFAULT_CLIENT_SETTINGS);
149+
await mount(remoteId);
150+
await act(() => click());
151+
expect(getClientSettings().favorites).toEqual([{ provider, model }]);
152+
await act(() => click());
153+
expect(getClientSettings().favorites).toEqual([]);
154+
expect(state.persistLocal).toHaveBeenCalledTimes(2);
155+
expect(writes).toEqual([]);
156+
});
157+
158+
it("keeps visibility and order edits local without repeatedly migrating to an older server", async () => {
159+
state.supportsModelPreferences = false;
160+
registry.set(state.settings.get(remoteId)!, DEFAULT_SERVER_SETTINGS);
161+
__setClientSettingsForTests({ ...DEFAULT_CLIENT_SETTINGS, favorites: [{ provider, model }] });
162+
function LegacyEditor() {
163+
const settings = useAtomValue(state.settings.get(remoteId)!);
164+
useMigrateModelPreferences(remoteId, settings);
165+
const save = useUpdateEnvironmentModelPreferences(remoteId);
166+
return (
167+
<button
168+
onClick={() =>
169+
save({
170+
setModelsHidden: [{ provider, model, hidden: true }],
171+
setProviderModelOrder: { provider, modelOrder: [model] },
172+
})
173+
}
174+
>
175+
Save preferences
176+
</button>
177+
);
178+
}
179+
await act(() => {
180+
renderer = create(
181+
<RegistryContext.Provider value={registry}>
182+
<LegacyEditor />
183+
</RegistryContext.Provider>,
184+
);
185+
});
186+
await act(() => click());
187+
await act(() => registry.set(state.settings.get(remoteId)!, { ...DEFAULT_SERVER_SETTINGS }));
188+
expect(getClientSettings().favorites).toEqual([{ provider, model }]);
189+
expect(getClientSettings().providerModelPreferences[provider]).toEqual({
190+
hiddenModels: [model],
191+
modelOrder: [model],
192+
});
193+
expect(state.persistLocal).toHaveBeenCalledOnce();
194+
expect(writes).toEqual([]);
195+
});
196+
120197
it.each([false, true])(
121198
"toggles twice before any server echo when initially favorited=%s",
122199
async (initiallyFavorited) => {

0 commit comments

Comments
 (0)