@askalf/dario 4.8.103 → 4.8.105

package/dist/analytics.d.ts

@@ -118,7 +118,18 @@ export declare class Analytics extends EventEmitter {
     private computeStats;
     private perAccountStats;
     private perModelStats;
-    private utilizationTrend;
+    /**
+     * The most recent rate-limit snapshot in the window — current 5h / 7d
+     * utilization (0–1) as of the last request. The Analytics tab's rate-limit
+     * gauge reads this; an empty window reads 0/0. Mirrors `perAccountStats`'
+     * `last.util*` "current" semantics.
+     *
+     * Replaces the old per-5-min-bucket `utilizationTrend` array: the TUI gauge
+     * (the only consumer of `summary.utilization`) reads `.lastUtil5h` /
+     * `.lastUtil7d`, which on the array shape were `undefined` → rendered NaN%.
+     * See #600.
+     */
+    private currentUtilization;
     private predict;
 }
 interface PerAccountStat {
@@ -164,12 +175,11 @@ export interface AnalyticsSummary {
     };
     perAccount: Record<string, PerAccountStat>;
     perModel: Record<string, PerModelStat>;
-    utilization: Array<{
-        timestamp: number;
-        avgUtil5h: number;
-        avgUtil7d: number;
-        requests: number;
-    }>;
+    /** Current 5h / 7d rate-limit utilization (0–1) as of the last request. */
+    utilization: {
+        lastUtil5h: number;
+        lastUtil7d: number;
+    };
     predictions: {
         estimatedExhaustionMinutes: number | null;
         tokenBurnRate: number;

package/dist/analytics.js

@@ -175,7 +175,7 @@ export class Analytics extends EventEmitter {
             },
             perAccount: this.perAccountStats(recent),
             perModel: this.perModelStats(recent),
-            utilization: this.utilizationTrend(recent),
+            utilization: this.currentUtilization(recent),
             predictions: this.predict(recent),
         };
     }
@@ -267,29 +267,22 @@ export class Analytics extends EventEmitter {
         }
         return result;
     }
