@goodandready/dsh-subscriptions 0.6.52 → 0.6.54

package/lib/adapter-manager.js

@@ -42,6 +42,8 @@ export function createAdapterManager({
     vendorConfig: (provider) => vendorConfig(provider, live()),
     cooldownMs: () => live().cooldownMs,
     autoPacing: () => live().autoPacing,
+    drainBeforeReset: () => live().drainBeforeReset,
+    drainSafetyPercent: () => live().drainSafetyPercent,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
     rememberQuarantine: (ref, reason, until, attempts) => store.rememberQuarantine(ref, reason, until, attempts),

package/lib/adapter.js

@@ -121,7 +121,18 @@ export class SubscriptionAdapter extends LlmAdapter {
       const effectiveAutoPacing = options.autoPacing !== undefined
         ? options.autoPacing
         : (typeof deps.autoPacing === 'function' ? deps.autoPacing() : (deps.autoPacing ?? true))
-      const streamOptions = { ...options, autoPacing: effectiveAutoPacing }
+      const effectiveDrainBeforeReset = options.drainBeforeReset !== undefined
+        ? options.drainBeforeReset
+        : (typeof deps.drainBeforeReset === 'function' ? deps.drainBeforeReset() : (deps.drainBeforeReset ?? false))
+      const effectiveDrainSafetyPercent = options.drainSafetyPercent !== undefined
+        ? options.drainSafetyPercent
+        : (typeof deps.drainSafetyPercent === 'function' ? deps.drainSafetyPercent() : (deps.drainSafetyPercent ?? 5))
+      const streamOptions = {
+        ...options,
+        autoPacing: effectiveAutoPacing,
+        drainBeforeReset: effectiveDrainBeforeReset,
+        drainSafetyPercent: effectiveDrainSafetyPercent,
+      }
       for await (const event of streamWithRotation({
         accounts: await deps.listAccounts(provider),
         nowMs: () => Date.now(),

package/lib/client.js

@@ -2362,14 +2362,41 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       return { label: (p.charAt(0).toUpperCase() || 'P'), cls: 'dsub-brandCodex', icon: '●' }
     }
 
-    const PLUGIN_LABELS = new Set(['plugins', 'плагины', '插件', 'plugin'])
-    function matchesPluginLabel(el) {
+    const PLUGIN_LABELS = new Set(['plugins', '插件', 'plugin'])
+
+    function resolvePluginLabels(customCtx) {
+      const labels = new Set(PLUGIN_LABELS)
+      const loc = (customCtx && customCtx.locale) || (typeof window !== 'undefined' && window.__dshCtx && window.__dshCtx.locale)
+      if (loc && typeof loc.bind === 'function') {
+        try {
+          const sp = loc.bind('settings.plugins')
+          const nav = typeof sp === 'function' ? sp('nav') : null
+          if (nav && typeof nav === 'string') labels.add(nav.trim().toLowerCase())
+        } catch { /* bestEffort */ }
+        try {
+          const pm = loc.bind('pluginManager')
+          const panel = typeof pm === 'function' ? (pm('panel') || pm('title')) : null
+          if (panel && typeof panel === 'string') labels.add(panel.trim().toLowerCase())
+        } catch { /* bestEffort */ }
+      }
+      return labels
+    }
+
+    function matchesPluginLabel(el, customLabels) {
       if (!el) return false
+      const dataTab = (el.getAttribute('data-tab') || '').trim().toLowerCase()
+      const dataSection = (el.getAttribute('data-section') || '').trim().toLowerCase()
+      const dataKey = (el.getAttribute('data-key') || '').trim().toLowerCase()
+      const id = (el.getAttribute('id') || '').trim().toLowerCase()
+      if (dataTab === 'plugins' || dataSection === 'plugins' || dataKey === 'plugins' || id === 'plugins') return true
+
+      if (el.querySelector && el.querySelector('path[d*="M10.3232"]')) return true
+
       const txt = (el.textContent || '').trim().toLowerCase()
       const aria = (el.getAttribute('aria-label') || '').trim().toLowerCase()
       const title = (el.getAttribute('title') || '').trim().toLowerCase()
-      const dataTab = (el.getAttribute('data-tab') || '').trim().toLowerCase()
-      return PLUGIN_LABELS.has(txt) || PLUGIN_LABELS.has(aria) || PLUGIN_LABELS.has(title) || PLUGIN_LABELS.has(dataTab)
+      const labels = customLabels || PLUGIN_LABELS
+      return labels.has(txt) || labels.has(aria) || labels.has(title) || labels.has(dataTab)
     }
 
     function findAndClickCard(doc) {
@@ -2387,12 +2414,15 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       return false
     }
 
-    function openPluginSettings(doc = document, schedule = (run, ms) => window.setTimeout(run, ms)) {
+    function openPluginSettings(doc = document, schedule = (run, ms) => window.setTimeout(run, ms), navCtx) {
       try {
         if (findAndClickCard(doc)) return
 
+        const activeLabels = resolvePluginLabels(navCtx)
+        const checkEl = (el) => matchesPluginLabel(el, activeLabels)
+
         const buttons = [...doc.querySelectorAll('button, a, div[role="button"], div[role="tab"]')]
-        const panel = buttons.find(matchesPluginLabel)
+        const panel = buttons.find(checkEl)
         if (panel) {
           panel.click()
           const poll = (left) => {
@@ -2410,7 +2440,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             trigger.click()
             const pollSection = (left) => {
               try {
-                const section = [...doc.querySelectorAll('button, a, div[role="tab"], [role="button"]')].find(matchesPluginLabel)
+                const section = [...doc.querySelectorAll('button, a, div[role="tab"], [role="button"]')].find(checkEl)
                 if (section && typeof section.click === 'function') {
                   section.click()
                   const poll = (cLeft) => {
@@ -2420,13 +2450,13 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   schedule(() => poll(40), 100)
                   return
                 }
-              } catch {}
+              } catch { /* bestEffort */ }
               if (left > 0) schedule(() => pollSection(left - 1), 80)
             }
             schedule(() => pollSection(20), 80)
           }
         }
-      } catch {}
+      } catch { /* bestEffort */ }
     }
     function SubsPill(props) {
       const t = (props && props.t) || ((k) => k)
@@ -2645,16 +2675,16 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                     if (nav && typeof nav.openBundle === 'function') {
                       nav.openBundle(PKG)
                     }
-                  } catch {}
+                  } catch { /* bestEffort */ }
 
                   try {
                     const layout = (clientCtx && clientCtx.layout) || (window.__dshCtx && window.__dshCtx.layout)
                     if (layout && typeof layout.selectPanel === 'function') {
                       layout.selectPanel('plugins')
                     }
-                  } catch {}
+                  } catch { /* bestEffort */ }
 
-                  openPluginSettings(document)
+                  openPluginSettings(document, undefined, clientCtx)
                 },
               }, t('subsOpenSettings')),
             ),
