@hystudio/dsh-quota-pill 0.2.5 → 0.2.7

package/client.js

@@ -513,6 +513,30 @@ window.__ModuleLoader__.load({
           credits: null,
         }];
       }
+      // Prepaid wallets (official DeepSeek): a balance, plus optional bonus
+      // credit. Both are money, not percentages, so each needs its own row —
+      // collapsing them into one label silently loses the bonus.
+      if (v.kind === 'payg' && v.credits && typeof v.credits.remain === 'number') {
+        const rows = [{
+          key: 'balance',
+          label: pick(lang, 'balanceLeft'),
+          pct: null,
+          reset: '',
+          credits: { remain: v.credits.remain, unit: v.credits.unit },
+          money: true,
+        }];
+        if (v.bonus && typeof v.bonus.amount === 'number') {
+          rows.push({
+            key: 'bonus',
+            label: pick(lang, 'bonusBalance'),
+            pct: null,
+            reset: '',
+            credits: { remain: v.bonus.amount, unit: v.bonus.unit },
+            money: true,
+          });
+        }
+        return rows;
+      }
       if (v.kind !== 'subscription-quota' || v.remainingPct === null || v.remainingPct === undefined) {
         return [{ key: 'kind', label: describeQuota(v, lang).text, pct: null, reset: '', credits: null }];
       }
