monadical/opencode
14
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: model dialog issue when searching for models in fav/recents list, also ensure that deprecated models dont appear in list (#7429)

Browse Source
This commit is contained in:
Aiden Cline
2026-01-08 21:55:37 -08:00
committed by Frank
parent 445c8631a2
commit 07dc1f8ecc
2 changed files with 69 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
View File

@@ -33,16 +33,19 @@ export function DialogModel(props: { providerID?: string }) {
const options = createMemo(() => { const options = createMemo(() => {
const q = query() const q = query()
const favorites = showExtra() ? local.model.favorite() : [] const needle = q.trim()
const showSections = showExtra() && needle.length === 0
const favorites = connected() ? local.model.favorite() : []
const recents = local.model.recent() const recents = local.model.recent()
const recentList = showExtra() const recentList = showSections
? recents.filter( ? recents.filter(
(item) => !favorites.some((fav) => fav.providerID === item.providerID && fav.modelID === item.modelID), (item) => !favorites.some((fav) => fav.providerID === item.providerID && fav.modelID === item.modelID),
) )
: [] : []
const favoriteOptions = favorites.flatMap((item) => { const favoriteOptions = showSections
? favorites.flatMap((item) => {
const provider = sync.data.provider.find((x) => x.id === item.providerID) const provider = sync.data.provider.find((x) => x.id === item.providerID)
if (!provider) return [] if (!provider) return []
const model = provider.models[item.modelID] const model = provider.models[item.modelID]
@@ -72,8 +75,10 @@ export function DialogModel(props: { providerID?: string }) {
}, },
] ]
}) })
: []
const recentOptions = recentList.flatMap((item) => { const recentOptions = showSections
? recentList.flatMap((item) => {
const provider = sync.data.provider.find((x) => x.id === item.providerID) const provider = sync.data.provider.find((x) => x.id === item.providerID)
if (!provider) return [] if (!provider) return []
const model = provider.models[item.modelID] const model = provider.models[item.modelID]
@@ -103,6 +108,7 @@ export function DialogModel(props: { providerID?: string }) {
}, },
] ]
}) })
: []
const providerOptions = pipe( const providerOptions = pipe(
sync.data.provider, sync.data.provider,
@@ -145,6 +151,7 @@ export function DialogModel(props: { providerID?: string }) {
} }
}), }),
filter((x) => { filter((x) => {
if (!showSections) return true
const value = x.value const value = x.value
const inFavorites = favorites.some( const inFavorites = favorites.some(
(item) => item.providerID === value.providerID && item.modelID === value.modelID, (item) => item.providerID === value.providerID && item.modelID === value.modelID,
@@ -177,16 +184,11 @@ export function DialogModel(props: { providerID?: string }) {
) )
: [] : []
// Apply fuzzy filtering to each section separately, maintaining section order // Search shows a single merged list (favorites inline)
if (q) { if (needle) {
const filteredFavorites = fuzzysort.go(q, favoriteOptions, { keys: ["title"] }).map((x) => x.obj) const filteredProviders = fuzzysort.go(needle, providerOptions, { keys: ["title", "category"] }).map((x) => x.obj)
const filteredRecents = fuzzysort const filteredPopular = fuzzysort.go(needle, popularProviders, { keys: ["title"] }).map((x) => x.obj)
.go(q, recentOptions, { keys: ["title"] }) return [...filteredProviders, ...filteredPopular]
.map((x) => x.obj)
.slice(0, 5)
const filteredProviders = fuzzysort.go(q, providerOptions, { keys: ["title", "category"] }).map((x) => x.obj)
const filteredPopular = fuzzysort.go(q, popularProviders, { keys: ["title"] }).map((x) => x.obj)
return [...filteredFavorites, ...filteredRecents, ...filteredProviders, ...filteredPopular]
} }
return [...favoriteOptions, ...recentOptions, ...providerOptions, ...popularProviders] return [...favoriteOptions, ...recentOptions, ...providerOptions, ...popularProviders]

1
packages/opencode/src/provider/provider.ts
View File

@@ -852,6 +852,7 @@ export namespace Provider {
if (modelID === "gpt-5-chat-latest" || (providerID === "openrouter" && modelID === "openai/gpt-5-chat")) if (modelID === "gpt-5-chat-latest" || (providerID === "openrouter" && modelID === "openai/gpt-5-chat"))
delete provider.models[modelID] delete provider.models[modelID]
if (model.status === "alpha" && !Flag.OPENCODE_ENABLE_EXPERIMENTAL_MODELS) delete provider.models[modelID] if (model.status === "alpha" && !Flag.OPENCODE_ENABLE_EXPERIMENTAL_MODELS) delete provider.models[modelID]
if (model.status === "deprecated") delete provider.models[modelID]
if ( if (
(configProvider?.blacklist && configProvider.blacklist.includes(modelID)) || (configProvider?.blacklist && configProvider.blacklist.includes(modelID)) ||
(configProvider?.whitelist && !configProvider.whitelist.includes(modelID)) (configProvider?.whitelist && !configProvider.whitelist.includes(modelID))