@goodandready/dsh-subscriptions 0.7.28 → 0.7.30

package/lib/accounts-view.js

@@ -145,6 +145,7 @@ export async function createAccountsView({ live, store, fetch, pmL, pmE, concurr
       // Issue 303: expose the cooldown scope and quarantine so the card can
       // explain why only some models are blocked.
       cooldownFamilies: info.cooldownFamilies || null,
+      cooldownModels: info.cooldownModels || null,
       quarantineUntil: info.quarantineUntil || 0,
       quarantineReason: info.quarantineReason || null,
       healthScore: info.healthScore,
@@ -166,6 +167,7 @@ export async function createAccountsView({ live, store, fetch, pmL, pmE, concurr
       lastDoctorVerdict: info.lastDoctorVerdict || null,
       availableModels: info.availableModels || null,
       poolEnabled: slot.poolEnabled !== false,
+      isDefault: !!slot.isDefault,
       ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
       capabilities,
       billing,

package/lib/accounts.js

@@ -74,6 +74,7 @@ export function normalizeSlots(slots) {
       ...(slot.expiresAt ? { expiresAt: Number(slot.expiresAt) } : {}),
       ...(slot.maxConcurrency !== undefined ? { maxConcurrency: Number(slot.maxConcurrency) } : {}),
       ...(slot.poolEnabled === false ? { poolEnabled: false } : {}),
+      ...(slot.isDefault ? { isDefault: true } : {}),
       ...(Array.isArray(slot.poolModels)
         ? { poolModels: [...new Set(slot.poolModels.map((id) => String(id).trim()).filter(Boolean))] }
         : {}),
@@ -82,6 +83,12 @@ export function normalizeSlots(slots) {
   return out
 }
 
+export function defaultAccountRef(slots, provider) {
+  const list = normalizeSlots(slots).filter((slot) => slot.provider === provider)
+  const marked = list.find((slot) => slot.isDefault)
+  return (marked || list[0] || null)?.ref || null
+}
+
 export function vendorConfig(provider, cfg) {
   const d = getVendor(provider).defaults()
   const pick = (suffix, fallback) => {
@@ -323,6 +330,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       quarantineUntil: quarantines.get(ref) ? quarantines.get(ref).until : 0,
       quarantineReason: quarantines.get(ref) ? quarantines.get(ref).reason : null,
       cooldownFamilies: cooldowns.get(ref) && cooldowns.get(ref).families ? cooldowns.get(ref).families : null,
+      cooldownModels: cooldowns.get(ref) && cooldowns.get(ref).models ? cooldowns.get(ref).models : null,
       quota: quotas.get(ref) || null,
       pacePerHour: quotas.get(ref)?.pacePerHour || calculateBurnRatePerHour(quotaSamples.get(ref) || [], Date.now()),
       samples: quotaSamples.get(ref) || [],
@@ -375,6 +383,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         usagePercent: info.usagePercent,
         cooldownUntil: info.cooldownUntil,
         cooldownFamilies: info.cooldownFamilies || null,
+        cooldownModels: info.cooldownModels || null,
         quota: info.quota || null,
         healthScore: computeHealthScore(info.health),
         healthBadge: healthBadge(computeHealthScore(info.health)),
@@ -389,6 +398,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         weight: Number(slot.weight) || 0,
         isPro: !!slot.isPro,
         poolEnabled: slot.poolEnabled !== false,
+        isDefault: !!slot.isDefault,
         ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
       })
     }
@@ -583,7 +593,16 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     recordClockSkew,
     // #87: family-scoped cooldowns. families=null blocks the whole account
     // (legacy behavior); a list blocks only those model families.
-    rememberCooldown(ref, until, families) {
+    rememberCooldown(ref, until, families, models = null) {
+      if (models && typeof models === 'object') {
+        const prev = cooldowns.get(ref)
+        cooldowns.set(ref, {
+          until: prev ? prev.until : 0,
+          families: prev ? prev.families : null,
+          models: { ...(prev && prev.models ? prev.models : {}), ...models },
+        })
+        return
+      }
       if (!families || !families.length) { cooldowns.set(ref, { until: Number(until) || 0, families: null }); return }
       const prev = cooldowns.get(ref)
       const merged = new Set(families)

package/lib/adapter-manager.js

@@ -1,10 +1,11 @@
 import { SubscriptionAdapter } from './adapter.js'
 import { resolveFallbackVendor, mapFallbackModel } from './cascade.js'
-import { normalizeSlots, vendorConfig } from './accounts.js'
+import { defaultAccountRef, normalizeSlots, vendorConfig } from './accounts.js'
 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,10 @@ 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),
+    poolEnabled: () => live().poolEnabled !== false,
+    defaultAccountRef: (provider) => defaultAccountRef(live().slots, provider),
     loadBlob: (ref) => store.loadBlob(ref),
     ensureFresh: (provider, blob, ref) => store.ensureFresh(provider, blob, ref),
     vendorConfig: (provider) => vendorConfig(provider, live()),
@@ -243,26 +248,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 +333,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) || '')))
@@ -165,11 +193,18 @@ export class SubscriptionAdapter extends LlmAdapter {
           options.signal,
         ),
       }
