From e705e87ab2edee77e7ce244bdcdddeaec07a2712 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 11 Nov 2026 14:04:01 -0800 Subject: [PATCH] fix(agent-picker): keep model rows keyed across sections; let launch search find legacy models --- .../agent/AgentLaunchSetupPanel.tsx | 20 +++++++++++-------- .../controls/NativeChatModelCombobox.tsx | 18 ++++++++++------- .../picker/agent-launch-picker-search.ts | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx index 202bc09fc23..50b66ae271b 100644 --- a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx +++ b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx @@ -266,14 +266,18 @@ export function AgentLaunchSetupPanel({ modelInArguments={modelInArguments} onSelect={editDraft} /> - {modelRows.rows.map(renderModelRow)} - setLegacyExpanded((expanded) => !expanded)} - /> - {modelRows.legacyRows.map(renderModelRow)} + {/* One keyed array, so a row moving between sections keeps its highlight. */} + {[ + ...modelRows.rows.map(renderModelRow), + setLegacyExpanded((expanded) => !expanded)} + />, + ...modelRows.legacyRows.map(renderModelRow) + ]} 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 12ca708dce4..37ec8e87452 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 @@ -109,13 +109,17 @@ export function NativeChatModelCombobox({ - {choices.filter((choice) => !folded(choice)).map(renderChoice)} - setLegacyExpanded((expanded) => !expanded)} - /> - {legacyExpanded ? legacyChoices.map(renderChoice) : null} + {/* One keyed array, so a row moving between sections keeps its highlight. */} + {[ + ...choices.filter((choice) => !folded(choice)).map(renderChoice), + setLegacyExpanded((expanded) => !expanded)} + />, + ...(legacyExpanded ? legacyChoices.map(renderChoice) : []) + ]} diff --git a/src/shared/agent-launch/picker/agent-launch-picker-search.ts b/src/shared/agent-launch/picker/agent-launch-picker-search.ts index f4aaa74f8c8..65bfac6400c 100644 --- a/src/shared/agent-launch/picker/agent-launch-picker-search.ts +++ b/src/shared/agent-launch/picker/agent-launch-picker-search.ts @@ -72,7 +72,7 @@ export function searchAgentPickerSetups( continue } for (const model of agentPickerModels(entry)) { - if (model.isLegacy || model.hidden) { + if (model.hidden) { continue } const modelWords = tokens([model.id, model.label].join(' '))