@lynn123411/dsh-model-submenu 0.2.5 → 0.3.1

package/src/client/effort-memory.ts

@@ -0,0 +1,90 @@
+/**
+ * The per-model reasoning level this browser last chose.
+ *
+ * The Host stores one level per session, so switching models away and back
+ * forgets what was picked for the first one. This module keeps that memory
+ * beside the favorite table, keyed the same way: provider route key plus model
+ * id. Remembering the provider default removes the row, so "follow the
+ * provider" stays distinguishable from "remembered a level".
+ */
+
+/** One remembered reasoning level. */
+export interface RememberedEffort {
+  readonly provider: string
+  readonly model: string
+  readonly effort: string
+}
+
+/** The single browser-wide storage key holding the whole memory. */
+export const EFFORTS_KEY = 'dsh-model-submenu.efforts'
+
+/** The part of `Storage` this module uses; absent or throwing reads mean "none". */
+export type EffortStorage = Pick<Storage, 'getItem' | 'setItem'>
+
+/**
+ * Read the memory, keeping only rows naming both halves and a level.
+ * @param storage - browser storage, or undefined when the browser withholds it.
+ * @returns the remembered rows; empty when unreadable.
+ */
+export function readEfforts(storage: EffortStorage | undefined): RememberedEffort[] {
+  const raw = getItem(storage)
+  if (raw === null) return []
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(raw)
+  } catch {
+    return []
+  }
+  if (!Array.isArray(parsed)) return []
+  return parsed.filter((row): row is RememberedEffort => typeof row === 'object' && row !== null
+    && typeof (row as RememberedEffort).provider === 'string'
+    && typeof (row as RememberedEffort).model === 'string'
+    && typeof (row as RememberedEffort).effort === 'string'
+    && (row as RememberedEffort).effort !== '')
+}
+
+/**
+ * @param memory - the rows to search.
+ * @param provider - the provider route key.
+ * @param model - the model id inside that provider.
+ * @returns the level last chosen for that exact model, or undefined.
+ */
+export function effortFor(
+  memory: readonly RememberedEffort[],
+  provider: string,
+  model: string,
+): string | undefined {
+  return memory.find((row) => row.provider === provider && row.model === model)?.effort
+}
+
+/**
+ * Remember one model's level, or forget it when the choice is the provider default.
+ * @param storage - browser storage, or undefined when writes are unavailable.
+ * @param provider - the provider route key.
+ * @param model - the model id inside that provider.
+ * @param effort - the chosen level, undefined meaning the provider default.
+ * @returns the memory after the change, whether or not the write landed.
+ */
+export function rememberEffort(
+  storage: EffortStorage | undefined,
+  provider: string,
+  model: string,
+  effort: string | undefined,
+): RememberedEffort[] {
+  const rest = readEfforts(storage).filter((row) => row.provider !== provider || row.model !== model)
+  const next = effort === undefined ? rest : [...rest, { provider, model, effort }]
+  try {
+    storage?.setItem(EFFORTS_KEY, JSON.stringify(next))
+  } catch {
+    // A full quota or a locked-down browser loses the memory, not the menu.
+  }
+  return next
+}
+
+function getItem(storage: EffortStorage | undefined): string | null {
+  try {
+    return storage?.getItem(EFFORTS_KEY) ?? null
+  } catch {
+    return null
+  }
+}

package/src/client/facts-source.ts

