Skip to content

Commit 8f4447c

Browse files
juliusmarmingejuliusmarminge
committed
fix(web): preserve custom model options when editing
1 parent 6c7e664 commit 8f4447c

3 files changed

Lines changed: 111 additions & 37 deletions

File tree

‎apps/web/src/components/settings/CustomModelEditor.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ export function CustomModelEditor({
119119
label: preset.label,
120120
type: preset.type,
121121
choices: (preset.choices ?? []).map(choiceFromPreset),
122+
currentBooleanValue: undefined,
122123
});
123124
};
124125

@@ -129,7 +130,7 @@ export function CustomModelEditor({
129130
setError(null);
130131
setDraft((current) => ({
131132
...current,
132-
descriptors: descriptorsFromCapabilities(model.capabilities),
133+
descriptors: descriptorsFromCapabilities(model.capabilities, driverKind),
133134
}));
134135
};
135136

‎apps/web/src/components/settings/customModelEditor.logic.test.ts‎

Lines changed: 92 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { describe, expect, it } from "vite-plus/test";
2+
import { ProviderDriverKind, type ModelCapabilities } from "@t3tools/contracts";
23

34
import {
5+
DESCRIPTOR_PRESETS_BY_KIND,
6+
descriptorFromPreset,
47
definitionFromDraft,
58
descriptorsFromCapabilities,
69
draftFromDefinition,
@@ -69,42 +72,107 @@ describe("customModelEditor.logic", () => {
6972
});
7073

7174
it("preserves the current choice when it differs from the built-in default", () => {
72-
const descriptors = descriptorsFromCapabilities({
73-
optionDescriptors: [
74-
{
75-
id: "effort",
76-
label: "Reasoning",
77-
type: "select",
78-
currentValue: "high",
79-
options: [
80-
{ id: "low", label: "Low", isDefault: true },
81-
{ id: "high", label: "High" },
82-
],
83-
},
84-
],
85-
});
75+
const descriptors = descriptorsFromCapabilities(
76+
{
77+
optionDescriptors: [
78+
{
79+
id: "effort",
80+
label: "Reasoning",
81+
type: "select",
82+
currentValue: "high",
83+
options: [
84+
{ id: "low", label: "Low", isDefault: true },
85+
{ id: "high", label: "High" },
86+
],
87+
},
88+
],
89+
},
90+
ProviderDriverKind.make("claudeAgent"),
91+
);
8692
expect(descriptors[0]!.choices.map((choice) => choice.isDefault)).toEqual([false, true]);
8793
expect(
8894
definitionFromDraft(draft({ descriptors })).capabilities?.optionDescriptors?.[0],
8995
).toMatchObject({ currentValue: "high" });
9096
});
9197

9298
it("drops prompt-injected choices when copying a built-in's descriptors", () => {
93-
const [copied] = descriptorsFromCapabilities({
99+
const [copied] = descriptorsFromCapabilities(
100+
{
101+
optionDescriptors: [
102+
{
103+
id: "effort",
104+
label: "Reasoning",
105+
type: "select",
106+
options: [
107+
{ id: "high", label: "High", isDefault: true },
108+
{ id: "ultrathink", label: "Ultrathink" },
109+
],
110+
promptInjectedValues: ["ultrathink"],
111+
},
112+
],
113+
},
114+
ProviderDriverKind.make("claudeAgent"),
115+
);
116+
expect(copied!.choices.map((choice) => choice.id)).toEqual(["high"]);
117+
});
118+
119+
it.each([true, false, undefined])(
120+
"preserves boolean values through copy and edit: %s",
121+
(currentValue) => {
122+
const capabilities: ModelCapabilities = {
123+
optionDescriptors: [
124+
{
125+
id: "thinking",
126+
label: "Thinking",
127+
type: "boolean",
128+
...(currentValue !== undefined ? { currentValue } : {}),
129+
},
130+
],
131+
};
132+
const copied = definitionFromDraft(
133+
draft({
134+
descriptors: descriptorsFromCapabilities(capabilities, ProviderDriverKind.make("cursor")),
135+
}),
136+
);
137+
expect(copied.capabilities).toEqual(capabilities);
138+
const reopened = draftFromDefinition(copied);
139+
expect(definitionFromDraft({ ...reopened, name: "Renamed" }).capabilities).toEqual(
140+
capabilities,
141+
);
142+
},
143+
);
144+
145+
it("excludes Claude context choices from presets and copies without changing other providers or authored entries", () => {
146+
const capabilities: ModelCapabilities = {
94147
optionDescriptors: [
95148
{
96-
id: "effort",
97-
label: "Reasoning",
149+
id: "contextWindow",
150+
label: "Context",
98151
type: "select",
99-
options: [
100-
{ id: "high", label: "High", isDefault: true },
101-
{ id: "ultrathink", label: "Ultrathink" },
102-
],
103-
promptInjectedValues: ["ultrathink"],
152+
options: [{ id: "1m", label: "1M", isDefault: true }],
104153
},
154+
{ id: "thinking", label: "Thinking", type: "boolean", currentValue: true },
105155
],
106-
});
107-
expect(copied!.choices.map((choice) => choice.id)).toEqual(["high"]);
156+
};
157+
const claude = ProviderDriverKind.make("claudeAgent");
158+
const copied = definitionFromDraft(
159+
draft({ descriptors: descriptorsFromCapabilities(capabilities, claude) }),
160+
);
161+
expect(copied.capabilities?.optionDescriptors).toEqual([capabilities.optionDescriptors![1]]);
162+
const presets = definitionFromDraft(
163+
draft({
164+
descriptors: (DESCRIPTOR_PRESETS_BY_KIND[claude] ?? []).map(descriptorFromPreset),
165+
}),
166+
);
167+
expect(
168+
presets.capabilities?.optionDescriptors?.some((option) => option.id === "contextWindow"),
169+
).toBe(false);
170+
const cursorCopy = descriptorsFromCapabilities(capabilities, ProviderDriverKind.make("cursor"));
171+
expect(cursorCopy.map((option) => option.id)).toEqual(["contextWindow", "thinking"]);
172+
const authored = { slug: "custom", name: "Custom", capabilities };
173+
expect(
174+
definitionFromDraft(draftFromDefinition(authored)).capabilities?.optionDescriptors?.[0],
175+
).toMatchObject(capabilities.optionDescriptors![0]!);
108176
});
109177

110178
it("collapses a blank name and no options back to a bare definition", () => {

‎apps/web/src/components/settings/customModelEditor.logic.ts‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export interface EditorDescriptor {
2020
readonly id: string;
2121
readonly label: string;
2222
readonly choices: ReadonlyArray<EditorChoice>;
23+
readonly currentBooleanValue?: boolean | undefined;
2324
}
2425

2526
export interface CustomModelDraft {
@@ -77,15 +78,6 @@ export const DESCRIPTOR_PRESETS_BY_KIND: Partial<
7778
},
7879
{ id: "fastMode", label: "Fast Mode", type: "boolean" },
7980
{ id: "thinking", label: "Thinking", type: "boolean" },
80-
{
81-
id: "contextWindow",
82-
label: "Context Window",
83-
type: "select",
84-
choices: [
85-
{ id: "200k", label: "200k", isDefault: true },
86-
{ id: "1m", label: "1M" },
87-
],
88-
},
8981
],
9082
[ProviderDriverKind.make("cursor")]: [
9183
{ id: "reasoning", label: "Reasoning", type: "select", choices: EFFORT_CHOICES },
@@ -163,6 +155,9 @@ export function descriptorToEditor(descriptor: ProviderOptionDescriptor): Editor
163155
type: descriptor.type,
164156
id: descriptor.id,
165157
label: descriptor.label,
158+
...(descriptor.type === "boolean" && descriptor.currentValue !== undefined
159+
? { currentBooleanValue: descriptor.currentValue }
160+
: {}),
166161
choices: choices.map((option) => ({
167162
key: newEditorKey(),
168163
id: option.id,
@@ -180,11 +175,14 @@ export function draftFromDefinition(entry: CustomModelDefinition): CustomModelDr
180175
};
181176
}
182177

183-
/** Descriptor list copied from another model, e.g. a built-in "start from". */
178+
/** Claude context choices require runtime suffix mappings that custom entries do not carry. */
184179
export function descriptorsFromCapabilities(
185180
capabilities: ModelCapabilities | null | undefined,
181+
driverKind: ProviderDriverKind | null,
186182
): EditorDescriptor[] {
187-
return (capabilities?.optionDescriptors ?? []).map(descriptorToEditor);
183+
return (capabilities?.optionDescriptors ?? [])
184+
.filter((descriptor) => driverKind !== "claudeAgent" || descriptor.id !== "contextWindow")
185+
.map(descriptorToEditor);
188186
}
189187

190188
/**
@@ -221,7 +219,14 @@ export function definitionFromDraft(draft: CustomModelDraft): CustomModelDefinit
221219
const id = descriptor.id.trim();
222220
const label = descriptor.label.trim();
223221
if (descriptor.type === "boolean") {
224-
return { id, label, type: "boolean" };
222+
return {
223+
id,
224+
label,
225+
type: "boolean",
226+
...(descriptor.currentBooleanValue !== undefined
227+
? { currentValue: descriptor.currentBooleanValue }
228+
: {}),
229+
};
225230
}
226231
const options = descriptor.choices.map((choice) => ({
227232
id: choice.id.trim(),

0 commit comments

Comments
 (0)