@jameslovespancakes/pi-plus 1.0.18 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jameslovespancakes/pi-plus",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "type": "module",
   "description": "pi and more",
   "license": "MIT",

package/src/core/quota/pool.ts

@@ -32,6 +32,18 @@ export const OBSERVED_PROVIDERS: ReadonlyArray<readonly [providerId: string, gro
 export const isFresh = (row: UsageRow, now = Date.now()) => !row.stale && !!row.checkedAt
   && now - row.checkedAt < CLAUDE_FRESH_MS && (!row.resetAt || row.resetAt > now);
 
+/**
+ * Rows as they stand now. A window whose reset has passed has refilled,
+ * whatever it read before, so it reports full with no reset rather than
+ * being discarded as unknown until the next poll replaces it. Freshness
+ * still comes from `checkedAt`: a failed or old reading stays unknown.
+ */
+export function rollOver(rows: UsageRow[], now = Date.now()): UsageRow[] {
+  return rows.map((row) => (row.resetAt !== undefined && row.resetAt <= now
+    ? { ...row, remaining: 100, resetAt: undefined }
+    : row));
+}
+
 /** Percent of combined capacity, not a claim that quota transfers between accounts.
  * Without published capacities this is explicitly an equal-account estimate.
  */

package/src/domains/models/catalog-tool.ts

@@ -14,7 +14,7 @@ import {
 } from "../../core/catalog/quality.ts";
 import { ensureFresh, usageState } from "../../services/usage-service.ts";
 import { geminiQuotaFamily } from "../../core/gemini/quota.ts";
-import { combinedWindow, isGeminiAccount, pooledWindow } from "../../core/quota/pool.ts";
+import { combinedWindow, isGeminiAccount, pooledWindow, rollOver } from "../../core/quota/pool.ts";
 import { env, isFromProcessEnv, maskSecret, setEnv } from "../../core/env.ts";
 import { fitId } from "../../ui/format.ts";
 
@@ -57,7 +57,7 @@ interface Entry {
 
 function quotaFor(provider: string, modelId: string): number | undefined {
   const state = usageState();
-  const rows = state.rows;
+  const rows = rollOver(state.rows);
   if (provider === "anthropic") {
     // The pool's figure, not whichever account happens to be listed first.
     const pool = combinedWindow(rows, "5h", state.accounts, Date.now(), true);

package/src/ui/usage-bars.ts

@@ -8,6 +8,7 @@ import {
   OBSERVED_PROVIDERS,
   poolAvailability,
   pooledWindow,
+  rollOver,
   scopedLabels,
   type UsageRow,
 } from "../core/quota/pool.ts";
@@ -163,7 +164,9 @@ function renderCell(theme: any, cell: Cell, labelWidth: number, cellWidth: numbe
   const label = theme.fg(cell.active ? "accent" : "muted", cell.label.slice(0, labelWidth).padEnd(labelWidth));
   const reset = formatShortReset(cell.resetAt);
   const resetWidth = 4;
-  const barWidth = Math.max(4, cellWidth - labelWidth - 6 - resetWidth - 3);
+  // label, space, bar, space, 5-wide percent, space, reset: exactly cellWidth,
+  // so every row's right column starts under its title.
+  const barWidth = Math.max(4, cellWidth - labelWidth - resetWidth - 8);
 
   if (cell.remaining === undefined) {
     return `${label} ${theme.fg("dim", "·".repeat(barWidth))} ${theme.fg("dim", "  n/a")}${" ".repeat(resetWidth + 1)}`;
@@ -188,7 +191,8 @@ function renderCell(theme: any, cell: Cell, labelWidth: number, cellWidth: numbe
   return `${label} ${bar} ${percent} ${theme.fg("dim", reset.padEnd(resetWidth))}`;
 }
 
-export function renderUsageLines(state: UsageState, theme: any, width: number, active?: ActiveModel): string[] {
+export function renderUsageLines(raw: UsageState, theme: any, width: number, active?: ActiveModel): string[] {
+  const state = { ...raw, rows: rollOver(raw.rows) };
   if (state.loading) return [theme.fg("dim", "  usage: loading…")];
   if (state.rows.length === 0) {
     if (state.errors.length > 0) return state.errors.map((error) => theme.fg("warning", `  ${error}`));
@@ -219,7 +223,8 @@ export function renderUsageLines(state: UsageState, theme: any, width: number, a
   return lines.map((line) => truncateToWidth(line, width, ""));
 }
 
-export function usageSummaryText(state: UsageState): string {
+export function usageSummaryText(raw: UsageState): string {
+  const state = { ...raw, rows: rollOver(raw.rows) };
   const combined = ["5h", "7d", ...scopedLabels(state.rows)].map((label) => {
     const pool = combinedWindow(state.rows, label, state.accounts, Date.now(), true);
     return `Claude combined ${label}: ${pool