diff --git a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx index 0ec1032f1f5..202bc09fc23 100644 --- a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx +++ b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx @@ -9,7 +9,8 @@ import { } from './agent-launch-setup-option-rows' import { useRef, useState } from 'react' import { useSetupModelHighlight } from './use-setup-model-highlight' -import { Check, ChevronDown, ChevronLeft, ChevronRight } from 'lucide-react' +import { AgentPickerLegacyModelsToggle } from './AgentPickerLegacyModelsToggle' +import { Check, ChevronDown, ChevronRight } from 'lucide-react' import { getAgentSessionOptionLaunchCatalog } from '../../../../shared/agent-session/options/agent-session-option-catalog' import { Command, @@ -72,7 +73,7 @@ export function AgentLaunchSetupPanel({ } } const [modelQuery, setModelQuery] = useState('') - const [legacy, setLegacy] = useState(false) + const [legacyExpanded, setLegacyExpanded] = useState(false) const [argumentsOpen, setArgumentsOpen] = useState(entry.defaultSurface === 'terminal') const argumentsKnown = agentPickerArgumentsKnown(entry, draft) const effective = agentPickerEffectiveChoices(entry, draft) @@ -98,7 +99,7 @@ export function AgentLaunchSetupPanel({ models, currentModel, modelQuery, - legacy, + legacyExpanded, modelInArguments ) const modelList = useRef(null) @@ -162,7 +163,28 @@ export function AgentLaunchSetupPanel({ // Launch leaves Permissions and Arguments to Agent settings; select mode edits a saved setup. const editsDefaults = mode === 'select' && !entry.textGeneration const note = agentLaunchSetupArgumentsNote(entry.label, options, !seed?.modelApply.cli?.length) - const legacyCount = models.filter((model) => model.isLegacy && !model.hidden).length + const renderModelRow = (model: (typeof modelRows.rows)[number]) => { + const current = model.unlisted || (currentModel === model.id && !modelInArguments) + return ( + { + if (!model.unlisted) { + editDraft({ kind: 'choice', patch: { model: model.id } }) + } + }} + > + {model.label} + + {current ? : null} + + + ) + } return (
- {legacy && !modelQuery ? ( - setLegacy(false)}> - - {t('agentPicker.legacyModels', 'Legacy models')} - - ) : null} - {modelRows.rows.map((model) => { - const current = model.unlisted || (currentModel === model.id && !modelInArguments) - return ( - { - if (!model.unlisted) { - editDraft({ kind: 'choice', patch: { model: model.id } }) - } - }} - > - {model.label} - - {current ? : null} - - - ) - })} - {!legacy && !modelQuery && legacyCount > 0 ? ( - setLegacy(true)}> - - {t('agentPicker.legacyModels', 'Legacy models')} - - {t('agentPicker.legacyModelCount', '{{total}} models', { - total: legacyCount - })} - - - - - ) : null} + {modelRows.rows.map(renderModelRow)} + setLegacyExpanded((expanded) => !expanded)} + /> + {modelRows.legacyRows.map(renderModelRow)} diff --git a/src/renderer/src/components/agent/AgentPickerLegacyModelsToggle.tsx b/src/renderer/src/components/agent/AgentPickerLegacyModelsToggle.tsx new file mode 100644 index 00000000000..1e9c476affe --- /dev/null +++ b/src/renderer/src/components/agent/AgentPickerLegacyModelsToggle.tsx @@ -0,0 +1,38 @@ +import { ChevronRight } from 'lucide-react' +import { CommandItem } from '@/components/ui/command' +import { useTranslate } from '@/i18n/use-translate' +import { cn } from '@/lib/class-names' + +/** Row that expands the folded legacy models in place, below itself. */ +export function AgentPickerLegacyModelsToggle({ + total, + expanded, + disabled, + onToggle +}: { + total: number + expanded: boolean + disabled?: boolean + onToggle: () => void +}): React.JSX.Element | null { + const t = useTranslate() + if (total === 0) { + return null + } + return ( + + {t('agentPicker.legacyModelsWithCount', 'Legacy models ({{total}})', { total })} + + + ) +} diff --git a/src/renderer/src/components/agent/agent-launch-setup-option-rows.ts b/src/renderer/src/components/agent/agent-launch-setup-option-rows.ts index ced76c6ecfa..04c32b02d2e 100644 --- a/src/renderer/src/components/agent/agent-launch-setup-option-rows.ts +++ b/src/renderer/src/components/agent/agent-launch-setup-option-rows.ts @@ -268,18 +268,19 @@ export function agentLaunchSetupCatalogState( return { hasModels, catalogPending, catalogMessage } } -/** Visible model rows, plus the model the list starts on. */ +/** Visible model rows, the expanded legacy rows below their toggle, and the model the list starts on. */ export function agentLaunchSetupModelRows( models: readonly AgentPickerModel[], currentModel: string | undefined, query: string, - legacy: boolean, + legacyExpanded: boolean, modelInArguments: boolean ) { - const rows: { id: string; label: string; unlisted?: true }[] = models.filter( - (model) => - !model.hidden && (model.id === currentModel || query || Boolean(model.isLegacy) === legacy) - ) + type Row = { id: string; label: string; unlisted?: true } + const listed = models.filter((model) => !model.hidden) + const folded = (model: AgentPickerModel) => !query && model.isLegacy && model.id !== currentModel + const rows: Row[] = listed.filter((model) => !folded(model)) + const legacyRows: Row[] = listed.filter(folded) // Why one keyed list: when the catalog later lists an unlisted current model, its row keeps // its identity, so the highlight stays on it instead of jumping to the first model. if (currentModel && !models.some((model) => model.id === currentModel)) { @@ -288,5 +289,10 @@ export function agentLaunchSetupModelRows( // An Arguments-owned text action has no current model row, so it starts on its default as before. const start = !modelInArguments && rows.some((row) => row.id === currentModel) ? currentModel : undefined - return { rows, start } + return { + rows, + legacyRows: legacyExpanded ? legacyRows : [], + legacyCount: legacyRows.length, + start + } } diff --git a/src/renderer/src/components/native-chat/session/options/controls/NativeChatModelCombobox.tsx b/src/renderer/src/components/native-chat/session/options/controls/NativeChatModelCombobox.tsx index 9a73dcc239b..12ca708dce4 100644 --- a/src/renderer/src/components/native-chat/session/options/controls/NativeChatModelCombobox.tsx +++ b/src/renderer/src/components/native-chat/session/options/controls/NativeChatModelCombobox.tsx @@ -1,5 +1,5 @@ import { useRef, useState } from 'react' -import { Check, ChevronLeft, ChevronRight } from 'lucide-react' +import { Check } from 'lucide-react' import { Command, CommandEmpty, @@ -15,6 +15,7 @@ import { nativeChatSessionChoiceLabel } from '../../../../../../../shared/native import { sayNativeChatSessionOptionTranslated as say } from './native-chat-session-option-labels-text' import { NativeChatSessionOptionChoiceBody } from './NativeChatSessionOptionChoiceBody' import { NativeChatSessionOptionWriteGroup } from './NativeChatSessionOptionWriteGroup' +import { AgentPickerLegacyModelsToggle } from '../../../../agent/AgentPickerLegacyModelsToggle' type NativeChatModelComboboxProps = { choices: readonly SessionOptionSelectChoice[] @@ -47,9 +48,39 @@ export function NativeChatModelCombobox({ const searchLabel = t('components.native-chat.composer.searchModels', 'Search models…') const search = useRef(null) const [query, setQuery] = useState('') - const [legacy, setLegacy] = useState(false) + const [legacyExpanded, setLegacyExpanded] = useState(false) const searching = Boolean(query.trim()) - const legacyCount = choices.filter((choice) => choice.legacy).length + const folded = (choice: SessionOptionSelectChoice) => + !searching && Boolean(choice.legacy) && choice.value !== currentValue + const legacyChoices = choices.filter(folded) + const renderChoice = (choice: SessionOptionSelectChoice) => { + const label = nativeChatSessionChoiceLabel(choice, say) + const current = choice.value === currentValue + return ( + { + if (!current) { + onSelect(choice.value) + } + }} + > + + {/* Reserve the check slot so selecting a model cannot rewrap its label. */} + + {current ? : null} + + + ) + } return ( - {legacy && !searching ? ( - setLegacy(false)}> - - {t('agentPicker.legacyModels', 'Legacy models')} - - ) : null} - {choices - .filter( - (choice) => - searching || choice.value === currentValue || Boolean(choice.legacy) === legacy - ) - .map((choice) => { - const label = nativeChatSessionChoiceLabel(choice, say) - const current = choice.value === currentValue - return ( - { - if (!current) { - onSelect(choice.value) - } - }} - > - - {/* Reserve the check slot so selecting a model cannot rewrap its label. */} - - {current ? : null} - - - ) - })} - {!legacy && !searching && legacyCount > 0 ? ( - setLegacy(true)}> - - {t('agentPicker.legacyModels', 'Legacy models')} - - {t('agentPicker.legacyModelCount', '{{total}} models', { total: legacyCount })} - - - - - ) : null} + {choices.filter((choice) => !folded(choice)).map(renderChoice)} + setLegacyExpanded((expanded) => !expanded)} + /> + {legacyExpanded ? legacyChoices.map(renderChoice) : null} diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 3285025db8a..9c6cdc8bd4e 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -23645,11 +23645,10 @@ "setByArguments": "Durch Argumente festgelegt", "searchModels": "Modelle suchen", "noModels": "Keine Modelle entsprechen deiner Suche.", - "legacyModels": "Ältere Modelle", "toggleArguments": "Argumente ein-/ausblenden", "argumentsTerminalHint": "Gilt nur für Terminalstarts (CLI)", "searchAgentModels": "{{agent}}-Modelle suchen…", - "legacyModelCount": "{{total}} Modelle", + "legacyModelsWithCount": "Ältere Modelle ({{total}})", "search": "Suchen, z. B. Opus 5.5…", "configure": "{{agent}} konfigurieren", "arguments": "Argumente", diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 51c214d5740..f1abae451bf 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -24726,13 +24726,12 @@ "setByArguments": "Set by your Arguments", "searchModels": "Search models", "noModels": "No models match your search.", - "legacyModels": "Legacy models", "toggleArguments": "Toggle Arguments", "argumentsTerminalHint": "Only applies to terminal (CLI) launches", "chatChoicesNote": "{{agent}} model or effort choices without a CLI flag apply to chats.", "composedChoicesNote": "{{agent}} effort and speed choices are included in the model argument.", "searchAgentModels": "Search {{agent}} models…", - "legacyModelCount": "{{total}} models", + "legacyModelsWithCount": "Legacy models ({{total}})", "use": "Use", "select": "Select agent", "promptPlaceholder": "Add a prompt (optional): / for skills, @ for files", diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index 10641f98332..7facfb94d7b 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -23538,11 +23538,10 @@ "setByArguments": "Definido por tus argumentos", "searchModels": "Buscar modelos", "noModels": "Ningún modelo coincide con tu búsqueda.", - "legacyModels": "Modelos antiguos", "toggleArguments": "Mostrar u ocultar argumentos", "argumentsTerminalHint": "Solo se aplica a los lanzamientos en terminal (CLI)", "searchAgentModels": "Buscar modelos de {{agent}}…", - "legacyModelCount": "{{total}} modelos", + "legacyModelsWithCount": "Modelos antiguos ({{total}})", "use": "Usar", "select": "Seleccionar agente", "promptPlaceholder": "Agregar un prompt (opcional): / para skills, @ para archivos", diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index 659a4cec52e..ad66c2fb663 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -23561,11 +23561,10 @@ "setByArguments": "Défini par vos arguments", "searchModels": "Rechercher des modèles", "noModels": "Aucun modèle ne correspond à votre recherche.", - "legacyModels": "Anciens modèles", "toggleArguments": "Afficher ou masquer les arguments", "argumentsTerminalHint": "S’applique uniquement aux lancements dans le terminal (CLI)", "searchAgentModels": "Rechercher des modèles {{agent}}…", - "legacyModelCount": "{{total}} modèles", + "legacyModelsWithCount": "Anciens modèles ({{total}})", "use": "Utiliser", "select": "Choisir un agent", "promptPlaceholder": "Ajouter un prompt (facultatif) : / pour les skills, @ pour les fichiers", diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 8d306274538..4a746475a59 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -22858,11 +22858,10 @@ "setByArguments": "引数で設定", "searchModels": "モデルを検索", "noModels": "検索に一致するモデルがありません。", - "legacyModels": "旧モデル", "toggleArguments": "引数の表示を切り替え", "argumentsTerminalHint": "ターミナル(CLI)からの起動にのみ適用", "searchAgentModels": "{{agent}} のモデルを検索…", - "legacyModelCount": "{{total}} 個のモデル", + "legacyModelsWithCount": "旧モデル ({{total}})", "use": "使用", "select": "Agent を選択", "promptPlaceholder": "プロンプトを追加 (オプション): / でスキル、@ でファイル", diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index ab428ee6831..c9ef701c464 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -22850,11 +22850,10 @@ "setByArguments": "인수로 설정됨", "searchModels": "모델 검색", "noModels": "검색과 일치하는 모델이 없습니다.", - "legacyModels": "이전 모델", "toggleArguments": "인수 표시 전환", "argumentsTerminalHint": "터미널(CLI) 실행에만 적용", "searchAgentModels": "{{agent}} 모델 검색…", - "legacyModelCount": "모델 {{total}}개", + "legacyModelsWithCount": "이전 모델 ({{total}})", "use": "사용", "select": "에이전트 선택", "promptPlaceholder": "프롬프트 추가(선택사항): 스킬은 /, 파일은 @", diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index de4225c9523..be2664d8f56 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -24114,11 +24114,10 @@ "setByArguments": "Definido pelos seus argumentos", "searchModels": "Pesquisar modelos", "noModels": "Nenhum modelo corresponde à pesquisa.", - "legacyModels": "Modelos antigos", "toggleArguments": "Mostrar ou ocultar argumentos", "argumentsTerminalHint": "Aplica-se apenas a inicializações no terminal (CLI)", "searchAgentModels": "Pesquisar modelos de {{agent}}…", - "legacyModelCount": "{{total}} modelos", + "legacyModelsWithCount": "Modelos antigos ({{total}})", "use": "Usar", "select": "Selecionar agente", "promptPlaceholder": "Adicione um prompt (opcional): / para skills, @ para arquivos", diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index 9c7888fb728..9080d27590f 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -24386,11 +24386,10 @@ "setByArguments": "Задано аргументами", "searchModels": "Поиск моделей", "noModels": "Нет моделей, соответствующих запросу.", - "legacyModels": "Устаревшие модели", "toggleArguments": "Показать или скрыть аргументы", "argumentsTerminalHint": "Применяется только при запуске в терминале (CLI)", "searchAgentModels": "Поиск моделей {{agent}}…", - "legacyModelCount": "Моделей: {{total}}", + "legacyModelsWithCount": "Устаревшие модели ({{total}})", "search": "Поиск, например Opus 5.5…", "configure": "Настроить {{agent}}", "arguments": "Аргументы", diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index edcec95b384..0a0153f3853 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -23615,11 +23615,10 @@ "setByArguments": "Argümanlarınızla ayarlandı", "searchModels": "Modelleri ara", "noModels": "Aramanızla eşleşen model yok.", - "legacyModels": "Eski modeller", "toggleArguments": "Argümanları göster veya gizle", "argumentsTerminalHint": "Yalnızca terminal (CLI) başlatmaları için geçerlidir", "searchAgentModels": "{{agent}} modellerini ara…", - "legacyModelCount": "{{total}} model", + "legacyModelsWithCount": "Eski modeller ({{total}})", "search": "Ara, ör. Opus 5.5…", "configure": "{{agent}} yapılandır", "arguments": "Argümanlar", diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 572851fbf54..678833c98ec 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -23311,11 +23311,10 @@ "setByArguments": "由引數設定", "searchModels": "搜尋模型", "noModels": "沒有符合搜尋條件的模型。", - "legacyModels": "舊版模型", "toggleArguments": "切換引數顯示", "argumentsTerminalHint": "僅適用於終端機(CLI)啟動", "searchAgentModels": "搜尋 {{agent}} 模型…", - "legacyModelCount": "{{total}} 個模型", + "legacyModelsWithCount": "舊版模型 ({{total}})", "search": "搜尋,例如 Opus 5.5…", "configure": "設定 {{agent}}", "arguments": "引數", diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 3473cd31c27..356774bcd71 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -23198,11 +23198,10 @@ "setByArguments": "由参数设置", "searchModels": "搜索模型", "noModels": "没有与搜索匹配的模型。", - "legacyModels": "旧版模型", "toggleArguments": "切换参数显示", "argumentsTerminalHint": "仅适用于终端(CLI)启动", "searchAgentModels": "搜索 {{agent}} 模型…", - "legacyModelCount": "{{total}} 个模型", + "legacyModelsWithCount": "旧版模型 ({{total}})", "use": "使用", "select": "选择智能体", "promptPlaceholder": "添加提示词(可选):/ 选择技能,@ 选择文件",