@goodandready/dsh-subscriptions 0.7.30 → 0.7.32

package/lib/account-reliability.js

@@ -0,0 +1,68 @@
+function text(value) {
+  return value == null ? '' : String(value).trim()
+}
+
+/**
+ * #827: decide whether a stored credential is usable without exposing it.
+ * Empty access/refresh tokens and non-finite expiry are treated as corrupt.
+ */
+export function credentialState(blob) {
+  if (!blob || typeof blob !== 'object') return { usable: false, reason: 'invalid_blob' }
+  const accessToken = text(blob.accessToken)
+  const refreshToken = text(blob.refreshToken)
+  if (!accessToken && !refreshToken && !text(blob.apiKey)) {
+    return { usable: false, reason: 'empty_credentials' }
+  }
+  if (blob.expiresAt != null && blob.expiresAt !== '' && !Number.isFinite(Number(blob.expiresAt))) {
+    return { usable: false, reason: 'invalid_expiry' }
+  }
+  return { usable: true, reason: null }
+}
+
+/**
+ * #831: stable provider identity used for duplicate detection. Unknown
+ * identities return null and must never be merged automatically.
+ */
+export function accountIdentityKey(provider, blob) {
+  if (!blob || typeof blob !== 'object') return null
+  const id = text(blob.email || blob.login || blob.accountId || blob.userId)
+  if (!id) return null
+  return `${text(provider).toLowerCase()}:${id.toLowerCase()}`
+}
+
+/**
+ * #818: aliases are display-only. Resolve either a stable ref or a legacy
+ * label within one provider back to the stable credential ref.
+ */
+export function resolveAccountRef(slots, provider, value) {
+  const wanted = text(value)
+  if (!wanted) return null
+  const list = (Array.isArray(slots) ? slots : []).filter((slot) => slot && slot.provider === provider)
+  const byIndex = Number(wanted)
+  if (Number.isInteger(byIndex) && byIndex > 0) {
+    return list.find((slot) => Number(slot.index) === byIndex)?.ref || null
+  }
+  return list.find((slot) => slot.ref === wanted || text(slot.label) === wanted)?.ref || null
+}
+
+/**
+ * #806: a delayed refresh may only write when its credential lineage is
+ * still current. A newer save/revoke bumps the version.
+ */
+export function refreshIsCurrent(currentVersion, expectedVersion) {
+  return Number(currentVersion) === Number(expectedVersion)
+}
+
+/**
+ * #833: deterministic host-env vs plugin-proxy precedence.
+ * @param {{ hostProxy?: string, pluginProxy?: string, prefer?: 'host' | 'plugin' }} [options]
+ */
+export function proxyPrecedence(options = {}) {
+  const prefer = options.prefer || 'host'
+  const host = text(options.hostProxy)
+  const plugin = text(options.pluginProxy)
+  if (host && plugin && prefer === 'plugin') return { proxy: plugin, source: 'plugin', conflict: true }
+  if (host) return { proxy: host, source: 'host', conflict: Boolean(plugin) }
+  if (plugin) return { proxy: plugin, source: 'plugin', conflict: false }
+  return { proxy: '', source: 'none', conflict: false }
+}

package/lib/accounts-view.js