@@ -0,0 +1,93 @@
+/**
+ * The browser's live answer to "what does the settings document know about this
+ * model?".
+ *
+ * Two host answers meet here: the shared settings mirror (which the settings
+ * page already keeps warm) and the LLM provider directory that says which
+ * settings namespace holds each provider's profile. Both can change while the
+ * page is open — a saved profile, a reconnected host — so the join is rebuilt
+ * whenever the mirror or the directory reports a change, and readers subscribe
+ * to the lookup itself.
+ */
+
+import type { ModelFacts } from './model-facts.ts'
+import {
+  buildModelFacts,
+  type ConfigurableProviderRow,
+  type NamespaceRow,
+} from './model-facts.ts'
+
+/** One lookup answering both metadata fields for a provider and model. */
+export type ModelFactsLookup = (provider: string, model: string) => ModelFacts
+
+/** The mirror face this source reads; a subset of the settings provider's. */
+export interface DescribeFace {
+  getSnapshot(): { readonly view: { readonly namespaces: readonly NamespaceRow[] } | undefined }
+  subscribe(listener: () => void): () => void
+  ensure(): Promise<void>
+}
+
+/** One remote answer, as the gateway returns it. */
+export interface DirectoryAnswer {
+  readonly ok: boolean
+  readonly value?: readonly ConfigurableProviderRow[]
+}
+
+/** A stable, subscribable lookup over the current settings answer. */
+export interface FactsSource {
+  /** @returns the lookup for the current answer; the identity changes on every rebuild. */
+  getSnapshot(): ModelFactsLookup
+  /** @param listener - called after each rebuild. @returns the disposer. */
+  subscribe(listener: () => void): () => void
+}
+
+const EMPTY: ModelFactsLookup = () => ({ contextWindow: undefined, images: 'unknown' })
+
+/**
+ * Join the settings mirror with the provider directory.
+ * @param deps.describe - the settings mirror's describe face.
+ * @param deps.listProviders - reads the LLM provider directory once.
+ * @returns the source, plus `start` which wires both reads and returns its disposer.
+ */
+export function createFactsSource(deps: {
+  readonly describe: DescribeFace
+  readonly listProviders: () => Promise<DirectoryAnswer>
+}): { readonly source: FactsSource; readonly start: () => () => void } {
+  const listeners = new Set<() => void>()
+  let providers: readonly ConfigurableProviderRow[] = []
+  let lookup: ModelFactsLookup = EMPTY
+
+  const rebuild = () => {
+    const namespaces = deps.describe.getSnapshot().view?.namespaces ?? []
+    lookup = providers.length === 0 || namespaces.length === 0
+      ? EMPTY
+      : buildModelFacts(providers, namespaces)
+    for (const listener of [...listeners]) listener()
+  }
+
+  return {
+    source: {
+      getSnapshot: () => lookup,
+      subscribe: (listener) => {
+        listeners.add(listener)
+        return () => { listeners.delete(listener) }
+      },
+    },
+    start: () => {
+      const off = deps.describe.subscribe(rebuild)
+      void deps.describe.ensure().catch(() => { /* a failed read leaves the empty lookup in place */ })
+      void deps.listProviders().then(
+        (answer) => {
+          providers = answer.ok && answer.value !== undefined ? answer.value : []
+          rebuild()
+        },
+        () => { /* the directory being unavailable leaves every model's facts unknown */ },
+      )
+      rebuild()
+      return () => {
+        off()
+        listeners.clear()
+      }
+    },
+  }
+}

package/src/client/favorites.ts

