Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
14 changes: 8 additions & 6 deletions desktop/renderer/src/components/CascadingModelMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,12 @@
<script setup lang="ts">
import { computed, nextTick, ref, useId, watch } from "vue";
import { t } from "@/i18n";
import { getModelRef, providerName, type ConfiguredModel } from "@/utils/configured-models";
import { sortModelsByFamily } from "@/utils/model-family-sort";
import { getProviderModelSections, isProviderModelVisible } from "@/utils/provider-model-options";
import { providerName, type ConfiguredModel } from "@/utils/configured-models";
import {
getProviderModelSections,
isProviderModelVisible,
sortProviderModels,
} from "@/utils/provider-model-options";
import ModelMenuChoices from "./ModelMenuChoices.vue";
import IconChevronDown from "./icons/IconChevronDown.vue";

Expand Down Expand Up @@ -161,9 +164,8 @@ const groups = computed(() => {
grouped.set(model.providerKey, models);
}
return [...grouped].map(([key, models]) => {
const sorted = sortModelsByFamily(models, key === "qwen" ? "desc" : "asc");
const selected = sorted.find((model) => getModelRef(model) === props.selectedModel);
const sections = getProviderModelSections(key, sorted, selected?.id);
const sorted = sortProviderModels(key, models);
const sections = getProviderModelSections(key, sorted);
const ranked = [...sections.primary, ...sections.more];
return { key, frequent: ranked.slice(0, 5), remaining: ranked.slice(5) };
});
Expand Down
56 changes: 52 additions & 4 deletions desktop/renderer/src/components/DefaultModelPicker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,56 @@ describe("DefaultModelPicker", () => {
expect(more.attributes("aria-expanded")).toBe("false");
});

it("preserves Qwen visibility, featured models, recommendation badges and selected aliases", async () => {
it("puts newer MiniMax versions before overflow even when an older model is selected", async () => {
const wrapper = await open();
const ids = [
"MiniMax-M2",
"MiniMax-M2.1",
"MiniMax-M2.1-highspeed",
"MiniMax-M2.5",
"MiniMax-M2.5-highspeed",
"MiniMax-M2.7",
"MiniMax-M2.7-highspeed",
"MiniMax-M3",
"MiniMax-M3.1-Flash",
];
await wrapper.setProps({
modelValue: "minimax/MiniMax-M2.1",
models: ids.map((id) => ({ providerKey: "minimax", id, name: id, source: "managed" })),
});
await wrapper.get('[data-provider-group="minimax"]').trigger("click");
const visible = wrapper.findAll("[data-model-ref]").filter((model) => model.isVisible());
expect(visible.map((model) => model.attributes("data-model-ref"))).toEqual([
"minimax/MiniMax-M3.1-Flash",
"minimax/MiniMax-M3",
"minimax/MiniMax-M2.7-highspeed",
"minimax/MiniMax-M2.7",
"minimax/MiniMax-M2.5-highspeed",
]);
await wrapper.get('[data-more-models="minimax"]').trigger("click");
const remaining = wrapper.get('[role="menu"][aria-label="MiniMax · More models"]');
expect(
remaining.findAll("[data-model-ref]").map((model) => model.attributes("data-model-ref")),
).toEqual([
"minimax/MiniMax-M2.5",
"minimax/MiniMax-M2.1-highspeed",
"minimax/MiniMax-M2.1",
"minimax/MiniMax-M2",
]);
expect(
remaining.get('[data-model-ref="minimax/MiniMax-M2.1"]').attributes("aria-checked"),
).toBe("true");
expect(wrapper.emitted("change")).toBeUndefined();
await wrapper.get('[data-model-ref="minimax/MiniMax-M3.1-Flash"]').trigger("click");
expect(wrapper.emitted("change")).toEqual([["minimax/MiniMax-M3.1-Flash"]]);
});

it("shows newer Qwen versions first and preserves selected aliases in overflow", async () => {
const wrapper = await open();
const ids = [
"qwen3.9-plus",
"qwen3.10-plus",
"qwen3.8-plus",
"qwen3.8-max",
"qwen3.8-flash",
"cmaas-qwen3.8-flash",
Expand All @@ -145,10 +192,10 @@ describe("DefaultModelPicker", () => {
await wrapper.get('[data-provider-group="qwen"]').trigger("click");
const visible = wrapper.findAll("[data-model-ref]").filter((model) => model.isVisible());
expect(visible.map((model) => model.attributes("data-model-ref"))).toEqual([
"qwen/qwen3.10-plus",
"qwen/qwen3.9-plus",
"qwen/qwen3.8-plus",
"qwen/qwen3.8-max",
"qwen/cmaas-qwen3.8-flash",
"qwen/qwen3.7-plus",
"qwen/qwen3.5-plus",
"qwen/qwen3.8-flash",
]);
expect(
Expand All @@ -161,6 +208,7 @@ describe("DefaultModelPicker", () => {
expect(wrapper.find(`[data-model-ref="qwen/${id}"]`).exists()).toBe(false);
}
await wrapper.get('[data-more-models="qwen"]').trigger("click");
expect(wrapper.get('[data-model-ref="qwen/cmaas-qwen3.8-flash"]').isVisible()).toBe(true);
expect(wrapper.get('[data-model-ref="qwen/qwen3.6-plus"]').isVisible()).toBe(true);
expect(wrapper.emitted("change")).toBeUndefined();
});
Expand Down
46 changes: 19 additions & 27 deletions desktop/renderer/src/components/ModelProviderGroups.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ describe("ModelProviderGroups", () => {
const modelRefs = () =>
wrapper.findAll("[data-model-ref]").map((entry) => entry.attributes("data-model-ref"));
const expectedOrder = [
"qwen/qwen3.8-27b",
"qwen/cmaas-qwen3.8-flash",
"qwen/qwen3.8-27b",
"qwen/qwen3.5-plus",
"llama-cpp/local-model",
];
Expand All @@ -52,21 +52,8 @@ describe("ModelProviderGroups", () => {
await wrapper.get('[data-model-ref="qwen/cmaas-qwen3.8-flash"]').trigger("click");
expect(wrapper.emitted("select")).toEqual([["qwen/cmaas-qwen3.8-flash"]]);
await wrapper.setProps({ selectedModel: "qwen/cmaas-qwen3.8-flash" });
expect(modelRefs()).toEqual([
"qwen/cmaas-qwen3.8-flash",
"qwen/qwen3.5-plus",
"llama-cpp/local-model",
]);
const more = wrapper.get('[data-more-models="qwen"]');
expect(more.attributes("aria-expanded")).toBe("false");
await more.trigger("click");
expect(modelRefs()).toEqual([
"qwen/cmaas-qwen3.8-flash",
"qwen/qwen3.5-plus",
"qwen/qwen3.8-27b",
"llama-cpp/local-model",
]);
expect(more.attributes("aria-expanded")).toBe("true");
expect(modelRefs()).toEqual(expectedOrder);
expect(wrapper.find('[data-more-models="qwen"]').exists()).toBe(false);

await wrapper.setProps({ query: "qwen3.8" });
expect(wrapper.findAll("[data-model-ref]")).toHaveLength(2);
Expand All @@ -76,7 +63,7 @@ describe("ModelProviderGroups", () => {
wrapper.unmount();
});

it("collapses the remaining catalog, searches it directly, and retains an unfeatured selection", async () => {
it("keeps older Qwen versions in overflow even after selecting them through search", async () => {
const models: ConfiguredModel[] = [
"qwen3.6-plus",
"qwen3.5-plus",
Expand All @@ -90,26 +77,31 @@ describe("ModelProviderGroups", () => {
});
const modelRefs = () =>
wrapper.findAll("[data-model-ref]").map((entry) => entry.attributes("data-model-ref"));
const featured = [
const newest = [
"qwen/qwen3.8-max-2026-10-01",
"qwen/qwen3.8-max",
"qwen/qwen3.8-flash",
"qwen/qwen3.7-plus",
"qwen/qwen3.5-plus",
"qwen/qwen3.6-plus",
];
expect(modelRefs()).toEqual(featured);
expect(modelRefs()).toEqual(newest);
expect(wrapper.findAll(".model-recommended")).toHaveLength(1);
expect(wrapper.emitted("select")).toBeUndefined();
await wrapper.get('[data-more-models="qwen"]').trigger("click");
expect(modelRefs()).toEqual([...featured, "qwen/qwen3.8-max-2026-10-01", "qwen/qwen3.6-plus"]);
expect(modelRefs()).toEqual([...newest, "qwen/qwen3.5-plus"]);
await wrapper.get('[data-more-models="qwen"]').trigger("click");
await wrapper.setProps({ query: "3.6" });
expect(modelRefs()).toEqual(["qwen/qwen3.6-plus"]);
await wrapper.setProps({ query: "3.5" });
expect(modelRefs()).toEqual(["qwen/qwen3.5-plus"]);
expect(wrapper.find('[data-more-models="qwen"]').exists()).toBe(false);
await wrapper.get('[data-model-ref="qwen/qwen3.6-plus"]').trigger("click");
expect(wrapper.emitted("select")).toEqual([["qwen/qwen3.6-plus"]]);
await wrapper.setProps({ query: "", selectedModel: "qwen/qwen3.6-plus" });
expect(modelRefs()).toEqual(["qwen/qwen3.6-plus", ...featured]);
await wrapper.get('[data-model-ref="qwen/qwen3.5-plus"]').trigger("click");
expect(wrapper.emitted("select")).toEqual([["qwen/qwen3.5-plus"]]);
await wrapper.setProps({ query: "", selectedModel: "qwen/qwen3.5-plus" });
expect(modelRefs()).toEqual(newest);
expect(wrapper.get('[data-more-models="qwen"]').attributes("aria-expanded")).toBe("false");
await wrapper.get('[data-more-models="qwen"]').trigger("click");
expect(wrapper.get('[data-model-ref="qwen/qwen3.5-plus"]').attributes("aria-pressed")).toBe(
"true",
);
wrapper.unmount();
});
});
7 changes: 3 additions & 4 deletions desktop/renderer/src/components/ModelProviderGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
import { computed, ref, useId, watch } from "vue";
import { t } from "@/i18n";
import { getModelRef, providerName, type ConfiguredModel } from "@/utils/configured-models";
import { sortModelsByFamily } from "@/utils/model-family-sort";
import {
getProviderModelSections,
isProviderModelVisible,
isRecommendedProviderModel,
sortProviderModels,
} from "@/utils/provider-model-options";
import { getChatModelRestriction } from "../../../src/provider-model-capabilities";

Expand Down Expand Up @@ -127,11 +127,10 @@ const groups = computed(() => {
result.set(model.providerKey, group);
}
return [...result].map(([key, models]) => {
const sorted = sortModelsByFamily(models, key === "qwen" ? "desc" : "asc");
const selected = sorted.find((model) => getModelRef(model) === props.selectedModel);
const sorted = sortProviderModels(key, models);
const sections = search.value
? { primary: sorted, more: [] }
: getProviderModelSections(key, sorted, selected?.id);
: getProviderModelSections(key, sorted);
return {
key,
models: sorted,
Expand Down
12 changes: 9 additions & 3 deletions desktop/renderer/src/components/ModelSetupDialog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ describe("ModelSetupDialog", () => {
discoverModels.mockResolvedValue({
ok: true,
models: [
"qwen3.9-plus",
"qwen3.10-plus",
"qwen3.8-plus",
"qwen3.8-max",
"kimi/kimi-k3.1-pro",
Expand All @@ -285,10 +287,11 @@ describe("ModelSetupDialog", () => {
await vi.advanceTimersByTimeAsync(600);
await flushPromises();
expect(wrapper.findAll("option").map((option) => option.attributes("value"))).toEqual([
"qwen3.10-plus",
"qwen3.9-plus",
"qwen3.8-plus",
"qwen3.8-max",
"cmaas-qwen3.8-flash",
"qwen3.7-plus",
"qwen3.5-plus",
]);
expect(wrapper.find(`option[value="${realtime}"]`).exists()).toBe(false);
expect(wrapper.get(".primary-action").attributes("disabled")).toBeDefined();
Expand All @@ -300,11 +303,13 @@ describe("ModelSetupDialog", () => {
await more.trigger("click");
expect(more.attributes("aria-expanded")).toBe("true");
expect(wrapper.findAll("option").map((option) => option.attributes("value"))).toEqual([
"qwen3.10-plus",
"qwen3.9-plus",
"qwen3.8-plus",
"qwen3.8-max",
"cmaas-qwen3.8-flash",
"qwen3.7-plus",
"qwen3.5-plus",
"qwen3.8-plus",
]);
const select = wrapper.findComponent(SelectStub);
select.props("filterMethod")?.("qwen3.8-plus");
Expand All @@ -318,6 +323,7 @@ describe("ModelSetupDialog", () => {
expect(wrapper.get('[data-testid="more-provider-models"]').attributes("aria-expanded")).toBe(
"false",
);
await wrapper.get('[data-testid="more-provider-models"]').trigger("click");
await wrapper.get("select").setValue("qwen3.7-plus");
expect(wrapper.get(".primary-action").attributes("disabled")).toBeUndefined();
wrapper.unmount();
Expand Down
1 change: 0 additions & 1 deletion desktop/renderer/src/components/ModelSetupDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@ const catalogSections = computed(() =>
getProviderModelSections(
providerKey.value,
catalogModels.value.map((id) => ({ id })),
selectedModelName.value,
),
);
const visibleCatalogModels = computed(() => {
Expand Down
3 changes: 2 additions & 1 deletion desktop/renderer/src/components/chat/ChatModelPicker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ describe("ChatModelPicker", () => {
models: ["qwen-saved", "qwen-live-one", "qwen-live-two"],
});
const wrapper = await open();
await wrapper.get('[data-more-models="qwen"]').trigger("click");
await wrapper.get('[data-provider-group="qwen"]').trigger("click");
expect(wrapper.find('[data-more-models="qwen"]').exists()).toBe(false);
expect(
wrapper
.findAll('[data-model-ref^="qwen/"]')
Expand Down
53 changes: 36 additions & 17 deletions desktop/renderer/src/utils/provider-model-options.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
isRecommendedProviderModel,
} from "./provider-model-options";

describe("Qwen model options", () => {
describe("Provider model options", () => {
it("only offers Qwen chat models, including namespaced and serving-prefixed aliases", () => {
const models = [
"MiniMax/MiniMax-M3.1-Flash",
Expand Down Expand Up @@ -64,16 +64,34 @@ describe("Qwen model options", () => {
expect(getProviderCatalogOptions("qwen", [])).toEqual([]);
});

it("does not filter other providers or rewrite their catalog order", () => {
const models = ["MiniMax-M3", "image-01", "qwen-image-2.1-pro", "private-model"];
it("does not filter MiniMax models or rewrite custom provider catalog order", () => {
const models = [
"MiniMax-M2.1",
"MiniMax-M3",
"MiniMax-M3.9",
"MiniMax-M3.10",
"MiniMax-M3.1-Flash",
"image-01",
"qwen-image-2.1-pro",
"private-model",
];

expect(getProviderCatalogOptions("minimax", models)).toEqual(models);
expect(getProviderCatalogOptions("minimax", models)).toEqual([
"image-01",
"MiniMax-M3.10",
"MiniMax-M3.9",
"MiniMax-M3.1-Flash",
"MiniMax-M3",
"MiniMax-M2.1",
"private-model",
"qwen-image-2.1-pro",
]);
expect(getProviderCatalogOptions("custom", models)).toEqual(models);
expect(isProviderModelVisible("llama-cpp", "local-model")).toBe(true);
expect(isProviderModelVisible("github-copilot", "gpt-5.5")).toBe(true);
});

it("features four available models, preferring canonical IDs over equivalent aliases", () => {
it("shows the five newest Qwen versions before overflow, including new catalog entries", () => {
const models = Object.freeze(
[
"qwen3.8-max-2026-10-01",
Expand All @@ -83,46 +101,47 @@ describe("Qwen model options", () => {
"qwen3.8-max",
"qwen3.8-flash",
"qwen3.6-plus",
"qwen3.9-plus",
"qwen3.10-plus",
].map((id) => ({ id, name: `Alias for ${id}` })),
);
const original = [...models];
const sections = getProviderModelSections("qwen", models);

expect(sections.primary.map((model) => model.id)).toEqual([
"qwen3.10-plus",
"qwen3.9-plus",
"qwen3.8-max-2026-10-01",
"qwen3.8-max",
"qwen3.8-flash",
"qwen3.7-plus",
"qwen3.5-plus",
]);
expect(sections.more.map((model) => model.id)).toEqual([
"qwen3.8-max-2026-10-01",
"cmaas-qwen3.8-flash",
"qwen3.7-plus",
"qwen3.6-plus",
"qwen3.5-plus",
]);
expect(models).toEqual(original);
expect(new Set([...sections.primary, ...sections.more])).toEqual(new Set(models));
const selectedAlias = getProviderModelSections("qwen", models, "cmaas-qwen3.8-flash");
expect(selectedAlias.primary).toHaveLength(4);
expect(selectedAlias.primary[1].id).toBe("cmaas-qwen3.8-flash");
expect(selectedAlias.more.some((model) => model.id === "qwen3.8-flash")).toBe(true);
});

it("keeps the selected model visible and never invents missing featured models", () => {
it("shows a short Qwen catalog in version order without inventing models", () => {
const models = [
{ id: "cmaas-qwen3.8-flash" },
{ id: "Qwen/Qwen3.5-plus" },
{ id: "qwen3.6-plus" },
{ id: "qwen3.7-plus-2026-10-01" },
];
const sections = getProviderModelSections("qwen", models, "qwen3.6-plus");
const sections = getProviderModelSections("qwen", models);

expect(sections.primary.map((model) => model.id)).toEqual([
"qwen3.6-plus",
"cmaas-qwen3.8-flash",
"qwen3.7-plus-2026-10-01",
"qwen3.6-plus",
"Qwen/Qwen3.5-plus",
]);
expect(sections.more).toEqual([models[3]]);
expect(getProviderModelSections("qwen", [], "missing")).toEqual({ primary: [], more: [] });
expect(sections.more).toEqual([]);
expect(getProviderModelSections("qwen", [])).toEqual({ primary: [], more: [] });
expect(getProviderModelSections("minimax", models)).toEqual({ primary: models, more: [] });
expect(isRecommendedProviderModel("qwen", "cmaas-qwen3.7-plus")).toBe(true);
expect(isRecommendedProviderModel("qwen", models[3].id)).toBe(false);
Expand Down
Loading
Loading