@goodandready/dsh-subscriptions 0.4.0 → 0.4.3

package/README.md

@@ -1,9 +1,9 @@
 # dsh-subscriptions
 
-Use **ChatGPT Codex**, **Claude**, **Grok**, **Antigravity**
+Use **ChatGPT Codex**, **Claude**, **Grok**, and **Antigravity**
 subscriptions as DeepSeek Harness LLM providers. Log in from
-**Settings → Subscriptions**. Several accounts per provider rotate on quota
-inside this plugin.
+**Settings → Plugins → Plugin settings → Subscriptions**.
+Several accounts per provider rotate on quota inside this plugin.
 
 This package is original software. It speaks vendor-public OAuth and LLM HTTP
 contracts. It does not ship tools (`x_search`, image, or video).
@@ -25,19 +25,145 @@ After a `file:` install, remove then add again if you added new files under
 
 ## Settings
 
-1. Open **Settings → Subscriptions**.
-2. Pick a provider card and click **Connect**. Complete sign-in in the browser.
-3. **Disconnect** removes that account's token so you can connect again. **Reconnect** repeats OAuth on the same slot. The × on the card also disconnects, then drops the slot.
+Settings live on a collapsible card in **Settings → Plugins → Plugin settings**
+(not a sidebar entry). Click **Show** to expand it.
+
+1. Pick a provider block and click **Connect**. Complete sign-in in the browser.
+2. **+ Add account** adds another account slot for the same provider; every
+   account participates in rotation.
+3. **Disconnect** removes that account's token; **Reconnect** repeats OAuth on
+   the same slot. The × button disconnects and drops the slot.
 4. If the provider redirects to a localhost or vendor URL that this host cannot
-   receive, paste the full redirected URL (or the `code` value) into the account
-   row and click **Submit code**.
+   receive, paste the full redirected URL (or the `code` value) into the
+   account row and click **Submit code**.
 5. Logged-in providers appear in the session model picker.
 
 Leave **Use this Web UI origin as OAuth redirect_uri** off unless you registered
 your own OAuth client for this origin. Vendor CLI clients typically require
 their published redirect URI plus the paste step.
 
-Disconnect removes that account's blob from the host credentials store.
+## Accounts and rotation
+
+Each provider holds any number of account slots (`CODEX_OAUTH_1`,
+`CODEX_OAUTH_2`, …). On `RATE_LIMIT`, `QUOTA`, or HTTP 429 the plugin cools the
+account down (`cooldownMs`, default 30 minutes) and retries the same request on
+the next account of the same provider — never a different provider.
+
+Beyond error-driven rotation, accounts are proactively skipped when:
+
+- usage is at 100% for the current window (vendor-reported), or
+- remaining quota fraction is at or below `switchAtRemaining`
+  (default `0.01` = 1%), or
+- the window resets within one minute (no point spending the tail).
+
+When every account is below threshold, the request still goes out on the first
+exhausted account — a refusal beats silence.
+
+## Quota visibility
+
+Vendors that report usage expose named windows (Claude `5h`/`7d apps`,
+Codex primary/secondary, Grok credits). Each window renders as a progress bar
+with percent; colors follow theme variables (normal / warning ≥70% / exhausted
+100%). The last known snapshot persists across harness restarts and refreshes
+on the next successful request.
+
+The plugin also estimates remaining requests for the primary window
+(`≈ N (5h)`) once enough request history exists — hidden when data is thin.
+
+### Limit notifications
+
+When a window crosses 70%, 90%, or 100%, the plugin logs a warning and emits a
+`subscriptions.limit-notice` event (provider, ref, window id, usedPercent,
+threshold). Each threshold fires once per window until it resets. Toggle with
+`notifyLimits` in Config.
+
+## Background maintenance
+
+Two timers run while the plugin is loaded:
+
+- **Token refresh ahead**: expiring tokens are refreshed before they are needed
+  (`refreshAheadMs`, default 5 min). Failures back off via `refreshRetryMs`
+  (default 10 min) and mark the card as *reconnect required*.
+- **Health probe loop**: every `probeIntervalMin` minutes (default 15, 0
+  disables) each connected account gets a cheap vendor check. Dead accounts
+  surface in the card; probes never set cooldown.
+
+Both timers clean up on plugin dispose.
+
+## HTTP proxy
+
+`POST|GET /dsh-subscriptions/proxy/{provider}/{path…}` forwards to the vendor
+API on behalf of a logged-in account — through the same allowlist, rotation,
+and quota accounting as model traffic. Same-origin only; no token ever appears
+in a response or log. Paths outside the per-provider allowlist get 403.
+
+Example:
+
+```bash
+curl -X POST https://<host>:3080/dsh-subscriptions/proxy/codex/models \
+  -H 'Content-Type: application/json' -d '{}'
+```
+
+## Export / import
+
+Tokens live in the host credentials store and normally tie the installation to
+one machine. To move them:
+
+```bash
+# export (returns an encrypted DSHE1 payload)
+curl -X POST https://<host>:3080/dsh-subscriptions/export \
+  -H 'Content-Type: application/json' -d '{"passphrase":"strong-passphrase"}'
+
+# import
+curl -X POST https://<host>:3080/dsh-subscriptions/import \
+  -H 'Content-Type: application/json' \
+  -d '{"passphrase":"strong-passphrase","payload":"DSHE1:…"}'
+```
+
+Bundles are AES-256-GCM encrypted with a key derived from your passphrase
+(scrypt). Without the passphrase nothing decrypts; wrong passphrase fails with
+a clear error. Tokens are never logged.
+
+## Composer provider switcher
+
+A small widget in the composer bar shows the active subscription provider;
+clicking cycles among logged-in providers without opening Settings. It does not
+change the session model picker state.
+
+## Session header chip
+
+A compact chip in the conversation header shows how many subscriptions are
+connected. It polls `/dsh-subscriptions/status` every minute and turns green
+when at least one account is active.
+
+## Quota reset countdown
+
+When a vendor reports a quota window reset timestamp, the account card shows a
+live `reset HH:MM:SS` countdown next to the quota bar, updating every second.
+
+## Slash commands
+
+From the chat, without opening Settings:
+
+```
+/login <provider>     # start OAuth for codex|claude|grok|antigravity (opens the vendor page)
+/login status         # insert the connected providers into the composer
+/logout <provider>    # disconnect that provider
+```
+
+## /subscriptions page
+
+A localhost-only summary page at `/subscriptions` lists every account slot,
+connection status, usage percent, remaining quota and reset time across all
+providers. Requests from non-loopback hosts get 403.
+
+## Import a token directly
+
+In any account card, paste an existing refresh token (or API key) and click
+**Import token** to sign in without the browser OAuth round trip. The token is
+written straight to the host credentials store via
+`POST /dsh-subscriptions/import-token { provider, index, refreshToken }`.
+
 
 ## Credential names
 
