Skip to content

Commit ad50f62

Browse files
fix(mobile): picking a model shows its remembered options before saving (pingdotgg#15719)
Co-authored-by: Julius Marminge <[email protected]>
1 parent 833b11f commit ad50f62

4 files changed

Lines changed: 121 additions & 19 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
605605
reportedModelSelection: props.reportedModelSelection,
606606
onSelectModel: (option) =>
607607
props.onUpdateModelSelection(withRememberedModelOptions(option.selection)),
608+
restoreSelection: withRememberedModelOptions,
608609
optionDescriptors: providerOptionDescriptors,
609610
onUpdateOptionSelections: (options) => {
610611
rememberModelOptions(

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@ import { useNavigation, useRoute, type RouteProp } from "@react-navigation/nativ
2828
import { type NativeStackNavigationProp } from "@react-navigation/native-stack";
2929
import * as Haptics from "expo-haptics";
3030
import { AsyncResult } from "effect/reactivity";
31-
import { createContext, use, useEffect, useRef, useState, type ReactNode } from "react";
31+
import {
32+
createContext,
33+
use,
34+
useEffect,
35+
useEffectEvent,
36+
useRef,
37+
useState,
38+
type ReactNode,
39+
} from "react";
3240
import { Platform, Pressable, RefreshControl, ScrollView, TextInput, View } from "react-native";
3341
import Animated, { FadeIn, FadeOut, LinearTransition } from "react-native-reanimated";
3442
import { useSafeAreaInsets } from "react-native-safe-area-context";
@@ -51,7 +59,10 @@ import {
5159
import { applyProviderOptionSelection } from "../../lib/providerOptions";
5260
import { resolveProviderOptionDescriptors } from "../../lib/providerOptions";
5361
import { useUniwindTheme } from "../../lib/useUniwindTheme";
54-
import { rememberModelOptions } from "../../state/use-model-option-memory";
62+
import {
63+
rememberModelOptions,
64+
withRememberedModelOptions,
65+
} from "../../state/use-model-option-memory";
5566
import { NativeStackScreenOptions, nativeHeaderScrollEdgeEffects } from "../../native/StackHeader";
5667
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
5768
import { ChatGptSharingStatus } from "./ChatGptSharingStatus";
@@ -234,6 +245,7 @@ type ThreadSettingsSessionProps = {
234245
readonly selectedModel: ModelSelection | null;
235246
readonly reportedModelSelection?: ModelSelection | null;
236247
readonly onSelectModel: (option: ModelOption) => void;
248+
readonly restoreSelection?: (selection: ModelSelection) => ModelSelection;
237249
readonly optionDescriptors: ReadonlyArray<ProviderOptionDescriptor>;
238250
readonly onUpdateOptionSelections: (selections: ReadonlyArray<ProviderOptionSelection>) => void;
239251
readonly runtimeMode: RuntimeMode;
@@ -533,6 +545,7 @@ function ThreadSettingsSessionProvider(
533545
current,
534546
pressed: option,
535547
pressedIsApplied: isApplied(option),
548+
restoreSelection: props.restoreSelection,
536549
}),
537550
);
538551
};
@@ -1122,10 +1135,10 @@ function ThreadSettingsModelsScreen() {
11221135
const usesNativeMailSearchToolbar = useNativeMailSearchToolbar();
11231136
const theme = useUniwindTheme();
11241137
const hasCustomCatalogFilter = session.providerFilter !== null || session.showLegacy;
1125-
const commitAndClose = () => {
1138+
const commitAndClose = useEffectEvent(() => {
11261139
if (!session.commitPendingModel()) return;
11271140
presentation.onClose();
1128-
};
1141+
});
11291142
const providerFilters = [
11301143
{ id: "all-providers", title: "All providers", value: null },
11311144
{ id: "favorites", title: "Favorites", value: FAVORITES_PROVIDER_FILTER },
@@ -1455,6 +1468,7 @@ export function NewTaskThreadSettingsRouteScreen() {
14551468
providerGroups={flow.providerGroups}
14561469
selectedModel={flow.selectedModel}
14571470
onSelectModel={(option) => flow.setSelectedModelKey(option.key, option.selection.options)}
1471+
restoreSelection={withRememberedModelOptions}
14581472
optionDescriptors={optionDescriptors}
14591473
onUpdateOptionSelections={flow.setSelectedModelOptions}
14601474
runtimeMode={flow.runtimeMode}

‎apps/mobile/src/features/threads/thread-settings-sheet-state.test.ts‎

Lines changed: 94 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
import { describe, expect, it } from "vite-plus/test";
1+
import { afterEach, beforeEach, describe, expect, it } from "@effect/vitest";
2+
import { vi } from "vite-plus/test";
23

34
import { ProviderInstanceId, type ProviderOptionSelection } from "@t3tools/contracts";
5+
import { getProviderOptionDescriptors } from "@t3tools/shared/model";
46

57
import type { ModelOption } from "../../lib/modelOptions";
8+
import { appAtomRegistry } from "../../state/atom-registry";
9+
import { modelOptionMemoryAtom } from "../../state/use-composer-drafts";
10+
import {
11+
rememberModelOptions,
12+
withRememberedModelOptions,
13+
} from "../../state/use-model-option-memory";
614
import {
715
canCommitPendingModel,
816
favoritesFirst,
@@ -23,7 +31,30 @@ function modelOption(
2331
providerDriver: "codex",
2432
isDefault: false,
2533
isLegacy: false,
26-
capabilities: null,
34+
capabilities: {
35+
optionDescriptors: [
36+
{
37+
id: "effort",
38+
label: "Reasoning",
39+
type: "select",
40+
options: [
41+
{ id: "medium", label: "Medium", isDefault: true },
42+
{ id: "high", label: "High" },
43+
],
44+
currentValue: "medium",
45+
},
46+
{
47+
id: "serviceTier",
48+
label: "Service Tier",
49+
type: "select",
50+
options: [
51+
{ id: "default", label: "Standard", isDefault: true },
52+
{ id: "priority", label: "Fast" },
53+
],
54+
currentValue: "default",
55+
},
56+
],
57+
},
2758
selection: {
2859
instanceId: ProviderInstanceId.make("codex"),
2960
model,
@@ -32,6 +63,16 @@ function modelOption(
3263
};
3364
}
3465

66+
beforeEach(() => {
67+
vi.useFakeTimers();
68+
});
69+
70+
afterEach(() => {
71+
vi.clearAllTimers();
72+
vi.useRealTimers();
73+
appAtomRegistry.set(modelOptionMemoryAtom, {});
74+
});
75+
3576
describe("thread settings sheet state", () => {
3677
it("keeps favorites in catalog order ahead of other models", () => {
3778
const models = [
@@ -101,28 +142,68 @@ describe("thread settings sheet state", () => {
101142
).toBeNull();
102143
});
103144

104-
it("preserves staged options when the highlighted model is pressed again", () => {
145+
it("preserves in-progress edits when the staged model is pressed again", () => {
146+
rememberModelOptions("codex", "gpt-next", [{ id: "effort", value: "medium" }]);
105147
const pending = modelOption("gpt-next", [{ id: "effort", value: "high" }]);
106148

107149
expect(
108150
pendingModelAfterPress({
109151
current: pending,
110152
pressed: modelOption("gpt-next"),
111153
pressedIsApplied: false,
112-
}),
113-
).toBe(pending);
154+
restoreSelection: withRememberedModelOptions,
155+
})?.selection.options,
156+
).toEqual([{ id: "effort", value: "high" }]);
157+
});
158+
159+
it("previews remembered options before Save when switching models", () => {
160+
const remembered = [
161+
{ id: "effort", value: "high" },
162+
{ id: "serviceTier", value: "priority" },
163+
];
164+
rememberModelOptions("codex", "gpt-other", remembered);
165+
const pressed = modelOption("gpt-other");
166+
167+
const pending = pendingModelAfterPress({
168+
current: modelOption("gpt-next"),
169+
pressed,
170+
pressedIsApplied: false,
171+
restoreSelection: withRememberedModelOptions,
172+
});
173+
174+
expect(pending?.selection).toEqual({ ...pressed.selection, options: remembered });
175+
const preview = getProviderOptionDescriptors({
176+
caps: pressed.capabilities!,
177+
selections: pending?.selection.options,
178+
});
179+
expect(preview.map(({ id, currentValue }) => ({ id, value: currentValue }))).toEqual(
180+
remembered,
181+
);
182+
expect(pending?.selection).toEqual(withRememberedModelOptions(pressed.selection));
114183
});
115184

116-
it("stages a different model", () => {
185+
it("keeps catalog defaults for scheduled-task picks even when options are remembered", () => {
186+
rememberModelOptions("codex", "gpt-other", [
187+
{ id: "effort", value: "high" },
188+
{ id: "serviceTier", value: "priority" },
189+
]);
117190
const pressed = modelOption("gpt-other");
118191

119-
expect(
120-
pendingModelAfterPress({
121-
current: modelOption("gpt-next"),
122-
pressed,
123-
pressedIsApplied: false,
124-
}),
125-
).toBe(pressed);
192+
const pending = pendingModelAfterPress({
193+
current: modelOption("gpt-next"),
194+
pressed,
195+
pressedIsApplied: false,
196+
});
197+
198+
expect(pending?.selection).toEqual(pressed.selection);
199+
const preview = getProviderOptionDescriptors({
200+
caps: pressed.capabilities!,
201+
selections: pending?.selection.options,
202+
});
203+
expect(preview.map(({ id, currentValue }) => ({ id, value: currentValue }))).toEqual([
204+
{ id: "effort", value: "medium" },
205+
{ id: "serviceTier", value: "default" },
206+
]);
126207
});
127208

128209
it("cannot select a hidden model exposed only for visibility management", () => {

‎apps/mobile/src/features/threads/thread-settings-sheet-state.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
2-
import type { ProviderInstanceId } from "@t3tools/contracts";
2+
import type { ModelSelection, ProviderInstanceId } from "@t3tools/contracts";
33

44
export function modelFavoriteKey(provider: ProviderInstanceId, model: string): string {
55
return `${provider}:${model}`;
@@ -39,11 +39,17 @@ export function pendingModelAfterPress(input: {
3939
readonly current: ModelOption | null;
4040
readonly pressed: ModelOption;
4141
readonly pressedIsApplied: boolean;
42+
readonly restoreSelection?: (selection: ModelSelection) => ModelSelection;
4243
}): ModelOption | null {
4344
if (input.pressedIsApplied) {
4445
return null;
4546
}
46-
return input.current?.key === input.pressed.key ? input.current : input.pressed;
47+
if (input.current?.key === input.pressed.key) {
48+
return input.current;
49+
}
50+
return input.restoreSelection
51+
? { ...input.pressed, selection: input.restoreSelection(input.pressed.selection) }
52+
: input.pressed;
4753
}
4854

4955
export function canCommitPendingModel(

0 commit comments

Comments
 (0)