Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions packages/app/src/components/dialog-select-model.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,24 @@ const ModelList: Component<{
current={model.current()}
filterKeys={["provider.name", "name", "id"]}
sortBy={(a, b) => a.name.localeCompare(b.name)}
groupBy={(x) => x.provider.name}
groupBy={(x) => {
const isDigitalOceanRouter = x.provider.id === "digitalocean" && x.id.startsWith("router:")
return isDigitalOceanRouter ? `${x.provider.name} | Inference Routers` : x.provider.name
}}
sortGroupsBy={(a, b) => {
const aProvider = a.items[0].provider.id
const bProvider = b.items[0].provider.id
const aItem = a.items[0]
const bItem = b.items[0]
const aProvider = aItem.provider.id
const bProvider = bItem.provider.id
if (popularProviders.includes(aProvider) && !popularProviders.includes(bProvider)) return -1
if (!popularProviders.includes(aProvider) && popularProviders.includes(bProvider)) return 1
return popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
const popularDelta = popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
if (popularDelta !== 0) return popularDelta
const aIsRouterGroup = aProvider === "digitalocean" && aItem.id.startsWith("router:")
const bIsRouterGroup = bProvider === "digitalocean" && bItem.id.startsWith("router:")
if (aIsRouterGroup && !bIsRouterGroup) return -1
if (!aIsRouterGroup && bIsRouterGroup) return 1
return 0
}}
itemWrapper={(item, node) => (
<Tooltip
Expand Down
5 changes: 4 additions & 1 deletion packages/opencode/src/cli/cmd/providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ const handlePluginAuth = Effect.fn("Cli.providers.pluginAuth")(function* (
yield* put(saveProvider, {
type: "api",
key: result.key,
...(result.metadata ? { metadata: result.metadata } : {}),
})
}
yield* spinner.stop("Login successful")
Expand Down Expand Up @@ -156,6 +157,7 @@ const handlePluginAuth = Effect.fn("Cli.providers.pluginAuth")(function* (
yield* put(saveProvider, {
type: "api",
key: result.key,
...(result.metadata ? { metadata: result.metadata } : {}),
})
}
yield* Prompt.log.success("Login successful")
Expand Down Expand Up @@ -191,10 +193,11 @@ const handlePluginAuth = Effect.fn("Cli.providers.pluginAuth")(function* (
}
if (result.type === "success") {
const saveProvider = result.provider ?? provider
const merged = { ...(metadata.metadata ?? {}), ...(result.metadata ?? {}) }
yield* put(saveProvider, {
type: "api",
key: result.key ?? apiKey,
...metadata,
...(Object.keys(merged).length ? { metadata: merged } : {}),
})
yield* Prompt.log.success("Login successful")
}
Expand Down
37 changes: 23 additions & 14 deletions packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,13 @@ export function DialogModel(props: { providerID?: string }) {
if (!provider) return []
const model = provider.models[item.modelID]
if (!model) return []
const isDigitalOceanRouter = provider.id === "digitalocean" && model.id.startsWith("router:")
return [
{
key: item,
value: { providerID: provider.id, modelID: model.id },
title: model.name ?? item.modelID,
description: provider.name,
description: isDigitalOceanRouter ? `${provider.name} Inference Router` : provider.name,
category,
disabled: provider.id === "opencode" && model.id.includes("-nano"),
footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
Expand Down Expand Up @@ -72,19 +73,26 @@ export function DialogModel(props: { providerID?: string }) {
entries(),
filter(([_, info]) => info.status !== "deprecated"),
filter(([_, info]) => (props.providerID ? info.providerID === props.providerID : true)),
map(([model, info]) => ({
value: { providerID: provider.id, modelID: model },
title: info.name ?? model,
description: favorites.some((item) => item.providerID === provider.id && item.modelID === model)
? "(Favorite)"
: undefined,
category: connected() ? provider.name : undefined,
disabled: provider.id === "opencode" && model.includes("-nano"),
footer: info.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
onSelect() {
onSelect(provider.id, model)
},
})),
map(([model, info]) => {
const isDigitalOceanRouter = provider.id === "digitalocean" && model.startsWith("router:")
return {
value: { providerID: provider.id, modelID: model },
title: info.name ?? model,
description: favorites.some((item) => item.providerID === provider.id && item.modelID === model)
? "(Favorite)"
: undefined,
category: connected()
? isDigitalOceanRouter
? `${provider.name} | Inference Routers`
: provider.name
: undefined,
disabled: provider.id === "opencode" && model.includes("-nano"),
footer: info.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
onSelect() {
onSelect(provider.id, model)
},
}
}),
filter((x) => {
if (!showSections) return true
if (favorites.some((item) => item.providerID === x.value.providerID && item.modelID === x.value.modelID))
Expand All @@ -95,6 +103,7 @@ export function DialogModel(props: { providerID?: string }) {
}),
sortBy(
(x) => x.footer !== "Free",
(x) => (x.category?.includes("Inference Routers") ? 0 : 1),
(x) => x.title,
),
),
Expand Down
Loading
Loading