@goodandready/dsh-subscriptions 0.6.38 → 0.6.39

package/lib/accounts.js

@@ -1,3 +1,4 @@
+import { needsWarmupProbe, enterProbing, resolveWarmupSuccess, resolveWarmupFailure, STATUS_QUARANTINE, STATUS_PROBING } from "./quarantine.js"
 import { fetchWithTimeout } from "./http.js"
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
 import { oauthRef, isProvider } from './refs.js'
@@ -348,19 +349,51 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       quarantines.delete(ref)
       if (health.has(ref)) health.set(ref, null)
     },
-    rememberQuarantine(ref, reason, until) {
+    rememberQuarantine(ref, reason, until, attempts = 1) {
       if (!ref) return
-      quarantines.set(ref, { reason: reason || 'RATE_LIMIT', until: Number(until) || (Date.now() + 3600000) })
+      quarantines.set(ref, {
+        reason: reason || 'RATE_LIMIT',
+        until: Number(until) || (Date.now() + 3600000),
+        attempts: Number(attempts) || 1,
+        status: STATUS_QUARANTINE,
+      })
     },
-    getQuarantine(ref) {
+    getQuarantine(ref, now = Date.now()) {
       const q = quarantines.get(ref)
       if (!q) return null
-      if (Number(q.until) <= Date.now()) {
+      if (Number(q.until) <= now) {
+        if (q.status === STATUS_PROBING) return q
         quarantines.delete(ref)
         return null
       }
       return q
     },
+    async probeWarmup(ref, probeFn) {
+      const q = quarantines.get(ref)
+      if (!q) return { success: true }
+      const acc = { quarantineReason: q.reason, quarantineUntil: q.until, quarantineAttempts: q.attempts || 1, status: q.status }
+      if (!needsWarmupProbe(acc)) {
+        return { success: false, reason: 'NOT_EXPIRED' }
+      }
+      quarantines.set(ref, enterProbing(acc))
+      try {
+        if (typeof probeFn === 'function') {
+          await probeFn(ref)
+        }
+        resolveWarmupSuccess(acc)
+        quarantines.delete(ref)
+        return { success: true }
+      } catch (err) {
+        const updated = resolveWarmupFailure(acc, err?.message || q.reason)
+        quarantines.set(ref, {
+          reason: updated.quarantineReason,
+          until: updated.quarantineUntil,
+          attempts: updated.quarantineAttempts,
+          status: updated.status,
+        })
+        return { success: false, account: updated, error: err }
+      }
+    },
     releaseQuarantine(ref) {
       quarantines.delete(ref)
     },

package/lib/adapter-manager.js

@@ -21,6 +21,7 @@ export function createAdapterManager({
 }) {
   let handle
   let adapterDisposed = false
+  let retryTimer
   let registeredByUs = new Set()
 
   function disposeAdapterHandle(h) {
@@ -48,6 +49,11 @@ export function createAdapterManager({
     saveBlob: (ref, blob) => store.saveBlob(ref, blob),
     alertThresholds: () => live().alertThresholds,
     webhookUrl: () => live().webhookUrl,
+    rememberRequest: (ref) => store.rememberRequest(ref),
+    recordSuccess: (ref) => store.recordSuccess(ref),
+    recordSwitch: (ref) => store.recordSwitch(ref),
+    recordExhaust: (ref) => store.recordExhaust(ref),
+    recordBroken: (ref) => store.recordBroken(ref),
     recordHistory,
     fetchImpl: fetch,
     fetchForRef,
@@ -83,6 +89,7 @@ export function createAdapterManager({
   async function syncAdapter() {
     if (adapterDisposed) return
     const desired = await store.loggedInProviders()
+    if (adapterDisposed) return
     const globalProviders = ctx.llm && typeof ctx.llm.listProviders === 'function'
       ? ctx.llm.listProviders().map((p) => p.id)
       : []
@@ -95,6 +102,7 @@ export function createAdapterManager({
       logger.info(`[dsh-subscriptions] syncAdapter skipping already-bound providers: ${skipped.join(', ')}`)
     }
 
+    if (adapterDisposed) return
     if (!handle && claimable.length) {
       handle = ctx.llm.registerAdapter(claimable, adapter)
       registeredByUs = new Set(claimable)
@@ -239,7 +247,6 @@ export function createAdapterManager({
       })
 
       let retries = 0
-      let retryTimer
       const scheduleRetry = () => {
         if (adapterDisposed || retries >= 30) return
         retryTimer = setTimeout(retrySync, 1000)
@@ -303,5 +310,15 @@ export function createAdapterManager({
     refreshModels,
     cascadeFallbackStream,
     registerAdapterLifecycle,
+    dispose: () => {
+      adapterDisposed = true
+      adapter.dispose()
+      if (retryTimer) clearTimeout(retryTimer)
+      if (handle) {
+        disposeAdapterHandle(handle)
+        handle = undefined
+        registeredByUs.clear()
+      }
+    },
   }
 }

package/lib/adapter.js

@@ -32,6 +32,11 @@ export class SubscriptionAdapter extends LlmAdapter {
   constructor(deps) {
     super()
     this.deps = deps
+    this.disposed = false
+  }
+
+  dispose() {
+    this.disposed = true
   }
 
   providerInfo(provider) {
@@ -238,6 +243,11 @@ export class SubscriptionAdapter extends LlmAdapter {
               } catch { /* ignore quota capture failure */ }
             }
           } catch (err) {
+            if (err && (err.code === 'QUOTA' || err.code === 'QUOTA_EXCEEDED' || err.status === 429)) {
+              if (typeof deps.recordExhaust === 'function') deps.recordExhaust(account.ref)
+            } else if (err && (err.status === 401 || err.status === 403 || err.code === 'TOKEN_REVOKED' || err.code === 'BROKEN')) {
+              if (typeof deps.recordBroken === 'function') deps.recordBroken(account.ref)
+            }
             if (err && err.code === 'VALIDATION_REQUIRED' && err.validationUrl) {
               await deps.saveBlob(account.ref, {
                 ...blob,
@@ -275,7 +285,7 @@ export class SubscriptionAdapter extends LlmAdapter {
       }
       // #91: when the whole pool is exhausted and nothing has been streamed
       // yet, continue seamlessly on local Ollama instead of failing the chat.
-      if (!yieldedAny && typeof deps.ollamaFallback === 'function') {
+      if (!yieldedAny && !options.signal?.aborted && typeof deps.ollamaFallback === 'function') {
         yield* deps.ollamaFallback({ options, provider, err })
         return
       }

package/lib/cascade.js

@@ -9,6 +9,16 @@ export const DEFAULT_CASCADE_CHAINS = {
   copilot: ['cursor', 'codex'],
   cursor: ['copilot', 'claude'],
   antigravity: ['copilot', 'claude'],
+  kimi: ['qwen', 'glm', 'spark'],
+  glm: ['kimi', 'qwen', 'spark'],
+  qwen: ['kimi', 'glm', 'spark'],
+  spark: ['qwen', 'kimi', 'glm'],
+  jetbrains: ['copilot', 'cursor'],
+  perplexity: ['copilot', 'cursor'],
+  replit: ['copilot', 'cursor'],
+  cody: ['copilot', 'cursor'],
+  kiro: ['copilot', 'cursor'],
+  ernie: ['qwen', 'glm'],
 }
 
 /**

package/lib/rotate.js

@@ -1,3 +1,4 @@
+import { computePacingRisk, calculateBurnRatePerHour } from "./forecast.js"
 import { isQuarantined } from './quarantine.js'
 import { getPinnedAccountRef, pinSession } from './session-pin.js'
 
@@ -43,7 +44,7 @@ export function cooldownBlocks(acc, family) {
 export function pickAccount(accounts, nowMs, opts) {
   const list = Array.isArray(accounts) ? accounts : []
   const now = Number(nowMs) || 0
-  const thrRaw = opts && opts.switchAtRemaining != null ? Number(opts.switchAtRemaining) : 0
+  const thrRaw = opts && opts.switchAtRemaining != null ? Number(opts.switchAtRemaining) : 0.01
   const thr = Number.isFinite(thrRaw) ? thrRaw : 0
   const isVipRequest = Boolean(opts && opts.vip)
   const targetTag = opts && opts.tag
@@ -92,11 +93,20 @@ export function pickAccount(accounts, nowMs, opts) {
   // Tier 1: Quota unknown (null) & healthy
   // Tier 2: Cooldown, quarantine or exhausted
   const tiers = [[], [], []]
-  const fallback = []
 
   for (const acc of list) {
     if (!acc || !acc.hasToken) continue
 
+    if (!opts || opts.autoPacing !== false) {
+      if (acc.pacingRisk === undefined) {
+        const rem = acc.quota?.remainingPercent ?? (acc.usagePercent != null ? (100 - Number(acc.usagePercent)) : null)
+        const pace = acc.pacePerHour || (Array.isArray(acc.samples) ? calculateBurnRatePerHour(acc.samples, now) : 0)
+        const resetAt = acc.quota?.resetAt || 0
+        const riskInfo = computePacingRisk(rem, pace, resetAt, now)
+        acc.pacingRisk = riskInfo.pacingRisk
+      }
+    }
+
     // VIP Slot Reservation (#175)
     if (acc.vipOnly && !isVipRequest) continue
 
@@ -105,11 +115,16 @@ export function pickAccount(accounts, nowMs, opts) {
 
     const isCooldown = acc.cooldownUntil && Number(acc.cooldownUntil) > now && cooldownBlocks(acc, opts && opts.family)
     const inQuarantine = isQuarantined(acc, now)
-    const exhausted = isQuotaExhausted(acc) || isUsageExhausted(acc)
+    const isHardExhausted = (acc.quota && acc.quota.remaining != null && Number(acc.quota.remaining) <= 0 && acc.quota.resetAt && Number(acc.quota.resetAt) > now) ||
+                            (acc.usagePercent != null && Number(acc.usagePercent) >= 100 && (!acc.quota || !acc.quota.resetAt || Number(acc.quota.resetAt) > now))
+
+    if (isCooldown || inQuarantine || isHardExhausted) {
+      continue
+    }
 
-    if (isCooldown || inQuarantine || exhausted) {
+    const softExhausted = isQuotaExhausted(acc) || isUsageExhausted(acc)
+    if (softExhausted) {
       tiers[2].push(acc)
-      fallback.push(acc)
       continue
     }
 
@@ -140,7 +155,7 @@ export function pickAccount(accounts, nowMs, opts) {
         if (aWeight !== bWeight) return bWeight - aWeight
 
         // 3. Health Score
-        return (b.healthScore || 100) - (a.healthScore || 100)
+        return (b.healthScore ?? 100) - (a.healthScore ?? 100)
       })
 
       const chosen = tier[0]
@@ -151,7 +166,6 @@ export function pickAccount(accounts, nowMs, opts) {
     }
   }
 
-  if (fallback.length) return fallback[0]
   return null
 }
 

package/package.json

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