@goodandready/dsh-subscriptions 0.7.29 → 0.7.31

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,6 +1,6 @@
 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'
@@ -41,6 +41,8 @@ export function createAdapterManager({
     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()),

package/lib/adapter.js

@@ -193,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,
@@ -216,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)",
@@ -196,6 +202,10 @@ window.__ModuleLoader__.load({
       "modelShowMore": "Show more",
       "modelShowAll": "Show all",
       "modelNoMatches": "No models match this search.",
+      "modelCatalogSourceHint": "Catalog source: live, cached or builtin",
+      "modelNamesTitle": "Model display names",
+      "modelNamesHint": "Presentation only: routing, reasoning and model ids stay unchanged. Reset restores the catalog name.",
+      "modelNameReset": "Reset",
       "rotationDecisionsTitle": "Rotation & Routing Decisions",
       "rotationDecisionsDesc": "Real-time decision trace explaining account selection, skips, and fallback reasons.",
       "rotationAttempt": "attempt",
@@ -302,7 +312,10 @@ window.__ModuleLoader__.load({
       "maxQueueSizeSlot": "Queue",
       "save": "Save",
       "saved": "Saved",
+      "cancel": "Cancel",
+      "unsavedChanges": "Unsaved changes",
       "accountLabel": "Account",
+      "usageRemaining": "Remaining quota",
       "plan": "Plan",
       "storedAs": "Stored as",
       "slashFast": "Toggle Codex Speed (fast/standard)",
@@ -544,6 +557,12 @@ window.__ModuleLoader__.load({
       "cascadingFallbackOrderHint": "首选服务商耗尽时按此顺序依次尝试备选服务商。",
       "rotationStrategy": "账户负载均衡策略",
       "rotationStrategyHint": "在同一服务商的多个可用账户之间分发请求的方式。",
+      "rotationQuotaAware": "配额感知（优先紧急）",
+      "poolEnabled": "自动账户池",
+      "poolEnabledHint": "关闭后请求只使用服务商默认账户，不会静默回退到其他账户。",
+      "mediaPoolEnabled": "自动媒体池",
+      "mediaPoolEnabledHint": "独立控制图片/视频账户轮询，与文本池分开。",
+      "defaultAccountHint": "用于直接路由，以及关闭自动账户池时的请求。",
       "rotationRoundRobin": "轮询均衡（标准交替）",
       "rotationLeastLoaded": "最少负载优先（配额公平共享）",
       "rotationPriority": "优先级顺序（按序号/权重顺序）",
@@ -582,6 +601,10 @@ window.__ModuleLoader__.load({
       "modelShowMore": "显示更多",
       "modelShowAll": "显示全部",
       "modelNoMatches": "没有匹配的模型。",
+      "modelCatalogSourceHint": "目录来源：实时、缓存或内置",
+      "modelNamesTitle": "模型显示名称",
+      "modelNamesHint": "仅影响显示：路由、推理和模型 ID 不变。重置恢复目录名称。",
+      "modelNameReset": "重置",
       "rotationDecisionsTitle": "轮询调度与路由决策",
       "rotationDecisionsDesc": "实时决策追踪，透明展示每次请求的账号选择、跳过与回退原因。",
       "rotationAttempt": "次尝试",
@@ -688,7 +711,10 @@ window.__ModuleLoader__.load({
       "maxQueueSizeSlot": "队列",
       "save": "保存",
       "saved": "已保存",
+      "cancel": "取消",
+      "unsavedChanges": "有未保存的更改",
       "accountLabel": "账户",
+      "usageRemaining": "剩余配额",
       "plan": "套餐方案",
       "storedAs": "存储标识",
       "slashFast": "切换 Codex 加速模式（快速/标准）",
@@ -1407,6 +1433,7 @@ window.__ModuleLoader__.load({
       }
       const [checking, setChecking] = React.useState({})
       const [saved, setSaved] = React.useState(false)
+      const [savedSnapshot, setSavedSnapshot] = React.useState(null)
       const [tokenDraft, setTokenDraft] = React.useState({})
       const [openHelp, setOpenHelp] = React.useState({})
       const [err, setErr] = React.useState('')
@@ -1428,7 +1455,9 @@ window.__ModuleLoader__.load({
 
       const applyPayload = (data) => {
         if (data && data.revision != null) setRevision(data.revision)
-        setDraft(JSON.parse(JSON.stringify((data && data.config) || {})))
+        const next = JSON.parse(JSON.stringify((data && data.config) || {}))
+        setDraft(next)
+        setSavedSnapshot(JSON.parse(JSON.stringify(next)))
         setAccounts((data && data.accounts) || [])
         setProviders((data && data.providers) || [])
         setModelsCatalog((data && data.modelsCatalog) || [])
@@ -1480,6 +1509,18 @@ window.__ModuleLoader__.load({
         return () => timers.forEach(clearInterval)
       }, [device])
 
+      const dirty = Boolean(draft && savedSnapshot && JSON.stringify(draft) !== JSON.stringify(savedSnapshot))
+      React.useEffect(() => {
+        if (!dirty) return undefined
+        const warn = (event) => {
+          event.preventDefault()
+          event.returnValue = ''
+          return ''
+        }
+        window.addEventListener('beforeunload', warn)
+        return () => window.removeEventListener('beforeunload', warn)
+      }, [dirty])
+
       // #81: settings snapshot status - never render phantom inputs before the
       // config snapshot arrives, and offer a retry when the store is unavailable.
       if (!draft) {
@@ -2366,6 +2407,7 @@ h('div', { className: 'dsub-row' },
                   m.provider ? h('span', { className: 'dsub-brand dsub-brand-' + m.provider, style: { fontSize: '9px', padding: '1px 4px' } }, m.provider.toUpperCase()) : null,
                   h('code', null, m.name || m.id),
                   tags.length ? h('span', { className: 'dsub-model-tag' }, tags.join(' · ')) : null,
+                  Array.isArray(m.catalogSources) && m.catalogSources.length ? h('span', { className: 'dsub-model-tag', title: t('modelCatalogSourceHint') }, '📚 ' + m.catalogSources.join('/')) : null,
                   h('span', { className: 'dsub-model-tag ' + statusClass }, poolLabel),
                 )
               })
@@ -2382,6 +2424,46 @@ h('div', { className: 'dsub-row' },
               }, t('modelShowAll')),
             ) : null,
           ),
+          h('details', { className: 'dsub-group', 'data-pane': 'models' },
+            h('summary', { className: 'dsub-groupHead' }, '🏷 ' + t('modelNamesTitle')),
+            h('div', { className: 'dsub-sub', style: { marginTop: 4 } }, t('modelNamesHint')),
+            h('div', { style: { maxHeight: 260, overflow: 'auto', marginTop: 6 } },
+              catalogShown.slice(0, 50).map((model) => {
+                const current = (Array.isArray(draft.modelDisplayNames) ? draft.modelDisplayNames : [])
+                  .find((row) => row && row.provider === model.provider && String(row.id) === String(model.id))
+                return h('div', { key: 'name:' + model.provider + ':' + model.id, className: 'dsub-row', style: { gap: 6 } },
+                  h('code', { style: { minWidth: 120, fontSize: 11 } }, model.id),
+                  h('input', {
+                    className: 'dsub-inp dsub-grow',
+                    value: current ? current.name : '',
+                    placeholder: model.name || model.id,
+                    onChange: (e) => {
+                      const value = e.target.value
+                      setDraft((d) => {
+                        const list = Array.isArray(d.modelDisplayNames) ? d.modelDisplayNames.slice() : []
+                        const idx = list.findIndex((row) => row && row.provider === model.provider && String(row.id) === String(model.id))
+                        if (value.trim()) {
+                          const next = { provider: model.provider, id: String(model.id), name: value.slice(0, 80) }
+                          if (idx >= 0) list[idx] = next
+                          else list.push(next)
+                        } else if (idx >= 0) {
+                          list.splice(idx, 1)
+                        }
+                        return Object.assign({}, d, { modelDisplayNames: list })
+                      })
+                    },
+                  }),
+                  h('button', {
+                    type: 'button', className: 'dsub-mini',
+                    onClick: () => setDraft((d) => Object.assign({}, d, {
+                      modelDisplayNames: (Array.isArray(d.modelDisplayNames) ? d.modelDisplayNames : [])
+                        .filter((row) => !(row && row.provider === model.provider && String(row.id) === String(model.id))),
+                    })),
+                  }, t('modelNameReset')),
+                )
+              })
+            ),
+          ),
           h('details', { className: 'dsub-group', 'data-pane': 'models' },
             h('summary', { className: 'dsub-groupHead' }, '🧠 ' + t('reasoningEffortTitle')),
             h('div', { className: 'dsub-sub', style: { marginTop: '4px' } }, t('reasoningEffortDesc')),
@@ -2489,10 +2571,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', {
@@ -2781,6 +2886,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 || '',
@@ -2865,6 +2978,9 @@ h('div', { className: 'dsub-row' },
                     },
                   }, '\u00d7'),
                 ),
+                (account && (account.quota?.remainingPercent != null || account.usagePercent != null)) ? h('div', { className: 'dsub-sub', style: { marginTop: 4 } },
+                  '📊 ' + t('usageRemaining') + ' ' + Math.round(account.quota?.remainingPercent != null ? Number(account.quota.remainingPercent) : (100 - Number(account.usagePercent))) + '%'
+                ) : null,
                 (account && account.quarantineUntil && Number(account.quarantineUntil) > Date.now()) ? h('div', { className: 'dsub-row', style: { marginTop: 4 } },
                   h('span', { className: 'dsub-sub', style: { color: 'var(--dsw-alias-state-error-primary)', fontVariantNumeric: 'tabular-nums' } },
                     '⛔ ' + (account.quarantineReason || 'QUARANTINE') + ' · ' + t('resetsIn') + ' ' + formatRelativeReset(account.quarantineUntil, t('lang'), Date.now())
@@ -3495,6 +3611,12 @@ h('div', { className: 'dsub-row' },
             type: 'button', className: 'dsub-save',
             onClick: () => save().catch((e) => setErr(cleanErrorMessage(e.message || e))),
           }, t('save')),
+          h('button', {
+            type: 'button', className: 'dsub-mini',
+            disabled: !dirty,
+            onClick: () => reload().catch((e) => setErr(cleanErrorMessage(e.message || e))),
+          }, t('cancel')),
+          dirty ? h('span', { className: 'dsub-sub' }, t('unsavedChanges')) : null,
           saved ? h('span', { className: 'dsub-ok' }, t('saved')) : null,
           info ? h('span', { className: 'dsub-ok' }, info) : null,
           err ? h('span', { className: 'dsub-bad' }, err) : null,

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

@@ -279,6 +279,17 @@ export function buildEnrichedCatalog({
 
       const modelName = (typeof item === 'object' && (item.name || item.display_name)) ? (item.name || item.display_name) : modelId
       const caps = inferModelCapabilities(provId, modelId)
+      const catalogSources = new Set()
+      for (const account of accounts) {
+        if (!account || String(account.provider || '').toLowerCase() !== String(provId).toLowerCase()) continue
+        const available = Array.isArray(account.availableModels) ? account.availableModels : []
+        const hasModel = available.some((model) => {
+          const id = typeof model === 'string' ? model : (model && (model.id || model.slug || model.name))
+          return String(id || '') === String(modelId)
+        })
+        if (hasModel) catalogSources.add(account.modelsSource || 'live')
+      }
+      if (!catalogSources.size) catalogSources.add('builtin')
 
       result.push({
         id: modelId,
@@ -288,6 +299,7 @@ export function buildEnrichedCatalog({
         contextWindow: caps.contextWindow,
         contextLabel: caps.contextLabel,
         capabilities: caps.capabilities,
+        catalogSources: Array.from(catalogSources),
         pool,
       })
     }

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.29",
+  "version": "0.7.31",
   "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",