@goodandready/dsh-subscriptions 0.7.28 → 0.7.29

package/lib/adapter-manager.js

@@ -5,6 +5,7 @@ import { PROVIDERS, isProvider, oauthRef } from './refs.js'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { getVendor } from './vendors/index.js'
 import { Config, plainConfig } from './config-schema.js'
+import { MODEL_CATALOG_TTL_MS, catalogSnapshotFresh } from './models-catalog.js'
 
 export function createAdapterManager({
   ctx,
@@ -38,6 +39,8 @@ export function createAdapterManager({
   const adapter = new SubscriptionAdapter({
     live: () => live(),
     listAccounts: (provider) => store.listAccounts(provider),
+    getDynamicModels: (ref) => store.getDynamicModels(ref),
+    rememberDynamicModels: (ref, models) => store.rememberDynamicModels(ref, models),
     loadBlob: (ref) => store.loadBlob(ref),
     ensureFresh: (provider, blob, ref) => store.ensureFresh(provider, blob, ref),
     vendorConfig: (provider) => vendorConfig(provider, live()),
@@ -243,26 +246,28 @@ export function createAdapterManager({
     }
   }
 
-  let lastModelRefresh = 0
-  const providerModelCache = new Map()
+  const lastModelRefreshAt = new Map()
 
-  async function refreshModels() {
-    if (Date.now() - lastModelRefresh < 60 * 1000) return
-    lastModelRefresh = Date.now()
-    const providers = await store.loggedInProviders()
-    for (const provider of providers) {
+  async function refreshModels({ force = false } = {}) {
+    const now = Date.now()
+    const slots = normalizeSlots(live().slots)
+    for (const slot of slots) {
+      const last = lastModelRefreshAt.get(slot.ref)
+      if (!force && catalogSnapshotFresh(last, now, MODEL_CATALOG_TTL_MS)) continue
       try {
-        const slot = normalizeSlots(live().slots).find((x) => x.provider === provider)
-        if (!slot) continue
         const blob = await store.loadBlob(slot.ref).catch(() => null)
         if (!blob) continue
-        const fresh = await store.ensureFresh(provider, blob, slot.ref)
-        const cfg = vendorConfig(provider, live())
-        const liveModels = await getVendor(provider).listModels(fresh, cfg, fetch).catch(() => null)
+        const fresh = await store.ensureFresh(slot.provider, blob, slot.ref)
+        const cfg = vendorConfig(slot.provider, live())
+        const liveModels = await getVendor(slot.provider).listModels(fresh, cfg, fetch).catch(() => null)
+        // #828: empty/broken live catalogs must not erase last-known-good.
         if (Array.isArray(liveModels) && liveModels.length) {
-          providerModelCache.set(provider, liveModels)
+          if (typeof store.rememberDynamicModels === 'function') {
+            store.rememberDynamicModels(slot.ref, liveModels)
+          }
+          lastModelRefreshAt.set(slot.ref, now)
         }
-      } catch { /* best-effort */ }
+      } catch { /* keep the previous snapshot */ }
     }
   }
 
@@ -326,9 +331,22 @@ export function createAdapterManager({
       }
       eager()
 
+      // #799: refresh at startup and hourly. Per-ref snapshots younger than
+      // five minutes are skipped, and failures keep last-known-good.
+      refreshModels().catch((err) => {
+        if (logger && logger.debug) logger.debug('[dsh-subscriptions] model refresh error: ' + (err && err.message || err))
+      })
+      const modelTimer = setInterval(() => {
+        refreshModels().catch((err) => {
+          if (logger && logger.debug) logger.debug('[dsh-subscriptions] hourly model refresh error: ' + (err && err.message || err))
+        })
+      }, 60 * 60 * 1000)
+      if (modelTimer && typeof modelTimer.unref === 'function') modelTimer.unref()
+
       return () => {
         adapterDisposed = true
         if (retryTimer) clearTimeout(retryTimer)
+        clearInterval(modelTimer)
         if (handle) {
           disposeAdapterHandle(handle)
           handle = undefined

package/lib/adapter.js

@@ -1,5 +1,5 @@
 import { resolveEffectiveReasoning, getModelReasoningCapabilities } from './reasoning-effort.js'
-import { inferModelCapabilities, isDeprecatedId } from './models-catalog.js'
+import { inferModelCapabilities, isDeprecatedId, mergeAccountCatalogs, resolveCatalogSource } from './models-catalog.js'
 import { fetchWithTimeout } from "./http.js"
 import { LlmAdapter, LlmError, attributionHeaders } from '@deepseek-ai/dsh-llm'
 import { displayName } from './refs.js'
@@ -54,10 +54,12 @@ export class SubscriptionAdapter extends LlmAdapter {
 
   async listModels(provider) {
     const accounts = await this.deps.listAccounts(provider)
+    const cfg = this.deps.vendorConfig(provider)
+    const builtin = modelCatalog(provider, cfg ? cfg.models : undefined)
     const targetAccount = accounts.find((a) => a.hasToken)
-    let models = null
+    let targetLive = null
+
     if (targetAccount) {
-      const cfg = this.deps.vendorConfig(provider)
       const baseFetch = pickFetch(this.deps, targetAccount.ref)
       const listModelsFetch = (url, init, opts) =>
         fetchWithTimeout(baseFetch, url, init, { timeoutMs: 15000, ...(opts || {}) })
@@ -68,13 +70,39 @@ export class SubscriptionAdapter extends LlmAdapter {
           targetAccount.ref,
         )
         const live = await getVendor(provider).listModels(blob, cfg, listModelsFetch)
-        if (Array.isArray(live) && live.length) models = live
-      } catch { /* use built-in catalog */ }
+        if (Array.isArray(live) && live.length) {
+          targetLive = live
+          if (typeof this.deps.rememberDynamicModels === 'function') {
+            this.deps.rememberDynamicModels(targetAccount.ref, live)
+          }
+        }
+      } catch { /* #828: keep last-known-good / built-in catalog */ }
     }
-    if (!models) {
-      const cfg = this.deps.vendorConfig(provider)
-      models = modelCatalog(provider, cfg ? cfg.models : undefined)
+
+    // #797: build the picker union from each account's own catalog. Live data
+    // is only fetched for the primary account here; background refresh fills
+    // the rest without blocking the picker.
+    const entries = []
+    for (const account of accounts) {
+      if (!account || !account.hasToken) continue
+      const cached = typeof this.deps.getDynamicModels === 'function'
+        ? this.deps.getDynamicModels(account.ref)
+        : null
+      const resolved = resolveCatalogSource({
+        live: account === targetAccount ? targetLive : null,
+        cached,
+        builtin,
+      })
+      entries.push({
+        ref: account.ref,
+        label: account.label || account.email || account.ref,
+        models: resolved.models,
+        source: resolved.source,
+      })
     }
+    if (!entries.length) entries.push({ models: builtin, source: 'builtin' })
+
+    let models = mergeAccountCatalogs(entries)
     // #94: optionally hide test/preview/beta/legacy ids from the picker.
     if (typeof this.deps.hideDeprecatedModels === 'function' && this.deps.hideDeprecatedModels()) {
       models = models.filter((m) => !isDeprecatedId(String((m && m.id) || '')))

package/lib/client.js

@@ -292,6 +292,9 @@ window.__ModuleLoader__.load({
       "poolModelsNone": "None",
       "poolModelsSelected": "selected",
       "poolModelsHint": "Automatic allows every current and future model. None removes this account from model routing. An explicit list permits only checked model ids.",
+      "poolModelsSearch": "Search models…",
+      "poolModelsCount": "{shown} shown · {selected} selected · {total} total",
+      "poolModelsNoMatches": "No models match this search.",
       "poolModelsNoCatalog": "No model catalog yet; sync models or use Automatic.",
       "tags": "Tags",
       "tagsPlaceholder": "team, prod",
@@ -675,6 +678,9 @@ window.__ModuleLoader__.load({
       "poolModelsNone": "无",
       "poolModelsSelected": "已选",
       "poolModelsHint": "自动允许当前及未来全部模型。无会将该账户移出模型调度。显式列表只允许勾选的模型 ID。",
+      "poolModelsSearch": "搜索模型…",
+      "poolModelsCount": "显示 {shown} · 已选 {selected} · 共 {total}",
+      "poolModelsNoMatches": "没有匹配的模型。",
       "poolModelsNoCatalog": "暂无模型目录；请同步模型或使用自动。",
       "tags": "标签",
       "tagsPlaceholder": "team, prod",
@@ -1047,6 +1053,7 @@ window.__ModuleLoader__.load({
       const [modelQuery, setModelQuery] = React.useState('')
       const [modelSort, setModelSort] = React.useState('name')
       const [modelLimit, setModelLimit] = React.useState(40)
+      const [poolModelQuery, setPoolModelQuery] = React.useState({})
       const [paste, setPaste] = React.useState({})
       const [device, setDevice] = React.useState({})  // #90 key -> {state,userCode,authUrl,intervalMs,status}
       const [loginLinks, setLoginLinks] = React.useState({})  // #595 provider:index -> fallback auth URL when a popup is blocked
@@ -2753,6 +2760,14 @@ h('div', { className: 'dsub-row' },
                   .concat(poolModels || [])
                   .filter(Boolean)
               )).sort()
+              const poolQuery = String(poolModelQuery[key] || '').trim().toLowerCase()
+              const visiblePoolModelIds = poolQuery
+                ? poolModelIds.filter((id) => String(id).toLowerCase().includes(poolQuery))
+                : poolModelIds
+              const selectedPoolCount = poolModels ? poolModels.length : poolModelIds.length
+              const poolModeLabel = !poolModels
+                ? t('poolModelsAutomatic')
+                : (poolModels.length ? (poolModels.length + ' ' + t('poolModelsSelected')) : t('poolModelsNone'))
               const avatarSrc = safeExternalUrl(account.avatarUrl, true)
               const avatarEl = (avatarSrc ? h('img', {
                 src: avatarSrc,
@@ -3063,9 +3078,24 @@ h('div', { className: 'dsub-row' },
                     ),
                     h('details', { className: 'dsub-details' },
                       h('summary', { className: 'dsub-summary' },
-                        '🎯 ' + t('poolModelsTitle') + ' · ' + (poolModels ? (poolModels.length + ' ' + t('poolModelsSelected')) : t('poolModelsAutomatic'))
+                        '🎯 ' + t('poolModelsTitle') + ' · ' + poolModeLabel
                       ),
                       h('div', { className: 'dsub-sub' }, t('poolModelsHint')),
+                      h('div', { className: 'dsub-row' },
+                        h('input', {
+                          className: 'dsub-inp dsub-grow',
+                          value: poolModelQuery[key] || '',
+                          placeholder: t('poolModelsSearch'),
+                          'aria-label': t('poolModelsSearch'),
+                          onChange: (e) => setPoolModelQuery((q) => Object.assign({}, q, { [key]: e.target.value })),
+                        }),
+                      ),
+                      h('div', { className: 'dsub-sub' },
+                        t('poolModelsCount')
+                          .replace('{shown}', String(visiblePoolModelIds.length))
+                          .replace('{selected}', String(selectedPoolCount))
+                          .replace('{total}', String(poolModelIds.length))
+                      ),
                       h('div', { className: 'dsub-row' },
                         h('button', {
                           type: 'button', className: 'dsub-mini' + (!poolModels ? ' dsub-btnActive' : ''),
@@ -3073,15 +3103,20 @@ h('div', { className: 'dsub-row' },
                         }, t('poolModelsAutomatic')),
                         h('button', {
                           type: 'button', className: 'dsub-mini',
-                          onClick: () => updateSlot(row.slot.provider, row.slot.index, { poolModels: poolModelIds.slice() }),
+                          onClick: () => updateSlot(row.slot.provider, row.slot.index, { poolModels: visiblePoolModelIds.slice() }),
                         }, t('poolModelsAll')),
                         h('button', {
                           type: 'button', className: 'dsub-mini' + (poolModels && poolModels.length === 0 ? ' dsub-btnActive' : ''),
-                          onClick: () => updateSlot(row.slot.provider, row.slot.index, { poolModels: [] }),
+                          onClick: () => {
+                            const base = poolModels || poolModelIds
+                            updateSlot(row.slot.provider, row.slot.index, {
+                              poolModels: base.filter((id) => !visiblePoolModelIds.includes(id)),
+                            })
+                          },
                         }, t('poolModelsNone')),
                       ),
-                      poolModelIds.length ? h('div', { className: 'dsub-row', style: { flexWrap: 'wrap', gap: 6 } },
-                        poolModelIds.map((modelId) => {
+                      visiblePoolModelIds.length ? h('div', { className: 'dsub-row', style: { flexWrap: 'wrap', gap: 6 } },
+                        visiblePoolModelIds.map((modelId) => {
                           const checked = poolModels ? poolModels.includes(modelId) : true
                           return h('label', { key: modelId, className: 'dsub-ref-tag', title: modelId },
                             h('input', {
@@ -3103,7 +3138,7 @@ h('div', { className: 'dsub-row' },
                             h('code', null, modelId)
                           )
                         })
-                      ) : h('div', { className: 'dsub-sub' }, t('poolModelsNoCatalog')),
+                      ) : h('div', { className: 'dsub-sub' }, poolModelIds.length ? t('poolModelsNoMatches') : t('poolModelsNoCatalog')),
                     ),
                     h('div', { className: 'dsub-row' },
                       h('span', { className: 'dsub-ref-tag' }, t('tags')),

package/lib/models-catalog.js

@@ -6,6 +6,63 @@ export function isDeprecatedId(id) {
 import { getVendor } from './vendors/index.js'
 import { getAccountRemainingPercent } from './rotate.js'
 
+export const MODEL_CATALOG_TTL_MS = 5 * 60 * 1000
+
+function catalogList(value) {
+  return Array.isArray(value) ? value.filter(Boolean) : []
+}
+
+/**
+ * Pick the best available catalog without ever dropping a provider.
+ * live > last-known-good cache > built-in vendor catalog.
+ */
+export function resolveCatalogSource({ live, cached, builtin } = {}) {
+  const liveList = catalogList(live)
+  if (liveList.length) return { models: liveList, source: 'live' }
+  const cachedList = catalogList(cached)
+  if (cachedList.length) return { models: cachedList, source: 'cached' }
+  return { models: catalogList(builtin), source: 'builtin' }
+}
+
+export function catalogSnapshotFresh(at, nowMs = Date.now(), ttlMs = MODEL_CATALOG_TTL_MS) {
+  if (!at || !Number.isFinite(Number(at))) return false
+  return Number(nowMs) - Number(at) < Number(ttlMs)
+}
+
+/**
+ * Union per-account catalogs, keeping the accounts that can see each model.
+ * Rows are deduplicated by id and never mutated.
+ */
+export function mergeAccountCatalogs(entries = []) {
+  const byId = new Map()
+  for (const entry of Array.isArray(entries) ? entries : []) {
+    if (!entry) continue
+    for (const model of catalogList(entry.models)) {
+      const id = model && (model.id || model.slug || model.name)
+      if (!id) continue
+      const existing = byId.get(id)
+      if (existing) {
+        if (entry.ref && !existing.accounts.includes(entry.ref)) existing.accounts.push(entry.ref)
+        if (entry.label && !existing.accountLabels.includes(entry.label)) existing.accountLabels.push(entry.label)
+        if (entry.source && !existing.catalogSources.includes(entry.source)) existing.catalogSources.push(entry.source)
+        continue
+      }
+      byId.set(id, {
+        ...model,
+        accounts: entry.ref ? [entry.ref] : [],
+        accountLabels: entry.label ? [entry.label] : [],
+        catalogSources: entry.source ? [entry.source] : [],
+      })
+    }
+  }
+  return Array.from(byId.values())
+}
+
+export function modelAllowlistMode(poolModels) {
+  if (!Array.isArray(poolModels)) return 'all'
+  return poolModels.length ? 'selected' : 'none'
+}
+
 export const CAPABILITY_TAGS = {
   VISION: 'vision',
   TOOLS: 'tools',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.28",
+  "version": "0.7.29",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",