Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(desktop): show model names alongside routing IDs
  • Loading branch information
SivanCola committed Nov 3, 2026
commit 2959adad1dac3cc298d1c6f03cdb371307f05da7
10 changes: 10 additions & 0 deletions desktop/frontend/src/__tests__/model-switcher-refresh.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@ await act(async () => {
});
const magpieLabel = document.querySelector(".modelsw__model");
if (magpieLabel?.textContent !== "DeepSeek V4 Pro (New) · OpenCode Go" || magpieLabel.getAttribute("title") !== "opencode-go/deepseek-v4-pro") throw new Error("gateway label lost or routing ID changed");
if (document.querySelector(".modelsw__meta")?.textContent !== "opencode-go/deepseek-v4-pro · Magpie") throw new Error("friendly model name hid the routing ID or connection");
for (const selector of ['.modelsw__rail-item[aria-label="Magpie"]', '[role="option"]']) {
if (!document.querySelector(`${selector} .modelsw__provider-icon`)?.getAttribute("style")?.includes("magpie.svg")) {
throw new Error(`Magpie official icon missing from ${selector}`);
Expand All @@ -493,11 +494,20 @@ await act(async () => {
magpieSearch.dispatchEvent(new dom.window.Event("input", { bubbles: true }));
});
if (document.querySelectorAll("[role='option']").length !== 1) throw new Error("friendly gateway labels are not searchable");
for (const query of ["opencode-go/deepseek-v4-pro", "Magpie"]) {
await act(async () => {
Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, "value")!.set!.call(magpieSearch, query);
magpieSearch.dispatchEvent(new dom.window.Event("input", { bubbles: true }));
});
if (document.querySelectorAll("[role='option']").length !== 1) throw new Error(`model ID or connection search failed: ${query}`);
}
await act(async () => {
(document.querySelector("[role='option']") as HTMLButtonElement).click();
await new Promise(resolve => setTimeout(resolve, 0));
});
if (picked.at(-1) !== "magpie-fixture/opencode-go/deepseek-v4-pro") throw new Error("picker sent a display label instead of the stable routing ref");
if (document.querySelector(".modelsw__label")?.textContent !== "DeepSeek V4 Pro (New) · OpenCode Go") throw new Error("selected model trigger lost its friendly name");
if (!document.querySelector(".modelsw__trigger")?.getAttribute("aria-label")?.includes("opencode-go/deepseek-v4-pro")) throw new Error("selected model tooltip hid the routing ID");

// Brand metadata survives renamed connections and takes precedence over vendor
// names. Legacy catalogs still recognize Magpie aliases and exact display names.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import assert from "node:assert/strict";
import { JSDOM } from "jsdom";
import React, { act } from "react";
import type { ProviderView } from "../lib/types";

const dom = new JSDOM('<div id="root"></div>', { url: "http://localhost", pretendToBeVisual: true });
Object.assign(globalThis, {
window: dom.window, document: dom.window.document, localStorage: dom.window.localStorage,
requestAnimationFrame: dom.window.requestAnimationFrame.bind(dom.window),
cancelAnimationFrame: dom.window.cancelAnimationFrame.bind(dom.window), IS_REACT_ACT_ENVIRONMENT: true,
});
const { createRoot } = await import("react-dom/client");
const { ProviderEditor } = await import("../components/SettingsPanel");
const { LocaleProvider } = await import("../lib/i18n");
const { installDesktopHostStub } = await import("./desktopHostStub");
installDesktopHostStub({ FetchProviderModelCatalog: async () => [
{ model: "deepseek-flash", displayName: "DeepSeek-V4.1-Flash", inputModalities: ["text", "image"] },
{ model: "deepseek-v4-pro", displayName: "DeepSeek-V4-Pro", inputModalities: ["text"] },
] });
const initial = {
name: "deepseek-test", kind: "openai", baseUrl: "https://api.deepseek.com/v1",
requestUrl: "https://api.deepseek.com/v1/chat/completions", models: ["deepseek-flash"], default: "deepseek-flash",
apiKeyEnv: "TEST_KEY", keySet: true, added: true, builtIn: false, visionModels: [], supportedEfforts: [],
modelsUrl: "", balanceUrl: "", contextWindow: 1000000,
} as ProviderView;
const saved: ProviderView[] = [];
const root = createRoot(document.getElementById("root")!);
await act(async () => root.render(<LocaleProvider><ProviderEditor initial={initial} kinds={["openai"]} busy={false}
onCancel={() => {}} onSave={async (value) => { saved.push(value); }} /></LocaleProvider>));
assert.match(document.querySelector(".provider-model-draft__option")!.textContent!, /deepseek-flash/);
await act(async () => {
(document.querySelector(".provider-model-toolbar button") as HTMLButtonElement).click();
await new Promise(resolve => setTimeout(resolve, 20));
});
const flash = [...document.querySelectorAll(".provider-model-draft__option")]
.find(row => row.textContent?.includes("DeepSeek-V4.1-Flash"))!;
assert.ok(flash, "refresh shows the official friendly name");
assert.equal(flash.querySelector("span[title]")?.getAttribute("title"), "deepseek-flash");
assert.equal(flash.querySelector(".provider-model-draft__id")?.textContent, "ID: deepseek-flash");
assert.equal(flash.querySelector("input")!.checked, true);
assert.equal(saved.length, 0, "refresh does not save or change the active connection");
await act(async () => {
const save = document.querySelector<HTMLButtonElement>(".provider-editor-footer .btn--primary")!;
assert.equal(save.disabled, false);
save.click();
});
assert.equal(saved.length, 1);
assert.deepEqual(saved[0].models, ["deepseek-flash"]);
assert.equal(saved[0].default, "deepseek-flash");
assert.equal(saved[0].kind, "openai");
assert.equal(saved[0].baseUrl, initial.baseUrl);
assert.equal(saved[0].requestUrl, initial.requestUrl);
console.log("PASS: DeepSeek refresh changes the label only; saved model=deepseek-flash, protocol=openai, endpoint=/v1/chat/completions");
await act(async () => root.unmount());
dom.window.close();
21 changes: 12 additions & 9 deletions desktop/frontend/src/components/ModelSwitcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,11 @@ export function ModelSwitcher({
].filter((group) => group.items.length > 0);
}, [activeFilter, favorites, filtered, providers, t]);

