From 58b3c4d8df067b9eb69fd6cd5d49433a3896e00e Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Fri, 6 Nov 2026 12:50:18 +0000 Subject: [PATCH] feat(app): group Manage models into provider cards and drop the picker's check column Manage models: each provider is a card (50% bg-layer-01, 8px radius, 6px apart) with its models inside, aligned with the provider name. The provider toggle becomes a status after the name (No / N of M / All models enabled) and an Enable all / Disable all action that lines up with the model toggles. Disabled models are muted, row dividers are gone, and the search below the title drops its hairline and fills while focused or holding a query. An empty search reads No results for "query" on one line, capped at 60% like Settings. Model picker: the selected model loses its check and the column reserved for it, so names and section headers line up with the search icon; the current model keeps an overlay-pressed fill instead. --- packages/app/src/providers/models/manage.css | 85 +++++++++++++------ packages/app/src/providers/models/manage.tsx | 62 ++++++++++---- .../src/providers/models/provider-group.tsx | 14 ++- .../src/providers/models/select-dialog.css | 19 ++--- .../src/providers/models/select-dialog.tsx | 5 -- packages/app/src/runtime/i18n/en.ts | 7 ++ 6 files changed, 137 insertions(+), 55 deletions(-) diff --git a/packages/app/src/providers/models/manage.css b/packages/app/src/providers/models/manage.css index 646012a0de8..599bc405eed 100644 --- a/packages/app/src/providers/models/manage.css +++ b/packages/app/src/providers/models/manage.css @@ -1,6 +1,19 @@ -.manage-models-search { +/* Below the title, the search is a field of its own: no hairline, and a fill while it is focused or has a query. */ +.settings-manage-models-dialog .manage-models-search { flex-shrink: 0; - padding: 0 6px 8px; + padding: 4px 8px 12px; + + &::after { + display: none; + } + + [data-component="text-input-v2"] { + border-radius: 6px; + } + + [data-component="text-input-v2"]:is(:focus-within, :has(input:not(:placeholder-shown))):not([data-disabled]) { + background: var(--v2-overlay-simple-overlay-hover); + } } [data-component="dialog-v2"]:has(.settings-manage-models-dialog) [data-slot="dialog-container"] { @@ -10,21 +23,53 @@ .settings-manage-models-dialog .settings-panel.settings-models { height: 100%; - gap: 0; + gap: 6px; padding: 0 8px 8px; } +/* Each provider is a card; its models sit inside it while it is open. */ .settings-manage-models-dialog .settings-models .settings-section { - gap: 4px; - padding-block: 8px; + gap: 0; + padding: 2px 6px; + border-radius: 8px; + background: color-mix(in srgb, var(--v2-background-bg-layer-01) 50%, var(--v2-background-bg-base)); } .settings-manage-models-dialog .settings-models .settings-section[data-expanded] { - padding-bottom: 8px; + padding-bottom: 6px; } -.settings-manage-models-dialog .settings-models .settings-section + .settings-section { - border-top: 0.5px solid var(--v2-border-border-base); +.settings-manage-models-dialog .settings-models-group-header { + height: 36px; + padding-inline-end: 8px; +} + +.settings-manage-models-dialog .settings-models-group-trigger { + flex: 1; + height: 36px; + border-radius: 6px; +} + +.manage-models-status { + margin-inline-start: 8px; + color: var(--v2-text-text-faint); + font-size: 12px; + font-weight: 440; + font-variant-numeric: tabular-nums; + white-space: nowrap; +} + +/* The label lines up with the model toggles; its hover reaches the same edge as a model row's. */ +.settings-manage-models-dialog [data-component="button-v2"].manage-models-bulk { + flex-shrink: 0; + margin-inline-end: -8px; + padding-inline: 8px; + border-radius: 6px; + font-size: 12px; +} + +.manage-models-empty { + padding-block: 48px; } .settings-manage-models-dialog .provider-model-groups { @@ -81,33 +126,25 @@ .manage-models-rows { display: flex; flex-direction: column; - gap: 1px; } .manage-models-rows .search-list-row { - position: relative; - height: 36px; + height: 32px; padding-inline: 8px; border-radius: 6px; } -.manage-models-rows .search-list-row:not(:last-child)::after { - content: ""; - position: absolute; - inset-inline: 8px; - bottom: -0.75px; - height: 0.5px; - background: var(--v2-border-border-base); - pointer-events: none; +/* Model names line up with their provider's name: the trigger's 4px inset, 20px chevron, 4px gap, 16px icon, 8px gap. */ +.settings-manage-models-dialog [data-component="settings-models-provider"] .manage-models-rows .search-list-row { + padding-inline-start: 52px; +} + +.manage-models-rows .search-list-row:not([data-enabled]) .search-list-title { + color: var(--v2-text-text-faint); } @media (hover: hover) { .manage-models-rows .search-list-row:hover { background: var(--v2-overlay-simple-overlay-hover); } - - .manage-models-rows .search-list-row:hover::after, - .manage-models-rows .search-list-row:has(+ .search-list-row:hover)::after { - opacity: 0; - } } diff --git a/packages/app/src/providers/models/manage.tsx b/packages/app/src/providers/models/manage.tsx index 90d3c4833d0..d588ef822c5 100644 --- a/packages/app/src/providers/models/manage.tsx +++ b/packages/app/src/providers/models/manage.tsx @@ -11,9 +11,11 @@ import { popularProviders } from "@/providers/catalog/providers" import { useLanguage } from "@/runtime/i18n/language" import { useDialog } from "@opencode/ui/context/dialog" import { DialogConnectProvider } from "@/providers/connect/dialog" +import { SettingsSearchEmpty } from "@/settings/search-empty" import { decode64 } from "@/runtime/persistence/base64" import { consoleModelGroup, ProviderModelSections } from "@/providers/models/provider-group" import "@/settings/settings.css" +import "@/settings/search.css" import "@/shell/search-list.css" import "./manage.css" @@ -32,8 +34,21 @@ export const DialogManageModels: Component = () => { const providerList = (providerID: string) => local.model.list().filter((x) => x.provider.id === providerID) - const providerVisible = (providerID: string) => - providerList(providerID).every((x) => local.model.visible({ modelID: x.id, providerID: x.provider.id })) + const enabledCount = (providerID: string) => + providerList(providerID).filter((x) => local.model.visible({ modelID: x.id, providerID: x.provider.id })).length + + const providerVisible = (providerID: string) => enabledCount(providerID) === providerList(providerID).length + + const providerStatus = (providerID: string) => { + const count = enabledCount(providerID) + const total = providerList(providerID).length + + if (count === 0) return language.t("dialog.model.manage.status.none") + + if (count === total) return language.t("dialog.model.manage.status.all") + + return language.t("dialog.model.manage.status.some", { count, total }) + } const setProviderVisibility = (providerID: string, checked: boolean) => { providerList(providerID).forEach((x) => { @@ -80,6 +95,7 @@ export const DialogManageModels: Component = () => { {(item) => (
event.preventDefault()} onClick={() => setModelVisibility(item, !visible(item))} > @@ -145,12 +161,16 @@ export const DialogManageModels: Component = () => { 0} fallback={ -
- {language.t("dialog.model.empty")} - - "{list.filter()}" - -
+ {language.t("dialog.model.empty")}
} + > + {(query) => ( +
+ +
+ )} + } > { disabled={searching()} onExpandedChange={(key, value) => setStore("collapsed", key, !value)} onSetVisibility={setProviderVisibility} + detail={(group) => {providerStatus(group.category)}} action={(group) => ( - setProviderVisibility(group.category, checked)} - hideLabel + // When only some models are enabled, the action enables the rest. + )} rows={(items) => } /> diff --git a/packages/app/src/providers/models/provider-group.tsx b/packages/app/src/providers/models/provider-group.tsx index 3429e0bf7d2..fd1b39cbdf8 100644 --- a/packages/app/src/providers/models/provider-group.tsx +++ b/packages/app/src/providers/models/provider-group.tsx @@ -25,6 +25,7 @@ function CustomManagedProviderIcon(props: { class?: string }) { } export function ProviderModelIcon(props: { provider: ModelProvider; class?: string }) { + // SAFETY: the cast only lets `includes` look up any string; the type guard narrows on the result. const icon = () => [ props.provider.canonical, @@ -62,6 +63,8 @@ export function ProviderModelSections(props: { rows: (items: T[]) => JSX.Element /** Trailing control in a direct provider's header. */ action?: (group: ModelGroup) => JSX.Element + /** Text after a direct provider's name, such as how many of its models are enabled. */ + detail?: (group: ModelGroup) => JSX.Element onSetVisibility?: (providerID: string, visible: boolean) => void ref?: (providerID: string, element: HTMLElement) => void }) { @@ -95,7 +98,14 @@ export function ProviderModelSections(props: { ? language.t("provider.connect.opencode.freeName") : group.items[0].provider.name - function Header(input: { id: string; icon: JSX.Element; title: JSX.Element; badge?: string; action?: JSX.Element }) { + function Header(input: { + id: string + icon: JSX.Element + title: JSX.Element + badge?: string + detail?: JSX.Element + action?: JSX.Element + }) { return (

{input.action} @@ -137,6 +148,7 @@ export function ProviderModelSections(props: { id={group().category} icon={} title={name(group())} + detail={props.detail?.(group())} action={props.action?.(group())} /> {props.rows(group().items)} diff --git a/packages/app/src/providers/models/select-dialog.css b/packages/app/src/providers/models/select-dialog.css index 817e9e85ad9..712cb7a8e73 100644 --- a/packages/app/src/providers/models/select-dialog.css +++ b/packages/app/src/providers/models/select-dialog.css @@ -125,7 +125,7 @@ [data-component="search-list"] [data-slot="search-list-header"] { height: auto; padding-block: 16px 2px; - padding-inline: 34px 6px; + padding-inline: 12px 6px; background: var(--v2-background-bg-base); color: var(--v2-text-text-faint); font-size: 12px; @@ -186,15 +186,6 @@ letter-spacing: -0.04px; } - [data-slot="model-dialog-check"] { - display: flex; - width: 16px; - flex-shrink: 0; - align-items: center; - justify-content: center; - color: var(--v2-icon-icon-base); - } - [data-slot="model-dialog-name"] { display: flex; min-width: 0; @@ -223,6 +214,14 @@ background: var(--v2-overlay-simple-overlay-hover); } +/* The current model keeps a pressed fill, also while it is the active row. */ +[data-component="dialog-v2"] + .model-dialog + [data-component="search-list"] + [data-slot="search-list-row"][aria-current="true"] { + background: var(--v2-overlay-simple-overlay-pressed); +} + [data-component="menu-v2-content"][data-slot="model-dialog-flyout"] { position: fixed; /* One width for every model, matching the 160px its placement assumes. */ diff --git a/packages/app/src/providers/models/select-dialog.tsx b/packages/app/src/providers/models/select-dialog.tsx index 88356338d7e..1e49df5fc4f 100644 --- a/packages/app/src/providers/models/select-dialog.tsx +++ b/packages/app/src/providers/models/select-dialog.tsx @@ -944,11 +944,6 @@ export function DialogSelectModel(props: { provider?: string; model?: ModelState dispatch({ type: "row.left", into, point: { x: event.clientX, y: event.clientY }, flyout: flyoutRect() }) }} > - - - - - diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 369faacd26e..b7335e2690d 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -161,6 +161,13 @@ export const dict = { "dialog.model.unavailable": "{{model}} (unavailable)", "dialog.model.manage": "Manage models", "dialog.model.manage.description": "Customize which models appear in the model selector.", + "dialog.model.manage.status.none": "No models enabled", + "dialog.model.manage.status.all": "All models enabled", + "dialog.model.manage.status.some": "{{count}} of {{total}} models enabled", + "dialog.model.manage.enableAll": "Enable all", + "dialog.model.manage.disableAll": "Disable all", + "dialog.model.manage.enableAll.label": "Enable all {{provider}} models", + "dialog.model.manage.disableAll.label": "Disable all {{provider}} models", "dialog.model.chatgptPlan": "Using ChatGPT plan", "dialog.model.chatgptManageUsage": "Manage usage", "dialog.model.favorites": "Favorites",