@@ -68,8 +194,9 @@ Live requests use the vendor subscription surfaces, not API-key hosts:
 Codex `chatgpt.com/backend-api/codex/responses`, Claude Messages with the
 OAuth beta header, Grok `cli-chat-proxy.grok.com` with CLI identity headers,
 and Antigravity Cloud Code Assist (`loadCodeAssist` then
-`streamGenerateContent`). Usage endpoints, when they answer, feed the 100%
-skip. If a live model list fails, the built-in catalog is used.
+`streamGenerateContent`). Usage endpoints, when they answer, feed the skip
+logic above. If a live model list fails, the built-in catalog is used.
+
 Antigravity uses a confidential Google OAuth client: set `antigravityClientId`
 and `antigravityClientSecret` in plugin Config (Settings) — nothing is baked
 into the repository.
@@ -78,14 +205,18 @@ Default model catalogs are built-in lists you can replace with
 `codexModels`, `claudeModels`, `grokModels`, `antigravityModels`
 in the plugin Config.
 
-## Rotation
+### Config reference
 
-On `RATE_LIMIT`, `QUOTA`, or HTTP 429 the plugin cools that account down
-(default 30 minutes) and retries the **same provider** on the next account.
-It never switches to a different provider. Accounts at 100% usage (when the
-vendor reports usage) are skipped.
-
-This plugin does not call `dsh-key-rotation`.
+| Key | Default | Meaning |
+|---|---|---|
+| `cooldownMs` | 1800000 | Cooldown after RATE_LIMIT/QUOTA/429 |
+| `switchAtRemaining` | 0.01 | Skip account when remaining ≤ this (fraction <1 or absolute ≥1); 0 disables |
+| `refreshAheadMs` | 300000 | Refresh tokens expiring within this window |
+| `refreshRetryMs` | 600000 | Backoff after a failed background refresh |
+| `probeIntervalMin` | 15 | Account health-check interval, minutes; 0 disables |
+| `notifyLimits` | true | Emit notices when usage crosses 70/90/100% |
+| `useWebCallback` | false | Use Web UI origin as OAuth redirect_uri |
+| `<vendor>Models` | built-in | Replace default model catalog per vendor |
 
 ## Identity
 
@@ -99,4 +230,4 @@ These three names must match:
 
 ## License
 
-MIT
+MIT

package/lib/accounts.js

@@ -55,6 +55,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, onLimitN
   const refreshFailures = new Map()
   const usage = new Map()
   const notifyThresholds = new Map()
+  const health = new Map()
   const requestCounts = new Map()
   const windows = new Map()
   const usageFetched = new Map()
@@ -124,6 +125,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, onLimitN
       cooldownUntil: cooldowns.get(ref) || 0,
       quota: quotas.get(ref) || null,
       usage: windows.get(ref) || base.usage || null,
+      health: health.get(ref) || null,
       usagePercent: usage.has(ref) ? usage.get(ref) : null,
       refreshError: refreshFailures.get(ref)?.error || '',
       validationUrl: base.validationUrl || '',
