@astrosheep/pi-quota 0.5.5 → 0.5.7

package/README.md

@@ -36,7 +36,7 @@ Add bindings in global `~/.pi/agent/settings.json` under `quotaUsage` (not proje
 }
 ```
 
-Use the **exact Pi provider ID**. Built-in providers and explicitly bound providers are queried; explicit bindings replace a built-in adapter with the same ID. Unknown keys or adapter options are rejected. The API key and model `baseUrl` come from Pi's active provider auth; do not put model API keys in `quotaUsage`.
+Use the **exact Pi provider ID**. Built-in providers and explicitly bound providers are queried; explicit bindings replace a built-in adapter with the same ID. Unknown keys or adapter options are rejected. The API key comes from Pi's provider auth, and the endpoint comes from the provider's registered model; do not put model API keys in `quotaUsage`.
 
 | Adapter | Endpoint | Result |
 |---|---|---|

package/package.json

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

package/src/bar/card.ts

@@ -1,8 +1,10 @@
-import { Text } from '@earendil-works/pi-tui';
+import { Text, visibleWidth } from '@earendil-works/pi-tui';
 import type { Component } from '@earendil-works/pi-tui';
-import type { Paint } from './bar.ts';
+import { duration, 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 type { QuotaState } from '../query/types.ts';
+import type { QuotaErrorCode, QuotaState } from '../query/types.ts';
 
 export const USAGE_ENTRY = 'quota-bar:usage:v1';
 
@@ -22,12 +24,120 @@ export function captureAllUsage(states: readonly QuotaState[], now = Date.now())
   )) };
 }
 
-export function usageLines(card: UsageCard, paint?: Paint, barWidth = 20): string[] {
+const errorText: Record<QuotaErrorCode, string> = {
+  auth: 'Sign in with /login',
+  'unsupported-auth': 'Unsupported credentials or endpoint',
+  'account-access': 'Account quota access denied',
+  network: 'Network error', timeout: 'Request timed out',
+  'rate-limit': 'Rate limited', http: 'Service unavailable', schema: 'Unrecognized quota response',
+};
+
+interface UsageRow {
+  group: number;
+  kind: 'quota' | 'balance' | 'error';
+  provider: string;
+  metric: string;
+  value: string;
+  secondary: string;
+  valueTone: Tone;
+  metricTone: Tone;
+  secondaryTone: Tone;
+}
+
+function padEndVisible(text: string, width: number): string {
+  return text + ' '.repeat(Math.max(0, width - visibleWidth(text)));
+}
+
+function padStartVisible(text: string, width: number): string {
+  return ' '.repeat(Math.max(0, width - visibleWidth(text))) + text;
+}
+
+function gridRows(states: readonly Exclude<QuotaState, { kind: 'loading' }>[], now: number, barWidth: number): UsageRow[] {
+  const rows: UsageRow[] = [];
+  states.forEach((state, group) => {
+    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 ? state.label : '',
+            metric: `${window.scope ? `${window.scope}/` : ''}${window.label}`,
+            value: `${horizontalBar(remaining, barWidth)} ${formatPercent(remaining)}`,
+            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: state.label, 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));
+        rows.push({
+          group, kind: 'balance', provider: state.label, metric: '',
+          value: `${horizontalBar(remaining, barWidth)} ${formatPercent(remaining)}`,
+          secondary: `${money(allowance.used, allowance.currency)} used`,
+          valueTone: remainingTone(remaining), metricTone: 'dim', secondaryTone: 'dim',
+        });
+        return;
+      }
+    }
+    if (state.kind === 'error') {
+      rows.push({ group, kind: 'error', provider: state.label, metric: '', value: errorText[state.code], secondary: '',
+        valueTone: 'warning', metricTone: 'dim', secondaryTone: 'dim' });
+    }
+  });
+  return rows;
+}
+
+export function aggregateUsageLines(
+  states: readonly Exclude<QuotaState, { kind: 'loading' }>[],
+  paint: Paint = (_tone, text) => text,
+  now = Date.now(),
+  barWidth = 12,
+): string[] {
+  const rows = gridRows(states, now, barWidth);
+  if (rows.length === 0) return ['No quota data available. Run /usage --all for details.'];
+  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 quotaValueWidth = Math.max(0, ...quotaRows.map(row => visibleWidth(row.value)));
+  const otherValueWidth = Math.max(0, ...otherRows.map(row => visibleWidth(row.value)));
+  const result: string[] = [];
+  let previousGroup: number | undefined;
+  for (const row of rows) {
+    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 value = padStartVisible(row.value, row.kind === 'quota' ? quotaValueWidth : otherValueWidth);
+    const line = paint('text', provider)
+      + (metric ? paint(row.metricTone, `  ${metric}`) : '')
+      + paint(row.valueTone, `  ${value}`)
+      + (row.secondary ? paint(row.secondaryTone, `  ${row.secondary}`) : '');
+    result.push(line.replace(/\s+$/u, ''));
+  }
+  return result;
+}
+
+export function usageLines(card: UsageCard, paint?: Paint, barWidth = 12): string[] {
   if (card.version === 1) return renderUsage(card.state, paint, card.capturedAt, barWidth);
-  if (card.states.length === 0) return ['No quota data available. Run /usage --all for details.'];
-  return card.states.flatMap((state, index) => [
-    ...(index ? ['', ''] : []), ...renderUsage(state, paint, card.capturedAt, barWidth),
-  ]);
+  return aggregateUsageLines(card.states, paint, card.capturedAt, barWidth);
 }
 
 export function usageCardComponent(card: UsageCard | undefined, paint?: Paint): Component {
@@ -38,7 +148,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 : 18);
+      const lines = usageLines(card, paint, width < 55 ? 6 : 12);
       // Wrapping, not clipping: long quota names remain readable in narrow terminals.
       return new Text(lines.join('\n'), 0, 0).render(width);
     },

package/src/extension.ts

@@ -85,8 +85,11 @@ export function createQuotaExtension(options: QuotaExtensionOptions = {}) {
         if (typeof value === 'string') headers[name] = value;
       }
       const auth: ProviderAuth = { ...resolved.auth, headers };
-      // A model-level custom endpoint must not be mistaken for an official account.
-      if (ctx.model?.provider === provider && ctx.model.baseUrl) auth.baseUrl = ctx.model.baseUrl;
+      // Provider auth often has no endpoint. /usage also queries providers other
+      // than the selected model, so resolve their configured model URL as well.
+      const model = ctx.model?.provider === provider ? ctx.model
+        : ctx.modelRegistry.getAll().find(model => model.provider === provider);
+      if (model?.baseUrl) auth.baseUrl = model.baseUrl;
       return auth;
     };
 
@@ -177,11 +180,20 @@ export function createQuotaExtension(options: QuotaExtensionOptions = {}) {
           const getAuth = resolveAuth(ctx);
           const providers = supportedProviders(ctx);
           const states = await Promise.all(providers.map(provider => queryProvider(provider, getAuth)));
+          const ordered = states
+            .map((state, index) => ({ state, index }))
+            .sort((a, b) => {
+              const rank = (state: QuotaState) => state.kind === 'error' ? 3
+                : state.kind === 'ready' && state.snapshot.windows.length > 0 ? 1
+                : 2;
+              return rank(a.state) - rank(b.state) || a.index - b.index;
+            })
+            .map(item => item.state);
           // Never append via a stale Pi runtime, or label a replacement model's data
           // as the result of the original command. A newer command owns its result.
           if (!current || generation !== commandGeneration) return;
           const visibleStates = args.trim() === '--all'
-            ? states : states.filter(state => state.kind === 'ready');
+            ? ordered : ordered.filter(state => state.kind === 'ready');
           const card = captureAllUsage(visibleStates);
           pi.appendEntry<UsageCard>(USAGE_ENTRY, card);
           // Custom entry renderers are TUI-only; RPC clients still get readable output.