@goodandready/dsh-subscriptions 0.7.43 → 0.7.45

package/lib/account-features.js

@@ -0,0 +1,133 @@
+function percentile(values, p) {
+  const list = (Array.isArray(values) ? values : []).filter(Number.isFinite).sort((a, b) => a - b)
+  if (!list.length) return null
+  return list[Math.min(list.length - 1, Math.max(0, Math.ceil((p / 100) * list.length) - 1))]
+}
+
+/** #796: independent picker entries are bound to the stable credential ref. */
+export function buildIndependentEntries(accounts, modelsByProvider = {}) {
+  const out = []
+  for (const account of Array.isArray(accounts) ? accounts : []) {
+    if (!account || account.independentEntry !== true || account.hasToken === false) continue
+    const alias = String(account.independentAlias || account.label || account.ref || '').trim()
+    for (const model of modelsByProvider[account.provider] || []) {
+      const id = typeof model === 'string' ? model : model && (model.id || model.slug)
+      if (!id) continue
+      out.push({
+        id: 'independent:' + account.ref + ':' + id,
+        model: id,
+        provider: account.provider,
+        accountRef: account.ref,
+        alias,
+      })
+    }
+  }
+  return out
+}
+
+export function resolveIndependentEntry(entry, accounts) {
+  if (!entry || entry.accountRef == null) return null
+  const account = (Array.isArray(accounts) ? accounts : []).find((row) => row && row.ref === entry.accountRef)
+  if (!account || account.hasToken === false) return null
+  return account
+}
+
+/** #812: per-account usage loading with in-flight dedupe, stale-drop and cleanup. */
+export function createUsageLoader({ load } = {}) {
+  const inflight = new Map()
+  const generation = new Map()
+  const state = new Map()
+
+  return {
+    load(key, { force = false } = {}) {
+      if (!force && inflight.has(key)) return inflight.get(key)
+      const gen = (generation.get(key) || 0) + 1
+      generation.set(key, gen)
+      state.set(key, { ...(state.get(key) || {}), loading: true, error: null })
+      const promise = Promise.resolve()
+        .then(() => load(key))
+        .then((value) => {
+          if (generation.get(key) !== gen) return state.get(key)
+          state.set(key, { value, loading: false, error: null })
+          return state.get(key)
+        })
+        .catch((error) => {
+          if (generation.get(key) !== gen) return state.get(key)
+          state.set(key, { ...(state.get(key) || {}), loading: false, error: String(error && error.message || error) })
+          return state.get(key)
+        })
+        .finally(() => { if (inflight.get(key) === promise) inflight.delete(key) })
+      inflight.set(key, promise)
+      return promise
+    },
+    get(key) { return state.get(key) || null },
+    clearMissing(validKeys) {
+      const keep = new Set(validKeys || [])
+      for (const key of [...state.keys()]) if (!keep.has(key)) state.delete(key)
+      for (const key of [...inflight.keys()]) if (!keep.has(key)) inflight.delete(key)
+    },
+  }
+}
+
+/** #802: explicit child choice > subagent default > session choice > global. */
+export function resolveSpeed({ childSpeed, sessionSpeed, subagentSpeed, modelSupportsFast = true } = {}) {
+  const pick = [childSpeed, subagentSpeed, sessionSpeed].find((value) => value === 'standard' || value === 'fast')
+  if (pick === 'fast' && !modelSupportsFast) {
+    const err = new Error('this model does not support fast speed')
+    err.code = 'FAST_UNSUPPORTED'
+    throw err
+  }
+  return pick || 'standard'
+}
+
+/** #789: per-provider account dashboard rows and 24h heatmap. */
+export function accountDashboard(accounts, { now = Date.now(), sort = 'risk' } = {}) {
+  const rows = (Array.isArray(accounts) ? accounts : []).map((account) => {
+    const quota = account.usagePercent == null ? null : Number(account.usagePercent)
+    const burn = Number(account.burnRatePerHour) || 0
+    const runwayMinutes = quota != null && burn > 0 ? Math.max(0, Math.round(((100 - quota) / burn) * 60)) : null
+    const latencies = (account.latencies || []).filter(Number.isFinite)
+    return {
+      ref: account.ref,
+      provider: account.provider,
+      label: account.label || account.email || account.ref,
+      status: account.quarantineUntil && account.quarantineUntil > now ? 'quarantined'
+        : account.cooldownUntil && account.cooldownUntil > now ? 'cooling' : 'healthy',
+      quota,
+      runwayMinutes,
+      burnRatePerHour: burn,
+      requests: Number(account.requests) || 0,
+      errors: Number(account.errors) || 0,
+      p95LatencyMs: percentile(latencies, 95),
+    }
+  })
+  const risk = (row) => (row.quota == null ? 1000 : row.quota) + row.errors * 5
+  if (sort === 'name') rows.sort((a, b) => String(a.label).localeCompare(String(b.label)))
+  else if (sort === 'quota') rows.sort((a, b) => (a.quota ?? 1000) - (b.quota ?? 1000))
+  else rows.sort((a, b) => risk(b) - risk(a))
+  return rows
+}
+
+/** #807: searchable model editor with counters and bounded rendering. */
+export function modelEditor(models, { query = '', overrides = {}, limit = 40 } = {}) {
+  const q = String(query || '').trim().toLowerCase()
+  const rows = (Array.isArray(models) ? models : []).map((model) => {
+    const id = typeof model === 'string' ? model : model && (model.id || model.slug)
+    const name = typeof model === 'string' ? model : model && model.name
+    const override = overrides[id] || {}
+    return {
+      id,
+      name: override.name || name || id,
+      hidden: override.hidden === true,
+      contextWindow: override.contextWindow || (model && model.contextWindow) || null,
+      reasoningEffort: override.reasoningEffort || null,
+    }
+  }).filter((row) => row.id && (!q || [row.id, row.name].some((value) => String(value || '').toLowerCase().includes(q))))
+  return {
+    rows: rows.slice(0, Math.max(0, Number(limit) || 0)),
+    total: rows.length,
+    discovered: Array.isArray(models) ? models.length : 0,
+    overridden: Object.keys(overrides || {}).length,
+    hidden: rows.filter((row) => row.hidden).length,
+  }
+}

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,
       proxyBypass: Array.isArray(slot.proxyBypass) ? slot.proxyBypass : [],
