fleetlens 1.0.3 → 1.0.5

package/app/apps/web/lib/usage-data.ts

@@ -70,20 +70,25 @@ export const readUsageSnapshots = cache((): UsageSnapshot[] => {
   return snapshots;
 });
 
-export const latestUsageSnapshot = cache((): UsageSnapshot | null => {
+/** Latest snapshot per agent (last line wins for each agent tag). */
+export const latestUsageSnapshotsByAgent = cache((): Partial<Record<AgentKind, UsageSnapshot>> => {
   const all = readUsageSnapshots();
-  // Sidebar's "current usage" widget is Claude-tier specific (extra_usage,
-  // per-model 7d windows). Filter to Claude only so a Codex snapshot doesn't
-  // accidentally end up as the latest source.
-  const claude = all.filter((s) => (s.agent ?? "claude-code") === "claude-code");
-  return claude.length > 0 ? claude[claude.length - 1]! : null;
+  const byAgent: Partial<Record<AgentKind, UsageSnapshot>> = {};
+  for (const s of all) {
+    const agent = (s.agent ?? "claude-code") as AgentKind;
+    byAgent[agent] = s;
+  }
+  return byAgent;
+});
+
+/** Claude-only latest. Kept for callers that still want the default plan. */
+export const latestUsageSnapshot = cache((): UsageSnapshot | null => {
+  return latestUsageSnapshotsByAgent()["claude-code"] ?? null;
 });
 
 export const latestUsageSnapshotByAgent = cache(
   (agent: AgentKind): UsageSnapshot | null => {
-    const all = readUsageSnapshots();
-    const filtered = all.filter((s) => (s.agent ?? "claude-code") === agent);
-    return filtered.length > 0 ? filtered[filtered.length - 1]! : null;
+    return latestUsageSnapshotsByAgent()[agent] ?? null;
   },
 );
 

package/app/apps/web/lib/usage-display.test.ts

@@ -2,6 +2,8 @@ import { describe, expect, it } from "vitest";
 import {
   copilotQuotaPresentation,
   copilotUnitLabel,
+  sidebarUsageRows,
+  sortUsageAgents,
   visibleUsageAgents,
 } from "./usage-display";
 
@@ -26,6 +28,63 @@ describe("visibleUsageAgents", () => {
   });
 });
 
