@goodandready/dsh-subscriptions 0.5.22 → 0.5.25

package/lib/accounts.js

@@ -1,6 +1,8 @@
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { oauthRef, isProvider } from './refs.js'
 import { parseBlob, serializeBlob } from './blob.js'
+import { recordSwitch, recordExhaust, recordBroken } from './health.js'
+import { executeWithRetry } from './backoff.js'
 import { getVendor } from './vendors/index.js'
 
 const SKEW_MS = 60 * 1000
@@ -54,6 +56,8 @@ export function vendorConfig(provider, cfg) {
 export function createAccountStore({ credentials, getConfig, fetchImpl, fetchForRef, onLimitNotice }) {
   const cooldowns = new Map()
   const quotas = new Map()
+  const quarantines = new Map()
+  const writeQueues = new Map()
   const refreshLocks = new Map()
   const refreshFailures = new Map()
   const usage = new Map()
@@ -86,13 +90,20 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
   }
 
   async function saveBlob(ref, blob) {
-    await credentials.set(credentialRef(ref), serializeBlob(blob))
+    const prev = writeQueues.get(ref) || Promise.resolve()
+    const next = prev.catch(() => {}).then(async () => {
+      await credentials.set(credentialRef(ref), serializeBlob(blob))
+    })
+    writeQueues.set(ref, next)
+    await next
   }
 
   async function clearRef(ref) {
     await credentials.unset(credentialRef(ref))
     cooldowns.delete(ref)
     quotas.delete(ref)
+    quarantines.delete(ref)
+    writeQueues.delete(ref)
     for (const k of [...notifyThresholds.keys()]) { if (k.startsWith(ref + ':')) notifyThresholds.delete(k) }
     for (const k of [...notifyThresholds.keys()]) { if (k.startsWith(ref + ':')) notifyThresholds.delete(k) }
     refreshFailures.delete(ref)
@@ -128,6 +139,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     return {
       ...base,
       cooldownUntil: cooldowns.get(ref) ? cooldowns.get(ref).until : 0,
+      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,
       quota: quotas.get(ref) || null,
       usage: windows.get(ref) || base.usage || null,
@@ -144,14 +157,20 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
   async function listAccounts(provider) {
     const slots = normalizeSlots(getConfig().slots).filter((s) => s.provider === provider)
     const out = []
+    const now = Date.now()
     for (const slot of slots) {
       const info = await describeRef(slot.ref)
+      const q = quarantines.get(slot.ref)
+      const inQ = q && Number(q.until) > now
       out.push({
         ref: slot.ref,
         hasToken: !!info.configured,
         usagePercent: info.usagePercent,
         cooldownUntil: info.cooldownUntil,
+        cooldownFamilies: info.cooldownFamilies || null,
         quota: info.quota || null,
+        quarantineUntil: inQ ? q.until : 0,
+        quarantineReason: inQ ? q.reason : null,
         label: slot.label || info.label,
       })
     }
@@ -174,7 +193,19 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     const promise = (async () => {
       try {
         const cfg = vendorConfig(provider, getConfig())
-        const next = await getVendor(provider).refresh(cfg, blob, fetchFor(ref))
+        const next = await executeWithRetry(
+          () => getVendor(provider).refresh(cfg, blob, fetchFor(ref)),
+          {
+            maxRetries: 2,
+            initialDelayMs: 300,
+            maxDelayMs: 2000,
+            isRetryable: (err) => {
+              const status = Number(err && (err.status || err.statusCode) || 0)
+              if (status === 400 || status === 401 || status === 403) return false
+              return true
+            },
+          }
+        )
         const merged = {
           ...blob,
           ...next,
@@ -297,8 +328,25 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     recordSuccess(ref) {
       // успешный запрос сбрасывает кулдаун и возвращает аккаунт в строй
       cooldowns.delete(ref)
+      quarantines.delete(ref)
       if (health.has(ref)) health.set(ref, null)
     },
+    rememberQuarantine(ref, reason, until) {
+      if (!ref) return
+      quarantines.set(ref, { reason: reason || 'RATE_LIMIT', until: Number(until) || (Date.now() + 3600000) })
+    },
+    getQuarantine(ref) {
+      const q = quarantines.get(ref)
+      if (!q) return null
+      if (Number(q.until) <= Date.now()) {
+        quarantines.delete(ref)
+        return null
+      }
+      return q
+    },
+    releaseQuarantine(ref) {
+      quarantines.delete(ref)
+    },
     rememberRequest(ref) { requestCounts.set(ref, (requestCounts.get(ref) || 0) + 1) },
     getRequestCount(ref) { return requestCounts.get(ref) || 0 },
   }

package/lib/adapter.js

@@ -4,6 +4,7 @@ import { getVendor } from './vendors/index.js'
 import { modelCatalog } from './messages.js'
 import { streamWithRotation } from './stream-rotate.js'
 import { pickFetch } from './proxy.js'
+import { quotaSnapshot, parseBody } from './ratelimit.js'
 
 // #94: heuristic for test/preview/beta/legacy model ids.
 function isDeprecatedId(id) {
@@ -109,6 +110,7 @@ export class SubscriptionAdapter extends LlmAdapter {
           if (typeof deps.recordSwitch === 'function') deps.recordSwitch(account.ref)
         },
         streamOnce: async function* (account, opts) {
+          const t0 = Date.now()
           const blob = await deps.ensureFresh(provider, await deps.loadBlob(account.ref), account.ref)
           const vendor = getVendor(provider)
           // ponytail: capture x-ratelimit headers without touching vendors

package/lib/client.js

@@ -78,6 +78,24 @@ window.__ModuleLoader__.load({
     '.dsub-barLabelRow{display:flex;justify-content:space-between;font-size:11.5px;color:var(--dsw-alias-label-secondary);margin-bottom:3px}' +
     '.dsub-barTrack{height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden}' +
     '.dsub-barFillGrad{height:100%;border-radius:3px;transition:width .3s ease}' +
+    '.dsub-panel-box{margin-top:10px;padding:12px 14px;border-radius:10px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);display:flex;flex-direction:column;gap:8px}' +
+    '.dsub-panel-warn{border-color:rgba(245,158,11,0.4);background:rgba(245,158,11,0.05)}' +
+    '.dsub-panel-title{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between}' +
+    '.dsub-panel-desc{font-size:12px;color:var(--dsw-alias-label-secondary);line-height:1.4}' +
+    '.dsub-usage-grid{display:flex;flex-direction:column;gap:8px;margin-top:4px}' +
+    '.dsub-usage-card{display:flex;flex-direction:column;gap:5px;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-1)}' +
+    '.dsub-usage-head{display:flex;justify-content:space-between;align-items:center;font-size:12px;font-weight:500;color:var(--dsw-alias-label-primary)}' +
+    '.dsub-usage-track{width:100%;height:8px;border-radius:999px;background:var(--dsw-alias-bg-layer-3);border:1px solid var(--dsw-alias-border-l2);overflow:hidden}' +
+    '.dsub-usage-fill{height:100%;border-radius:999px;transition:width .3s ease}' +
+    '.dsub-usage-meta{display:flex;justify-content:space-between;align-items:center;font-size:11px;color:var(--dsw-alias-label-secondary)}' +
+    '.dsub-tag-ok{border-color:rgba(16,185,129,0.3);color:var(--dsw-alias-state-success-primary);background:rgba(16,185,129,0.08);padding:1px 7px;border-radius:999px;font-size:11px;font-weight:600;border-style:solid;border-width:1px}' +
+    '.dsub-tag-warn{border-color:rgba(245,158,11,0.4);color:var(--dsw-alias-state-warning-primary);background:rgba(245,158,11,0.08);padding:1px 7px;border-radius:999px;font-size:11px;font-weight:600;border-style:solid;border-width:1px}' +
+    '.dsub-tag-bad{border-color:rgba(239,68,68,0.4);color:var(--dsw-alias-state-error-primary);background:rgba(239,68,68,0.08);padding:1px 7px;border-radius:999px;font-size:11px;font-weight:600;border-style:solid;border-width:1px}' +
+    '.dsub-slot-meta-row{display:flex;flex-wrap:wrap;align-items:center;gap:10px;margin-top:12px;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l2);font-size:12px}' +
+    '.dsub-ref-tag{display:inline-flex;align-items:center;gap:5px;font-size:11.5px;color:var(--dsw-alias-label-secondary)}' +
+    '.dsub-ref-tag code{padding:2px 6px;border-radius:4px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);font-family:ui-monospace,monospace;color:var(--dsw-alias-label-primary);font-size:11px}' +
+    '.dsub-btn-danger{border-color:rgba(239,68,68,0.4)!important;color:var(--dsw-alias-state-error-primary)!important}' +
+    '.dsub-btn-danger:hover:not(:disabled){background:rgba(239,68,68,0.12)!important}' +
     '.dsub-poolTitle{margin-top:16px;margin-bottom:8px;font-size:11.5px;font-weight:700;color:var(--dsw-alias-label-secondary);text-transform:uppercase;letter-spacing:.05em}' +
     '.dsub-accountCard{display:flex;align-items:center;gap:12px;padding:10px 14px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-2);margin-top:6px;transition:border-color .15s,background .15s}' +
     '.dsub-accountCard:hover{background:var(--dsw-alias-bg-layer-3);border-color:var(--dsw-alias-label-tertiary)}' +
@@ -261,7 +279,10 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'privacyMask': 'Mask emails and account identifiers',
       'privacyMaskHint': 'For demos and screen sharing: emails show as j***n@example.com.',
       'resetCredits': 'Reset credits',
-      'resetCreditsHint': 'ChatGPT reset cards: shows how many are available. Consuming one is a deliberate action with a 5s confirmation.',
+      'resetCreditsHint': 'ChatGPT reset cards: emergency reset for the 5-hour window. Requires a 5s confirmation.',
+      'resetCreditsAction': 'Reset ChatGPT Limit',
+      'usageLimitsTitle': 'Usage Limits',
+      'slotDetailsTitle': 'Slot Details',
       'resetAvailable': 'Reset attempts available',
       'resetExpires': 'earliest expires',
       'resetAck': 'I understand one attempt will be consumed',
@@ -335,6 +356,24 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'slashStatus': 'Subscription status',
       'none': 'none',
       'forecast': '≈',
+      'resetCredits': 'Сброс лимитов ChatGPT',
+      'resetCreditsHint': 'Экстренный сброс 5-часового окна ChatGPT Plus/Pro. Требует 5 секунд подтверждения перед списанием.',
+      'resetCreditsAction': 'Сбросить лимит ChatGPT',
+      'resetAvailable': 'Доступно сбросов',
+      'resetExpires': 'срок действия',
+      'resetAck': 'Я понимаю, что одна попытка сброса будет списана',
+      'resetWait': 'подтверждение через',
+      'resetReady': 'готово к сбросу',
+      'resetGo': 'Сбросить лимит сейчас',
+      'resetBusy': 'Сброс…',
+      'resetDone': 'Лимит успешно сброшен',
+      'resetNothing': 'Лимит не требует сброса',
+      'resetNoCredit': 'Нет доступных попыток сброса',
+      'resetRedeemed': 'Попытка уже использована',
+      'windowPrimary': 'Окно 5 часов',
+      'windowSecondary': 'Окно 7 дней',
+      'usageLimitsTitle': 'Лимиты использования',
+      'slotDetailsTitle': 'Параметры слота',
       'resetLabel': 'reset',
       'check': 'Check',
       'checking': 'Checking…',
@@ -457,6 +496,24 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'slashStatus': 'Статус подписок',
       'none': 'нет',
       'forecast': '≈',
+      'resetCredits': 'Сброс лимитов ChatGPT',
+      'resetCreditsHint': 'Экстренный сброс 5-часового окна ChatGPT Plus/Pro. Требует 5 секунд подтверждения перед списанием.',
+      'resetCreditsAction': 'Сбросить лимит ChatGPT',
+      'resetAvailable': 'Доступно сбросов',
+      'resetExpires': 'срок действия',
+      'resetAck': 'Я понимаю, что одна попытка сброса будет списана',
+      'resetWait': 'подтверждение через',
+      'resetReady': 'готово к сбросу',
+      'resetGo': 'Сбросить лимит сейчас',
+      'resetBusy': 'Сброс…',
+      'resetDone': 'Лимит успешно сброшен',
+      'resetNothing': 'Лимит не требует сброса',
+      'resetNoCredit': 'Нет доступных попыток сброса',
+      'resetRedeemed': 'Попытка уже использована',
+      'windowPrimary': 'Окно 5 часов',
+      'windowSecondary': 'Окно 7 дней',
+      'usageLimitsTitle': 'Лимиты использования',
+      'slotDetailsTitle': 'Параметры слота',
     }
 
     // #51: live countdown to the quota window reset (account.quota.resetAt).
@@ -1082,39 +1139,54 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                     return code
                   }
                   if (st.phase !== 'confirm') {
-                    return React.createElement('div', { className: 'dsub-row' },
-                      React.createElement('button', {
-                        type: 'button', className: 'dsub-mini',
-                        onClick: () => resetPrepare(row.slot.provider, row.slot.index, key).catch((e) => setErr(String(e && e.message || e))),
-                      }, st.phase === 'loading' ? '\u2026' : t('resetCredits')),
-                      React.createElement('div', { className: 'dsub-sub' }, t('resetCreditsHint')),
+                    return React.createElement('div', { className: 'dsub-panel-box' },
+                      React.createElement('div', { className: 'dsub-panel-title' },
+                        React.createElement('span', null, '⚡ ' + t('resetCredits')),
+                        React.createElement('button', {
+                          type: 'button',
+                          className: 'dsub-mini',
+                          disabled: st.phase === 'loading',
+                          onClick: () => resetPrepare(row.slot.provider, row.slot.index, key).catch((e) => setErr(String(e && e.message || e))),
+                        }, st.phase === 'loading' ? '…' : t('resetCreditsAction'))
+                      ),
+                      React.createElement('div', { className: 'dsub-panel-desc' }, t('resetCreditsHint'))
                     )
                   }
                   var ready = now >= st.readyAt
                   var secs = Math.max(0, Math.ceil((st.readyAt - now) / 1000))
-                  return React.createElement('div', { className: 'dsub-verify' },
-                    React.createElement('div', null,
-                      t('resetAvailable') + ': ' + st.availableCount +
-                      (st.creditExpiresAt ? (' · ' + t('resetExpires') + ' ' + new Date(st.creditExpiresAt).toLocaleString()) : '')
+                  return React.createElement('div', { className: 'dsub-panel-box dsub-panel-warn' },
+                    React.createElement('div', { className: 'dsub-panel-title' },
+                      React.createElement('span', null, '⚠️ ' + t('resetCredits')),
+                      React.createElement('span', { className: 'dsub-tag-ok' }, t('resetAvailable') + ': ' + st.availableCount)
                     ),
-                    React.createElement('label', { className: 'dsub-row' },
+                    st.creditExpiresAt ? React.createElement('div', { className: 'dsub-panel-desc' },
+                      t('resetExpires') + ': ' + new Date(st.creditExpiresAt).toLocaleString()
+                    ) : null,
+                    React.createElement('label', { className: 'dsub-row', style: { cursor: 'pointer', margin: '4px 0' } },
                       React.createElement('input', {
                         type: 'checkbox',
                         checked: !!st.ack,
                         onChange: (e) => setReset((m) => Object.assign({}, m, { [key]: Object.assign({}, st, { ack: e.target.checked }) })),
                       }),
-                      React.createElement('span', null, t('resetAck')),
+                      React.createElement('span', { style: { fontSize: '12px', fontWeight: 500 } }, t('resetAck')),
                     ),
-                    React.createElement('div', { className: 'dsub-row' },
+                    React.createElement('div', { className: 'dsub-row', style: { gap: '8px' } },
                       React.createElement('button', {
-                        type: 'button', className: 'dsub-mini',
+                        type: 'button',
+                        className: 'dsub-mini dsub-btn-danger',
                         disabled: !st.ack || !ready || !!st.busy,
                         onClick: () => resetConsume(key).catch((e) => setErr(String(e && e.message || e))),
                       }, st.busy ? t('resetBusy') : (ready ? t('resetGo') : (t('resetWait') + ' ' + secs + 's'))),
                       !ready && !st.busy ? React.createElement('span', { className: 'dsub-sub' }, t('resetWait') + ' ' + secs + 's') : null,
-                      st.ack && ready ? React.createElement('span', { className: 'dsub-ok' }, t('resetReady')) : null,
+                      st.ack && ready ? React.createElement('span', { className: 'dsub-ok', style: { fontSize: '12px', fontWeight: 600 } }, '✓ ' + t('resetReady')) : null,
+                      React.createElement('button', {
+                        type: 'button',
+                        className: 'dsub-mini',
+                        style: { marginLeft: 'auto' },
+                        onClick: () => setReset((m) => Object.assign({}, m, { [key]: { phase: 'idle' } })),
+                      }, t('cancel'))
                     ),
-                    st.result ? React.createElement('div', { className: 'dsub-ok' }, resultText(st.result)) : null,
+                    st.result ? React.createElement('div', { className: 'dsub-ok', style: { fontWeight: 600 } }, resultText(st.result)) : null,
                     st.error ? React.createElement('div', { className: 'dsub-bad' }, st.error) : null,
                   )
                 })() : null),
@@ -1126,56 +1198,89 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   React.createElement('a', { href: account.validationUrl, target: '_blank', rel: 'noopener noreferrer' }, t('verifyLink')),
                   t('verifySuffix'),
                 ) : null,
-(function(){
-                  var parts=[]
-                  var wins=account.usage
-                  function bar(label,pct){
-                    var cls='dsub-bar'+(pct>=100?' dsub-barFull':(pct>=70?' dsub-barWarn':''))
-                    return React.createElement('div',{className:'dsub-barRow',key:label},
-                      React.createElement('span',null,label),
-                      React.createElement('div',{className:cls},
-                        React.createElement('div',{className:'dsub-barFill',style:{width:Math.min(100,Math.max(0,pct))+'%'}})
+                (function usageLimitsBlock(){
+                  var wins = account.usage
+                  var q = account.quota
+                  var hasWins = Array.isArray(wins) && wins.length > 0
+                  var hasQuota = q && q.usedPercent != null
+                  var hasUsagePct = !hasWins && !hasQuota && account.usagePercent != null
+
+                  if (!hasWins && !hasQuota && !hasUsagePct) return null
+
+                  function windowLabel(w){
+                    var id = String((w && w.id) || '')
+                    var given = w && (w.ru || w.en)
+                    if (given && given !== id) return given
+                    if (id === 'primary_window') return t('windowPrimary')
+                    if (id === 'secondary_window') return t('windowSecondary')
+                    if (!id) return t('quota')
+                    return id.replace(/_/g, ' ')
+                  }
+
+                  function renderItem(label, pct, detail){
+                    var p = Math.min(100, Math.max(0, Math.round(pct)))
+                    var tagCls = p >= 90 ? 'dsub-tag-bad' : (p >= 70 ? 'dsub-tag-warn' : 'dsub-tag-ok')
+                    var fillBg = p >= 90 ? 'var(--dsw-alias-state-error-primary)' : (p >= 70 ? 'var(--dsw-alias-state-warning-primary)' : 'var(--dsw-alias-state-success-primary)')
+                    return React.createElement('div', { key: label, className: 'dsub-usage-card' },
+                      React.createElement('div', { className: 'dsub-usage-head' },
+                        React.createElement('span', null, label),
+                        React.createElement('span', { className: tagCls }, p + '%')
                       ),
-                      React.createElement('span',null,Math.round(pct)+'%'),
+                      React.createElement('div', { className: 'dsub-usage-track' },
+                        React.createElement('div', {
+                          className: 'dsub-usage-fill',
+                          style: { width: p + '%', background: fillBg }
+                        })
+                      ),
+                      detail ? React.createElement('div', { className: 'dsub-usage-meta' }, detail) : null
                     )
                   }
-                  // Имя окна приходит от провайдера внутренним: primary_window.
-                  // Известные переводим, незнакомое хотя бы причёсываем, чтобы
-                  // в карточке не оставалось подчёркиваний из чужого протокола.
-                  function windowLabel(w){
-                    var id=String((w&&w.id)||'')
-                    var given=w&&(w.ru||w.en)
-                    if(given&&given!==id)return given
-                    if(id==='primary_window')return t('windowPrimary')
-                    if(id==='secondary_window')return t('windowSecondary')
-                    if(!id)return t('quota')
-                    return id.replace(/_/g,' ')
-                  }
-                  if(Array.isArray(wins)&&wins.length){
-                    wins.forEach(function(w){
-                      if(w&&w.usedPercent!=null)parts.push(bar(windowLabel(w),w.usedPercent))
+
+                  var items = []
+                  if (hasWins) {
+                    wins.forEach(function(w, idx){
+                      if (w && w.usedPercent != null) {
+                        var extra = null
+                        if (idx === 0 && account.requests && w.usedPercent < 100) {
+                          var rem = 100 - w.usedPercent
+                          var est = Math.floor(rem / (w.usedPercent / account.requests))
+                          if (est > 0) extra = React.createElement('span', null, t('forecast') + ' ' + est)
+                        }
+                        items.push(renderItem(windowLabel(w), w.usedPercent, extra))
+                      }
                     })
                   }
-                  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'))}
-                  if(Array.isArray(wins)&&wins.length&&account.requests){
-                    var w0=wins[0]
-                    if(w0&&w0.usedPercent!=null&&w0.usedPercent<100){
-                      var remaining=100-w0.usedPercent
-                      var est=Math.floor(remaining/(w0.usedPercent/account.requests))
-                      if(est>0)parts.push(React.createElement('span',{className:'dsub-sub',key:'fc'},t('forecast')+' '+est+' ('+windowLabel(w0)+')'))
-                    }
+                  if (hasQuota) {
+                    items.push(renderItem(t('quota'), q.usedPercent, q.resetAt ? React.createElement(ResetCountdown, { key: 'reset', resetAt: q.resetAt }) : null))
+                  } else if (hasUsagePct) {
+                    items.push(renderItem(t('quota'), account.usagePercent, null))
+                  }
+
+                  var at = (q && q.measuredAt) || (account.usageAt || 0)
+                  var agoStr = null
+                  if (at) {
+                    var m = Math.round((Date.now() - at) / 60000)
+                    if (m >= 1) agoStr = m + 'm ' + (t('lang') === 'ru' || t('refresh') === 'Обновить' ? 'назад' : 'ago')
                   }
-                  if(!parts.length)return null
-                  return React.createElement('div',{className:'dsub-block'},parts)
-                })(),
 
-                                account.paidTierName ? React.createElement('span', { className: 'dsub-sub' }, t('plan') + ': ' + account.paidTierName) : null,
-                account.ref ? React.createElement('span', { className: 'dsub-sub' }, t('storedAs') + ' ' + account.ref) : null,
+                  return React.createElement('div', { className: 'dsub-panel-box' },
+                    React.createElement('div', { className: 'dsub-panel-title' },
+                      React.createElement('span', null, '📊 ' + t('usageLimitsTitle')),
+                      agoStr ? React.createElement('span', { className: 'dsub-sub' }, agoStr) : null
+                    ),
+                    React.createElement('div', { className: 'dsub-usage-grid' }, items)
+                  )
+                })(),
+                (account.paidTierName || account.ref ? React.createElement('div', { className: 'dsub-slot-meta-row' },
+                  account.paidTierName ? React.createElement('span', { className: 'dsub-sub' },
+                    React.createElement('strong', null, t('plan') + ': '),
+                    account.paidTierName
+                  ) : null,
+                  account.ref ? React.createElement('span', { className: 'dsub-ref-tag' },
+                    React.createElement('span', null, t('storedAs')),
+                    React.createElement('code', null, account.ref)
+                  ) : null
+                ) : null),
               )
             }),
             React.createElement('button', {
@@ -1260,20 +1365,26 @@ const cssId = 'dsh-subscriptions/settings.module.css'
         ))
       } catch { moved = false }
       if (moved) return
-      // Запасной путь для сборок без settings.plugin.item: прежний раздел,
-      // чтобы настройки не пропали.
-      ctx.slots.inject('settings.section', () => ctx.slots.register(
-        {
-          name: 'settings.section',
-          id: '@goodandready/dsh-subscriptions',
-          order: 28,
-          // locale в записи слота — то, из-за чего компонент получает props.t.
-          locale: NS,
-          label: () => t('title'),
-          inject: () => ({ ctx: ctx }),
-        },
-        SubsSection,
-      ))
+      // #244: Fallback for harness cores before settings.plugin.item slot was
+      // introduced (< 0.1.2-rc.1). Once all production profiles run a core
+      // that has settings.plugin.item, this block can be safely removed.
+      // Tracked in Gitea #244 — do not remove without verifying minimum core.
+      try {
+        ctx.slots.inject('settings.section', () => ctx.slots.register(
+          {
+            name: 'settings.section',
+            id: '@goodandready/dsh-subscriptions',
+            order: 28,
+            locale: NS,
+            label: () => t('title'),
+            inject: () => ({ ctx: ctx }),
+          },
+          SubsSection,
+        ))
+      } catch (e) {
+        // Neither slot system available — settings panel will not render.
+        // This is expected on headless / non-web profiles.
+      }
     }
 
     // Горячий переключатель провайдера в строке композера: клик циклично

package/lib/code-assist.js

@@ -128,11 +128,13 @@ export async function discoverProject(fetchImpl, token, metadata, extraHeaders)
   }
   const projectId = projectFrom(op) || account.projectId
   const after = accountFromLoad(op && op.response ? op.response : load)
+  const notice = noticeFromLoadCodeAssist(op && op.response ? op.response : load)
   return {
     projectId,
     tierId: after.paidTierId || tierId,
     paidTierId: after.paidTierId,
     paidTierName: after.paidTierName,
+    accountNotice: notice ? notice.message : '',
   }
 }
 
@@ -231,6 +233,7 @@ export async function inspectGoogleAccount(fetchImpl, token, { metadata, extraHe
     return {
       validation: null,
       notice,
+      accountNotice: notice ? notice.message : '',
       projectId: resolvedProject,
       paidTierId: account.paidTierId,
       paidTierName: account.paidTierName,

package/lib/google-validation.js

@@ -115,3 +115,13 @@ export function googleRateLimitMessage(status, bodyText) {
   }
   return ''
 }
+
+export function googleLicenseMessage(status, bodyText) {
+  if (status !== 403) return ''
+  const api = parseGoogleApiError(bodyText)
+  const msg = String(api?.message || bodyText || '')
+  if (/do not have a valid license|#3501|PERMISSION_DENIED/i.test(msg)) {
+    return 'У аккаунта Google нет активной лицензии Gemini Code Assist / Antigravity (#3501), либо не привязан проект Google Cloud. Проверьте подписку на https://one.google.com или подключите другой Google аккаунт.'
+  }
+  return ''
+}

package/lib/http.js

@@ -42,3 +42,25 @@ export function queryOf(req) {
     return new URLSearchParams()
   }
 }
+
+/**
+ * Fetch with connect/overall timeout using AbortSignal.any.
+ */
+export async function fetchWithTimeout(fetchImpl, url, init = {}, { timeoutMs = 30000 } = {}) {
+  const impl = fetchImpl || fetch
+  if (!timeoutMs || timeoutMs <= 0) return impl(url, init)
+  const controller = new AbortController()
+  const timer = setTimeout(() => {
+    controller.abort(new DOMException('The operation was aborted due to timeout', 'TimeoutError'))
+  }, timeoutMs)
+
+  const signal = init.signal
+    ? AbortSignal.any([init.signal, controller.signal])
+    : controller.signal
+
+  try {
+    return await impl(url, { ...init, signal })
+  } finally {
+    clearTimeout(timer)
+  }
+}

package/lib/index.js

@@ -22,13 +22,14 @@ import { createResetCreditService } from './reset-credits.js'
 import { maskEmail, maskLabel, maskText } from './mask.js'
 import { proxyFetch, pickFetch } from './proxy.js'
 import { HistoryStore } from './history.js'
+import { ProactiveTokenRefreshDaemon } from './proactive-refresh.js'
 import {
   inspectGoogleAccount,
   antigravityMetadata,
   antigravityIdentityHeaders,
 } from './code-assist.js'
 
-export const name = 'dsh-subscriptions'
+export const name = '@goodandready/dsh-subscriptions'
 export const inject = ['llm', 'credentials', 'webServer', 'settings']
 
 const NS = 'dsh-subscriptions'
@@ -109,6 +110,11 @@ export const Config = z.object({
 
 function publicConfig(cfg) {
   const clone = structuredClone(cfg)
+  // #242: redact all *ClientSecret fields before exposing config via GET /config.
+  // Secrets must never leave the server; the UI does not need them.
+  for (const key of Object.keys(clone)) {
+    if (key.endsWith('ClientSecret')) clone[key] = clone[key] ? '••••••' : ''
+  }
   return clone
 }
 
@@ -183,6 +189,43 @@ export function apply(ctx, config) {
   const history = new HistoryStore()
   const recordHistory = (entry) => history.add(entry)
 
+  // Proactive token refresh daemon: runs periodically and refreshes tokens nearing expiration
+  const refreshDaemon = new ProactiveTokenRefreshDaemon({
+    refreshLeadMs: 15 * 60 * 1000,
+    checkIntervalMs: 60 * 1000,
+  })
+  refreshDaemon.start(
+    async () => {
+      const slots = normalizeSlots(live().slots)
+      const accounts = []
+      for (const slot of slots) {
+        try {
+          const raw = await store.resolveRaw(slot.ref)
+          if (!raw) continue
+          const blob = parseBlob(raw)
+          if (blob && blob.refreshToken && blob.expiresAt) {
+            accounts.push({
+              ref: slot.ref,
+              provider: slot.provider,
+              refreshToken: blob.refreshToken,
+              expiresAt: blob.expiresAt,
+              blob,
+            })
+          }
+        } catch {}
+      }
+      return accounts
+    },
+    async (acc) => {
+      try {
+        await store.ensureFresh(acc.provider, acc.blob, acc.ref)
+      } catch (e) {
+        try { ctx.log && ctx.log.warn && ctx.log.warn('[dsh-subscriptions] proactive refresh failed for ' + acc.ref + ': ' + String(e && e.message || e)) } catch {}
+      }
+    }
+  )
+  ctx.effect(() => () => refreshDaemon.stop(), 'dsh-subscriptions: proactive token refresh daemon')
+
   // #85: host-only reset credit service for Codex accounts.
   const resetCredits = createResetCreditService({ loadBlob: (ref) => store.loadBlob(ref) })
   function refForSlot(provider, index) {
@@ -236,6 +279,7 @@ export function apply(ctx, config) {
     cooldownMs: () => live().cooldownMs,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
+    rememberQuarantine: (ref, reason, until) => store.rememberQuarantine(ref, reason, until),
     recordSuccess: (ref) => store.recordSuccess(ref),
     getHealth: (ref) => store.getHealth(ref),
     recordSwitch: (ref) => store.recordSwitch(ref),
@@ -301,6 +345,7 @@ export function apply(ctx, config) {
     cooldownMs: () => live().cooldownMs,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
+    rememberQuarantine: (ref, reason, until) => store.rememberQuarantine(ref, reason, until),
     rememberQuota: (ref, snap) => store.rememberQuota(ref, snap),
     getQuota: (ref) => store.getQuota(ref),
     refreshUsage: (provider) => store.refreshUsage(provider),

package/lib/rotate.js

@@ -5,6 +5,7 @@ const SWITCH_CODES = new Set([
   'RATE_LIMIT',
   'QUOTA',
   'QUOTA_EXCEEDED',
+  'LICENSE_REQUIRED',
 ])
 
 export function isSwitchableError(err) {
@@ -12,7 +13,7 @@ export function isSwitchableError(err) {
   const code = err.code || (err.failure && err.failure.code)
   if (SWITCH_CODES.has(code)) return true
   const status = err.status || err.statusCode
-  return status === 429 || status === 500 || status === 502 || status === 503
+  return status === 401 || status === 403 || status === 429 || status === 500 || status === 502 || status === 503
 }
 
 export function modelFamily(provider, model) {

package/lib/sse.js

@@ -1,4 +1,4 @@
-export async function* iterateSse(body) {
+export async function* iterateSse(body, { idleTimeoutMs = 60000 } = {}) {
   const reader = body && typeof body.getReader === 'function' ? body.getReader() : null
   const decoder = new TextDecoder()
   let buffer = ''
@@ -18,9 +18,27 @@ export async function* iterateSse(body) {
       yield data
     }
   }
+
+  async function readWithTimeout(r) {
+    if (!idleTimeoutMs || idleTimeoutMs <= 0) return r.read()
+    let timer
+    const timeoutPromise = new Promise((_, reject) => {
+      timer = setTimeout(() => {
+        const err = new Error(`stream idle timeout: no data received for ${Math.round(idleTimeoutMs / 1000)}s`)
+        err.code = 'TIMEOUT'
+        reject(err)
+      }, idleTimeoutMs)
+    })
+    try {
+      return await Promise.race([r.read(), timeoutPromise])
+    } finally {
+      clearTimeout(timer)
+    }
+  }
+
   if (reader) {
     while (true) {
-      const { done, value } = await reader.read()
+      const { done, value } = await readWithTimeout(reader)
       if (done) break
       yield* fromText(decoder.decode(value, { stream: true }))
     }

package/lib/stream-rotate.js

@@ -1,5 +1,5 @@
 import { pickAccount, markCooldown, isSwitchableError, modelFamily } from './rotate.js'
-import { putInQuarantine, REASON_RATE_LIMIT } from './quarantine.js'
+import { putInQuarantine, REASON_RATE_LIMIT, REASON_HARD_LIMIT, REASON_REVOKED } from './quarantine.js'
 
 export async function* streamWithRotation({
   accounts,
@@ -38,9 +38,8 @@ export async function* streamWithRotation({
 
     tried.add(account.ref || account.id)
 
+    let firstChunkDelivered = false
     try {
-      // In-flight seamless failover (#166): stream generator execution
-      let firstChunkDelivered = false
       for await (const chunk of streamOnce(account, options)) {
         firstChunkDelivered = true
         yield chunk
@@ -48,6 +47,9 @@ export async function* streamWithRotation({
       return
     } catch (err) {
       lastError = err
+      // If chunks were already yielded to the caller, never rotate mid-stream
+      // as that would repeat or scramble generated tokens.
+      if (firstChunkDelivered) throw err
       if (!isSwitchableError(err)) throw err
 
       // Move slot to cooldown and quarantine (#172)
@@ -55,7 +57,15 @@ export async function* streamWithRotation({
       account.cooldownUntil = cooled.cooldownUntil
       if (cooled.cooldownFamilies) account.cooldownFamilies = cooled.cooldownFamilies
 
-      const quarantined = putInQuarantine(account, REASON_RATE_LIMIT, nowMs())
+      const status = Number(err && (err.status || err.statusCode) || 0)
+      const code = String(err && err.code || '')
+      const reason = (status === 401 || code === 'AUTH' || code === 'TOKEN_REVOKED')
+        ? REASON_REVOKED
+        : (status === 403 || code === 'HARD_LIMIT' || code === 'LICENSE_REQUIRED')
+          ? REASON_HARD_LIMIT
+          : REASON_RATE_LIMIT
+
+      const quarantined = putInQuarantine(account, reason, nowMs())
       account.quarantineUntil = quarantined.quarantineUntil
       account.quarantineReason = quarantined.quarantineReason
 

package/lib/vendors/antigravity.js

@@ -84,6 +84,7 @@ async function withProject(blob, fetchImpl, saveBlob) {
       projectId: found.projectId || blob.projectId || '',
       paidTierId: found.paidTierId || blob.paidTierId || '',
       paidTierName: found.paidTierName || blob.paidTierName || '',
+      accountNotice: found.accountNotice || blob.accountNotice || '',
       sessionId: blob.sessionId || randomUUID(),
     }
     if (saveBlob) await saveBlob(next)

package/lib/vendors/cursor.js

@@ -11,6 +11,13 @@ export const CURSOR_AGENT_URL = 'https://agentn.us.api5.cursor.sh/agent.v1.Agent
 export const CURSOR_CLIENT_VERSION = 'cli-2026.05.01-eea359f'
 
 export const CURSOR_MODELS = [
+  {
+    id: 'composer-2.5',
+    name: 'Composer 2.5 Fast',
+    contextWindow: 200000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+  },
   {
     id: 'composer-2',
     name: 'Composer 2',
@@ -27,24 +34,89 @@ export const CURSOR_MODELS = [
     inputModalities: ['text', 'image'],
   },
   {
-    id: 'claude-sonnet-5',
-    name: 'Claude Sonnet 5 (Cursor)',
+    id: 'claude-3.7-sonnet',
+    name: 'Claude 3.7 Sonnet (Cursor)',
     contextWindow: 200000,
     maxTokens: 64000,
     inputModalities: ['text', 'image'],
   },
   {
-    id: 'gpt-5.5',
-    name: 'GPT-5.5 (Cursor)',
+    id: 'claude-3.7-sonnet-thinking',
+    name: 'Claude 3.7 Sonnet Thinking (Cursor)',
     contextWindow: 200000,
-    maxTokens: 128000,
-    inputModalities: ['text'],
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+    reasoning: { efforts: [{ id: 'low', name: 'Low' }, { id: 'medium', name: 'Medium' }, { id: 'high', name: 'High' }, { id: 'max', name: 'Max' }] },
   },
   {
-    id: 'grok-4.5',
-    name: 'Grok 4.5 (Cursor)',
+    id: 'claude-3.5-sonnet',
+    name: 'Claude 3.5 Sonnet (Cursor)',
     contextWindow: 200000,
     maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'claude-3.5-haiku',
+    name: 'Claude 3.5 Haiku (Cursor)',
+    contextWindow: 200000,
+    maxTokens: 8192,
+    inputModalities: ['text'],
+  },
+  {
+    id: 'gpt-4o',
+    name: 'GPT-4o (Cursor)',
+    contextWindow: 128000,
+    maxTokens: 16384,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'gpt-4o-mini',
+    name: 'GPT-4o Mini (Cursor)',
+    contextWindow: 128000,
+    maxTokens: 16384,
+    inputModalities: ['text'],
+  },
+  {
+    id: 'o3-mini',
+    name: 'o3-mini (Cursor)',
+    contextWindow: 200000,
+    maxTokens: 100000,
+    inputModalities: ['text'],
+    reasoning: { efforts: [{ id: 'low', name: 'Low' }, { id: 'medium', name: 'Medium' }, { id: 'high', name: 'High' }] },
+  },
+  {
+    id: 'o1',
+    name: 'o1 (Cursor)',
+    contextWindow: 200000,
+    maxTokens: 100000,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'deepseek-r1',
+    name: 'DeepSeek R1 (Cursor)',
+    contextWindow: 64000,
+    maxTokens: 8192,
+    inputModalities: ['text'],
+  },
+  {
+    id: 'deepseek-v3',
+    name: 'DeepSeek V3 (Cursor)',
+    contextWindow: 64000,
+    maxTokens: 8192,
+    inputModalities: ['text'],
+  },
+  {
+    id: 'gemini-2.0-flash',
+    name: 'Gemini 2.0 Flash (Cursor)',
+    contextWindow: 1000000,
+    maxTokens: 8192,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'cursor-small',
+    name: 'Cursor Small',
+    contextWindow: 32000,
+    maxTokens: 4096,
     inputModalities: ['text'],
   },
 ]

package/lib/wire.js

@@ -1,5 +1,5 @@
 import { iterateSse, jsonSse } from './sse.js'
-import { validationFromHttpError, validationRequiredError, googleRateLimitMessage } from './google-validation.js'
+import { validationFromHttpError, validationRequiredError, googleRateLimitMessage, googleLicenseMessage } from './google-validation.js'
 
 export function httpError(status, bodyText, code) {
   const snippet = String(bodyText || '').slice(0, 400)
@@ -21,6 +21,12 @@ export function httpError(status, bodyText, code) {
 export function throwHttpError(status, bodyText) {
   const validation = validationFromHttpError(status, bodyText)
   if (validation) throw validationRequiredError(validation)
+  const license = googleLicenseMessage(status, bodyText)
+  if (license) {
+    const err = httpError(status, bodyText, 'LICENSE_REQUIRED')
+    err.message = `${license} (${err.message})`
+    throw err
+  }
   const hint = googleRateLimitMessage(status, bodyText)
   if (hint) {
     const err = httpError(status, bodyText, status === 429 ? 'RATE_LIMIT' : undefined)
@@ -181,12 +187,14 @@ export async function* googleStream(body) {
   yield { type: 'finish', reason: { kind: 'stop' } }
 }
 
-export async function formTokenRequest(url, params, fetchImpl, headers) {
+export async function formTokenRequest(url, params, fetchImpl, headers, { timeoutMs = 25000 } = {}) {
   const impl = fetchImpl || fetch
+  const timeoutSignal = AbortSignal.timeout(timeoutMs)
   const res = await impl(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded', Accept: 'application/json', ...(headers || {}) },
     body: new URLSearchParams(params),
+    signal: timeoutSignal,
   })
   return readJson(res)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.5.22",
+  "version": "0.5.25",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -35,7 +35,7 @@
     "url": "https://github.com/GooDAnDReaDY/dsh-subscriptions/issues"
   },
   "scripts": {
-    "test": "node --test test/*.test.mjs"
+    "test": "eslint lib/ && node --test test/*.test.mjs"
   },
   "dsh": {
     "bundle": {