@@ -2758,6 +2788,9 @@ const cssId = 'dsh-subscriptions/settings.module.css'
 
     exports.inject = ['slots', 'locale', 'sessions']
     exports.apply = function apply(ctx) {
+      if (typeof window !== 'undefined') {
+        window.__dshCtx = ctx
+      }
       setT(ctx.locale.bind(NS))
       try {
         ctx.inject(['pluginNavigation'], (navCtx) => {

package/lib/config-schema.js

@@ -94,6 +94,10 @@ export const Config = z.object({
     .description('#351 Quota usage percentage thresholds for firing alerts.'),
   autoPacing: z.boolean().volatile().default(true)
     .description('#352 Predictive burn-rate load balancing between accounts.'),
+  drainBeforeReset: z.boolean().volatile().default(false)
+    .description('#485 Prioritize accounts with closest reset window to burn expiring quota first.'),
+  drainSafetyPercent: z.number().volatile().default(5)
+    .description('#485 Safety margin percent: avoid draining accounts below this threshold when alternatives exist.'),
   customVendors: z.array(z.any()).volatile().default([])
     .description('Declarative OpenAI-Responses-compatible providers. See README.'),
 })

package/lib/forecast.js

@@ -125,3 +125,19 @@ export function computePacingRisk(remainingPercent, pacePerHour, resetsAt, now =
     pacingRisk: hoursUntilExhaustion < 1 ? 50 : 0,
   }
 }
+
+// #485: Smart Quota Drainer urgency calculation
+export function calculateBurnUrgency(remainingPercent, resetAt, nowMs = Date.now(), safetyFloor = 5) {
+  const rem = Number(remainingPercent)
+  if (!Number.isFinite(rem) || rem <= 0) return 0
+  const floor = Number(safetyFloor) || 0
+  if (rem <= floor) return 0
+
+  const reset = Number(resetAt)
+  if (!Number.isFinite(reset) || reset <= nowMs) return 0
+
+  const hoursUntilReset = (reset - nowMs) / HOUR_MS
+  // Denominator clamped to minimum 0.05 hours (3 mins) to avoid infinity
+  const clampedHours = Math.max(hoursUntilReset, 0.05)
+  return rem / clampedHours
+}

package/lib/http.js

@@ -157,13 +157,13 @@ export function isTrustedSettingsRequest(request, targetCtx) {
       try {
         const u = new URL(origin)
         if (u.host.toLowerCase() === host.toLowerCase()) return true
-      } catch {}
+      } catch { /* bestEffort */ }
     }
     if (referer && host) {
       try {
         const u = new URL(referer)
         if (u.host.toLowerCase() === host.toLowerCase()) return true
-      } catch {}
+      } catch { /* bestEffort */ }
     }
   }
 