@@ -169,6 +169,8 @@ export async function createAccountsView({ live, store, fetch, pmL, pmE, concurr
       poolEnabled: slot.poolEnabled !== false,
       isDefault: !!slot.isDefault,
       ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
+      credentialError: info.credentialError || null,
+      duplicateOf: info.duplicateOf || null,
       capabilities,
       billing,
       renewsAt: billing.renewsAt,

package/lib/accounts.js

@@ -46,6 +46,7 @@ import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { oauthRef, isProvider } from './refs.js'
 import { parseBlob, serializeBlob } from './blob.js'
 import { encryptWithPassphrase, decryptWithPassphrase } from './crypto.js'
+import { accountIdentityKey, credentialState } from './account-reliability.js'
 import { recordSwitch, recordExhaust, recordBroken, computeHealthScore, healthBadge } from './health.js'
 import { executeWithRetry } from './backoff.js'
 import { getVendor } from './vendors/index.js'
@@ -308,6 +309,26 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     if (base.configured) {
       try {
         const blob = parseBlob(await resolveRaw(ref))
+        const state = credentialState(blob)
+        if (!state.usable) {
+          base.configured = false
+          base.credentialError = state.reason
+          base.label = blob.label || blob.email || ''
+          return {
+            ...base,
+            cooldownUntil: 0,
+            quarantineUntil: 0,
+            cooldownFamilies: null,
+            cooldownModels: null,
+            quota: null,
+            isRevoked: false,
+            authWarning: '',
+            validationUrl: '',
+            validationMessage: '',
+            accountNotice: '',
+            paidTierName: '',
+          }
+        }
         base.label = blob.label || blob.email || ''
         base.email = blob.email || ''
         base.plan = blob.plan || blob.paidTierName || ''
@@ -367,6 +388,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       latencyGrade: pings.get(ref)?.latencyGrade ?? null,
       lastDoctorVerdict: doctorVerdicts.get(ref) || null,
       availableModels: dynamicModels.get(ref)?.models || null,
+      credentialError: base.credentialError || null,
     }
   }
 
@@ -374,8 +396,12 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     const curConfig = getConfig()
     const slots = normalizeSlots(curConfig.slots).filter((s) => s.provider === provider)
     const out = []
+    const identities = new Map()
     for (const slot of slots) {
       const info = await describeRef(slot.ref, curConfig)
+      const identity = accountIdentityKey(provider, { email: info.email, accountId: info.accountId })
+      const duplicateOf = identity ? (identities.get(identity) || null) : null
+      if (identity && !duplicateOf) identities.set(identity, slot.ref)
       const q = quarantines.get(slot.ref)
       out.push({
         ref: slot.ref,
@@ -400,6 +426,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         poolEnabled: slot.poolEnabled !== false,
         isDefault: !!slot.isDefault,
         ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
+        credentialError: info.credentialError || null,
+        duplicateOf,
       })
     }
     return out

package/lib/client.js

@@ -202,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",
@@ -308,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)",
@@ -594,6 +601,10 @@ window.__ModuleLoader__.load({
       "modelShowMore": "显示更多",
       "modelShowAll": "显示全部",
       "modelNoMatches": "没有匹配的模型。",
+      "modelCatalogSourceHint": "目录来源：实时、缓存或内置",
+      "modelNamesTitle": "模型显示名称",
+      "modelNamesHint": "仅影响显示：路由、推理和模型 ID 不变。重置恢复目录名称。",
+      "modelNameReset": "重置",
       "rotationDecisionsTitle": "轮询调度与路由决策",
       "rotationDecisionsDesc": "实时决策追踪，透明展示每次请求的账号选择、跳过与回退原因。",
       "rotationAttempt": "次尝试",
@@ -700,7 +711,10 @@ window.__ModuleLoader__.load({
       "maxQueueSizeSlot": "队列",
       "save": "保存",
       "saved": "已保存",
+      "cancel": "取消",
+      "unsavedChanges": "有未保存的更改",
       "accountLabel": "账户",
+      "usageRemaining": "剩余配额",
       "plan": "套餐方案",
       "storedAs": "存储标识",
       "slashFast": "切换 Codex 加速模式（快速/标准）",
@@ -1419,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('')
@@ -1440,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) || [])
@@ -1492,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) {
@@ -2378,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),
                 )
               })
@@ -2394,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')),
@@ -2908,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())
@@ -3538,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/index.js

@@ -18,6 +18,7 @@ import { createSubscriptionsService } from './subscriptions.js'
 import { registerSubscriptionTools } from './native-tools.js'
 import { detectConflicts, readProfilePluginNames, setActiveConflicts } from './coexistence.js'
 import { createAccountStore, defaultAccountRef, normalizeSlots, vendorConfig } from './accounts.js'
+import { resolveAccountRef } from './account-reliability.js'
 import { OllamaAdapter, ollamaAlive, ollamaModels, ollamaBase } from './ollama.js'
 import { createResetCreditService } from './reset-credits.js'
 import { maskEmail, maskLabel } from './mask.js'
@@ -276,9 +277,8 @@ export function apply(ctx, rawConfig) {
 
   // #85: host-only reset credit service for Codex accounts.
   const resetCredits = createResetCreditService({ loadBlob: (ref) => store.loadBlob(ref) })
-  function refForSlot(provider, index) {
-    const slot = normalizeSlots(live().slots).find((s) => s.provider === provider && s.index === index)
-    return slot ? slot.ref : null
+  function refForSlot(provider, indexOrAlias) {
+    return resolveAccountRef(normalizeSlots(live().slots), provider, indexOrAlias)
   }
 
   function stripLegacySlots(slots) {

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/package.json

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