-    utilizationTrend(records) {
+    /**
+     * The most recent rate-limit snapshot in the window — current 5h / 7d
+     * utilization (0–1) as of the last request. The Analytics tab's rate-limit
+     * gauge reads this; an empty window reads 0/0. Mirrors `perAccountStats`'
+     * `last.util*` "current" semantics.
+     *
+     * Replaces the old per-5-min-bucket `utilizationTrend` array: the TUI gauge
+     * (the only consumer of `summary.utilization`) reads `.lastUtil5h` /
+     * `.lastUtil7d`, which on the array shape were `undefined` → rendered NaN%.
+     * See #600.
+     */
+    currentUtilization(records) {
         if (records.length === 0)
-            return [];
-        const bucketMs = 5 * 60_000;
-        const buckets = new Map();
-        for (const r of records) {
-            const key = Math.floor(r.timestamp / bucketMs) * bucketMs;
-            const existing = buckets.get(key);
-            if (existing) {
-                existing.push(r);
-            }
-            else {
-                buckets.set(key, [r]);
-            }
-        }
-        return [...buckets.entries()]
-            .sort(([a], [b]) => a - b)
-            .map(([ts, recs]) => ({
-            timestamp: ts,
-            avgUtil5h: Math.round(recs.reduce((s, r) => s + r.util5h, 0) / recs.length * 100) / 100,
-            avgUtil7d: Math.round(recs.reduce((s, r) => s + r.util7d, 0) / recs.length * 100) / 100,
-            requests: recs.length,
-        }));
+            return { lastUtil5h: 0, lastUtil7d: 0 };
+        const last = records[records.length - 1];
+        return { lastUtil5h: last.util5h, lastUtil7d: last.util7d };
     }
     predict(records) {
         if (records.length < 3) {

package/dist/tui/tabs/analytics.d.ts

@@ -37,6 +37,12 @@ interface SummaryShape {
         lastUtil5h: number;
         lastUtil7d: number;
     };
+    perAccount: Record<string, {
+        requests: number;
+        currentUtil5h: number;
+        currentUtil7d: number;
+        lastClaim: string;
+    }>;
 }
 export interface AnalyticsState {
     summary: SummaryShape | null;

package/dist/tui/tabs/analytics.js

@@ -78,7 +78,7 @@ export const AnalyticsTab = {
         lines.push('  ' + renderKvRow('Tokens out', formatNumber(s.window.totalOutputTokens), w - 4));
         lines.push('  ' + renderKvRow('Thinking tokens', formatNumber(s.window.totalThinkingTokens), w - 4));
         lines.push('  ' + renderKvRow('Avg latency', `${Math.round(s.window.avgLatencyMs)}ms`, w - 4));
-        lines.push('  ' + renderKvRow('Subscription %', `${(s.window.subscriptionPercent * 100).toFixed(0)}%`, w - 4));
+        lines.push('  ' + renderKvRow('Subscription %', `${s.window.subscriptionPercent.toFixed(0)}%`, w - 4));
         // ── Per-model bars ─────────────────────────────────────────
         const models = Object.entries(s.perModel).sort((a, b) => b[1].requests - a[1].requests);
         if (models.length > 0) {
@@ -94,14 +94,33 @@ export const AnalyticsTab = {
             }
         }
         // ── Rate-limit ────────────────────────────────────────────
+        // Each account hits its OWN 5h/7d windows, so with >1 account an
+        // aggregate gauge is misleading (#600) — show one row per account, the
+        // bar tracking the binding constraint (max of 5h/7d = closest to a limit).
         lines.push('');
-        lines.push(' ' + brand('Rate-limit'));
-        lines.push('  ' + pad('5h', 6) +
-            fg('cyan', progressBar(s.utilization.lastUtil5h, barWidth)) +
-            '  ' + dim(`${(s.utilization.lastUtil5h * 100).toFixed(0)}%`));
-        lines.push('  ' + pad('7d', 6) +
-            fg('cyan', progressBar(s.utilization.lastUtil7d, barWidth)) +
-            '  ' + dim(`${(s.utilization.lastUtil7d * 100).toFixed(0)}%`));
+        const accts = s.perAccount ? Object.entries(s.perAccount) : [];
+        if (accts.length > 1) {
+            lines.push(' ' + brand('Rate-limit') + dim('  (per account)'));
+            const acctBarWidth = Math.max(8, Math.min(20, w - 48));
+            for (const [alias, a] of accts.sort((x, y) => y[1].requests - x[1].requests)) {
+                const u5 = a.currentUtil5h ?? 0;
+                const u7 = a.currentUtil7d ?? 0;
+                const peak = Math.max(u5, u7);
+                lines.push('  ' + pad(alias, 14) +
+                    fg(peak >= 0.9 ? 'red' : 'cyan', progressBar(peak, acctBarWidth)) +
+                    '  ' + dim(`5h ${(u5 * 100).toFixed(0)}%`.padEnd(8)) +
+                    dim(`7d ${(u7 * 100).toFixed(0)}%`));
+            }
+        }
+        else {
+            lines.push(' ' + brand('Rate-limit'));
+            lines.push('  ' + pad('5h', 6) +
+                fg('cyan', progressBar(s.utilization.lastUtil5h, barWidth)) +
+                '  ' + dim(`${(s.utilization.lastUtil5h * 100).toFixed(0)}%`));
+            lines.push('  ' + pad('7d', 6) +
+                fg('cyan', progressBar(s.utilization.lastUtil7d, barWidth)) +
+                '  ' + dim(`${(s.utilization.lastUtil7d * 100).toFixed(0)}%`));
+        }
         // Overage bucket (v4.1, dario#288). Count of requests that landed in
         // the overage bucket within the rolling window. Empty bar in normal
         // operation; non-zero count renders in red. Hard zero IS the success

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "4.8.103",
+  "version": "4.8.105",
   "description": "Use your Claude Pro/Max subscription in any tool — Cursor, Cline, Aider, the Agent SDK, your scripts — at subscription pricing, not per-token API bills. One local Anthropic + OpenAI-compatible endpoint.",
   "type": "module",
   "bin": {