package/lib/index.js

@@ -142,7 +142,7 @@ export function apply(ctx, rawConfig) {
         syncCustomVendors()
       } catch (err) {
         cachedConfig = prevConfig
-        try { syncCustomVendors() } catch {}
+        try { syncCustomVendors() } catch { /* bestEffort */ }
         throw err
       }
       return parsed
@@ -314,6 +314,8 @@ export function apply(ctx, rawConfig) {
     ensureFresh: (provider, blob, ref) => store.ensureFresh(provider, blob, ref),
     vendorConfig: (provider) => vendorConfig(provider, live()),
     cooldownMs: () => live().cooldownMs,
+    drainBeforeReset: () => live().drainBeforeReset,
+    drainSafetyPercent: () => live().drainSafetyPercent,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
     rememberQuarantine: (ref, reason, until, attempts) => store.rememberQuarantine(ref, reason, until, attempts),
@@ -348,7 +350,11 @@ export function apply(ctx, rawConfig) {
         throw new Error(`unknown subscription provider: ${provider}`)
       }
       const accounts = await store.listAccounts(provider)
-      const eligible = pickAccount(accounts || [], Date.now(), { family: provider === 'codex' ? 'gpt' : 'grok' })
+      const eligible = pickAccount(accounts || [], Date.now(), {
+        family: provider === 'codex' ? 'gpt' : 'grok',
+        drainBeforeReset: live().drainBeforeReset,
+        drainSafetyPercent: live().drainSafetyPercent,
+      })
       const slot = eligible || (accounts || []).find((row) => row && row.ref && row.hasToken)
       if (!slot) throw new Error(`not logged in to ${provider}: sign in in the Subscriptions section`)
       const raw = await store.resolveRaw(slot.ref)

package/lib/rotate.js

@@ -1,4 +1,4 @@
-import { computePacingRisk, calculateBurnRatePerHour } from "./forecast.js"
+import { computePacingRisk, calculateBurnRatePerHour, calculateBurnUrgency } from "./forecast.js"
 import { isQuarantined } from './quarantine.js'
 import { getPinnedAccountRef, pinSession } from './session-pin.js'
 
@@ -41,6 +41,28 @@ export function cooldownBlocks(acc, family) {
   return fams.includes(family)
 }
 
+
+export function getAccountRemainingPercent(acc) {
+  if (!acc) return null
+  if (acc.quota?.remainingPercent != null) {
+    const val = Number(acc.quota.remainingPercent)
+    return Number.isFinite(val) ? val : null
+  }
+  if (acc.quota?.usedPercent != null) {
+    const val = 100 - Number(acc.quota.usedPercent)
+    return Number.isFinite(val) ? val : null
+  }
+  if (acc.usagePercent != null) {
+    const val = 100 - Number(acc.usagePercent)
+    return Number.isFinite(val) ? val : null
+  }
+  if (acc.quota?.remaining != null && acc.quota?.limit != null && Number(acc.quota.limit) > 0) {
+    const val = (Number(acc.quota.remaining) / Number(acc.quota.limit)) * 100
+    return Number.isFinite(val) ? val : null
+  }
+  return null
+}
+
 export function pickAccount(accounts, nowMs, opts) {
   const list = Array.isArray(accounts) ? accounts : []
   const now = Number(nowMs) || 0
@@ -111,6 +133,15 @@ export function pickAccount(accounts, nowMs, opts) {
       }
     }
 
+    if (opts && opts.drainBeforeReset) {
+      if (acc.burnUrgency === undefined) {
+        const rem = getAccountRemainingPercent(acc)
+        const resetAt = acc.quota?.resetAt || 0
+        const safetyFloor = opts.drainSafetyPercent != null ? Number(opts.drainSafetyPercent) : 5
+        acc.burnUrgency = calculateBurnUrgency(rem, resetAt, now, safetyFloor)
+      }
+    }
+
     // VIP Slot Reservation (#175)
     if (acc.vipOnly && !isVipRequest) continue
 
@@ -142,6 +173,15 @@ export function pickAccount(accounts, nowMs, opts) {
   for (const tier of tiers) {
     if (tier.length) {
       tier.sort((a, b) => {
+        // #485: Smart Quota Drainer - prioritize higher burn urgency first
+        if (opts && opts.drainBeforeReset) {
+          const aUrg = Number(a.burnUrgency) || 0
+          const bUrg = Number(b.burnUrgency) || 0
+          if (Math.abs(aUrg - bUrg) > 0.01) {
+            return bUrg - aUrg
+          }
+        }
+
         // 0. Auto-Pacing: lower pacing risk preferred (#352)
         const aRisk = Number(a.pacingRisk) || 0
         const bRisk = Number(b.pacingRisk) || 0

package/lib/stream-rotate.js

@@ -28,6 +28,8 @@ export async function* streamWithRotation({
       tag: options && options.tag,
       vip: options && options.vip,
       autoPacing: options && (options.autoPacing !== undefined ? options.autoPacing : (options.config && options.config.autoPacing)),
+      drainBeforeReset: options && (options.drainBeforeReset !== undefined ? options.drainBeforeReset : (options.config && options.config.drainBeforeReset)),
+      drainSafetyPercent: options && (options.drainSafetyPercent !== undefined ? options.drainSafetyPercent : (options.config && options.config.drainSafetyPercent)),
     })
 
     if (!account || tried.has(account.ref || account.id)) {

package/lib/subscriptions.js

@@ -108,7 +108,12 @@ export function createSubscriptionsService(deps) {
       const tried = new Set()
       let lastError = null
       while (true) {
-        const account = pickAccount(pool, Date.now(), { switchAtRemaining: thr, family: modelFamily(provider, body && body.model) })
+        const account = pickAccount(pool, Date.now(), {
+          switchAtRemaining: thr,
+          family: modelFamily(provider, body && body.model),
+          drainBeforeReset: typeof deps.drainBeforeReset === 'function' ? deps.drainBeforeReset() : deps.drainBeforeReset,
+          drainSafetyPercent: typeof deps.drainSafetyPercent === 'function' ? deps.drainSafetyPercent() : deps.drainSafetyPercent,
+        })
         if (!account) {
           if (lastError) throw lastError
           const err = new Error("no usable subscription account for this provider")

package/package.json

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