@goodandready/dsh-subscriptions 0.6.40 → 0.6.41

package/lib/accounts.js

@@ -260,59 +260,84 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     return promise
   }
 
+  const providerUsageLocks = new Map()
+  const slotUsageLocks = new Map()
+
   async function refreshUsage(provider) {
-    const curConfig = getConfig()
-    const cfg = vendorConfig(provider, curConfig)
-    const vendor = getVendor(provider)
-    const slots = normalizeSlots(curConfig.slots).filter((s) => s.provider === provider)
-    for (const slot of slots) {
-      const last = usageFetched.get(slot.ref) || 0
-      if (Date.now() - last < USAGE_TTL_MS) continue
-      let raw = ''
-      try { raw = await resolveRaw(slot.ref) } catch { continue }
-      if (!raw) continue
-      try {
-        const blob = await ensureFresh(provider, parseBlob(raw), slot.ref)
-        const snap = await vendor.usage(blob, cfg, fetchFor(slot.ref))
-        usageFetched.set(slot.ref, Date.now())
-        if (!snap) continue
-        if (Number.isFinite(Number(snap.usedPercent))) {
-          usage.set(slot.ref, Number(snap.usedPercent))
+    if (providerUsageLocks.has(provider)) {
+      return providerUsageLocks.get(provider)
+    }
+    const flight = (async () => {
+      const curConfig = getConfig()
+      const cfg = vendorConfig(provider, curConfig)
+      const vendor = getVendor(provider)
+      const slots = normalizeSlots(curConfig.slots).filter((s) => s.provider === provider)
+      for (const slot of slots) {
+        if (slotUsageLocks.has(slot.ref)) {
+          await slotUsageLocks.get(slot.ref).catch(() => {})
+          continue
         }
-        // Notification thresholds: 70/90/100% — fire once per window until reset.
-        if (Array.isArray(snap.windows)) {
-          for (const win of snap.windows) {
-            if (!win || !Number.isFinite(Number(win.usedPercent))) continue
-            const pct = Number(win.usedPercent)
-            const key = slot.ref + ':' + win.id
-            const prev = notifyThresholds.get(key) || 0
-            const THRESHOLDS = [70, 90, 100]
-            for (const th of THRESHOLDS) {
-              if (pct >= th && prev < th) {
-                notifyThresholds.set(key, th)
-                try { onLimitNotice && onLimitNotice(slot.provider, slot.ref, win, th) } catch { /* ignore notification failure */ }
-                break
+        const last = usageFetched.get(slot.ref) || 0
+        if (Date.now() - last < USAGE_TTL_MS) continue
+        let raw = ''
+        try { raw = await resolveRaw(slot.ref) } catch { continue }
+        if (!raw) continue
+
+        const slotFlight = (async () => {
+          try {
+            usageFetched.set(slot.ref, Date.now())
+            const blob = await ensureFresh(provider, parseBlob(raw), slot.ref)
+            const snap = await vendor.usage(blob, cfg, fetchFor(slot.ref))
+            if (!snap) return
+            if (Number.isFinite(Number(snap.usedPercent))) {
+              usage.set(slot.ref, Number(snap.usedPercent))
+            }
+            // Notification thresholds: 70/90/100% — fire once per window until reset.
+            if (Array.isArray(snap.windows)) {
+              for (const win of snap.windows) {
+                if (!win || !Number.isFinite(Number(win.usedPercent))) continue
+                const pct = Number(win.usedPercent)
+                const key = slot.ref + ':' + win.id
+                const prev = notifyThresholds.get(key) || 0
+                const THRESHOLDS = [70, 90, 100]
+                for (const th of THRESHOLDS) {
+                  if (pct >= th && prev < th) {
+                    notifyThresholds.set(key, th)
+                    try { onLimitNotice && onLimitNotice(slot.provider, slot.ref, win, th) } catch { /* ignore notification failure */ }
+                    break
+                  }
+                }
               }
             }
-          }
-        }
-        const list = Array.isArray(snap.windows) ? snap.windows : null
-        if (list) {
-          windows.set(slot.ref, list)
-          // persist last known windows so the card survives restarts
-          try {
-            const prev = Array.isArray(blob.usage) ? JSON.stringify(blob.usage) : ''
-            if (prev !== JSON.stringify(list)) {
-              await saveBlob(slot.ref, { ...blob, usage: list, usageAt: Date.now() })
-            } else if (!blob.usageAt) {
-              await saveBlob(slot.ref, { ...blob, usageAt: Date.now() })
+            const list = Array.isArray(snap.windows) ? snap.windows : null
+            if (list) {
+              windows.set(slot.ref, list)
+              // persist last known windows so the card survives restarts
+              try {
+                const prev = Array.isArray(blob.usage) ? JSON.stringify(blob.usage) : ''
+                if (prev !== JSON.stringify(list)) {
+                  await saveBlob(slot.ref, { ...blob, usage: list, usageAt: Date.now() })
+                } else if (!blob.usageAt) {
+                  await saveBlob(slot.ref, { ...blob, usageAt: Date.now() })
+                }
+              } catch { /* persistence best-effort */ }
             }
-          } catch { /* persistence best-effort */ }
-        }
-      } catch {
-        usageFetched.set(slot.ref, Date.now())
+          } catch {
+            usageFetched.set(slot.ref, Date.now())
+          } finally {
+            slotUsageLocks.delete(slot.ref)
+          }
+        })()
+
+        slotUsageLocks.set(slot.ref, slotFlight)
+        await slotFlight.catch(() => {})
       }
-    }
+    })().finally(() => {
+      providerUsageLocks.delete(provider)
+    })
+
+    providerUsageLocks.set(provider, flight)
+    return flight
   }
 
   return {

package/lib/adapter-manager.js

@@ -281,8 +281,9 @@ export function createAdapterManager({
       // #75: eager usage refresh at startup so the windows (5h/7d) land in the blob immediately
       const eager = async () => {
         try {
-          for (const slot of normalizeSlots(live().slots)) {
-            store.refreshUsage(slot.provider).catch((err) => {
+          const uniqueProviders = new Set(normalizeSlots(live().slots).map((s) => s.provider).filter(Boolean))
+          for (const provider of uniqueProviders) {
+            store.refreshUsage(provider).catch((err) => {
               if (logger && logger.debug) logger.debug('[dsh-subscriptions] eager usage error: ' + (err && err.message || err))
             })
           }

package/lib/adapter.js

@@ -73,7 +73,7 @@ export class SubscriptionAdapter extends LlmAdapter {
       models = models.filter((m) => !isDeprecatedId(String((m && m.id) || '')))
     }
     // Defensive: ensure every model has the provider field set
-    models = models.map((m) => (m && !m.provider ? { ...m, provider } : m))
+    models = models.map((m) => (m ? { ...m, provider: (!m.provider || m.provider === "custom") ? provider : m.provider } : m))
     return models
   }
 
@@ -136,7 +136,66 @@ export class SubscriptionAdapter extends LlmAdapter {
           let cacheReadTokens = 0
           let cacheWriteTokens = 0
           let approxChars = 0
-          const blob = await deps.ensureFresh(provider, await deps.loadBlob(account.ref), account.ref)
+          let completed = false
+          let sawFinish = false
+          let finishReason = null
+          let errorCaught = null
+          let finalized = false
+          let blob = null
+
+          const finalizeOnce = (outcome, extraStatus) => {
+            if (finalized) return
+            finalized = true
+
+            if (!outputTokens && approxChars > 0) {
+              outputTokens = Math.max(1, Math.round(approxChars / 4))
+            }
+
+            const totalMs = Date.now() - t0
+            const ttftMs = firstChunkTime !== null ? Math.max(0, firstChunkTime - t0) : null
+            const genMs = (firstChunkTime !== null && totalMs > ttftMs) ? (totalMs - ttftMs) : 0
+            const tps = (outputTokens > 0 && genMs > 0)
+              ? Math.round((outputTokens / (genMs / 1000)) * 10) / 10
+              : null
+
+            let status = 200
+            if (outcome === 'error') {
+              status = extraStatus || (errorCaught && (errorCaught.status || errorCaught.statusCode)) || (errorCaught && errorCaught.code === 'QUOTA' ? 429 : 500)
+            } else if (outcome === 'cancel') {
+              status = 499
+            } else if (outcome === 'runaway') {
+              status = 200
+            }
+
+            if (outcome === 'success') {
+              if (typeof deps.recordSuccess === 'function') deps.recordSuccess(account.ref)
+            }
+
+            if (typeof deps.recordHistory === 'function') {
+              try {
+                deps.recordHistory({
+                  provider,
+                  ref: account.ref,
+                  model: (opts && opts.model) || null,
+                  path: '/responses',
+                  method: 'POST',
+                  status,
+                  outcome,
+                  ms: totalMs,
+                  ttftMs,
+                  tps,
+                  inputTokens: inputTokens || undefined,
+                  outputTokens: outputTokens || undefined,
+                  cacheReadTokens: cacheReadTokens || undefined,
+                  cacheWriteTokens: cacheWriteTokens || undefined,
+                  kind: 'stream',
+                  ...(outcome === 'error' && errorCaught ? { error: errorCaught.message || String(errorCaught) } : {}),
+                  ...(outcome === 'runaway' ? { reason: finishReason || (opts && opts._runawayState && opts._runawayState.reason) || 'runaway_loop_detected' } : {}),
+                })
+              } catch { /* ignore quota capture failure */ }
+            }
+          }
+
           const vendor = getVendor(provider)
           // ponytail: capture x-ratelimit headers without touching vendors
           const baseFetch = pickFetch(deps, account.ref)
@@ -189,7 +248,9 @@ export class SubscriptionAdapter extends LlmAdapter {
             }
             return res
           }
+
           try {
+            blob = await deps.ensureFresh(provider, await deps.loadBlob(account.ref), account.ref)
             if (typeof deps.rememberRequest === 'function') deps.rememberRequest(account.ref)
             for await (const chunk of vendor.streamOnce({
               blob,
@@ -204,7 +265,10 @@ export class SubscriptionAdapter extends LlmAdapter {
                 firstChunkTime = Date.now()
               }
               if (chunk && typeof chunk === 'object') {
-                if (chunk.type === 'usage' && chunk.usage) {
+                if (chunk.type === 'finish') {
+                  sawFinish = true
+                  finishReason = chunk.reason
+                } else if (chunk.type === 'usage' && chunk.usage) {
                   const u = toTokenUsage(chunk.usage)
                   if (u && typeof u.outputTokens === 'number' && u.outputTokens > 0) {
                     outputTokens = u.outputTokens
@@ -224,46 +288,15 @@ export class SubscriptionAdapter extends LlmAdapter {
               }
               yield chunk
             }
-            if (!outputTokens && approxChars > 0) {
-              outputTokens = Math.max(1, Math.round(approxChars / 4))
-            }
-            // stream completed successfully: clear cooldown and health penalties
-            if (typeof deps.recordSuccess === 'function') deps.recordSuccess(account.ref)
-            // #65: record in the request and cost history.
-            if (typeof deps.recordHistory === 'function') {
-              try {
-                const totalMs = Date.now() - t0
-                const ttftMs = firstChunkTime !== null ? Math.max(0, firstChunkTime - t0) : null
-                const genMs = (firstChunkTime !== null && totalMs > ttftMs) ? (totalMs - ttftMs) : 0
-                const tps = (outputTokens > 0 && genMs > 0)
-                  ? Math.round((outputTokens / (genMs / 1000)) * 10) / 10
-                  : null
-
-                deps.recordHistory({
-                  provider,
-                  ref: account.ref,
-                  model: (opts && opts.model) || null,
-                  path: '/responses',
-                  method: 'POST',
-                  status: 200,
-                  ms: totalMs,
-                  ttftMs,
-                  tps,
-                  inputTokens: inputTokens || undefined,
-                  outputTokens: outputTokens || undefined,
-                  cacheReadTokens: cacheReadTokens || undefined,
-                  cacheWriteTokens: cacheWriteTokens || undefined,
-                  kind: 'stream',
-                })
-              } catch { /* ignore quota capture failure */ }
-            }
+            completed = true
           } catch (err) {
+            errorCaught = 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) {
+            if (err && err.code === 'VALIDATION_REQUIRED' && err.validationUrl && blob) {
               await deps.saveBlob(account.ref, {
                 ...blob,
                 validationUrl: err.validationUrl,
@@ -271,6 +304,18 @@ export class SubscriptionAdapter extends LlmAdapter {
               })
             }
             throw err
+          } finally {
+            if (errorCaught) {
+              finalizeOnce('error')
+            } else if (opts && opts._runawayState && opts._runawayState.tripped) {
+              finalizeOnce('runaway')
+            } else if (completed || sawFinish) {
+              finalizeOnce('success')
+            } else if (opts && opts.signal && opts.signal.aborted) {
+              finalizeOnce('cancel', 499)
+            } else {
+              finalizeOnce('cancel', 499)
+            }
           }
         },
       })) {

package/lib/client.js

@@ -919,9 +919,12 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             const items = (h && h.items) || []
             const events = items.map((it) => ({
               usage: {
-                promptTokens: it.promptTokens || (it.tokens && it.tokens.prompt) || 0,
-                cachedTokens: it.cachedTokens || (it.tokens && it.tokens.cached) || 0,
-                completionTokens: it.completionTokens || (it.tokens && it.tokens.completion) || 0,
+                inputTokens: it.inputTokens ?? it.promptTokens ?? (it.tokens && it.tokens.prompt) ?? 0,
+                cacheReadTokens: it.cacheReadTokens ?? it.cachedTokens ?? (it.tokens && it.tokens.cached) ?? 0,
+                outputTokens: it.outputTokens ?? it.completionTokens ?? (it.tokens && it.tokens.completion) ?? 0,
+                promptTokens: it.inputTokens ?? it.promptTokens ?? (it.tokens && it.tokens.prompt) ?? 0,
+                cachedTokens: it.cacheReadTokens ?? it.cachedTokens ?? (it.tokens && it.tokens.cached) ?? 0,
+                completionTokens: it.outputTokens ?? it.completionTokens ?? (it.tokens && it.tokens.completion) ?? 0,
               },
             }))
             return fetch('/dsh-subscriptions/analyze-session', {
@@ -1396,6 +1399,10 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             React.createElement('div', { className: 'dsub-stat-val' }, (telemetry.successRate || 100) + '%'),
             React.createElement('div', { className: 'dsub-stat-lbl' }, t('statsSuccessRate')),
           ),
+          React.createElement('div', { className: 'dsub-stat-box' },
+            React.createElement('div', { className: 'dsub-stat-val' }, (telemetry.cacheHitPercent || 0) + '%'),
+            React.createElement('div', { className: 'dsub-stat-lbl' }, t('cacheHitRate')),
+          ),
           React.createElement('div', { className: 'dsub-stat-box' },
             React.createElement('div', { className: 'dsub-stat-val' }, telemetry.lastRequestAt ? Math.round((Date.now() - telemetry.lastRequestAt) / 60000) + 'm ago' : '—'),
             React.createElement('div', { className: 'dsub-stat-lbl' }, t('statsLastActivity')),
@@ -2169,17 +2176,31 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             ))
             if (typeof un1 === 'function') cleanups.push(un1)
 
-            const un2 = ctx.slots.inject('plugins.row.config', () => ctx.slots.register(
+            // DSH 0.2 bundle config seat: rendered in PackageDetail when viewing package
+            const unBundle = ctx.slots.inject('plugins.bundle.config', () => ctx.slots.register(
               {
-                name: 'plugins.row.config',
-                key: ROW_CONFIG_KEY,
+                name: 'plugins.bundle.config',
+                key: PKG,
                 locale: NS,
                 inject: () => ({ ctx: ctx }),
               },
               PluginCard,
             ))
-            if (typeof un2 === 'function') cleanups.push(un2)
-
+            if (typeof unBundle === 'function') cleanups.push(unBundle)
+
+            // DSH 0.1/0.2 row config seats
+            for (const key of [ROW_CONFIG_KEY, ROW_ID + '#' + ROW_ID, ROW_ID]) {
+              const unRow = ctx.slots.inject('plugins.row.config', () => ctx.slots.register(
+                {
+                  name: 'plugins.row.config',
+                  key,
+                  locale: NS,
+                  inject: () => ({ ctx: ctx }),
+                },
+                PluginCard,
+              ))
+              if (typeof unRow === 'function') cleanups.push(unRow)
+            }
           }
         } catch {
           // Slot system not available — expected on headless / non-web profiles.
@@ -2536,8 +2557,35 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   e.preventDefault()
                   setState((s) => Object.assign({}, s, { open: false }))
                   try {
-                    const btn = Array.from(document.querySelectorAll('button')).find((b) => (b.textContent || '').includes(t('title')))
-                    if (btn) btn.click()
+                    const nav = (props.ctx && props.ctx.pluginNavigation) || (window.__dshCtx && window.__dshCtx.pluginNavigation)
+                    if (nav && typeof nav.openBundle === 'function') {
+                      nav.openBundle(PKG)
+                      return
+                    }
+                  } catch { /* best-effort */ }
+
+                  try {
+                    if (props.ctx && props.ctx.layout && typeof props.ctx.layout.selectPanel === 'function') {
+                      props.ctx.layout.selectPanel('plugins')
+                    }
+                  } catch { /* best-effort */ }
+
+                  try {
+                    const panelBtn = document.querySelector('[data-panel-id="plugins"]') ||
+                      document.querySelector('button[aria-label*="Plugin" i]') ||
+                      document.querySelector('button[title*="Plugin" i]')
+                    if (panelBtn) panelBtn.click()
+
+                    setTimeout(() => {
+                      try {
+                        const item = document.querySelector(`[data-plugin-name="${PKG}"]`) ||
+                          document.querySelector(`[data-plugin-item="${ROW_ID}"]`) ||
+                          Array.from(document.querySelectorAll('button, a, div')).find((el) =>
+                            el.textContent && (el.textContent.includes('dsh-subscriptions') || el.textContent.includes(t('title')))
+                          )
+                        if (item) item.click()
+                      } catch { /* best-effort */ }
+                    }, 150)
                   } catch { /* best-effort */ }
                 },
               }, t('subsOpenSettings')),
@@ -2557,7 +2605,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 15,
               locale: NS,
             },
-            () => React.createElement(ErrorBoundary, null, React.createElement(SubsPill, { t })),
+            () => React.createElement(ErrorBoundary, null, React.createElement(SubsPill, { t, ctx })),
           ),
         )
       }, 'dsh-subscriptions: subs pill')
@@ -2643,6 +2691,11 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     exports.inject = ['slots', 'locale', 'sessions']
     exports.apply = function apply(ctx) {
       setT(ctx.locale.bind(NS))
+      try {
+        ctx.inject(['pluginNavigation'], (navCtx) => {
+          ctx.pluginNavigation = navCtx.pluginNavigation
+        })
+      } catch { /* optional */ }
       registerSettings(ctx)
       registerSubsPill(ctx)
       registerComposerQuota(ctx)

package/lib/history.js

@@ -242,6 +242,9 @@ export class HistoryStore {
     const now = Date.now()
     const last24h = now - 24 * 60 * 60 * 1000
     let count24h = 0
+    let totalPromptTokens = 0
+    let totalCompletionTokens = 0
+    let totalCacheReadTokens = 0
 
     for (const r of this.rows) {
       if (r.ts >= last24h) count24h++
@@ -252,6 +255,9 @@ export class HistoryStore {
         totalMs += r.ms
         latencyCount++
       }
+      if (typeof r.inputTokens === 'number') totalPromptTokens += r.inputTokens
+      if (typeof r.outputTokens === 'number') totalCompletionTokens += r.outputTokens
+      if (typeof r.cacheReadTokens === 'number') totalCacheReadTokens += r.cacheReadTokens
     }
 
     const first = this.rows[0] // newest first
@@ -266,6 +272,12 @@ export class HistoryStore {
       lastRequestAt: (first && first.ts) || null,
       lastProvider: (first && first.provider) || null,
       lastModel: (first && first.model) || null,
+      totalPromptTokens,
+      totalCompletionTokens,
+      totalCacheReadTokens,
+      cacheHitPercent: totalPromptTokens > 0
+        ? Math.round((totalCacheReadTokens / totalPromptTokens) * 1000) / 10
+        : 0,
       accounts: this.accountsTelemetry(),
     }
   }

package/lib/runaway-guard.js

@@ -79,7 +79,7 @@ export async function* withRunawayGuard(stream, options = {}) {
   for await (const chunk of stream) {
     if (chunk && chunk.type === 'finish') {
       yield chunk
-      return
+      continue
     }
 
     const text = (chunk && typeof chunk === 'object')
@@ -88,6 +88,13 @@ export async function* withRunawayGuard(stream, options = {}) {
 
     if (text && (chunk.type === 'text-delta' || chunk.type === 'reasoning-delta' || !chunk.type)) {
       if (detector.feed(text)) {
+        if (options && typeof options === 'object') {
+          options.tripped = true
+          options.trippedReason = detector.getReason()
+          if (typeof options.onRunaway === 'function') {
+            options.onRunaway(detector.getReason())
+          }
+        }
         yield {
           type: 'finish',
           reason: {

package/lib/stream-rotate.js

@@ -53,7 +53,18 @@ export async function* streamWithRotation({
 
     while (true) {
       try {
-        const guardedStream = withRunawayGuard(streamOnce(account, options), options && options.runawayGuard)
+        const runawayState = options && options._runawayState ? options._runawayState : { tripped: false, reason: null }
+        const runawayOpts = {
+          ...(options && options.runawayGuard),
+          onRunaway: (reason) => {
+            runawayState.tripped = true
+            runawayState.reason = reason
+          },
+        }
+        const guardedStream = withRunawayGuard(
+          streamOnce(account, { ...options, _runawayState: runawayState }),
+          runawayOpts
+        )
         for await (const chunk of guardedStream) {
           firstChunkDelivered = true
           yield chunk

package/lib/vendor-factory.js

@@ -13,8 +13,8 @@ import { codexResponsesBody, modelCatalog } from "./messages.js"
 import { formTokenRequest, jsonTokenRequest, codexResponsesStream, readJson, tokenBlobFromOAuth, httpError } from "./wire.js"
 import { emailFromToken } from "./jwt.js"
 
-function defaultModels(models) {
-  return modelCatalog("custom", (models || []).map((row) => (typeof row === "string" ? { id: row, name: row } : row)))
+function defaultModels(providerId, models) {
+  return modelCatalog(providerId, (models || []).map((row) => (typeof row === "string" ? { id: row, name: row } : row)))
 }
 
 /**
@@ -84,7 +84,7 @@ export function createVendorFromProfile(profile) {
       return tokenBlobFromOAuth(json, { label: blob.label, email: blob.email })
     },
     async listModels(blob, cfg, fetchImpl) {
-      const catalog = defaultModels(cfg.models || profile.models || [])
+      const catalog = defaultModels(id, cfg.models || profile.models || [])
       if (!profile.modelsPath) return catalog
       try {
         const res = await fetchWithTimeout(fetchImpl || fetch, `${base}${profile.modelsPath}`, {

package/lib/vendors/cody.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'cody'
 const CODY_API_BASE = 'https://sourcegraph.com/.api'
@@ -42,9 +41,7 @@ export async function listModels() {
 
 export async function usage(blob) {
   if (blob && (blob.accessToken || blob.token)) {
-    const snap = asUsageSnapshot(15)
-    if (snap) snap.plan = 'Cody Pro'
-    return snap
+    return { usedPercent: null, plan: 'Cody Pro', timestamp: Date.now() }
   }
   return null
 }

package/lib/vendors/copilot.js

@@ -2,7 +2,6 @@ import { LlmError } from "@deepseek-ai/dsh-llm"
 import { openaiMessages, openaiTools, modelCatalog } from "../messages.js"
 import { fetchWithTimeout } from "../http.js"
 import { openaiChatStream, readJson, httpError } from "../wire.js"
-import { asUsageSnapshot } from "../usage.js"
 
 export const id = "copilot"
 
@@ -268,9 +267,14 @@ export async function usage(blob, config, fetchImpl) {
     })
     if (!res.ok) return null
     const user = await readJson(res)
-    const snap = asUsageSnapshot(10)
-    if (snap) snap.plan = user && user.plan ? user.plan.name : "Copilot"
-    return snap
+    const usedPercent = user && typeof user.used_percent === "number" && Number.isFinite(user.used_percent)
+      ? user.used_percent
+      : null
+    return {
+      usedPercent,
+      plan: user && user.plan ? (user.plan.name || String(user.plan)) : "Copilot",
+      timestamp: Date.now(),
+    }
   } catch {
     return null
   }

package/lib/vendors/ernie.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, readJson, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'ernie'
 export const ERNIE_OAUTH_URL = 'https://aip.baidubce.com/oauth/2.0/token'
@@ -51,10 +50,7 @@ async function refreshErnieToken(apiKey, secretKey, fetchImpl) {
   return readJson(res)
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.apiKey)) {
-    return asUsageSnapshot(20)
-  }
+export async function usage() {
   return null
 }
 

package/lib/vendors/jetbrains.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'jetbrains'
 const JETBRAINS_API_BASE = 'https://api.jetbrains.ai'
@@ -42,10 +41,7 @@ export async function listModels() {
   return JETBRAINS_MODELS
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.token)) {
-    return asUsageSnapshot(30)
-  }
+export async function usage() {
   return null
 }
 

package/lib/vendors/perplexity.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'perplexity'
 const PERPLEXITY_API_BASE = 'https://api.perplexity.ai'
@@ -44,9 +43,7 @@ export async function listModels() {
 
 export async function usage(blob) {
   if (blob && (blob.accessToken || blob.apiKey)) {
-    const snap = asUsageSnapshot(18)
-    if (snap) snap.plan = 'Perplexity Pro'
-    return snap
+    return { usedPercent: null, plan: 'Perplexity Pro', timestamp: Date.now() }
   }
   return null
 }

package/lib/vendors/qwen.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages, openaiTools } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'qwen'
 const QWEN_API_BASE = 'https://dashscope.aliyuncs.com/compatible-mode/v1'
@@ -49,10 +48,7 @@ export async function listModels() {
   return QWEN_MODELS
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.apiKey)) {
-    return asUsageSnapshot(15)
-  }
+export async function usage() {
   return null
 }
 

package/lib/vendors/replit.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'replit'
 const REPLIT_API_BASE = 'https://replit.com/api/v1/ai'
@@ -37,9 +36,7 @@ export async function listModels() {
 
 export async function usage(blob) {
   if (blob && (blob.accessToken || blob.token)) {
-    const snap = asUsageSnapshot(25)
-    if (snap) snap.plan = 'Replit Core'
-    return snap
+    return { usedPercent: null, plan: 'Replit Core', timestamp: Date.now() }
   }
   return null
 }

package/lib/vendors/spark.js

@@ -1,7 +1,6 @@
 import { LlmError } from '@deepseek-ai/dsh-llm'
 import { openaiMessages } from '../messages.js'
 import { openaiChatStream, httpError } from '../wire.js'
-import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'spark'
 const SPARK_API_BASE = 'https://spark-api-open.xf-yun.com/v1'
@@ -42,10 +41,7 @@ export async function listModels() {
   return SPARK_MODELS
 }
 
-export async function usage(blob) {
-  if (blob && (blob.accessToken || blob.apiKey)) {
-    return asUsageSnapshot(12)
-  }
+export async function usage() {
   return null
 }
 

package/package.json

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