+describe("sortUsageAgents", () => {
+  it("puts Claude first and sorts the rest alphabetically", () => {
+    expect(sortUsageAgents(["grok", "claude-code", "codex", "zai"])).toEqual([
+      "claude-code",
+      "codex",
+      "grok",
+      "zai",
+    ]);
+  });
+});
+
+describe("sidebarUsageRows", () => {
+  const win = (u: number) => ({ utilization: u, resets_at: null });
+
+  it("returns empty when there is no snapshot", () => {
+    expect(sidebarUsageRows("claude-code", null)).toEqual([]);
+  });
+
+  it("shows 5h + 7d for Claude, and optional Sonnet", () => {
+    const snap = {
+      five_hour: win(10),
+      seven_day: win(40),
+      seven_day_sonnet: win(12),
+    };
+    expect(sidebarUsageRows("claude-code", snap).map((r) => r.label)).toEqual(["5h", "7d"]);
+    expect(
+      sidebarUsageRows("claude-code", snap, { showSonnet: true }).map((r) => r.label),
+    ).toEqual(["5h", "7d", "Sonnet 7d"]);
+  });
+
+  it("hides the retired Codex 5h meter when utilization is null", () => {
+    const snap = { five_hour: { utilization: null, resets_at: null }, seven_day: win(55) };
+    expect(sidebarUsageRows("codex", snap).map((r) => r.label)).toEqual(["7d"]);
+  });
+
+  it("uses monthly for Copilot and 7d-only for Grok", () => {
+    expect(
+      sidebarUsageRows("copilot", { monthly: win(3) }).map((r) => r.label),
+    ).toEqual(["Monthly"]);
+    expect(
+      sidebarUsageRows("grok", { seven_day: win(80) }).map((r) => r.label),
+    ).toEqual(["7d"]);
+  });
+
+  it("derives Copilot monthly windowMs from the calendar month of resets_at", () => {
+    // resets_at = Mar 1 00:00 UTC → previous month is February (non-leap 2026)
+    const febMs =
+      Date.UTC(2026, 2, 1) - Date.UTC(2026, 1, 1); // Mar 1 − Feb 1
+    const rows = sidebarUsageRows("copilot", {
+      monthly: { utilization: 20, resets_at: "2026-03-01T00:00:00.000Z" },
+    });
+    expect(rows).toHaveLength(1);
+    expect(rows[0]!.windowMs).toBe(febMs);
+    expect(rows[0]!.windowMs).toBe(28 * 24 * 3_600_000);
+  });
+});
+
 describe("copilotQuotaPresentation", () => {
   it("does not claim unlimited use when Copilot omits a personal limit", () => {
     const display = copilotQuotaPresentation(null, {

package/app/apps/web/lib/usage-display.ts

@@ -11,6 +11,79 @@ export function visibleUsageAgents(snapshots: UsageAgentEvidence[]): AgentKind[]
   return Array.from(agents);
 }
 
+/** Claude first, then the rest alphabetically — matches /usage tabs. */
+export function sortUsageAgents(agents: AgentKind[]): AgentKind[] {
+  return [...agents].sort((a, b) => {
+    if (a === "claude-code") return -1;
+    if (b === "claude-code") return 1;
+    return a.localeCompare(b);
+  });
+}
+
+export type SidebarUsageRow = {
+  label: string;
+  window: { utilization: number | null; resets_at: string | null } | null;
+  windowMs: number;
+};
+
+const HOUR = 3_600_000;
+const FIVE_HOURS_MS = 5 * HOUR;
+const SEVEN_DAYS_MS = 7 * 24 * HOUR;
+const MONTHLY_MS = 30 * 24 * HOUR;
+
+/**
+ * Which meters the sidebar shows for an agent. Mirrors /usage so switching
+ * the sidebar agent doesn't invent windows that agent never reports.
+ */
+export function sidebarUsageRows(
+  agent: AgentKind,
+  snapshot: {
+    five_hour?: { utilization: number | null; resets_at: string | null } | null;
+    seven_day?: { utilization: number | null; resets_at: string | null } | null;
+    seven_day_sonnet?: { utilization: number | null; resets_at: string | null } | null;
+    monthly?: { utilization: number | null; resets_at: string | null } | null;
+  } | null,
+  opts: { showSonnet?: boolean } = {},
+): SidebarUsageRow[] {
+  if (!snapshot) return [];
+
+  if (agent === "copilot") {
+    // Calendar-month length (same rule as UsageChart.cycleStart for monthly).
+    // A fixed 30d window mis-colors pace near ±15pp in Feb / 31-day months.
+    const monthly = snapshot.monthly ?? null;
+    let windowMs = MONTHLY_MS;
+    if (monthly?.resets_at) {
+      const endMs = new Date(monthly.resets_at).getTime();
+      if (Number.isFinite(endMs)) {
+        const reset = new Date(endMs);
+        const startMs = Date.UTC(reset.getUTCFullYear(), reset.getUTCMonth() - 1, 1);
+        windowMs = Math.max(HOUR, endMs - startMs);
+      }
+    }
+    return [{ label: "Monthly", window: monthly, windowMs }];
+  }
+  if (agent === "grok") {
+    return [{ label: "7d", window: snapshot.seven_day ?? null, windowMs: SEVEN_DAYS_MS }];
+  }
+  // Codex accounts that dropped the 5h limit only report 7d.
+  if (agent === "codex" && snapshot.five_hour?.utilization == null) {
+    return [{ label: "7d", window: snapshot.seven_day ?? null, windowMs: SEVEN_DAYS_MS }];
+  }
+
+  const rows: SidebarUsageRow[] = [
+    { label: "5h", window: snapshot.five_hour ?? null, windowMs: FIVE_HOURS_MS },
+    { label: "7d", window: snapshot.seven_day ?? null, windowMs: SEVEN_DAYS_MS },
+  ];
+  if (agent === "claude-code" && opts.showSonnet) {
+    rows.push({
+      label: "Sonnet 7d",
+      window: snapshot.seven_day_sonnet ?? null,
+      windowMs: SEVEN_DAYS_MS,
+    });
+  }
+  return rows;
+}
+
 export type CopilotMonthlyQuota = {
   used: number | null;
   limit: number | null;

package/app/apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-lens/web",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "private": true,
   "description": "Local-only dashboard for Claude Code sessions. Reads ~/.claude/projects/*.jsonl and visualizes agent activity.",
   "license": "MIT",