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, 13:30 UTC
fix(web): retain custom model drafts until saved (#35176)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Alex Southwell committed
Nov 15, 2026 at 04:58 UTC
619c652d2556ebdbb166db3e9f5706774c8b288c
4 files changed
+75
-21
apps/web/src/components/settings/ProviderInstanceCard.tsx
+2
-2
@@ -676,7 +676,7 @@ interface ProviderInstanceCardProps {
676
readonly onSelect?: (() => void) | undefined;
677
readonly readOnly?: boolean | undefined;
678
readonly canWriteSettings?: boolean;
679
- readonly onUpdate: (nextInstance: ProviderInstanceConfig) => void;
679
+ readonly onUpdate: (nextInstance: ProviderInstanceConfig) => Promise<boolean>;
680
readonly onDelete?: (() => void) | undefined;
681
readonly headerAction?: ReactNode | undefined;
682
readonly setup?: ReactNode;
@@ -877,7 +877,7 @@ export function ProviderInstanceCard({
877
next.map(toCustomModelSetting),
878
);
879
const { config: _omit, ...rest } = instance;
880
- onUpdate({ ...rest, config: nextConfig } as ProviderInstanceConfig);
880
+ return onUpdate({ ...rest, config: nextConfig } as ProviderInstanceConfig);
881
});
882
883
const updateEnvironment = (environment: ReadonlyArray<ProviderInstanceEnvironmentVariable>) => {
apps/web/src/components/settings/ProviderModelsSection.browser.test.tsx
+47
-8
@@ -1,12 +1,13 @@
1
import { ProviderDriverKind, ProviderInstanceId } from "@t3tools/contracts";
2
+import type { ComponentProps } from "react";
3
import { expect, it, vi } from "vite-plus/test";
4
+import { userEvent } from "vite-plus/test/browser";
5
4
-import { render } from "../../../test/render";
6
+import { act, render } from "../../../test/render";
7
import { ProviderModelsSection } from "./ProviderModelsSection";
8
7
-it("lists a favorite the provider no longer reports so it can be unstarred", async () => {
8
- const onToggleFavorite = vi.fn();
9
- await using screen = await render(
9
+function section(props: Partial<ComponentProps<typeof ProviderModelsSection>>) {
10
+ return (
11
<ProviderModelsSection
12
instanceId={ProviderInstanceId.make("claude")}
13
driverKind={ProviderDriverKind.make("claude")}
@@ -14,15 +15,53 @@ it("lists a favorite the provider no longer reports so it can be unstarred", asy
15
customModels={[]}
16
canManageCustomModels
17
hiddenModels={[]}
17
- favoriteModels={["retired-model"]}
18
+ favoriteModels={[]}
19
modelOrder={[]}
19
- onChange={() => {}}
20
+ onChange={async () => true}
21
onHiddenModelsChange={() => {}}
22
onFavoriteModelsChange={() => {}}
22
- onToggleFavorite={onToggleFavorite}
23
+ onToggleFavorite={() => {}}
24
onModelOrderChange={() => {}}
24
- />,
25
+ {...props}
26
+ />
27
+ );
28
+}
29
+
30
+it("lists a favorite the provider no longer reports so it can be unstarred", async () => {
31
+ const onToggleFavorite = vi.fn();
32
+ await using screen = await render(
33
+ section({ favoriteModels: ["retired-model"], onToggleFavorite }),
34
);
35
await screen.getByRole("button", { name: "Remove retired-model from favorites" }).click();
36
expect(onToggleFavorite).toHaveBeenCalledWith("retired-model");
37
});
38
+
39
+it("keeps a custom model draft until it saves, so a failed save can be retried", async () => {
40
+ const saves: Array<(saved: boolean) => void> = [];
41
+ const onChange = () => new Promise<boolean>((resolve) => saves.push(resolve));
42
+ await using screen = await render(section({ onChange }));
43
+ const addCustomModel = screen.getByRole("button", { name: "Add custom model" });
44
+ const input = screen.getByRole("textbox");
45
+ const add = screen.getByRole("button", { name: "Add", exact: true });
46
+
47
+ await userEvent.click(addCustomModel);
48
+ await userEvent.type(input, "my-model{Enter}");
49
+ await expect.element(add).toBeDisabled();
50
+ await userEvent.keyboard("{Enter}");
51
+ expect(saves).toHaveLength(1);
52
+ await act(() => saves[0]!(false));
53
+ await expect.element(add).toBeEnabled();
54
+ await expect.element(input).toHaveValue("my-model");
55
+
56
+ await userEvent.click(add);
57
+ await act(() => saves[1]!(true));
58
+ await expect.element(input).not.toBeInTheDocument();
59
+
60
+ // A save the user cancelled must not close the draft opened after it.
61
+ await userEvent.click(addCustomModel);
62
+ await userEvent.type(input, "other-model{Enter}");
63
+ await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
64
+ await userEvent.click(addCustomModel);
65
+ await act(() => saves[2]!(true));
66
+ await expect.element(add).toBeEnabled();
67
+});
apps/web/src/components/settings/ProviderModelsSection.tsx
+22
-8
@@ -109,7 +109,8 @@ interface ProviderModelsSectionProps {
109
readonly hiddenModels: ReadonlyArray<string>;
110
readonly favoriteModels: ReadonlyArray<string>;
111
readonly modelOrder: ReadonlyArray<string>;
112
- readonly onChange: (next: ReadonlyArray<CustomModelDefinition>) => void;
112
+ /** Resolves true once the custom models are saved. */
113
+ readonly onChange: (next: ReadonlyArray<CustomModelDefinition>) => Promise<boolean>;
114
readonly onHiddenModelsChange: (
115
next: ReadonlyArray<string>,
116
affectedModels: ReadonlyArray<string>,
@@ -137,6 +138,8 @@ export function ProviderModelsSection({
138
}: ProviderModelsSectionProps) {
139
const [input, setInput] = useState("");
140
const [isAdding, setIsAdding] = useState(false);
141
+ const [isSaving, setIsSaving] = useState(false);
142
+ const addAttemptRef = useRef(0);
143
const [filter, setFilter] = useState("");
144
const [error, setError] = useState<string | null>(null);
145
const [editingSlug, setEditingSlug] = useState<string | null>(null);
@@ -189,8 +192,8 @@ export function ProviderModelsSection({
192
const allBuiltInModelsHidden =
193
builtInModels.length > 0 && builtInModels.every((model) => hiddenModels.includes(model.slug));
194
192
- const handleAdd = () => {
193
- if (!canManageCustomModels || driverKind === "antigravity") return;
195
+ const handleAdd = async () => {
196
+ if (!canManageCustomModels || driverKind === "antigravity" || isSaving) return;
197
const normalized = normalizeCustomModelSlug(input);
198
if (!normalized) {
199
setError("Enter a model slug.");
@@ -209,15 +212,25 @@ export function ProviderModelsSection({
212
return;
213
}
214
215
+ addAttemptRef.current += 1;
216
+ const attempt = addAttemptRef.current;
217
+ setIsSaving(true);
218
+ const saved = await onChange([
219
+ ...customModels,
220
+ { slug: normalized, name: normalized, capabilities: null },
221
+ ]);
222
+ setIsSaving(false);
223
+ // Cancel bumps the attempt, so a late save cannot close the draft opened after it.
224
+ if (!saved || attempt !== addAttemptRef.current) return;
225
scrollToSlugRef.current = normalized;
226
setFilter("");
214
- onChange([...customModels, { slug: normalized, name: normalized, capabilities: null }]);
227
setInput("");
228
setError(null);
229
setIsAdding(false);
230
};
231
232
const cancelAdd = () => {
233
+ addAttemptRef.current += 1;
234
setInput("");
235
setError(null);
236
setIsAdding(false);
@@ -226,7 +239,7 @@ export function ProviderModelsSection({
239
const handleRemove = (slug: string) => {
240
if (!canManageCustomModels) return;
241
if (editingSlug === slug) setEditingSlug(null);
229
- onChange(customModels.filter((entry) => entry.slug !== slug));
242
+ void onChange(customModels.filter((entry) => entry.slug !== slug));
243
onModelOrderChange(modelOrder.filter((model) => model !== slug));
244
onFavoriteModelsChange(favoriteModels.filter((model) => model !== slug));
245
setError(null);
@@ -234,7 +247,7 @@ export function ProviderModelsSection({
247
248
const handleSaveEdit = (next: CustomModelDefinition) => {
249
if (!canManageCustomModels) return;
237
- onChange(customModels.map((entry) => (entry.slug === next.slug ? next : entry)));
250
+ void onChange(customModels.map((entry) => (entry.slug === next.slug ? next : entry)));
251
setEditingSlug(null);
252
};
253
@@ -411,6 +424,7 @@ export function ProviderModelsSection({
424
id={`provider-instance-${instanceId}-custom-model`}
425
size="sm"
426
autoFocus
427
+ readOnly={isSaving}
428
value={input}
429
onChange={(event) => {
430
setInput(event.target.value);
@@ -424,13 +438,13 @@ export function ProviderModelsSection({
438
}
439
if (event.key !== "Enter") return;
440
event.preventDefault();
427
- handleAdd();
441
+ void handleAdd();
442
}}
443
placeholder={driverKind ? CUSTOM_MODEL_PLACEHOLDER_BY_KIND[driverKind] : "model-slug"}
444
spellCheck={false}
445
/>
446
<div className="flex shrink-0 gap-2">
433
- <Button size="sm" variant="outline" onClick={handleAdd}>
447
+ <Button size="sm" variant="outline" disabled={isSaving} onClick={handleAdd}>
448
Add
449
</Button>
450
<Button size="sm" variant="ghost" onClick={cancelAdd}>
apps/web/src/components/settings/ProviderSettingsPanel.tsx
+4
-3
@@ -808,6 +808,7 @@ export function EnvironmentProviderSettings({
808
description: error instanceof Error ? error.message : "The settings update failed.",
809
});
810
}
811
+ return result._tag !== "Failure";
812
};
813
814
const updateInstance = useStableCallback(
@@ -821,7 +822,7 @@ export function EnvironmentProviderSettings({
822
isDisabling &&
823
resolveAppModelSelectionState(settings, serverProviders).instanceId === instanceId &&
824
readEnvironmentScope(environmentId, AuthSettingsWriteScope);
824
- void persistInstance(
825
+ return persistInstance(
826
instanceId,
827
next,
828
shouldClearTextGen ? DEFAULT_UNIFIED_SETTINGS.textGenerationModelSelection : undefined,
@@ -1197,11 +1198,11 @@ interface ProviderInstanceRowActions {
1198
instanceId: ProviderInstanceId,
1199
previous: ProviderInstanceConfig,
1200
next: ProviderInstanceConfig,
1200
- ) => void;
1201
+ ) => Promise<boolean>;
1202
readonly enableInstance: (
1203
instanceId: ProviderInstanceId,
1204
next: ProviderInstanceConfig,
1204
- ) => Promise<void>;
1205
+ ) => Promise<boolean>;
1206
readonly deleteInstance: (
1207
instanceId: ProviderInstanceId,
1208
instance: ProviderInstanceConfig,