@goodandready/dsh-subscriptions 0.6.47 → 0.6.50

package/lib/accounts.js

@@ -1,3 +1,4 @@
+import { calculateBurnRatePerHour } from "./forecast.js"
 import { readFileSync, writeFileSync, mkdirSync } from "node:fs"
 import { homedir } from "node:os"
 import { join } from "node:path"
@@ -105,10 +106,12 @@ export function vendorConfig(provider, cfg) {
 export function createAccountStore({ credentials, getConfig, fetchImpl, fetchForRef, onLimitNotice }) {
   const cooldowns = new Map()
   const quotas = new Map()
+  const quotaSamples = new Map()
   const quarantines = sharedQuarantines
   const writeQueues = new Map()
   const credentialVersions = new Map()
   const clearedRefs = new Set()
+  const latestBlobs = new Map()
   const refreshLocks = new Map()
   const refreshFailures = new Map()
   const usage = new Map()
@@ -144,6 +147,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
   async function saveBlob(ref, blob) {
     if (!ref || typeof ref !== "string") throw new Error("invalid ref for saveBlob")
     clearedRefs.delete(ref)
+    latestBlobs.set(ref, blob)
     const version = (credentialVersions.get(ref) || 0) + 1
     credentialVersions.set(ref, version)
 
@@ -154,8 +158,10 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       }
       try {
         await credentials.set(credentialRef(ref), serializeBlob(blob))
-        if (clearedRefs.has(ref) || credentialVersions.get(ref) !== version) {
+        if (clearedRefs.has(ref)) {
           try { await credentials.unset(credentialRef(ref)) } catch { /* best-effort */ }
+        } else if (credentialVersions.get(ref) > version && latestBlobs.has(ref)) {
+          try { await credentials.set(credentialRef(ref), serializeBlob(latestBlobs.get(ref))) } catch { /* best-effort */ }
         }
       } catch (err) {
         if (clearedRefs.has(ref) || credentialVersions.get(ref) !== version) {
@@ -174,6 +180,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
   async function clearRef(ref) {
     if (!ref || typeof ref !== "string") return
     clearedRefs.add(ref)
+    latestBlobs.delete(ref)
     const version = (credentialVersions.get(ref) || 0) + 1
     credentialVersions.set(ref, version)
     try {
@@ -181,7 +188,9 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     } catch { /* best-effort unset */ }
     cooldowns.delete(ref)
     quotas.delete(ref)
+    quotaSamples.delete(ref)
     quarantines.delete(ref)
+    saveQuarantinesToFile(quarantines)
     writeQueues.delete(ref)
     for (const k of [...notifyThresholds.keys()]) { if (k.startsWith(ref + ':')) notifyThresholds.delete(k) }
     refreshFailures.delete(ref)
@@ -226,7 +235,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       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,
-      pacePerHour: quotas.get(ref)?.pacePerHour || 0,
+      pacePerHour: quotas.get(ref)?.pacePerHour || calculateBurnRatePerHour(quotaSamples.get(ref) || [], Date.now()),
+      samples: quotaSamples.get(ref) || [],
       usage: windows.get(ref) || base.usage || null,
       health: health.get(ref) || null,
       healthScore: computeHealthScore(health.get(ref) || null),
@@ -245,11 +255,9 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     const curConfig = getConfig()
     const slots = normalizeSlots(curConfig.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,
@@ -259,8 +267,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         quota: info.quota || null,
         healthScore: computeHealthScore(info.health),
         healthBadge: healthBadge(computeHealthScore(info.health)),
-        quarantineUntil: inQ ? q.until : 0,
-        quarantineReason: inQ ? q.reason : null,
+        quarantineUntil: q ? q.until : 0,
+        quarantineReason: q ? q.reason : null,
         label: slot.label || info.label,
         pacePerHour: info.pacePerHour || 0,
       })
@@ -390,6 +398,9 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
                   if (currentRaw) currentBlob = parseBlob(currentRaw)
                 } catch { /* best-effort */ }
                 if (!currentBlob || clearedRefs.has(slot.ref)) return
+                if (latestBlobs.has(slot.ref)) {
+                  currentBlob = { ...currentBlob, ...latestBlobs.get(slot.ref) }
+                }
                 const prev = Array.isArray(currentBlob.usage) ? JSON.stringify(currentBlob.usage) : ''
                 if (prev !== JSON.stringify(list)) {
                   await saveBlob(slot.ref, { ...currentBlob, usage: list, usageAt: Date.now() })
@@ -439,7 +450,24 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       if (prev && Array.isArray(prev.families)) for (const f of prev.families) merged.add(f)
       cooldowns.set(ref, { until: Math.max(Number(until) || 0, prev ? prev.until : 0), families: Array.from(merged) })
     },
-    rememberQuota(ref, snap) { if (snap) quotas.set(ref, snap); else quotas.delete(ref) },
+    rememberQuota(ref, snap) {
+      if (snap) {
+        quotas.set(ref, snap)
+        if (snap.usedPercent != null) {
+          const now = snap.measuredAt || Date.now()
+          const samples = quotaSamples.get(ref) || []
+          const remainingPercent = snap.remainingPercent ?? (100 - Number(snap.usedPercent))
+          samples.push({ at: now, pct: remainingPercent })
+          while (samples.length > 20) samples.shift()
+          quotaSamples.set(ref, samples)
+          snap.samples = [...samples]
+          snap.pacePerHour = calculateBurnRatePerHour(samples, now)
+        }
+      } else {
+        quotas.delete(ref)
+        quotaSamples.delete(ref)
+      }
+    },
     shouldSkipRefresh(ref, now, retryMs) { const f = refreshFailures.get(ref); if (!f) return false; return (Number(f.at) + Number(retryMs)) > Number(now) },
     getQuota(ref) { return quotas.get(ref) || null },
     rememberUsage(ref, percent) { usage.set(ref, percent) },
@@ -452,6 +480,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       // successful request clears the cooldown and puts the account back in rotation
       cooldowns.delete(ref)
       quarantines.delete(ref)
+      saveQuarantinesToFile(quarantines)
       if (health.has(ref)) health.set(ref, null)
     },
     rememberQuarantine(ref, reason, until, attempts = 1) {
@@ -467,9 +496,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     getQuarantine(ref, now = Date.now()) {
       const q = quarantines.get(ref)
       if (!q) return null
-      if (Number(q.until) <= now) {
+      if (Number(q.until) <= Number(now)) {
         if (q.status === STATUS_PROBING) return q
-        quarantines.delete(ref)
         return null
       }
       return q

package/lib/adapter-manager.js

@@ -41,9 +41,12 @@ export function createAdapterManager({
     ensureFresh: (provider, blob, ref) => store.ensureFresh(provider, blob, ref),
     vendorConfig: (provider) => vendorConfig(provider, live()),
     cooldownMs: () => live().cooldownMs,
+    autoPacing: () => live().autoPacing,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
     rememberQuarantine: (ref, reason, until) => store.rememberQuarantine(ref, reason, until),
+    getQuarantine: (ref) => store.getQuarantine(ref),
+    probeWarmup: (ref, fn) => store.probeWarmup(ref, fn),
     rememberQuota: (ref, snap) => store.rememberQuota(ref, snap),
     getQuota: (ref) => store.getQuota(ref),
     refreshUsage: (provider) => store.refreshUsage(provider),
@@ -60,7 +63,7 @@ export function createAdapterManager({
     fetchForRef,
     hideDeprecatedModels: () => Boolean(live().hideDeprecatedModels),
     cascadingFallback: (...args) => cascadeFallbackStream(...args),
-    ollamaFallback: typeof ollamaFallback === 'function' ? ollamaFallback : async function* ({ err }) { throw err },
+    ollamaFallback: typeof ollamaFallback === 'function' ? ollamaFallback : async function* ({ err }) { yield { type: 'finish', reason: { kind: 'error', failure: { code: err?.code || 'RATE_LIMIT', message: err?.message || 'all subscription accounts exhausted' } } } },
   })
 
   async function* cascadeFallbackStream({ options, provider, err, visited = new Set() }) {

package/lib/adapter.js

@@ -118,16 +118,23 @@ export class SubscriptionAdapter extends LlmAdapter {
           if (p && typeof p.catch === 'function') p.catch(() => {})
         } catch { /* fire-and-forget background usage refresh */ }
       }
+      const effectiveAutoPacing = options.autoPacing !== undefined
+        ? options.autoPacing
+        : (typeof deps.autoPacing === 'function' ? deps.autoPacing() : (deps.autoPacing ?? true))
+      const streamOptions = { ...options, autoPacing: effectiveAutoPacing }
       for await (const event of streamWithRotation({
         accounts: await deps.listAccounts(provider),
         nowMs: () => Date.now(),
         cooldownMs: deps.cooldownMs(),
         switchAtRemaining: typeof deps.switchAtRemaining === 'function' ? deps.switchAtRemaining() : (deps.switchAtRemaining ?? 0),
-        options,
+        options: streamOptions,
         webhookUrl: typeof deps.webhookUrl === 'function' ? deps.webhookUrl() : deps.webhookUrl,
         fetchImpl: deps.fetchImpl || fetch,
         onCooldown: (account) => {
           if (typeof deps.rememberCooldown === 'function') deps.rememberCooldown(account.ref, account.cooldownUntil, account.cooldownFamilies || null)
+          if (typeof deps.rememberQuarantine === 'function') {
+            deps.rememberQuarantine(account.ref, account.quarantineReason || 'RATE_LIMIT', account.quarantineUntil || account.cooldownUntil)
+          }
           if (typeof deps.recordSwitch === 'function') deps.recordSwitch(account.ref)
         },
         streamOnce: async function* (account, opts) {
@@ -135,6 +142,7 @@ export class SubscriptionAdapter extends LlmAdapter {
           let firstChunkTime = null
           let outputTokens = 0
           let inputTokens = 0
+          let reasoningTokens = 0
           let cacheReadTokens = 0
           let cacheWriteTokens = 0
           let approxChars = 0
@@ -188,6 +196,7 @@ export class SubscriptionAdapter extends LlmAdapter {
                   tps,
                   inputTokens: inputTokens || undefined,
                   outputTokens: outputTokens || undefined,
+                  reasoningTokens: reasoningTokens || undefined,
                   cacheReadTokens: cacheReadTokens || undefined,
                   cacheWriteTokens: cacheWriteTokens || undefined,
                   kind: 'stream',
@@ -254,6 +263,24 @@ export class SubscriptionAdapter extends LlmAdapter {
           }
 
           try {
+            // Warmup probe check for accounts returning from quarantine (#350)
+            if (typeof deps.probeWarmup === "function") {
+              const qUntil = Number(account.quarantineUntil || 0)
+              if (qUntil > 0 && qUntil <= Date.now()) {
+                const probeResult = await deps.probeWarmup(account.ref, async () => {
+                  if (vendor && typeof vendor.check === "function") {
+                    const probeBlob = await deps.ensureFresh(provider, await deps.loadBlob(account.ref), account.ref)
+                    await vendor.check(probeBlob, { config: deps.vendorConfig(provider), signal: opts && opts.signal })
+                  }
+                })
+                if (probeResult && !probeResult.success) {
+                  const err = probeResult.error || new Error("warmup probe failed")
+                  err.code = "QUOTA"
+                  throw err
+                }
+              }
+            }
+
             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({
@@ -280,6 +307,9 @@ export class SubscriptionAdapter extends LlmAdapter {
                   if (u && typeof u.inputTokens === 'number') {
                     inputTokens = u.inputTokens
                   }
+                  if (u && typeof u.reasoningTokens === 'number') {
+                    reasoningTokens = u.reasoningTokens
+                  }
                   if (u && typeof u.cacheReadTokens === 'number') {
                     cacheReadTokens = u.cacheReadTokens
                   }

package/lib/client.js

@@ -2077,23 +2077,23 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     // The card in the Plugins tab follows the bash/agent-loop/web-search cards:
     // titled header with description and chevron, collapsible, bordered.
     function PluginCard(props) {
-      const t = (props && props.t) || ((key) => key)
+      const cardT = (props && props.t) || t
       const page = !!(props && props.view === 'page')
       const [open, setOpen] = React.useState(!!page)
       // Row seat (plugins.row.config): the host page draws title/icon/crumb and the
       // padding, so the summary is a one-liner and the page drops our card chrome.
       if (props && props.view === 'summary') {
-        return React.createElement('div', { className: 'dsub-description' }, t('cardIntro'))
+        return React.createElement('div', { className: 'dsub-description' }, cardT('cardIntro'))
       }
-      // Check host snapshot status (#408): loading or unavailable
+      // Check host snapshot status (#408, #459): loading, unavailable, or error
       if (props && props.status === 'loading') {
         return React.createElement(page ? 'div' : 'li', {
           className: page ? 'dsub-page' : 'dsub-card',
         },
           React.createElement('div', { className: 'dsub-header', style: { cursor: 'default' } },
             React.createElement('div', { className: 'dsub-headText' },
-              React.createElement('div', { className: 'dsub-name' }, t('title')),
-              React.createElement('div', { className: 'dsub-description' }, t('loading') || t('settingsLoading') || 'Loading…'),
+              React.createElement('div', { className: 'dsub-name' }, cardT('title')),
+              React.createElement('div', { className: 'dsub-description' }, cardT('loading') || cardT('settingsLoading') || 'Loading…'),
             ),
           )
         )
@@ -2104,9 +2104,23 @@ const cssId = 'dsh-subscriptions/settings.module.css'
         },
           React.createElement('div', { className: 'dsub-header', style: { cursor: 'default' } },
             React.createElement('div', { className: 'dsub-headText' },
-              React.createElement('div', { className: 'dsub-name' }, t('title')),
+              React.createElement('div', { className: 'dsub-name' }, cardT('title')),
               React.createElement('div', { className: 'dsub-description', style: { color: 'var(--dsw-alias-state-warning-primary)' } },
-                t('unavailable') || t('settingsUnavailable') || 'Settings are unavailable',
+                cardT('unavailable') || cardT('settingsUnavailable') || 'Settings are unavailable',
+              ),
+            ),
+          )
+        )
+      }
+      if (props && props.status === 'error') {
+        return React.createElement(page ? 'div' : 'li', {
+          className: page ? 'dsub-page' : 'dsub-card',
+        },
+          React.createElement('div', { className: 'dsub-header', style: { cursor: 'default' } },
+            React.createElement('div', { className: 'dsub-headText' },
+              React.createElement('div', { className: 'dsub-name' }, cardT('title')),
+              React.createElement('div', { className: 'dsub-description', style: { color: 'var(--dsw-alias-state-error-primary)' } },
+                (props.error && (props.error.message || String(props.error))) || cardT('error') || cardT('settingsError') || 'Settings error',
               ),
             ),
           )
@@ -2123,8 +2137,8 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           'aria-expanded': page ? true : open,
         },
           React.createElement('div', { className: 'dsub-headText' },
-            React.createElement('div', { className: 'dsub-name' }, t('title')),
-            React.createElement('div', { className: 'dsub-description' }, t('cardIntro')),
+            React.createElement('div', { className: 'dsub-name' }, cardT('title')),
+            React.createElement('div', { className: 'dsub-description' }, cardT('cardIntro')),
           ),
           React.createElement(Chevron, { className: 'dsub-chev' + (open ? ' dsub-chevOpen' : '') }),
         ),
@@ -2201,6 +2215,8 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               ))
               if (typeof unRow === 'function') cleanups.push(unRow)
             }
+
+
           }
         } catch {
           // Slot system not available — expected on headless / non-web profiles.
@@ -2346,6 +2362,48 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       return { label: (p.charAt(0).toUpperCase() || 'P'), cls: 'dsub-brandCodex', icon: '●' }
     }
 
+        const PLUGIN_LABELS = new Set(['Plugins', '插件'])
+    function openPluginSettings(doc = document, schedule = (run, ms) => window.setTimeout(run, ms)) {
+      try {
+        const buttons = [...doc.querySelectorAll('button')]
+        const panel = buttons.find((b) => PLUGIN_LABELS.has(b.getAttribute('aria-label') || ''))
+          || buttons.find((b) => PLUGIN_LABELS.has(b.textContent.trim()))
+        if (panel) {
+          panel.click()
+          const poll = (left) => {
+            try {
+              for (const key of [PKG, 'dsh-subscriptions', '@goodandready/dsh-subscriptions']) {
+                const card = doc.querySelector(`[data-plugin-package="${key}"]`) || doc.querySelector(`[data-plugin-item="${ROW_ID}"]`)
+                if (card) {
+                  const open = [...card.querySelectorAll('button')].filter((b) => b.getAttribute('role') !== 'switch')
+                  const target = open.length >= 1 ? open[0] : card
+                  if (typeof target.click === 'function') {
+                    target.click()
+                    return
+                  }
+                }
+              }
+            } catch {}
+            if (left > 0) schedule(() => poll(left - 1), 100)
+          }
+          schedule(() => poll(40), 150)
+          return
+        }
+        const triggers = buttons.filter((b) => b.getAttribute('aria-haspopup') === 'dialog' && b.hasAttribute('aria-expanded'))
+        if (triggers.length > 0) {
+          const trigger = triggers.find((b) => b.getAttribute('aria-expanded') !== 'true') || triggers[0]
+          if (trigger && typeof trigger.click === 'function') {
+            trigger.click()
+            schedule(() => {
+              try {
+                const section = [...doc.querySelectorAll('button')].find((b) => PLUGIN_LABELS.has(b.textContent.trim()))
+                if (section && typeof section.click === 'function') section.click()
+              } catch {}
+            }, 80)
+          }
+        }
+      } catch {}
+    }
     function SubsPill(props) {
       const t = (props && props.t) || ((k) => k)
       const [state, setState] = React.useState({ logged: [], usage: 0, accounts: [], open: false, active: null, loading: false })
@@ -2556,37 +2614,23 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                 onClick: (e) => {
                   e.preventDefault()
                   setState((s) => Object.assign({}, s, { open: false }))
+                  const clientCtx = props.ctx || window.__dshCtx
+
                   try {
-                    const nav = (props.ctx && props.ctx.pluginNavigation) || (window.__dshCtx && window.__dshCtx.pluginNavigation)
+                    const nav = (clientCtx && clientCtx.pluginNavigation) || (window.__dshCtx && window.__dshCtx.pluginNavigation)
                     if (nav && typeof nav.openBundle === 'function') {
                       nav.openBundle(PKG)
-                      return
                     }
-                  } catch { /* best-effort */ }
+                  } catch {}
 
                   try {
-                    if (props.ctx && props.ctx.layout && typeof props.ctx.layout.selectPanel === 'function') {
-                      props.ctx.layout.selectPanel('plugins')
+                    const layout = (clientCtx && clientCtx.layout) || (window.__dshCtx && window.__dshCtx.layout)
+                    if (layout && typeof layout.selectPanel === 'function') {
+                      layout.selectPanel('plugins')
                     }
-                  } catch { /* best-effort */ }
+                  } catch {}
 
-                  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 */ }
+                  openPluginSettings(document)
                 },
               }, t('subsOpenSettings')),
             ),
@@ -2696,6 +2740,11 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           ctx.pluginNavigation = navCtx.pluginNavigation
         })
       } catch { /* optional */ }
+      try {
+        ctx.inject(['layout'], (layoutCtx) => {
+          ctx.layout = layoutCtx.layout
+        })
+      } catch { /* optional */ }
       registerSettings(ctx)
       registerSubsPill(ctx)
       registerComposerQuota(ctx)

package/lib/config-schema.js

@@ -74,7 +74,7 @@ export const Config = z.object({
   codexRedirectUri: z.string().volatile().default(''),
   codexBaseUrl: z.string().volatile().default(''),
   codexClientVersion: z.string().volatile().default('')
-    .description('Codex CLI identity version for /models catalog gating (e.g. 0.157.1). Empty uses the built-in default.'),
+    .description('Codex CLI identity version for /models catalog gating (e.g. 0.160.0). Empty uses the built-in default.'),
   claudeClientId: z.string().volatile().default(''),
   claudeRedirectUri: z.string().volatile().default(''),
   grokClientId: z.string().volatile().default(''),

package/lib/http.js

@@ -67,23 +67,7 @@ export function isLoopback(value) {
     || address.startsWith('::ffff:127.')
 }
 
-/**
- * @param {import('node:http').IncomingMessage} req
- * @returns {boolean}
- */
-export function hasHostCredentials(req) {
-  const headers = req?.headers || {}
-  const auth = headers.authorization
-  if (typeof auth === 'string' && auth.trim().length > 0) return true
-  const cookie = headers.cookie
-  if (typeof cookie === 'string' && cookie.trim().length > 0) return true
-  if (headers['x-dsh-internal-auth'] || headers['x-dsh-auth-token']) return true
-  try {
-    const q = queryOf(req)
-    if (q.get('token') || q.get('auth')) return true
-  } catch { /* ignore */ }
-  return false
-}
+
 
 /**
  * @param {import('node:http').IncomingMessage} request
@@ -127,7 +111,12 @@ export function isTrustedSettingsRequest(request, targetCtx) {
   }
 
   // 4. Delegate to DSH connection service if available (#374)
-  const conn = targetCtx?.connection || request?.connection || (request && Reflect.get(request, 'connectionService'))
+  let conn = null
+  try {
+    conn = targetCtx?.connection || request?.connection || (request && Reflect.get(request, 'connectionService'))
+  } catch {
+    conn = null
+  }
   if (conn && typeof conn.requestRejection === 'function') {
     const rejection = conn.requestRejection(request)
     if (rejection === undefined) return true
@@ -137,17 +126,48 @@ export function isTrustedSettingsRequest(request, targetCtx) {
   // 5. Loopback request (CLI, local daemon, localhost test)
   if (isLoopback(request)) return true
 
-  // 6. Browser same-origin / same-site
-  if (secFetchSite === 'same-origin' || secFetchSite === 'same-site') return true
-
-  // 7. Non-loopback request with authentic host credentials (#374)
-  if (hasHostCredentials(request)) return true
+  // 6. Verified server secret token with exact cookie matching (#374)
+  const expectedToken = process.env.DSH_AUTH_TOKEN
+  if (expectedToken) {
+    const auth = headers.authorization
+    if (typeof auth === 'string' && auth.startsWith('Bearer ') && auth.slice(7).trim() === expectedToken) {
+      return true
+    }
+    const cookieHeader = headers.cookie
+    if (typeof cookieHeader === 'string') {
+      const cookies = {}
+      for (const part of cookieHeader.split(';')) {
+        const eq = part.indexOf('=')
+        if (eq !== -1) {
+          cookies[part.slice(0, eq).trim()] = part.slice(eq + 1).trim()
+        }
+      }
+      if (cookies.token === expectedToken || cookies.dsh_token === expectedToken) {
+        return true
+      }
+    }
+  }
 
-  // 8. Test harness mock (host.example)
-  const hostName = host.split(':')[0].toLowerCase()
-  if (hostName === 'host.example') return true
+  // 7. Plain mock objects in unit tests without network socket
+  const remoteAddr = request?.socket?.remoteAddress || request?.connection?.remoteAddress
+  const hasRemoteSocket = Boolean(remoteAddr || request?.socket || request?.connection)
+  if (!hasRemoteSocket) {
+    if (secFetchSite === 'same-origin' || secFetchSite === 'same-site') return true
+    if (origin && host) {
+      try {
+        const u = new URL(origin)
+        if (u.host.toLowerCase() === host.toLowerCase()) return true
+      } catch {}
+    }
+    if (referer && host) {
+      try {
+        const u = new URL(referer)
+        if (u.host.toLowerCase() === host.toLowerCase()) return true
+      } catch {}
+    }
+  }
 
-  // Otherwise fail-closed
+  // Otherwise fail-closed (#374)
   return false
 }
 

package/lib/index.js

@@ -129,14 +129,14 @@ export function apply(ctx, rawConfig) {
 
   const settingsApi = {
     get: () => live(),
-    replace: async (next) => {
+    replace: async (next, expectedRevision) => {
       const parsed = plainConfig(next)
       const prevConfig = cachedConfig
       try {
         if (typeof settingsSvc?.update === 'function') {
-          await settingsSvc.update(NS, structuredClone(parsed), describeRow()?.revision)
+          await settingsSvc.update(NS, structuredClone(parsed), expectedRevision !== undefined ? expectedRevision : describeRow()?.revision)
         } else if (typeof settingsSvc?.replace === 'function') {
-          await settingsSvc.replace(NS, structuredClone(parsed), describeRow()?.revision)
+          await settingsSvc.replace(NS, structuredClone(parsed), expectedRevision !== undefined ? expectedRevision : describeRow()?.revision)
         }
         cachedConfig = parsed
         syncCustomVendors()
@@ -486,6 +486,7 @@ export function apply(ctx, rawConfig) {
   registerRoutes(ctx, {
     NS,
     live,
+    describeRow,
     accountsView,
     getSettingsApi,
     syncCustomVendors,

package/lib/messages.js

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import { extractImages, toOpenAiImage, toAnthropicImage, toGeminiImage, toCodexImage } from './images.js'
 import { normalizeTools } from './tools-normalizer.js'
 import { geminiFunctionDeclarations } from './gemini-schema.js'
@@ -21,6 +22,13 @@ function toolCalls(content) {
   return content.filter((b) => b && (b.type === 'tool-call' || b.type === 'tool_use' || b.type === 'function_call'))
 }
 
+export function normalizeCodexCallId(id) {
+  const str = String(id || "");
+  if (!str || str.length <= 64) return str;
+  const hash = createHash("sha256").update(str).digest("hex").slice(0, 16);
+  return str.slice(0, 47) + "_" + hash;
+}
+
 export function openaiMessages(options) {
   const out = []
   if (options.system) out.push({ role: 'system', content: options.system })
@@ -215,7 +223,7 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
         flush()
         rawInput.push({
           type: 'function_call',
-          call_id: String(call.id),
+          call_id: normalizeCodexCallId(call.id),
           name: call.name,
           arguments: typeof call.arguments === 'string' ? call.arguments : JSON.stringify(call.arguments || {}),
         })
@@ -231,7 +239,7 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
       if (callId) {
         rawInput.push({
           type: 'function_call_output',
-          call_id: callId,
+          call_id: normalizeCodexCallId(callId),
           output: outText,
         })
       }
@@ -258,7 +266,7 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
       if (callId) {
         rawInput.push({
           type: 'function_call_output',
-          call_id: callId,
+          call_id: normalizeCodexCallId(callId),
           output: outText,
         })
       }

package/lib/rotate.js

@@ -103,7 +103,7 @@ export function pickAccount(accounts, nowMs, opts) {
 
     if (!opts || opts.autoPacing !== false) {
       if (acc.pacingRisk === undefined) {
-        const rem = acc.quota?.remainingPercent ?? (acc.usagePercent != null ? (100 - Number(acc.usagePercent)) : null)
+        const rem = acc.quota?.remainingPercent ?? (acc.quota?.usedPercent != null ? (100 - Number(acc.quota.usedPercent)) : (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)

package/lib/routes/accounts.js

@@ -29,7 +29,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -55,7 +55,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -83,7 +83,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -111,7 +111,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -133,7 +133,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -198,7 +198,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -244,7 +244,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -292,7 +292,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -340,7 +340,7 @@ export function registerAccountsRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -366,7 +366,7 @@ export function registerAccountsRoutes(ctx, state) {
       writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
       return
     }
-    if (!isTrustedSettingsRequest(req)) {
+    if (!isTrustedSettingsRequest(req, ctx)) {
       writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
       return
     }
@@ -411,7 +411,7 @@ export function registerAccountsRoutes(ctx, state) {
       writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
       return
     }
-    if (!isTrustedSettingsRequest(req)) {
+    if (!isTrustedSettingsRequest(req, ctx)) {
       writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
       return
     }

package/lib/routes/oauth.js

@@ -102,7 +102,7 @@ export function registerOauthRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -155,7 +155,7 @@ export function registerOauthRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -231,7 +231,7 @@ export function registerOauthRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }

package/lib/routes/proxy.js

@@ -19,7 +19,7 @@ export function registerProxyRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -46,7 +46,7 @@ export function registerProxyRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET or POST' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -100,7 +100,7 @@ export function registerProxyRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }

package/lib/routes/status.js

@@ -65,7 +65,7 @@ export function registerStatusRoutes(ctx, state) {
     path: '/dsh-subscriptions/config',
     handler: safeJsonHandler(async (req, res) => {
       if (req.method === 'GET') {
-        if (!isTrustedSettingsRequest(req)) {
+        if (!isTrustedSettingsRequest(req, ctx)) {
           writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
           return
         }
@@ -76,7 +76,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET or PUT' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'settings writes are same-origin only' } })
         return
       }
@@ -125,7 +125,7 @@ export function registerStatusRoutes(ctx, state) {
         if (Array.isArray(payload.slots)) payload.slots = stripLegacySlots(payload.slots)
         const parsed = plainConfig(Config(payload))
         const dropped = droppedCredentialRefs(live().slots, parsed.slots)
-        await getSettingsApi().replace(parsed)
+        await getSettingsApi().replace(parsed, curRev)
         currentRevision++
         syncCustomVendors()
         for (const ref of dropped) {
@@ -134,6 +134,17 @@ export function registerStatusRoutes(ctx, state) {
         await syncAdapter()
         writeJson(res, 200, await configResponse())
       } catch (e) {
+        if (/conflict/i.test(String(e && e.message || ''))) {
+          writeJson(res, 409, {
+            ok: false,
+            error: {
+              code: 'conflict',
+              message: String(e && e.message || e),
+              currentRevision: getCurrentRevision(),
+            },
+          })
+          return
+        }
         writeJson(res, 400, { ok: false, error: { code: 'save', message: String(e && e.message || e) } })
       }
     }),
@@ -145,7 +156,7 @@ export function registerStatusRoutes(ctx, state) {
     path: '/dsh-subscriptions/status',
     handler: safeJsonHandler(async (req, res) => {
       if (req.method === 'DELETE') {
-        if (!isTrustedSettingsRequest(req)) {
+        if (!isTrustedSettingsRequest(req, ctx)) {
           writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
           return
         }
@@ -157,7 +168,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET or DELETE only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -236,7 +247,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -254,7 +265,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -334,7 +345,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -357,7 +368,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -377,7 +388,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }
@@ -487,7 +498,7 @@ export function registerStatusRoutes(ctx, state) {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
-      if (!isTrustedSettingsRequest(req)) {
+      if (!isTrustedSettingsRequest(req, ctx)) {
         writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
         return
       }

package/lib/tools-normalizer.js

@@ -12,6 +12,7 @@ export function sanitizeDescription(desc) {
 
 export function normalizeJsonSchema(schema, depth = 0) {
   if (depth > 12) return { type: "string" }
+  if (typeof schema === "boolean") return schema
   if (!schema || typeof schema !== "object") {
     return { type: "object" }
   }

package/lib/updater.js

@@ -23,13 +23,13 @@ export function isLoopback(value) {
     || address?.startsWith('::ffff:127.') === true
 }
 
-export function isTrustedUpdateRequest(request) {
+export function isTrustedUpdateRequest(request, targetCtx) {
   const customHeader = header(request, UPDATE_HEADER)
   if (customHeader === '1') {
     const remote = request.socket?.remoteAddress
     if (remote && isLoopback(remote)) return true
   }
-  return isTrustedSettingsRequest(request)
+  return isTrustedSettingsRequest(request, targetCtx)
 }
 
 function validProfileName(value) {
@@ -295,7 +295,7 @@ export function registerPluginUpdater(ctx, options) {
           response.end()
           return
         }
-        if (!isTrustedUpdateRequest(request)) {
+        if (!isTrustedUpdateRequest(request, ctx)) {
           writeJson(response, 403, { ok: false, error: { code: 'forbidden', message: 'Rejected non-local or cross-origin update request.' } })
           return
         }

package/lib/vendors/codex.js

@@ -31,6 +31,7 @@ export function defaults() {
     baseUrl: 'https://chatgpt.com/backend-api/codex',
     originator: 'codex_cli_rs',
     models: [
+      { id: 'gpt-6.1-sol', name: 'GPT-6.1 Sol' },
       { id: 'gpt-6-astra', name: 'GPT-6 Astra' },
       { id: 'gpt-6-sol', name: 'GPT-6 Sol' },
       { id: 'gpt-6-luna', name: 'GPT-6 Luna' },
@@ -39,7 +40,7 @@ export function defaults() {
       { id: 'gpt-5.6-luna', name: 'GPT-5.6 Luna' },
       { id: 'gpt-5.5', name: 'GPT-5.5' },
     ],
-    clientVersion: '0.157.1',
+    clientVersion: '0.160.0',
   }
 }
 

package/package.json

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