@@ -1250,7 +1274,7 @@ window.__ModuleLoader__.load({
     }
 
     function WindowRow(props) {
-      const { label, pct, reset, credits, lang, stale } = props;
+      const { label, pct, reset, credits, lang, stale, money: isMoney } = props;
       const isNum = typeof pct === 'number' && Number.isFinite(pct);
       const tweened = useTween(isNum ? pct : null, 450);
       // 首帧 tween 还没拿到起点时 shown 是 null；这时按目标值渲染静态读数，
@@ -1271,7 +1295,14 @@ window.__ModuleLoader__.load({
         h('div', { className: 'quota-pill-win-main' },
           h('div', { className: 'quota-pill-win-text' },
             h('span', { className: 'quota-pill-win-label', title: label }, label),
-            reset ? h('span', { className: 'quota-pill-win-reset', title: reset }, reset) : null,
+            // Reserve the reset line even when there is nothing to show.
+            // Conditionally omitting it made rows with a reset taller than those
+            // without one, so the column of numbers did not line up.
+            h('span', {
+              className: 'quota-pill-win-reset',
+              title: reset || undefined,
+              style: reset ? undefined : { visibility: 'hidden' },
+            }, reset || '\u00a0'),
           ),
           h('div', { className: 'quota-pill-win-gauge' },
             showCredits
@@ -1281,7 +1312,7 @@ window.__ModuleLoader__.load({
                     ? `${fmtAmount(credits.remain)} / ${fmtAmount(credits.total)}`
                       + (credits.unit ? ' ' + String(credits.unit) : '')
                     : undefined,
-                }, fmtCompact(credits.remain))
+                }, isMoney ? money(credits.remain, credits.unit) : fmtCompact(credits.remain))
               : isNum
                 ? h('span', {
                     className: 'quota-pill-win-pct',
@@ -1293,7 +1324,7 @@ window.__ModuleLoader__.load({
                     style: { color: remainingColor(shown) },
                   }, typeof shown === 'number' ? `${shown.toFixed(shown < 10 ? 1 : 0)}%` : '')
                 : null,
-            showCredits && unitLabel(credits.unit, lang)
+            showCredits && !isMoney && unitLabel(credits.unit, lang)
               ? h('span', { className: 'quota-pill-win-unit' }, unitLabel(credits.unit, lang))
               : null,
 
@@ -1313,7 +1344,7 @@ window.__ModuleLoader__.load({
         h('div', { className: 'quota-pill-group-head' }, name),
         // 组内行 key 带组名，避免不同 provider 的同名窗口（都是 5h/weekly）
         // 被 React 当成同一个组件实例，导致 tween 跨 provider 插值。
-        entries.map((e) => h(WindowRow, { key: `${name}|${e.key}`, label: e.label, pct: e.pct, reset: e.reset, credits: e.credits, lang, stale })),
+        entries.map((e) => h(WindowRow, { key: `${name}|${e.key}`, label: e.label, pct: e.pct, reset: e.reset, credits: e.credits, lang, stale, money: e.money })),
       );
     }
 
@@ -1388,7 +1419,7 @@ window.__ModuleLoader__.load({
             // key 带 provider：换 provider 时强制重挂载，让 tween 从「空」开始，
             // 而不是把 A 的 5h 平滑滑到 B 的 5h——那是两个不同账户的额度，
             // 中间的数字不代表任何真实状态。
-            entries.map((e) => h(WindowRow, { key: `${providerName}|${e.key}`, label: e.label, pct: e.pct, reset: e.reset, credits: e.credits, lang, stale })),
+            entries.map((e) => h(WindowRow, { key: `${providerName}|${e.key}`, label: e.label, pct: e.pct, reset: e.reset, credits: e.credits, lang, stale, money: e.money })),
           ),
           h('dl', { className: 'quota-pill-stats' },
             data.account ? statRow(pick(lang, 'account'), String(data.account)) : null,
@@ -1504,6 +1535,8 @@ window.__ModuleLoader__.load({
               '.quota-pill-win-unit{flex:none;margin-left:3px;color:var(--dsw-alias-label-tertiary)}',
 
               '.quota-pill-win-ring{flex:none;display:inline-flex}',
+              // 固定行高：没有重置时间的行也要占住这一行，数字才对得齐
+              '.quota-pill-win-reset{min-height:14px}',
               // Sidecar not running: show the fix instead of a bare dash.
               '.quota-pill-offline{display:flex;flex-direction:column;gap:6px;padding:10px 2px}',
               '.quota-pill-offline-title{font-weight:600;color:var(--dsw-alias-label-primary,inherit)}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hystudio/dsh-quota-pill",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "private": false,
   "type": "module",
   "description": "Quota pill for DeepSeek Harness: remaining quota for every LLM subscription you have, in one collapsible pill",

package/src/adapters-apikey.js

@@ -11,6 +11,27 @@ import { getJson } from './http.js';
 const clamp = (n, lo, hi) => Math.max(lo, Math.min(hi, n));
 const round2 = (n) => Math.round(n * 100) / 100;
 
+/**
+ * Normalise a reset timestamp to ISO, or null when there is none.
+ *
+ * Upstreams are inconsistent: some send ISO strings, some epoch milliseconds,
+ * and some use `0` to mean "this window has no reset pending" (Command Code's
+ * five-hour window does exactly that). Treating 0 as a date would render 1970.
+ */
+function isoReset(v) {
+  if (v == null || v === '' || v === 0) return null;
+  if (typeof v === 'string') {
+    // Already ISO-ish: keep as-is so the client formats it consistently.
+    const t = Date.parse(v);
+    return Number.isFinite(t) ? new Date(t).toISOString() : null;
+  }
+  const n = Number(v);
+  if (!Number.isFinite(n) || n <= 0) return null;
+  // Seconds vs milliseconds: anything below ~year 33658 in ms is really seconds.
+  const ms = n < 1e11 ? n * 1000 : n;
+  return new Date(ms).toISOString();
+}
+
 /** Expand `products` (window → used%) into the `windows` rows the pill renders. */
 function toWindows(products, resetByKey = {}) {
   const out = [];
@@ -217,7 +238,7 @@ export async function commandcode() {
     const pct = round2((Number(used) / Number(cap)) * 100);
     products[label] = pct;
     ratios.push(100 - pct);
-    if (tight === null || pct > tight[1]) tight = [key, pct, w.resetAt];
+    if (tight === null || pct > tight[1]) tight = [key, pct, isoReset(w.resetAt)];
   }
 
   const monthlyLeft = cred.monthlyCredits;
@@ -237,14 +258,21 @@ export async function commandcode() {
 
   // Plan identity (GOAT / Pro / Max) lives on a sibling endpoint; failure there
   // must not lose the quota we already have.
+  // Plan identity and the monthly period live on a sibling endpoint, nested under
+  // `data`. Getting this wrong is silent: the quota still renders, just with a
+  // null plan and a monthly window that cannot show when it renews.
   let plan = null;
+  let monthlyReset = null;
   try {
     const sub = await getJson('https://api.commandcode.ai/alpha/billing/subscriptions', { token });
-    if (sub.ok && sub.data) {
-      plan = sub.data.plan || (sub.data.subscription && sub.data.subscription.plan) || null;
-    }
+    const d = sub.ok && sub.data ? (sub.data.data || {}) : {};
+    plan = d.planId || null;
+    // currentPeriodEnd is the real monthly renewal — better than deriving it
+    // from the weekly window, which was my earlier guess.
+    monthlyReset = d.currentPeriodEnd || null;
   } catch {
     plan = null;
+    monthlyReset = null;
   }
 
   const remaining = round2(Math.min(...ratios));
@@ -261,8 +289,12 @@ export async function commandcode() {
       const r = {};
       for (const [label, key] of [['5h', 'fiveHour'], ['weekly', 'weekly']]) {
         const w = win[key] || {};
-        if (w.resetAt) r[label] = w.resetAt;
+        const iso = isoReset(w.resetAt);
+        if (iso) r[label] = iso;
       }
+      // The monthly ceiling is derived, so its reset must come from the
+      // subscription period; the credits endpoint does not carry one.
+      if (monthlyReset) r.monthly = monthlyReset;
       return r;
     })()),
     raw: { source: 'api.commandcode.ai/alpha/billing/credits', plan },

package/src/adapters-cliproxy.js

@@ -72,6 +72,14 @@ function isoFromEpoch(sec) {
 }
 
 
+/** Same reset for every product row — xAI reports one billing period for all. */
+function fillReset(products, resetAt) {
+  const out = {};
+  if (!resetAt) return out;
+  for (const key of Object.keys(products || {})) out[key] = resetAt;
+  return out;
+}
+
 /**
  * Expand `products` (window → used%) into the `windows` array the client
  * renders. The client shows one row per window with its own reset time, so an
@@ -142,7 +150,10 @@ export async function xai(model) {
       window: period.type || null,
       resetAt: period.end || cfg.billingPeriodEnd || null,
       products,
-      windows: toWindows(products, {}),
+      // Every per-product row shares the account's billing period, so they all
+      // carry the same reset. Leaving it empty made those rows look like they
+      // never expire while the summary right above them showed a date.
+      windows: toWindows(products, fillReset(products, period.end || cfg.billingPeriodEnd)),
       raw: { source: 'billing?format=credits', config: cfg },
     };
   }
@@ -175,7 +186,7 @@ export async function xai(model) {
         window: period.type || null,
         resetAt: period.end || cfg.billingPeriodEnd || null,
         products,
-        windows: toWindows(products, {}),
+        windows: toWindows(products, fillReset(products, period.end || cfg.billingPeriodEnd)),
         detail: {
           tokens: `${rl.remaining_tokens}/${rl.limit_tokens}`,
           requests: `${rl.remaining_requests}/${rl.limit_requests}`,