dsh-oc-tui 0.2.0-pre.13 → 0.2.0

package/lib/util.js

@@ -242,6 +242,55 @@ export function localImagePath(text) {
   return s
 }
 
+// What a bracketed paste contributes to a single-line text field.
+//
+// An image has no text form — decoding its bytes would type mojibake — so it
+// yields null and the caller drops it. A newline run is removed entirely for a
+// secret (a key pasted across lines is still one key) and folded into a single
+// space otherwise, which leaves a pasted JSON blob parseable. Remaining control
+// characters are stripped: some terminals pad their clipboard payload with NULs.
+export function fieldPasteText(bytes, { secret = false } = {}) {
+  if (!bytes || bytes.length === 0) return null
+  if (detectImageMediaType(bytes)) return null
+  const raw = bytes.toString('utf8')
+  const folded = secret ? raw.replace(/[\r\n]+/g, '') : raw.replace(/[\r\n]+/g, ' ')
+  const clean = folded.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g, '')
+  return clean === '' ? null : clean
+}
+
+// Reasoning as it should be displayed, with the transport's thinking signature
+// removed.
+//
+// Some endpoints prefix the reasoning text with `<signature>…</signature>`: the
+// opaque blob a later request replays to prove the chain of thought is the one
+// the model produced. It is routing data, not prose, and it is long enough to
+// fill the whole thinking box on its own. Mirrors the host's own
+// `reasoningText()` so both frontends show the same thing.
+//
+// Streaming is why this is a function of the raw text rather than a one-shot
+// strip: a delta can stop anywhere, including inside the tag itself. Anything
+// that could still turn out to be the opening tag — a lone `<`, `<sig`, the
+// complete opening tag with no close yet — yields empty text, so the box stays
+// hidden instead of flashing a partial tag and then vanishing. Text that merely
+// starts with `<` but cannot be that tag is returned untouched.
+export function reasoningText(text) {
+  if (typeof text !== 'string' || text[0] !== '<') return text ?? ''
+  const opening = '<signature>'
+  if (opening.startsWith(text)) return ''
+  if (!text.startsWith(opening)) return text
+  const end = text.indexOf('</signature>', opening.length)
+  if (end === -1) return ''
+  let start = end + '</signature>'.length
+  // The signature sits on its own lines; dropping the break that follows it
+  // keeps the first real paragraph from inheriting its indentation.
+  while (start < text.length) {
+    if (text[start] === '\n') start++
+    else if (text[start] === '\r' && text[start + 1] === '\n') start += 2
+    else break
+  }
+  return text.slice(start)
+}
+
 // A stored image reference is usable in message content only while it still
 // carries the media type every adapter reads to describe the image. The
 // attachment store returns the complete reference; a partial object reduced to

package/lib/web-settings.js

@@ -1,7 +1,23 @@
 import z from '@deepseek-ai/schemastery'
 import { dirname } from 'node:path'
 import { collectServers } from './mcp.js'
-import { LOCALES, isLocaleId, localeInfo, resolveLocale, setLocale, t, tv, valueChoices } from './i18n.js'
+import { LOCALES, isLocaleId, localeInfo, resolveLocale, setLocale, t, tn, tv, valueChoices } from './i18n.js'
+import {
+  ACCOUNT_ROUTE,
+  URL_FAMILIES,
+  adoptDiscovered,
+  capabilitySuffix,
+  capacitySuffix,
+  fetchProviderModels,
+  hasPath,
+  mergeModelSelection,
+  modelEntryId,
+  normalizeModels,
+  protocolChoices,
+  providerDirectory,
+  routeKeyRef,
+  valueAt,
+} from './providers.js'
 
 // The settings this plugin owns. Each is declared twice on purpose: as a
 // namespace for a 0.1.x settings provider (which has a registry and stores a
