@astrosheep/pi-quota 0.5.2 → 0.5.4

package/package.json

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

package/src/bar/balance.ts

@@ -4,21 +4,29 @@ import type { Paint, Span } from './bar.ts';
 
 export function money(amount: number, currency: string): string {
   const sign = amount < 0 ? '-' : '';
-  const prefix = currency === 'USD' ? '$' : `${currency} `;
+  const symbol = currency === 'CNY' ? '¥' : currency === 'USD' ? '$' : `${currency} `;
   const absolute = Math.abs(amount);
-  if (absolute > 0 && absolute < 0.01) return `${sign}<${prefix}0.01`;
-  return `${sign}${prefix}${absolute.toFixed(2)}`;
+  if (absolute > 0 && absolute < 0.01) return `${sign}<${symbol}0.01`;
+  return `${sign}${symbol}${absolute.toFixed(2)}`;
 }
 
 export function remainingMoney(balance: AccountBalance): string {
-  if (balance.unlimited === true) return balance.currency === 'USD' ? '$∞' : `${balance.currency} ∞`;
+  if (balance.unlimited === true) return balance.currency === 'CNY' ? '¥∞' : balance.currency === 'USD' ? '$∞' : `${balance.currency} ∞`;
   return money(balance.remaining, balance.currency);
 }
 
+export function compactMoney(amount: number, currency: string): string {
+  return money(amount, currency);
+}
+
+export function compactRemainingMoney(balance: AccountBalance): string {
+  return remainingMoney(balance);
+}
+
 export function balanceSpans(balance: AccountBalance): Span[] {
   return [
     { text: 'Bal ', tone: 'dim' },
-    { text: remainingMoney(balance), tone: !balance.unlimited && balance.remaining <= 0 ? 'error' : 'text' },
+    { text: compactRemainingMoney(balance), tone: !balance.unlimited && balance.remaining <= 0 ? 'error' : 'text' },
   ];
 }
 
@@ -35,7 +43,7 @@ export function allowanceSpans(allowance: QuotaAllowance): Span[] {
   const remaining = allowancePercent(allowance);
   return [
     { text: 'Quota ', tone: 'dim' },
-    { text: `${verticalBar(remaining)} ${money(allowance.remaining, allowance.currency)}`, tone: remainingTone(remaining) },
+    { text: `${verticalBar(remaining)} ${compactMoney(allowance.remaining, allowance.currency)}`, tone: remainingTone(remaining) },
   ];
 }
 
@@ -52,6 +60,5 @@ export function allowanceLines(allowance: QuotaAllowance, paint: Paint, barWidth
 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)}`));
-  if (spend.lifetime !== undefined) lines.push(paint('dim', `Lifetime  ${money(spend.lifetime, spend.currency)}`));
   return lines;
 }

package/src/bar/card.ts

@@ -38,7 +38,7 @@ export function usageCardComponent(card: UsageCard | undefined, paint?: Paint):
         return new Text('Usage snapshot unavailable.', 0, 0).render(width);
       }
       // Rebuild on every render for theme/width changes, but freeze time at capture.
-      const lines = usageLines(card, paint, width < 55 ? 10 : 20);
+      const lines = usageLines(card, paint, width < 55 ? 10 : 18);
       // Wrapping, not clipping: long quota names remain readable in narrow terminals.
       return new Text(lines.join('\n'), 0, 0).render(width);
     },

package/src/bar/quota.ts

@@ -46,16 +46,12 @@ export function renderFooter(state: QuotaState, paint: Paint = plain, now = Date
   return renderBar([quotaElement(state, now)], paint);
 }
 
-export function renderUsage(state: QuotaState, paint: Paint = plain, now = Date.now(), barWidth = 20): string[] {
+export function renderUsage(state: QuotaState, paint: Paint = plain, now = Date.now(), barWidth = 16): string[] {
   if (state.kind === 'hidden') return ['No quota adapter for the current provider.'];
-  const balanceOnly = state.kind === 'ready' && state.snapshot.balance
-    && !state.snapshot.allowance && state.snapshot.windows.length === 0;
-  const spendOnly = state.kind === 'ready' && state.snapshot.spend
-    && !state.snapshot.balance && !state.snapshot.allowance && state.snapshot.windows.length === 0;
-  const title = `${state.label} · ${balanceOnly ? (state.snapshot.spend ? 'Account' : 'Balance')
-    : spendOnly ? 'Usage' : 'Remaining quota'}`;
-  if (state.kind === 'loading') return [title, '', 'Loading…'];
-  if (state.kind === 'error') return [title, '', errorText[state.code]];
+  const title = state.label;
+  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 {
@@ -69,26 +65,25 @@ export function renderUsage(state: QuotaState, paint: Paint = plain, now = Date.
   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 label = row.label + ' '.repeat(labelWidth - visibleWidth(row.label));
-    const value = ' '.repeat(valueWidth - visibleWidth(row.value)) + row.value;
     const tone = remainingTone(row.remaining);
-    return paint('dim', `${label}  `)
+    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)}`
-        : ''}`);
+        : ''}`));
   })];
   if (state.snapshot.allowance) {
     if (rows.length) lines.push('');
-    lines.push(...allowanceLines(state.snapshot.allowance, paint, barWidth));
+    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));
+    lines.push(...balanceLines(state.snapshot.balance, paint).map(indent));
   }
