From d0746abae4d2890582143a6d06612d9369f6001a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Wed, 5 Aug 2026 14:09:12 +0200
Subject: [PATCH 01/11] feat(ui): manage visible provider models

Extend the provider settings screen with searchable, virtualized per-provider model visibility controls so large plugin catalogs can be reduced to the models users actually need.

Persist exact model allowlists as CodeNomad UI preferences without rewriting OpenCode configuration. Serialize optimistic preference updates across manager remounts, retain unavailable selections, respect visibility during default selection, and keep active session models usable.

Add localized UI and failure states for every supported locale, pure normalization/filtering coverage, and the regression test to PR CI. Typecheck, the changed-behavior suite, browser-condition tests, and the production UI build pass.
---
 .github/workflows/pr-build.yml                |   1 +
 packages/ui/src/components/model-selector.tsx | 118 ++++++----
 .../provider-auth/provider-manager-modal.tsx  | 112 +++++++---
 .../provider-model-visibility-manager.tsx     | 204 ++++++++++++++++++
 .../ui/src/lib/i18n/messages/de/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/en/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/es/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/fr/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/he/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/ja/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/ne/settings.ts   |  21 ++
 .../ui/src/lib/i18n/messages/ru/settings.ts   |  21 ++
 .../src/lib/i18n/messages/zh-Hans/settings.ts |  21 ++
 packages/ui/src/lib/model-visibility.test.ts  |  43 ++++
 packages/ui/src/lib/model-visibility.ts       |  53 +++++
 packages/ui/src/stores/preferences.tsx        |  83 ++++++-
 packages/ui/src/stores/session-actions.ts     |   7 +
 packages/ui/src/stores/session-models.ts      |  30 ++-
 .../components/provider-model-visibility.css  | 125 +++++++++++
 packages/ui/src/styles/controls.css           |   1 +
 20 files changed, 886 insertions(+), 80 deletions(-)
 create mode 100644 packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
 create mode 100644 packages/ui/src/lib/model-visibility.test.ts
 create mode 100644 packages/ui/src/lib/model-visibility.ts
 create mode 100644 packages/ui/src/styles/components/provider-model-visibility.css

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 02ccb32cf..33d19bc7b 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -109,6 +109,7 @@ jobs:
           packages/ui/src/lib/hooks/use-app-session-capture.test.ts
           packages/ui/src/lib/launch-errors.test.ts
           packages/ui/src/lib/message-selection-position.test.ts
+          packages/ui/src/lib/model-visibility.test.ts
           packages/ui/src/lib/trailing-resync.test.ts
           packages/ui/src/stores/abort-created-workspace-cleanup.test.ts
           packages/ui/src/stores/app-session-reconciliation.test.ts
diff --git a/packages/ui/src/components/model-selector.tsx b/packages/ui/src/components/model-selector.tsx
index fba3680db..a1ad68f65 100644
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -5,8 +5,9 @@ import { ChevronDown, PlugZap, Star } from "lucide-solid"
 import type { Model } from "../types/session"
 import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
-import { uiState, toggleFavoriteModelPreference } from "../stores/preferences"
+import { getProviderModelVisibilityPreference, uiState, toggleFavoriteModelPreference } from "../stores/preferences"
 import { ProviderManagerModal } from "./provider-auth/provider-manager-modal"
+import { isModelVisible } from "../lib/model-visibility"
 const log = getLogger("session")
 
 interface ModelSelectorProps {
@@ -20,6 +21,7 @@ interface FlatModel extends Model {
   providerName: string
   key: string
   searchText: string
+  unavailable?: boolean
 }
 
 interface ModelGroup {
@@ -67,7 +69,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
     }
   })
 