@@ -63,84 +79,11 @@ export const SETTINGS_MENU = [
 
 const MCP_MENU_INDEX = SETTINGS_MENU.findIndex((entry) => entry.id === 'mcp')
 
-function valueAt(source, path) {
-  let value = source
-  for (const part of path) {
-    if (typeof value !== 'object' || value === null) return undefined
-    value = value[part]
-  }
-  return value
-}
-
-function hasPath(source, path) {
-  let value = source
-  for (const part of path) {
-    if (typeof value !== 'object' || value === null || !Object.hasOwn(value, part)) return false
-    value = value[part]
-  }
-  return true
-}
-
-function keyRef(provider) {
-  return provider.toUpperCase().replace(/[^A-Z0-9]+/g, '_') + '_API_KEY'
-}
-
-// A provider's stored model catalog tolerates both string entries and
-// `{ id, ... }` objects; normalize to objects with an id so the merged view
-// and the picker can treat them uniformly.
-function normalizeModels(models) {
-  if (!Array.isArray(models)) return []
-  const out = []
-  for (const entry of models) {
-    if (typeof entry === 'string' && entry) out.push({ id: entry })
-    else if (entry && typeof entry === 'object' && typeof entry.id === 'string' && entry.id) out.push(entry)
-  }
-  return out
-}
-
-function modelEntryId(entry) {
-  return typeof entry === 'string' ? entry : entry?.id
-}
-
-// Picker/choice annotation: a glanceable capability marker per model.
-function capabilitySuffix(model) {
-  const capabilities = []
-  if (Array.isArray(model.inputModalities) && model.inputModalities.includes('image')) capabilities.push('vision')
-  if (model.reasoning && Array.isArray(model.reasoning.efforts) && model.reasoning.efforts.length > 0) capabilities.push('thinking')
-  return capabilities.length > 0 ? ' (' + capabilities.join(', ') + ')' : ''
-}
-
-// Discover the models a configurable provider advertises. Uses the
-// model-discovery seam (`ctx.llm.discoverModels`): it answers from the
-// installed catalog for a known route and interrogates a custom/dormant
-// route's endpoint — resolving the stored credential itself. `listModels`
-// only covers registered adapters, so it silently missed user-added
-// providers that are not currently registered; it is kept as the fallback for
-// namespaces that register no discovery (e.g. the built-in DeepSeek adapter).
-// Returns the normalized list plus whether discovery failed.
-async function fetchProviderModels(ctx, entry, record) {
-  const llm = ctx.get('llm')
-  let fetched = null
-  let failed = false
-  if (llm?.discoverModels) {
-    const request = {
-      ...(entry.provider === undefined ? {} : { provider: entry.provider }),
-      ...(typeof record.baseURL === 'string' && record.baseURL.trim().length > 0 ? { baseURL: record.baseURL } : {}),
-      ...(typeof record.api === 'string' && record.api.trim().length > 0 ? { api: record.api } : {}),
-    }
-    try {
-      fetched = await llm.discoverModels(entry.settingsNs, request)
-    } catch (error) {
-      // `NO_DISCOVERY` means the namespace registered no discovery; its
-      // registered adapter answers from its own catalog below.
-      if (error?.code !== 'NO_DISCOVERY') failed = true
-    }
-  }
-  if (!Array.isArray(fetched) && !failed && llm?.listModels) {
-    try { fetched = await llm.listModels(entry.provider) } catch { failed = true }
-  }
-  if (!Array.isArray(fetched) && !failed) failed = true
-  return { models: normalizeModels(fetched), failed }
+function modelPickerAnnotations(models) {
+  return models.map((model) => {
+    const suffix = capabilitySuffix(model)
+    return suffix ? { label: model.id + suffix, value: model.id } : model.id
+  })
 }
 
 function effortOptions(models, selectedModel) {
@@ -368,14 +311,16 @@ export function applyLocalePreference(ctx, config) {
 }
 // Model menu tab: the merged provider + model settings. Per provider:
 // Provider URL, Provider API key, Models (the saved selection, listed below
-// the row; Enter auto-fetches the catalog and opens the selection window).
+// the row; Enter auto-fetches the catalog and opens the selection window), a
+// manual "add model by id" row for an endpoint whose listing lies, and the
+// removal. The last row is the add flow itself.
 export async function loadModelSettings(ctx) {
   installWebSettingSchemas(ctx)
-  const settings = ctx.get('settings')
-  if (!settings) {
+  const directory = providerDirectory(ctx)
+  if (!directory) {
     return { settings: null, items: [{ label: t('model.title'), value: t('common.unavailable'), disabled: true }], title: t('model.title'), menu: SETTINGS_MENU, menuIndex: 1 }
   }
-  const descriptors = new Map(settings.describe({ redactSecrets: true }).map((entry) => [String(entry.ns), entry]))
+  const { settings, descriptors, llm, configured, addable } = directory
   const items = []
   const add = (ns, field, label, options, extra = {}) => {
     const descriptor = descriptors.get(ns)
@@ -383,24 +328,8 @@ export async function loadModelSettings(ctx) {
     const value = descriptor.value[field]
     items.push({ kind: options?.length ? 'choice' : 'text', ns, field, label, value: value === undefined ? 'system' : String(value), options, revision: descriptor.revision, disabled: !settings.writable, ...extra })
   }
-  const llm = ctx.get('llm')
   const credentials = ctx.get('credentials')
 
-  // Only providers the user has actually added are listed. A provider counts
-  // as added when its profile is present in the user settings layer; a
-  // built-in namespace provider (empty settings path) counts only when the
-  // user configured something in that namespace. Preset providers that were
-  // never added stay hidden.
-  const configurable = (llm?.listConfigurableProviders?.() ?? []).filter((entry) => {
-    const descriptor = descriptors.get(entry.settingsNs)
-    if (!descriptor) return false
-    if (entry.settingsPath.length === 0) {
-      return descriptor.user && typeof descriptor.user === 'object'
-        && Object.keys(descriptor.user).length > 0
-    }
-    return hasPath(descriptor.user, entry.settingsPath)
-  })
-
   // ---- default route ----------------------------------------------------
   items.push({ kind: 'header', label: t('model.defaultSection'), value: '', disabled: true })
   const providers = descriptors.get('llm-pi-ai')?.value?.providers
@@ -416,12 +345,10 @@ export async function loadModelSettings(ctx) {
   // would diverge from the saved selection shown in the provider block below.
   // The auto-fetched catalog stays available behind the Models row (Enter →
   // loadProviderModels).
-  const selectedEntry = configurable.find((entry) => entry.provider === selectedProvider)
+  const selectedEntry = configured.find((row) => row.entry.provider === selectedProvider)
   let models = []
   if (selectedEntry) {
-    const selectedDescriptor = descriptors.get(selectedEntry.settingsNs)
-    const selectedProfile = selectedDescriptor ? valueAt(selectedDescriptor.value, selectedEntry.settingsPath) : undefined
-    const selectedRecord = typeof selectedProfile === 'object' && selectedProfile !== null ? selectedProfile : {}
+    const selectedRecord = typeof selectedEntry.profile === 'object' && selectedEntry.profile !== null ? selectedEntry.profile : {}
     models = normalizeModels(selectedRecord.models)
   } else {
     models = normalizeModels(providerEntries.find(([id]) => id === selectedProvider)?.[1]?.models)
@@ -430,10 +357,7 @@ export async function loadModelSettings(ctx) {
   // The picker annotates each candidate with its capabilities, so a user can
   // tell at a glance which models take image input and which can adjust their
   // thinking strength instead of discovering the refusal after sending.
-  const modelOptions = models.map((model) => {
-    const suffix = capabilitySuffix(model)
-    return suffix ? { label: model.id + suffix, value: model.id } : model.id
-  })
+  const modelOptions = modelPickerAnnotations(models)
   add('agent-default-model', 'model', t('model.defaultModel'), modelOptions, { kind: 'default-model' })
   let reasoningOptions = effortOptions(models, selectedModel)
   let reasoningDefault
@@ -454,22 +378,45 @@ export async function loadModelSettings(ctx) {
   add('agent-default-model', 'reasoningEffort', t('model.reasoning'), reasoningOptions, reasoningExtra)
 
   // ---- merged provider blocks --------------------------------------------
-  for (const entry of configurable) {
-    const descriptor = descriptors.get(entry.settingsNs)
-    if (!descriptor) continue
-    items.push({ kind: 'header', label: entry.displayName, value: '', disabled: true })
-    const profile = valueAt(descriptor.value, entry.settingsPath)
-    const removable = entry.settingsPath.length > 0 && hasPath(descriptor.user, entry.settingsPath) && !hasPath(descriptor.base, entry.settingsPath)
+  for (const row of configured) {
+    const { entry, descriptor, path: settingsPath } = row
+    // A whole-section profile (`settingsPath: []`) is the plugin entry's own
+    // Config: there is no per-route record, and its `models` is the adapter's
+    // catalog rather than a selection, so it gets no model editing here.
+    const wholeSection = settingsPath.length === 0
+    const profile = row.profile
     const record = typeof profile === 'object' && profile !== null ? profile : {}
-    const ref = typeof record.apiKeyEnv === 'string' && record.apiKeyEnv ? record.apiKeyEnv : keyRef(entry.provider)
+    const isAccount = entry.provider === ACCOUNT_ROUTE
+    items.push({ kind: 'header', label: entry.displayName, value: '', disabled: true })
+    // A catalog diagnostic the adapter reported (a stored profile its installed
+    // catalog can no longer serve) is the whole reason a request from this route
+    // would fail, so it belongs on the row instead of in a log the TUI cannot
+    // show.
+    if (typeof entry.error === 'string' && entry.error !== '') {
+      items.push({ kind: 'provider-error', label: entry.error, wide: true, indent: 1, tone: 'warning', disabled: true, selectable: false })
+    }
+    // The account route authenticates through a sign-in, not a stored key, so it
+    // has no reference to describe and nothing to remove.
+    const ref = isAccount
+      ? undefined
+      : (typeof record.apiKeyEnv === 'string' && record.apiKeyEnv ? record.apiKeyEnv : routeKeyRef(entry.provider))
     let credential
-    try { credential = credentials ? await credentials.describe(ref) : undefined } catch { credential = undefined }
-    if (entry.settingsNs === 'llm-deepseek' || entry.settingsNs === 'llm-pi-ai') items.push({ kind: 'path', label: t('model.providerUrl'), value: typeof record.baseURL === 'string' ? record.baseURL : 'default', ns: entry.settingsNs, path: [...entry.settingsPath, 'baseURL'], revision: descriptor.revision, disabled: !settings.writable })
-    items.push({ kind: 'secret', label: t('model.providerApiKey'), value: credential?.configured ? t('model.credentialConfigured', { source: credential.source ?? 'stored' }) : t('model.credentialMissing'), credentialRef: ref, disabled: !credentials || credential?.writable === false })
+    if (ref !== undefined) {
+      try { credential = credentials ? await credentials.describe(ref) : undefined } catch { credential = undefined }
+    }
+    if (URL_FAMILIES.has(entry.settingsNs)) items.push({ kind: 'path', label: t('model.providerUrl'), value: typeof record.baseURL === 'string' ? record.baseURL : 'default', ns: entry.settingsNs, path: [...settingsPath, 'baseURL'], revision: descriptor.revision, disabled: !settings.writable })
+    if (isAccount) {
+      items.push({ kind: 'provider-note', label: t('provider.accountManaged'), wide: true, indent: 1, disabled: true, selectable: false })
+    } else {
+      items.push({ kind: 'secret', label: t('model.providerApiKey'), value: credential?.configured ? t('model.credentialConfigured', { source: credential.source ?? 'stored' }) : t('model.credentialMissing'), credentialRef: ref, disabled: !credentials || credential?.writable === false })
+    }
     if (entry.settingsNs === 'llm-pi-ai' && entry.declared === true) {
-      items.push({ kind: 'path', label: t('model.displayName'), value: typeof record.displayName === 'string' ? record.displayName : entry.displayName, ns: entry.settingsNs, path: [...entry.settingsPath, 'displayName'], revision: descriptor.revision, disabled: !settings.writable })
-      const choices = ['openai-completions', 'openai-responses', 'anthropic-messages', 'google-generative-ai']
-      items.push({ kind: 'path-choice', label: t('model.wireProtocol'), value: typeof record.api === 'string' ? record.api : choices[0], options: choices, ns: entry.settingsNs, path: [...entry.settingsPath, 'api'], revision: descriptor.revision, disabled: !settings.writable })
+      items.push({ kind: 'path', label: t('model.displayName'), value: typeof record.displayName === 'string' ? record.displayName : entry.displayName, ns: entry.settingsNs, path: [...settingsPath, 'displayName'], revision: descriptor.revision, disabled: !settings.writable })
+      // The protocols offered are the ones this adapter can serve, read out of
+      // its own schema: a hardcoded list offered `google-generative-ai`, which
+      // the family has no implementation for and would refuse at request time.
+      const choices = protocolChoices(descriptor)
+      if (choices.length > 0) items.push({ kind: 'path-choice', label: t('model.wireProtocol'), value: typeof record.api === 'string' ? record.api : choices[0], options: choices, ns: entry.settingsNs, path: [...settingsPath, 'api'], revision: descriptor.revision, disabled: !settings.writable })
     }
     // Route-level request modalities. This is what makes a hand-declared vision
     // model usable: pi-ai under-claims text by default (refusing the image before
@@ -477,7 +424,7 @@ export async function loadModelSettings(ctx) {
     // serving vision models declares `[text, image]` once here instead of on
     // every entry. Catalog models keep the modalities the catalog records for
     // them; this value never narrows one.
-    if (entry.settingsNs === 'llm-pi-ai') {
+    if (entry.settingsNs === 'llm-pi-ai' && !wholeSection) {
       const declaredInput = Array.isArray(record.defaultInput) ? record.defaultInput : undefined
       items.push({
         kind: 'input-modalities',
@@ -485,7 +432,7 @@ export async function loadModelSettings(ctx) {
         value: declaredInput?.includes('image') ? 'text + image' : 'text only',
         options: ['text only', 'text + image'].map((id) => ({ label: tv(id), value: id })),
         ns: entry.settingsNs,
-        path: [...entry.settingsPath, 'defaultInput'],
+        path: [...settingsPath, 'defaultInput'],
         revision: descriptor.revision,
         disabled: !settings.writable,
       })
@@ -493,13 +440,16 @@ export async function loadModelSettings(ctx) {
     // Models: Enter auto-fetches the provider catalog and opens the selection
     // window; the saved selection is listed right below, one row per model.
     const stored = normalizeModels(record.models)
-    items.push({ kind: 'provider-models', label: t('model.models'), value: stored.length > 0 ? t('model.selectedCount', { count: stored.length }) : t('model.fetch'), providerId: entry.provider, disabled: false })
+    if (!wholeSection) {
+      items.push({ kind: 'provider-models', label: t('model.models'), value: stored.length > 0 ? t('model.selectedCount', { count: stored.length }) : t('model.fetch'), providerId: entry.provider, disabled: false })
+    }
     for (const model of stored) {
       const isDefault = entry.provider === selectedProvider && model.id === selectedModel
+      const suffix = capabilitySuffix(model)
       items.push({
         kind: 'provider-model',
         label: model.id,
-        value: isDefault ? t('model.defaultTag') : '',
+        value: isDefault ? t('model.defaultTag') + suffix : suffix,
         indent: 1,
         modelId: model.id,
         providerId: entry.provider,
@@ -508,8 +458,37 @@ export async function loadModelSettings(ctx) {
         disabled: false,
       })
     }
-    if (removable) items.push({ kind: 'remove-provider', label: t('model.removeProvider'), value: 'Enter', ns: entry.settingsNs, path: entry.settingsPath, revision: descriptor.revision, credentialRef: credential?.configured && credential?.writable ? ref : undefined, confirmText: t('model.removeProviderConfirm', { name: entry.displayName }), disabled: !settings.writable })
+    // A hand-declared route's endpoint may advertise nothing usable, so a model
+    // id has to be typeable without a discovery round trip.
+    if (!wholeSection && entry.settingsNs === 'llm-pi-ai') {
+      items.push({
+        kind: 'provider-model-add',
+        label: t('provider.field.addModel'),
+        value: '',
+        indent: 1,
+        ns: entry.settingsNs,
+        path: settingsPath,
+        storedModels: stored,
+        revision: descriptor.revision,
+        disabled: !settings.writable,
+      })
+    }
+    const removable = !wholeSection && hasPath(descriptor.user, settingsPath) && !hasPath(descriptor.base, settingsPath)
+    if (removable) items.push({ kind: 'remove-provider', label: t('model.removeProvider'), value: 'Enter', ns: entry.settingsNs, path: settingsPath, revision: descriptor.revision, credentialRef: credential?.configured && credential?.writable ? ref : undefined, confirmText: t('model.removeProviderConfirm', { name: entry.displayName }), disabled: !settings.writable })
+  }
+  // ---- add a provider ---------------------------------------------------
+  // The WebUI's add card, as a row: with nothing configured it is also the only
+  // way out of an otherwise empty Model tab, which is exactly the state a fresh
+  // install starts in.
+  if (configured.length === 0) {
+    items.push({ kind: 'provider-none', label: t('provider.empty'), wide: true, disabled: true, selectable: false })
   }
+  items.push({
+    kind: 'provider-add',
+    label: t('provider.add'),
+    value: tn('model.addCount', addable.length, { count: addable.length }),
+    disabled: !settings.writable || addable.length === 0,
+  })
   return { settings, items, title: t('model.title'), subtitle: t('model.subtitle'), menu: SETTINGS_MENU, menuIndex: 1 }
 }
 
@@ -532,18 +511,33 @@ export async function loadProviderModels(ctx, providerId) {
   const fetched = discovered.models
   const fetchFailed = discovered.failed
   const items = []
+  // The refusal, verbatim: "answered 401; check the API key" and "no model
+  // listing for this protocol" are the difference between a fetch that looks
+  // broken and one a user can fix with the next keystroke.
+  if (discovered.error) {
+    items.push({ kind: 'model-error', label: discovered.error, wide: true, indent: 1, tone: 'warning', disabled: true, selectable: false })
+  }
   const seen = new Set()
+  const rows = []
   const pushRow = (model) => {
     if (!model?.id || seen.has(model.id)) return
     seen.add(model.id)
     const checked = storedIds.has(model.id)
-    items.push({
+    const saved = stored.find((candidate) => candidate.id === model.id)
+    rows.push({
       kind: 'model-toggle',
       label: model.id + capabilitySuffix(model),
-      value: checked ? '[x]' : '[ ]',
+      // The saved entry owns the capacities: a model the user corrected must
+      // read back as corrected, not as what the endpoint advertises.
+      value: (checked ? '[x]' : '[ ]') + capacitySuffix(saved ?? model),
       modelId: model.id,
       checked,
-      selectedIds: [...storedIds],
+      // What the entry would be if adopted: the endpoint's metadata, or the
+      // stored entry itself when the row came from the saved list.
+      candidate: model,
+      // Position in the saved list, or -1 for a model this provider lists
+      // nowhere yet. The editor addresses the array by position.
+      storedIndex: saved === undefined ? -1 : stored.indexOf(saved),
       storedModels: stored,
       providerId,
       settingsNs: entry.settingsNs,
@@ -555,16 +549,42 @@ export async function loadProviderModels(ctx, providerId) {
   for (const model of fetched) pushRow(model)
   // Saved models that the catalog no longer returns stay toggleable.
   for (const model of stored) pushRow(model)
-  if (items.length === 0) {
+  if (fetched.length > 0) {
+    const picked = fetched.filter((model) => storedIds.has(model.id)).length
+    items.push({
+      kind: 'model-select-all',
+      label: t('model.selectAll'),
+      value: (picked === fetched.length ? '[x] ' : '[ ] ') + picked + '/' + fetched.length,
+      allPicked: picked === fetched.length,
+      candidates: fetched,
+      storedModels: stored,
+      providerId,
+      settingsNs: entry.settingsNs,
+      providerPath: entry.settingsPath,
+      revision: descriptor.revision,
+      disabled: !settings.writable,
+    })
+  }
+  items.push(...rows)
+  if (rows.length === 0) {
     items.push({ label: fetchFailed ? t('model.noModels') : t('model.noModelsReturned'), value: '', disabled: true })
   }
+  // The two actions a discovery round trip cannot cover: a model the endpoint
+  // does not advertise (or one whose metadata needs correcting), and asking
+  // again now that the endpoint came up.
+  items.push({ kind: 'model-add', label: t('provider.field.addModel'), value: 'Enter', storedModels: stored, providerId, settingsNs: entry.settingsNs, providerPath: entry.settingsPath, revision: descriptor.revision, disabled: !settings.writable })
+  items.push({ kind: 'model-refresh', label: t('model.refresh'), value: 'Enter', providerId, disabled: !settings.writable })
   return {
     settings,
     items,
+    storedModels: stored,
+    fetched,
+    fetchFailed,
+    fetchError: discovered.error,
     title: entry.displayName + ' · ' + t('model.models').toLowerCase(),
     subtitle: fetchFailed
-      ? t('model.fetchUnavailable')
-      : t('model.fetchOk'),
+      ? t('model.fetchUnavailable') + ' · ' + t('model.editHint')
+      : t('model.fetchOk') + ' · ' + t('model.editHint'),
   }
 }
 
@@ -633,21 +653,41 @@ export async function saveWebSetting(ctx, settings, item, value) {
     ], item.revision)
   }
   // The auto-fetched selection window: toggle one model in or out of the
-  // provider's saved models list. Existing stored entries keep their shape;
-  // additions are plain `{ id }` records.
+  // provider's saved models list. Existing stored entries keep their shape
+  // (and their position, so nothing the user corrected is rewritten);
+  // an adopted one keeps what the endpoint advertised.
   if (item.kind === 'model-toggle') {
-    const ids = new Set(item.selectedIds ?? [])
-    if (item.checked) ids.delete(item.modelId)
-    else ids.add(item.modelId)
-    const next = []
-    for (const entry of item.storedModels ?? []) {
-      if (ids.has(modelEntryId(entry))) next.push(entry)
-    }
-    for (const id of ids) {
-      if (!next.some((entry) => modelEntryId(entry) === id)) next.push({ id })
+    const next = [...(item.storedModels ?? [])]
+    if (item.checked) {
+      const index = next.findIndex((entry) => modelEntryId(entry) === item.modelId)
+      if (index >= 0) next.splice(index, 1)
+    } else if (!next.some((entry) => modelEntryId(entry) === item.modelId)) {
+      next.push(adoptDiscovered(item.candidate) ?? { id: item.modelId })
     }
     return settings.mutate(item.settingsNs, [{ op: 'set', path: [...item.providerPath, 'models'], value: next }], item.revision)
   }
+  // A model id typed by hand joins the saved list. Existing entries keep their
+  // shape and their order; the new row is a plain `{ id }` record, which is all
+  // a catalog model needs (the adapter fills the capacities it knows).
+  if (item.kind === 'provider-model-add') {
+    const id = value.trim()
+    if (id === '') return
+    const next = [...(item.storedModels ?? [])]
+    if (next.some((entry) => modelEntryId(entry) === id)) throw new Error(t('provider.error.modelDuplicate', { id }))
+    next.push({ id })
+    return settings.mutate(item.ns, [{ op: 'set', path: [...item.path, 'models'], value: next }], item.revision)
+  }
+  // The whole-selection toggle: every model the endpoint advertised, or none.
+  //
+  // Deselecting means the empty list — the stored rows go too, which is the only
+  // reading of "deselect all" that leaves nothing ticked. For a catalog route the
+  // unset is also "serve your own catalog again"; a hand-declared route has no
+  // catalog to fall back to, so the adapter refuses that write and says why.
+  if (item.kind === 'model-select-all') {
+    const next = item.allPicked ? [] : mergeModelSelection(item.storedModels ?? [], item.candidates ?? [])
+    const path = [...item.providerPath, 'models']
+    return settings.mutate(item.settingsNs, [next.length === 0 ? { op: 'unset', path } : { op: 'set', path, value: next }], item.revision)
+  }
   if (!item.ns || !item.field) return
   if (item.ns === 'locale' && item.field === 'preference' && value === 'system') return settings.replace(item.ns, {}, item.revision)
   // A TUI-owned field set back to the value it defaults to is cleared rather

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-oc-tui",
-  "version": "0.2.0-pre.13",
+  "version": "0.2.0",
   "type": "module",
   "description": "A terminal UI (TUI) for DeepSeek Harness — an opencode-inspired chat client that boots as a dsh profile app plugin. ｜ DeepSeek Harness 的终端界面（TUI），受 opencode 启发，以 dsh profile 应用插件形式启动。",
   "keywords": [
@@ -25,8 +25,8 @@
   "author": "rayafriandion",
   "license": "LGPL-3.0-or-later",
   "scripts": {
-    "test": "node tests/smoke.test.mjs && node tests/i18n.test.mjs && node tests/locale.test.mjs && node tests/locale-forms.test.mjs && node tests/graphics.test.mjs && node tests/render.test.mjs && node tests/rail.test.mjs && node tests/rewind.test.mjs && node tests/std.test.mjs && node tests/resume.test.mjs && node tests/mcp.test.mjs && node tests/mcp-form.test.mjs && node tests/mcp-sse-bridge.test.mjs && node tests/mcp-skill.test.mjs && node tests/mcp-live.test.mjs && node tests/esc-questions.test.mjs && node tests/deadline.test.mjs && node tests/secret-prompt.test.mjs && node tests/test-mermaid-ascii.mjs",
-    "check": "node --check lib/index.js && node --check lib/ui.js && node --check lib/term.js && node --check lib/caps.js && node --check lib/image.js && node --check lib/mcp.js && node --check lib/mcp-skill.js && node --check lib/mermaid.js && node --check lib/mermaid-ascii.js && node --check lib/util.js && node --check lib/metrics.js && node --check lib/interrupt.js && node --check lib/web-settings.js && node --check lib/updates.js && node --check lib/rewind.js && node --check lib/bridge.js && node --check lib/facet.js && node --check lib/i18n.js && node --check lib/locales/en.js && node --check lib/locales/zh-CN.js && node --check lib/locales/zh-TW.js && node --check lib/locales/ja.js && node --check lib/locales/ko.js && node --check lib/locales/de.js && node --check lib/locales/fr.js && node --check lib/locales/es.js && node --check lib/locales/pt-BR.js && node --check lib/locales/ru.js && node --check lib/locales/it.js && node --check lib/locales/tr.js && node --check lib/locales/vi.js && node --check lib/locales/id.js && node --check lib/locales/pl.js && node --check lib/locales/nl.js && node --check lib/locales/ar.js && node --check lib/std/adapt.js && node --check lib/std/presentation.js && node --check lib/std/command-list.js && node --check lib/std/commands.js && node --check bin/dsh-oc-tui.js && node --check bin/apply-update.cjs && node --check bin/mcp-sse-bridge.mjs"
+    "test": "node tests/smoke.test.mjs && node tests/i18n.test.mjs && node tests/locale.test.mjs && node tests/locale-forms.test.mjs && node tests/provider-form.test.mjs && node tests/graphics.test.mjs && node tests/render.test.mjs && node tests/reasoning.test.mjs && node tests/diagnostics.test.mjs && node tests/media.test.mjs && node tests/rail.test.mjs && node tests/rewind.test.mjs && node tests/git-branch.test.mjs && node tests/std.test.mjs && node tests/resume.test.mjs && node tests/mcp.test.mjs && node tests/mcp-form.test.mjs && node tests/mcp-sse-bridge.test.mjs && node tests/mcp-skill.test.mjs && node tests/mcp-live.test.mjs && node tests/esc-questions.test.mjs && node tests/deadline.test.mjs && node tests/secret-prompt.test.mjs && node tests/settings-paste.test.mjs && node tests/test-mermaid-ascii.mjs",
+    "check": "node --check lib/index.js && node --check lib/ui.js && node --check lib/term.js && node --check lib/diagnostics.js && node --check lib/caps.js && node --check lib/image.js && node --check lib/mcp.js && node --check lib/mcp-skill.js && node --check lib/mermaid.js && node --check lib/mermaid-ascii.js && node --check lib/providers.js && node --check lib/util.js && node --check lib/metrics.js && node --check lib/interrupt.js && node --check lib/web-settings.js && node --check lib/updates.js && node --check lib/rewind.js && node --check lib/git-branch.js && node --check lib/bridge.js && node --check lib/facet.js && node --check lib/i18n.js && node --check lib/locales/en.js && node --check lib/locales/zh-CN.js && node --check lib/locales/zh-TW.js && node --check lib/locales/ja.js && node --check lib/locales/ko.js && node --check lib/locales/de.js && node --check lib/locales/fr.js && node --check lib/locales/es.js && node --check lib/locales/pt-BR.js && node --check lib/locales/ru.js && node --check lib/locales/it.js && node --check lib/locales/tr.js && node --check lib/locales/vi.js && node --check lib/locales/id.js && node --check lib/locales/pl.js && node --check lib/locales/nl.js && node --check lib/locales/ar.js && node --check lib/std/adapt.js && node --check lib/std/presentation.js && node --check lib/std/command-list.js && node --check lib/std/commands.js && node --check bin/dsh-oc-tui.js && node --check bin/apply-update.cjs && node --check bin/mcp-sse-bridge.mjs"
   },
   "main": "lib/index.js",
   "exports": {
@@ -45,7 +45,8 @@
     "docs/用户手册.md"
   ],
   "engines": {
-    "node": "^22.19 || >=24"
+    "node": "^22.19 || >=24",
+    "dsh": ">=0.1.1-rc.2 <0.3.0-0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "*",