@goodandready/dsh-subscriptions 0.4.10 → 0.4.12

package/lib/client.js

@@ -667,19 +667,28 @@ function PluginCard(props) {
         const id = setInterval(pull, 60 * 1000)
         return () => clearInterval(id)
       }, [])
-      // #69: если есть активная подписка — показываем её (провайдер + план + usage%).
+      // #69/#72: если есть активная подписка — показываем её (провайдер + индекс + windows с процентами).
       if (state.active) {
         const a = state.active
-        const u = typeof a.usagePercent === 'number' ? a.usagePercent : null
+        const wins = Array.isArray(a.windows) ? a.windows : []
+        // макс-процент среди окон для цвета полоски
+        let maxPct = -1
+        for (const w of wins) {
+          if (w && typeof w.usedPercent === 'number' && w.usedPercent > maxPct) maxPct = w.usedPercent
+        }
+        if (maxPct < 0 && typeof a.usagePercent === 'number') maxPct = a.usagePercent
+        const u = maxPct >= 0 ? maxPct : null
         let acls = 'dsub-chipActive'
         if (u != null) acls += u >= 100 ? ' dsub-chipActiveDanger' : (u >= 80 ? ' dsub-chipActiveDanger' : (u >= 50 ? ' dsub-chipActiveWarn' : ' dsub-chipActiveOk'))
         const prov = t('provider' + a.provider.charAt(0).toUpperCase() + a.provider.slice(1)) || a.provider
-        const plan = a.plan || ''
-        const label = plan ? (prov + ' ' + plan) : prov
-        const pctText = u == null ? '' : Math.round(u) + '%'
+        const idx = a.index != null ? (' #' + a.index) : ''
+        const plan = a.plan ? (' ' + a.plan) : ''
+        const label = prov + idx + plan
+        // windows: "5h 12%  7d 8%"
+        const winLabels = wins.map((w) => (w.label || w.id) + ' ' + Math.round(w.usedPercent) + '%').join('  ')
         return React.createElement('span', {
           className: acls,
-          title: a.model ? (prov + ' · ' + a.model) : prov,
+          title: a.model ? (prov + idx + ' · ' + a.model) : (prov + idx),
         },
           React.createElement('span', { className: 'dsub-chipDot' }),
           label,
@@ -687,7 +696,7 @@ function PluginCard(props) {
             ? React.createElement('span', { className: 'dsub-chipActiveBar' },
                 React.createElement('span', { className: 'dsub-chipActiveFill', style: { width: Math.min(100, Math.max(0, u)) + '%' } }))
             : null,
-          pctText ? React.createElement('span', null, pctText) : null,
+          winLabels || null,
         )
       }
       const on = state.count > 0

package/lib/index.js

@@ -535,7 +535,7 @@ export function apply(ctx, config) {
           }
         } catch {}
       }
-      // #69: активная подписка = последний успешный запрос (новые сверху).
+      // #69/#72: активная подписка = последний успешный запрос (новые сверху).
       let active = null
       const last = history.recent(1)
       if (last.length) {
@@ -543,18 +543,27 @@ export function apply(ctx, config) {
         const accts = await store.listAccounts(lastRow.provider)
         const acct = accts.find((a) => a.ref === lastRow.ref) || accts[0]
         let plan = ''
+        let index = acct && acct.ref ? Number(String(acct.ref).split('_').pop()) || null : null
         let status = 'ok'
+        let windows = []
         try {
           const info = await store.describeRef(lastRow.ref)
           plan = info.paidTierName || ''
           if (info.validationUrl) status = 'verify'
           else if (info.cooldownUntil && info.cooldownUntil > Date.now()) status = 'cooldown'
+          if (Array.isArray(info.usage)) {
+            windows = info.usage
+              .filter((w) => w && typeof w.usedPercent === 'number')
+              .map((w) => ({ id: w.id || w.en || w.ru, label: w.en || w.ru || w.id, usedPercent: w.usedPercent }))
+          }
         } catch {}
         active = {
           provider: lastRow.provider,
+          index,
           model: lastRow.model || null,
           path: lastRow.path || null,
           plan,
+          windows,
           usagePercent: usage[lastRow.provider] != null ? usage[lastRow.provider] : null,
           status,
           at: lastRow.ts,

package/lib/usage.js

@@ -58,13 +58,14 @@ const WINDOW_LABELS = {
   weekly_limit_7_days: { ru: "7д", en: "7d" },
   primary: { ru: "осн.", en: "primary" },
   secondary: { ru: "втор.", en: "secondary" },
-  primary_window: { ru: "осн.", en: "primary" },
-  secondary_window: { ru: "втор.", en: "secondary" },
+  // codex: vendor API отдаёт primary_window/secondary_window — для UI читаем как 5h/7d
+  primary_window: { ru: "5ч", en: "5h" },
+  secondary_window: { ru: "7д", en: "7d" },
   monthly: { ru: "месяц", en: "month" },
   credits: { ru: "кредиты", en: "credits" },
 }
 
-function windowLabel(id) {
+export function windowLabel(id) {
   const known = WINDOW_LABELS[id]
   return known || { ru: id, en: id }
 }

package/package.json

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