+      const poolEnabled = typeof deps.poolEnabled === 'function' ? deps.poolEnabled() !== false : true
+      const defaultRef = typeof deps.defaultAccountRef === 'function' ? deps.defaultAccountRef(provider) : null
       const streamOptions = {
         ...hydratedOptions,
         ...(provider === 'codex' && getSpeedMode(sessionId) === 'fast' ? { service_tier: 'priority' } : {}),
         ...(effectiveReasoning.effort ? { reasoningEffort: effectiveReasoning.effort } : {}),
         ...(effectiveReasoning.budgetTokens ? { thinkingBudget: effectiveReasoning.budgetTokens } : {}),
+        // #830: kill switch. With no default account, use a sentinel that
+        // intentionally matches nothing, so the error is explicit and there
+        // is no silent fallback to another account.
+        ...(!poolEnabled ? { onlyRef: defaultRef || '__no_default_account__' } : {}),
+        ...(defaultRef ? { defaultRef } : {}),
         _decisionTrace: decisionTrace,
         autoPacing: effectiveAutoPacing,
         drainBeforeReset: effectiveDrainBeforeReset,
@@ -188,7 +223,7 @@ export class SubscriptionAdapter extends LlmAdapter {
         webhookUrl: typeof deps.webhookUrl === 'function' ? deps.webhookUrl() : deps.webhookUrl,
         fetchImpl: deps.fetchImpl || fetch,
         onCooldown: (account) => {
-          if (typeof deps.rememberCooldown === 'function') deps.rememberCooldown(account.ref, account.cooldownUntil, account.cooldownFamilies || null)
+          if (typeof deps.rememberCooldown === 'function') deps.rememberCooldown(account.ref, account.cooldownUntil, account.cooldownFamilies || null, account.cooldownModels || null)
           if (typeof deps.rememberQuarantine === 'function') {
             const currentQ = typeof deps.getQuarantine === 'function' ? deps.getQuarantine(account.ref) : null
             if (currentQ && currentQ.attempts && currentQ.attempts > 1) {

package/lib/client.js

@@ -158,6 +158,12 @@ window.__ModuleLoader__.load({
       "cascadingFallbackOrderHint": "Sequence of alternative providers to try when primary accounts are exhausted.",
       "rotationStrategy": "Account Balancing Strategy",
       "rotationStrategyHint": "Method used to distribute requests among available accounts of a provider.",
+      "rotationQuotaAware": "Quota-aware (urgent first)",
+      "poolEnabled": "Automatic account pool",
+      "poolEnabledHint": "When off, requests use only the provider default account. No silent fallback to other accounts.",
+      "mediaPoolEnabled": "Automatic media pool",
+      "mediaPoolEnabledHint": "Controls image/video account rotation separately from the text pool.",
+      "defaultAccountHint": "Used for direct routing and when the automatic pool is off.",
       "rotationRoundRobin": "Round-Robin (Balanced rotation)",
       "rotationLeastLoaded": "Least-Loaded (Fair-share quota)",
       "rotationPriority": "Priority (Sequential by index/weight)",
@@ -292,6 +298,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",
@@ -541,6 +550,12 @@ window.__ModuleLoader__.load({
       "cascadingFallbackOrderHint": "首选服务商耗尽时按此顺序依次尝试备选服务商。",
       "rotationStrategy": "账户负载均衡策略",
       "rotationStrategyHint": "在同一服务商的多个可用账户之间分发请求的方式。",
+      "rotationQuotaAware": "配额感知（优先紧急）",
+      "poolEnabled": "自动账户池",
+      "poolEnabledHint": "关闭后请求只使用服务商默认账户，不会静默回退到其他账户。",
+      "mediaPoolEnabled": "自动媒体池",
+      "mediaPoolEnabledHint": "独立控制图片/视频账户轮询，与文本池分开。",
+      "defaultAccountHint": "用于直接路由，以及关闭自动账户池时的请求。",
       "rotationRoundRobin": "轮询均衡（标准交替）",
       "rotationLeastLoaded": "最少负载优先（配额公平共享）",
       "rotationPriority": "优先级顺序（按序号/权重顺序）",
@@ -675,6 +690,9 @@ window.__ModuleLoader__.load({
       "poolModelsNone": "无",
       "poolModelsSelected": "已选",
       "poolModelsHint": "自动允许当前及未来全部模型。无会将该账户移出模型调度。显式列表只允许勾选的模型 ID。",
+      "poolModelsSearch": "搜索模型…",
+      "poolModelsCount": "显示 {shown} · 已选 {selected} · 共 {total}",
+      "poolModelsNoMatches": "没有匹配的模型。",
       "poolModelsNoCatalog": "暂无模型目录；请同步模型或使用自动。",
       "tags": "标签",
       "tagsPlaceholder": "team, prod",
@@ -1047,6 +1065,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
@@ -2482,10 +2501,33 @@ h('div', { className: 'dsub-row' },
                 },
                   h('option', { value: 'round-robin' }, t('rotationRoundRobin')),
                   h('option', { value: 'least-loaded' }, t('rotationLeastLoaded')),
+                  h('option', { value: 'quota-aware' }, t('rotationQuotaAware')),
                   h('option', { value: 'priority' }, t('rotationPriority')),
                 ),
               ),
             ),
+            h('div', { className: 'dsub-row', style: { marginTop: 12 } },
+              h('label', { style: { display: 'flex', alignItems: 'center', gap: 8, cursor: 'pointer' } },
+                h('input', {
+                  type: 'checkbox',
+                  checked: draft.poolEnabled !== false,
+                  onChange: (e) => setDraft((d) => Object.assign({}, d, { poolEnabled: e.target.checked })),
+                }),
+                h('span', null, t('poolEnabled')),
+              ),
+              h('div', { className: 'dsub-sub' }, t('poolEnabledHint')),
+            ),
+            h('div', { className: 'dsub-row', style: { marginTop: 8 } },
+              h('label', { style: { display: 'flex', alignItems: 'center', gap: 8, cursor: 'pointer' } },
+                h('input', {
+                  type: 'checkbox',
+                  checked: draft.mediaPoolEnabled !== false,
+                  onChange: (e) => setDraft((d) => Object.assign({}, d, { mediaPoolEnabled: e.target.checked })),
+                }),
+                h('span', null, t('mediaPoolEnabled')),
+              ),
+              h('div', { className: 'dsub-sub' }, t('mediaPoolEnabledHint')),
+            ),
             h('div', { className: 'dsub-row', style: { marginTop: 12 } },
               h('label', { style: { display: 'flex', alignItems: 'center', gap: 8, cursor: 'pointer' } },
                 h('input', {
@@ -2753,6 +2795,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,
@@ -2766,6 +2816,14 @@ h('div', { className: 'dsub-row' },
               return h('div', { className: 'dsub-card', key: key },
                 h('div', { className: 'dsub-row', style: { alignItems: 'center' } },
                   avatarEl,
+                  h('label', { className: 'dsub-ref-tag', title: t('defaultAccountHint') },
+                    h('input', {
+                      type: 'checkbox',
+                      checked: !!row.slot.isDefault,
+                      onChange: (e) => updateSlot(row.slot.provider, row.slot.index, { isDefault: e.target.checked }),
+                    }),
+                    ' ★'
+                  ),
                   h('input', {
                     className: 'dsub-grow',
                     value: row.slot.label || '',
@@ -3063,9 +3121,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 +3146,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 +3181,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/config-schema.js

@@ -36,6 +36,8 @@ export const Slot = z.object({
     .description('#171 Treat this account as Pro for weighted rotation.'),
   poolEnabled: z.boolean().default(true)
     .description('#795 Include this account in automatic pool selection. false keeps it available for explicit/manual use only.'),
+  isDefault: z.boolean().default(false)
+    .description('#829 Mark this account as the provider default for direct/fallback routing.'),
   poolModels: z.array(z.string()).default(undefined)
     .description('#795 Model allowlist for automatic pool selection. Absent = every model, empty = none, explicit list = only those ids.'),
 })
@@ -154,7 +156,11 @@ export const Config = z.object({
   cascadingFallbackOrder: z.array(z.string()).volatile().default(PROVIDERS)
     .description('Configurable global priority sequence for cross-vendor fallback.'),
   rotationStrategy: z.string().volatile().default('round-robin')
-    .description('Load balancing strategy among available accounts: round-robin (balanced), least-loaded (fair-share quota), or priority (sequential).'),
+    .description('Load balancing strategy among available accounts: round-robin (balanced), least-loaded (fair-share quota), quota-aware (urgent quota first), or priority (sequential).'),
+  poolEnabled: z.boolean().volatile().default(true)
+    .description('#830 Master switch for automatic account rotation. Off routes only to the provider default account and never silently falls back.'),
+  mediaPoolEnabled: z.boolean().volatile().default(true)
+    .description('#830 Separate switch for the image/video account pool.'),
   enableSoftFailureSentinel: z.boolean().volatile().default(true)
     .description('Intercept HTTP 200 soft-failure capacity apologies and automatically cascade to next healthy account.'),
   cascadingChain: z.any().volatile().default({})

package/lib/index.js

@@ -17,7 +17,7 @@ import { registerCustomProviderIds, registerDisplayName } from './refs.js'
 import { createSubscriptionsService } from './subscriptions.js'
 import { registerSubscriptionTools } from './native-tools.js'
 import { detectConflicts, readProfilePluginNames, setActiveConflicts } from './coexistence.js'
-import { createAccountStore, normalizeSlots, vendorConfig } from './accounts.js'
+import { createAccountStore, defaultAccountRef, normalizeSlots, vendorConfig } from './accounts.js'
 import { OllamaAdapter, ollamaAlive, ollamaModels, ollamaBase } from './ollama.js'
 import { createResetCreditService } from './reset-credits.js'
 import { maskEmail, maskLabel } from './mask.js'
@@ -389,12 +389,15 @@ export function apply(ctx, rawConfig) {
         throw new Error(`unknown subscription provider: ${provider}`)
       }
       const accounts = await store.listAccounts(provider)
+      const mediaPool = live().mediaPoolEnabled !== false
+      const onlyRef = mediaPool ? null : defaultAccountRef(live().slots, provider)
       const eligible = pickAccount(accounts || [], Date.now(), {
         family: provider === 'codex' ? 'gpt' : 'grok',
         drainBeforeReset: live().drainBeforeReset,
         drainSafetyPercent: live().drainSafetyPercent,
+        ...(onlyRef ? { onlyRef } : {}),
       })
-      const slot = eligible || (accounts || []).find((row) => row && row.ref && row.hasToken && !poolBlockReason(row, {}))
+      const slot = eligible || (accounts || []).find((row) => row && row.ref && row.hasToken && !poolBlockReason(row, {}) && (!onlyRef || row.ref === onlyRef))
       if (!slot) throw new Error(`not logged in to ${provider}: sign in in the Subscriptions section`)
       const raw = await store.resolveRaw(slot.ref)
       if (!raw) throw new Error(`not logged in to ${provider}: sign in in the Subscriptions section`)

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/lib/rotate.js

@@ -50,7 +50,10 @@ export function modelFamily(provider, model) {
   return 'standard'
 }
 
-export function cooldownBlocks(acc, family) {
+export function cooldownBlocks(acc, family, model, nowMs = Date.now()) {
+  const modelUntil = acc && model && acc.cooldownModels && acc.cooldownModels[model]
+  if (modelUntil && Number(modelUntil) > Number(nowMs)) return true
+  if (model && acc && acc.cooldownModels && !acc.cooldownUntil) return false
   const fams = acc && acc.cooldownFamilies
   if (!Array.isArray(fams) || !fams.length) return true
   if (!family) return true
@@ -79,6 +82,26 @@ export function getAccountRemainingPercent(acc) {
   return null
 }
 
+export function earliestRecovery(accounts, nowMs = Date.now()) {
+  const now = Number(nowMs) || 0
+  let best = null
+  for (const account of Array.isArray(accounts) ? accounts : []) {
+    if (!account) continue
+    const candidates = []
+    if (account.cooldownUntil) candidates.push({ at: Number(account.cooldownUntil), reason: 'cooldown' })
+    if (account.quarantineUntil) candidates.push({ at: Number(account.quarantineUntil), reason: account.quarantineReason || 'quarantine' })
+    if (account.quota && account.quota.resetAt) candidates.push({ at: Number(account.quota.resetAt), reason: 'quota_reset' })
+    for (const [model, until] of Object.entries(account.cooldownModels || {})) {
+      if (Number(until) > now) candidates.push({ at: Number(until), reason: 'model_cooldown', model })
+    }
+    for (const item of candidates) {
+      if (!Number.isFinite(item.at) || item.at <= now) continue
+      if (!best || item.at < best.at) best = { ref: account.ref || account.id || 'unknown', ...item }
+    }
+  }
+  return best
+}
+
 export function poolBlockReason(account, opts) {
   if (!account) return null
   if (account.poolEnabled === false) return 'pool_disabled'
@@ -93,7 +116,11 @@ export function poolBlockReason(account, opts) {
 }
 
 export function pickAccountWithTrace(accounts, nowMs, opts) {
-  const list = Array.isArray(accounts) ? accounts : []
+  const allAccounts = Array.isArray(accounts) ? accounts : []
+  const onlyRef = opts && opts.onlyRef
+  const list = onlyRef
+    ? allAccounts.filter((account) => account && (account.ref || account.id) === onlyRef)
+    : allAccounts
   const now = Number(nowMs) || 0
   const thrRaw = opts && opts.switchAtRemaining != null ? Number(opts.switchAtRemaining) : 0
   const thr = Number.isFinite(thrRaw) ? thrRaw : 0
@@ -142,7 +169,8 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
           pinned: true,
         })
       } else if (pinned && pinned.hasToken && !isQuarantined(pinned, now)) {
-        const isCooldown = pinned.cooldownUntil && Number(pinned.cooldownUntil) > now && cooldownBlocks(pinned, opts && opts.family)
+        const pinnedModelCooling = opts && opts.model && pinned.cooldownModels && Number(pinned.cooldownModels[opts.model] || 0) > now
+        const isCooldown = pinnedModelCooling || (pinned.cooldownUntil && Number(pinned.cooldownUntil) > now && cooldownBlocks(pinned, opts && opts.family, opts && opts.model, now))
         const isPinnedZero = Boolean(pinned.quota && (
           (pinned.quota.remaining != null && Number(pinned.quota.remaining) <= 0) ||
           (pinned.quota.remainingPercent != null && Number(pinned.quota.remainingPercent) <= 0)
@@ -252,9 +280,17 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
       continue
     }
 
-    const isCooldown = acc.cooldownUntil && Number(acc.cooldownUntil) > now && cooldownBlocks(acc, opts && opts.family)
+    const modelCooling = opts && opts.model && acc.cooldownModels && Number(acc.cooldownModels[opts.model] || 0) > now
+    const isCooldown = modelCooling || (acc.cooldownUntil && Number(acc.cooldownUntil) > now && cooldownBlocks(acc, opts && opts.family, opts && opts.model, now))
     if (isCooldown) {
-      evaluations.push({ ref, eligible: false, tier: null, reason: 'cooldown', until: acc.cooldownUntil })
+      evaluations.push({
+        ref,
+        eligible: false,
+        tier: null,
+        reason: modelCooling ? 'model_cooldown' : 'cooldown',
+        until: modelCooling ? acc.cooldownModels[opts.model] : acc.cooldownUntil,
+        ...(modelCooling ? { model: opts.model } : {}),
+      })
       continue
     }
 
@@ -333,6 +369,11 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
           const aIdx = list.indexOf(a)
           const bIdx = list.indexOf(b)
           if (aIdx !== -1 && bIdx !== -1 && aIdx !== bIdx) return aIdx - bIdx
+        } else if (strategy === 'quota-aware') {
+          const floor = opts && opts.drainSafetyPercent != null ? Number(opts.drainSafetyPercent) : 5
+          const aUrgency = calculateBurnUrgency(getAccountRemainingPercent(a), a.quota && a.quota.resetAt, now, floor)
+          const bUrgency = calculateBurnUrgency(getAccountRemainingPercent(b), b.quota && b.quota.resetAt, now, floor)
+          if (Math.abs(aUrgency - bUrgency) > 0.01) return bUrgency - aUrgency
         }
 
         // 0. Auto-Pacing: lower pacing risk preferred (#352)
@@ -358,7 +399,17 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
         return (b.healthScore ?? 100) - (a.healthScore ?? 100)
       })
 
-      const chosen = tier[0]
+      let chosen = tier[0]
+      const strategy = (opts && opts.rotationStrategy) || 'round-robin'
+      if (strategy === 'quota-aware' && opts && opts.defaultRef) {
+        const byDefault = tier.find((account) => (account.ref || account.id) === opts.defaultRef)
+        if (byDefault && byDefault !== chosen) {
+          const floor = opts.drainSafetyPercent != null ? Number(opts.drainSafetyPercent) : 5
+          const chosenUrgency = calculateBurnUrgency(getAccountRemainingPercent(chosen), chosen.quota && chosen.quota.resetAt, now, floor)
+          const defaultUrgency = calculateBurnUrgency(getAccountRemainingPercent(byDefault), byDefault.quota && byDefault.quota.resetAt, now, floor)
+          if (defaultUrgency >= chosenUrgency - 5) chosen = byDefault
+        }
+      }
       const chosenRef = chosen.ref || chosen.id
       if (targetSession && chosen) {
         pinSession(targetSession, chosenRef, {
@@ -382,6 +433,8 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
             resetAt: chosen.quota?.resetAt || null,
             weight: chosen.weight || (chosen.isPro ? 5 : 1),
             healthScore: chosen.healthScore ?? 100,
+            urgency: calculateBurnUrgency(getAccountRemainingPercent(chosen), chosen.quota && chosen.quota.resetAt, now, opts && opts.drainSafetyPercent != null ? Number(opts.drainSafetyPercent) : 5),
+            defaultAccount: Boolean(opts && opts.defaultRef && chosenRef === opts.defaultRef),
           },
         },
       }
@@ -405,12 +458,21 @@ export function pickAccount(accounts, nowMs, opts) {
   return res ? res.account : null
 }
 
-export function markCooldown(account, nowMs, cooldownMs, family, customUntil = null) {
+export function markCooldown(account, nowMs, cooldownMs, family, customUntil = null, model = null) {
   const wait = Number(cooldownMs)
   const ms = Number.isFinite(wait) && wait > 0 ? wait : 30 * 60 * 1000
   const until = (customUntil && Number(customUntil) > (Number(nowMs) || 0))
     ? Number(customUntil)
     : ((Number(nowMs) || 0) + ms)
+  // #814: Claude/Antigravity quotas are model-specific. Auth/session errors
+  // are handled elsewhere as account-wide; ordinary model quota failures stay
+  // scoped to the failing model.
+  if (model && (account.provider === 'claude' || account.provider === 'antigravity')) {
+    return {
+      ...account,
+      cooldownModels: { ...(account.cooldownModels || {}), [model]: until },
+    }
+  }
   const prev = Array.isArray(account.cooldownFamilies) ? account.cooldownFamilies.slice() : []
   const fams = family ? (prev.includes(family) ? prev : prev.concat(family)) : prev
   return {

package/lib/stream-rotate.js

@@ -1,7 +1,7 @@
 import { inspectAccountCapabilities, normalizeCapabilitiesRequest } from './capabilities.js'
 import { defaultConcurrencyQueue } from './concurrency-queue.js'
 import { recordSessionCacheUsage } from './session-pin.js'
-import { pickAccountWithTrace, markCooldown, isSwitchableError, isRegionError, isAuthError, modelFamily } from './rotate.js'
+import { pickAccountWithTrace, markCooldown, isSwitchableError, isRegionError, isAuthError, modelFamily, earliestRecovery } from './rotate.js'
 import { putInQuarantine, REASON_RATE_LIMIT, REASON_HARD_LIMIT, REASON_REVOKED, REASON_DEGRADED } from './quarantine.js'
 import { notifySessionExpired, notifyQuarantineEntered } from './alerts.js'
 import { withRunawayGuard } from './runaway-guard.js'
@@ -52,6 +52,8 @@ export async function* streamWithRotation({
     const pickRes = pickAccountWithTrace(pool, nowMs(), {
       switchAtRemaining,
       model: options && options.model,
+      onlyRef: options && options.onlyRef,
+      defaultRef: options && options.defaultRef,
       family: modelFamily(options && options.provider, options && options.model),
       sessionId: options && options.sessionId,
       tag: options && options.tag,
@@ -96,10 +98,13 @@ export async function* streamWithRotation({
           lastError.retryAfterMs = Math.min(wait, maxWait)
           lastError.resetAt = nowMs() + lastError.retryAfterMs
         }
+        lastError.recovery = lastError.recovery || earliestRecovery(pool, nowMs())
         throw lastError
       }
-      const err = /** @type {Error & { code?: string }} */ (new Error('no usable subscription account for this provider'))
+      const err = /** @type {Error & { code?: string, recovery?: any, onlyRef?: string }} */ (new Error('no usable subscription account for this provider'))
       err.code = 'RATE_LIMIT'
+      err.recovery = earliestRecovery(pool, nowMs())
+      if (options && options.onlyRef) err.onlyRef = options.onlyRef
       throw err
     }
 
@@ -233,9 +238,10 @@ export async function* streamWithRotation({
 
         // Move slot to cooldown and quarantine (#172, #538)
         const effectiveCooldownMs = isSoft ? Math.min(cooldownMs, 5 * 60 * 1000) : (isAuth ? 86400000 : cooldownMs)
-        const cooled = markCooldown(account, nowMs(), effectiveCooldownMs, modelFamily(options && options.provider, options && options.model), accurateUntil)
+        const cooled = markCooldown(account, nowMs(), effectiveCooldownMs, modelFamily(options && options.provider, options && options.model), accurateUntil, options && options.model)
         account.cooldownUntil = cooled.cooldownUntil
         if (cooled.cooldownFamilies) account.cooldownFamilies = cooled.cooldownFamilies
+        if (cooled.cooldownModels) account.cooldownModels = cooled.cooldownModels
 
         const status = Number(err && (err.status || err.statusCode) || 0)
         const code = String(err && err.code || '')

package/lib/subscriptions.js

@@ -299,9 +299,10 @@ export function createSubscriptionsService(deps) {
           currentAttempt.switchError = err ? (err.code || err.status || err.message) : 'switchable'
           lastError = err
           if (!isSwitchableError(err)) throw err
-          const cooled = markCooldown(account, Date.now(), cooldownMs, modelFamily(provider, body && body.model))
+          const cooled = markCooldown(account, Date.now(), cooldownMs, modelFamily(provider, body && body.model), null, body && body.model)
           account.cooldownUntil = cooled.cooldownUntil
-          if (typeof deps.rememberCooldown === "function") deps.rememberCooldown(account.ref, account.cooldownUntil, cooled.cooldownFamilies || null)
+          if (cooled.cooldownModels) account.cooldownModels = cooled.cooldownModels
+          if (typeof deps.rememberCooldown === "function") deps.rememberCooldown(account.ref, account.cooldownUntil, cooled.cooldownFamilies || null, cooled.cooldownModels || null)
           // try next account
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.28",
+  "version": "0.7.30",
   "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",