+      independentEntry: slot.independentEntry === true,
+      independentAlias: slot.independentAlias || '',
       ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
       credentialError: info.credentialError || null,
       duplicateOf: info.duplicateOf || null,

package/lib/accounts.js

@@ -76,6 +76,8 @@ export function normalizeSlots(slots) {
       ...(slot.expiresAt ? { expiresAt: Number(slot.expiresAt) } : {}),
       ...(slot.maxConcurrency !== undefined ? { maxConcurrency: Number(slot.maxConcurrency) } : {}),
       ...(Array.isArray(slot.proxyBypass) ? { proxyBypass: slot.proxyBypass.map((host) => String(host).trim()).filter(Boolean) } : {}),
+      ...(slot.independentEntry === true ? { independentEntry: true } : {}),
+      ...(slot.independentAlias ? { independentAlias: String(slot.independentAlias).trim() } : {}),
       ...(slot.poolEnabled === false ? { poolEnabled: false } : {}),
       ...(slot.isDefault ? { isDefault: true } : {}),
       ...(Array.isArray(slot.poolModels)
@@ -433,6 +435,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         poolEnabled: slot.poolEnabled !== false,
         isDefault: !!slot.isDefault,
         proxyBypass: Array.isArray(slot.proxyBypass) ? slot.proxyBypass : [],
+        independentEntry: slot.independentEntry === true,
+        independentAlias: slot.independentAlias || '',
         ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
         credentialError: info.credentialError || null,
         lastUsedAt: lastUsedAt.get(slot.ref) || 0,

package/lib/client.js

@@ -283,6 +283,23 @@ window.__ModuleLoader__.load({
       "providerGallery": "Add provider",
       "tabOverview": "Overview",
       "tabAccounts": "Accounts",
+      "tabDashboard": "Dashboard",
+      "accountsDashboard": "Accounts dashboard",
+      "sortRisk": "Risk",
+      "sortQuota": "Quota",
+      "sortName": "Name",
+      "speedSubagent": "Subagent speed",
+      "statusHealthy": "healthy",
+      "statusCooling": "cooling",
+      "statusQuarantined": "quarantined",
+      "quotaUsed": "quota used",
+      "requests": "requests",
+      "errors": "errors",
+      "loadUsage": "Load usage",
+      "modelEditor": "Model editor",
+      "discovered": "discovered",
+      "shown": "shown",
+      "searchModels": "Search models by name or id",
       "tabRouting": "Routing",
       "tabModels": "Models",
       "tabVault": "Vault",
@@ -691,6 +708,23 @@ window.__ModuleLoader__.load({
       "providerGallery": "添加服务商",
       "tabOverview": "概览",
       "tabAccounts": "账户",
+      "tabDashboard": "仪表盘",
+      "accountsDashboard": "账户仪表盘",
+      "sortRisk": "风险",
+      "sortQuota": "配额",
+      "sortName": "名称",
+      "speedSubagent": "子代理速度",
+      "statusHealthy": "正常",
+      "statusCooling": "冷却中",
+      "statusQuarantined": "隔离中",
+      "quotaUsed": "已用配额",
+      "requests": "请求",
+      "errors": "错误",
+      "loadUsage": "加载用量",
+      "modelEditor": "模型编辑器",
+      "discovered": "已发现",
+      "shown": "已显示",
+      "searchModels": "按名称或 ID 搜索模型",
       "tabRouting": "路由",
       "tabModels": "模型",
       "tabVault": "Vault",
@@ -1046,6 +1080,7 @@ window.__ModuleLoader__.load({
     const VaultSnapshotsPanel = lazyPanel('VaultSnapshotsPanel')
     const ProviderPacksPanel = lazyPanel('ProviderPacksPanel')
     const SourcesPanel = lazyPanel('SourcesPanel')
+    const AccountsDashboardPanel = lazyPanel('AccountsDashboardPanel')
 
     // #839 model-list helpers
     function modelListSearchText(model) {
@@ -1955,6 +1990,7 @@ window.__ModuleLoader__.load({
           [
             ['overview', t('tabOverview')],
             ['accounts', t('tabAccounts')],
+            ['dashboard', t('tabDashboard')],
             ['routing', t('tabRouting')],
             ['models', t('tabModels')],
             ['vault', t('tabVault')],
@@ -2221,6 +2257,19 @@ h('div', { className: 'dsub-row' },
             h('summary', { className: 'dsub-groupHead' }, t('sources')),
             h(SourcesPanel, { t }),
           ),
+          h('div', { className: 'dsub-group', 'data-pane': 'dashboard' },
+            h(AccountsDashboardPanel, {
+              t,
+              labels: {
+                accountsDashboard: t('accountsDashboard'),
+                sortRisk: t('sortRisk'), sortQuota: t('sortQuota'), sortName: t('sortName'),
+                speedSubagent: t('speedSubagent'),
+                statusHealthy: t('statusHealthy'), statusCooling: t('statusCooling'), statusQuarantined: t('statusQuarantined'),
+                quotaUsed: t('quotaUsed'), requests: t('requests'), errors: t('errors'), loadUsage: t('loadUsage'),
+                modelEditor: t('modelEditor'), discovered: t('discovered'), shown: t('shown'), searchModels: t('searchModels'),
+              },
+            }),
+          ),
           h('details', { className: 'dsub-group', 'data-pane': 'models' },
             h('summary', { className: 'dsub-groupHead' }, t('providerPacks')),
             h(ProviderPacksPanel, { t }),

package/lib/client.panels.js

@@ -182,6 +182,95 @@ window.__ModuleLoader__.load({
     }
 
 
-    return { WebhookTestButton, VaultSnapshotsPanel, ProviderPacksPanel, SourcesPanel }
+    // #789/#807/#812/#802: account dashboard, model editor, lazy usage and speed controls.
+    function AccountsDashboardPanel(props) {
+      const t = (props && props.t) || ((k) => k)
+      const [data, setData] = React.useState(null)
+      const [provider, setProvider] = React.useState('')
+      const [query, setQuery] = React.useState('')
+      const [sort, setSort] = React.useState('risk')
+      const [usage, setUsage] = React.useState({})
+      const [speed, setSpeed] = React.useState('standard')
+      const usageRef = React.useRef({ inflight: {}, gen: {} })
+      const pull = () => fetch('/dsh-subscriptions/config', { cache: 'no-store' })
+        .then((res) => res.json())
+        .then((cfg) => {
+          setData(cfg)
+          setSpeed((cfg.config && cfg.config.codexSubagentSpeed) || 'standard')
+          if (!provider && cfg.accounts && cfg.accounts.length) setProvider(cfg.accounts[0].provider)
+        })
+        .catch(() => {})
+      React.useEffect(() => { pull() }, [])
+      const loadUsage = (row) => {
+        const key = row.provider + ':' + row.index
+        if (usageRef.current.inflight[key]) return
+        const gen = (usageRef.current.gen[key] || 0) + 1
+        usageRef.current.gen[key] = gen
+        usageRef.current.inflight[key] = true
+        setUsage((m) => Object.assign({}, m, { [key]: { loading: true } }))
+        fetch('/dsh-subscriptions/usage?provider=' + encodeURIComponent(row.provider) + '&index=' + encodeURIComponent(row.index), { cache: 'no-store' })
+          .then((res) => res.json())
+          .then((out) => {
+            if (usageRef.current.gen[key] !== gen) return
+            setUsage((m) => Object.assign({}, m, { [key]: { value: out, loading: false } }))
+          })
+          .catch((e) => {
+            if (usageRef.current.gen[key] === gen) setUsage((m) => Object.assign({}, m, { [key]: { loading: false, error: String(e && e.message || e) } }))
+          })
+          .finally(() => { usageRef.current.inflight[key] = false })
+      }
+      const saveSpeed = (value) => {
+        setSpeed(value)
+        if (!data || !data.config) return
+        fetch('/dsh-subscriptions/config', {
+          method: 'PUT',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({ config: Object.assign({}, data.config, { codexSubagentSpeed: value }), revision: data.revision }),
+        }).then(pull).catch(() => {})
+      }
+      const accounts = (data && data.accounts) || []
+      const selected = provider || (accounts[0] && accounts[0].provider) || ''
+      const rows = accounts.filter((row) => row.provider === selected).sort((a, b) => {
+        if (sort === 'name') return String(a.label || a.email || a.ref).localeCompare(String(b.label || b.email || b.ref))
+        if (sort === 'quota') return (b.usagePercent || 0) - (a.usagePercent || 0)
+        return (b.usagePercent || 0) + (b.errors || 0) * 5 - ((a.usagePercent || 0) + (a.errors || 0) * 5)
+      })
+      const models = ((data && data.modelsCatalog) || []).filter((m) => m.provider === selected)
+      const q = query.trim().toLowerCase()
+      const shown = models.filter((m) => !q || [m.id, m.name, m.alias].some((v) => String(v || '').toLowerCase().includes(q)))
+      const providers = Array.from(new Set(accounts.map((row) => row.provider).filter(Boolean)))
+      return h('div', { className: 'dsub-section-card' },
+        h('div', { className: 'dsub-section-title' }, t('accountsDashboard'), h('button', { type: 'button', className: 'dsub-mini', onClick: pull }, '↻')),
+        h('div', { className: 'dsub-row' },
+          h('select', { className: 'dsub-select', value: selected, onChange: (e) => setProvider(e.target.value) },
+            providers.map((id) => h('option', { key: id, value: id }, id))),
+          h('select', { className: 'dsub-select', value: sort, onChange: (e) => setSort(e.target.value) },
+            ['risk', 'quota', 'name'].map((id) => h('option', { key: id, value: id }, t('sort' + id[0].toUpperCase() + id.slice(1))))),
+          h('span', { className: 'dsub-sub' }, t('speedSubagent') + ':'),
+          h('select', { className: 'dsub-select', value: speed, onChange: (e) => saveSpeed(e.target.value) },
+            h('option', { value: 'standard' }, 'Standard'), h('option', { value: 'fast' }, 'Fast')),
+        ),
+        rows.map((row, i) => {
+          const key = row.provider + ':' + row.index
+          const u = usage[key]
+          return h('div', { key: key + ':' + i, className: 'dsub-group', style: { padding: '8px' } },
+            h('div', { className: 'dsub-row' },
+              h('span', { className: 'dsub-h' }, '#' + row.index + ' ' + (row.label || row.email || row.ref)),
+              h('span', { className: 'dsub-pillTag' }, row.quarantineUntil > Date.now() ? t('statusQuarantined') : (row.cooldownUntil > Date.now() ? t('statusCooling') : t('statusHealthy')))),
+            h('div', { className: 'dsub-sub' }, t('quotaUsed') + ': ' + (row.usagePercent == null ? '—' : row.usagePercent + '%') + ' · ' + t('requests') + ' ' + (row.requests || 0) + ' · ' + t('errors') + ' ' + (row.errors || 0)),
+            h('div', { className: 'dsub-row' },
+              h('button', { type: 'button', className: 'dsub-mini', onClick: () => loadUsage(row) }, u && u.loading ? '…' : t('loadUsage')),
+              u && u.error ? h('span', { className: 'dsub-bad' }, u.error) : null,
+              u && u.value ? h('span', { className: 'dsub-dim' }, JSON.stringify(u.value).slice(0, 180)) : null),
+          )
+        }),
+        h('div', { className: 'dsub-h' }, t('modelEditor') + ' · ' + t('discovered') + ' ' + models.length + ' · ' + t('shown') + ' ' + shown.length),
+        h('input', { className: 'dsub-grow', value: query, placeholder: t('searchModels'), onChange: (e) => setQuery(e.target.value) }),
+        shown.slice(0, 40).map((m) => h('div', { key: m.id, className: 'dsub-row' },
+          h('span', { className: 'dsub-h' }, m.independent ? '★ ' : ''), h('span', { className: 'dsub-sub' }, m.name || m.id), h('span', { className: 'dsub-dim' }, m.id))),
+      )
+    }
+
+    return { WebhookTestButton, VaultSnapshotsPanel, ProviderPacksPanel, SourcesPanel, AccountsDashboardPanel }
   }
 })

package/lib/config-schema.js

@@ -22,6 +22,10 @@ export const Slot = z.object({
     .description('#88 Per-account proxy URL (http://, https://, socks5://). All requests for this account route through it. Empty = direct connection.'),
   proxyBypass: z.array(z.string()).default([])
     .description('#803 Hosts/domains that bypass the per-account proxy.'),
+  independentEntry: z.boolean().default(false)
+    .description('#796 Expose this account as separate picker model rows with no fallback.'),
+  independentAlias: z.string().default('')
+    .description('#796 Display alias for independent model rows. Binding stays by credential ref.'),
   maxConcurrency: z.number().default(1)
     .description('#555 Per-slot max concurrent requests before queuing. Defaults to 1 for subscription safety.'),
   monthlyCost: z.number().default(20)
@@ -101,6 +105,8 @@ export const Config = z.object({
     .description('#93 Response verbosity for Codex reasoning models: low, medium or high. Empty = protocol default.'),
   codexFastMode: z.boolean().volatile().default(false)
     .description('#92 Fast Mode for Codex: sends service_tier priority (1.5x speed billing tier) with every request.'),
+  codexSubagentSpeed: z.string().volatile().default('standard')
+    .description('#802 Default speed for subagents: standard or fast. Explicit child choice wins.'),
   composerQuota: z.string().volatile().default('off')
     .description('#84 Composer quota indicator mode: off, percent, bar or forecast (predictive runway from a sliding window).'),
   composerQuotaDisplay: z.string().volatile().default('current')

package/lib/models-catalog.js

@@ -5,6 +5,7 @@ export function isDeprecatedId(id) {
 }
 import { getVendor } from './vendors/index.js'
 import { getAccountRemainingPercent } from './rotate.js'
+import { buildIndependentEntries } from './account-features.js'
 
 export const MODEL_CATALOG_TTL_MS = 5 * 60 * 1000
 
@@ -303,6 +304,22 @@ export function buildEnrichedCatalog({
         pool,
       })
     }
+
+    const independent = buildIndependentEntries(
+      accounts.filter((account) => account && account.provider === provId),
+      { [provId]: rawList },
+    )
+    for (const entry of independent) {
+      result.push({
+        id: entry.id,
+        name: entry.alias + ' · ' + entry.model,
+        provider: provId,
+        providerName: displayName(provId),
+        accountRef: entry.accountRef,
+        independent: true,
+        pool,
+      })
+    }
   }
 
   return result

package/package.json

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