@@ -0,0 +1,103 @@
+/**
+ * The favorite-model table the picker keeps in the browser.
+ *
+ * One browser-wide key holds `{ provider, model }` rows: the provider route key
+ * and the model id are the catalog's own identity, so a favorite survives a
+ * display-name change and never collides across providers. A value that cannot
+ * be read or does not parse reads as an empty table — a privacy-mode browser or
+ * a hand-edited row must never keep the menu from opening. Rows whose provider
+ * leaves the catalog are kept, so restoring the provider restores the star.
+ */
+
+import type { ModelRef } from './rows.ts'
+
+/** One favorited model, identified the way the catalog identifies it. */
+export type FavoriteModel = ModelRef
+
+/** The single browser-wide storage key holding the whole table. */
+export const FAVORITES_KEY = 'dsh-model-submenu.favorites'
+
+/** The part of `Storage` this module uses; absent or throwing reads mean "none". */
+export type FavoritesStorage = Pick<Storage, 'getItem' | 'setItem'>
+
+/**
+ * Read the table, keeping only rows that name both halves.
+ * @param storage - browser storage, or undefined when the browser withholds it.
+ * @returns the stored favorites in stored order; empty when unreadable.
+ */
+export function readFavorites(storage: FavoritesStorage | undefined): FavoriteModel[] {
+  const raw = getItem(storage)
+  if (raw === null) return []
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(raw)
+  } catch {
+    return []
+  }
+  if (!Array.isArray(parsed)) return []
+  return parsed.filter((row): row is FavoriteModel => typeof row === 'object' && row !== null
+    && typeof (row as FavoriteModel).provider === 'string'
+    && typeof (row as FavoriteModel).model === 'string')
+}
+
+/**
+ * Add or remove one model, writing the whole table back.
+ * @param storage - browser storage, or undefined when writes are unavailable.
+ * @param provider - the provider route key.
+ * @param model - the model id inside that provider.
+ * @returns the table after the change, whether or not the write landed.
+ */
+export function toggleFavorite(
+  storage: FavoritesStorage | undefined,
+  provider: string,
+  model: string,
+): FavoriteModel[] {
+  const current = readFavorites(storage)
+  const next = isFavorite(current, provider, model)
+    ? current.filter((row) => row.provider !== provider || row.model !== model)
+    : [...current, { provider, model }]
+  try {
+    storage?.setItem(FAVORITES_KEY, JSON.stringify(next))
+  } catch {
+    // A full quota or a locked-down browser loses the star, not the menu.
+  }
+  return next
+}
+
+/**
+ * @param favorites - the table to search.
+ * @param provider - the provider route key.
+ * @param model - the model id inside that provider.
+ * @returns whether that exact pair is favorited.
+ */
+export function isFavorite(
+  favorites: readonly FavoriteModel[],
+  provider: string,
+  model: string,
+): boolean {
+  return favorites.some((row) => row.provider === provider && row.model === model)
+}
+
+/**
+ * Stable-partition a catalog so favorited rows lead, each part keeping the
+ * catalog's own order.
+ * @param rows - the catalog in its display order.
+ * @param favorited - predicate answering whether one row is favorited.
+ * @returns a new list; the input order when nothing is favorited.
+ */
+export function orderWithFavorites<T>(
+  rows: readonly T[],
+  favorited: (row: T) => boolean,
+): readonly T[] {
+  const starred = rows.filter(favorited)
+  if (starred.length === 0) return rows
+  return [...starred, ...rows.filter((row) => !favorited(row))]
+}
+
+function getItem(storage: FavoritesStorage | undefined): string | null {
+  try {
+    return storage?.getItem(FAVORITES_KEY) ?? null
+  } catch {
+    return null
+  }
+}

package/src/client/icons.tsx

@@ -0,0 +1,36 @@
+/**
+ * The one glyph this plugin draws itself.
+ *
+ * The shared icon library carries no star, so the favorite mark is defined here:
+ * a five-point star whose outline and fill use the same path, which keeps the
+ * hover-only outline and the standing filled state identical in geometry.
+ */
+
+/**
+ * Render the favorite star.
+ * @param props.filled - draw the solid star; otherwise the outline.
+ * @param props.size - square edge in pixels, matching the shared icon set's default.
+ * @param props.className - extra class for colour and placement.
+ * @returns the inline SVG.
+ */
+export function StarIcon({ filled, size = 14, className }: {
+  readonly filled: boolean
+  readonly size?: number | undefined
+  readonly className?: string | undefined
+}) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      fill={filled ? 'currentColor' : 'none'}
+      stroke="currentColor"
+      strokeWidth={filled ? 0 : 1.6}
+      strokeLinejoin="round"
+      aria-hidden="true"
+      className={className}
+    >
+      <path d="M12 3.2l2.7 5.6 6.1.85-4.45 4.3 1.08 6.05L12 17.1l-5.43 2.9 1.08-6.05L3.2 9.65l6.1-.85z" />
+    </svg>
+  )
+}

package/src/client/index.ts

@@ -2,26 +2,41 @@ import type { Context as ClientContext } from '@deepseek-ai/cordis'
 // Type-only: `slots` and its LocaleNamespaceMap merge come from the renderer and
 // the slot package; the composer seat's SlotMap entry and owner props from
 // ui-conversation; the `modelDirectories` service and the seat's injected face
-// from ui-model-selection's browser half.
+// from ui-model-selection's browser half; `configForms` from the settings
+// provider, whose shared mirror answers the metadata line.
 import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
 import type {} from '@deepseek-ai/dsh-client-locale/client'
 import type {} from '@deepseek-ai/dsh-api-remotes/client'
 import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
 import type {} from '@deepseek-ai/dsh-client-ui-model-selection/client'
+import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
 import { ModelSubmenu } from './ModelSubmenu.tsx'