-  const allModels = createMemo<FlatModel[]>(() =>
+  const catalogModels = createMemo<FlatModel[]>(() =>
     instanceProviders().flatMap((p) =>
       p.models.map((m) => ({
         ...m,
@@ -78,6 +80,14 @@ export default function ModelSelector(props: ModelSelectorProps) {
     ),
   )
 
+  const allModels = createMemo(() => catalogModels().filter((model) =>
+    isModelVisible(
+      getProviderModelVisibilityPreference(model.providerId),
+      model.id,
+      model.providerId === props.currentModel.providerId ? props.currentModel.modelId : undefined,
+    ),
+  ))
+
   const sortedModels = createMemo<FlatModel[]>(() =>
     [...allModels()].sort((left, right) => {
       const providerComparison = compareIds(left.providerId, right.providerId)
@@ -106,9 +116,22 @@ export default function ModelSelector(props: ModelSelectorProps) {
 
   const hasFavorites = createMemo(() => favoriteModels().length > 0)
 
-  const currentModelValue = createMemo(() =>
-    allModels().find((m) => m.providerId === props.currentModel.providerId && m.id === props.currentModel.modelId),
-  )
+  const currentModelValue = createMemo<FlatModel | undefined>(() => {
+    const current = props.currentModel
+    const found = catalogModels().find((model) => model.providerId === current.providerId && model.id === current.modelId)
+    if (found) return found
+    if (!current.providerId || !current.modelId) return undefined
+    const providerName = instanceProviders().find((provider) => provider.id === current.providerId)?.name ?? current.providerId
+    return {
+      id: current.modelId,
+      name: t("modelSelector.unavailableModel", { model: current.modelId }),
+      providerId: current.providerId,
+      providerName,
+      key: `${current.providerId}/${current.modelId}`,
+      searchText: `${current.modelId} ${providerName} ${current.providerId}`,
+      unavailable: true,
+    }
+  })
 
   const currentModelIsFavorite = createMemo(() => {
     const current = props.currentModel
@@ -134,10 +157,9 @@ export default function ModelSelector(props: ModelSelectorProps) {
   })
 
   const visibleOptions = createMemo<FlatModel[]>(() => {
-    if (!favoritesOnlyEnabled()) {
-      return sortedModels()
-    }
-    return favoriteModels()
+    const visible = favoritesOnlyEnabled() ? favoriteModels() : sortedModels()
+    const current = currentModelValue()
+    return current?.unavailable ? [current, ...visible] : visible
   })
 
   const groupedVisibleOptions = createMemo<ModelGroup[]>(() => {
@@ -170,7 +192,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
   )
 
   const handleChange = async (value: PickerOption | null) => {
-    if (!value || isProviderHeaderOption(value)) return
+    if (!value || isProviderHeaderOption(value) || value.unavailable) return
     await props.onModelChange({ providerId: value.providerId, modelId: value.id })
   }
 
@@ -278,7 +300,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
         optionValue="key"
         optionTextValue="searchText"
         optionLabel={(option) => (isProviderHeaderOption(option) ? option.providerName : option.name)}
-        optionDisabled={isProviderHeaderOption}
+        optionDisabled={(option) => isProviderHeaderOption(option) || Boolean(option.unavailable)}
         placeholder={t("modelSelector.placeholder.search")}
         defaultFilter={customFilter}
         allowsEmptyCollection
@@ -314,42 +336,44 @@ export default function ModelSelector(props: ModelSelectorProps) {
                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
                   </svg>
                 </Combobox.ItemIndicator>
-                <button
-                  type="button"
-                  class="selector-option-star"
-                  data-active={isFavorite()}
-                  aria-label={
-                    isFavorite()
-                      ? t("modelSelector.favorite.remove")
-                      : t("modelSelector.favorite.add")
-                  }
-                  onPointerDown={preventListboxPress}
-                  onPointerUp={preventListboxPress}
-                  onMouseDown={preventListboxPress}
-                  onMouseUp={preventListboxPress}
-                  onKeyDown={(event) => {
-                    if (event.key !== "Enter" && event.key !== " ") return
-                    event.preventDefault()
-                    event.stopPropagation()
-                    suppressNextClose = true
-                    setTimeout(() => {
-                      suppressNextClose = false
-                    }, 0)
-                  }}
-                  onClick={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                    toggleFavoriteModelPreference({
-                      providerId: model.providerId,
-                      modelId: model.id,
-                    })
-                  }}
-                >
-                  <Star
-                    class="w-4 h-4"
-                    fill={isFavorite() ? "currentColor" : "none"}
-                  />
-                </button>
+                {!model.unavailable && (
+                  <button
+                    type="button"
+                    class="selector-option-star"
+                    data-active={isFavorite()}
+                    aria-label={
+                      isFavorite()
+                        ? t("modelSelector.favorite.remove")
+                        : t("modelSelector.favorite.add")
+                    }
+                    onPointerDown={preventListboxPress}
+                    onPointerUp={preventListboxPress}
+                    onMouseDown={preventListboxPress}
+                    onMouseUp={preventListboxPress}
+                    onKeyDown={(event) => {
+                      if (event.key !== "Enter" && event.key !== " ") return
+                      event.preventDefault()
+                      event.stopPropagation()
+                      suppressNextClose = true
+                      setTimeout(() => {
+                        suppressNextClose = false
+                      }, 0)
+                    }}
+                    onClick={(event) => {
+                      event.preventDefault()
+                      event.stopPropagation()
+                      toggleFavoriteModelPreference({
+                        providerId: model.providerId,
+                        modelId: model.id,
+                      })
+                    }}
+                  >
+                    <Star
+                      class="w-4 h-4"
+                      fill={isFavorite() ? "currentColor" : "none"}
+                    />
+                  </button>
+                )}
               </>
             </Combobox.Item>
           )
diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index a7f4e5b81..772eba0b1 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -17,6 +17,10 @@ import {
 } from "../../lib/provider-auth"
 import { instances } from "../../stores/instances"
 import { fetchProviders } from "../../stores/sessions"
+import {
+  ProviderModelVisibilityManager,
+  type ProviderVisibilityModel,
+} from "./provider-model-visibility-manager"
 
 type AuthStage = "idle" | "prompts" | "authorizing" | "code" | "waiting" | "success" | "error"
 
@@ -38,6 +42,7 @@ type ListedProvider = {
   id: string
   name: string
   modelCount: number
+  models: ProviderVisibilityModel[]
   source: "env" | "config" | "custom" | "api" | "unknown"
 }
 
@@ -50,11 +55,13 @@ interface ProviderManagerModalProps {
   onOpenChange?: (open: boolean) => void
 }
 
-function modelCountFromProvider(provider: any): number {
+function modelsFromProvider(provider: any): ProviderVisibilityModel[] {
   const models = provider?.models
-  if (Array.isArray(models)) return models.length
-  if (models && typeof models === "object") return Object.keys(models).length
-  return 0
+  if (!models || typeof models !== "object" || Array.isArray(models)) return []
+  return Object.entries(models).map(([id, model]) => ({
+    id,
+    name: typeof (model as any)?.name === "string" ? (model as any).name : id,
+  }))
 }
 
 export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props) => {
@@ -66,6 +73,9 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
   const [configData, setConfigData] = createSignal<Record<string, any>>({})
   const [selectedProviderId, setSelectedProviderId] = createSignal<string | null>(null)
   const [activeProviderId, setActiveProviderId] = createSignal<string | null>(null)
+  const [managedProviderId, setManagedProviderId] = createSignal<string | null>(null)
+  const manageModelButtons = new Map<string, HTMLButtonElement>()
+  let managedProviderTriggerId: string | null = null
   const [selectedMethodIndex, setSelectedMethodIndex] = createSignal(0)
   const [apiKey, setApiKey] = createSignal("")
   const [promptValues, setPromptValues] = createSignal<Record<string, string>>({})
@@ -118,6 +128,10 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     availableProviders().filter((provider) => isConfiguredProvider(provider)),
   )
 
+  const managedProvider = createMemo(() =>
+    configuredProviders().find((provider) => provider.id === managedProviderId()) ?? null,
+  )
+
   const getDisconnectMode = (provider: ListedProvider): DisconnectMode => {
     if (provider.source === "env") return "not-disconnectable"
     if (provider.source === "config" || configuredProviderIds().has(provider.id)) return "disable-in-config"
@@ -270,15 +284,19 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
       if (version !== loadVersion) return
       const nextConfigData = (configResponse?.data ?? {}) as Record<string, any>
       const nextConfiguredIds = new Set(Object.keys((nextConfigData.provider ?? {}) as Record<string, unknown>))
-      const listed = ((providerListResponse?.data?.all ?? []) as any[]).map((provider) => ({
-        id: String(provider.id ?? ""),
-        name: String(provider.name ?? provider.id ?? ""),
-        modelCount: modelCountFromProvider(provider),
-        source:
-          provider?.source === "env" || provider?.source === "config" || provider?.source === "custom" || provider?.source === "api"
-            ? provider.source
-            : "unknown",
-      })).filter((provider) => provider.id.length > 0)
+      const listed = ((providerListResponse?.data?.all ?? []) as any[]).map((provider) => {
+        const models = modelsFromProvider(provider)
+        return {
+          id: String(provider.id ?? ""),
+          name: String(provider.name ?? provider.id ?? ""),
+          modelCount: models.length,
+          models,
+          source:
+            provider?.source === "env" || provider?.source === "config" || provider?.source === "custom" || provider?.source === "api"
+              ? provider.source
+              : "unknown",
+        } as ListedProvider
+      }).filter((provider) => provider.id.length > 0)
       setAvailableProviders(listed)
       setConnectedProviderIds(new Set((providerListResponse?.data?.connected ?? []) as string[]))
       setConfiguredProviderIds(nextConfiguredIds)
@@ -309,6 +327,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     setConfiguredProviderIds(new Set<string>())
     setConfigData({})
     setSelectedProviderId(null)
+    setManagedProviderId(null)
     setLoadError(null)
     setLoading(false)
   }
@@ -344,6 +363,24 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     await loadProviderData(authClient).catch(() => undefined)
   }
 
+  async function refreshProviderData() {
+    const authClient = client()
+    const instanceId = props.instanceId
+    if (!authClient) return
+    await (authClient as any).global.dispose().catch(() => undefined)
+    if (client() !== authClient || props.instanceId !== instanceId) return
+    await fetchProviders(instanceId).catch(() => undefined)
+    if (client() !== authClient || props.instanceId !== instanceId) return
+    await loadProviderData(authClient)
+  }
+
+  function closeModelManager() {
+    setManagedProviderId(null)
+    queueMicrotask(() => {
+      if (managedProviderTriggerId) manageModelButtons.get(managedProviderTriggerId)?.focus()
+    })
+  }
+
   async function submitApiAuth(providerId: string, authClient: OpencodeClient, instanceId: string, operationVersion: number) {
     await requestData(
       (authClient as any).auth.set({ providerID: providerId, auth: { type: "api", key: apiKey().trim() } }),
@@ -578,7 +615,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
                 <button type="button" class="selector-button selector-button-primary" disabled={!selectedProviderOption()} onClick={() => resetFlow(selectedProviderOption()?.id ?? null)}>
                   {t("settings.providers.actions.connect")}
                 </button>
-                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => client() && void loadProviderData(client()!)}>
+                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => void refreshProviderData()}>
                   <RefreshCw class={loading() ? "providers-spin-icon" : "providers-button-icon"} />
                   {t("settings.providers.refresh")}
                 </button>
@@ -694,16 +731,43 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
 
               <section class="providers-list-section">
                 <h3 class="settings-card-title">{t("settings.providers.configured.title")}</h3>
-                <Show when={loading()}><div class="providers-loading-row" role="status"><Loader2 class="providers-spin-icon" /><span>{t("settings.providers.loading")}</span></div></Show>
-                <Show when={!loading() && configuredProviders().length === 0}><div class="settings-card-message" role="status">{t("settings.providers.empty.noConfiguredProviders")}</div></Show>
-                <div class="providers-grid">
-                  <For each={configuredProviders()}>{(provider) => (
-                    <article class="providers-card">
-                      <div class="providers-card-main"><div class="providers-card-mark"><ShieldCheck class="providers-card-mark-icon" /></div><div class="providers-card-copy"><div class="providers-card-title-row"><h4 class="providers-card-title">{provider.name || provider.id}</h4></div><p class="providers-card-meta">{provider.id}</p><p class="providers-card-methods">{methodSummary(provider.id)}</p><p class="providers-card-source">{describeProviderSource(provider)}</p></div></div>
-                       <div class="providers-card-footer"><span class="providers-model-count">{provider.modelCount === 1 ? t("settings.providers.models.one", { count: provider.modelCount }) : t("settings.providers.models.other", { count: provider.modelCount })}</span><Show when={getDisconnectMode(provider) !== "disable-in-config"}><button type="button" class="selector-button selector-button-secondary providers-disconnect-button" disabled={getDisconnectMode(provider) === "not-disconnectable" || stage() !== "idle"} onClick={() => void disconnectProvider(provider.id)} title={getDisconnectMode(provider) === "not-disconnectable" ? t("settings.providers.source.env") : t("settings.providers.actions.disconnect")}>{t("settings.providers.actions.disconnect")}</button></Show></div>
-                    </article>
-                  )}</For>
-                </div>
+                <Show when={managedProvider()} fallback={
+                  <>
+                    <Show when={loading()}><div class="providers-loading-row" role="status"><Loader2 class="providers-spin-icon" /><span>{t("settings.providers.loading")}</span></div></Show>
+                    <Show when={!loading() && configuredProviders().length === 0}><div class="settings-card-message" role="status">{t("settings.providers.empty.noConfiguredProviders")}</div></Show>
+                    <div class="providers-grid">
+                      <For each={configuredProviders()}>{(provider) => (
+                        <article class="providers-card">
+                          <div class="providers-card-main"><div class="providers-card-mark"><ShieldCheck class="providers-card-mark-icon" /></div><div class="providers-card-copy"><div class="providers-card-title-row"><h4 class="providers-card-title">{provider.name || provider.id}</h4></div><p class="providers-card-meta">{provider.id}</p><p class="providers-card-methods">{methodSummary(provider.id)}</p><p class="providers-card-source">{describeProviderSource(provider)}</p></div></div>
+                          <div class="providers-card-footer">
+                            <span class="providers-model-count">{provider.modelCount === 1 ? t("settings.providers.models.one", { count: provider.modelCount }) : t("settings.providers.models.other", { count: provider.modelCount })}</span>
+                            <div class="provider-model-card-actions">
+                              <button
+                                ref={(element) => manageModelButtons.set(provider.id, element)}
+                                type="button"
+                                class="selector-button selector-button-secondary"
+                                onClick={() => {
+                                  managedProviderTriggerId = provider.id
+                                  setManagedProviderId(provider.id)
+                                }}
+                              >{t("settings.providers.actions.manageModels")}</button>
+                              <Show when={getDisconnectMode(provider) !== "disable-in-config"}><button type="button" class="selector-button selector-button-secondary providers-disconnect-button" disabled={getDisconnectMode(provider) === "not-disconnectable" || stage() !== "idle"} onClick={() => void disconnectProvider(provider.id)} title={getDisconnectMode(provider) === "not-disconnectable" ? t("settings.providers.source.env") : t("settings.providers.actions.disconnect")}>{t("settings.providers.actions.disconnect")}</button></Show>
+                            </div>
+                          </div>
+                        </article>
+                      )}</For>
+                    </div>
+                  </>
+                }>
+                  {(provider) => (
+                    <ProviderModelVisibilityManager
+                      providerId={provider().id}
+                      providerName={provider().name || provider().id}
+                      models={provider().models}
+                      onBack={closeModelManager}
+                    />
+                  )}
+                </Show>
               </section>
             </Show>
           </div>
diff --git a/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx b/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
new file mode 100644
index 000000000..cf3b2f19b
--- /dev/null
+++ b/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
@@ -0,0 +1,204 @@
+import { VList } from "virtua/solid"
+import { ArrowLeft } from "lucide-solid"
+import { createEffect, createMemo, createSignal, on, onMount, Show, type Component } from "solid-js"
+import { useI18n } from "../../lib/i18n"
+import {
+  getUnavailableSelectedModelIds,
+  normalizeModelVisibilityPreference,
+  seedCustomModelVisibility,
+  type ModelVisibilityPreference,
+} from "../../lib/model-visibility"
+import { useConfig } from "../../stores/preferences"
+
+export interface ProviderVisibilityModel {
+  id: string
+  name: string
+}
+
+interface ProviderModelVisibilityManagerProps {
+  providerId: string
+  providerName: string
+  models: readonly ProviderVisibilityModel[]
+  onBack: () => void
+}
+
+const compareModel = (left: ProviderVisibilityModel, right: ProviderVisibilityModel) =>
+  left.name.localeCompare(right.name, undefined, { sensitivity: "base" }) ||
+  left.id.localeCompare(right.id, undefined, { sensitivity: "base" })
+
+export const ProviderModelVisibilityManager: Component<ProviderModelVisibilityManagerProps> = (props) => {
+  const { t } = useI18n()
+  const {
+    getProviderModelVisibilityPreference,
+    providerModelVisibilitySaveFailed,
+    setProviderModelVisibility,
+  } = useConfig()
+  const [query, setQuery] = createSignal("")
+  const [preference, setPreference] = createSignal<ModelVisibilityPreference>({ mode: "all" })
+  const headingId = "provider-model-visibility-heading"
+  let searchInput: HTMLInputElement | undefined
+
+  const models = createMemo(() => [...props.models].sort(compareModel))
+  const modelIds = createMemo(() => models().map((model) => model.id))
+  const selectedIds = createMemo(() => {
+    const saved = preference()
+    return new Set(saved.mode === "custom" ? saved.modelIds : modelIds())
+  })
+  const selectedCurrentCount = createMemo(() => modelIds().filter((id) => selectedIds().has(id)).length)
+  const unavailableCount = createMemo(() =>
+    getUnavailableSelectedModelIds(preference(), modelIds()).length,
+  )
+  const filteredModels = createMemo(() => {
+    const value = query().trim().toLocaleLowerCase()
+    if (!value) return models()
+    return models().filter((model) =>
+      model.name.toLocaleLowerCase().includes(value) || model.id.toLocaleLowerCase().includes(value),
+    )
+  })
+
+  createEffect(on(() => props.providerId, (providerId) => {
+    setQuery("")
+    setPreference(getProviderModelVisibilityPreference(providerId))
+  }))
+
+  createEffect(() => {
+    setPreference(getProviderModelVisibilityPreference(props.providerId))
+  })
+
+  onMount(() => queueMicrotask(() => searchInput?.focus()))
+
+  const save = (next: ModelVisibilityPreference) => {
+    const normalized = normalizeModelVisibilityPreference(next)
+    setPreference(normalized)
+    void setProviderModelVisibility(props.providerId, normalized).catch(() => undefined)
+  }
+
+  const setMode = (mode: "all" | "custom") => {
+    if (mode === "all") {
+      save({ mode: "all" })
+    } else if (preference().mode !== "custom") {
+      save(seedCustomModelVisibility(modelIds()))
+    }
+  }
+
+  const selectAll = () => {
+    const saved = preference()
+    const unavailable = saved.mode === "custom" ? getUnavailableSelectedModelIds(saved, modelIds()) : []
+    save(seedCustomModelVisibility([...modelIds(), ...unavailable]))
+  }
+
+  const toggleModel = (modelId: string, checked: boolean) => {
+    const saved = preference()
+    const ids = saved.mode === "custom" ? saved.modelIds : modelIds()
+    save({
+      mode: "custom",
+      modelIds: checked ? [...ids, modelId] : ids.filter((id) => id !== modelId),
+    })
+  }
+
+  return (
+    <section class="provider-model-visibility" aria-labelledby={headingId}>
+      <header class="provider-model-visibility-header">
+        <button type="button" class="selector-button selector-button-secondary" onClick={props.onBack}>
+          <ArrowLeft class="w-4 h-4" />
+          {t("settings.providers.modelVisibility.back")}
+        </button>
+        <div>
+          <h4 id={headingId} class="settings-card-title">
+            {t("settings.providers.modelVisibility.title", { provider: props.providerName })}
+          </h4>
+          <p class="settings-card-subtitle">{t("settings.providers.modelVisibility.subtitle")}</p>
+        </div>
+      </header>
+
+      <fieldset class="provider-model-visibility-modes">
+        <legend class="sr-only">{t("settings.providers.modelVisibility.mode.label")}</legend>
+        <label class="provider-model-visibility-mode">
+          <input
+            type="radio"
+            name={`model-visibility-${props.providerId}`}
+            checked={preference().mode === "all"}
+            onChange={() => setMode("all")}
+          />
+          <span><strong>{t("settings.providers.modelVisibility.mode.all")}</strong><small>{t("settings.providers.modelVisibility.mode.all.description")}</small></span>
+        </label>
+        <label class="provider-model-visibility-mode">
+          <input
+            type="radio"
+            name={`model-visibility-${props.providerId}`}
+            checked={preference().mode === "custom"}
+            onChange={() => setMode("custom")}
+          />
+          <span><strong>{t("settings.providers.modelVisibility.mode.custom")}</strong><small>{t("settings.providers.modelVisibility.mode.custom.description")}</small></span>
+        </label>
+      </fieldset>
+
+      <div class="provider-model-visibility-toolbar">
+        <label class="sr-only" for="provider-model-visibility-search">{t("settings.providers.modelVisibility.search.label")}</label>
+        <input
+          ref={searchInput}
+          id="provider-model-visibility-search"
+          type="search"
+          class="providers-input"
+          value={query()}
+          onInput={(event) => setQuery(event.currentTarget.value)}
+          placeholder={t("settings.providers.modelVisibility.search.placeholder")}
+        />
+        <span class="provider-model-visibility-count" role="status">
+          {t("settings.providers.modelVisibility.count", { selected: selectedCurrentCount(), total: models().length })}
+        </span>
+        <button type="button" class="selector-button selector-button-secondary" disabled={preference().mode !== "custom"} onClick={selectAll}>
+          {t("settings.providers.modelVisibility.selectAll")}
+        </button>
+        <button type="button" class="selector-button selector-button-secondary" disabled={preference().mode !== "custom"} onClick={() => save({ mode: "custom", modelIds: [] })}>
+          {t("settings.providers.modelVisibility.selectNone")}
+        </button>
+      </div>
+
+      <Show when={providerModelVisibilitySaveFailed(props.providerId)}>
+        <p class="settings-error-message" role="alert">{t("settings.providers.modelVisibility.saveFailed")}</p>
+      </Show>
+
+      <Show when={unavailableCount() > 0}>
+        <p class="provider-model-visibility-unavailable" role="status">
+          {unavailableCount() === 1
+            ? t("settings.providers.modelVisibility.unavailable.one", { count: unavailableCount() })
+            : t("settings.providers.modelVisibility.unavailable.other", { count: unavailableCount() })}
+        </p>
+      </Show>
+
+      <Show
+        when={filteredModels().length > 0}
+        fallback={<p class="settings-card-message" role="status">{t("settings.providers.modelVisibility.empty")}</p>}
+      >
+        <VList
+          class="provider-model-visibility-list"
+          data={filteredModels()}
+          itemSize={54}
+          role="list"
+          aria-label={t("settings.providers.modelVisibility.listAriaLabel", { provider: props.providerName })}
+        >
+          {(model) => {
+            const position = () => filteredModels().findIndex((item) => item.id === model.id) + 1
+            return (
+            <label
+              class="provider-model-visibility-item"
+              role="listitem"
+              aria-posinset={position()}
+              aria-setsize={filteredModels().length}
+            >
+              <input
+                type="checkbox"
+                checked={selectedIds().has(model.id)}
+                disabled={preference().mode !== "custom"}
+                onChange={(event) => toggleModel(model.id, event.currentTarget.checked)}
+              />
+              <span><strong>{model.name || model.id}</strong><small dir="ltr">{model.id}</small></span>
+            </label>
+            )
+          }}
+        </VList>
+      </Show>
+    </section>
+  )
+}
diff --git a/packages/ui/src/lib/i18n/messages/de/settings.ts b/packages/ui/src/lib/i18n/messages/de/settings.ts
index 49794fa81..5f57b5e98 100644
--- a/packages/ui/src/lib/i18n/messages/de/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/de/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "Zu Favoriten hinzufügen",
   "modelSelector.favorite.remove": "Aus Favoriten entfernen",
   "modelSelector.manageProviders": "Anbieter verwalten",
+  "modelSelector.unavailableModel": "{model} (nicht verfügbar)",
+  "modelSelector.error.noVisibleModels": "Wähle vor dem Senden einer Nachricht mindestens ein sichtbares Modell aus.",
+  "settings.providers.actions.manageModels": "Modelle verwalten",
+  "settings.providers.modelVisibility.back": "Zurück zu Anbietern",
+  "settings.providers.modelVisibility.title": "Modelle für {provider}",
+  "settings.providers.modelVisibility.subtitle": "Wählen Sie, welche Modelle CodeNomad in der Modellauswahl anzeigt.",
+  "settings.providers.modelVisibility.mode.label": "Modellsichtbarkeit",
+  "settings.providers.modelVisibility.mode.all": "Alle Modelle",
+  "settings.providers.modelVisibility.mode.all.description": "Aktuelle und neu gemeldete Modelle anzeigen.",
+  "settings.providers.modelVisibility.mode.custom": "Benutzerdefiniert",
+  "settings.providers.modelVisibility.mode.custom.description": "Nur ausgewählte Modell-IDs anzeigen.",
+  "settings.providers.modelVisibility.search.label": "Anbietermodelle suchen",
+  "settings.providers.modelVisibility.search.placeholder": "Nach Modellname oder ID suchen...",
+  "settings.providers.modelVisibility.count": "{selected} von {total} ausgewählt",
+  "settings.providers.modelVisibility.selectAll": "Alle auswählen",
+  "settings.providers.modelVisibility.selectNone": "Keine auswählen",
+  "settings.providers.modelVisibility.unavailable.one": "{count} ausgewähltes Modell ist derzeit nicht verfügbar.",
+  "settings.providers.modelVisibility.unavailable.other": "{count} ausgewählte Modelle sind derzeit nicht verfügbar.",
+  "settings.providers.modelVisibility.empty": "Keine Modelle entsprechen dieser Suche.",
+  "settings.providers.modelVisibility.listAriaLabel": "Modelle für {provider}",
+  "settings.providers.modelVisibility.saveFailed": "Die Modellsichtbarkeit konnte nicht gespeichert werden.",
 
   "thinkingSelector.variant.default": "Standard",
   "thinkingSelector.label": "Denken: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/en/settings.ts b/packages/ui/src/lib/i18n/messages/en/settings.ts
index 7e79f5e06..76f6d7a00 100644
--- a/packages/ui/src/lib/i18n/messages/en/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/en/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "Add to favorites",
   "modelSelector.favorite.remove": "Remove from favorites",
   "modelSelector.manageProviders": "Manage Providers",
+  "modelSelector.unavailableModel": "{model} (unavailable)",
+  "modelSelector.error.noVisibleModels": "Select at least one visible model before sending a message.",
+  "settings.providers.actions.manageModels": "Manage models",
+  "settings.providers.modelVisibility.back": "Back to providers",
+  "settings.providers.modelVisibility.title": "Models for {provider}",
+  "settings.providers.modelVisibility.subtitle": "Choose which models CodeNomad shows in model selectors.",
+  "settings.providers.modelVisibility.mode.label": "Model visibility mode",
+  "settings.providers.modelVisibility.mode.all": "All models",
+  "settings.providers.modelVisibility.mode.all.description": "Show current and newly reported models.",
+  "settings.providers.modelVisibility.mode.custom": "Custom",
+  "settings.providers.modelVisibility.mode.custom.description": "Show only selected model IDs.",
+  "settings.providers.modelVisibility.search.label": "Search provider models",
+  "settings.providers.modelVisibility.search.placeholder": "Search by model name or ID...",
+  "settings.providers.modelVisibility.count": "{selected} of {total} selected",
+  "settings.providers.modelVisibility.selectAll": "Select all",
+  "settings.providers.modelVisibility.selectNone": "Select none",
+  "settings.providers.modelVisibility.unavailable.one": "{count} selected model is currently unavailable.",
+  "settings.providers.modelVisibility.unavailable.other": "{count} selected models are currently unavailable.",
+  "settings.providers.modelVisibility.empty": "No models match this search.",
+  "settings.providers.modelVisibility.listAriaLabel": "Models for {provider}",
+  "settings.providers.modelVisibility.saveFailed": "Failed to save model visibility.",
 
   "thinkingSelector.variant.default": "Default",
   "thinkingSelector.label": "Thinking: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/es/settings.ts b/packages/ui/src/lib/i18n/messages/es/settings.ts
index 268c30623..de135063c 100644
--- a/packages/ui/src/lib/i18n/messages/es/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/es/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "Agregar a favoritos",
   "modelSelector.favorite.remove": "Quitar de favoritos",
   "modelSelector.manageProviders": "Gestionar proveedores",
+  "modelSelector.unavailableModel": "{model} (no disponible)",
+  "modelSelector.error.noVisibleModels": "Selecciona al menos un modelo visible antes de enviar un mensaje.",
+  "settings.providers.actions.manageModels": "Gestionar modelos",
+  "settings.providers.modelVisibility.back": "Volver a proveedores",
+  "settings.providers.modelVisibility.title": "Modelos de {provider}",
+  "settings.providers.modelVisibility.subtitle": "Elige qué modelos muestra CodeNomad en los selectores.",
+  "settings.providers.modelVisibility.mode.label": "Modo de visibilidad de modelos",
+  "settings.providers.modelVisibility.mode.all": "Todos los modelos",
+  "settings.providers.modelVisibility.mode.all.description": "Mostrar modelos actuales y nuevos.",
+  "settings.providers.modelVisibility.mode.custom": "Personalizado",
+  "settings.providers.modelVisibility.mode.custom.description": "Mostrar solo los ID de modelo seleccionados.",
+  "settings.providers.modelVisibility.search.label": "Buscar modelos del proveedor",
+  "settings.providers.modelVisibility.search.placeholder": "Buscar por nombre o ID del modelo...",
+  "settings.providers.modelVisibility.count": "{selected} de {total} seleccionados",
+  "settings.providers.modelVisibility.selectAll": "Seleccionar todos",
+  "settings.providers.modelVisibility.selectNone": "No seleccionar ninguno",
+  "settings.providers.modelVisibility.unavailable.one": "{count} modelo seleccionado no está disponible actualmente.",
+  "settings.providers.modelVisibility.unavailable.other": "{count} modelos seleccionados no están disponibles actualmente.",
+  "settings.providers.modelVisibility.empty": "Ningún modelo coincide con esta búsqueda.",
+  "settings.providers.modelVisibility.listAriaLabel": "Modelos de {provider}",
+  "settings.providers.modelVisibility.saveFailed": "No se pudo guardar la visibilidad de los modelos.",
 
   "thinkingSelector.variant.default": "Por defecto",
   "thinkingSelector.label": "Pensamiento: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/fr/settings.ts b/packages/ui/src/lib/i18n/messages/fr/settings.ts
index 65c924f73..02455aef2 100644
--- a/packages/ui/src/lib/i18n/messages/fr/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "Ajouter aux favoris",
   "modelSelector.favorite.remove": "Retirer des favoris",
   "modelSelector.manageProviders": "Gérer les fournisseurs",
+  "modelSelector.unavailableModel": "{model} (indisponible)",
+  "modelSelector.error.noVisibleModels": "Sélectionnez au moins un modèle visible avant d’envoyer un message.",
+  "settings.providers.actions.manageModels": "Gérer les modèles",
+  "settings.providers.modelVisibility.back": "Retour aux fournisseurs",
+  "settings.providers.modelVisibility.title": "Modèles pour {provider}",
+  "settings.providers.modelVisibility.subtitle": "Choisissez les modèles affichés par CodeNomad dans les sélecteurs.",
+  "settings.providers.modelVisibility.mode.label": "Mode de visibilité des modèles",
+  "settings.providers.modelVisibility.mode.all": "Tous les modèles",
+  "settings.providers.modelVisibility.mode.all.description": "Afficher les modèles actuels et nouveaux.",
+  "settings.providers.modelVisibility.mode.custom": "Personnalisé",
+  "settings.providers.modelVisibility.mode.custom.description": "Afficher uniquement les identifiants sélectionnés.",
+  "settings.providers.modelVisibility.search.label": "Rechercher les modèles du fournisseur",
+  "settings.providers.modelVisibility.search.placeholder": "Rechercher par nom ou identifiant...",
+  "settings.providers.modelVisibility.count": "{selected} sur {total} sélectionnés",
+  "settings.providers.modelVisibility.selectAll": "Tout sélectionner",
+  "settings.providers.modelVisibility.selectNone": "Tout désélectionner",
+  "settings.providers.modelVisibility.unavailable.one": "{count} modèle sélectionné est actuellement indisponible.",
+  "settings.providers.modelVisibility.unavailable.other": "{count} modèles sélectionnés sont actuellement indisponibles.",
+  "settings.providers.modelVisibility.empty": "Aucun modèle ne correspond à cette recherche.",
+  "settings.providers.modelVisibility.listAriaLabel": "Modèles pour {provider}",
+  "settings.providers.modelVisibility.saveFailed": "Impossible d’enregistrer la visibilité des modèles.",
 
   "thinkingSelector.variant.default": "Par défaut",
   "thinkingSelector.label": "Réflexion : {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/he/settings.ts b/packages/ui/src/lib/i18n/messages/he/settings.ts
index a7f9c7fb6..692da0e56 100644
--- a/packages/ui/src/lib/i18n/messages/he/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/he/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "הוסף למועדפים",
   "modelSelector.favorite.remove": "הסר ממועדפים",
   "modelSelector.manageProviders": "נהל ספקים",
+  "modelSelector.unavailableModel": "{model} (לא זמין)",
+  "modelSelector.error.noVisibleModels": "יש לבחור לפחות מודל גלוי אחד לפני שליחת הודעה.",
+  "settings.providers.actions.manageModels": "ניהול מודלים",
+  "settings.providers.modelVisibility.back": "חזרה לספקים",
+  "settings.providers.modelVisibility.title": "מודלים עבור {provider}",
+  "settings.providers.modelVisibility.subtitle": "בחר אילו מודלים CodeNomad יציג בבוררי המודלים.",
+  "settings.providers.modelVisibility.mode.label": "מצב נראות מודלים",
+  "settings.providers.modelVisibility.mode.all": "כל המודלים",
+  "settings.providers.modelVisibility.mode.all.description": "הצג מודלים נוכחיים וחדשים.",
+  "settings.providers.modelVisibility.mode.custom": "מותאם אישית",
+  "settings.providers.modelVisibility.mode.custom.description": "הצג רק מזהי מודלים שנבחרו.",
+  "settings.providers.modelVisibility.search.label": "חיפוש מודלים של הספק",
+  "settings.providers.modelVisibility.search.placeholder": "חיפוש לפי שם או מזהה מודל...",
+  "settings.providers.modelVisibility.count": "{selected} מתוך {total} נבחרו",
+  "settings.providers.modelVisibility.selectAll": "בחר הכול",
+  "settings.providers.modelVisibility.selectNone": "בטל בחירת הכול",
+  "settings.providers.modelVisibility.unavailable.one": "מודל נבחר אחד אינו זמין כעת.",
+  "settings.providers.modelVisibility.unavailable.other": "{count} מודלים שנבחרו אינם זמינים כעת.",
+  "settings.providers.modelVisibility.empty": "אין מודלים התואמים לחיפוש.",
+  "settings.providers.modelVisibility.listAriaLabel": "מודלים עבור {provider}",
+  "settings.providers.modelVisibility.saveFailed": "שמירת נראות המודלים נכשלה.",
 
   "thinkingSelector.variant.default": "ברירת מחדל",
   "thinkingSelector.label": "חשיבה: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ja/settings.ts b/packages/ui/src/lib/i18n/messages/ja/settings.ts
index 6b266a108..4fd1fec78 100644
--- a/packages/ui/src/lib/i18n/messages/ja/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "お気に入りに追加",
   "modelSelector.favorite.remove": "お気に入りから削除",
   "modelSelector.manageProviders": "プロバイダーを管理",
+  "modelSelector.unavailableModel": "{model}（利用不可）",
+  "modelSelector.error.noVisibleModels": "メッセージを送信する前に、表示するモデルを1つ以上選択してください。",
+  "settings.providers.actions.manageModels": "モデルを管理",
+  "settings.providers.modelVisibility.back": "プロバイダーに戻る",
+  "settings.providers.modelVisibility.title": "{provider} のモデル",
+  "settings.providers.modelVisibility.subtitle": "CodeNomad のモデル選択に表示するモデルを選びます。",
+  "settings.providers.modelVisibility.mode.label": "モデル表示モード",
+  "settings.providers.modelVisibility.mode.all": "すべてのモデル",
+  "settings.providers.modelVisibility.mode.all.description": "現在および新しく報告されたモデルを表示します。",
+  "settings.providers.modelVisibility.mode.custom": "カスタム",
+  "settings.providers.modelVisibility.mode.custom.description": "選択したモデル ID のみ表示します。",
+  "settings.providers.modelVisibility.search.label": "プロバイダーのモデルを検索",
+  "settings.providers.modelVisibility.search.placeholder": "モデル名または ID で検索...",
+  "settings.providers.modelVisibility.count": "{total} 件中 {selected} 件を選択",
+  "settings.providers.modelVisibility.selectAll": "すべて選択",
+  "settings.providers.modelVisibility.selectNone": "すべて解除",
+  "settings.providers.modelVisibility.unavailable.one": "選択したモデル {count} 件は現在利用できません。",
+  "settings.providers.modelVisibility.unavailable.other": "選択したモデル {count} 件は現在利用できません。",
+  "settings.providers.modelVisibility.empty": "検索に一致するモデルはありません。",
+  "settings.providers.modelVisibility.listAriaLabel": "{provider} のモデル",
+  "settings.providers.modelVisibility.saveFailed": "モデルの表示設定を保存できませんでした。",
 
   "thinkingSelector.variant.default": "デフォルト",
   "thinkingSelector.label": "思考: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ne/settings.ts b/packages/ui/src/lib/i18n/messages/ne/settings.ts
index cbfbb0953..0098295b9 100644
--- a/packages/ui/src/lib/i18n/messages/ne/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ne/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "मनपर्नेमा थप्नुहोस्",
   "modelSelector.favorite.remove": "मनपर्नेबाट हटाउनुहोस्",
   "modelSelector.manageProviders": "प्रदायकहरू व्यवस्थापन गर्नुहोस्",
+  "modelSelector.unavailableModel": "{model} (उपलब्ध छैन)",
+  "modelSelector.error.noVisibleModels": "सन्देश पठाउनु अघि कम्तीमा एउटा देखिने मोडेल चयन गर्नुहोस्।",
+  "settings.providers.actions.manageModels": "मोडेलहरू व्यवस्थापन गर्नुहोस्",
+  "settings.providers.modelVisibility.back": "प्रदायकहरूमा फर्कनुहोस्",
+  "settings.providers.modelVisibility.title": "{provider} का मोडेलहरू",
+  "settings.providers.modelVisibility.subtitle": "CodeNomad का मोडेल चयनकर्तामा देखिने मोडेलहरू छान्नुहोस्।",
+  "settings.providers.modelVisibility.mode.label": "मोडेल दृश्यता मोड",
+  "settings.providers.modelVisibility.mode.all": "सबै मोडेलहरू",
+  "settings.providers.modelVisibility.mode.all.description": "हालका र नयाँ मोडेलहरू देखाउनुहोस्।",
+  "settings.providers.modelVisibility.mode.custom": "अनुकूलित",
+  "settings.providers.modelVisibility.mode.custom.description": "चयन गरिएका मोडेल ID मात्र देखाउनुहोस्।",
+  "settings.providers.modelVisibility.search.label": "प्रदायकका मोडेलहरू खोज्नुहोस्",
+  "settings.providers.modelVisibility.search.placeholder": "मोडेल नाम वा ID बाट खोज्नुहोस्...",
+  "settings.providers.modelVisibility.count": "{total} मध्ये {selected} चयन गरियो",
+  "settings.providers.modelVisibility.selectAll": "सबै चयन गर्नुहोस्",
+  "settings.providers.modelVisibility.selectNone": "कुनै पनि चयन नगर्नुहोस्",
+  "settings.providers.modelVisibility.unavailable.one": "चयन गरिएको {count} मोडेल हाल उपलब्ध छैन।",
+  "settings.providers.modelVisibility.unavailable.other": "चयन गरिएका {count} मोडेलहरू हाल उपलब्ध छैनन्।",
+  "settings.providers.modelVisibility.empty": "यो खोजसँग मिल्ने मोडेल छैन।",
+  "settings.providers.modelVisibility.listAriaLabel": "{provider} का मोडेलहरू",
+  "settings.providers.modelVisibility.saveFailed": "मोडेल दृश्यता सुरक्षित गर्न असफल भयो।",
 
   "thinkingSelector.variant.default": "पूर्वनिर्धारित",
   "thinkingSelector.label": "सोचाइ: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ru/settings.ts b/packages/ui/src/lib/i18n/messages/ru/settings.ts
index d364ab5a6..01317d680 100644
--- a/packages/ui/src/lib/i18n/messages/ru/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "Добавить в избранное",
   "modelSelector.favorite.remove": "Удалить из избранного",
   "modelSelector.manageProviders": "Управление провайдерами",
+  "modelSelector.unavailableModel": "{model} (недоступна)",
+  "modelSelector.error.noVisibleModels": "Перед отправкой сообщения выберите хотя бы одну видимую модель.",
+  "settings.providers.actions.manageModels": "Управление моделями",
+  "settings.providers.modelVisibility.back": "Назад к провайдерам",
+  "settings.providers.modelVisibility.title": "Модели {provider}",
+  "settings.providers.modelVisibility.subtitle": "Выберите модели, которые CodeNomad показывает в списках выбора.",
+  "settings.providers.modelVisibility.mode.label": "Режим видимости моделей",
+  "settings.providers.modelVisibility.mode.all": "Все модели",
+  "settings.providers.modelVisibility.mode.all.description": "Показывать текущие и новые модели.",
+  "settings.providers.modelVisibility.mode.custom": "Выборочно",
+  "settings.providers.modelVisibility.mode.custom.description": "Показывать только выбранные идентификаторы моделей.",
+  "settings.providers.modelVisibility.search.label": "Поиск моделей провайдера",
+  "settings.providers.modelVisibility.search.placeholder": "Поиск по имени или ID модели...",
+  "settings.providers.modelVisibility.count": "Выбрано {selected} из {total}",
+  "settings.providers.modelVisibility.selectAll": "Выбрать все",
+  "settings.providers.modelVisibility.selectNone": "Снять выбор",
+  "settings.providers.modelVisibility.unavailable.one": "{count} выбранная модель сейчас недоступна.",
+  "settings.providers.modelVisibility.unavailable.other": "{count} выбранных моделей сейчас недоступны.",
+  "settings.providers.modelVisibility.empty": "Нет моделей, соответствующих поиску.",
+  "settings.providers.modelVisibility.listAriaLabel": "Модели {provider}",
+  "settings.providers.modelVisibility.saveFailed": "Не удалось сохранить видимость моделей.",
 
   "thinkingSelector.variant.default": "По умолчанию",
   "thinkingSelector.label": "Размышления: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
index 1eed86ce0..c104f2ce8 100644
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
@@ -33,6 +33,27 @@ export const settingsMessages = {
   "modelSelector.favorite.add": "添加到收藏",
   "modelSelector.favorite.remove": "从收藏移除",
   "modelSelector.manageProviders": "管理提供商",
+  "modelSelector.unavailableModel": "{model}（不可用）",
+  "modelSelector.error.noVisibleModels": "发送消息前，请至少选择一个可见模型。",
+  "settings.providers.actions.manageModels": "管理模型",
+  "settings.providers.modelVisibility.back": "返回提供商列表",
+  "settings.providers.modelVisibility.title": "{provider} 的模型",
+  "settings.providers.modelVisibility.subtitle": "选择 CodeNomad 在模型选择器中显示的模型。",
+  "settings.providers.modelVisibility.mode.label": "模型可见性模式",
+  "settings.providers.modelVisibility.mode.all": "所有模型",
+  "settings.providers.modelVisibility.mode.all.description": "显示当前和新报告的模型。",
+  "settings.providers.modelVisibility.mode.custom": "自定义",
+  "settings.providers.modelVisibility.mode.custom.description": "仅显示已选择的模型 ID。",
+  "settings.providers.modelVisibility.search.label": "搜索提供商模型",
+  "settings.providers.modelVisibility.search.placeholder": "按模型名称或 ID 搜索...",
+  "settings.providers.modelVisibility.count": "已选择 {selected}/{total}",
+  "settings.providers.modelVisibility.selectAll": "全选",
+  "settings.providers.modelVisibility.selectNone": "全部取消",
+  "settings.providers.modelVisibility.unavailable.one": "当前有 {count} 个已选模型不可用。",
+  "settings.providers.modelVisibility.unavailable.other": "当前有 {count} 个已选模型不可用。",
+  "settings.providers.modelVisibility.empty": "没有与搜索匹配的模型。",
+  "settings.providers.modelVisibility.listAriaLabel": "{provider} 的模型",
+  "settings.providers.modelVisibility.saveFailed": "无法保存模型可见性设置。",
 
   "thinkingSelector.variant.default": "默认",
   "thinkingSelector.label": "思考：{variant}",
diff --git a/packages/ui/src/lib/model-visibility.test.ts b/packages/ui/src/lib/model-visibility.test.ts
new file mode 100644
index 000000000..31547e2f5
--- /dev/null
+++ b/packages/ui/src/lib/model-visibility.test.ts
@@ -0,0 +1,43 @@
+import assert from "node:assert/strict"
+import test from "node:test"
+import {
+  getUnavailableSelectedModelIds,
+  isModelVisible,
+  normalizeModelVisibilityPreference,
+  normalizeModelVisibilityPreferences,
+  seedCustomModelVisibility,
+} from "./model-visibility"
+
+test("normalizes malformed preferences fail-open", () => {
+  assert.deepEqual(normalizeModelVisibilityPreference(null), { mode: "all" })
+  assert.deepEqual(normalizeModelVisibilityPreference({ mode: "custom" }), { mode: "all" })
+  assert.deepEqual(normalizeModelVisibilityPreferences([]), {})
+  assert.deepEqual(normalizeModelVisibilityPreferences({ broken: { mode: "nope" } }), {
+    broken: { mode: "all" },
+  })
+})
+
+test("keeps unique non-empty exact IDs without catalog-based deletion", () => {
+  assert.deepEqual(
+    normalizeModelVisibilityPreference({ mode: "custom", modelIds: ["Model-A", "model-a", "", "Model-A", 7] }),
+    { mode: "custom", modelIds: ["Model-A", "model-a"] },
+  )
+})
+
+test("matches IDs case-sensitively and overrides a hidden current model", () => {
+  const preference = { mode: "custom", modelIds: ["Model-A"] } as const
+  assert.equal(isModelVisible(preference, "Model-A"), true)
+  assert.equal(isModelVisible(preference, "model-a"), false)
+  assert.equal(isModelVisible(preference, "hidden", "hidden"), true)
+})
+
+test("new models follow mode while disappeared selections are retained", () => {
+  const custom = { mode: "custom", modelIds: ["known", "disappeared"] } as const
+  assert.equal(isModelVisible(custom, "new"), false)
+  assert.equal(isModelVisible({ mode: "all" }, "new"), true)
+  assert.deepEqual(getUnavailableSelectedModelIds(custom, ["known", "new"]), ["disappeared"])
+  assert.deepEqual(seedCustomModelVisibility(["known", "new", "known"]), {
+    mode: "custom",
+    modelIds: ["known", "new"],
+  })
+})
diff --git a/packages/ui/src/lib/model-visibility.ts b/packages/ui/src/lib/model-visibility.ts
new file mode 100644
index 000000000..edc3b093c
--- /dev/null
+++ b/packages/ui/src/lib/model-visibility.ts
@@ -0,0 +1,53 @@
+export type ModelVisibilityPreference =
+  | { mode: "all" }
+  | { mode: "custom"; modelIds: readonly string[] }
+
+export type ModelVisibilityPreferences = Record<string, ModelVisibilityPreference>
+
+export function normalizeModelVisibilityPreference(value: unknown): ModelVisibilityPreference {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return { mode: "all" }
+  const candidate = value as { mode?: unknown; modelIds?: unknown }
+  if (candidate.mode === "all") return { mode: "all" }
+  if (candidate.mode !== "custom" || !Array.isArray(candidate.modelIds)) return { mode: "all" }
+
+  return {
+    mode: "custom",
+    modelIds: Array.from(new Set(candidate.modelIds.filter(
+      (id): id is string => typeof id === "string" && id.trim().length > 0,
+    ))),
+  }
+}
+
+export function normalizeModelVisibilityPreferences(value: unknown): ModelVisibilityPreferences {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return {}
+  const result: ModelVisibilityPreferences = {}
+  for (const [providerId, preference] of Object.entries(value as Record<string, unknown>)) {
+    if (!providerId) continue
+    result[providerId] = normalizeModelVisibilityPreference(preference)
+  }
+  return result
+}
+
+export function isModelVisible(
+  preference: ModelVisibilityPreference | undefined,
+  modelId: string,
+  currentModelId?: string,
+): boolean {
+  if (modelId === currentModelId) return true
+  const normalized = normalizeModelVisibilityPreference(preference)
+  return normalized.mode === "all" || normalized.modelIds.includes(modelId)
+}
+
+export function getUnavailableSelectedModelIds(
+  preference: ModelVisibilityPreference | undefined,
+  currentModelIds: readonly string[],
+): string[] {
+  const normalized = normalizeModelVisibilityPreference(preference)
+  if (normalized.mode === "all") return []
+  const current = new Set(currentModelIds)
+  return normalized.modelIds.filter((id) => !current.has(id))
+}
+
+export function seedCustomModelVisibility(currentModelIds: readonly string[]): ModelVisibilityPreference {
+  return normalizeModelVisibilityPreference({ mode: "custom", modelIds: currentModelIds })
+}
diff --git a/packages/ui/src/stores/preferences.tsx b/packages/ui/src/stores/preferences.tsx
index 2f39824b2..6412fa788 100644
--- a/packages/ui/src/stores/preferences.tsx
+++ b/packages/ui/src/stores/preferences.tsx
@@ -14,6 +14,12 @@ import {
 import { getLogger } from "../lib/logger"
 import { loadSpeechCapabilities, resetSpeechCapabilities } from "./speech"
 import { buildSpeechPatch } from "../lib/speech-patch"
+import {
+  normalizeModelVisibilityPreference,
+  normalizeModelVisibilityPreferences,
+  type ModelVisibilityPreference,
+  type ModelVisibilityPreferences,
+} from "../lib/model-visibility"
 
 const log = getLogger("actions")
 
@@ -103,6 +109,7 @@ export interface UiSettings {
   usageMetricsExpansion: ExpansionPreference
   autoCleanupBlankSessions: boolean
   keepUnseenSubagentIdleStatus: boolean
+  modelVisibility: ModelVisibilityPreferences
 
   // OS notifications
   osNotificationsEnabled: boolean
@@ -193,6 +200,7 @@ const defaultUiSettings: UiSettings = {
   usageMetricsExpansion: "collapsed",
   autoCleanupBlankSessions: true,
   keepUnseenSubagentIdleStatus: false,
+  modelVisibility: {},
 
   osNotificationsEnabled: false,
   osNotificationsAllowWhenVisible: false,
@@ -299,6 +307,7 @@ function normalizeUiSettings(input?: Partial<UiSettings> | null): UiSettings {
     autoCleanupBlankSessions: sanitized.autoCleanupBlankSessions ?? defaultUiSettings.autoCleanupBlankSessions,
     keepUnseenSubagentIdleStatus:
       sanitized.keepUnseenSubagentIdleStatus ?? defaultUiSettings.keepUnseenSubagentIdleStatus,
+    modelVisibility: normalizeModelVisibilityPreferences(sanitized.modelVisibility),
     osNotificationsEnabled: sanitized.osNotificationsEnabled ?? defaultUiSettings.osNotificationsEnabled,
     osNotificationsAllowWhenVisible:
       sanitized.osNotificationsAllowWhenVisible ?? defaultUiSettings.osNotificationsAllowWhenVisible,
@@ -616,7 +625,11 @@ async function patchStateOwner(owner: string, patch: unknown) {
 function updateUiSettings(updates: Partial<UiSettings>) {
   const current = uiConfigBucket()
   const nextSettings = normalizeUiSettings({ ...(current.settings ?? {}), ...updates })
-  const patch = { settings: nextSettings }
+  const patch = {
+    settings: Object.fromEntries(
+      Object.keys(updates).map((key) => [key, nextSettings[key as keyof UiSettings]]),
+    ),
+  }
   void patchConfigOwner("ui", patch).catch((error) => log.error("Failed to patch ui settings", error))
 }
 
@@ -624,6 +637,65 @@ function updatePreferences(updates: Partial<UiSettings>): void {
   updateUiSettings(updates)
 }
 
+const modelVisibilityWriteQueues = new Map<string, Promise<void>>()
+const [pendingModelVisibility, setPendingModelVisibility] = createSignal(new Map<string, ModelVisibilityPreference>())
+const [modelVisibilityWriteFailures, setModelVisibilityWriteFailures] = createSignal(new Set<string>())
+
+function getProviderModelVisibilityPreference(providerId: string): ModelVisibilityPreference {
+  return pendingModelVisibility().get(providerId)
+    ?? normalizeModelVisibilityPreference(preferences().modelVisibility[providerId])
+}
+
+function providerModelVisibilitySaveFailed(providerId: string): boolean {
+  return modelVisibilityWriteFailures().has(providerId)
+}
+
+async function setProviderModelVisibility(providerId: string, preference: ModelVisibilityPreference): Promise<void> {
+  if (!providerId) return
+  const normalized = normalizeModelVisibilityPreference(preference)
+  setPendingModelVisibility((current) => new Map(current).set(providerId, normalized))
+  setModelVisibilityWriteFailures((current) => {
+    const next = new Set(current)
+    next.delete(providerId)
+    return next
+  })
+  const previous = modelVisibilityWriteQueues.get(providerId) ?? Promise.resolve()
+  const write = previous
+    .catch(() => undefined)
+    .then(() => patchConfigOwner("ui", {
+      settings: {
+        modelVisibility: {
+          [providerId]: normalized.mode === "all" ? { mode: "all", modelIds: null } : normalized,
+        },
+      },
+    }))
+
+  modelVisibilityWriteQueues.set(providerId, write)
+  void write.then(
+    () => {
+      if (modelVisibilityWriteQueues.get(providerId) !== write) return
+      modelVisibilityWriteQueues.delete(providerId)
+      setPendingModelVisibility((current) => {
+        const next = new Map(current)
+        next.delete(providerId)
+        return next
+      })
+    },
+    (error) => {
+      log.error("Failed to update provider model visibility", error)
+      if (modelVisibilityWriteQueues.get(providerId) !== write) return
+      modelVisibilityWriteQueues.delete(providerId)
+      setPendingModelVisibility((current) => {
+        const next = new Map(current)
+        next.delete(providerId)
+        return next
+      })
+      setModelVisibilityWriteFailures((current) => new Set(current).add(providerId))
+    },
+  )
+  await write
+}
+
 function setThemePreference(preference: ThemePreference): void {
   if (themePreference() === preference) return
   void patchConfigOwner("ui", { theme: preference }).catch((error) => log.error("Failed to set theme", error))
@@ -945,6 +1017,9 @@ interface ConfigContextValue {
   useTauriNativeEventTransport: typeof useTauriNativeEventTransport
   setUseTauriNativeEventTransport: typeof setUseTauriNativeEventTransport
   updatePreferences: typeof updatePreferences
+  setProviderModelVisibility: typeof setProviderModelVisibility
+  getProviderModelVisibilityPreference: typeof getProviderModelVisibilityPreference
+  providerModelVisibilitySaveFailed: typeof providerModelVisibilitySaveFailed
   themePreference: typeof themePreference
   setThemePreference: typeof setThemePreference
 
@@ -1008,6 +1083,9 @@ const configContextValue: ConfigContextValue = {
   useTauriNativeEventTransport,
   setUseTauriNativeEventTransport,
   updatePreferences,
+  setProviderModelVisibility,
+  getProviderModelVisibilityPreference,
+  providerModelVisibilitySaveFailed,
   themePreference,
   setThemePreference,
   serverSettings,
@@ -1105,6 +1183,9 @@ export {
   themePreference,
   setThemePreference,
   updatePreferences,
+  setProviderModelVisibility,
+  getProviderModelVisibilityPreference,
+  providerModelVisibilitySaveFailed,
   setListeningMode,
   updateEnvironmentVariables,
   addEnvironmentVariable,
diff --git a/packages/ui/src/stores/session-actions.ts b/packages/ui/src/stores/session-actions.ts
index 6c0db47c7..54d850688 100644
--- a/packages/ui/src/stores/session-actions.ts
+++ b/packages/ui/src/stores/session-actions.ts
@@ -12,6 +12,7 @@ import { removeMessagePartV2, removeMessageV2 } from "./message-v2/bridge"
 import { getLogger } from "../lib/logger"
 import { requestData } from "../lib/opencode-api"
 import { clearConversationPlaybackForSession } from "./conversation-speech"
+import { tGlobal } from "../lib/i18n"
 
 const log = getLogger("actions")
 
@@ -98,6 +99,9 @@ async function sendMessage(
   if (!session) {
     throw new Error("Session not found")
   }
+  if (!session.model.providerId || !session.model.modelId) {
+    throw new Error(tGlobal("modelSelector.error.noVisibleModels"))
+  }
 
   const messageId = createId("msg")
   const textPartId = createId("prt")
@@ -254,6 +258,9 @@ async function executeCustomCommand(
   if (!session) {
     throw new Error("Session not found")
   }
+  if (!session.model.providerId || !session.model.modelId) {
+    throw new Error(tGlobal("modelSelector.error.noVisibleModels"))
+  }
 
   const body: {
     command: string
diff --git a/packages/ui/src/stores/session-models.ts b/packages/ui/src/stores/session-models.ts
index 919e8a9ec..d32aadc2f 100644
--- a/packages/ui/src/stores/session-models.ts
+++ b/packages/ui/src/stores/session-models.ts
@@ -1,5 +1,6 @@
 import { agents, providers } from "./session-state"
-import { uiState, getAgentModelPreference } from "./preferences"
+import { getProviderModelVisibilityPreference, uiState, getAgentModelPreference } from "./preferences"
+import { isModelVisible } from "../lib/model-visibility"
 
 const DEFAULT_MODEL_OUTPUT_LIMIT = 32_000
 
@@ -14,12 +15,22 @@ function isModelValid(
   return provider.models.some((item) => item.id === model.modelId)
 }
 
+function isModelSelectable(
+  instanceId: string,
+  model?: { providerId: string; modelId: string } | null,
+): model is { providerId: string; modelId: string } {
+  return isModelValid(instanceId, model) && isModelVisible(
+    getProviderModelVisibilityPreference(model.providerId),
+    model.modelId,
+  )
+}
+
 function getRecentModelPreferenceForInstance(
   instanceId: string,
 ): { providerId: string; modelId: string } | undefined {
   const recents = uiState().models.recents ?? []
   for (const item of recents) {
-    if (isModelValid(instanceId, item)) {
+    if (isModelSelectable(instanceId, item)) {
       return item
     }
   }
@@ -34,7 +45,7 @@ async function getDefaultModel(
 
   if (agentName) {
     const agent = instanceAgents.find((a) => a.name === agentName)
-    if (agent && agent.model && isModelValid(instanceId, agent.model)) {
+    if (agent && agent.model && isModelSelectable(instanceId, agent.model)) {
       return {
         providerId: agent.model.providerId,
         modelId: agent.model.modelId,
@@ -42,7 +53,7 @@ async function getDefaultModel(
     }
 
     const stored = await getAgentModelPreference(instanceId, agentName)
-    if (isModelValid(instanceId, stored)) {
+    if (isModelSelectable(instanceId, stored)) {
       return stored
     }
   }
@@ -54,7 +65,9 @@ async function getDefaultModel(
 
   for (const provider of instanceProviders) {
     if (provider.defaultModelId) {
-      const model = provider.models.find((m) => m.id === provider.defaultModelId)
+      const model = provider.models.find((m) =>
+        m.id === provider.defaultModelId && isModelVisible(getProviderModelVisibilityPreference(provider.id), m.id),
+      )
       if (model) {
         return {
           providerId: provider.id,
@@ -64,9 +77,10 @@ async function getDefaultModel(
     }
   }
 
-  if (instanceProviders.length > 0) {
-    const firstProvider = instanceProviders[0]
-    const firstModel = firstProvider.models[0]
+  for (const firstProvider of instanceProviders) {
+    const firstModel = firstProvider.models.find((model) =>
+      isModelVisible(getProviderModelVisibilityPreference(firstProvider.id), model.id),
+    )
     if (firstModel) {
       return {
         providerId: firstProvider.id,
diff --git a/packages/ui/src/styles/components/provider-model-visibility.css b/packages/ui/src/styles/components/provider-model-visibility.css
new file mode 100644
index 000000000..fd98b82f4
--- /dev/null
+++ b/packages/ui/src/styles/components/provider-model-visibility.css
@@ -0,0 +1,125 @@
+.provider-model-visibility {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.provider-model-visibility-header {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  padding-bottom: 1rem;
+  border-bottom: 1px solid var(--border-base);
+}
+
+.provider-model-visibility-header > .selector-button {
+  flex: 0 0 auto;
+  width: auto;
+}
+
+.provider-model-visibility-modes {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 0.75rem;
+  border: 0;
+}
+
+.provider-model-visibility-mode {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.65rem;
+  padding: 0.75rem;
+  border: 1px solid var(--border-base);
+  background: var(--surface-base);
+  color: var(--text-primary);
+  cursor: pointer;
+}
+
+.provider-model-visibility-mode:has(input:checked) {
+  border-color: color-mix(in oklab, var(--accent-primary) 55%, var(--border-base));
+  background: color-mix(in oklab, var(--accent-primary) 8%, var(--surface-base));
+}
+
+.provider-model-visibility-mode span,
+.provider-model-visibility-item span {
+  display: flex;
+  min-width: 0;
+  flex-direction: column;
+  gap: 0.2rem;
+}
+
+.provider-model-visibility-mode small,
+.provider-model-visibility-item small {
+  color: var(--text-muted);
+  font-size: var(--font-size-xs);
+  font-weight: var(--font-weight-normal);
+  overflow-wrap: anywhere;
+}
+
+.provider-model-visibility-toolbar {
+  display: grid;
+  grid-template-columns: minmax(10rem, 1fr) auto auto auto;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.provider-model-visibility-count,
+.provider-model-visibility-unavailable {
+  color: var(--text-secondary);
+  font-size: var(--font-size-xs);
+}
+
+.provider-model-visibility-unavailable {
+  padding: 0.625rem 0.75rem;
+  border: 1px solid var(--border-base);
+  background: var(--surface-base);
+}
+
+.provider-model-visibility-list {
+  height: min(22rem, 45dvh);
+  border: 1px solid var(--border-base);
+  background: var(--surface-base);
+}
+
+.provider-model-visibility-item {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  min-height: 3.375rem;
+  padding: 0.55rem 0.75rem;
+  border-bottom: 1px solid color-mix(in oklab, var(--border-base) 70%, transparent);
+  color: var(--text-primary);
+  cursor: pointer;
+}
+
+.provider-model-visibility-item:hover {
+  background: var(--surface-secondary);
+}
+
+.provider-model-visibility-item:has(input:disabled) {
+  cursor: default;
+}
+
+.provider-model-card-actions {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+@media (max-width: 700px) {
+  .provider-model-visibility-modes,
+  .provider-model-visibility-toolbar {
+    grid-template-columns: 1fr;
+  }
+
+  .provider-model-visibility-header,
+  .provider-model-card-actions {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .provider-model-visibility-toolbar .selector-button {
+    width: 100%;
+    justify-content: center;
+  }
+}
diff --git a/packages/ui/src/styles/controls.css b/packages/ui/src/styles/controls.css
index 2199a6441..f88e02100 100644
--- a/packages/ui/src/styles/controls.css
+++ b/packages/ui/src/styles/controls.css
@@ -14,3 +14,4 @@
 @import "./components/settings-info.css";
 @import "./components/config-files-settings.css";
 @import "./components/provider-auth.css";
+@import "./components/provider-model-visibility.css";

From 059e08bf94ce0f159001c8c3e714a19175ac802b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Wed, 5 Aug 2026 15:24:57 +0200
Subject: [PATCH 02/11] fix(ui): keep model visibility in settings

Keep the floating provider manager focused on quick connection and refresh actions. Expose the large-catalog visibility workflow only from the embedded Providers settings section, where the virtualized management view has sufficient context and space.
---
 .../provider-auth/provider-manager-modal.tsx  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index 772eba0b1..430cafcf7 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -129,7 +129,9 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
   )
 
   const managedProvider = createMemo(() =>
-    configuredProviders().find((provider) => provider.id === managedProviderId()) ?? null,
+    props.embedded
+      ? configuredProviders().find((provider) => provider.id === managedProviderId()) ?? null
+      : null,
   )
 
   const getDisconnectMode = (provider: ListedProvider): DisconnectMode => {
@@ -742,15 +744,17 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
                           <div class="providers-card-footer">
                             <span class="providers-model-count">{provider.modelCount === 1 ? t("settings.providers.models.one", { count: provider.modelCount }) : t("settings.providers.models.other", { count: provider.modelCount })}</span>
                             <div class="provider-model-card-actions">
-                              <button
-                                ref={(element) => manageModelButtons.set(provider.id, element)}
-                                type="button"
-                                class="selector-button selector-button-secondary"
-                                onClick={() => {
-                                  managedProviderTriggerId = provider.id
-                                  setManagedProviderId(provider.id)
-                                }}
-                              >{t("settings.providers.actions.manageModels")}</button>
+                              <Show when={props.embedded}>
+                                <button
+                                  ref={(element) => manageModelButtons.set(provider.id, element)}
+                                  type="button"
+                                  class="selector-button selector-button-secondary"
+                                  onClick={() => {
+                                    managedProviderTriggerId = provider.id
+                                    setManagedProviderId(provider.id)
+                                  }}
+                                >{t("settings.providers.actions.manageModels")}</button>
+                              </Show>
                               <Show when={getDisconnectMode(provider) !== "disable-in-config"}><button type="button" class="selector-button selector-button-secondary providers-disconnect-button" disabled={getDisconnectMode(provider) === "not-disconnectable" || stage() !== "idle"} onClick={() => void disconnectProvider(provider.id)} title={getDisconnectMode(provider) === "not-disconnectable" ? t("settings.providers.source.env") : t("settings.providers.actions.disconnect")}>{t("settings.providers.actions.disconnect")}</button></Show>
                             </div>
                           </div>

From e799ba6c84e9d2fc4d9cfbd11114e78fa5b9e0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 01:59:57 +0200
Subject: [PATCH 03/11] fix(ui): simplify hidden model management

Replace the virtualized allowlist workflow with a plain searchable checkbox list inspired by OpenChamber and OpenCode Desktop. Users can show or hide all models, while new provider models remain visible by default.

Treat hiding as presentation state only: hidden models no longer affect defaults, execution, prompts, or commands, and an active hidden model remains usable. Persist exact hidden model IDs with the existing serialized optimistic writer.

Update every locale and focused tests for hidden-model semantics. Root typecheck, targeted tests, production UI build, diff checks, and two Gatekeeper reviews pass.
---
 packages/ui/src/components/model-selector.tsx |   1 -
 .../provider-model-visibility-manager.tsx     | 131 ++++--------------
 .../ui/src/lib/i18n/messages/de/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/en/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/es/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/fr/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/he/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/ja/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/ne/settings.ts   |  20 +--
 .../ui/src/lib/i18n/messages/ru/settings.ts   |  20 +--
 .../src/lib/i18n/messages/zh-Hans/settings.ts |  20 +--
 packages/ui/src/lib/model-visibility.test.ts  |  40 +++---
 packages/ui/src/lib/model-visibility.ts       |  35 +----
 packages/ui/src/stores/preferences.tsx        |   2 +-
 packages/ui/src/stores/session-actions.ts     |   7 -
 packages/ui/src/stores/session-models.ts      |  30 ++--
 .../components/provider-model-visibility.css  |  40 +-----
 17 files changed, 115 insertions(+), 351 deletions(-)

diff --git a/packages/ui/src/components/model-selector.tsx b/packages/ui/src/components/model-selector.tsx
index a1ad68f65..c82dfbd4b 100644
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -84,7 +84,6 @@ export default function ModelSelector(props: ModelSelectorProps) {
     isModelVisible(
       getProviderModelVisibilityPreference(model.providerId),
       model.id,
-      model.providerId === props.currentModel.providerId ? props.currentModel.modelId : undefined,
     ),
   ))
 
diff --git a/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx b/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
index cf3b2f19b..0ceea2a49 100644
--- a/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
+++ b/packages/ui/src/components/provider-auth/provider-model-visibility-manager.tsx
@@ -1,13 +1,6 @@
-import { VList } from "virtua/solid"
 import { ArrowLeft } from "lucide-solid"
-import { createEffect, createMemo, createSignal, on, onMount, Show, type Component } from "solid-js"
+import { createEffect, createMemo, createSignal, For, on, onMount, Show, type Component } from "solid-js"
 import { useI18n } from "../../lib/i18n"
-import {
-  getUnavailableSelectedModelIds,
-  normalizeModelVisibilityPreference,
-  seedCustomModelVisibility,
-  type ModelVisibilityPreference,
-} from "../../lib/model-visibility"
 import { useConfig } from "../../stores/preferences"
 
 export interface ProviderVisibilityModel {
@@ -34,20 +27,14 @@ export const ProviderModelVisibilityManager: Component<ProviderModelVisibilityMa
     setProviderModelVisibility,
   } = useConfig()
   const [query, setQuery] = createSignal("")
-  const [preference, setPreference] = createSignal<ModelVisibilityPreference>({ mode: "all" })
   const headingId = "provider-model-visibility-heading"
   let searchInput: HTMLInputElement | undefined
 
   const models = createMemo(() => [...props.models].sort(compareModel))
   const modelIds = createMemo(() => models().map((model) => model.id))
-  const selectedIds = createMemo(() => {
-    const saved = preference()
-    return new Set(saved.mode === "custom" ? saved.modelIds : modelIds())
-  })
-  const selectedCurrentCount = createMemo(() => modelIds().filter((id) => selectedIds().has(id)).length)
-  const unavailableCount = createMemo(() =>
-    getUnavailableSelectedModelIds(preference(), modelIds()).length,
-  )
+  const preference = createMemo(() => getProviderModelVisibilityPreference(props.providerId))
+  const hiddenIds = createMemo(() => new Set(preference().hiddenModelIds))
+  const visibleCount = createMemo(() => modelIds().filter((id) => !hiddenIds().has(id)).length)
   const filteredModels = createMemo(() => {
     const value = query().trim().toLocaleLowerCase()
     if (!value) return models()
@@ -56,45 +43,18 @@ export const ProviderModelVisibilityManager: Component<ProviderModelVisibilityMa
     )
   })
 
-  createEffect(on(() => props.providerId, (providerId) => {
-    setQuery("")
-    setPreference(getProviderModelVisibilityPreference(providerId))
-  }))
-
-  createEffect(() => {
-    setPreference(getProviderModelVisibilityPreference(props.providerId))
-  })
-
+  createEffect(on(() => props.providerId, () => setQuery("")))
   onMount(() => queueMicrotask(() => searchInput?.focus()))
 
-  const save = (next: ModelVisibilityPreference) => {
-    const normalized = normalizeModelVisibilityPreference(next)
-    setPreference(normalized)
-    void setProviderModelVisibility(props.providerId, normalized).catch(() => undefined)
-  }
+  const save = (hiddenModelIds: readonly string[]) =>
+    void setProviderModelVisibility(props.providerId, { hiddenModelIds }).catch(() => undefined)
 
-  const setMode = (mode: "all" | "custom") => {
-    if (mode === "all") {
-      save({ mode: "all" })
-    } else if (preference().mode !== "custom") {
-      save(seedCustomModelVisibility(modelIds()))
-    }
+  const toggleModel = (modelId: string, visible: boolean) => {
+    const current = preference().hiddenModelIds
+    save(visible ? current.filter((id) => id !== modelId) : [...current, modelId])
   }
 
-  const selectAll = () => {
-    const saved = preference()
-    const unavailable = saved.mode === "custom" ? getUnavailableSelectedModelIds(saved, modelIds()) : []
-    save(seedCustomModelVisibility([...modelIds(), ...unavailable]))
-  }
-
-  const toggleModel = (modelId: string, checked: boolean) => {
-    const saved = preference()
-    const ids = saved.mode === "custom" ? saved.modelIds : modelIds()
-    save({
-      mode: "custom",
-      modelIds: checked ? [...ids, modelId] : ids.filter((id) => id !== modelId),
-    })
-  }
+  const hideAll = () => save([...preference().hiddenModelIds, ...modelIds()])
 
   return (
     <section class="provider-model-visibility" aria-labelledby={headingId}>
@@ -111,28 +71,6 @@ export const ProviderModelVisibilityManager: Component<ProviderModelVisibilityMa
         </div>
       </header>
 
-      <fieldset class="provider-model-visibility-modes">
-        <legend class="sr-only">{t("settings.providers.modelVisibility.mode.label")}</legend>
-        <label class="provider-model-visibility-mode">
-          <input
-            type="radio"
-            name={`model-visibility-${props.providerId}`}
-            checked={preference().mode === "all"}
-            onChange={() => setMode("all")}
-          />
-          <span><strong>{t("settings.providers.modelVisibility.mode.all")}</strong><small>{t("settings.providers.modelVisibility.mode.all.description")}</small></span>
-        </label>
-        <label class="provider-model-visibility-mode">
-          <input
-            type="radio"
-            name={`model-visibility-${props.providerId}`}
-            checked={preference().mode === "custom"}
-            onChange={() => setMode("custom")}
-          />
-          <span><strong>{t("settings.providers.modelVisibility.mode.custom")}</strong><small>{t("settings.providers.modelVisibility.mode.custom.description")}</small></span>
-        </label>
-      </fieldset>
-
       <div class="provider-model-visibility-toolbar">
         <label class="sr-only" for="provider-model-visibility-search">{t("settings.providers.modelVisibility.search.label")}</label>
         <input
@@ -145,59 +83,40 @@ export const ProviderModelVisibilityManager: Component<ProviderModelVisibilityMa
           placeholder={t("settings.providers.modelVisibility.search.placeholder")}
         />
         <span class="provider-model-visibility-count" role="status">
-          {t("settings.providers.modelVisibility.count", { selected: selectedCurrentCount(), total: models().length })}
+          {t("settings.providers.modelVisibility.count.visible", { visible: visibleCount(), total: models().length })}
         </span>
-        <button type="button" class="selector-button selector-button-secondary" disabled={preference().mode !== "custom"} onClick={selectAll}>
-          {t("settings.providers.modelVisibility.selectAll")}
+        <button type="button" class="selector-button selector-button-secondary" onClick={() => save([])}>
+          {t("settings.providers.modelVisibility.actions.showAll")}
         </button>
-        <button type="button" class="selector-button selector-button-secondary" disabled={preference().mode !== "custom"} onClick={() => save({ mode: "custom", modelIds: [] })}>
-          {t("settings.providers.modelVisibility.selectNone")}
+        <button type="button" class="selector-button selector-button-secondary" onClick={hideAll}>
+          {t("settings.providers.modelVisibility.actions.hideAll")}
         </button>
       </div>
 
       <Show when={providerModelVisibilitySaveFailed(props.providerId)}>
-        <p class="settings-error-message" role="alert">{t("settings.providers.modelVisibility.saveFailed")}</p>
-      </Show>
-
-      <Show when={unavailableCount() > 0}>
-        <p class="provider-model-visibility-unavailable" role="status">
-          {unavailableCount() === 1
-            ? t("settings.providers.modelVisibility.unavailable.one", { count: unavailableCount() })
-            : t("settings.providers.modelVisibility.unavailable.other", { count: unavailableCount() })}
-        </p>
+        <p class="settings-error-message" role="alert">{t("settings.providers.modelVisibility.save.failed")}</p>
       </Show>
 
       <Show
         when={filteredModels().length > 0}
-        fallback={<p class="settings-card-message" role="status">{t("settings.providers.modelVisibility.empty")}</p>}
+        fallback={<p class="settings-card-message" role="status">{t("settings.providers.modelVisibility.list.empty")}</p>}
       >
-        <VList
+        <div
           class="provider-model-visibility-list"
-          data={filteredModels()}
-          itemSize={54}
           role="list"
-          aria-label={t("settings.providers.modelVisibility.listAriaLabel", { provider: props.providerName })}
+          aria-label={t("settings.providers.modelVisibility.list.label", { provider: props.providerName })}
         >
-          {(model) => {
-            const position = () => filteredModels().findIndex((item) => item.id === model.id) + 1
-            return (
-            <label
-              class="provider-model-visibility-item"
-              role="listitem"
-              aria-posinset={position()}
-              aria-setsize={filteredModels().length}
-            >
+          <For each={filteredModels()}>{(model) => (
+            <label class="provider-model-visibility-item" role="listitem">
               <input
                 type="checkbox"
-                checked={selectedIds().has(model.id)}
-                disabled={preference().mode !== "custom"}
+                checked={!hiddenIds().has(model.id)}
                 onChange={(event) => toggleModel(model.id, event.currentTarget.checked)}
               />
               <span><strong>{model.name || model.id}</strong><small dir="ltr">{model.id}</small></span>
             </label>
-            )
-          }}
-        </VList>
+          )}</For>
+        </div>
       </Show>
     </section>
   )
diff --git a/packages/ui/src/lib/i18n/messages/de/settings.ts b/packages/ui/src/lib/i18n/messages/de/settings.ts
index 5f57b5e98..f38a3446e 100644
--- a/packages/ui/src/lib/i18n/messages/de/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/de/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "Aus Favoriten entfernen",
   "modelSelector.manageProviders": "Anbieter verwalten",
   "modelSelector.unavailableModel": "{model} (nicht verfügbar)",
-  "modelSelector.error.noVisibleModels": "Wähle vor dem Senden einer Nachricht mindestens ein sichtbares Modell aus.",
   "settings.providers.actions.manageModels": "Modelle verwalten",
   "settings.providers.modelVisibility.back": "Zurück zu Anbietern",
   "settings.providers.modelVisibility.title": "Modelle für {provider}",
   "settings.providers.modelVisibility.subtitle": "Wählen Sie, welche Modelle CodeNomad in der Modellauswahl anzeigt.",
-  "settings.providers.modelVisibility.mode.label": "Modellsichtbarkeit",
-  "settings.providers.modelVisibility.mode.all": "Alle Modelle",
-  "settings.providers.modelVisibility.mode.all.description": "Aktuelle und neu gemeldete Modelle anzeigen.",
-  "settings.providers.modelVisibility.mode.custom": "Benutzerdefiniert",
-  "settings.providers.modelVisibility.mode.custom.description": "Nur ausgewählte Modell-IDs anzeigen.",
   "settings.providers.modelVisibility.search.label": "Anbietermodelle suchen",
   "settings.providers.modelVisibility.search.placeholder": "Nach Modellname oder ID suchen...",
-  "settings.providers.modelVisibility.count": "{selected} von {total} ausgewählt",
-  "settings.providers.modelVisibility.selectAll": "Alle auswählen",
-  "settings.providers.modelVisibility.selectNone": "Keine auswählen",
-  "settings.providers.modelVisibility.unavailable.one": "{count} ausgewähltes Modell ist derzeit nicht verfügbar.",
-  "settings.providers.modelVisibility.unavailable.other": "{count} ausgewählte Modelle sind derzeit nicht verfügbar.",
-  "settings.providers.modelVisibility.empty": "Keine Modelle entsprechen dieser Suche.",
-  "settings.providers.modelVisibility.listAriaLabel": "Modelle für {provider}",
-  "settings.providers.modelVisibility.saveFailed": "Die Modellsichtbarkeit konnte nicht gespeichert werden.",
+  "settings.providers.modelVisibility.count.visible": "{visible} von {total} sichtbar",
+  "settings.providers.modelVisibility.actions.showAll": "Alle anzeigen",
+  "settings.providers.modelVisibility.actions.hideAll": "Alle ausblenden",
+  "settings.providers.modelVisibility.list.empty": "Keine Modelle entsprechen dieser Suche.",
+  "settings.providers.modelVisibility.list.label": "Modelle für {provider}",
+  "settings.providers.modelVisibility.save.failed": "Die Modellsichtbarkeit konnte nicht gespeichert werden.",
 
   "thinkingSelector.variant.default": "Standard",
   "thinkingSelector.label": "Denken: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/en/settings.ts b/packages/ui/src/lib/i18n/messages/en/settings.ts
index 76f6d7a00..0696825cd 100644
--- a/packages/ui/src/lib/i18n/messages/en/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/en/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "Remove from favorites",
   "modelSelector.manageProviders": "Manage Providers",
   "modelSelector.unavailableModel": "{model} (unavailable)",
-  "modelSelector.error.noVisibleModels": "Select at least one visible model before sending a message.",
   "settings.providers.actions.manageModels": "Manage models",
   "settings.providers.modelVisibility.back": "Back to providers",
   "settings.providers.modelVisibility.title": "Models for {provider}",
   "settings.providers.modelVisibility.subtitle": "Choose which models CodeNomad shows in model selectors.",
-  "settings.providers.modelVisibility.mode.label": "Model visibility mode",
-  "settings.providers.modelVisibility.mode.all": "All models",
-  "settings.providers.modelVisibility.mode.all.description": "Show current and newly reported models.",
-  "settings.providers.modelVisibility.mode.custom": "Custom",
-  "settings.providers.modelVisibility.mode.custom.description": "Show only selected model IDs.",
   "settings.providers.modelVisibility.search.label": "Search provider models",
   "settings.providers.modelVisibility.search.placeholder": "Search by model name or ID...",
-  "settings.providers.modelVisibility.count": "{selected} of {total} selected",
-  "settings.providers.modelVisibility.selectAll": "Select all",
-  "settings.providers.modelVisibility.selectNone": "Select none",
-  "settings.providers.modelVisibility.unavailable.one": "{count} selected model is currently unavailable.",
-  "settings.providers.modelVisibility.unavailable.other": "{count} selected models are currently unavailable.",
-  "settings.providers.modelVisibility.empty": "No models match this search.",
-  "settings.providers.modelVisibility.listAriaLabel": "Models for {provider}",
-  "settings.providers.modelVisibility.saveFailed": "Failed to save model visibility.",
+  "settings.providers.modelVisibility.count.visible": "{visible} of {total} visible",
+  "settings.providers.modelVisibility.actions.showAll": "Show all",
+  "settings.providers.modelVisibility.actions.hideAll": "Hide all",
+  "settings.providers.modelVisibility.list.empty": "No models match this search.",
+  "settings.providers.modelVisibility.list.label": "Models for {provider}",
+  "settings.providers.modelVisibility.save.failed": "Failed to save model visibility.",
 
   "thinkingSelector.variant.default": "Default",
   "thinkingSelector.label": "Thinking: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/es/settings.ts b/packages/ui/src/lib/i18n/messages/es/settings.ts
index de135063c..07e8f7686 100644
--- a/packages/ui/src/lib/i18n/messages/es/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/es/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "Quitar de favoritos",
   "modelSelector.manageProviders": "Gestionar proveedores",
   "modelSelector.unavailableModel": "{model} (no disponible)",
-  "modelSelector.error.noVisibleModels": "Selecciona al menos un modelo visible antes de enviar un mensaje.",
   "settings.providers.actions.manageModels": "Gestionar modelos",
   "settings.providers.modelVisibility.back": "Volver a proveedores",
   "settings.providers.modelVisibility.title": "Modelos de {provider}",
   "settings.providers.modelVisibility.subtitle": "Elige qué modelos muestra CodeNomad en los selectores.",
-  "settings.providers.modelVisibility.mode.label": "Modo de visibilidad de modelos",
-  "settings.providers.modelVisibility.mode.all": "Todos los modelos",
-  "settings.providers.modelVisibility.mode.all.description": "Mostrar modelos actuales y nuevos.",
-  "settings.providers.modelVisibility.mode.custom": "Personalizado",
-  "settings.providers.modelVisibility.mode.custom.description": "Mostrar solo los ID de modelo seleccionados.",
   "settings.providers.modelVisibility.search.label": "Buscar modelos del proveedor",
   "settings.providers.modelVisibility.search.placeholder": "Buscar por nombre o ID del modelo...",
-  "settings.providers.modelVisibility.count": "{selected} de {total} seleccionados",
-  "settings.providers.modelVisibility.selectAll": "Seleccionar todos",
-  "settings.providers.modelVisibility.selectNone": "No seleccionar ninguno",
-  "settings.providers.modelVisibility.unavailable.one": "{count} modelo seleccionado no está disponible actualmente.",
-  "settings.providers.modelVisibility.unavailable.other": "{count} modelos seleccionados no están disponibles actualmente.",
-  "settings.providers.modelVisibility.empty": "Ningún modelo coincide con esta búsqueda.",
-  "settings.providers.modelVisibility.listAriaLabel": "Modelos de {provider}",
-  "settings.providers.modelVisibility.saveFailed": "No se pudo guardar la visibilidad de los modelos.",
+  "settings.providers.modelVisibility.count.visible": "{visible} de {total} visibles",
+  "settings.providers.modelVisibility.actions.showAll": "Mostrar todos",
+  "settings.providers.modelVisibility.actions.hideAll": "Ocultar todos",
+  "settings.providers.modelVisibility.list.empty": "Ningún modelo coincide con esta búsqueda.",
+  "settings.providers.modelVisibility.list.label": "Modelos de {provider}",
+  "settings.providers.modelVisibility.save.failed": "No se pudo guardar la visibilidad de los modelos.",
 
   "thinkingSelector.variant.default": "Por defecto",
   "thinkingSelector.label": "Pensamiento: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/fr/settings.ts b/packages/ui/src/lib/i18n/messages/fr/settings.ts
index 02455aef2..aa91d1841 100644
--- a/packages/ui/src/lib/i18n/messages/fr/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "Retirer des favoris",
   "modelSelector.manageProviders": "Gérer les fournisseurs",
   "modelSelector.unavailableModel": "{model} (indisponible)",
-  "modelSelector.error.noVisibleModels": "Sélectionnez au moins un modèle visible avant d’envoyer un message.",
   "settings.providers.actions.manageModels": "Gérer les modèles",
   "settings.providers.modelVisibility.back": "Retour aux fournisseurs",
   "settings.providers.modelVisibility.title": "Modèles pour {provider}",
   "settings.providers.modelVisibility.subtitle": "Choisissez les modèles affichés par CodeNomad dans les sélecteurs.",
-  "settings.providers.modelVisibility.mode.label": "Mode de visibilité des modèles",
-  "settings.providers.modelVisibility.mode.all": "Tous les modèles",
-  "settings.providers.modelVisibility.mode.all.description": "Afficher les modèles actuels et nouveaux.",
-  "settings.providers.modelVisibility.mode.custom": "Personnalisé",
-  "settings.providers.modelVisibility.mode.custom.description": "Afficher uniquement les identifiants sélectionnés.",
   "settings.providers.modelVisibility.search.label": "Rechercher les modèles du fournisseur",
   "settings.providers.modelVisibility.search.placeholder": "Rechercher par nom ou identifiant...",
-  "settings.providers.modelVisibility.count": "{selected} sur {total} sélectionnés",
-  "settings.providers.modelVisibility.selectAll": "Tout sélectionner",
-  "settings.providers.modelVisibility.selectNone": "Tout désélectionner",
-  "settings.providers.modelVisibility.unavailable.one": "{count} modèle sélectionné est actuellement indisponible.",
-  "settings.providers.modelVisibility.unavailable.other": "{count} modèles sélectionnés sont actuellement indisponibles.",
-  "settings.providers.modelVisibility.empty": "Aucun modèle ne correspond à cette recherche.",
-  "settings.providers.modelVisibility.listAriaLabel": "Modèles pour {provider}",
-  "settings.providers.modelVisibility.saveFailed": "Impossible d’enregistrer la visibilité des modèles.",
+  "settings.providers.modelVisibility.count.visible": "{visible} sur {total} visibles",
+  "settings.providers.modelVisibility.actions.showAll": "Tout afficher",
+  "settings.providers.modelVisibility.actions.hideAll": "Tout masquer",
+  "settings.providers.modelVisibility.list.empty": "Aucun modèle ne correspond à cette recherche.",
+  "settings.providers.modelVisibility.list.label": "Modèles pour {provider}",
+  "settings.providers.modelVisibility.save.failed": "Impossible d’enregistrer la visibilité des modèles.",
 
   "thinkingSelector.variant.default": "Par défaut",
   "thinkingSelector.label": "Réflexion : {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/he/settings.ts b/packages/ui/src/lib/i18n/messages/he/settings.ts
index 692da0e56..e15b28c5d 100644
--- a/packages/ui/src/lib/i18n/messages/he/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/he/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "הסר ממועדפים",
   "modelSelector.manageProviders": "נהל ספקים",
   "modelSelector.unavailableModel": "{model} (לא זמין)",
-  "modelSelector.error.noVisibleModels": "יש לבחור לפחות מודל גלוי אחד לפני שליחת הודעה.",
   "settings.providers.actions.manageModels": "ניהול מודלים",
   "settings.providers.modelVisibility.back": "חזרה לספקים",
   "settings.providers.modelVisibility.title": "מודלים עבור {provider}",
   "settings.providers.modelVisibility.subtitle": "בחר אילו מודלים CodeNomad יציג בבוררי המודלים.",
-  "settings.providers.modelVisibility.mode.label": "מצב נראות מודלים",
-  "settings.providers.modelVisibility.mode.all": "כל המודלים",
-  "settings.providers.modelVisibility.mode.all.description": "הצג מודלים נוכחיים וחדשים.",
-  "settings.providers.modelVisibility.mode.custom": "מותאם אישית",
-  "settings.providers.modelVisibility.mode.custom.description": "הצג רק מזהי מודלים שנבחרו.",
   "settings.providers.modelVisibility.search.label": "חיפוש מודלים של הספק",
   "settings.providers.modelVisibility.search.placeholder": "חיפוש לפי שם או מזהה מודל...",
-  "settings.providers.modelVisibility.count": "{selected} מתוך {total} נבחרו",
-  "settings.providers.modelVisibility.selectAll": "בחר הכול",
-  "settings.providers.modelVisibility.selectNone": "בטל בחירת הכול",
-  "settings.providers.modelVisibility.unavailable.one": "מודל נבחר אחד אינו זמין כעת.",
-  "settings.providers.modelVisibility.unavailable.other": "{count} מודלים שנבחרו אינם זמינים כעת.",
-  "settings.providers.modelVisibility.empty": "אין מודלים התואמים לחיפוש.",
-  "settings.providers.modelVisibility.listAriaLabel": "מודלים עבור {provider}",
-  "settings.providers.modelVisibility.saveFailed": "שמירת נראות המודלים נכשלה.",
+  "settings.providers.modelVisibility.count.visible": "{visible} מתוך {total} גלויים",
+  "settings.providers.modelVisibility.actions.showAll": "הצג הכול",
+  "settings.providers.modelVisibility.actions.hideAll": "הסתר הכול",
+  "settings.providers.modelVisibility.list.empty": "אין מודלים התואמים לחיפוש.",
+  "settings.providers.modelVisibility.list.label": "מודלים עבור {provider}",
+  "settings.providers.modelVisibility.save.failed": "שמירת נראות המודלים נכשלה.",
 
   "thinkingSelector.variant.default": "ברירת מחדל",
   "thinkingSelector.label": "חשיבה: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ja/settings.ts b/packages/ui/src/lib/i18n/messages/ja/settings.ts
index 4fd1fec78..a85a906e4 100644
--- a/packages/ui/src/lib/i18n/messages/ja/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "お気に入りから削除",
   "modelSelector.manageProviders": "プロバイダーを管理",
   "modelSelector.unavailableModel": "{model}（利用不可）",
-  "modelSelector.error.noVisibleModels": "メッセージを送信する前に、表示するモデルを1つ以上選択してください。",
   "settings.providers.actions.manageModels": "モデルを管理",
   "settings.providers.modelVisibility.back": "プロバイダーに戻る",
   "settings.providers.modelVisibility.title": "{provider} のモデル",
   "settings.providers.modelVisibility.subtitle": "CodeNomad のモデル選択に表示するモデルを選びます。",
-  "settings.providers.modelVisibility.mode.label": "モデル表示モード",
-  "settings.providers.modelVisibility.mode.all": "すべてのモデル",
-  "settings.providers.modelVisibility.mode.all.description": "現在および新しく報告されたモデルを表示します。",
-  "settings.providers.modelVisibility.mode.custom": "カスタム",
-  "settings.providers.modelVisibility.mode.custom.description": "選択したモデル ID のみ表示します。",
   "settings.providers.modelVisibility.search.label": "プロバイダーのモデルを検索",
   "settings.providers.modelVisibility.search.placeholder": "モデル名または ID で検索...",
-  "settings.providers.modelVisibility.count": "{total} 件中 {selected} 件を選択",
-  "settings.providers.modelVisibility.selectAll": "すべて選択",
-  "settings.providers.modelVisibility.selectNone": "すべて解除",
-  "settings.providers.modelVisibility.unavailable.one": "選択したモデル {count} 件は現在利用できません。",
-  "settings.providers.modelVisibility.unavailable.other": "選択したモデル {count} 件は現在利用できません。",
-  "settings.providers.modelVisibility.empty": "検索に一致するモデルはありません。",
-  "settings.providers.modelVisibility.listAriaLabel": "{provider} のモデル",
-  "settings.providers.modelVisibility.saveFailed": "モデルの表示設定を保存できませんでした。",
+  "settings.providers.modelVisibility.count.visible": "{total} 件中 {visible} 件を表示",
+  "settings.providers.modelVisibility.actions.showAll": "すべて表示",
+  "settings.providers.modelVisibility.actions.hideAll": "すべて非表示",
+  "settings.providers.modelVisibility.list.empty": "検索に一致するモデルはありません。",
+  "settings.providers.modelVisibility.list.label": "{provider} のモデル",
+  "settings.providers.modelVisibility.save.failed": "モデルの表示設定を保存できませんでした。",
 
   "thinkingSelector.variant.default": "デフォルト",
   "thinkingSelector.label": "思考: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ne/settings.ts b/packages/ui/src/lib/i18n/messages/ne/settings.ts
index 0098295b9..54edf4262 100644
--- a/packages/ui/src/lib/i18n/messages/ne/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ne/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "मनपर्नेबाट हटाउनुहोस्",
   "modelSelector.manageProviders": "प्रदायकहरू व्यवस्थापन गर्नुहोस्",
   "modelSelector.unavailableModel": "{model} (उपलब्ध छैन)",
-  "modelSelector.error.noVisibleModels": "सन्देश पठाउनु अघि कम्तीमा एउटा देखिने मोडेल चयन गर्नुहोस्।",
   "settings.providers.actions.manageModels": "मोडेलहरू व्यवस्थापन गर्नुहोस्",
   "settings.providers.modelVisibility.back": "प्रदायकहरूमा फर्कनुहोस्",
   "settings.providers.modelVisibility.title": "{provider} का मोडेलहरू",
   "settings.providers.modelVisibility.subtitle": "CodeNomad का मोडेल चयनकर्तामा देखिने मोडेलहरू छान्नुहोस्।",
-  "settings.providers.modelVisibility.mode.label": "मोडेल दृश्यता मोड",
-  "settings.providers.modelVisibility.mode.all": "सबै मोडेलहरू",
-  "settings.providers.modelVisibility.mode.all.description": "हालका र नयाँ मोडेलहरू देखाउनुहोस्।",
-  "settings.providers.modelVisibility.mode.custom": "अनुकूलित",
-  "settings.providers.modelVisibility.mode.custom.description": "चयन गरिएका मोडेल ID मात्र देखाउनुहोस्।",
   "settings.providers.modelVisibility.search.label": "प्रदायकका मोडेलहरू खोज्नुहोस्",
   "settings.providers.modelVisibility.search.placeholder": "मोडेल नाम वा ID बाट खोज्नुहोस्...",
-  "settings.providers.modelVisibility.count": "{total} मध्ये {selected} चयन गरियो",
-  "settings.providers.modelVisibility.selectAll": "सबै चयन गर्नुहोस्",
-  "settings.providers.modelVisibility.selectNone": "कुनै पनि चयन नगर्नुहोस्",
-  "settings.providers.modelVisibility.unavailable.one": "चयन गरिएको {count} मोडेल हाल उपलब्ध छैन।",
-  "settings.providers.modelVisibility.unavailable.other": "चयन गरिएका {count} मोडेलहरू हाल उपलब्ध छैनन्।",
-  "settings.providers.modelVisibility.empty": "यो खोजसँग मिल्ने मोडेल छैन।",
-  "settings.providers.modelVisibility.listAriaLabel": "{provider} का मोडेलहरू",
-  "settings.providers.modelVisibility.saveFailed": "मोडेल दृश्यता सुरक्षित गर्न असफल भयो।",
+  "settings.providers.modelVisibility.count.visible": "{total} मध्ये {visible} देखिने",
+  "settings.providers.modelVisibility.actions.showAll": "सबै देखाउनुहोस्",
+  "settings.providers.modelVisibility.actions.hideAll": "सबै लुकाउनुहोस्",
+  "settings.providers.modelVisibility.list.empty": "यो खोजसँग मिल्ने मोडेल छैन।",
+  "settings.providers.modelVisibility.list.label": "{provider} का मोडेलहरू",
+  "settings.providers.modelVisibility.save.failed": "मोडेल दृश्यता सुरक्षित गर्न असफल भयो।",
 
   "thinkingSelector.variant.default": "पूर्वनिर्धारित",
   "thinkingSelector.label": "सोचाइ: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/ru/settings.ts b/packages/ui/src/lib/i18n/messages/ru/settings.ts
index 01317d680..34e4ebdd3 100644
--- a/packages/ui/src/lib/i18n/messages/ru/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "Удалить из избранного",
   "modelSelector.manageProviders": "Управление провайдерами",
   "modelSelector.unavailableModel": "{model} (недоступна)",
-  "modelSelector.error.noVisibleModels": "Перед отправкой сообщения выберите хотя бы одну видимую модель.",
   "settings.providers.actions.manageModels": "Управление моделями",
   "settings.providers.modelVisibility.back": "Назад к провайдерам",
   "settings.providers.modelVisibility.title": "Модели {provider}",
   "settings.providers.modelVisibility.subtitle": "Выберите модели, которые CodeNomad показывает в списках выбора.",
-  "settings.providers.modelVisibility.mode.label": "Режим видимости моделей",
-  "settings.providers.modelVisibility.mode.all": "Все модели",
-  "settings.providers.modelVisibility.mode.all.description": "Показывать текущие и новые модели.",
-  "settings.providers.modelVisibility.mode.custom": "Выборочно",
-  "settings.providers.modelVisibility.mode.custom.description": "Показывать только выбранные идентификаторы моделей.",
   "settings.providers.modelVisibility.search.label": "Поиск моделей провайдера",
   "settings.providers.modelVisibility.search.placeholder": "Поиск по имени или ID модели...",
-  "settings.providers.modelVisibility.count": "Выбрано {selected} из {total}",
-  "settings.providers.modelVisibility.selectAll": "Выбрать все",
-  "settings.providers.modelVisibility.selectNone": "Снять выбор",
-  "settings.providers.modelVisibility.unavailable.one": "{count} выбранная модель сейчас недоступна.",
-  "settings.providers.modelVisibility.unavailable.other": "{count} выбранных моделей сейчас недоступны.",
-  "settings.providers.modelVisibility.empty": "Нет моделей, соответствующих поиску.",
-  "settings.providers.modelVisibility.listAriaLabel": "Модели {provider}",
-  "settings.providers.modelVisibility.saveFailed": "Не удалось сохранить видимость моделей.",
+  "settings.providers.modelVisibility.count.visible": "Видно {visible} из {total}",
+  "settings.providers.modelVisibility.actions.showAll": "Показать все",
+  "settings.providers.modelVisibility.actions.hideAll": "Скрыть все",
+  "settings.providers.modelVisibility.list.empty": "Нет моделей, соответствующих поиску.",
+  "settings.providers.modelVisibility.list.label": "Модели {provider}",
+  "settings.providers.modelVisibility.save.failed": "Не удалось сохранить видимость моделей.",
 
   "thinkingSelector.variant.default": "По умолчанию",
   "thinkingSelector.label": "Размышления: {variant}",
diff --git a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
index c104f2ce8..1357ff69f 100644
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
@@ -34,26 +34,18 @@ export const settingsMessages = {
   "modelSelector.favorite.remove": "从收藏移除",
   "modelSelector.manageProviders": "管理提供商",
   "modelSelector.unavailableModel": "{model}（不可用）",
-  "modelSelector.error.noVisibleModels": "发送消息前，请至少选择一个可见模型。",
   "settings.providers.actions.manageModels": "管理模型",
   "settings.providers.modelVisibility.back": "返回提供商列表",
   "settings.providers.modelVisibility.title": "{provider} 的模型",
   "settings.providers.modelVisibility.subtitle": "选择 CodeNomad 在模型选择器中显示的模型。",
-  "settings.providers.modelVisibility.mode.label": "模型可见性模式",
-  "settings.providers.modelVisibility.mode.all": "所有模型",
-  "settings.providers.modelVisibility.mode.all.description": "显示当前和新报告的模型。",
-  "settings.providers.modelVisibility.mode.custom": "自定义",
-  "settings.providers.modelVisibility.mode.custom.description": "仅显示已选择的模型 ID。",
   "settings.providers.modelVisibility.search.label": "搜索提供商模型",
   "settings.providers.modelVisibility.search.placeholder": "按模型名称或 ID 搜索...",
-  "settings.providers.modelVisibility.count": "已选择 {selected}/{total}",
-  "settings.providers.modelVisibility.selectAll": "全选",
-  "settings.providers.modelVisibility.selectNone": "全部取消",
-  "settings.providers.modelVisibility.unavailable.one": "当前有 {count} 个已选模型不可用。",
-  "settings.providers.modelVisibility.unavailable.other": "当前有 {count} 个已选模型不可用。",
-  "settings.providers.modelVisibility.empty": "没有与搜索匹配的模型。",
-  "settings.providers.modelVisibility.listAriaLabel": "{provider} 的模型",
-  "settings.providers.modelVisibility.saveFailed": "无法保存模型可见性设置。",
+  "settings.providers.modelVisibility.count.visible": "显示 {visible}/{total}",
+  "settings.providers.modelVisibility.actions.showAll": "全部显示",
+  "settings.providers.modelVisibility.actions.hideAll": "全部隐藏",
+  "settings.providers.modelVisibility.list.empty": "没有与搜索匹配的模型。",
+  "settings.providers.modelVisibility.list.label": "{provider} 的模型",
+  "settings.providers.modelVisibility.save.failed": "无法保存模型可见性设置。",
 
   "thinkingSelector.variant.default": "默认",
   "thinkingSelector.label": "思考：{variant}",
diff --git a/packages/ui/src/lib/model-visibility.test.ts b/packages/ui/src/lib/model-visibility.test.ts
index 31547e2f5..7d33b3642 100644
--- a/packages/ui/src/lib/model-visibility.test.ts
+++ b/packages/ui/src/lib/model-visibility.test.ts
@@ -1,43 +1,39 @@
 import assert from "node:assert/strict"
 import test from "node:test"
 import {
-  getUnavailableSelectedModelIds,
   isModelVisible,
   normalizeModelVisibilityPreference,
   normalizeModelVisibilityPreferences,
-  seedCustomModelVisibility,
 } from "./model-visibility"
 
 test("normalizes malformed preferences fail-open", () => {
-  assert.deepEqual(normalizeModelVisibilityPreference(null), { mode: "all" })
-  assert.deepEqual(normalizeModelVisibilityPreference({ mode: "custom" }), { mode: "all" })
+  assert.deepEqual(normalizeModelVisibilityPreference(null), { hiddenModelIds: [] })
+  assert.deepEqual(normalizeModelVisibilityPreference({ mode: "custom", modelIds: ["legacy"] }), { hiddenModelIds: [] })
+  assert.deepEqual(normalizeModelVisibilityPreference({ hiddenModelIds: "hidden" }), { hiddenModelIds: [] })
   assert.deepEqual(normalizeModelVisibilityPreferences([]), {})
-  assert.deepEqual(normalizeModelVisibilityPreferences({ broken: { mode: "nope" } }), {
-    broken: { mode: "all" },
+  assert.deepEqual(normalizeModelVisibilityPreferences({ broken: { hiddenModelIds: null } }), {
+    broken: { hiddenModelIds: [] },
   })
 })
 
 test("keeps unique non-empty exact IDs without catalog-based deletion", () => {
   assert.deepEqual(
-    normalizeModelVisibilityPreference({ mode: "custom", modelIds: ["Model-A", "model-a", "", "Model-A", 7] }),
-    { mode: "custom", modelIds: ["Model-A", "model-a"] },
+    normalizeModelVisibilityPreference({ hiddenModelIds: ["Model-A", "model-a", "", "Model-A", 7] }),
+    { hiddenModelIds: ["Model-A", "model-a"] },
   )
 })
 
-test("matches IDs case-sensitively and overrides a hidden current model", () => {
-  const preference = { mode: "custom", modelIds: ["Model-A"] } as const
-  assert.equal(isModelVisible(preference, "Model-A"), true)
-  assert.equal(isModelVisible(preference, "model-a"), false)
-  assert.equal(isModelVisible(preference, "hidden", "hidden"), true)
+test("matches hidden IDs exactly and case-sensitively", () => {
+  const preference = { hiddenModelIds: ["Model-A"] }
+  assert.equal(isModelVisible(preference, "Model-A"), false)
+  assert.equal(isModelVisible(preference, "model-a"), true)
 })
 
-test("new models follow mode while disappeared selections are retained", () => {
-  const custom = { mode: "custom", modelIds: ["known", "disappeared"] } as const
-  assert.equal(isModelVisible(custom, "new"), false)
-  assert.equal(isModelVisible({ mode: "all" }, "new"), true)
-  assert.deepEqual(getUnavailableSelectedModelIds(custom, ["known", "new"]), ["disappeared"])
-  assert.deepEqual(seedCustomModelVisibility(["known", "new", "known"]), {
-    mode: "custom",
-    modelIds: ["known", "new"],
-  })
+test("new models and missing preferences are visible by default", () => {
+  assert.equal(isModelVisible({ hiddenModelIds: ["known"] }, "new"), true)
+  assert.equal(isModelVisible(undefined, "new"), true)
+})
+
+test("a current model receives no helper-level visibility override", () => {
+  assert.equal(isModelVisible({ hiddenModelIds: ["current"] }, "current"), false)
 })
diff --git a/packages/ui/src/lib/model-visibility.ts b/packages/ui/src/lib/model-visibility.ts
index edc3b093c..629be5fb6 100644
--- a/packages/ui/src/lib/model-visibility.ts
+++ b/packages/ui/src/lib/model-visibility.ts
@@ -1,19 +1,15 @@
-export type ModelVisibilityPreference =
-  | { mode: "all" }
-  | { mode: "custom"; modelIds: readonly string[] }
+export type ModelVisibilityPreference = { hiddenModelIds: readonly string[] }
 
 export type ModelVisibilityPreferences = Record<string, ModelVisibilityPreference>
 
 export function normalizeModelVisibilityPreference(value: unknown): ModelVisibilityPreference {
-  if (!value || typeof value !== "object" || Array.isArray(value)) return { mode: "all" }
-  const candidate = value as { mode?: unknown; modelIds?: unknown }
-  if (candidate.mode === "all") return { mode: "all" }
-  if (candidate.mode !== "custom" || !Array.isArray(candidate.modelIds)) return { mode: "all" }
+  if (!value || typeof value !== "object" || Array.isArray(value)) return { hiddenModelIds: [] }
+  const hiddenModelIds = (value as { hiddenModelIds?: unknown }).hiddenModelIds
+  if (!Array.isArray(hiddenModelIds)) return { hiddenModelIds: [] }
 
   return {
-    mode: "custom",
-    modelIds: Array.from(new Set(candidate.modelIds.filter(
-      (id): id is string => typeof id === "string" && id.trim().length > 0,
+    hiddenModelIds: Array.from(new Set(hiddenModelIds.filter(
+      (id): id is string => typeof id === "string" && id.length > 0,
     ))),
   }
 }
@@ -31,23 +27,6 @@ export function normalizeModelVisibilityPreferences(value: unknown): ModelVisibi
 export function isModelVisible(
   preference: ModelVisibilityPreference | undefined,
   modelId: string,
-  currentModelId?: string,
 ): boolean {
-  if (modelId === currentModelId) return true
-  const normalized = normalizeModelVisibilityPreference(preference)
-  return normalized.mode === "all" || normalized.modelIds.includes(modelId)
-}
-
-export function getUnavailableSelectedModelIds(
-  preference: ModelVisibilityPreference | undefined,
-  currentModelIds: readonly string[],
-): string[] {
-  const normalized = normalizeModelVisibilityPreference(preference)
-  if (normalized.mode === "all") return []
-  const current = new Set(currentModelIds)
-  return normalized.modelIds.filter((id) => !current.has(id))
-}
-
-export function seedCustomModelVisibility(currentModelIds: readonly string[]): ModelVisibilityPreference {
-  return normalizeModelVisibilityPreference({ mode: "custom", modelIds: currentModelIds })
+  return !normalizeModelVisibilityPreference(preference).hiddenModelIds.includes(modelId)
 }
diff --git a/packages/ui/src/stores/preferences.tsx b/packages/ui/src/stores/preferences.tsx
index 6412fa788..3427692da 100644
--- a/packages/ui/src/stores/preferences.tsx
+++ b/packages/ui/src/stores/preferences.tsx
@@ -665,7 +665,7 @@ async function setProviderModelVisibility(providerId: string, preference: ModelV
     .then(() => patchConfigOwner("ui", {
       settings: {
         modelVisibility: {
-          [providerId]: normalized.mode === "all" ? { mode: "all", modelIds: null } : normalized,
+          [providerId]: normalized,
         },
       },
     }))
diff --git a/packages/ui/src/stores/session-actions.ts b/packages/ui/src/stores/session-actions.ts
index 54d850688..6c0db47c7 100644
--- a/packages/ui/src/stores/session-actions.ts
+++ b/packages/ui/src/stores/session-actions.ts
@@ -12,7 +12,6 @@ import { removeMessagePartV2, removeMessageV2 } from "./message-v2/bridge"
 import { getLogger } from "../lib/logger"
 import { requestData } from "../lib/opencode-api"
 import { clearConversationPlaybackForSession } from "./conversation-speech"
-import { tGlobal } from "../lib/i18n"
 
 const log = getLogger("actions")
 
@@ -99,9 +98,6 @@ async function sendMessage(
   if (!session) {
     throw new Error("Session not found")
   }
-  if (!session.model.providerId || !session.model.modelId) {
-    throw new Error(tGlobal("modelSelector.error.noVisibleModels"))
-  }
 
   const messageId = createId("msg")
   const textPartId = createId("prt")
@@ -258,9 +254,6 @@ async function executeCustomCommand(
   if (!session) {
     throw new Error("Session not found")
   }
-  if (!session.model.providerId || !session.model.modelId) {
-    throw new Error(tGlobal("modelSelector.error.noVisibleModels"))
-  }
 
   const body: {
     command: string
diff --git a/packages/ui/src/stores/session-models.ts b/packages/ui/src/stores/session-models.ts
index d32aadc2f..919e8a9ec 100644
--- a/packages/ui/src/stores/session-models.ts
+++ b/packages/ui/src/stores/session-models.ts
@@ -1,6 +1,5 @@
 import { agents, providers } from "./session-state"
-import { getProviderModelVisibilityPreference, uiState, getAgentModelPreference } from "./preferences"
-import { isModelVisible } from "../lib/model-visibility"
+import { uiState, getAgentModelPreference } from "./preferences"
 
 const DEFAULT_MODEL_OUTPUT_LIMIT = 32_000
 
@@ -15,22 +14,12 @@ function isModelValid(
   return provider.models.some((item) => item.id === model.modelId)
 }
 
-function isModelSelectable(
-  instanceId: string,
-  model?: { providerId: string; modelId: string } | null,
-): model is { providerId: string; modelId: string } {
-  return isModelValid(instanceId, model) && isModelVisible(
-    getProviderModelVisibilityPreference(model.providerId),
-    model.modelId,
-  )
-}
-
 function getRecentModelPreferenceForInstance(
   instanceId: string,
 ): { providerId: string; modelId: string } | undefined {
   const recents = uiState().models.recents ?? []
   for (const item of recents) {
-    if (isModelSelectable(instanceId, item)) {
+    if (isModelValid(instanceId, item)) {
       return item
     }
   }
@@ -45,7 +34,7 @@ async function getDefaultModel(
 
   if (agentName) {
     const agent = instanceAgents.find((a) => a.name === agentName)
-    if (agent && agent.model && isModelSelectable(instanceId, agent.model)) {
+    if (agent && agent.model && isModelValid(instanceId, agent.model)) {
       return {
         providerId: agent.model.providerId,
         modelId: agent.model.modelId,
@@ -53,7 +42,7 @@ async function getDefaultModel(
     }
 
     const stored = await getAgentModelPreference(instanceId, agentName)
-    if (isModelSelectable(instanceId, stored)) {
+    if (isModelValid(instanceId, stored)) {
       return stored
     }
   }
@@ -65,9 +54,7 @@ async function getDefaultModel(
 
   for (const provider of instanceProviders) {
     if (provider.defaultModelId) {
-      const model = provider.models.find((m) =>
-        m.id === provider.defaultModelId && isModelVisible(getProviderModelVisibilityPreference(provider.id), m.id),
-      )
+      const model = provider.models.find((m) => m.id === provider.defaultModelId)
       if (model) {
         return {
           providerId: provider.id,
@@ -77,10 +64,9 @@ async function getDefaultModel(
     }
   }
 
-  for (const firstProvider of instanceProviders) {
-    const firstModel = firstProvider.models.find((model) =>
-      isModelVisible(getProviderModelVisibilityPreference(firstProvider.id), model.id),
-    )
+  if (instanceProviders.length > 0) {
+    const firstProvider = instanceProviders[0]
+    const firstModel = firstProvider.models[0]
     if (firstModel) {
       return {
         providerId: firstProvider.id,
diff --git a/packages/ui/src/styles/components/provider-model-visibility.css b/packages/ui/src/styles/components/provider-model-visibility.css
index fd98b82f4..50cc9fb69 100644
--- a/packages/ui/src/styles/components/provider-model-visibility.css
+++ b/packages/ui/src/styles/components/provider-model-visibility.css
@@ -17,30 +17,6 @@
   width: auto;
 }
 
-.provider-model-visibility-modes {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 0.75rem;
-  border: 0;
-}
-
-.provider-model-visibility-mode {
-  display: flex;
-  align-items: flex-start;
-  gap: 0.65rem;
-  padding: 0.75rem;
-  border: 1px solid var(--border-base);
-  background: var(--surface-base);
-  color: var(--text-primary);
-  cursor: pointer;
-}
-
-.provider-model-visibility-mode:has(input:checked) {
-  border-color: color-mix(in oklab, var(--accent-primary) 55%, var(--border-base));
-  background: color-mix(in oklab, var(--accent-primary) 8%, var(--surface-base));
-}
-
-.provider-model-visibility-mode span,
 .provider-model-visibility-item span {
   display: flex;
   min-width: 0;
@@ -48,7 +24,6 @@
   gap: 0.2rem;
 }
 
-.provider-model-visibility-mode small,
 .provider-model-visibility-item small {
   color: var(--text-muted);
   font-size: var(--font-size-xs);
@@ -63,20 +38,14 @@
   gap: 0.5rem;
 }
 
-.provider-model-visibility-count,
-.provider-model-visibility-unavailable {
+.provider-model-visibility-count {
   color: var(--text-secondary);
   font-size: var(--font-size-xs);
 }
 
-.provider-model-visibility-unavailable {
-  padding: 0.625rem 0.75rem;
-  border: 1px solid var(--border-base);
-  background: var(--surface-base);
-}
-
 .provider-model-visibility-list {
   height: min(22rem, 45dvh);
+  overflow-y: auto;
   border: 1px solid var(--border-base);
   background: var(--surface-base);
 }
@@ -96,10 +65,6 @@
   background: var(--surface-secondary);
 }
 
-.provider-model-visibility-item:has(input:disabled) {
-  cursor: default;
-}
-
 .provider-model-card-actions {
   display: flex;
   align-items: center;
@@ -107,7 +72,6 @@
 }
 
 @media (max-width: 700px) {
-  .provider-model-visibility-modes,
   .provider-model-visibility-toolbar {
     grid-template-columns: 1fr;
   }

From de7e7a11e46cc878aded3841d3e1450dd60ecfb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 18:24:47 +0200
Subject: [PATCH 04/11] fix(ui): restore floating model management

Expose the existing model visibility manager from both the embedded provider settings and the floating provider dialog. This keeps model hiding accessible from the model picker without duplicating state or UI logic.

Validated with workspace typechecking, the focused model visibility tests, and the UI production build.
---
 .../provider-auth/provider-manager-modal.tsx  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index 430cafcf7..772eba0b1 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -129,9 +129,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
   )
 
   const managedProvider = createMemo(() =>
-    props.embedded
-      ? configuredProviders().find((provider) => provider.id === managedProviderId()) ?? null
-      : null,
+    configuredProviders().find((provider) => provider.id === managedProviderId()) ?? null,
   )
 
   const getDisconnectMode = (provider: ListedProvider): DisconnectMode => {
@@ -744,17 +742,15 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
                           <div class="providers-card-footer">
                             <span class="providers-model-count">{provider.modelCount === 1 ? t("settings.providers.models.one", { count: provider.modelCount }) : t("settings.providers.models.other", { count: provider.modelCount })}</span>
                             <div class="provider-model-card-actions">
-                              <Show when={props.embedded}>
-                                <button
-                                  ref={(element) => manageModelButtons.set(provider.id, element)}
-                                  type="button"
-                                  class="selector-button selector-button-secondary"
-                                  onClick={() => {
-                                    managedProviderTriggerId = provider.id
-                                    setManagedProviderId(provider.id)
-                                  }}
-                                >{t("settings.providers.actions.manageModels")}</button>
-                              </Show>
+                              <button
+                                ref={(element) => manageModelButtons.set(provider.id, element)}
+                                type="button"
+                                class="selector-button selector-button-secondary"
+                                onClick={() => {
+                                  managedProviderTriggerId = provider.id
+                                  setManagedProviderId(provider.id)
+                                }}
+                              >{t("settings.providers.actions.manageModels")}</button>
                               <Show when={getDisconnectMode(provider) !== "disable-in-config"}><button type="button" class="selector-button selector-button-secondary providers-disconnect-button" disabled={getDisconnectMode(provider) === "not-disconnectable" || stage() !== "idle"} onClick={() => void disconnectProvider(provider.id)} title={getDisconnectMode(provider) === "not-disconnectable" ? t("settings.providers.source.env") : t("settings.providers.actions.disconnect")}>{t("settings.providers.actions.disconnect")}</button></Show>
                             </div>
                           </div>

From e3e452ba5a83f783d8ddca2cebaca173c2f1601a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 21:06:41 +0200
Subject: [PATCH 05/11] fix(ui): address model visibility review findings

Refresh provider metadata without disposing active OpenCode instances. Keep the Combobox selection aligned with its visible collection while preserving an accessible current-model label when that model is hidden.

Propagate YAML persistence failures and roll back the in-memory document so model visibility does not appear saved when disk writes fail. Add a focused regression test for the write-failure boundary.

Validated with UI, Electron, and server typechecks; focused visibility and YAML-store tests; the UI production build; and the server suite apart from an unrelated local default-branch assertion in git-worktrees.test.ts.
---
 .../src/settings/yaml-doc-store.test.ts       | 26 +++++++++++++++++++
 .../server/src/settings/yaml-doc-store.ts     | 11 +++++++-
 packages/ui/src/components/model-selector.tsx | 18 ++++++++++---
 .../provider-auth/provider-manager-modal.tsx  | 13 +---------
 4 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 packages/server/src/settings/yaml-doc-store.test.ts

diff --git a/packages/server/src/settings/yaml-doc-store.test.ts b/packages/server/src/settings/yaml-doc-store.test.ts
new file mode 100644
index 000000000..3f684aeed
--- /dev/null
+++ b/packages/server/src/settings/yaml-doc-store.test.ts
@@ -0,0 +1,26 @@
+import assert from "node:assert/strict"
+import fs from "node:fs"
+import os from "node:os"
+import path from "node:path"
+import { describe, it } from "node:test"
+import { YamlDocStore } from "./yaml-doc-store"
+
+describe("YamlDocStore", () => {
+  it("reports persistence failures without replacing the cached document", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const parent = path.join(root, "settings")
+    const file = path.join(parent, "config.yaml")
+    const store = new YamlDocStore(file, { warn() {} } as any)
+
+    try {
+      store.replace({ version: 1 })
+      fs.rmSync(parent, { recursive: true })
+      fs.writeFileSync(parent, "blocks directory creation")
+
+      assert.throws(() => store.replace({ version: 2 }))
+      assert.deepEqual(store.get(), { version: 1 })
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/packages/server/src/settings/yaml-doc-store.ts b/packages/server/src/settings/yaml-doc-store.ts
index 91c5540c8..a9d82ed0d 100644
--- a/packages/server/src/settings/yaml-doc-store.ts
+++ b/packages/server/src/settings/yaml-doc-store.ts
@@ -58,9 +58,17 @@ export class YamlDocStore {
 
   replace(next: unknown): SettingsDoc {
     const normalized = normalizeDoc(next)
+    const previousCache = this.cache
+    const previousLoaded = this.loaded
     this.cache = normalized
     this.loaded = true
-    this.persist()
+    try {
+      this.persist()
+    } catch (error) {
+      this.cache = previousCache
+      this.loaded = previousLoaded
+      throw error
+    }
     return this.cache
   }
 
@@ -105,6 +113,7 @@ export class YamlDocStore {
       fs.writeFileSync(this.filePath, ensureTrailingNewline(yaml), "utf-8")
     } catch (error) {
       this.logger.warn({ err: error, filePath: this.filePath }, "Failed to persist YAML doc")
+      throw error
     }
   }
 }
diff --git a/packages/ui/src/components/model-selector.tsx b/packages/ui/src/components/model-selector.tsx
index c82dfbd4b..7584f1d75 100644
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -190,6 +190,17 @@ export default function ModelSelector(props: ModelSelectorProps) {
     ]),
   )
 
+  const comboboxValue = createMemo(() => {
+    const current = currentModelValue()
+    if (!current) return undefined
+    const option = pickerOptions().find((item) => item.key === current.key)
+    return option && !isProviderHeaderOption(option) ? option : undefined
+  })
+
+  const currentModelLabel = createMemo(() =>
+    t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") }),
+  )
+
   const handleChange = async (value: PickerOption | null) => {
     if (!value || isProviderHeaderOption(value) || value.unavailable) return
     await props.onModelChange({ providerId: value.providerId, modelId: value.id })
@@ -289,7 +300,7 @@ export default function ModelSelector(props: ModelSelectorProps) {
     <div class="sidebar-selector">
       <Combobox<PickerOption>
         open={isOpen()}
-        value={currentModelValue()}
+        value={comboboxValue()}
         onChange={handleChange}
         onOpenChange={(next) => {
           if (!next && suppressNextClose) return
@@ -379,14 +390,15 @@ export default function ModelSelector(props: ModelSelectorProps) {
         }}
       >
         <Combobox.Control class="relative w-full" data-model-selector-control>
-          <Combobox.Input class="sr-only" data-model-selector />
+          <Combobox.Input class="sr-only" data-model-selector aria-label={currentModelLabel()} />
           <Combobox.Trigger
             ref={triggerRef}
             class="selector-trigger"
+            aria-label={currentModelLabel()}
           >
             <div class="selector-trigger-label selector-trigger-label--stacked flex-1 min-w-0">
               <span class="selector-trigger-primary selector-trigger-primary--align-left">
-                {t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") })}
+                {currentModelLabel()}
               </span>
           {currentModelValue() && (
                 <span class="selector-trigger-secondary" dir="ltr">
diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index 772eba0b1..29acc5e43 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -363,17 +363,6 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     await loadProviderData(authClient).catch(() => undefined)
   }
 
-  async function refreshProviderData() {
-    const authClient = client()
-    const instanceId = props.instanceId
-    if (!authClient) return
-    await (authClient as any).global.dispose().catch(() => undefined)
-    if (client() !== authClient || props.instanceId !== instanceId) return
-    await fetchProviders(instanceId).catch(() => undefined)
-    if (client() !== authClient || props.instanceId !== instanceId) return
-    await loadProviderData(authClient)
-  }
-
   function closeModelManager() {
     setManagedProviderId(null)
     queueMicrotask(() => {
@@ -615,7 +604,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
                 <button type="button" class="selector-button selector-button-primary" disabled={!selectedProviderOption()} onClick={() => resetFlow(selectedProviderOption()?.id ?? null)}>
                   {t("settings.providers.actions.connect")}
                 </button>
-                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => void refreshProviderData()}>
+                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => client() && void loadProviderData(client()!)}>
                   <RefreshCw class={loading() ? "providers-spin-icon" : "providers-button-icon"} />
                   {t("settings.providers.refresh")}
                 </button>

From 0e22d5154d985618a3651db290abb7592ac0fcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 21:23:56 +0200
Subject: [PATCH 06/11] fix(ui): complete Gatekeeper follow-ups

Refresh both the shared provider catalog and modal-local provider details without disposing active OpenCode instances. Add collection-safe picker selection coverage and source-level contracts for the refresh and accessibility wiring.

Limit strict YAML persistence errors to SettingsService stores and make sidecar create, update, and delete operations roll back their runtime state when persistence fails. Add focused rollback coverage for those operations.

Validated with UI, Electron, and server typechecks; ten focused regression tests; the UI production build; and git diff checks.
---
 packages/server/src/settings/service.ts       | 12 ++++-
 .../src/settings/yaml-doc-store.test.ts       |  2 +-
 .../server/src/settings/yaml-doc-store.ts     |  3 +-
 packages/server/src/sidecars/manager.test.ts  | 47 +++++++++++++++++++
 packages/server/src/sidecars/manager.ts       | 25 ++++++++--
 packages/ui/src/components/model-selector.tsx |  8 ++--
 .../provider-auth/provider-manager-modal.tsx  | 12 ++++-
 packages/ui/src/lib/model-visibility.test.ts  | 29 ++++++++++++
 packages/ui/src/lib/model-visibility.ts       |  7 +++
 9 files changed, 132 insertions(+), 13 deletions(-)
 create mode 100644 packages/server/src/sidecars/manager.test.ts

diff --git a/packages/server/src/settings/service.ts b/packages/server/src/settings/service.ts
index f4f0409c2..dc860777f 100644
--- a/packages/server/src/settings/service.ts
+++ b/packages/server/src/settings/service.ts
@@ -67,8 +67,16 @@ export class SettingsService {
     private readonly logger: Logger,
   ) {
     migrateSettingsLayout(location, logger)
-    this.configStore = new YamlDocStore(location.configYamlPath, logger.child({ component: "settings-config" }))
-    this.stateStore = new YamlDocStore(location.stateYamlPath, logger.child({ component: "settings-state" }))
+    this.configStore = new YamlDocStore(
+      location.configYamlPath,
+      logger.child({ component: "settings-config" }),
+      { throwOnPersistError: true },
+    )
+    this.stateStore = new YamlDocStore(
+      location.stateYamlPath,
+      logger.child({ component: "settings-state" }),
+      { throwOnPersistError: true },
+    )
   }
 
   getDoc(kind: DocKind): SettingsDoc {
diff --git a/packages/server/src/settings/yaml-doc-store.test.ts b/packages/server/src/settings/yaml-doc-store.test.ts
index 3f684aeed..91fcb1698 100644
--- a/packages/server/src/settings/yaml-doc-store.test.ts
+++ b/packages/server/src/settings/yaml-doc-store.test.ts
@@ -10,7 +10,7 @@ describe("YamlDocStore", () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
     const parent = path.join(root, "settings")
     const file = path.join(parent, "config.yaml")
-    const store = new YamlDocStore(file, { warn() {} } as any)
+    const store = new YamlDocStore(file, { warn() {} } as any, { throwOnPersistError: true })
 
     try {
       store.replace({ version: 1 })
diff --git a/packages/server/src/settings/yaml-doc-store.ts b/packages/server/src/settings/yaml-doc-store.ts
index a9d82ed0d..5e5850046 100644
--- a/packages/server/src/settings/yaml-doc-store.ts
+++ b/packages/server/src/settings/yaml-doc-store.ts
@@ -25,6 +25,7 @@ export class YamlDocStore {
   constructor(
     private readonly filePath: string,
     private readonly logger: Logger,
+    private readonly options: { throwOnPersistError?: boolean } = {},
   ) {}
 
   load(): SettingsDoc {
@@ -113,7 +114,7 @@ export class YamlDocStore {
       fs.writeFileSync(this.filePath, ensureTrailingNewline(yaml), "utf-8")
     } catch (error) {
       this.logger.warn({ err: error, filePath: this.filePath }, "Failed to persist YAML doc")
-      throw error
+      if (this.options.throwOnPersistError) throw error
     }
   }
 }
diff --git a/packages/server/src/sidecars/manager.test.ts b/packages/server/src/sidecars/manager.test.ts
new file mode 100644
index 000000000..65eb1d12f
--- /dev/null
+++ b/packages/server/src/sidecars/manager.test.ts
@@ -0,0 +1,47 @@
+import assert from "node:assert/strict"
+import { describe, it } from "node:test"
+import { SideCarManager } from "./manager"
+
+const existing = {
+  id: "existing",
+  kind: "port",
+  name: "Existing",
+  port: 65534,
+  insecure: true,
+  prefixMode: "strip",
+  createdAt: "2026-01-01T00:00:00.000Z",
+  updatedAt: "2026-01-01T00:00:00.000Z",
+}
+
+function manager(sidecars: unknown[] = []) {
+  return new SideCarManager({
+    settings: {
+      getOwner: () => ({ sidecars }),
+      mergePatchOwner: () => { throw new Error("disk full") },
+    } as any,
+    eventBus: { publish() {} } as any,
+    logger: { warn() {} } as any,
+  })
+}
+
+describe("SideCarManager persistence rollback", () => {
+  it("restores create, update, and delete state when persistence fails", async () => {
+    const createManager = manager()
+    await assert.rejects(createManager.create({
+      kind: "port",
+      name: "New",
+      port: 65533,
+      insecure: true,
+      prefixMode: "strip",
+    }))
+    assert.deepEqual(await createManager.list(), [])
+
+    const updateManager = manager([existing])
+    await assert.rejects(updateManager.update(existing.id, { name: "Changed" }))
+    assert.equal((await updateManager.get(existing.id))?.name, existing.name)
+
+    const deleteManager = manager([existing])
+    await assert.rejects(deleteManager.delete(existing.id))
+    assert.equal((await deleteManager.get(existing.id))?.id, existing.id)
+  })
+})
diff --git a/packages/server/src/sidecars/manager.ts b/packages/server/src/sidecars/manager.ts
index 57593c30a..5fce06776 100644
--- a/packages/server/src/sidecars/manager.ts
+++ b/packages/server/src/sidecars/manager.ts
@@ -82,7 +82,13 @@ export class SideCarManager {
 
     this.configs.set(record.id, record)
     this.runtime.set(record.id, { status: "stopped" })
-    this.persistConfigs()
+    try {
+      this.persistConfigs()
+    } catch (error) {
+      this.configs.delete(record.id)
+      this.runtime.delete(record.id)
+      throw error
+    }
     await this.refreshPortSideCar(record.id)
     return this.toSideCar(record)
   }
@@ -98,13 +104,19 @@ export class SideCarManager {
   ): Promise<SideCar> {
     const record = this.requireConfig(id)
 
+    const previous = { ...record }
     record.name = typeof input.name === "string" ? input.name.trim() : record.name
     record.port = typeof input.port === "number" ? input.port : record.port
     record.insecure = typeof input.insecure === "boolean" ? input.insecure : record.insecure
     record.prefixMode = typeof input.prefixMode === "string" ? input.prefixMode : record.prefixMode
     record.updatedAt = new Date().toISOString()
 
-    this.persistConfigs()
+    try {
+      this.persistConfigs()
+    } catch (error) {
+      this.configs.set(id, previous)
+      throw error
+    }
     await this.refreshPortSideCar(id)
     return this.toSideCar(record)
   }
@@ -113,9 +125,16 @@ export class SideCarManager {
     const record = this.configs.get(id)
     if (!record) return false
 
+    const runtime = this.runtime.get(id)
     this.configs.delete(id)
     this.runtime.delete(id)
-    this.persistConfigs()
+    try {
+      this.persistConfigs()
+    } catch (error) {
+      this.configs.set(id, record)
+      if (runtime) this.runtime.set(id, runtime)
+      throw error
+    }
     this.options.eventBus.publish({ type: "sidecar.removed", sidecarId: id })
     return true
   }
diff --git a/packages/ui/src/components/model-selector.tsx b/packages/ui/src/components/model-selector.tsx
index 7584f1d75..c1550f9e1 100644
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -7,7 +7,7 @@ import { useI18n } from "../lib/i18n"
 import { getLogger } from "../lib/logger"
 import { getProviderModelVisibilityPreference, uiState, toggleFavoriteModelPreference } from "../stores/preferences"
 import { ProviderManagerModal } from "./provider-auth/provider-manager-modal"
-import { isModelVisible } from "../lib/model-visibility"
+import { isModelVisible, resolvePickerValue } from "../lib/model-visibility"
 const log = getLogger("session")
 
 interface ModelSelectorProps {
@@ -191,10 +191,8 @@ export default function ModelSelector(props: ModelSelectorProps) {
   )
 
   const comboboxValue = createMemo(() => {
-    const current = currentModelValue()
-    if (!current) return undefined
-    const option = pickerOptions().find((item) => item.key === current.key)
-    return option && !isProviderHeaderOption(option) ? option : undefined
+    const options = pickerOptions().filter((option): option is FlatModel => !isProviderHeaderOption(option))
+    return resolvePickerValue(currentModelValue(), options)
   })
 
   const currentModelLabel = createMemo(() =>
diff --git a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
index 29acc5e43..9028fd38e 100644
--- a/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
+++ b/packages/ui/src/components/provider-auth/provider-manager-modal.tsx
@@ -363,6 +363,16 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
     await loadProviderData(authClient).catch(() => undefined)
   }
 
+  async function refreshProviderData() {
+    const authClient = client()
+    const instanceId = props.instanceId
+    if (!authClient) return
+    setLoading(true)
+    await fetchProviders(instanceId).catch(() => undefined)
+    if (client() !== authClient || props.instanceId !== instanceId) return
+    await loadProviderData(authClient)
+  }
+
   function closeModelManager() {
     setManagedProviderId(null)
     queueMicrotask(() => {
@@ -604,7 +614,7 @@ export const ProviderManagerModal: Component<ProviderManagerModalProps> = (props
                 <button type="button" class="selector-button selector-button-primary" disabled={!selectedProviderOption()} onClick={() => resetFlow(selectedProviderOption()?.id ?? null)}>
                   {t("settings.providers.actions.connect")}
                 </button>
-                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => client() && void loadProviderData(client()!)}>
+                <button type="button" class="settings-pill-button" disabled={loading()} onClick={() => void refreshProviderData()}>
                   <RefreshCw class={loading() ? "providers-spin-icon" : "providers-button-icon"} />
                   {t("settings.providers.refresh")}
                 </button>
diff --git a/packages/ui/src/lib/model-visibility.test.ts b/packages/ui/src/lib/model-visibility.test.ts
index 7d33b3642..9711f483e 100644
--- a/packages/ui/src/lib/model-visibility.test.ts
+++ b/packages/ui/src/lib/model-visibility.test.ts
@@ -1,9 +1,11 @@
 import assert from "node:assert/strict"
+import fs from "node:fs"
 import test from "node:test"
 import {
   isModelVisible,
   normalizeModelVisibilityPreference,
   normalizeModelVisibilityPreferences,
+  resolvePickerValue,
 } from "./model-visibility"
 
 test("normalizes malformed preferences fail-open", () => {
@@ -37,3 +39,30 @@ test("new models and missing preferences are visible by default", () => {
 test("a current model receives no helper-level visibility override", () => {
   assert.equal(isModelVisible({ hiddenModelIds: ["current"] }, "current"), false)
 })
+
+test("uses the current model as the picker value only while it remains in the collection", () => {
+  const current = { key: "provider/current" }
+  assert.equal(resolvePickerValue(current, [current]), current)
+  assert.equal(resolvePickerValue(current, [{ key: "provider/visible" }]), undefined)
+})
+
+test("provider refresh updates shared and modal catalogs without disposing active instances", () => {
+  const source = fs.readFileSync(
+    new URL("../components/provider-auth/provider-manager-modal.tsx", import.meta.url),
+    "utf8",
+  )
+  const start = source.indexOf("async function refreshProviderData()")
+  const end = source.indexOf("function closeModelManager()", start)
+  const refresh = source.slice(start, end)
+
+  assert.ok(start >= 0 && end > start)
+  assert.match(refresh, /await fetchProviders\(instanceId\)/)
+  assert.match(refresh, /await loadProviderData\(authClient\)/)
+  assert.doesNotMatch(refresh, /global\.dispose/)
+})
+
+test("model picker wires collection-safe selection and an accessible current-model label", () => {
+  const source = fs.readFileSync(new URL("../components/model-selector.tsx", import.meta.url), "utf8")
+  assert.match(source, /value=\{comboboxValue\(\)\}/)
+  assert.equal(source.match(/aria-label=\{currentModelLabel\(\)\}/g)?.length, 2)
+})
diff --git a/packages/ui/src/lib/model-visibility.ts b/packages/ui/src/lib/model-visibility.ts
index 629be5fb6..02ff90312 100644
--- a/packages/ui/src/lib/model-visibility.ts
+++ b/packages/ui/src/lib/model-visibility.ts
@@ -30,3 +30,10 @@ export function isModelVisible(
 ): boolean {
   return !normalizeModelVisibilityPreference(preference).hiddenModelIds.includes(modelId)
 }
+
+export function resolvePickerValue<T extends { key: string }>(
+  current: T | undefined,
+  options: readonly { key: string }[],
+): T | undefined {
+  return current && options.some((option) => option.key === current.key) ? current : undefined
+}

From 2a599a2fb1960d5e4d06dc1500a79d8614f934cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 21:33:44 +0200
Subject: [PATCH 07/11] fix(server): persist normalized settings atomically

Apply config merge patches in memory, normalize the result, and persist it once. This prevents a failed normalization write from leaving an earlier intermediate write on disk while callers roll back runtime state.

Add focused tests that fail if document or server-owner patches perform an intermediate persistence operation.
---
 packages/server/src/settings/service.test.ts | 43 ++++++++++++++++++++
 packages/server/src/settings/service.ts      | 14 ++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 packages/server/src/settings/service.test.ts

diff --git a/packages/server/src/settings/service.test.ts b/packages/server/src/settings/service.test.ts
new file mode 100644
index 000000000..6fa0c6fea
--- /dev/null
+++ b/packages/server/src/settings/service.test.ts
@@ -0,0 +1,43 @@
+import assert from "node:assert/strict"
+import { describe, it } from "node:test"
+import { SettingsService } from "./service"
+
+function serviceWithStore(store: Record<string, unknown>) {
+  const service = Object.create(SettingsService.prototype) as SettingsService
+  Object.assign(service as any, { configStore: store, eventBus: undefined })
+  return service
+}
+
+describe("SettingsService config persistence", () => {
+  it("normalizes and persists a document patch once", () => {
+    let writes = 0
+    const service = serviceWithStore({
+      get: () => ({ server: { logLevel: "info" } }),
+      replace: (value: unknown) => {
+        writes += 1
+        return value
+      },
+      mergePatch: () => assert.fail("must not persist an intermediate document"),
+    })
+
+    const result = service.mergePatchDoc("config", { ui: { theme: "dark" } })
+    assert.equal(writes, 1)
+    assert.deepEqual(result, { server: { logLevel: "INFO" }, ui: { theme: "dark" } })
+  })
+
+  it("normalizes and persists a server-owner patch once", () => {
+    let writes = 0
+    const service = serviceWithStore({
+      getOwner: () => ({ logLevel: "info", sidecars: [] }),
+      replaceOwner: (_owner: string, value: unknown) => {
+        writes += 1
+        return value
+      },
+      mergePatchOwner: () => assert.fail("must not persist an intermediate owner"),
+    })
+
+    const result = service.mergePatchOwner("config", "server", { sidecars: [{ id: "one" }] })
+    assert.equal(writes, 1)
+    assert.deepEqual(result, { logLevel: "INFO", sidecars: [{ id: "one" }] })
+  })
+})
diff --git a/packages/server/src/settings/service.ts b/packages/server/src/settings/service.ts
index dc860777f..5d3d89e9e 100644
--- a/packages/server/src/settings/service.ts
+++ b/packages/server/src/settings/service.ts
@@ -6,6 +6,7 @@ import { YamlDocStore, type SettingsDoc } from "./yaml-doc-store"
 import { migrateSettingsLayout } from "./migrate"
 import type { WorkspaceEventPayload } from "../api-types"
 import { sanitizeConfigOwner } from "./public-config"
+import { applyMergePatch } from "./merge-patch"
 
 export type DocKind = "config" | "state"
 
@@ -93,9 +94,12 @@ export class SettingsService {
   }
 
   mergePatchDoc(kind: DocKind, patch: unknown): SettingsDoc {
+    if (!isPlainObject(patch)) {
+      throw new Error("Patch must be a JSON object")
+    }
     const updated =
       kind === "config"
-        ? this.configStore.replace(normalizeConfigDoc(this.configStore.mergePatch(patch)))
+        ? this.configStore.replace(normalizeConfigDoc(applyMergePatch(this.configStore.get(), patch) as SettingsDoc))
         : this.stateStore.mergePatch(patch)
     this.publish(kind, "*")
     return updated
@@ -112,10 +116,16 @@ export class SettingsService {
   }
 
   mergePatchOwner(kind: DocKind, owner: string, patch: unknown): SettingsDoc {
+    if (!isPlainObject(patch)) {
+      throw new Error("Patch must be a JSON object")
+    }
     const updated =
       kind === "config"
         ? owner === "server"
-          ? this.configStore.replaceOwner(owner, normalizeServerConfigOwner(this.configStore.mergePatchOwner(owner, patch)))
+          ? this.configStore.replaceOwner(
+              owner,
+              normalizeServerConfigOwner(applyMergePatch(this.configStore.getOwner(owner), patch) as SettingsDoc),
+            )
           : this.configStore.mergePatchOwner(owner, patch)
         : this.stateStore.mergePatchOwner(owner, patch)
     this.publish(kind, owner, updated)

From 0136e2a368f7447959b6c528d50c51eba4251a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 21:46:18 +0200
Subject: [PATCH 08/11] fix(server): atomically replace settings files

Write YAML updates to a same-directory temporary file and rename it over the live document. Failed writes or replacements now leave the prior on-disk and cached settings intact.

Treat settings-change events as post-commit notifications so listener errors are logged without making a successful persisted request look failed. Add regression coverage for failed replacement, successful Windows replacement, and listener exceptions.
---
 packages/server/src/settings/service.test.ts  | 15 ++++++++++++
 packages/server/src/settings/service.ts       |  6 ++++-
 .../src/settings/yaml-doc-store.test.ts       | 23 +++++++++++++++++++
 .../server/src/settings/yaml-doc-store.ts     | 14 ++++++++++-
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/settings/service.test.ts b/packages/server/src/settings/service.test.ts
index 6fa0c6fea..505a5cca9 100644
--- a/packages/server/src/settings/service.test.ts
+++ b/packages/server/src/settings/service.test.ts
@@ -40,4 +40,19 @@ describe("SettingsService config persistence", () => {
     assert.equal(writes, 1)
     assert.deepEqual(result, { logLevel: "INFO", sidecars: [{ id: "one" }] })
   })
+
+  it("does not report a persisted patch as failed when an event listener throws", () => {
+    let warnings = 0
+    const service = serviceWithStore({
+      getOwner: () => ({}),
+      mergePatchOwner: (_owner: string, patch: unknown) => patch,
+    })
+    Object.assign(service as any, {
+      eventBus: { publish: () => { throw new Error("listener failed") } },
+      logger: { warn: () => { warnings += 1 } },
+    })
+
+    assert.deepEqual(service.mergePatchOwner("config", "ui", { theme: "dark" }), { theme: "dark" })
+    assert.equal(warnings, 1)
+  })
 })
diff --git a/packages/server/src/settings/service.ts b/packages/server/src/settings/service.ts
index 5d3d89e9e..7bb10e721 100644
--- a/packages/server/src/settings/service.ts
+++ b/packages/server/src/settings/service.ts
@@ -141,6 +141,10 @@ export class SettingsService {
       owner,
       value: kind === "config" ? sanitizeConfigOwner(owner, nextValue) : nextValue,
     } as any
-    this.eventBus.publish(payload)
+    try {
+      this.eventBus.publish(payload)
+    } catch (error) {
+      this.logger.warn({ err: error, kind, owner }, "Failed to publish settings change")
+    }
   }
 }
diff --git a/packages/server/src/settings/yaml-doc-store.test.ts b/packages/server/src/settings/yaml-doc-store.test.ts
index 91fcb1698..97ca28487 100644
--- a/packages/server/src/settings/yaml-doc-store.test.ts
+++ b/packages/server/src/settings/yaml-doc-store.test.ts
@@ -23,4 +23,27 @@ describe("YamlDocStore", () => {
       fs.rmSync(root, { recursive: true, force: true })
     }
   })
+
+  it("keeps the live document intact when atomic replacement fails", () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const file = path.join(root, "config.yaml")
+    const store = new YamlDocStore(file, { warn() {} } as any, { throwOnPersistError: true })
+    const renameSync = fs.renameSync
+
+    try {
+      store.replace({ version: 1 })
+      ;(fs as any).renameSync = () => { throw new Error("replacement failed") }
+
+      assert.throws(() => store.replace({ version: 2 }))
+      assert.match(fs.readFileSync(file, "utf8"), /version: 1/)
+      assert.deepEqual(store.get(), { version: 1 })
+
+      ;(fs as any).renameSync = renameSync
+      store.replace({ version: 2 })
+      assert.match(fs.readFileSync(file, "utf8"), /version: 2/)
+    } finally {
+      ;(fs as any).renameSync = renameSync
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
 })
diff --git a/packages/server/src/settings/yaml-doc-store.ts b/packages/server/src/settings/yaml-doc-store.ts
index 5e5850046..c61579c44 100644
--- a/packages/server/src/settings/yaml-doc-store.ts
+++ b/packages/server/src/settings/yaml-doc-store.ts
@@ -1,5 +1,6 @@
 import fs from "fs"
 import path from "path"
+import { randomUUID } from "node:crypto"
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml"
 import type { Logger } from "../logger"
 import { applyMergePatch, isPlainObject } from "./merge-patch"
@@ -108,13 +109,24 @@ export class YamlDocStore {
   }
 
   private persist() {
+    let tempPath: string | undefined
     try {
       fs.mkdirSync(path.dirname(this.filePath), { recursive: true })
       const yaml = stringifyYaml(this.cache as any)
-      fs.writeFileSync(this.filePath, ensureTrailingNewline(yaml), "utf-8")
+      tempPath = `${this.filePath}.${process.pid}.${randomUUID()}.tmp`
+      fs.writeFileSync(tempPath, ensureTrailingNewline(yaml), "utf-8")
+      fs.renameSync(tempPath, this.filePath)
     } catch (error) {
       this.logger.warn({ err: error, filePath: this.filePath }, "Failed to persist YAML doc")
       if (this.options.throwOnPersistError) throw error
+    } finally {
+      if (tempPath) {
+        try {
+          fs.rmSync(tempPath, { force: true })
+        } catch (error) {
+          this.logger.warn({ err: error, tempPath }, "Failed to remove temporary YAML doc")
+        }
+      }
     }
   }
 }

From 039b18b902266aab99311dde642107bb99fd6788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 21:57:23 +0200
Subject: [PATCH 09/11] fix(ui): harden visibility persistence and labels

Serialize model visibility writes across providers so full server snapshots cannot resolve out of order. Include provider and exact model identifiers in the localized accessible picker label.

Preserve existing settings-file permissions during atomic replacement, create new settings files privately, and update symlink targets without replacing the links. Add POSIX regression coverage for permissions and symlinks plus UI wiring checks.

Validated with workspace and server typechecks, focused persistence and visibility tests, the UI production build, and git diff checks.
---
 .../src/settings/yaml-doc-store.test.ts       | 32 +++++++++++++++++++
 .../server/src/settings/yaml-doc-store.ts     | 19 ++++++++---
 packages/ui/src/components/model-selector.tsx | 14 ++++++--
 .../ui/src/lib/i18n/messages/de/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/en/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/es/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/fr/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/he/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/ja/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/ne/settings.ts   |  1 +
 .../ui/src/lib/i18n/messages/ru/settings.ts   |  1 +
 .../src/lib/i18n/messages/zh-Hans/settings.ts |  1 +
 packages/ui/src/lib/model-visibility.test.ts  | 10 +++++-
 packages/ui/src/stores/preferences.tsx        |  4 ++-
 14 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/settings/yaml-doc-store.test.ts b/packages/server/src/settings/yaml-doc-store.test.ts
index 97ca28487..8784da966 100644
--- a/packages/server/src/settings/yaml-doc-store.test.ts
+++ b/packages/server/src/settings/yaml-doc-store.test.ts
@@ -46,4 +46,36 @@ describe("YamlDocStore", () => {
       fs.rmSync(root, { recursive: true, force: true })
     }
   })
+
+  it("preserves private file permissions", { skip: process.platform === "win32" }, () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const file = path.join(root, "config.yaml")
+    const store = new YamlDocStore(file, { warn() {} } as any, { throwOnPersistError: true })
+
+    try {
+      store.replace({ version: 1 })
+      fs.chmodSync(file, 0o600)
+      store.replace({ version: 2 })
+      assert.equal(fs.statSync(file).mode & 0o777, 0o600)
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
+
+  it("updates a symlink target without replacing the link", { skip: process.platform === "win32" }, () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
+    const target = path.join(root, "target.yaml")
+    const link = path.join(root, "config.yaml")
+    fs.writeFileSync(target, "version: 1\n")
+    fs.symlinkSync(target, link)
+    const store = new YamlDocStore(link, { warn() {} } as any, { throwOnPersistError: true })
+
+    try {
+      store.replace({ version: 2 })
+      assert.equal(fs.lstatSync(link).isSymbolicLink(), true)
+      assert.match(fs.readFileSync(target, "utf8"), /version: 2/)
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true })
+    }
+  })
 })
diff --git a/packages/server/src/settings/yaml-doc-store.ts b/packages/server/src/settings/yaml-doc-store.ts
index c61579c44..f50de9b3f 100644
--- a/packages/server/src/settings/yaml-doc-store.ts
+++ b/packages/server/src/settings/yaml-doc-store.ts
@@ -111,11 +111,22 @@ export class YamlDocStore {
   private persist() {
     let tempPath: string | undefined
     try {
-      fs.mkdirSync(path.dirname(this.filePath), { recursive: true })
+      let destination = this.filePath
+      try {
+        if (fs.lstatSync(this.filePath).isSymbolicLink()) {
+          const target = fs.readlinkSync(this.filePath)
+          destination = path.resolve(path.dirname(this.filePath), target)
+        }
+      } catch (error: any) {
+        if (error?.code !== "ENOENT") throw error
+      }
+
+      fs.mkdirSync(path.dirname(destination), { recursive: true })
       const yaml = stringifyYaml(this.cache as any)
-      tempPath = `${this.filePath}.${process.pid}.${randomUUID()}.tmp`
-      fs.writeFileSync(tempPath, ensureTrailingNewline(yaml), "utf-8")
-      fs.renameSync(tempPath, this.filePath)
+      const mode = fs.existsSync(destination) ? fs.statSync(destination).mode & 0o777 : 0o600
+      tempPath = `${destination}.${process.pid}.${randomUUID()}.tmp`
+      fs.writeFileSync(tempPath, ensureTrailingNewline(yaml), { encoding: "utf-8", mode })
+      fs.renameSync(tempPath, destination)
     } catch (error) {
       this.logger.warn({ err: error, filePath: this.filePath }, "Failed to persist YAML doc")
       if (this.options.throwOnPersistError) throw error
diff --git a/packages/ui/src/components/model-selector.tsx b/packages/ui/src/components/model-selector.tsx
index c1550f9e1..0ae193718 100644
--- a/packages/ui/src/components/model-selector.tsx
+++ b/packages/ui/src/components/model-selector.tsx
@@ -199,6 +199,16 @@ export default function ModelSelector(props: ModelSelectorProps) {
     t("modelSelector.trigger.primary", { model: currentModelValue()?.name ?? t("modelSelector.none") }),
   )
 
+  const currentModelAccessibleLabel = createMemo(() => {
+    const current = currentModelValue()
+    if (!current) return currentModelLabel()
+    return t("modelSelector.trigger.ariaLabel", {
+      model: current.name,
+      provider: current.providerName,
+      id: `${current.providerId}/${current.id}`,
+    })
+  })
+
   const handleChange = async (value: PickerOption | null) => {
     if (!value || isProviderHeaderOption(value) || value.unavailable) return
     await props.onModelChange({ providerId: value.providerId, modelId: value.id })
@@ -388,11 +398,11 @@ export default function ModelSelector(props: ModelSelectorProps) {
         }}
       >
         <Combobox.Control class="relative w-full" data-model-selector-control>
-          <Combobox.Input class="sr-only" data-model-selector aria-label={currentModelLabel()} />
+          <Combobox.Input class="sr-only" data-model-selector aria-label={currentModelAccessibleLabel()} />
           <Combobox.Trigger
             ref={triggerRef}
             class="selector-trigger"
-            aria-label={currentModelLabel()}
+            aria-label={currentModelAccessibleLabel()}
           >
             <div class="selector-trigger-label selector-trigger-label--stacked flex-1 min-w-0">
               <span class="selector-trigger-primary selector-trigger-primary--align-left">
diff --git a/packages/ui/src/lib/i18n/messages/de/settings.ts b/packages/ui/src/lib/i18n/messages/de/settings.ts
index f38a3446e..716b6427a 100644
--- a/packages/ui/src/lib/i18n/messages/de/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/de/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Modelle suchen...",
   "modelSelector.none": "Keines",
   "modelSelector.trigger.primary": "Modell: {model}",
+  "modelSelector.trigger.ariaLabel": "Modell: {model}, Anbieter: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Nur Favoriten umschalten",
   "modelSelector.favoritesOnly.showAll": "Alle Modelle anzeigen",
   "modelSelector.favorite.add": "Zu Favoriten hinzufügen",
diff --git a/packages/ui/src/lib/i18n/messages/en/settings.ts b/packages/ui/src/lib/i18n/messages/en/settings.ts
index 0696825cd..c275900dd 100644
--- a/packages/ui/src/lib/i18n/messages/en/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/en/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Search models...",
   "modelSelector.none": "None",
   "modelSelector.trigger.primary": "Model: {model}",
+  "modelSelector.trigger.ariaLabel": "Model: {model}, provider: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Toggle favorites only",
   "modelSelector.favoritesOnly.showAll": "Show all models",
   "modelSelector.favorite.add": "Add to favorites",
diff --git a/packages/ui/src/lib/i18n/messages/es/settings.ts b/packages/ui/src/lib/i18n/messages/es/settings.ts
index 07e8f7686..4ce787cac 100644
--- a/packages/ui/src/lib/i18n/messages/es/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/es/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Buscar modelos...",
   "modelSelector.none": "Ninguno",
   "modelSelector.trigger.primary": "Modelo: {model}",
+  "modelSelector.trigger.ariaLabel": "Modelo: {model}, proveedor: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Alternar solo favoritos",
   "modelSelector.favoritesOnly.showAll": "Mostrar todos los modelos",
   "modelSelector.favorite.add": "Agregar a favoritos",
diff --git a/packages/ui/src/lib/i18n/messages/fr/settings.ts b/packages/ui/src/lib/i18n/messages/fr/settings.ts
index aa91d1841..890079d3d 100644
--- a/packages/ui/src/lib/i18n/messages/fr/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/fr/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Rechercher des modèles...",
   "modelSelector.none": "Aucun",
   "modelSelector.trigger.primary": "Modèle : {model}",
+  "modelSelector.trigger.ariaLabel": "Modèle : {model}, fournisseur : {provider}, identifiant : {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Basculer en favoris uniquement",
   "modelSelector.favoritesOnly.showAll": "Afficher tous les modèles",
   "modelSelector.favorite.add": "Ajouter aux favoris",
diff --git a/packages/ui/src/lib/i18n/messages/he/settings.ts b/packages/ui/src/lib/i18n/messages/he/settings.ts
index e15b28c5d..9967c766c 100644
--- a/packages/ui/src/lib/i18n/messages/he/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/he/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "חפש מודלים...",
   "modelSelector.none": "ללא",
   "modelSelector.trigger.primary": "מודל: {model}",
+  "modelSelector.trigger.ariaLabel": "מודל: {model}, ספק: {provider}, מזהה: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "הצג מועדפים בלבד",
   "modelSelector.favoritesOnly.showAll": "הצג את כל המודלים",
   "modelSelector.favorite.add": "הוסף למועדפים",
diff --git a/packages/ui/src/lib/i18n/messages/ja/settings.ts b/packages/ui/src/lib/i18n/messages/ja/settings.ts
index a85a906e4..dfcb9a044 100644
--- a/packages/ui/src/lib/i18n/messages/ja/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ja/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "モデルを検索...",
   "modelSelector.none": "なし",
   "modelSelector.trigger.primary": "モデル: {model}",
+  "modelSelector.trigger.ariaLabel": "モデル: {model}、プロバイダー: {provider}、ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "お気に入りのみ",
   "modelSelector.favoritesOnly.showAll": "すべてのモデルを表示",
   "modelSelector.favorite.add": "お気に入りに追加",
diff --git a/packages/ui/src/lib/i18n/messages/ne/settings.ts b/packages/ui/src/lib/i18n/messages/ne/settings.ts
index 54edf4262..769fc1913 100644
--- a/packages/ui/src/lib/i18n/messages/ne/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ne/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "मोडेलहरू खोज्नुहोस्...",
   "modelSelector.none": "कुनै छैन",
   "modelSelector.trigger.primary": "मोडेल: {model}",
+  "modelSelector.trigger.ariaLabel": "मोडेल: {model}, प्रदायक: {provider}, आईडी: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "मनपर्ने मात्र टगल गर्नुहोस्",
   "modelSelector.favoritesOnly.showAll": "सबै मोडेलहरू देखाउनुहोस्",
   "modelSelector.favorite.add": "मनपर्नेमा थप्नुहोस्",
diff --git a/packages/ui/src/lib/i18n/messages/ru/settings.ts b/packages/ui/src/lib/i18n/messages/ru/settings.ts
index 34e4ebdd3..15a03ae87 100644
--- a/packages/ui/src/lib/i18n/messages/ru/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ru/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "Поиск моделей…",
   "modelSelector.none": "Нет",
   "modelSelector.trigger.primary": "Модель: {model}",
+  "modelSelector.trigger.ariaLabel": "Модель: {model}, провайдер: {provider}, ID: {id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "Только избранное",
   "modelSelector.favoritesOnly.showAll": "Показать все модели",
   "modelSelector.favorite.add": "Добавить в избранное",
diff --git a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
index 1357ff69f..ef046df6d 100644
--- a/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-Hans/settings.ts
@@ -28,6 +28,7 @@ export const settingsMessages = {
   "modelSelector.placeholder.search": "搜索模型...",
   "modelSelector.none": "无",
   "modelSelector.trigger.primary": "模型：{model}",
+  "modelSelector.trigger.ariaLabel": "模型：{model}，提供商：{provider}，ID：{id}",
   "modelSelector.favoritesOnly.toggle.ariaLabel": "仅显示收藏",
   "modelSelector.favoritesOnly.showAll": "显示所有模型",
   "modelSelector.favorite.add": "添加到收藏",
diff --git a/packages/ui/src/lib/model-visibility.test.ts b/packages/ui/src/lib/model-visibility.test.ts
index 9711f483e..d720b287e 100644
--- a/packages/ui/src/lib/model-visibility.test.ts
+++ b/packages/ui/src/lib/model-visibility.test.ts
@@ -64,5 +64,13 @@ test("provider refresh updates shared and modal catalogs without disposing activ
 test("model picker wires collection-safe selection and an accessible current-model label", () => {
   const source = fs.readFileSync(new URL("../components/model-selector.tsx", import.meta.url), "utf8")
   assert.match(source, /value=\{comboboxValue\(\)\}/)
-  assert.equal(source.match(/aria-label=\{currentModelLabel\(\)\}/g)?.length, 2)
+  assert.equal(source.match(/aria-label=\{currentModelAccessibleLabel\(\)\}/g)?.length, 2)
+  assert.match(source, /id: `\$\{current\.providerId\}\/\$\{current\.id\}`/)
+})
+
+test("serializes visibility writes across providers before installing server snapshots", () => {
+  const source = fs.readFileSync(new URL("../stores/preferences.tsx", import.meta.url), "utf8")
+  assert.match(source, /let modelVisibilityWriteQueue = Promise\.resolve\(\)/)
+  assert.match(source, /const previous = modelVisibilityWriteQueue/)
+  assert.match(source, /modelVisibilityWriteQueue = write/)
 })
diff --git a/packages/ui/src/stores/preferences.tsx b/packages/ui/src/stores/preferences.tsx
index 3427692da..63d289ef1 100644
--- a/packages/ui/src/stores/preferences.tsx
+++ b/packages/ui/src/stores/preferences.tsx
@@ -638,6 +638,7 @@ function updatePreferences(updates: Partial<UiSettings>): void {
 }
 
 const modelVisibilityWriteQueues = new Map<string, Promise<void>>()
+let modelVisibilityWriteQueue = Promise.resolve()
 const [pendingModelVisibility, setPendingModelVisibility] = createSignal(new Map<string, ModelVisibilityPreference>())
 const [modelVisibilityWriteFailures, setModelVisibilityWriteFailures] = createSignal(new Set<string>())
 
@@ -659,7 +660,7 @@ async function setProviderModelVisibility(providerId: string, preference: ModelV
     next.delete(providerId)
     return next
   })
-  const previous = modelVisibilityWriteQueues.get(providerId) ?? Promise.resolve()
+  const previous = modelVisibilityWriteQueue
   const write = previous
     .catch(() => undefined)
     .then(() => patchConfigOwner("ui", {
@@ -670,6 +671,7 @@ async function setProviderModelVisibility(providerId: string, preference: ModelV
       },
     }))
 
+  modelVisibilityWriteQueue = write
   modelVisibilityWriteQueues.set(providerId, write)
   void write.then(
     () => {

From 19e5d1318b393f26e390955a4975945bbacdc8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 22:03:46 +0200
Subject: [PATCH 10/11] fix(server): preserve settings file metadata

Resolve complete symlink chains before atomic replacement and apply the original mode after temporary-file creation so umask cannot silently change existing permissions.

Expand POSIX coverage to assert exact nontrivial mode preservation and multi-hop symlink retention.
---
 .../src/settings/yaml-doc-store.test.ts       | 11 ++++---
 .../server/src/settings/yaml-doc-store.ts     | 31 +++++++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/packages/server/src/settings/yaml-doc-store.test.ts b/packages/server/src/settings/yaml-doc-store.test.ts
index 8784da966..1dc98edcf 100644
--- a/packages/server/src/settings/yaml-doc-store.test.ts
+++ b/packages/server/src/settings/yaml-doc-store.test.ts
@@ -54,25 +54,28 @@ describe("YamlDocStore", () => {
 
     try {
       store.replace({ version: 1 })
-      fs.chmodSync(file, 0o600)
+      fs.chmodSync(file, 0o664)
       store.replace({ version: 2 })
-      assert.equal(fs.statSync(file).mode & 0o777, 0o600)
+      assert.equal(fs.statSync(file).mode & 0o777, 0o664)
     } finally {
       fs.rmSync(root, { recursive: true, force: true })
     }
   })
 
-  it("updates a symlink target without replacing the link", { skip: process.platform === "win32" }, () => {
+  it("updates the final target without replacing a symlink chain", { skip: process.platform === "win32" }, () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "codenomad-yaml-store-"))
     const target = path.join(root, "target.yaml")
+    const intermediate = path.join(root, "current.yaml")
     const link = path.join(root, "config.yaml")
     fs.writeFileSync(target, "version: 1\n")
-    fs.symlinkSync(target, link)
+    fs.symlinkSync(target, intermediate)
+    fs.symlinkSync(intermediate, link)
     const store = new YamlDocStore(link, { warn() {} } as any, { throwOnPersistError: true })
 
     try {
       store.replace({ version: 2 })
       assert.equal(fs.lstatSync(link).isSymbolicLink(), true)
+      assert.equal(fs.lstatSync(intermediate).isSymbolicLink(), true)
       assert.match(fs.readFileSync(target, "utf8"), /version: 2/)
     } finally {
       fs.rmSync(root, { recursive: true, force: true })
diff --git a/packages/server/src/settings/yaml-doc-store.ts b/packages/server/src/settings/yaml-doc-store.ts
index f50de9b3f..95090c10b 100644
--- a/packages/server/src/settings/yaml-doc-store.ts
+++ b/packages/server/src/settings/yaml-doc-store.ts
@@ -19,6 +19,25 @@ function normalizeDoc(input: unknown): SettingsDoc {
   return input
 }
 
+function resolveWriteDestination(filePath: string): string {
+  let current = path.resolve(filePath)
+  const seen = new Set<string>()
+
+  while (true) {
+    let stat: fs.Stats
+    try {
+      stat = fs.lstatSync(current)
+    } catch (error: any) {
+      if (error?.code === "ENOENT") return current
+      throw error
+    }
+    if (!stat.isSymbolicLink()) return current
+    if (seen.has(current)) throw new Error(`Circular settings symlink: ${filePath}`)
+    seen.add(current)
+    current = path.resolve(path.dirname(current), fs.readlinkSync(current))
+  }
+}
+
 export class YamlDocStore {
   private cache: SettingsDoc = {}
   private loaded = false
@@ -111,21 +130,13 @@ export class YamlDocStore {
   private persist() {
     let tempPath: string | undefined
     try {
-      let destination = this.filePath
-      try {
-        if (fs.lstatSync(this.filePath).isSymbolicLink()) {
-          const target = fs.readlinkSync(this.filePath)
-          destination = path.resolve(path.dirname(this.filePath), target)
-        }
-      } catch (error: any) {
-        if (error?.code !== "ENOENT") throw error
-      }
-
+      const destination = resolveWriteDestination(this.filePath)
       fs.mkdirSync(path.dirname(destination), { recursive: true })
       const yaml = stringifyYaml(this.cache as any)
       const mode = fs.existsSync(destination) ? fs.statSync(destination).mode & 0o777 : 0o600
       tempPath = `${destination}.${process.pid}.${randomUUID()}.tmp`
       fs.writeFileSync(tempPath, ensureTrailingNewline(yaml), { encoding: "utf-8", mode })
+      if (process.platform !== "win32") fs.chmodSync(tempPath, mode)
       fs.renameSync(tempPath, destination)
     } catch (error) {
       this.logger.warn({ err: error, filePath: this.filePath }, "Failed to persist YAML doc")

From 3a142c4478e0ea913d6cb2b48550d56e41f25aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Andr=C3=A9?= <pascalandr@gmail.com>
Date: Fri, 7 Aug 2026 23:13:04 +0200
Subject: [PATCH 11/11] fix(ui): prevent provider action wrapping

Give configured-provider cards enough responsive width for their model-management and disconnect actions, and keep button labels on one line. This avoids the narrow vertical text shown in the provider authentication dialog while retaining a single-column layout on small screens.

Validated with the UI production build and git diff --check.
---
 packages/ui/src/styles/components/provider-auth.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/styles/components/provider-auth.css b/packages/ui/src/styles/components/provider-auth.css
index 3132b842a..8647dc83c 100644
--- a/packages/ui/src/styles/components/provider-auth.css
+++ b/packages/ui/src/styles/components/provider-auth.css
@@ -90,7 +90,7 @@
 
 .providers-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(min(20rem, 100%), 1fr));
   gap: 0.875rem;
 }
 
@@ -211,6 +211,11 @@
   border-top: 1px solid color-mix(in oklab, var(--border-base) 70%, transparent);
 }
 
+.providers-card-footer .selector-button {
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
 .providers-disconnect-button {
   width: min(9rem, 50%);
   min-width: 6.5rem;