From f997a8a39bc7b6f00c6ee8a3bdb0a88fb5dfee0f Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Tue, 18 Aug 2026 13:17:53 +0800
Subject: [PATCH] fix(ai): clarify model selector hierarchy

---
 apps/desktop/src/components/editor/AiAssistant.vue | 14 ++++----------
 .../app-tests/aiAssistantComposerLayout.test.ts    | 11 +++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/apps/desktop/src/components/editor/AiAssistant.vue b/apps/desktop/src/components/editor/AiAssistant.vue
index f785359d88..da298ad28f 100644
--- a/apps/desktop/src/components/editor/AiAssistant.vue
+++ b/apps/desktop/src/components/editor/AiAssistant.vue
@@ -2934,21 +2934,15 @@ async function openExternalUrl(url: string) {
                     <input v-model="modelSearchQuery" type="text" :placeholder="t('ai.searchModels')" class="w-full rounded-sm border bg-background py-1.5 pl-7 pr-2 text-xs outline-none focus:ring-1 focus:ring-primary" @click.stop />
                   </div>
                   <div class="max-h-80 overflow-auto">
-                    <template v-for="config in configuredProviders" :key="config.id">
-                      <button
-                        type="button"
-                        class="flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-left text-xs hover:bg-muted"
-                        :class="config.id === settings.activeModel?.configId ? 'bg-accent text-accent-foreground' : 'text-foreground'"
-                        :aria-expanded="!isModelConfigCollapsed(config.id)"
-                        @click="toggleModelConfig(config.id)"
-                      >
+                    <template v-for="(config, configIndex) in configuredProviders" :key="config.id">
+                      <button type="button" class="flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-left text-xs text-foreground hover:bg-muted" :aria-expanded="!isModelConfigCollapsed(config.id)" @click="toggleModelConfig(config.id)">
                         <ChevronRight class="h-3.5 w-3.5 shrink-0 transition-transform" :class="{ 'rotate-90': !isModelConfigCollapsed(config.id) }" />
                         <AiProviderLogo :provider="config.provider" :label="AI_PROVIDER_PRESETS[config.provider]?.label ?? config.provider" :icon-slug="AI_PROVIDER_PRESETS[config.provider]?.iconSlug" class="h-3.5 w-3.5 shrink-0" />
                         <span class="min-w-0 flex-1 truncate font-medium">{{ config.name }}</span>
                         <Loader2 v-if="getModelCatalog(config.id).status === 'loading'" class="h-3 w-3 shrink-0 animate-spin text-muted-foreground" />
                         <span v-if="config.isDefault" class="ml-auto text-[10px] text-muted-foreground">{{ t("ai.default") }}</span>
                       </button>
-                      <div v-if="!isModelConfigCollapsed(config.id)">
+                      <div v-if="!isModelConfigCollapsed(config.id)" class="ml-5 border-l border-border/60 pl-1">
                         <div v-if="getModelCatalog(config.id).status === 'loading' && !getModelsForConfig(config.id).length" class="flex items-center gap-2 px-2 py-2 text-xs text-muted-foreground">
                           <Loader2 class="h-3.5 w-3.5 animate-spin" />
                           {{ t("ai.loadingModels") }}
@@ -2989,7 +2983,7 @@ async function openExternalUrl(url: string) {
                           {{ t("ai.manualModel") }}
                         </button>
                       </div>
-                      <div class="my-1 border-t" />
+                      <div v-if="configIndex < configuredProviders.length - 1" class="my-1 border-t" />
                     </template>
                   </div>
                   <div v-if="settings.activeModel" class="border-t pt-1">
diff --git a/packages/app-tests/aiAssistantComposerLayout.test.ts b/packages/app-tests/aiAssistantComposerLayout.test.ts
index 85cef1106f..14e2e013c1 100644
--- a/packages/app-tests/aiAssistantComposerLayout.test.ts
+++ b/packages/app-tests/aiAssistantComposerLayout.test.ts
@@ -59,6 +59,17 @@ test("AI effort control opens as a hoverable side submenu", () => {
   assert.doesNotMatch(selector, /v-if="effortPanelOpen"/);
 });
 
+test("AI model menu separates provider groups from model selections", () => {
+  const selectorStart = source.indexOf("<!-- Combined provider + model selector -->");
+  const selectorEnd = source.indexOf("</template>", source.indexOf("</Popover>", selectorStart));
+  const selector = source.slice(selectorStart, selectorEnd);
+
+  assert.match(selector, /v-for="\(config, configIndex\) in configuredProviders"/);
+  assert.match(selector, /class="ml-5 border-l border-border\/60 pl-1"/);
+  assert.match(selector, /v-if="configIndex < configuredProviders\.length - 1" class="my-1 border-t"/);
+  assert.doesNotMatch(selector, /bg-accent text-accent-foreground.*config\.id === settings\.activeModel/);
+});
+
 test("AI model and effort menu refreshes do not persist effort settings", () => {
   const loaderStart = source.indexOf("async function ensureModelEffort");
   const loaderEnd = source.indexOf("function handleModelSelect", loaderStart);