-  if (state.snapshot.spend) {
+  if (state.snapshot.spend?.today !== undefined) {
     if (rows.length || state.snapshot.allowance || state.snapshot.balance) lines.push('');
-    lines.push(...spendLines(state.snapshot.spend, paint));
+    lines.push(...spendLines(state.snapshot.spend, paint).map(indent));
   }
   return lines;
 }

package/src/config.ts

@@ -77,3 +77,6 @@ export function loadQuotaAdaptersFromSettings(settings: unknown): QuotaAdapter[]
     }
   });
 }
+
+  // Explicit adapter bindings from quotaUsage already have adapters registered; listing every
+  // registered adapter is the boundary between quota providers and ordinary model providers.

package/src/extension.ts

@@ -3,6 +3,7 @@ import { renderFooter } from './bar/quota.ts';
 import { captureAllUsage, USAGE_ENTRY, usageCardComponent, usageLines } from './bar/card.ts';
 import type { UsageCard } from './bar/card.ts';
 import { codexAdapter } from './query/codex.ts';
+import { createDeepSeekAdapter } from './query/deepseek.ts';
 import { kimiAdapter } from './query/kimi.ts';
 import { openCodeGoAdapter } from './query/opencode-go.ts';
 import { QuotaController } from './query/controller.ts';
@@ -15,7 +16,9 @@ const STATUS_KEY = 'quota-bar';
 const USAGE_WIDGET = 'quota-bar:usage';
 
 export interface QuotaExtensionOptions {
-  adapters?: readonly QuotaAdapter[]; // Extra adapters; duplicate IDs are rejected.
+  // Explicit adapters replace matching built-ins; duplicate explicit IDs are rejected.
+  adapters?: readonly QuotaAdapter[];
+  providers?: readonly string[]; // Extra configured quota providers to include in /usage
   footer?: boolean; // false: query + /usage + structured events only
   intervalMs?: number;
   timeoutMs?: number;
@@ -23,7 +26,13 @@ export interface QuotaExtensionOptions {
 
 export function createQuotaExtension(options: QuotaExtensionOptions = {}) {
   return (pi: ExtensionAPI): void => {
-    const registry = new AdapterRegistry([codexAdapter, kimiAdapter, openCodeGoAdapter, ...(options.adapters ?? [])]);
+    const explicitAdapters = options.adapters ?? [];
+    const explicitProviderIds = new Set(explicitAdapters.map(adapter => adapter.provider));
+    // Settings are deliberate user bindings, so they take precedence over defaults.
+    // AdapterRegistry still detects an ambiguous duplicate among explicit adapters.
+    const registry = new AdapterRegistry([
+      codexAdapter, kimiAdapter, openCodeGoAdapter, createDeepSeekAdapter('deepseek'),
+    ].filter(adapter => !explicitProviderIds.has(adapter.provider)).concat(explicitAdapters));
     let current: ExtensionContext | undefined;
     let selectedProvider: string | undefined;
     let timer: ReturnType<typeof setInterval> | undefined;
@@ -97,7 +106,8 @@ export function createQuotaExtension(options: QuotaExtensionOptions = {}) {
         }
       };
       add(ctx.model?.provider);
-      for (const model of ctx.modelRegistry.getAll()) add(model.provider);
+      for (const adapter of registry.list()) add(adapter.provider);
+      for (const provider of options.providers ?? []) add(provider);
       return providers;
     };
 

package/src/query/deepseek.ts

@@ -24,7 +24,7 @@ export function parseDeepSeekBalance(payload: unknown): AccountBalance {
 
 export function createDeepSeekAdapter(provider: string): QuotaAdapter {
   return {
-    provider, label: provider,
+    provider, label: provider === 'deepseek' ? 'DeepSeek' : provider,
     async query(context) {
       const auth = await officialAuth(context, DEEPSEEK_ORIGIN);
       const payload = await context.getJson(`${DEEPSEEK_ORIGIN}/user/balance`,