From efb969c2bd2ac095cbe8de54ab6934e8cc463f18 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 11 Nov 2026 18:25:58 -0800 Subject: [PATCH] fix(agent-picker): keep the Legacy models row last, expanding older models above it --- .../native-chat/input/MobileNativeChatSessionOptionRows.tsx | 4 ++-- src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx | 4 ++-- .../src/components/agent/launch-settings/AgentChoiceMenu.tsx | 4 ++-- .../session/options/controls/NativeChatModelCombobox.tsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx b/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx index a924e30f56d..00dbbe2b6dc 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx @@ -227,6 +227,7 @@ export function descriptorRowElements( ...choices.filter((choice) => !choice.legacy).map(choiceRow), ...(more.length > 0 && moreChoices ? [ + ...(moreChoices.shown ? more.map(choiceRow) : []), , - ...(moreChoices.shown ? more.map(choiceRow) : []) + /> ] : []) ] diff --git a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx index f54fdfd0f03..ec7ae005a9f 100644 --- a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx +++ b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx @@ -272,14 +272,14 @@ export function AgentLaunchSetupPanel({ {/* One keyed array, so a row moving between sections keeps its highlight. */} {[ ...modelRows.rows.map(renderModelRow), + ...modelRows.legacyRows.map(renderModelRow), , - ...modelRows.legacyRows.map(renderModelRow) + /> ]} diff --git a/src/renderer/src/components/agent/launch-settings/AgentChoiceMenu.tsx b/src/renderer/src/components/agent/launch-settings/AgentChoiceMenu.tsx index 69be7a41a1a..7a3de571c7f 100644 --- a/src/renderer/src/components/agent/launch-settings/AgentChoiceMenu.tsx +++ b/src/renderer/src/components/agent/launch-settings/AgentChoiceMenu.tsx @@ -106,6 +106,7 @@ export function AgentChoiceMenu({ {mainChoices.map(radioItem)} + {shownLegacy.map(radioItem)} {legacyChoices.length > 0 ? ( ) : null} - {shownLegacy.map(radioItem)} @@ -160,12 +160,12 @@ export function AgentChoiceMenu({ {mainChoices.map(selectItem)} + {shownLegacy.map(selectItem)} {legacyChoices.length > 0 ? ( {toggleBody} ) : null} - {shownLegacy.map(selectItem)} 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 ccd96caa200..b592d2c5d55 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 @@ -115,14 +115,14 @@ export function NativeChatModelCombobox({ {/* One keyed array, so a row moving between sections keeps its highlight. */} {[ ...choices.filter((choice) => !folded(choice)).map(renderChoice), + ...(legacyExpanded ? legacyChoices.map(renderChoice) : []), , - ...(legacyExpanded ? legacyChoices.map(renderChoice) : []) + /> ]}