+import { createFactsSource, type DescribeFace } from './facts-source.ts'
 import { NS, en, zh } from './locales.ts'
 
 export { ModelSubmenu } from './ModelSubmenu.tsx'
 
 /**
  * Cordis services required by the browser half. `slots` is the contribution
- * registry, `sessions` tells whether a session may select a model, and
+ * registry, `sessions` tells whether a session may select a model,
  * `modelDirectories` owns the per-session catalog snapshot this seat renders
- * from. `remote` / `remote.session` are declared because a service method runs
- * on the calling context: `directoryFor` reads `this.ctx.remote.session` while
- * building the directory, so the seat must carry that service too.
+ * from, and `configForms` carries the settings provider's shared describe
+ * mirror, which answers each model's context window and accepted modalities.
+ * `remote`, `remote.llm`, and `remote.session` are declared because a service
+ * method runs on the calling context: `directoryFor` reads
+ * `this.ctx.remote.session`, and the provider directory that names each
+ * settings address is read through `this.ctx.remote.llm`.
  */
-export const inject = ['locale', 'modelDirectories', 'remote', 'remote.session', 'sessions', 'slots']
+export const inject = [
+  'configForms',
+  'locale',
+  'modelDirectories',
+  'remote',
+  'remote.llm',
+  'remote.session',
+  'sessions',
+  'slots',
+]
 
 /**
  * Client plugin body: register this plugin's dictionaries, then take over the
@@ -31,9 +46,14 @@ export const inject = ['locale', 'modelDirectories', 'remote', 'remote.session',
  */
 export function apply(ctx: ClientContext): void {
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-model-submenu: dictionaries')
-  ctx.inject(['slots', 'modelDirectories'], (scope) => {
+  ctx.inject(['slots', 'modelDirectories', 'configForms', 'remote'], (scope) => {
     const models = scope.modelDirectories
     const sessions = scope.sessions
+    const facts = createFactsSource({
+      describe: scope.configForms.describe() as DescribeFace,
+      listProviders: () => scope.remote.llm.listConfigurableProviders(),
+    })
+    ctx.effect(() => facts.start(), 'dsh-model-submenu: model metadata')
     scope.slots.inject('conversation.input.model', () => scope.slots.register({
       name: 'conversation.input.model',
       priority: -100,
@@ -48,6 +68,7 @@ export function apply(ctx: ClientContext): void {
         return {
           available,
           directory: directory.store,
+          factsSource: facts.source,
           load: () => {
             if (available) directory.load().catch(() => {})
           },
@@ -56,4 +77,4 @@ export function apply(ctx: ClientContext): void {
       },
     }, ModelSubmenu))
   })
-}
+}

package/src/client/locales.ts

@@ -1,76 +1,109 @@
-/** Locale bundles for the composer model seat this plugin takes over. */
+/** Locale bundles for the composer model menu and the picker it opens. */
 
 /** Dictionary namespace owned by this plugin. */
 export const NS = 'modelSubmenu'
 
-/** Locale keys the seat renders. */
+/** Locale keys the menu and the picker render. */
 export type ModelSubmenuLocaleKey =
-  | 'back'
-  | 'provider.modelCount'
-  | 'action.reload'
   | 'trigger.fallback'
   | 'trigger.loading'
   | 'trigger.selectAria'
   | 'trigger.aria'
   | 'trigger.ariaEffort'
   | 'menu.aria'
-  | 'menu.provider'
   | 'menu.effort'
+  | 'menu.more'
+  | 'menu.hint'
   | 'effort.providerDefault'
   | 'status.loading'
+  | 'status.empty'
+  | 'status.failed'
+  | 'status.providerFailed'
+  | 'action.reload'
   | 'error.action'
   | 'error.sessionInUse'
-  | 'warning.groupLoad'
-  | 'empty.models'
-  | 'empty.efforts'
+  | 'picker.title'
+  | 'picker.close'
+  | 'picker.search'
+  | 'picker.searchEmpty'
+  | 'picker.all'
+  | 'picker.favorite'
+  | 'picker.unfavorite'
+  | 'picker.hintNavigate'
+  | 'picker.hintSelect'
+  | 'picker.hintClose'
+  | 'meta.effort'
+  | 'meta.images'
 
 declare module '@deepseek-ai/dsh-client-ui-slots' {
   interface LocaleNamespaceMap {
-    /** The composer model seat's copy. */
+    /** The composer model menu's copy. */
     modelSubmenu: ModelSubmenuLocaleKey
   }
 }
 
 /** Simplified Chinese dictionary (the key-set source of truth). */
 export const zh: Record<ModelSubmenuLocaleKey, string> = {
-  'back': '返回',
-  'provider.modelCount': '{count} 个模型',
-  'action.reload': '重新加载',
   'trigger.fallback': '选择模型',
   'trigger.loading': '正在加载模型…',
   'trigger.selectAria': '选择模型',
   'trigger.aria': '选择模型，当前 {model}',
-  'trigger.ariaEffort': '选择模型，当前 {model}，推理等级 {effort}',
-  'menu.aria': '供应商与推理等级',
-  'menu.provider': '供应商',
-  'menu.effort': '推理等级',
-  'effort.providerDefault': 'Default',
-  'status.loading': '正在刷新模型列表…',
+  'trigger.ariaEffort': '选择模型，当前 {model}，思考等级 {effort}',
+  'menu.aria': '模型与思考等级',
+  'menu.effort': '思考',
+  'menu.more': '更多模型…',
+  'menu.hint': '提示：切换模型或思考程度会使既有的提示词缓存失效。建议新建会话，避免额外的 token 消耗。',
+  'effort.providerDefault': '默认',
+  'status.loading': '正在加载模型…',
+  'status.empty': '没有可用的模型。',
+  'status.failed': '模型列表加载失败：{message}',
+  'status.providerFailed': '{name} 加载失败：{message}',
+  'action.reload': '重新加载',
   'error.action': '模型操作失败：{message}',
   'error.sessionInUse': '当前会话已被占用，可能是其他正在运行的 DSH 导致的（如其他 dsh web、桌面端），请退出其他正在运行的 DSH 后重试。',
-  'warning.groupLoad': '{name} 加载失败：{message}',
-  'empty.models': '没有可用的模型。',
-  'empty.efforts': '当前模型未提供推理等级。',
+  'picker.title': '切换模型',
+  'picker.close': '关闭',
+  'picker.search': '搜索模型或提供商…',
+  'picker.searchEmpty': '没有匹配的模型。',
+  'picker.all': '全部',
+  'picker.favorite': '收藏 {model}',
+  'picker.unfavorite': '取消收藏 {model}',
+  'picker.hintNavigate': '导航',
+  'picker.hintSelect': '选择',
+  'picker.hintClose': '关闭',
+  'meta.effort': '思考',
+  'meta.images': '图片输入',
 }
 
 /** English dictionary, checked complete against the zh key set. */
 export const en: Record<ModelSubmenuLocaleKey, string> = {
-  'back': 'Back',
-  'provider.modelCount': '{count} models',
-  'action.reload': 'Reload',
   'trigger.fallback': 'Select model',
   'trigger.loading': 'Loading models…',
   'trigger.selectAria': 'Select model',
   'trigger.aria': 'Select model, current {model}',
-  'trigger.ariaEffort': 'Select model, current {model}, reasoning effort {effort}',
-  'menu.aria': 'Provider and reasoning effort',
-  'menu.provider': 'Provider',
+  'trigger.ariaEffort': 'Select model, current {model}, effort {effort}',
+  'menu.aria': 'Model and effort',
   'menu.effort': 'Effort',
+  'menu.more': 'More models…',
+  'menu.hint': 'Changing the model or the effort invalidates the existing prompt cache. Start a new session to avoid the extra token cost.',
   'effort.providerDefault': 'Default',
-  'status.loading': 'Refreshing model list…',
+  'status.loading': 'Loading models…',
+  'status.empty': 'No models available.',
+  'status.failed': 'Model list failed to load: {message}',
+  'status.providerFailed': '{name} failed to load: {message}',
+  'action.reload': 'Reload',
   'error.action': 'Model operation failed: {message}',
   'error.sessionInUse': 'This session is already in use, possibly by another running DSH instance (such as dsh web or the desktop app). Quit other running DSH instances and try again.',
-  'warning.groupLoad': '{name} failed to load: {message}',
-  'empty.models': 'No models available.',
-  'empty.efforts': 'This model provides no reasoning effort levels.',
-}
+  'picker.title': 'Switch model',
+  'picker.close': 'Close',
+  'picker.search': 'Search models or providers…',
+  'picker.searchEmpty': 'No matching models.',
+  'picker.all': 'All',
+  'picker.favorite': 'Favorite {model}',
+  'picker.unfavorite': 'Remove {model} from favorites',
+  'picker.hintNavigate': 'navigate',
+  'picker.hintSelect': 'select',
+  'picker.hintClose': 'close',
+  'meta.effort': 'Effort',
+  'meta.images': 'Images',
+}