Skip to content

Commit e259111

Browse files
vinkyliclaude
andcommitted
fix(server): picker labels rename bundled Claude models
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 7a52752 commit e259111

2 files changed

Lines changed: 30 additions & 16 deletions

File tree

‎apps/server/src/provider/ClaudeModelPicker.test.ts‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { applyClaudeModelPicker, readClaudeModelPicker } from "./ClaudeModelPick
1111
const builtIn = (slug: string): ServerProviderModel => ({
1212
slug,
1313
name: `Built-in ${slug}`,
14+
shortName: `Short ${slug}`,
1415
isCustom: false,
1516
capabilities: createModelCapabilities({ optionDescriptors: [] }),
1617
});
@@ -25,14 +26,15 @@ const writeSettings = Effect.fn(function* (settings: string) {
2526
});
2627

2728
it.layer(NodeServices.layer)("Claude modelPicker", (it) => {
28-
it.effect("lists picker rows first and keeps bundled models' own controls", () =>
29+
it.effect("lists picker rows first and keeps bundled models' controls under their label", () =>
2930
Effect.gen(function* () {
3031
const claudeSettings = yield* writeSettings(
3132
JSON.stringify({
3233
modelPicker: {
3334
options: [
3435
{ model: "deepseek/deepseek-v4-pro", label: "DeepSeek V4 Pro" },
35-
{ model: "claude-other", label: "ignored for bundled models" },
36+
{ model: "claude-other", label: "Work Claude" },
37+
{ model: "claude-known" },
3638
{ model: "kimi/kimi-k2.6" },
3739
{ model: "deepseek/deepseek-v4-pro", label: "duplicate" },
3840
{ model: " " },
@@ -49,12 +51,14 @@ it.layer(NodeServices.layer)("Claude modelPicker", (it) => {
4951
models.map((model) => [model.slug, model.name, model.isCustom]),
5052
[
5153
["deepseek/deepseek-v4-pro", "DeepSeek V4 Pro", false],
52-
["claude-other", "Built-in claude-other", false],
53-
["kimi/kimi-k2.6", "kimi/kimi-k2.6", false],
54+
["claude-other", "Work Claude", false],
5455
["claude-known", "Built-in claude-known", false],
56+
["kimi/kimi-k2.6", "kimi/kimi-k2.6", false],
5557
],
5658
);
57-
assert.strictEqual(models[1], builtInModels[1]);
59+
assert.strictEqual(models[1]?.capabilities, builtInModels[1]?.capabilities);
60+
assert.isUndefined(models[1]?.shortName);
61+
assert.strictEqual(models[2], builtInModels[0]);
5862
assert.isNull(models[0]?.capabilities);
5963
}),
6064
);
@@ -82,10 +86,15 @@ it.layer(NodeServices.layer)("Claude modelPicker", (it) => {
8286
it.effect("leaves the built-in list alone without a usable modelPicker", () =>
8387
Effect.gen(function* () {
8488
const malformed = yield* writeSettings("{ modelPicker: { options: 'nope' }, }");
89+
const unusableRows = yield* writeSettings(
90+
JSON.stringify({
91+
modelPicker: { replaceBuiltInOptions: true, options: [{ model: " " }, { label: "x" }] },
92+
}),
93+
);
8594
const absent = yield* writeSettings("{}");
8695
const missing = { homePath: `${absent.homePath}/missing` };
8796

88-
for (const claudeSettings of [malformed, absent, missing]) {
97+
for (const claudeSettings of [malformed, unusableRows, absent, missing]) {
8998
const picker = yield* readClaudeModelPicker(claudeSettings, {});
9099
assert.strictEqual(applyClaudeModelPicker(builtInModels, picker), builtInModels);
91100
}

‎apps/server/src/provider/ClaudeModelPicker.ts‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ const decodeModelPickerRow = Schema.decodeUnknownOption(ModelPickerRow);
3030

3131
export interface ClaudeModelPicker {
3232
readonly replaceBuiltInOptions: boolean;
33-
/** Display names keyed by model id, in picker order. */
34-
readonly names: ReadonlyMap<string, string>;
33+
/** Configured labels keyed by model id, in picker order. */
34+
readonly labels: ReadonlyMap<string, string | undefined>;
3535
}
3636

3737
// Claude Code ignores a project checkout's `modelPicker`, and the highest source
@@ -59,13 +59,15 @@ export const readClaudeModelPicker = Effect.fn("readClaudeModelPicker")(function
5959
))?.modelPicker;
6060
if (!picker) continue;
6161

62-
const names = new Map<string, string>();
62+
const labels = new Map<string, string | undefined>();
6363
for (const option of picker.options) {
6464
const row = Option.getOrUndefined(decodeModelPickerRow(option));
6565
const slug = row?.model.trim();
66-
if (row && slug && !names.has(slug)) names.set(slug, row.label?.trim() || slug);
66+
if (row && slug && !labels.has(slug)) labels.set(slug, row.label?.trim() || undefined);
6767
}
68-
return { replaceBuiltInOptions: picker.replaceBuiltInOptions === true, names };
68+
return labels.size === 0
69+
? undefined
70+
: { replaceBuiltInOptions: picker.replaceBuiltInOptions === true, labels };
6971
}
7072
return undefined;
7173
});
@@ -78,11 +80,14 @@ export function applyClaudeModelPicker(
7880
const builtInBySlug = new Map(builtInModels.map((model) => [model.slug, model]));
7981
// Rows naming a bundled model keep its effort and context controls. Any other
8082
// id goes to Claude Code verbatim with no controls, like a custom model.
81-
const listed = [...picker.names].map(
82-
([slug, name]): ServerProviderModel =>
83-
builtInBySlug.get(slug) ?? { slug, name, isCustom: false, capabilities: null },
84-
);
83+
const listed = [...picker.labels].map(([slug, label]): ServerProviderModel => {
84+
const builtIn = builtInBySlug.get(slug);
85+
if (!builtIn) return { slug, name: label ?? slug, isCustom: false, capabilities: null };
86+
if (!label) return builtIn;
87+
const { shortName: _shortName, ...rest } = builtIn;
88+
return { ...rest, name: label };
89+
});
8590
return picker.replaceBuiltInOptions
8691
? listed
87-
: [...listed, ...builtInModels.filter((model) => !picker.names.has(model.slug))];
92+
: [...listed, ...builtInModels.filter((model) => !picker.labels.has(model.slug))];
8893
}

0 commit comments

Comments
 (0)