@astrosheep/pi-quota 0.12.2 → 0.13.0

package/dist/query/types.d.ts

@@ -1,33 +1,36 @@
-export interface QuotaWindow {
+export interface Balance {
     id: string;
     label: string;
-    remainingPercent: number | null;
-    resetAt: number | null;
-    durationSeconds: number;
-    scope?: string;
-    amounts?: QuotaAllowance;
-}
-export interface AccountBalance {
     currency: string;
     remaining: number;
-    unlimited?: boolean;
 }
-export interface QuotaAllowance {
-    currency: string;
-    limit: number;
+export interface LimitAmounts {
+    unit: string;
+    limit: number | null;
     used: number;
     remaining: number;
 }
-export interface SpendSummary {
+export interface UsageLimit {
+    id: string;
+    label: string;
+    scope?: string;
+    remainingPercent: number | null;
+    resetAt: number | null;
+    durationSeconds?: number;
+    amounts?: LimitAmounts;
+    unlimited?: true;
+}
+export interface Spending {
+    id: string;
+    label: string;
     currency: string;
-    today?: number;
-    lifetime?: number;
+    amount: number;
+    period: 'today' | 'lifetime';
 }
 export interface QuotaSnapshot {
-    windows: readonly QuotaWindow[];
-    balance?: AccountBalance;
-    allowance?: QuotaAllowance;
-    spend?: SpendSummary;
+    balances: Balance[];
+    limits: UsageLimit[];
+    spending: Spending[];
     fetchedAt: number;
 }
 export interface ProviderAuth {

package/dist/query/yescode.js

@@ -62,7 +62,7 @@ function limitWindow(id, label, durationSeconds, limitRaw, usedRaw, resetAt) {
     }
     const remaining = Math.max(0, limit - used);
     return [{ id, label, durationSeconds, remainingPercent: percent(remaining / limit * 100), resetAt,
-            amounts: { currency: 'USD', limit, used, remaining } }];
+            amounts: { unit: 'USD', limit, used, remaining } }];
 }
 // GET /api/v1/user/balance (optional; some accounts may lack it) merged with
 // GET /api/v1/auth/profile (required). The live response carries a generic
@@ -93,7 +93,7 @@ function spendingLimitWindows(balanceData) {
         const left = remaining ?? Math.max(0, limit - spent);
         return [{ id: `spending:${item.key}`, label: windowLabel(windowSeconds), durationSeconds: windowSeconds,
                 remainingPercent: percent(left / limit * 100), resetAt,
-                amounts: { currency: 'USD', limit, used: spent, remaining: left } }];
+                amounts: { unit: 'USD', limit, used: spent, remaining: left } }];
     });
     // Footer/detail convention is ascending duration (5h → 1w → 30d).
     return windows.sort((a, b) => a.durationSeconds - b.durationSeconds);
