@goodandready/dsh-subscriptions 0.6.22 → 0.6.24

package/lib/client.js

@@ -4,9 +4,6 @@ window.__ModuleLoader__.load({
     var module = { exports: {} }
     var exports = module.exports
     const React = require('react')
-    const createPortal = (function () {
-      try { return require('react-dom').createPortal } catch { return null }
-    })()
 
     // Modular translator: shared by component subscriptions and helpers.
     let t = (key) => key
@@ -21,15 +18,15 @@ window.__ModuleLoader__.load({
         return { hasError: true, error }
       }
       componentDidCatch(error, info) {
-        try { console.error("[dsh-subscriptions UI error]", error, info) } catch (err) { /* fallback if console fails */ }
+        try { console.error("[dsh-subscriptions UI error]", error, info) } catch { /* fallback if console fails */ }
       }
       render() {
         if (this.state.hasError) {
           return React.createElement(
             "div",
-            { style: { padding: "12px", border: "1px solid var(--dsw-alias-state-error-primary, #e5534b)", borderRadius: "8px", background: "var(--dsw-alias-bg-layer-2, #1f1f1f)", margin: "8px 0", fontSize: "13px" } },
-            React.createElement("div", { style: { fontWeight: 600, color: "var(--dsw-alias-state-error-primary, #e5534b)", marginBottom: "4px" } }, "Subscriptions UI error"),
-            React.createElement("div", { style: { color: "var(--dsw-alias-label-secondary, #8b949e)", fontSize: "12px", marginBottom: "8px" } }, String(this.state.error && this.state.error.message || this.state.error || "Unknown error")),
+            { style: { padding: "12px", border: "1px solid var(--dsw-alias-state-error-primary)", borderRadius: "8px", background: "var(--dsw-alias-bg-layer-2)", margin: "8px 0", fontSize: "13px" } },
+            React.createElement("div", { style: { fontWeight: 600, color: "var(--dsw-alias-state-error-primary)", marginBottom: "4px" } }, "Subscriptions UI error"),
+            React.createElement("div", { style: { color: "var(--dsw-alias-label-secondary)", fontSize: "12px", marginBottom: "8px" } }, String(this.state.error && this.state.error.message || this.state.error || "Unknown error")),
             React.createElement("button", {
               className: "dsub-mini",
               onClick: () => this.setState({ hasError: false, error: null })
@@ -63,7 +60,7 @@ window.__ModuleLoader__.load({
     '.dsub-helpBox{margin-top:8px;padding:12px 14px;border-radius:8px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);font-size:12px;line-height:1.6}' +
     '.dsub-helpHead{display:flex;align-items:center;justify-content:space-between;font-weight:600;margin-bottom:8px;color:var(--dsw-alias-brand-primary)}' +
     '.dsub-helpStep{margin-bottom:6px;color:var(--dsw-alias-label-primary)}' +
-    '.dsub-btnActive{background:var(--dsw-alias-brand-primary);color:var(--dsw-alias-text-contrast,#fff);border-color:var(--dsw-alias-brand-primary)}' +
+    '.dsub-btnActive{background:var(--dsw-alias-brand-primary);color:var(--dsw-alias-text-contrast);border-color:var(--dsw-alias-brand-primary)}' +
     '.dsub-h{font-size:13.5px;font-weight:600;color:var(--dsw-alias-label-primary)}' +
     '.dsub-sub{font-size:12px;color:var(--dsw-alias-label-secondary)}' +
     '.dsub-dim{font-size:11.5px;color:var(--dsw-alias-label-tertiary)}' +
@@ -77,7 +74,7 @@ window.__ModuleLoader__.load({
     '.dsub-inp{height:30px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);border-radius:6px;padding:0 8px;font-size:12px;min-width:180px}' +
     '.dsub-inp:focus{outline:none;border-color:var(--dsw-alias-brand-primary)}' +
     '.dsub-box{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:10px;margin-top:8px;background:var(--dsw-alias-bg-layer-2)}' +
-    '.dsub-cooldown{display:inline-block;padding:2px 6px;border-radius:4px;background:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-bg-layer-1,#000);font-size:11px;font-weight:600}' +
+    '.dsub-cooldown{display:inline-block;padding:2px 6px;border-radius:4px;background:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-bg-layer-1);font-size:11px;font-weight:600}' +
     '.dsub-bar{position:relative;height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden;flex:1;min-width:80px}' +
     '.dsub-barFill{height:100%;border-radius:3px;background:var(--dsw-alias-state-success-primary);transition:width .2s}' +
     '.dsub-barWarn .dsub-barFill{background:var(--dsw-alias-state-warning-primary)}' +
@@ -91,10 +88,10 @@ window.__ModuleLoader__.load({
     '.dsub-pill:active{transform:translateY(0)}' +
     '.dsub-pillTag{padding:1px 5px;border-radius:4px;font-size:10.5px;font-weight:700;letter-spacing:.02em;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary)}' +
     '.dsub-led{width:7px;height:7px;border-radius:50%;flex:none;transition:all .2s ease}' +
-    '.dsub-ledOk{background:var(--dsw-alias-state-success-primary,#10b981);box-shadow:0 0 6px color-mix(in srgb,var(--dsw-alias-state-success-primary) 70%,transparent)}' +
-    '.dsub-ledWarn{background:var(--dsw-alias-state-warning-primary,#f59e0b);box-shadow:0 0 6px color-mix(in srgb,var(--dsw-alias-state-warning-primary) 70%,transparent)}' +
-    '.dsub-ledBad{background:var(--dsw-alias-state-error-primary,#ef4444);box-shadow:0 0 6px color-mix(in srgb,var(--dsw-alias-state-error-primary) 70%,transparent)}' +
-    '.dsub-ledOff{background:var(--dsw-alias-label-tertiary,#6b7280)}' +
+    '.dsub-ledOk{background:var(--dsw-alias-state-success-primary);box-shadow:0 0 6px color-mix(in srgb,var(--dsw-alias-state-success-primary) 70%,transparent)}' +
+    '.dsub-ledWarn{background:var(--dsw-alias-state-warning-primary);box-shadow:0 0 6px color-mix(in srgb,var(--dsw-alias-state-warning-primary) 70%,transparent)}' +
+    '.dsub-ledBad{background:var(--dsw-alias-state-error-primary);box-shadow:0 0 6px color-mix(in srgb,var(--dsw-alias-state-error-primary) 70%,transparent)}' +
+    '.dsub-ledOff{background:var(--dsw-alias-label-tertiary)}' +
     '.dsub-modalWrap{position:fixed;inset:0;z-index:10020;display:grid;place-items:center;background:color-mix(in srgb, black 65%, transparent);backdrop-filter:blur(10px);animation:dsubFadeIn .16s ease-out}' +
     '.dsub-modal{width:min(520px,94vw);max-height:min(85vh,720px);overflow-y:auto;border:1px solid var(--dsw-alias-border-l1);border-radius:16px;background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);box-shadow:0 24px 64px color-mix(in srgb, black 60%, transparent),0 0 0 1px color-mix(in srgb, white 7%, transparent);padding:20px;animation:dsubScaleIn .18s cubic-bezier(.16,1,.3,1)}' +
     '@keyframes dsubFadeIn{from{opacity:0}to{opacity:1}}' +
@@ -160,11 +157,11 @@ window.__ModuleLoader__.load({
     '.dsub-brandBadge{width:32px;height:32px;border-radius:8px;display:grid;place-items:center;font-size:12px;font-weight:700;flex-shrink:0}' +
     '.dsub-brandCodex{background:color-mix(in srgb,var(--dsw-alias-state-success-primary) 15%,transparent);color:var(--dsw-alias-state-success-primary);border:1px solid color-mix(in srgb,var(--dsw-alias-state-success-primary) 30%,transparent)}' +
     '.dsub-brandClaude{background:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 15%,transparent);color:var(--dsw-alias-state-warning-primary);border:1px solid color-mix(in srgb,var(--dsw-alias-state-warning-primary) 30%,transparent)}' +
-    '.dsub-brandGrok{background:color-mix(in srgb,#a855f7 15%,transparent);color:#c084fc;border:1px solid color-mix(in srgb,#a855f7 30%,transparent)}' +
+    '.dsub-brandGrok{background:color-mix(in srgb,var(--dsw-alias-accent-primary, var(--dsw-alias-brand-primary)) 15%,transparent);color:var(--dsw-alias-accent-primary, var(--dsw-alias-brand-primary));border:1px solid color-mix(in srgb,var(--dsw-alias-accent-primary, var(--dsw-alias-brand-primary)) 30%,transparent)}' +
     '.dsub-brandAgy{background:color-mix(in srgb,var(--dsw-alias-brand-primary) 15%,transparent);color:var(--dsw-alias-brand-primary);border:1px solid color-mix(in srgb,var(--dsw-alias-brand-primary) 30%,transparent)}' +
     '.dsub-brandOllama{background:color-mix(in srgb,var(--dsw-alias-label-tertiary) 15%,transparent);color:var(--dsw-alias-label-secondary);border:1px solid color-mix(in srgb,var(--dsw-alias-label-tertiary) 30%,transparent)}' +
-    '.dsub-brandKimi{background:color-mix(in srgb,#ec4899 15%,transparent);color:#f472b6;border:1px solid color-mix(in srgb,#ec4899 30%,transparent)}' +
-    '.dsub-brandGlm{background:color-mix(in srgb,#14b8a6 15%,transparent);color:#2dd4bf;border:1px solid color-mix(in srgb,#14b8a6 30%,transparent)}' +
+    '.dsub-brandKimi{background:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 15%,transparent);color:var(--dsw-alias-state-warning-primary);border:1px solid color-mix(in srgb,var(--dsw-alias-state-warning-primary) 30%,transparent)}' +
+    '.dsub-brandGlm{background:color-mix(in srgb,var(--dsw-alias-state-info-primary, var(--dsw-alias-brand-primary)) 15%,transparent);color:var(--dsw-alias-state-info-primary, var(--dsw-alias-brand-primary));border:1px solid color-mix(in srgb,var(--dsw-alias-state-info-primary, var(--dsw-alias-brand-primary)) 30%,transparent)}' +
     '.dsub-planBadge{display:inline-flex;align-items:center;padding:1px 6px;border-radius:4px;font-size:10px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px;background:color-mix(in srgb,var(--dsw-alias-brand-primary) 15%,transparent);color:var(--dsw-alias-brand-primary);border:1px solid color-mix(in srgb,var(--dsw-alias-brand-primary) 30%,transparent);margin-left:6px}' +
     
     '.dsub-accInfo{flex:1;min-width:0;display:flex;flex-direction:column;gap:3px}' +
@@ -176,7 +173,7 @@ window.__ModuleLoader__.load({
     '.dsub-statusBad{background:color-mix(in srgb,var(--dsw-alias-state-error-primary) 15%,transparent);color:var(--dsw-alias-state-error-primary)}' +
     '.dsub-statusOff{background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-tertiary)}' +
     '.dsub-modalFoot{display:flex;align-items:center;justify-content:space-between;margin-top:16px;padding-top:12px;border-top:1px solid var(--dsw-alias-border-l2)}' +
-    '.dsub-btnPrimary{display:inline-flex;align-items:center;gap:6px;padding:6px 12px;border-radius:8px;font-size:12px;font-weight:600;background:var(--dsw-alias-brand-primary,#3b82f6);color:var(--dsw-alias-text-contrast,#fff);border:0;cursor:pointer;transition:opacity .15s}' +
+    '.dsub-btnPrimary{display:inline-flex;align-items:center;gap:6px;padding:6px 12px;border-radius:8px;font-size:12px;font-weight:600;background:var(--dsw-alias-brand-primary);color:var(--dsw-alias-text-contrast);border:0;cursor:pointer;transition:opacity .15s}' +
     '.dsub-btnPrimary:hover{opacity:.9}' +
     '.dsub-btnSec{display:inline-flex;align-items:center;gap:5px;padding:5px 10px;border-radius:7px;font-size:11.5px;font-weight:500;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary);border:1px solid var(--dsw-alias-border-l2);cursor:pointer;text-decoration:none;transition:all .15s}' +
     '.dsub-btnSec:hover{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-label-tertiary)}' +
@@ -696,7 +693,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           if (parsed.error && parsed.error.message) text = parsed.error.message
           else if (parsed.message) text = parsed.message
           else if (parsed.code) text = parsed.code
-        } catch (e) { /* ignore parse error */ }
+        } catch { /* ignore parse error */ }
       }
       var firstLine = text.split('\n')[0].trim()
       if (firstLine.length > 160) return firstLine.slice(0, 157) + '...'
@@ -767,7 +764,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     function badgeFor(account, t) {
       if (!account || !account.configured) return t('notConnected')
       if (account.validationUrl) return t('verifyAccount')
-      // #303: a quarantined account says why it is parked.
+      // Issue 303: a quarantined account says why it is parked.
       if (account.quarantineReason && account.quarantineUntil && account.quarantineUntil > Date.now()) {
         return account.quarantineReason === 'VERIFY' ? t('verifyAccount') : String(account.quarantineReason)
       }
@@ -783,7 +780,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     try {
       const primitives = require('@deepseek-ai/dsh-client-ui-primitives')
       ChevronIcon = primitives && primitives.IconChevronDownOutline14
-    } catch (noPrimitives) {
+    } catch {
       ChevronIcon = null
     }
     function FallbackChevron(props) {
@@ -863,7 +860,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           .then((d) => {
             const txt = d && d.ok ? JSON.stringify(d.report, null, 2) : ('error: ' + ((d && d.error && d.error.message) || 'unknown'))
             setDiag(txt)
-            try { navigator.clipboard.writeText(txt) } catch (err) { /* clipboard write disallowed */ }
+            try { navigator.clipboard.writeText(txt) } catch { /* clipboard write disallowed */ }
           })
           .catch((e) => setDiag('error: ' + String(e && e.message || e)))
       }
@@ -937,8 +934,10 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       const [openHelp, setOpenHelp] = React.useState({})
       const [err, setErr] = React.useState('')
       const [info, setInfo] = React.useState('')
+      const [revision, setRevision] = React.useState(null)
 
       const applyPayload = (data) => {
+        if (data && data.revision != null) setRevision(data.revision)
         setDraft(JSON.parse(JSON.stringify((data && data.config) || {})))
         setAccounts((data && data.accounts) || [])
         setProviders((data && data.providers) || [])
@@ -998,13 +997,20 @@ const cssId = 'dsh-subscriptions/settings.module.css'
 
       const save = async () => {
         setErr(''); setSaved(false)
+        const payload = revision != null ? Object.assign({}, draft, { revision }) : draft
         const res = await fetch('/dsh-subscriptions/config', {
           method: 'PUT',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(draft),
+          body: JSON.stringify(payload),
         })
         const data = await res.json().catch(() => ({}))
-        if (!res.ok) throw new Error((data.error && data.error.message) || ('HTTP ' + res.status))
+        if (!res.ok) {
+          if (res.status === 409) {
+            reload().catch(() => {})
+            throw new Error((data.error && data.error.message) || 'Configuration modified concurrently; reloaded.')
+          }
+          throw new Error((data.error && data.error.message) || ('HTTP ' + res.status))
+        }
         applyPayload(data)
         setSaved(true); setTimeout(() => setSaved(false), 2000)
       }
@@ -1251,7 +1257,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           React.createElement('div', { style: { padding: '8px 0', overflowX: 'auto' } },
             React.createElement('table', { style: { width: '100%', fontSize: '12px', borderCollapse: 'collapse' } },
               React.createElement('thead', null,
-                React.createElement('tr', { style: { borderBottom: '1px solid var(--dsw-alias-border-primary, rgba(255,255,255,0.1))', textAlign: 'left', opacity: 0.7 } },
+                React.createElement('tr', { style: { borderBottom: '1px solid var(--dsw-alias-border-primary)', textAlign: 'left', opacity: 0.7 } },
                   React.createElement('th', { style: { padding: '6px' } }, t('healthAccount')),
                   React.createElement('th', { style: { padding: '6px' } }, t('healthScore')),
                   React.createElement('th', { style: { padding: '6px' } }, t('healthLatency')),
@@ -1262,11 +1268,11 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               React.createElement('tbody', null,
                 accounts.map((acc, idx) => {
                   const sc = acc.healthScore != null ? acc.healthScore : 100
-                  const healthColor = sc >= 80 ? '#10b981' : (sc >= 50 ? '#f59e0b' : '#ef4444')
+                  const healthColor = sc >= 80 ? 'var(--dsw-alias-state-success-primary)' : (sc >= 50 ? 'var(--dsw-alias-state-warning-primary)' : 'var(--dsw-alias-state-error-primary)')
                   const isQ = acc.status === 'quarantine' || (acc.quarantineUntil && Number(acc.quarantineUntil) > Date.now())
                   const statusLabel = isQ ? ('⛔ ' + t('healthQuarantine')) : (acc.status === 'probing' ? ('🟡 ' + t('healthWarmup')) : (acc.configured ? ('🟢 ' + t('healthActive')) : ('⚪ ' + t('healthIdle'))))
                   const pct = acc.usagePercent != null ? Math.round(acc.usagePercent) : null
-                  return React.createElement('tr', { key: (acc.ref || acc.provider + acc.index || idx), style: { borderBottom: '1px solid var(--dsw-alias-border-secondary, rgba(255,255,255,0.05))' } },
+                  return React.createElement('tr', { key: (acc.ref || acc.provider + acc.index || idx), style: { borderBottom: '1px solid var(--dsw-alias-border-secondary)' } },
                     React.createElement('td', { style: { padding: '6px', fontWeight: 600 } }, (acc.provider ? acc.provider.toUpperCase() : 'LLM') + ' #' + (acc.index || 1) + (acc.label ? ' (' + acc.label + ')' : '')),
                     React.createElement('td', { style: { padding: '6px', color: healthColor } }, sc + '%'),
                     React.createElement('td', { style: { padding: '6px' } }, acc.latencyMs ? acc.latencyMs + ' ms' : '—'),
@@ -1481,7 +1487,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           diag ? React.createElement('div', { className: 'dsub-row' },
             React.createElement('button', {
               type: 'button', className: 'dsub-mini',
-              onClick: () => { try { navigator.clipboard.writeText(diag) } catch (err) { /* clipboard write error */ } },
+              onClick: () => { try { navigator.clipboard.writeText(diag) } catch { /* clipboard write error */ } },
             }, t('diagCopy')),
             React.createElement('pre', { className: 'dsub-diag' }, diag),
           ) : null,
@@ -1650,7 +1656,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                       React.createElement('div', { className: 'dsub-row' },
                         React.createElement('button', {
                           type: 'button', className: 'dsub-mini',
-                          onClick: () => { try { navigator.clipboard.writeText(d.userCode) } catch (err) { /* clipboard write error */ } },
+                          onClick: () => { try { navigator.clipboard.writeText(d.userCode) } catch { /* clipboard write error */ } },
                         }, t('deviceCopy')),
                         React.createElement('a', { href: d.authUrl, target: '_blank', rel: 'noopener noreferrer', className: 'dsub-mini' }, t('verifyLink')),
                       ),
@@ -1876,7 +1882,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       const addLocale = (locale, dictionary) => {
         try {
           return ctx.locale.register(NS, locale, dictionary)
-        } catch (alreadyTaken) {
+        } catch {
           return () => {}
         }
       }
@@ -1889,51 +1895,59 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       // The canonical place is the Plugins tab: a card with its own header
       // and collapse instead of a row in the side list. The registration key must
       // equal the settings namespace, otherwise the tab silently hides the slot.
-      try {
-        // Plugin-list seat (plugins.item) first: the seat the current core
-        // (0.1.6-alpha.2) renders as the plugin's own page with its configuration. The
-        // label is a static string on purpose — it is resolved while the page renders,
-        // and a locale lookup there would take the whole client batch down with it.
-        ctx.slots.inject('plugins.item', () => ctx.slots.register(
-          {
-            name: 'plugins.item',
-            id: ROW_ID,
-            order: 60,
-            label: () => t('title') || 'Subscriptions',
-            locale: NS,
-            inject: () => ({ ctx: ctx }),
-          },
-          PluginCard,
-        ))
-        // Row seat and the legacy seat stay as fallbacks.
-        ctx.slots.inject('plugins.row.config', () => ctx.slots.register(
-          {
-            name: 'plugins.row.config',
-            key: ROW_CONFIG_KEY,
-            locale: NS,
-            inject: () => ({ ctx: ctx }),
-          },
-          PluginCard,
-        ))
-        ctx.slots.inject('settings.plugin.item', () => ctx.slots.register(
-          {
-            name: 'settings.plugin.item',
-            key: NS,
-            locale: NS,
-            inject: () => ({ ctx: ctx }),
-          },
-          PluginCard,
-        ))
-      } catch (e) {
-        // Slot system not available — expected on headless / non-web profiles.
-      }
+      ctx.effect(() => {
+        const cleanups = []
+        try {
+          if (ctx.slots && typeof ctx.slots.inject === 'function') {
+            const un1 = ctx.slots.inject('plugins.item', () => ctx.slots.register(
+              {
+                name: 'plugins.item',
+                id: ROW_ID,
+                order: 60,
+                label: () => t('title') || 'Subscriptions',
+                locale: NS,
+                inject: () => ({ ctx: ctx }),
+              },
+              PluginCard,
+            ))
+            if (typeof un1 === 'function') cleanups.push(un1)
+
+            const un2 = ctx.slots.inject('plugins.row.config', () => ctx.slots.register(
+              {
+                name: 'plugins.row.config',
+                key: ROW_CONFIG_KEY,
+                locale: NS,
+                inject: () => ({ ctx: ctx }),
+              },
+              PluginCard,
+            ))
+            if (typeof un2 === 'function') cleanups.push(un2)
+
+            const un3 = ctx.slots.inject('settings.plugin.item', () => ctx.slots.register(
+              {
+                name: 'settings.plugin.item',
+                key: NS,
+                locale: NS,
+                inject: () => ({ ctx: ctx }),
+              },
+              PluginCard,
+            ))
+            if (typeof un3 === 'function') cleanups.push(un3)
+          }
+        } catch {
+          // Slot system not available — expected on headless / non-web profiles.
+        }
+        return () => {
+          for (const off of cleanups) {
+            try { off() } catch { /* best-effort cleanup */ }
+          }
+        }
+      }, 'dsh-subscriptions: settings slots')
     }
 
     // Hot provider switcher in the composer row: a click cycles
     // the active subscription provider for the next request.
-    let activeIdx = 0
-    let labelEl = null
-    const ORDER = ['codex', 'claude', 'grok', 'antigravity']
+        const ORDER = ['codex', 'claude', 'grok', 'antigravity']
 
     async function refreshLoggedIn() {
       try {
@@ -1970,7 +1984,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       windows[key] = { samples: samples.filter((x) => x.at >= now - 24 * 60 * 60 * 1000).slice(-192) }
     }
 
-    function fcEstimate(key, remaining, now) {
+    function fcEstimate(key, remaining) {
       const rec = fcSamples.windows[key]
       if (!rec) return { status: 'calibrating' }
       const samples = rec.samples
@@ -2144,7 +2158,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   className: 'dsub-barFillGrad',
                   style: {
                     width: Math.min(100, Math.max(0, primPct)) + '%',
-                    background: primPct >= 90 ? 'var(--dsw-alias-state-error-primary,#ef4444)' : (primPct >= 50 ? 'var(--dsw-alias-state-warning-primary,#f59e0b)' : 'var(--dsw-alias-state-success-primary,#10b981)'),
+                    background: primPct >= 90 ? 'var(--dsw-alias-state-error-primary)' : (primPct >= 50 ? 'var(--dsw-alias-state-warning-primary)' : 'var(--dsw-alias-state-success-primary)'),
                   },
                 }),
               ),
@@ -2271,7 +2285,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   try {
                     const btn = Array.from(document.querySelectorAll('button')).find((b) => (b.textContent || '').includes(t('title')))
                     if (btn) btn.click()
-                  } catch (err) { /* best-effort */ }
+                  } catch { /* best-effort */ }
                 },
               }, t('subsOpenSettings')),
             ),
@@ -2290,7 +2304,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 15,
               locale: NS,
             },
-            (props) => React.createElement(ErrorBoundary, null, React.createElement(SubsPill, { t })),
+            () => React.createElement(ErrorBoundary, null, React.createElement(SubsPill, { t })),
           ),
         )
       }, 'dsh-subscriptions: subs pill')
@@ -2306,7 +2320,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 5,
               locale: NS,
             },
-            (props) => React.createElement(ErrorBoundary, null, React.createElement(ComposerQuota, { t })),
+            () => React.createElement(ErrorBoundary, null, React.createElement(ComposerQuota, { t })),
           ),
         )
       }, 'dsh-subscriptions: composer quota')

package/lib/code-assist.js

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto'
 import { httpError, readJson } from './wire.js'
-import { validationFromLoadCodeAssist, validationFromHttpError, noticeFromLoadCodeAssist, validationRequiredError } from './google-validation.js'
+import { validationFromLoadCodeAssist, noticeFromLoadCodeAssist, validationRequiredError } from './google-validation.js'
 import { asUsageSnapshot, usageWindows, deepestUsedPercent } from './usage.js'
 
 export const CODE_ASSIST_PROD = 'https://cloudcode-pa.googleapis.com/v1internal'

package/lib/config-schema.js

@@ -56,6 +56,8 @@ export const Config = z.object({
     .description('#84 Composer quota indicator mode: off, percent, bar or forecast (predictive runway from a sliding window).'),
   codexRedirectUri: z.string().default(''),
   codexBaseUrl: z.string().default(''),
+  codexClientVersion: z.string().default('')
+    .description('Codex CLI identity version for /models catalog gating (e.g. 0.157.1). Empty uses the built-in default.'),
   claudeClientId: z.string().default(''),
   claudeRedirectUri: z.string().default(''),
   grokClientId: z.string().default(''),
@@ -64,10 +66,8 @@ export const Config = z.object({
   grokClientVersion: z.string().default('')
     .description('Grok CLI identity version header. Empty uses the built-in default.'),
   antigravityClientId: z.string().default(''),
-  antigravityClientSecret: z.string().default('')
-    .description('Google Cloud OAuth Client Secret for Antigravity.'),
   antigravityRedirectUri: z.string().default(''),
-    cascadingFallback: z.boolean().default(false)
+  cascadingFallback: z.boolean().default(false)
     .description('#349 Opt-in cross-vendor fallback when all accounts of a provider are exhausted or rate limited.'),
   cascadingChain: z.any().default({})
     .description('#349 Custom cross-vendor fallback chains (e.g. { claude: ["copilot", "cursor"] }).'),
@@ -82,11 +82,53 @@ export const Config = z.object({
 })
 
 export function publicConfig(cfg) {
+  if (!cfg || typeof cfg !== "object") return cfg
   const clone = { ...cfg }
-  // #242: redact all *ClientSecret fields before exposing config via GET /config.
-  // Secrets must never leave the server; the UI does not need them.
+  // #242, #252: redact secret fields before exposing config via GET /config.
   for (const key of Object.keys(clone)) {
-    if (key.endsWith('ClientSecret')) clone[key] = clone[key] ? '••••••' : ''
+    if (key.endsWith("ClientSecret") || key.endsWith("Secret")) {
+      clone[key] = clone[key] ? "••••••" : ""
+    }
   }
+
+  // Redact credentials in slots (proxyUrl with user:pass)
+  if (Array.isArray(clone.slots)) {
+    clone.slots = clone.slots.map((s) => {
+      if (!s || typeof s !== "object" || !s.proxyUrl) return s
+      try {
+        const u = new URL(s.proxyUrl)
+        if (u.password || u.username) {
+          const auth = u.username ? (u.password ? `${u.username}:${u.password}` : u.username) : `:${u.password}`
+          const safeAuth = u.username ? `${u.username}:••••••` : `:••••••`
+          return { ...s, proxyUrl: s.proxyUrl.replace(auth + "@", safeAuth + "@") }
+        }
+      } catch { /* ignore non-standard url */ }
+      return s
+    })
+  }
+
+  // Redact credentials in customVendors (apiKey, token, secret, Authorization headers)
+  if (Array.isArray(clone.customVendors)) {
+    clone.customVendors = clone.customVendors.map((cv) => {
+      if (!cv || typeof cv !== "object") return cv
+      const copy = { ...cv }
+      if (copy.apiKey) copy.apiKey = "••••••"
+      if (copy.token) copy.token = "••••••"
+      if (copy.secret) copy.secret = "••••••"
+      if (copy.clientSecret) copy.clientSecret = "••••••"
+      if (copy.headers && typeof copy.headers === "object") {
+        const h = { ...copy.headers }
+        for (const hk of Object.keys(h)) {
+          const lower = hk.toLowerCase()
+          if (lower === "authorization" || lower.includes("key") || lower.includes("token") || lower.includes("secret")) {
+            h[hk] = "••••••"
+          }
+        }
+        copy.headers = h
+      }
+      return copy
+    })
+  }
+
   return clone
 }

package/lib/diagnostics.js

@@ -0,0 +1,60 @@
+import { maskText } from './mask.js'
+import { normalizeSlots } from './accounts.js'
+import { PROVIDERS } from './refs.js'
+
+export function scrubReport(v) {
+  if (typeof v === 'string') return maskText(v)
+  if (Array.isArray(v)) return v.map(scrubReport)
+  if (v && typeof v === 'object') {
+    const o = {}
+    for (const k of Object.keys(v)) o[k] = scrubReport(v[k])
+    return o
+  }
+  return v
+}
+
+export async function createDiagnosticsReport({ live, store, history, NS, pkgVersion }) {
+  const cfg = live()
+  const slots = normalizeSlots(cfg.slots)
+  const mk = () => ({ loggedIn: false, slots: 0, configured: 0, cooldown: 0, proxy: 0, maxUsagePercent: null })
+  const providers = {}
+  for (const p of PROVIDERS) providers[p] = mk()
+  const logged = await store.loggedInProviders()
+  for (const slot of slots) {
+    const pv = providers[slot.provider] || (providers[slot.provider] = mk())
+    pv.slots++
+    if (slot.proxyUrl) pv.proxy++
+    try {
+      const info = await store.describeRef(slot.ref)
+      if (info.configured) pv.configured++
+      if (info.cooldownUntil && info.cooldownUntil > Date.now()) pv.cooldown++
+      if (info.usagePercent != null) pv.maxUsagePercent = Math.max(pv.maxUsagePercent || 0, Math.round(info.usagePercent))
+    } catch { /* best-effort */ }
+  }
+  for (const p of Object.keys(providers)) providers[p].loggedIn = logged.includes(p)
+  const rows = history.all()
+  const byStatus = {}
+  for (const r of rows) {
+    const k = (r.provider || '?') + ':' + (r.status || '?')
+    byStatus[k] = (byStatus[k] || 0) + 1
+  }
+  const lastErrors = rows.filter((r) => r.status && r.status >= 400).slice(0, 10)
+    .map((r) => ({ ts: r.ts, provider: r.provider, status: r.status, kind: r.kind || 'request', ms: r.ms || null }))
+  return scrubReport({
+    generatedAt: new Date().toISOString(),
+    plugin: NS + (pkgVersion ? ' v' + pkgVersion : ''),
+    runtime: { node: process.version, platform: process.platform, arch: process.arch, uptimeSec: Math.round(process.uptime()) },
+    providers,
+    requests: { total: rows.length, byStatus, lastErrors },
+    settings: {
+      cooldownMs: cfg.cooldownMs,
+      switchAtRemaining: cfg.switchAtRemaining,
+      probeIntervalMin: cfg.probeIntervalMin,
+      useWebCallback: !!cfg.useWebCallback,
+      autoLoopback: !!cfg.autoLoopback,
+      privacyMask: !!cfg.privacyMask,
+      customVendors: Array.isArray(cfg.customVendors) ? cfg.customVendors.length : 0,
+      proxySlots: slots.filter((s) => s.proxyUrl).length,
+    },
+  })
+}

package/lib/history.js

@@ -9,10 +9,11 @@ import { homedir } from 'node:os'
 export const DEFAULT_HISTORY_DIR = join(homedir(), '.dsh', 'storages', 'dsh-subscriptions')
 
 export class HistoryStore {
-  constructor(dir = DEFAULT_HISTORY_DIR, ttlMs = 7 * 24 * 60 * 60 * 1000, debounceMs = 0) {
+  constructor(dir = DEFAULT_HISTORY_DIR, ttlMs = 7 * 24 * 60 * 60 * 1000, debounceMs = 0, maxEntries = 1000) {
     this.dir = dir
     this.ttlMs = ttlMs
     this.debounceMs = debounceMs
+    this.maxEntries = maxEntries
     this.path = join(dir, 'history.json')
     this.rows = []
     this._persistTimer = null
@@ -39,6 +40,9 @@ export class HistoryStore {
     const cutoff = Date.now() - this.ttlMs
     const before = this.rows.length
     this.rows = this.rows.filter((r) => r && r.ts && r.ts >= cutoff)
+    if (this.rows.length > this.maxEntries) {
+      this.rows = this.rows.slice(0, this.maxEntries)
+    }
     if (this.rows.length !== before) this._persist()
   }
 
@@ -71,12 +75,28 @@ export class HistoryStore {
   add(entry) {
     if (!entry || typeof entry !== 'object') return this.rows.length
     this.rows.unshift({ ts: Date.now(), ...entry })
+    if (this.rows.length > this.maxEntries) {
+      this.rows = this.rows.slice(0, this.maxEntries)
+    }
     this._prune()
     this._persist()
     return this.rows.length
   }
 
   /** Last N entries (newest first). */
+  dispose() {
+    this.flush()
+    if (this._persistTimer) {
+      clearTimeout(this._persistTimer)
+      this._persistTimer = null
+    }
+    if (this._exitHandler && typeof process !== "undefined" && typeof process.removeListener === "function") {
+      process.removeListener("beforeExit", this._exitHandler)
+      this._exitHandler = null
+    }
+    this.rows = []
+  }
+
   recent(n) {
     return this.rows.slice(0, n)
   }