@@ -273,6 +275,16 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, onLimitN
     shouldSkipRefresh(ref, now, retryMs) { const f = refreshFailures.get(ref); if (!f) return false; return (Number(f.at) + Number(retryMs)) > Number(now) },
     getQuota(ref) { return quotas.get(ref) || null },
     rememberUsage(ref, percent) { usage.set(ref, percent) },
+    getHealth(ref) { return health.get(ref) || null },
+    setHealth(ref, h) { health.set(ref, h) },
+    recordSwitch(ref) { health.set(ref, recordSwitch(health.get(ref))) },
+    recordExhaust(ref) { health.set(ref, recordExhaust(health.get(ref))) },
+    recordBroken(ref) { health.set(ref, recordBroken(health.get(ref))) },
+    recordSuccess(ref) {
+      // успешный запрос сбрасывает кулдаун и возвращает аккаунт в строй
+      cooldowns.delete(ref)
+      if (health.has(ref)) health.set(ref, null)
+    },
     rememberRequest(ref) { requestCounts.set(ref, (requestCounts.get(ref) || 0) + 1) },
     getRequestCount(ref) { return requestCounts.get(ref) || 0 },
   }

package/lib/adapter.js

@@ -78,7 +78,10 @@ export class SubscriptionAdapter extends LlmAdapter {
         cooldownMs: deps.cooldownMs(),
         switchAtRemaining: typeof deps.switchAtRemaining === 'function' ? deps.switchAtRemaining() : (deps.switchAtRemaining ?? 0),
         options,
-        onCooldown: (account) => deps.rememberCooldown(account.ref, account.cooldownUntil),
+        onCooldown: (account) => {
+          deps.rememberCooldown(account.ref, account.cooldownUntil)
+          if (typeof deps.recordSwitch === 'function') deps.recordSwitch(account.ref)
+        },
         streamOnce: async function* (account, opts) {
           const blob = await deps.ensureFresh(provider, await deps.loadBlob(account.ref), account.ref)
           const vendor = getVendor(provider)
@@ -116,6 +119,8 @@ export class SubscriptionAdapter extends LlmAdapter {
               signal: opts.signal,
               saveBlob: (next) => deps.saveBlob(account.ref, next),
             })
+            // поток завершился успешно: снять кулдаун и здоровье-штрафы
+            if (typeof deps.recordSuccess === 'function') deps.recordSuccess(account.ref)
           } catch (err) {
             if (err && err.code === 'VALIDATION_REQUIRED' && err.validationUrl) {
               await deps.saveBlob(account.ref, {

package/lib/client.js

@@ -36,6 +36,10 @@ window.__ModuleLoader__.load({
     '.dsub-badge{font-size:11px;padding:2px 8px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary);white-space:nowrap}' +
     '.dsub-badge-on{color:var(--dsw-alias-state-success-primary);border-color:currentColor}' +
     '.dsub-badge-warn{color:var(--dsw-alias-state-warning-primary);border-color:currentColor}' +
+    '.dsub-chip{display:inline-flex;align-items:center;gap:5px;height:26px;padding:0 10px;border-radius:999px;font-size:12px;font-weight:600;line-height:1;white-space:nowrap;color:var(--dsw-alias-label-secondary);border:1px solid var(--dsw-alias-border-l2)}' +
+    '.dsub-chipOn{color:var(--dsw-alias-state-success-primary);border-color:currentColor}' +
+    '.dsub-chipDot{width:6px;height:6px;border-radius:999px;background:currentColor;flex:none}' +
+
     '.dsub-link{background:none;border:none;color:var(--dsw-alias-label-secondary);cursor:pointer;font-size:12px;padding:0}' +
     '.dsub-bar{position:relative;height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden;flex:1;min-width:80px}' +
     '.dsub-barFill{height:100%;border-radius:3px;background:var(--dsw-alias-state-success-primary);transition:width .2s}' +
@@ -88,8 +92,14 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'plan': 'Plan',
       'storedAs': 'Stored as',
       'switchLabel': 'Provider',
+      'chipActive': 'Subscriptions',
+      'slashLogin': 'Login to a subscription provider',
+      'slashLogout': 'Log out a subscription provider',
+      'slashStatus': 'Subscription status',
       'none': 'none',
       'forecast': '≈',
+      'resetLabel': 'сброс',
+      'resetLabel': 'reset',
     }
     const ru = {
       'notConnected': 'Не подключено',
@@ -121,10 +131,32 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'plan': 'Тариф',
       'storedAs': 'Хранится как',
       'switchLabel': 'Провайдер',
+      'chipActive': 'Подписки',
+      'slashLogin': 'Вход в провайдера подписки',
+      'slashLogout': 'Выйти из провайдера подписки',
+      'slashStatus': 'Статус подписок',
       'none': 'нет',
       'forecast': '≈',
     }
 
+    // #51: live countdown to the quota window reset (account.quota.resetAt).
+    function ResetCountdown(props) {
+      const [now, setNow] = React.useState(Date.now())
+      React.useEffect(() => {
+        const id = setInterval(() => setNow(Date.now()), 1000)
+        return () => clearInterval(id)
+      }, [])
+      const ms = (props.resetAt || 0) - now
+      if (ms <= 0) return null
+      const total = Math.floor(ms / 1000)
+      const h = Math.floor(total / 3600)
+      const m = Math.floor((total % 3600) / 60)
+      const sec = total % 60
+      const pad = (n) => String(n).padStart(2, '0')
+      return React.createElement('span', { className: 'dsub-sub', style: { fontVariantNumeric: 'tabular-nums' } },
+        t('resetLabel') + ' ' + pad(h) + ':' + pad(m) + ':' + pad(sec))
+    }
+
     function badgeFor(account, t) {
       if (!account || !account.configured) return t('notConnected')
       if (account.validationUrl) return t('verifyAccount')
@@ -178,6 +210,7 @@ function PluginCard(props) {
       const [checkRes, setCheckRes] = React.useState({})
       const [checking, setChecking] = React.useState({})
       const [saved, setSaved] = React.useState(false)
+      const [tokenDraft, setTokenDraft] = React.useState({})
       const [err, setErr] = React.useState('')
 
       const applyPayload = (data) => {
@@ -269,6 +302,21 @@ function PluginCard(props) {
         setAccounts(data.accounts || [])
       }
 
+      const importToken = async (provider, index) => {
+        setErr('')
+        const tok = (tokenDraft[provider + ':' + index] || '').trim()
+        if (!tok) return
+        const res = await fetch('/dsh-subscriptions/import-token', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ provider, index, refreshToken: tok }),
+        })
+        const data = await res.json().catch(() => ({}))
+        if (!res.ok) throw new Error((data.error && data.error.message) || ('HTTP ' + res.status))
+        setAccounts(data.accounts || [])
+        setTokenDraft((d) => Object.assign({}, d, { [provider + ':' + index]: '' }))
+      }
+
       const addSlot = (provider) => {
         const used = slots.filter((s) => s.provider === provider).map((s) => s.index)
         let index = 1
@@ -358,6 +406,18 @@ function PluginCard(props) {
                     onClick: () => complete(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
                   }, t('submitCode')),
                 ),
+                React.createElement('div', { className: 'dsub-row' },
+                  React.createElement('input', {
+                    className: 'dsub-grow',
+                    value: tokenDraft[key] || '',
+                    placeholder: t('importTokenPlace'),
+                    onChange: (e) => setTokenDraft((d) => Object.assign({}, d, { [key]: e.target.value })),
+                  }),
+                  React.createElement('button', {
+                    type: 'button', className: 'dsub-mini',
+                    onClick: () => importToken(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                  }, t('importToken')),
+                ),
                 account.accountNotice ? React.createElement('div', { className: 'dsub-verify' }, account.accountNotice) : null,
                 account.refreshError ? React.createElement('div', { className: 'dsub-bad' }, 'reconnect required: ' + account.refreshError) : null,
                 (function(){ var r=checkRes[key]; if(!r) return null; var txt=r.ok ? ('ok ' + (r.email||'')) : ('fail ' + (r.error && r.error.message || '')); var cls=r.ok ? 'dsub-ok' : 'dsub-bad'; var q=r.quota; if(q && q.remaining!=null) txt += ' quota:'+q.remaining+(q.limit!=null?'/'+q.limit:''); return React.createElement('div', {className: cls}, txt) })(),
@@ -386,6 +446,7 @@ function PluginCard(props) {
                   }
                   var q=account.quota
                   if(q&&q.usedPercent!=null)parts.push(bar(t('quota'),q.usedPercent))
+                  if(q&&q.resetAt)parts.push(React.createElement(ResetCountdown,{key:'reset',resetAt:q.resetAt}))
                   if(!wins&&!q&&account.usagePercent!=null)parts.push(bar(t('quota'),account.usagePercent))
                   var at=(q&&q.measuredAt)||(account.usageAt||0)
                   if(at){var m=Math.round((Date.now()-at)/60000);if(m>=1)parts.push(React.createElement('span',{className:'dsub-sub',key:'ago'},m+'m'))}
@@ -525,6 +586,46 @@ function PluginCard(props) {
       } catch { return [] }
     }
 
+    // #52: компактный чип в шапке сессии со статусом подключённых подписок.
+    function HeaderChip(props) {
+      const [state, setState] = React.useState({ loading: true, count: 0 })
+      const t = (props && props.t) || ((k) => k)
+      React.useEffect(() => {
+        const pull = () => {
+          refreshLoggedIn().then((logged) => {
+            setState({ loading: false, count: logged.length })
+          }).catch(() => setState({ loading: false, count: 0 }))
+        }
+        pull()
+        const id = setInterval(pull, 60 * 1000)
+        return () => clearInterval(id)
+      }, [])
+      const on = state.count > 0
+      return React.createElement('span', {
+        className: 'dsub-chip' + (on ? ' dsub-chipOn' : ''),
+        title: on ? t('chipActive') + ': ' + state.count : t('none'),
+      },
+        React.createElement('span', { className: 'dsub-chipDot' }),
+        on ? String(state.count) : '—',
+      )
+    }
+
+    function registerHeaderChip(ctx) {
+      ctx.effect(() => {
+        ctx.slots.inject('conversation.session.header.utilities', () =>
+          ctx.slots.register(
+            {
+              name: 'conversation.session.header.utilities',
+              id: 'dsh-subscriptions-header-chip',
+              order: 5,
+              locale: NS,
+            },
+            (props) => React.createElement(HeaderChip, { t }),
+          ),
+        )
+      }, 'dsh-subscriptions: header chip')
+    }
+
     function registerComposerSwitch(ctx) {
       ctx.effect(() => {
         const render = () => {
@@ -569,10 +670,74 @@ function PluginCard(props) {
       }, 'dsh-subscriptions: composer provider switch')
     }
 
-    exports.inject = ['slots', 'locale']
+    // #43: slash-команды входа/выхода/статуса прямо из чата.
+    function registerSlashCommands(ctx) {
+      ctx.effect(() => {
+        const triggers = ctx.get('inputTriggers')
+        if (!triggers) return () => {}
+        const providerMatch = new RegExp('^(' + ORDER.join('|') + ')$')
+        const run = (cmd, line) => {
+          const args = (line.trim().replace(/^\/\S+\s*/, '')).split(/\s+/).filter(Boolean)
+          const prov = args[0]
+          if (cmd === 'logout') {
+            if (!prov || !providerMatch.test(prov)) return
+            fetch('/dsh-subscriptions/logout', {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ provider: prov, index: 1 }),
+            }).catch(() => {})
+            return
+          }
+          if (cmd === 'status' || (cmd === 'login' && prov === 'status')) { refreshLoggedIn().catch(() => {}); return }
+          // login <provider>
+          if (!prov || !providerMatch.test(prov)) return
+          fetch('/dsh-subscriptions/oauth/start?provider=' + encodeURIComponent(prov) + '&index=1', { cache: 'no-store' })
+            .then((r) => r.json()).then((data) => {
+              if (data && data.url) window.open(data.url, '_blank', 'noopener')
+            }).catch(() => {})
+        }
+        const line = (line) => line.trim()
+        const sources = [
+          { name: 'login', description: t('slashLogin') },
+          { name: 'logout', description: t('slashLogout') },
+        ]
+        const disposers = sources.map((src) =>
+          triggers.registerSource({
+            trigger: '/',
+            name: src.name,
+            order: 40,
+            description: src.description,
+            candidates: (_s, req) => {
+              if (req.position !== 'leading') return Promise.resolve([])
+              const q = req.query.trim().toLowerCase()
+              const name = src.name
+              if (q !== '' && !name.startsWith(q)) return Promise.resolve([])
+              return Promise.resolve([{ name, description: src.description }])
+            },
+            matchEnter: (_session, l) => {
+              const t2 = line(l)
+              const tok = t2.split(/\s+/)[0]
+              if (tok !== '/' + src.name) return Promise.resolve(undefined)
+              // '/login status' surfaces the connected providers as composer text.
+              if (src.name === 'login' && /\bstatus\b/.test(t2)) {
+                return refreshLoggedIn().then((logged) =>
+                  ({ text: 'Connected: ' + (logged.length ? logged.join(', ') : 'none') }))
+              }
+              run(src.name, t2)
+              return Promise.resolve('handled')
+            },
+          }),
+        )
+        return () => { for (const off of disposers) off() }
+      }, 'dsh-subscriptions: slash commands')
+    }
+
+    exports.inject = ['slots', 'locale', 'sessions']
     exports.apply = function apply(ctx) {
       registerSettings(ctx)
+      registerHeaderChip(ctx)
       registerComposerSwitch(ctx)
+      registerSlashCommands(ctx)
     }
     return module.exports
   },

package/lib/health.js

@@ -0,0 +1,38 @@
+// Health-счёт аккаунта для умной ротации.
+// Числа как в dsh-key-rotation pool.js: свитч 5, исчерпание 10, битый ключ 15.
+const PENALTY = { switch: 5, exhaust: 10, broken: 15 }
+
+export function emptyHealth() {
+  return { switches: 0, exhaustions: 0, broken: 0 }
+}
+
+export function recordSwitch(h) {
+  const cur = h || emptyHealth()
+  return { ...cur, switches: (cur.switches || 0) + 1 }
+}
+
+export function recordExhaust(h) {
+  const cur = h || emptyHealth()
+  return { ...cur, exhaustions: (cur.exhaustions || 0) + 1 }
+}
+
+export function recordBroken(h) {
+  const cur = h || emptyHealth()
+  return { ...cur, broken: (cur.broken || 0) + 1 }
+}
+
+export function computeHealthScore(h) {
+  const H = h || emptyHealth()
+  const score = 100
+    - (H.switches || 0) * PENALTY.switch
+    - (H.exhaustions || 0) * PENALTY.exhaust
+    - (H.broken || 0) * PENALTY.broken
+  return Math.max(0, Math.min(100, score))
+}
+
+export function healthBadge(score) {
+  if (score == null) return 'unknown'
+  if (score >= 80) return 'healthy'
+  if (score >= 50) return 'tired'
+  return 'broken'
+}

package/lib/index.js

@@ -3,12 +3,11 @@ import { PROVIDERS, oauthRef, isProvider, displayName, droppedCredentialRefs } f
 import { createPkce } from './pkce.js'
 import { parseCallbackInput, requestOrigin, webCallbackUri } from './oauth.js'
 import { writeJson, writeHtml, readBody, isTrustedSettingsRequest, queryOf } from './http.js'
-import { getVendor } from './vendors/index.js'
+import { getVendor, registerCustomVendor, clearCustomVendors } from './vendors/index.js'
 import { SubscriptionAdapter } from './adapter.js'
 import { generateOnce, SIZES as IMAGE_SIZES } from './images.js'
 import { parseBlob } from './blob.js'
 import { createVendorFromProfile, validateProfile } from './vendor-factory.js'
-import { registerCustomVendor } from './vendors/index.js'
 import { registerCustomProviderIds, registerDisplayName } from './refs.js'
 import { createSubscriptionsService } from './subscriptions.js'
 import { encryptWithPassphrase, decryptWithPassphrase } from './crypto.js'
@@ -106,7 +105,7 @@ export function apply(ctx, config) {
       try { ctx.log && ctx.log.warn && ctx.log.warn('[dsh-subscriptions] customVendors: ' + String(e && e.message || e)) } catch {}
       return
     }
-    clearCustomProviders()
+    clearCustomVendors()
     for (const profile of profiles) {
       try {
         const vendor = createVendorFromProfile(profile)
@@ -141,6 +140,12 @@ export function apply(ctx, config) {
     cooldownMs: () => live().cooldownMs,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until) => store.rememberCooldown(ref, until),
+    recordSuccess: (ref) => store.recordSuccess(ref),
+    getHealth: (ref) => store.getHealth(ref),
+    recordSwitch: (ref) => store.recordSwitch(ref),
+    recordExhaust: (ref) => store.recordExhaust(ref),
+    recordBroken: (ref) => store.recordBroken(ref),
+    setHealth: (ref, h) => store.setHealth(ref, h),
     rememberQuota: (ref, snap) => store.rememberQuota(ref, snap),
     rememberRequest: (ref) => store.rememberRequest(ref),
     getRequestCount: (ref) => store.getRequestCount(ref),
@@ -224,6 +229,26 @@ export function apply(ctx, config) {
     }
   }
 
+  // #46: after a login lands, eagerly refresh the live model catalog so the
+  // model picker shows the new provider within ~1 min instead of waiting.
+  let lastModelRefresh = 0
+  async function refreshModels() {
+    if (Date.now() - lastModelRefresh < 60 * 1000) return
+    lastModelRefresh = Date.now()
+    const providers = await store.loggedInProviders()
+    for (const provider of providers) {
+      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())
+        await getVendor(provider).listModels(fresh, cfg, fetch).catch(() => {})
+      } catch {}
+    }
+  }
+
   function sweepPending(now) {
     for (const [state, row] of pending) {
       if (now - row.createdAt > PENDING_TTL_MS) pending.delete(state)
@@ -255,6 +280,7 @@ export function apply(ctx, config) {
     await store.saveBlob(ref, blob)
     pending.delete(row.state)
     await syncAdapter()
+    refreshModels().catch(() => {})
     return { ref, label: blob.label || blob.email || displayName(provider) }
   }
 
@@ -798,6 +824,111 @@ export function apply(ctx, config) {
     },
   }), 'dsh-subscriptions: /import')
 
+  // #45: импорт существующего refresh token / API key без OAuth-флоу.
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-subscriptions/import-token',
+    handler: async (req, res) => {
+      if (req.method !== 'POST') {
+        writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
+        return
+      }
+      if (!isTrustedSettingsRequest(req)) {
+        writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
+        return
+      }
+      let payload
+      try { payload = JSON.parse((await readBody(req, 64 * 1024)).toString('utf8') || '{}') } catch {
+        writeJson(res, 400, { ok: false, error: { code: 'json', message: 'invalid json' } })
+        return
+      }
+      const provider = payload.provider
+      const index = Number(payload.index || '1')
+      const refreshToken = payload.refreshToken
+      const apiKey = payload.apiKey
+      if (!isProvider(provider)) {
+        writeJson(res, 400, { ok: false, error: { code: 'provider', message: 'unknown provider' } })
+        return
+      }
+      if (!refreshToken && !apiKey) {
+        writeJson(res, 400, { ok: false, error: { code: 'token', message: 'нужен refreshToken или apiKey' } })
+        return
+      }
+      try {
+        const ref = oauthRef(provider, index)
+        const blob = { accessToken: apiKey || refreshToken, refreshToken: refreshToken || apiKey }
+        if (apiKey) { blob.apiKey = apiKey; blob.apiKeyOnly = true }
+        await store.saveBlob(ref, blob)
+        await syncAdapter()
+        refreshModels().catch(() => {})
+        writeJson(res, 200, { ok: true, ref, accounts: await accountsView() })
+      } catch (e) {
+        writeJson(res, 400, { ok: false, error: { code: 'import', message: String(e && e.message || e) } })
+      }
+    },
+  }), 'dsh-subscriptions: /import-token')
+
+  // #50: сводная страница /subscriptions (localhost-only).
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/subscriptions',
+    handler: async (req, res) => {
+      if (req.method !== 'GET') {
+        writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
+        return
+      }
+      const host = (req.headers.host || '').split(':')[0]
+      if (host !== 'localhost' && host !== '127.0.0.1') {
+        writeHtml(res, 403, '<!doctype html><meta charset="utf-8"><p>Subscriptions overview is localhost-only.</p>')
+        return
+      }
+      let cfg, accounts
+      try {
+        const out = await configResponse()
+        cfg = out.config
+        accounts = out.accounts || []
+      } catch (e) {
+        writeHtml(res, 500, '<!doctype html><meta charset="utf-8"><p>Failed to load: ' + escapeHtml(String(e && e.message || e)) + '</p>')
+        return
+      }
+      const rows = accounts.map((a) => {
+        const pct = a.usagePercent != null ? a.usagePercent : (a.quota && a.quota.usedPercent) || null
+        const rem = a.quota && a.quota.remaining != null ? a.quota.remaining : null
+        const lim = a.quota && a.quota.limit != null ? a.quota.limit : null
+        const reset = a.quota && a.quota.resetAt ? new Date(a.quota.resetAt).toLocaleString() : ''
+        const status = a.validationUrl ? 'verify' : (a.cooldownUntil && a.cooldownUntil > Date.now() ? 'cooldown' : (a.configured ? 'ok' : 'none'))
+        return '<tr><td>' + escapeHtml(a.provider) + '</td><td>' + (a.index||1) + '</td>' +
+          '<td>' + esc(a.label || a.email || '') + '</td><td>' + status + '</td>' +
+          '<td>' + (pct != null ? Math.round(pct) + '%' : '—') + '</td>' +
+          '<td>' + (rem != null ? (rem + (lim != null ? '/' + lim : '')) : '—') + '</td>' +
+          '<td>' + esc(reset) + '</td><td>' + esc(a.refreshError || '') + '</td></div>'
+      })
+      const body = rows.length
+        ? '<div class="grid">' + rows.join('') + '</div>'
+        : '<p class="empty">No accounts connected yet.</p>'
+      const slots = cfg.slots || []
+      const connected = accounts.filter((a) => a.configured).length
+      writeHtml(res, 200, `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Subscriptions</title>
+<style>
+body{font-family:system-ui,sans-serif;margin:0;padding:24px;background:#0d1117;color:#e6edf3}
+h1{font-size:20px} .dim{color:#8b949e;font-size:13px}
+.stats{display:flex;gap:24px;margin:16px 0;font-size:13px}
+.grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));gap:12px}
+.card{border:1px solid #30363d;border-radius:10px;padding:14px;background:#161b22}
+.card b{display:block;margin-bottom:4px}
+.status{font-size:11px;padding:2px 8px;border-radius:999px;border:1px solid #30363d}
+.status.ok{color:#3fb950;border-color:#238636} .status.none{color:#8b949e}
+.status.cooldown{color:#d29922;border-color:#9e6a03} .status.verify{color:#d29922;border-color:#9e6a03}
+.meta{color:#8b949e;font-size:12px}
+</style></head><body>
+<h1>Subscriptions</h1>
+<div class="dim">/subscriptions — localhost only</div>
+<div class="stats"><span><b>${connected}</b> connected</span><span><b>${accounts.length}</b> accounts</span><span><b>${slots.length}</b> slots</span></div>
+${body}
+</body></html>`)
+    },
+  }), 'dsh-subscriptions: /subscriptions')
+
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/logout',
@@ -819,6 +950,7 @@ export function apply(ctx, config) {
         const ref = oauthRef(payload.provider, payload.index)
         await store.clearRef(ref)
         await syncAdapter()
+        refreshModels().catch(() => {})
         writeJson(res, 200, { ok: true, ref, accounts: await accountsView() })
       } catch (e) {
         writeJson(res, 400, { ok: false, error: { code: 'logout', message: String(e && e.message || e) } })

package/lib/refs.js

@@ -1,5 +1,4 @@
-// Встроенные провайдеры. Кастомные из Config добавляются динамически через
-// registerCustomProviderIds и попадают в тот же список.
+// Встроенные провайдеры + динамические из Config.customVendors.
 export const BUILTIN_PROVIDERS = Object.freeze([
   'codex',
   'claude',
@@ -7,49 +6,32 @@ export const BUILTIN_PROVIDERS = Object.freeze([
   'antigravity',
 ])
 
-const dynamic = new Set()
+const dynamicIds = new Set()
+const displayExtra = {}
+
+export let PROVIDERS = [...BUILTIN_PROVIDERS]
 
 export function registerCustomProviderIds(ids) {
+  let changed = false
   for (const id of ids || []) {
-    if (typeof id === 'string' && /^[a-z][a-z0-9_]*$/.test(id)) dynamic.add(id)
+    if (typeof id === 'string' && /^[a-z][a-z0-9_]*$/.test(id) && !dynamicIds.has(id)) {
+      dynamicIds.add(id)
+      changed = true
+    }
   }
+  if (changed) PROVIDERS = listProviders()
 }
 
 export function listProviders() {
-  return [...BUILTIN_PROVIDERS, ...dynamic]
+  return [...BUILTIN_PROVIDERS, ...dynamicIds]
 }
 
-// Обратно-совместимый доступ: массив читается на момент вызова.
-export const PROVIDERS = new Proxy([], {
-  get(_t, prop) {
-    if (prop === 'length') return listProviders().length
-    if (prop === Symbol.iterator) return listProviders()[Symbol.iterator]
-    const i = Number(prop)
-    return Number.isInteger(i) ? listProviders()[i] : undefined
-  },
-  has() { return true },
-})
-
-const DISPLAY_EXTRA = {}
-
 export function registerDisplayName(id, name) {
-  if (id && name) DISPLAY_EXTRA[id] = name
+  if (id && name) displayExtra[id] = name
 }
 
-const KNOWN_CACHE = new Map()
-
 export function isProvider(value) {
-  if (KNOWN_CACHE.has(value)) return KNOWN_CACHE.get(value)
-  let result
-  try {
-    const { isProvider: check } = require('./vendors/index.js')
-    result = Boolean(check(value))
-  } catch {
-    // require недоступен в этом контексте — используем списки
-    result = BUILTIN_PROVIDERS.includes(value) || dynamic.has(value)
-  }
-  KNOWN_CACHE.set(value, result)
-  return result
+  return BUILTIN_PROVIDERS.includes(value) || dynamicIds.has(value)
 }
 
 const DISPLAY = {
@@ -60,7 +42,7 @@ const DISPLAY = {
 }
 
 export function displayName(provider) {
-  return DISPLAY[provider] || DISPLAY_EXTRA[provider] || provider
+  return DISPLAY[provider] || displayExtra[provider] || provider
 }
 
 export function oauthRef(provider, index) {

package/lib/rotate.js

@@ -57,7 +57,13 @@ export function pickAccount(accounts, nowMs, opts) {
     if (!acc.quota) tiers[1].push(acc)
     else tiers[0].push(acc)
   }
-  for (const tier of tiers) if (tier.length) return tier[0]
+  // Внутри здоровых тиров предпочитаем аккаунт с более высоким health-счётом
+  for (const tier of tiers) {
+    if (tier.length) {
+      tier.sort((a, b) => (b.healthScore || 100) - (a.healthScore || 100))
+      return tier[0]
+    }
+  }
   if (fallback.length) return fallback[0]
   return null
 }

package/lib/vendors/index.js

@@ -2,12 +2,39 @@ import * as codex from './codex.js'
 import * as claude from './claude.js'
 import * as grok from './grok.js'
 import * as antigravity from './antigravity.js'
+import { createVendorFromProfile } from '../vendor-factory.js'
 
-export const vendors = {
-  codex,
-  claude,
-  grok,
-  antigravity,
+const builtins = { codex, claude, grok, antigravity }
+
+const customVendors = new Map()
+
+export function registerCustomVendor(vendor) {
+  if (!vendor || !vendor.id) throw new Error('custom vendor needs id')
+  customVendors.set(vendor.id, vendor)
+}
+
+export function clearCustomVendors() {
+  customVendors.clear()
+}
+
+const vendors = new Proxy({}, {
+  get(_t, prop) {
+    if (prop in builtins) return builtins[prop]
+    return customVendors.get(prop)
+  },
+  has(_t, prop) {
+    return prop in builtins || customVendors.has(prop)
+  },
+  ownKeys() {
+    return [...Reflect.ownKeys(builtins), ...customVendors.keys()]
+  },
+  getOwnPropertyDescriptor() {
+    return { enumerable: true, configurable: true }
+  },
+})
+
+export function isProvider(value) {
+  return Boolean(vendors[value])
 }
 
 export function getVendor(provider) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",