const currentProvider = useMemo(() => {
const cur = models.find((m) => m.current) ?? models.find((m) => m.model === label || m.ref === label);
return cur ? (cur.displayName?.trim() || providerLabel(cur.provider, t)) : null;
}, [label, models, t]);
const triggerLabel = [label, currentProvider, detailLabel].filter(Boolean).join(" · ");
const currentModel = useMemo(() => models.find((m) => m.current)
?? models.find((m) => m.model === label || m.ref === label), [label, models]);
const currentProvider = currentModel ? (currentModel.displayName?.trim() || providerLabel(currentModel.provider, t)) : null;
const displayLabel = currentModel?.modelDisplayName?.trim() || label;
const triggerLabel = [displayLabel, currentModel && displayLabel !== currentModel.model ? currentModel.model : null, currentProvider, detailLabel].filter(Boolean).join(" · ");

const toggleFavorite = (ref: string) => {
setFavorites((current) => {
Expand Down Expand Up @@ -227,7 +227,7 @@ export function ModelSwitcher({
onClick={() => setOpen((v) => !v)}
>
<Cpu size={14} className="modelsw__kind" />
<span className="modelsw__label">{label}{detailLabel && <span className="modelsw__detail"> · {detailLabel}</span>}{application?.application==="pending" && <span className="modelsw__detail"> · {t("modelApply.badge")}</span>}</span>
<span className="modelsw__label">{displayLabel}{detailLabel && <span className="modelsw__detail"> · {detailLabel}</span>}{application?.application==="pending" && <span className="modelsw__detail"> · {t("modelApply.badge")}</span>}</span>
<ChevronDown size={12} />
</button>
</Tooltip>
Expand Down Expand Up @@ -284,6 +284,7 @@ export function ModelSwitcher({
<div className="modelsw__group-label" role="presentation">{g.label}</div>
{g.items.map((m) => {
const favorite = favorites.has(m.ref);
const meta = modelMeta(m, t);
const favoriteLabel = t(favorite ? "modelSwitcher.removeFavorite" : "modelSwitcher.addFavorite", { model: m.model });
return (
<div className="modelsw__row" key={m.ref}>
Expand All @@ -296,8 +297,8 @@ export function ModelSwitcher({
>
<ProviderMark provider={m.provider} label={m.displayName?.trim() || providerLabel(m.provider, t)} brandId={m.brandId} />
<span className="modelsw__copy">
<span className="modelsw__model" title={m.model}>{m.modelDisplayName || m.model}</span>
<span className="modelsw__meta">{modelMeta(m, t)}</span>
<span className="modelsw__model" title={m.model}>{m.modelDisplayName?.trim() || m.model}</span>
<span className="modelsw__meta" title={meta}>{meta}</span>
</span>
{m.contextWindow ? <span className="badge badge--neutral">{formatTokens(m.contextWindow)}</span> : null}
{m.vision && <span className="modelsw__capability" title={t("providerUI.image")}><Image size={13} aria-hidden="true" /><span>{t("providerUI.image")}</span></span>}
Expand Down Expand Up @@ -340,7 +341,9 @@ function providerLabel(provider: string, t: ReturnType<typeof useT>): string {

function modelMeta(model: ModelInfo, t: ReturnType<typeof useT>): string {
const provider = model.displayName?.trim() || providerLabel(model.provider, t);
return model.current ? `${provider} · ${t("modelSwitcher.currentModel")}` : provider;
const name = model.modelDisplayName?.trim();
return [name && name !== model.model ? model.model : null, provider, model.current ? t("modelSwitcher.currentModel") : null]
.filter(Boolean).join(" · ");
}

function ProviderMark({ provider, label, brandId }: { provider: string; label: string; brandId?: string }) {
Expand Down
2 changes: 1 addition & 1 deletion desktop/frontend/src/components/ProviderConnections.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
.provider-model-draft--inline .provider-model-draft__option { flex-wrap: nowrap; min-height: 56px; box-sizing: border-box; padding: 8px 12px; border: 0; border-bottom: 1px solid var(--border); border-radius: 0; background: transparent; font-family: var(--font-sans); font-size: var(--font-control); }
.provider-model-draft--inline .provider-model-draft__option:last-child { border-bottom: 0; }
.provider-model-draft--inline .provider-model-draft__model { display: flex; align-items: center; min-width: 0; gap: 12px; }
.provider-model-draft--inline .provider-model-draft__model span { min-width: 0; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; overflow-wrap: anywhere; }
.provider-model-draft--inline .provider-model-draft__name { min-width: 0; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; overflow-wrap: anywhere; }
.provider-model-draft--inline input[type="checkbox"] { accent-color: var(--accent); width: 16px; height: 16px; }
.provider-context-badge { flex-shrink: 0; padding: 4px 8px; border: 1px solid var(--border); border-radius: 6px; color: var(--fg-faint); font-size: var(--font-control-small); }
.provider-editor--compact .provider-capabilities { padding: 0; }
Expand Down
6 changes: 5 additions & 1 deletion desktop/frontend/src/components/SettingsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3594,6 +3594,7 @@ export const ProviderEditorModelPicker = memo(function ProviderEditorModelPicker
<div className="provider-model-draft__list" role="list" aria-label={t("settings.modelList")}>
{deferredCandidates.length > 0 ? deferredCandidates.map((model) => {
const enabled = selected.has(model);
const displayName = modelCapabilities.find(item => item.model === model)?.displayName?.trim();
const capability = providerModelVisionCapability(
{modelCapabilities},
model,
Expand All @@ -3608,7 +3609,10 @@ export const ProviderEditorModelPicker = memo(function ProviderEditorModelPicker
disabled={disabled}
onChange={() => onToggleModel(model)}
/>
<span title={model}>{modelCapabilities.find(item => item.model === model)?.displayName || model}</span>
<span className="provider-model-draft__identity">
<span className="provider-model-draft__name" title={model}>{displayName || model}</span>
{displayName && displayName !== model && <code className="provider-model-draft__id">ID: {model}</code>}
</span>
{conversationModel === model && <small className="provider-conversation-model">{t("onboarding.conversationModel")}</small>}
</label>
<div className="provider-model-draft__capabilities" aria-label={t("settings.modelCapabilitiesAria", { model })}>
Expand Down
12 changes: 7 additions & 5 deletions desktop/frontend/src/lib/bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1884,8 +1884,8 @@ function makeMockApp(): MockAppBindings {
}, 800);
}
const mockModelCatalog = [
{ ref: "deepseek/deepseek-v4-flash", provider: "deepseek", model: "deepseek-v4-flash" },
{ ref: "deepseek/deepseek-v4-pro", provider: "deepseek", model: "deepseek-v4-pro" },
{ ref: "deepseek/deepseek-v4-flash", provider: "deepseek", model: "deepseek-v4-flash", modelDisplayName: "DeepSeek-V4.1-Flash" },
{ ref: "deepseek/deepseek-v4-pro", provider: "deepseek", model: "deepseek-v4-pro", modelDisplayName: "DeepSeek-V4-Pro" },
];
const defaultMockModelRef = mockModelCatalog[0].ref;
const mockModelRef = (name: string): string => {
Expand Down Expand Up @@ -4158,14 +4158,16 @@ function makeMockApp(): MockAppBindings {
if (!p.baseUrl.trim()) throw new Error(t("settings.fetchModelsMissingBaseUrl"));
if (providerRequiresKey(p) && !p.apiKeyEnv.trim()) throw new Error(t("settings.fetchModelsMissingKeyEnv"));
await delay(350);
const models = p.baseUrl.includes("deepseek") ? ["deepseek-v4-flash","deepseek-v4-pro"]
const deepSeek = p.baseUrl.includes("deepseek");
const models = deepSeek ? ["deepseek-flash","deepseek-v4-pro"]
: p.baseUrl.includes("token-plan") ? ["mimo-v2.5","mimo-v2.5-pro"]
: p.baseUrl.includes("xiaomimimo") ? ["mimo-v2.5-pro","mimo-v2.5"]
: ["gpt-5","gpt-5-mini","qwen3-coder"];
return models.map((model) => ({
model,
inputModalities: p.modelCapabilities?.find((item) => item.model === model)?.inputModalities ?? [],
state: p.modelCapabilities?.find((item) => item.model === model)?.state ?? "unknown",
displayName: deepSeek ? model === "deepseek-flash" ? "DeepSeek-V4.1-Flash" : "DeepSeek-V4-Pro" : undefined,
inputModalities: deepSeek ? model === "deepseek-flash" ? ["text", "image"] : ["text"] : p.modelCapabilities?.find((item) => item.model === model)?.inputModalities ?? [],
state: deepSeek ? model === "deepseek-flash" ? "supported" : "unsupported" : p.modelCapabilities?.find((item) => item.model === model)?.state ?? "unknown",
source: "adapter",
}));
},
Expand Down
15 changes: 15 additions & 0 deletions desktop/frontend/src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -17416,6 +17416,21 @@ body > .mermaid-diagram--fullscreen {
.provider-model-draft__model input {
accent-color: var(--accent);
}
.provider-model-draft__identity {
display: flex;
flex-direction: column;
min-width: 0;
gap: 3px;
}
.provider-model-draft__id {
color: var(--fg-faint);
font-family: var(--mono);
font-size: var(--font-control-small);
font-weight: 400;
line-height: 1.4;
white-space: normal;
overflow-wrap: anywhere;
}
.provider-model-draft__context {
min-width: 0;
display: grid;
Expand Down
Loading