From 030a459cd8f4c20d5c2a4f379f90dd8bfef99b5a Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Thu, 12 Nov 2026 02:25:44 -0800 Subject: [PATCH] fix(native-chat): keep a pending hidden model pick listed --- .../native-chat/input/MobileNativeChatSessionOptionRows.tsx | 2 +- .../session/options/controls/NativeChatModelCombobox.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx b/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx index 1731e99ac39..391211f20f5 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionRows.tsx @@ -222,7 +222,7 @@ export function descriptorRowElements( /> ) // No search here, so search-only rows stay out; folded ones follow a More models toggle. - const listed = choices.filter((choice) => !choice.hidden) + const listed = choices.filter((choice) => !choice.hidden || choice.value === currentValue) const more = moreChoices ? listed.filter((choice) => choice.legacy) : [] return [ ...listed.filter((choice) => !choice.legacy).map(choiceRow), 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 6326a28abd6..12f47a54bfe 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 @@ -55,7 +55,10 @@ export function NativeChatModelCombobox({ const searching = Boolean(query.trim()) // Membership ignores the selection, so picking a model never moves rows in the open list. const folded = (choice: SessionOptionSelectChoice) => !searching && Boolean(choice.legacy) - const listed = searching ? choices : choices.filter((choice) => !choice.hidden) + // The current value stays listed even while a pending pick still carries its hidden flag. + const listed = choices.filter( + (choice) => searching || !choice.hidden || choice.value === currentValue + ) const legacyChoices = listed.filter(folded) const renderChoice = (choice: SessionOptionSelectChoice) => { const label = nativeChatSessionChoiceLabel(choice, say)