@@ -106,16 +106,15 @@ export function parseYesCodeAccount(balancePayload, profilePayload) {
     const paygo = optionalAmount(balanceData.pay_as_you_go_balance ?? profile.pay_as_you_go_balance);
     if (subscription === undefined && paygo === undefined)
         throw new QuotaError('schema');
-    const weekStart = timestamp(profile.last_week_reset);
-    const monthStart = timestamp(profile.last_month_reset);
-    const windows = spendingLimitWindows(balanceData) ?? [
+    const limits = spendingLimitWindows(balanceData) ?? [
         ...limitWindow('daily', '1d', 86400, balanceData.daily_limit, balanceData.daily_spent, timestamp(balanceData.daily_resets_at ?? balanceData.daily_reset_at)),
-        ...limitWindow('weekly', '1w', 604800, balanceData.weekly_limit ?? plan.weekly_limit, balanceData.weekly_spent_balance ?? balanceData.weekly_spent ?? profile.current_week_spend, timestamp(balanceData.weekly_resets_at ?? balanceData.weekly_reset_at)
-            ?? (weekStart === null ? null : weekStart + 604800000)),
-        ...limitWindow('monthly', '30d', 2592000, balanceData.monthly_spend_limit ?? plan.monthly_spend_limit, balanceData.monthly_spent_balance ?? balanceData.monthly_spent ?? profile.current_month_spend, timestamp(balanceData.monthly_resets_at ?? balanceData.monthly_reset_at)
-            ?? (monthStart === null ? null : monthStart + 2592000000)),
+        ...limitWindow('weekly', '1w', 604800, balanceData.weekly_limit ?? plan.weekly_limit, balanceData.weekly_spent_balance ?? balanceData.weekly_spent ?? profile.current_week_spend, timestamp(balanceData.weekly_resets_at ?? balanceData.weekly_reset_at)),
+        ...limitWindow('monthly', '30d', 2592000, balanceData.monthly_spend_limit ?? plan.monthly_spend_limit, balanceData.monthly_spent_balance ?? balanceData.monthly_spent ?? profile.current_month_spend, timestamp(balanceData.monthly_resets_at ?? balanceData.monthly_reset_at)),
     ];
-    return { windows, balance: { currency: 'USD', remaining: (subscription ?? 0) + (paygo ?? 0) } };
+    return { limits, balances: [
+            ...(subscription !== undefined ? [{ id: 'subscription', label: 'Subscription', currency: 'USD', remaining: subscription }] : []),
+            ...(paygo !== undefined ? [{ id: 'paygo', label: 'Pay-as-you-go', currency: 'USD', remaining: paygo }] : []),
+        ], spending: [] };
 }
 export function createYesCodeAdapter(provider, options) {
     const credentials = validateYesCodeOptions(options);

package/examples/custom-provider.ts

@@ -21,8 +21,10 @@ const customAdapter: QuotaAdapter = {
     if (remaining === null) throw new QuotaError('schema');
     return {
       fetchedAt: context.now(),
-      windows: [{ id: 'daily', label: '1d', durationSeconds: 86400,
+      balances: [],
+      limits: [{ id: 'daily', label: '1d', durationSeconds: 86400,
         remainingPercent: percent(remaining), resetAt: timestamp(data.reset_at) }],
+      spending: [],
     };
   },
 };

package/examples/preview.ts

@@ -10,10 +10,10 @@ const paint: Paint = process.env.NO_COLOR !== undefined ? (_tone, text) => text
   : (tone, text) => `\x1b[${colors[tone]}m${text}\x1b[0m`;
 function mock(short: number, weekly: number): QuotaState {
   return { kind: 'ready', provider: 'openai-codex', label: 'Codex', snapshot: {
-    fetchedAt: now, windows: [
+    fetchedAt: now, balances: [], limits: [
       { id: '5h', label: '5h', durationSeconds: 18000, remainingPercent: short, resetAt: now + 8100000 },
       { id: '1w', label: '1w', durationSeconds: 604800, remainingPercent: weekly, resetAt: now + 442800000 },
-    ],
+    ], spending: [],
   } };
 }
 console.log('MOCK DATA — no live queries\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/pi-quota",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "publishConfig": {
     "access": "public"
   },

package/src/bar/balance.ts

@@ -1,6 +1,5 @@
-import { horizontalBar, remainingTone, verticalBar } from './bar.ts';
-import type { AccountBalance, QuotaAllowance, SpendSummary } from '../query/types.ts';
-import type { Paint, Span } from './bar.ts';
+import type { Balance, LimitAmounts } from '../query/types.ts';
+import type { Span } from './bar.ts';
 
 export function money(amount: number, currency: string): string {
   const sign = amount < 0 ? '-' : '';
@@ -10,55 +9,18 @@ export function money(amount: number, currency: string): string {
   return `${sign}${symbol}${absolute.toFixed(2)}`;
 }
 
-export function remainingMoney(balance: AccountBalance): string {
-  if (balance.unlimited === true) return balance.currency === 'CNY' ? '¥∞' : balance.currency === 'USD' ? '$∞' : `${balance.currency} ∞`;
-  return money(balance.remaining, balance.currency);
+export function quantity(amount: number, unit: string): string {
+  return /^[A-Z]{3}$/.test(unit) ? money(amount, unit) : `${amount.toLocaleString('en-US', { maximumFractionDigits: 8 })} ${unit}`;
 }
 
-export function compactMoney(amount: number, currency: string): string {
-  return money(amount, currency);
+export function amountSummary(amounts: LimitAmounts): string {
+  return `${quantity(amounts.remaining, amounts.unit)}/${amounts.limit === null ? '?' : quantity(amounts.limit, amounts.unit)}`
+    + ` · ${quantity(amounts.used, amounts.unit)} used`;
 }
 
-export function compactRemainingMoney(balance: AccountBalance): string {
-  return remainingMoney(balance);
-}
-
-export function balanceSpans(balance: AccountBalance): Span[] {
-  return [
-    { text: 'Bal ', tone: 'dim' },
-    { text: compactRemainingMoney(balance), tone: !balance.unlimited && balance.remaining <= 0 ? 'error' : 'text' },
-  ];
-}
-
-export function balanceLines(balance: AccountBalance, paint: Paint): string[] {
-  const remaining = remainingMoney(balance);
-  return [paint('dim', 'Balance   ') + paint(!balance.unlimited && balance.remaining <= 0 ? 'error' : 'text', remaining)];
-}
-
-export function allowancePercent(allowance: QuotaAllowance): number {
-  return Math.max(0, Math.min(100, allowance.remaining / allowance.limit * 100));
-}
-
-export function allowanceSpans(allowance: QuotaAllowance): Span[] {
-  const remaining = allowancePercent(allowance);
-  return [
-    { text: 'Quota ', tone: 'dim' },
-    { text: `${verticalBar(remaining)} ${compactMoney(allowance.remaining, allowance.currency)}`, tone: remainingTone(remaining) },
-  ];
-}
-
-export function allowanceLines(allowance: QuotaAllowance, paint: Paint, barWidth: number): string[] {
-  const remaining = allowancePercent(allowance);
+export function balanceSpans(balance: Balance, multiple = false): Span[] {
   return [
-    paint(remainingTone(remaining), horizontalBar(remaining, barWidth))
-      + paint('dim', `  ${money(allowance.remaining, allowance.currency)} left`),
-    paint('dim', `Used      ${money(allowance.used, allowance.currency)}`),
-    paint('dim', `Limit     ${money(allowance.limit, allowance.currency)}`),
+    { text: `${!multiple && balance.label === 'Balance' ? 'Bal' : balance.label} `, tone: 'dim' },
+    { text: money(balance.remaining, balance.currency), tone: balance.remaining <= 0 ? 'error' : 'text' },
   ];
 }
-
-export function spendLines(spend: SpendSummary, paint: Paint): string[] {
-  const lines: string[] = [];
-  if (spend.today !== undefined) lines.push(paint('dim', `Today     ${money(spend.today, spend.currency)}`));
-  return lines;
-}

package/src/bar/card.ts

@@ -1,21 +1,19 @@
 import { Text, visibleWidth } from '@earendil-works/pi-tui';
 import type { Component } from '@earendil-works/pi-tui';
-import { duration, formatPercent, horizontalBar, remainingTone } from './bar.ts';
+import { formatPercent, horizontalBar, remainingTone } from './bar.ts';
 import type { Paint, Tone } from './bar.ts';
-import { money, remainingMoney } from './balance.ts';
-import { renderUsage } from './quota.ts';
+import { amountSummary, money } from './balance.ts';
+import { limitLabel, limitRemaining, limitReset, renderUsage } from './quota.ts';
 import type { QuotaErrorCode, QuotaState } from '../query/types.ts';
 
-export const USAGE_ENTRY = 'quota-bar:usage:v1';
+export const USAGE_ENTRY = 'quota-bar:usage:v2';
 
 export type UsageCard =
   | { version: 1; capturedAt: number; state: Exclude<QuotaState, { kind: 'loading' }> }
-  // currentProvider is optional so cards saved before the marker existed still render.
   | { version: 2; capturedAt: number; states: Exclude<QuotaState, { kind: 'loading' }>[]; currentProvider?: string };
 
 export function captureUsage(state: QuotaState, now = Date.now()): UsageCard | undefined {
   if (state.kind === 'loading') return undefined;
-  // Preserve v1 rendering for cards already saved in sessions.
   return { version: 1, capturedAt: now, state: structuredClone(state) };
 }
 
@@ -61,45 +59,36 @@ function gridRows(states: readonly Exclude<QuotaState, { kind: 'loading' }>[], n
     const mark = (entry: { provider: string; label: string }) =>
       currentProvider !== undefined && entry.provider === currentProvider ? `★ ${entry.label}` : entry.label;
     if (state.kind === 'ready') {
-      const windows = state.snapshot.windows;
-      if (windows.length > 0) {
-        windows.forEach((window, index) => {
-          const expired = window.resetAt !== null && window.resetAt <= now;
-          const remaining = expired ? null : window.remainingPercent;
-          rows.push({
-            group, kind: 'quota',
-            provider: index === 0 ? mark(state) : '',
-            metric: `${window.scope ? `${window.scope}/` : ''}${window.label}`,
-            value: `${horizontalBar(remaining, barWidth)} ${padStartVisible(formatPercent(remaining), 4)}`,
-            secondary: `↺ ${window.resetAt === null ? '?' : duration(window.resetAt - now)}`,
-            valueTone: remainingTone(remaining), metricTone: 'dim', secondaryTone: 'dim',
-          });
-        });
-        return;
-      }
-      if (state.snapshot.balance) {
-        const balance = state.snapshot.balance;
-        rows.push({
-          group, kind: 'balance', provider: mark(state), metric: '',
-          value: remainingMoney(balance),
-          secondary: state.snapshot.spend?.today !== undefined
-            ? `today ${money(state.snapshot.spend.today, state.snapshot.spend.currency)}` : '',
-          valueTone: !balance.unlimited && balance.remaining <= 0 ? 'error' : 'text',
-          metricTone: 'dim', secondaryTone: 'dim',
-        });
-        return;
-      }
-      if (state.snapshot.allowance) {
-        const allowance = state.snapshot.allowance;
-        const remaining = Math.max(0, Math.min(100, allowance.remaining / allowance.limit * 100));
+      const firstRow = rows.length;
+      state.snapshot.limits.forEach(limit => {
+        const remaining = limitRemaining(limit, now);
+        const reset = limitReset(limit, now);
         rows.push({
-          group, kind: 'balance', provider: mark(state), metric: '',
-          value: `${horizontalBar(remaining, barWidth)} ${formatPercent(remaining)}`,
-          secondary: `${money(allowance.used, allowance.currency)} used`,
-          valueTone: remainingTone(remaining), metricTone: 'dim', secondaryTone: 'dim',
+          group, kind: 'quota', provider: '', metric: limitLabel(limit),
+          value: limit.unlimited ? '∞' : `${horizontalBar(remaining, barWidth)} ${padStartVisible(formatPercent(remaining), 4)}`,
+          secondary: [reset, limit.amounts ? amountSummary(limit.amounts) : ''].filter(Boolean).join(' · '),
+          valueTone: limit.unlimited ? 'text' : remainingTone(remaining), metricTone: 'dim', secondaryTone: 'dim',
         });
-        return;
+      });
+      const balances = state.snapshot.balances;
+      balances.forEach(balance => rows.push({
+        group, kind: 'balance', provider: '',
+        metric: balances.length === 1 && balance.label === 'Balance' ? '' : balance.label,
+        value: money(balance.remaining, balance.currency), secondary: '',
+        valueTone: balance.remaining <= 0 ? 'error' : 'text', metricTone: 'dim', secondaryTone: 'dim',
+      }));
+      const today = state.snapshot.spending.filter(entry => entry.period === 'today');
+      // Keep the compact single-wallet + Today layout, but never drop other entries.
+      if (balances.length === 1 && today.length === 1) {
+        rows[rows.length - 1].secondary = `today ${money(today[0].amount, today[0].currency)}`;
+      } else {
+        today.forEach(entry => rows.push({
+          group, kind: 'balance', provider: '', metric: `Today${today.length > 1 ? ` ${entry.label}` : ''}`,
+          value: money(entry.amount, entry.currency), secondary: '',
+          valueTone: 'dim', metricTone: 'dim', secondaryTone: 'dim',
+        }));
       }
+      if (rows.length > firstRow) rows[firstRow].provider = mark(state);
     }
     if (state.kind === 'error') {
       rows.push({ group, kind: 'error', provider: mark(state), metric: '', value: errorText[state.code], secondary: '',
@@ -121,7 +110,7 @@ export function aggregateUsageLines(
   const quotaRows = rows.filter(row => row.kind === 'quota');
   const otherRows = rows.filter(row => row.kind !== 'quota');
   const providerWidth = Math.max(...quotaRows.map(row => visibleWidth(row.provider)), ...otherRows.map(row => visibleWidth(row.provider)));
-  const metricWidth = Math.max(0, ...quotaRows.map(row => visibleWidth(row.metric)));
+  const metricWidth = Math.max(0, ...rows.map(row => visibleWidth(row.metric)));
   const quotaValueWidth = Math.max(0, ...quotaRows.map(row => visibleWidth(row.value)));
   const otherValueWidth = Math.max(0, ...otherRows.map(row => visibleWidth(row.value)));
   const result: string[] = [];
@@ -130,7 +119,7 @@ export function aggregateUsageLines(
     if (previousGroup !== undefined && row.group !== previousGroup && (row.kind === 'quota' || rows.some(other => other.group === previousGroup && other.kind === 'quota'))) result.push('');
     previousGroup = row.group;
     const provider = padEndVisible(row.provider, providerWidth);
-    const metric = row.kind === 'quota' ? padEndVisible(row.metric, metricWidth) : '';
+    const metric = row.kind === 'quota' || row.metric ? padEndVisible(row.metric, metricWidth) : '';
     const value = padEndVisible(row.value, row.kind === 'quota' ? quotaValueWidth : otherValueWidth);
     const line = paint('text', provider)
       + (metric ? paint(row.metricTone, `  ${metric}`) : '')
@@ -147,7 +136,7 @@ export function usageLines(card: UsageCard, paint?: Paint, barWidth = 12): strin
 }
 
 // Narrow-client layout (RPC notify bubbles, phones): provider name on its own
-// header line, windows indented below. No wide grid columns, so monospace code
+// header line, limits and balances indented below. No wide grid columns, so monospace code
 // blocks never wrap. Paseo's fence blocks have no horizontal scroll: RN Text
 // wraps long lines and a wrapped grid is worse than no grid.
 export function aggregateCompactLines(
@@ -159,13 +148,13 @@ export function aggregateCompactLines(
 ): string[] {
   const rows = gridRows(states, now, barWidth, currentProvider);
   if (rows.length === 0) return ['No quota data available. Run /usage --all for details.'];
-  const metricWidth = Math.max(0, ...rows.filter(row => row.kind === 'quota').map(row => visibleWidth(row.metric)));
+  const metricWidth = Math.max(0, ...rows.map(row => visibleWidth(row.metric)));
   const lines: string[] = [];
   let previousGroup: number | undefined;
   for (const row of rows) {
     if (previousGroup !== undefined && row.group !== previousGroup) lines.push('');
     previousGroup = row.group;
-    if (row.kind === 'quota') {
+    if (row.kind === 'quota' || row.metric || !row.provider) {
       if (row.provider) lines.push(paint('text', row.provider));
       const metric = padEndVisible(row.metric, metricWidth);
       const line = `  ${paint(row.metricTone, metric)}  ${paint(row.valueTone, row.value)}`

package/src/bar/quota.ts

@@ -1,8 +1,8 @@
 import { visibleWidth } from '@earendil-works/pi-tui';
 import { duration, formatPercent, horizontalBar, plain, remainingTone, renderBar, verticalBar } from './bar.ts';
 import type { BarElement, Paint, Span } from './bar.ts';
-import { allowanceLines, allowanceSpans, balanceLines, balanceSpans, money, spendLines } from './balance.ts';
-import type { QuotaErrorCode, QuotaState, QuotaWindow } from '../query/types.ts';
+import { amountSummary, balanceSpans, money, quantity } from './balance.ts';
+import type { QuotaErrorCode, QuotaState, UsageLimit } from '../query/types.ts';
 import type { FooterWindows } from '../query/settings.ts';
 
 const errorText: Record<QuotaErrorCode, string> = {
@@ -13,19 +13,34 @@ const errorText: Record<QuotaErrorCode, string> = {
   'rate-limit': 'Rate limited', http: 'Service unavailable', schema: 'Unrecognized quota response',
 };
 
-function windowSpans(window: QuotaWindow, now: number): Span[] {
-  const expired = window.resetAt !== null && window.resetAt <= now;
+export function limitLabel(limit: UsageLimit): string {
+  return `${limit.scope ? `${limit.scope}/` : ''}${limit.label}`;
+}
+
+export function limitRemaining(limit: UsageLimit, now: number): number | null {
   // Reaching the reset deadline is not proof the provider granted a fresh quota.
-  const remaining = expired ? null : window.remainingPercent;
-  const glyph = verticalBar(remaining);
+  return limit.resetAt !== null && limit.resetAt <= now ? null : limit.remainingPercent;
+}
+
+export function limitReset(limit: UsageLimit, now: number): string {
+  // No schedule is inferred from duration alone. No duration/reset means unknown.
+  return limit.resetAt !== null ? `↺ ${duration(limit.resetAt - now)}`
+    : limit.durationSeconds !== undefined ? '↺ ?' : '';
+}
+
+function limitSpans(limit: UsageLimit, now: number): Span[] {
+  const remaining = limitRemaining(limit, now);
+  const value = limit.unlimited ? '∞' : `${verticalBar(remaining)} ${limit.amounts && limit.durationSeconds === undefined
+    ? quantity(limit.amounts.remaining, limit.amounts.unit) : formatPercent(remaining)}`;
+  const reset = limitReset(limit, now);
   return [
-    { text: `${window.scope ? `${window.scope}/` : ''}${window.label} `, tone: 'dim' },
-    { text: `${glyph} ${formatPercent(remaining)}`, tone: remainingTone(remaining) },
-    { text: ` ↺ ${window.resetAt === null ? '?' : duration(window.resetAt - now)}`, tone: 'dim' },
+    { text: `${limitLabel(limit)} `, tone: 'dim' },
+    { text: value, tone: limit.unlimited ? 'text' : remainingTone(remaining) },
+    ...(reset ? [{ text: ` ${reset}`, tone: 'dim' as const }] : []),
   ];
 }
 
-// Footer window cap: a positive count, or 'all' for every shared window.
+// Retain the existing setting name; it now caps displayed limits, not wallets.
 export type { FooterWindows };
 
 export function quotaElement(state: QuotaState, now = Date.now(), maxWindows: FooterWindows = 2): BarElement {
@@ -33,17 +48,18 @@ export function quotaElement(state: QuotaState, now = Date.now(), maxWindows: Fo
   if (state.kind === 'hidden') return element;
   if (state.kind === 'loading') return { ...element, spans: [{ text: 'Quota …', tone: 'dim' }] };
   if (state.kind === 'error') return { ...element, spans: [{ text: `Quota ! ${errorText[state.code]}`, tone: 'warning' }] };
-  const windows = state.snapshot.windows;
-  const shared = windows.filter(window => !window.scope);
-  const eligible = shared.length ? shared : windows;
+  const { balances, limits } = state.snapshot;
+  const shared = limits.filter(limit => !limit.scope);
+  const eligible = shared.length ? shared : limits;
   const shown = maxWindows === 'all' ? eligible : eligible.slice(0, maxWindows);
-  const spans: Span[] = state.snapshot.balance ? balanceSpans(state.snapshot.balance)
-    : state.snapshot.allowance ? allowanceSpans(state.snapshot.allowance) : [];
-  for (const window of shown) {
+  const spans: Span[] = [];
+  const append = (parts: Span[]) => {
     if (spans.length) spans.push({ text: ' · ', tone: 'dim' });
-    spans.push(...windowSpans(window, now));
-  }
-  if (windows.length > shown.length) spans.push({ text: ` +${windows.length - shown.length}`, tone: 'dim' });
+    spans.push(...parts);
+  };
+  balances.forEach(balance => append(balanceSpans(balance, balances.length > 1)));
+  shown.forEach(limit => append(limitSpans(limit, now)));
+  if (limits.length > shown.length) spans.push({ text: ` +${limits.length - shown.length}`, tone: 'dim' });
   return { ...element, spans };
 }
 
@@ -57,38 +73,27 @@ export function renderUsage(state: QuotaState, paint: Paint = plain, now = Date.
   const indent = (line: string) => line ? `  ${line}` : line;
   if (state.kind === 'loading') return [title, '', indent('Loading…')];
   if (state.kind === 'error') return [title, '', indent(errorText[state.code])];
-  const rows = state.snapshot.windows.map(window => {
-    const remaining = window.resetAt !== null && window.resetAt <= now ? null : window.remainingPercent;
-    return {
-      label: `${window.scope ? `${window.scope}/` : ''}${window.label}`,
-      remaining,
-      value: formatPercent(remaining),
-      reset: window.resetAt === null ? '?' : duration(window.resetAt - now),
-      amounts: window.amounts,
-    };
-  });
-  const labelWidth = Math.max(0, ...rows.map(row => visibleWidth(row.label)));
-  const valueWidth = Math.max(4, ...rows.map(row => visibleWidth(row.value)));
-  const lines = [title, '', ...rows.map(row => {
-    const tone = remainingTone(row.remaining);
-    const value = ' '.repeat(valueWidth - visibleWidth(row.value)) + row.value;
-    return indent(paint('dim', `${row.label}${' '.repeat(labelWidth - visibleWidth(row.label))}  `)
-      + paint(tone, `${horizontalBar(row.remaining, barWidth)} ${value}`)
-      + paint('dim', ` ↺ ${row.reset}${row.amounts
-        ? ` · ${money(row.amounts.remaining, row.amounts.currency)}/${money(row.amounts.limit, row.amounts.currency)}`
-        : ''}`));
+  const { limits, balances, spending } = state.snapshot;
+  const labelWidth = Math.max(0, ...limits.map(limit => visibleWidth(limitLabel(limit))));
+  const valueWidth = Math.max(4, ...limits.map(limit => visibleWidth(formatPercent(limitRemaining(limit, now)))));
+  const lines = [title, '', ...limits.map(limit => {
+    const remaining = limitRemaining(limit, now);
+    const value = formatPercent(remaining);
+    const reset = limitReset(limit, now);
+    return indent(paint('dim', `${limitLabel(limit)}${' '.repeat(labelWidth - visibleWidth(limitLabel(limit)))}  `)
+      + paint(limit.unlimited ? 'text' : remainingTone(remaining), limit.unlimited ? '∞'
+        : `${horizontalBar(remaining, barWidth)} ${' '.repeat(valueWidth - visibleWidth(value))}${value}`)
+      + paint('dim', `${reset ? ` ${reset}` : ''}${limit.amounts ? ` · ${amountSummary(limit.amounts)}` : ''}`));
   })];
-  if (state.snapshot.allowance) {
-    if (rows.length) lines.push('');
-    lines.push(...allowanceLines(state.snapshot.allowance, paint, barWidth).map(indent));
-  }
-  if (state.snapshot.balance) {
-    if (rows.length || state.snapshot.allowance) lines.push('');
-    lines.push(...balanceLines(state.snapshot.balance, paint).map(indent));
+  if (balances.length) {
+    if (limits.length) lines.push('');
+    balances.forEach(balance => lines.push(indent(paint('dim', `${balance.label}   `)
+      + paint(balance.remaining <= 0 ? 'error' : 'text', money(balance.remaining, balance.currency)))));
   }
-  if (state.snapshot.spend?.today !== undefined) {
-    if (rows.length || state.snapshot.allowance || state.snapshot.balance) lines.push('');
-    lines.push(...spendLines(state.snapshot.spend, paint).map(indent));
+  const today = spending.filter(entry => entry.period === 'today');
+  if (today.length) {
+    if (limits.length || balances.length) lines.push('');
+    today.forEach(entry => lines.push(indent(paint('dim', `Today${today.length > 1 ? ` ${entry.label}` : ''}     ${money(entry.amount, entry.currency)}`))));
   }
   return lines;
 }

package/src/extension.ts

@@ -8,7 +8,7 @@ import { createJsonClient, createPostJsonClient } from './query/http.ts';
 import { composeQuotaRegistry } from './query/settings.ts';
 import type { ProviderAuth, QuotaAdapter, QuotaState } from './query/types.ts';
 
-export const STATUS_EVENT = 'quota-bar:state:v1';
+export const STATUS_EVENT = 'quota-bar:state:v2';
 const STATUS_KEY = 'quota-bar';
 const USAGE_WIDGET = 'quota-bar:usage';
 const REFRESHING_TEXT = 'Refreshing…';
@@ -21,7 +21,7 @@ export interface QuotaExtensionOptions {
   providers?: readonly string[]; // Extra configured quota providers to include in /usage
   aliases?: Record<string, string>; // alias provider → target provider; shares the target's account quota
   footer?: boolean; // false: query + /usage + structured events only
-  footerWindows?: FooterWindows; // footer window cap; default 2, 'all' shows every window
+  footerWindows?: FooterWindows; // footer limit cap; default 2, 'all' shows every limit
   intervalMs?: number;
   timeoutMs?: number;
 }
@@ -222,7 +222,7 @@ export function createQuotaExtension(options: QuotaExtensionOptions = {}) {
                 return provider === currentProvider || provider === canonicalProvider ? 0 : 1;
               };
               const rank = (state: QuotaState) => state.kind === 'error' ? 3
-                : state.kind === 'ready' && state.snapshot.windows.length > 0 ? 1
+                : state.kind === 'ready' && state.snapshot.limits.length > 0 ? 1
                 : 2;
               return pinned(a) - pinned(b) || rank(a.state) - rank(b.state) || a.index - b.index;
             })

package/src/query/codex.ts

@@ -1,7 +1,7 @@
 import { bearer, header, officialAuth } from './http.ts';
 import { numeric, object, percent, safeLabel, timestamp, windowLabel } from './parse.ts';
 import { QuotaError } from './types.ts';
-import type { QuotaAdapter, QuotaWindow } from './types.ts';
+import type { QuotaAdapter, UsageLimit } from './types.ts';
 
 // Decode only to obtain routing metadata from the same resolved token.
 // This does not verify a JWT; the official server verifies authentication.
@@ -13,9 +13,9 @@ export function codexAccountId(token: string): string | undefined {
   } catch { return undefined; }
 }
 
-export function parseCodex(payload: unknown, now: number): QuotaWindow[] {
+export function parseCodex(payload: unknown, now: number): UsageLimit[] {
   const data = object(payload);
-  const windows: QuotaWindow[] = [];
+  const windows: UsageLimit[] = [];
   const addDomain = (raw: unknown, domain: string, scope?: string) => {
     const rate = object(raw);
     for (const [key, fallback] of [['primary_window', 18000], ['secondary_window', 604800]] as const) {
@@ -60,6 +60,6 @@ export const codexAdapter: QuotaAdapter = {
       Origin: 'https://chatgpt.com', Referer: 'https://chatgpt.com/',
     }, context.signal);
     const now = context.now();
-    return { windows: parseCodex(data, now), fetchedAt: now };
+    return { balances: [], limits: parseCodex(data, now), spending: [], fetchedAt: now };
   },
 };

package/src/query/deepseek.ts

@@ -1,25 +1,24 @@
 import { bearer, officialAuth } from './http.ts';
 import { numeric, object } from './parse.ts';
 import { QuotaError } from './types.ts';
-import type { AccountBalance, QuotaAdapter } from './types.ts';
+import type { Balance, QuotaAdapter } from './types.ts';
 
 export const DEEPSEEK_ORIGIN = 'https://api.deepseek.com';
 
 // https://api-docs.deepseek.com/api/get-user-balance
 // GET /user/balance (also mounted under /v1/). The sk- key works directly.
 // Amounts arrive as strings in yuan; balance_infos may list several currencies.
-export function parseDeepSeekBalance(payload: unknown): AccountBalance {
+export function parseDeepSeekBalance(payload: unknown): Balance[] {
   const body = object(payload);
   if (!Array.isArray(body.balance_infos) || body.balance_infos.length === 0) throw new QuotaError('schema');
-  for (const entry of body.balance_infos) {
+  return body.balance_infos.map(entry => {
     const info = object(entry);
     const remaining = numeric(info.total_balance);
     if (typeof info.currency !== 'string' || !/^[A-Z]{3}$/.test(info.currency)
-      || remaining === null || remaining < 0) continue;
-    // The endpoint exposes no usage total; only return the actual balance.
-    return { currency: info.currency, remaining };
-  }
-  throw new QuotaError('schema');
+      || remaining === null) throw new QuotaError('schema');
+    // Preserve each currency; the endpoint exposes no usage total.
+    return { id: info.currency, label: 'Balance', currency: info.currency, remaining };
+  });
 }
 
 export function createDeepSeekAdapter(provider: string): QuotaAdapter {
@@ -29,7 +28,7 @@ export function createDeepSeekAdapter(provider: string): QuotaAdapter {
       const auth = await officialAuth(context, DEEPSEEK_ORIGIN);
       const payload = await context.getJson(`${DEEPSEEK_ORIGIN}/user/balance`,
         { Authorization: `Bearer ${bearer(auth)}` }, context.signal);
-      return { windows: [], balance: parseDeepSeekBalance(payload), fetchedAt: context.now() };
+      return { balances: parseDeepSeekBalance(payload), limits: [], spending: [], fetchedAt: context.now() };
     },
   };
 }

package/src/query/kimi.ts

@@ -1,15 +1,15 @@
 import { bearer, officialAuth } from './http.ts';
 import { numeric, object, percent, timestamp, windowLabel } from './parse.ts';
 import { QuotaError } from './types.ts';
-import type { QuotaAdapter, QuotaWindow } from './types.ts';
+import type { QuotaAdapter, UsageLimit } from './types.ts';
 
 const units: Record<string, number> = {
   TIME_UNIT_SECOND: 1, TIME_UNIT_MINUTE: 60, TIME_UNIT_HOUR: 3600, TIME_UNIT_DAY: 86400,
 };
 
-export function parseKimi(payload: unknown): QuotaWindow[] {
+export function parseKimi(payload: unknown): UsageLimit[] {
   const data = object(payload);
-  const windows: QuotaWindow[] = [];
+  const windows: UsageLimit[] = [];
   const add = (raw: unknown, duration: number, id: string) => {
     const detail = object(raw);
     const limit = numeric(detail.limit);
@@ -38,7 +38,7 @@ export function parseKimi(payload: unknown): QuotaWindow[] {
     }
   }
   if (windows.length === 0) throw new QuotaError('schema');
-  return windows.sort((a, b) => a.durationSeconds - b.durationSeconds);
+  return windows.sort((a, b) => a.durationSeconds! - b.durationSeconds!);
 }
 
 export const kimiAdapter: QuotaAdapter = {
@@ -48,6 +48,6 @@ export const kimiAdapter: QuotaAdapter = {
     const data = await context.getJson('https://api.kimi.com/coding/v1/usages', {
       Authorization: `Bearer ${bearer(auth)}`,
     }, context.signal);
-    return { windows: parseKimi(data), fetchedAt: context.now() };
+    return { balances: [], limits: parseKimi(data), spending: [], fetchedAt: context.now() };
   },
 };