tledger 0.2.1 → 0.3.0

package/bin/token-ledger-rates.mjs

@@ -18,10 +18,13 @@ export const RATE_CARD = {
 };
 
 export function normalizeModel(model) {
+  // Collapse underscore and whitespace separators to dashes so variants like
+  // "gpt-5.4 mini" resolve to their own rate-card entry. Keep in lockstep
+  // with normalizeModel in lib/token-ledger-importer.mjs.
   const value = String(model || "unknown")
     .trim()
     .toLowerCase()
-    .replaceAll("_", "-");
+    .replace(/[\s_]+/g, "-");
   if (RATE_CARD[value]) return value;
   if (value.startsWith("gpt-5.6-sol")) return "gpt-5.6-sol";
   if (value.startsWith("gpt-5.6-terra")) return "gpt-5.6-terra";

package/bin/token-ledger-terminal.mjs

@@ -1,4 +1,5 @@
 import {
+  eventCredits,
   normalizeQuotaTimeline,
   weeklyQuotaObservations,
 } from "./token-ledger-trend.mjs";
@@ -6,6 +7,11 @@ import {
   INTERACTIVE_FOOTER,
   INTERACTIVE_HELP,
 } from "./token-ledger-controls.mjs";
+import {
+  usageBucketsInRange,
+  usageCallCount,
+  usageThreadIds,
+} from "../lib/token-ledger-usage.mjs";
 
 const RESET = "\u001b[0m";
 const PRIMARY_STYLE = [38, 2, 255, 255, 255];
@@ -78,12 +84,18 @@ function compact(value) {
     [1_000_000, "M"],
     [1_000, "K"],
   ];
-  for (const [divisor, suffix] of units) {
-    if (absolute >= divisor) {
-      const scaled = value / divisor;
-      const precision = scaled >= 100 ? 0 : scaled >= 10 ? 1 : 2;
-      return `${scaled.toFixed(precision)}${suffix}`;
+  for (let index = 0; index < units.length; index += 1) {
+    const [divisor, suffix] = units[index];
+    if (absolute < divisor) continue;
+    const scaled = value / divisor;
+    const magnitude = Math.abs(scaled);
+    const precision = magnitude >= 100 ? 0 : magnitude >= 10 ? 1 : 2;
+    // Values that round to 1000 of a unit belong to the next unit up
+    // (999,999 → 1.00M, not 1000K).
+    if (index > 0 && Number(magnitude.toFixed(precision)) >= 1_000) {
+      return compact(Math.sign(value) * divisor * 1_000);
     }
+    return `${scaled.toFixed(precision)}${suffix}`;
   }
   return Math.round(value).toLocaleString("en-US");
 }
@@ -131,8 +143,13 @@ function displayProject(row) {
   return row.displayProject || row.project || "Unlabelled activity";
 }
 
-function dateLabel(bounds, range = "day") {
+function isRollingRange(range) {
+  return range === "rolling24h" || range === "rolling";
+}
+
+function dateLabel(bounds, range = "day", rollingLabel = "1 day") {
   if (range === "rolling24h") return "LAST 24 HOURS";
+  if (range === "rolling") return `LAST ${rollingLabel.toUpperCase()}`;
   if (range === "week" && bounds.startDateString && bounds.endDateString) {
     const startParts = bounds.startDateString.split("-").map(Number);
     const endParts = bounds.endDateString.split("-").map(Number);
@@ -232,30 +249,52 @@ export function quotaCycleSummary(snapshot = {}, displayedEvents = []) {
     };
   }
 
-  const inObservedCycle = (event) => {
-    const eventMs = new Date(event.timestamp).getTime();
-    return (
-      Number.isFinite(eventMs) &&
-      eventMs >= windowStartMs &&
-      eventMs <= observedThroughMs
+  const sumUsage = (events) =>
+    events.reduce(
+      (acc, event) => {
+        const tokens = Number(event.totalTokens) || 0;
+        acc.tokens += tokens;
+        const credits = eventCredits(event);
+        if (Number.isFinite(credits) && credits >= 0) {
+          acc.credits += credits;
+          acc.ratedTokens += tokens;
+        }
+        return acc;
+      },
+      { tokens: 0, credits: 0, ratedTokens: 0 },
     );
-  };
-  const sumTokens = (events) =>
-    events.reduce((sum, event) => sum + (Number(event.totalTokens) || 0), 0);
-  const cycleTokens = sumTokens((snapshot.events ?? []).filter(inObservedCycle));
-  const displayedTokens = sumTokens(displayedEvents.filter(inObservedCycle));
+  const cycleEndMs = observedThroughMs + 1;
+  const cycle = sumUsage(
+    usageBucketsInRange(snapshot, windowStartMs, cycleEndMs),
+  );
+  const displayed = sumUsage(
+    usageBucketsInRange(
+      { events: displayedEvents },
+      windowStartMs,
+      cycleEndMs,
+    ),
+  );
   const usedPercent = Math.min(100, Math.max(0, Number(observation.usedPercent) || 0));
-  const displayedSharePercent = cycleTokens
-    ? (displayedTokens / cycleTokens) * 100
-    : null;
+  // The weekly meter weights usage by model, token type, and fast mode;
+  // rate-card credits carry those weights. Allocate burn by credit share
+  // when every event in the cycle is rated, and fall back to raw token
+  // share otherwise.
+  const creditsUsable =
+    cycle.tokens > 0 && cycle.ratedTokens === cycle.tokens && cycle.credits > 0;
+  const displayedSharePercent = creditsUsable
+    ? (displayed.credits / cycle.credits) * 100
+    : cycle.tokens
+      ? (displayed.tokens / cycle.tokens) * 100
+      : null;
 
   return {
     available: true,
     usedPercent,
     remainingPercent: 100 - usedPercent,
-    cycleTokens,
-    displayedTokens,
+    cycleTokens: cycle.tokens,
+    displayedTokens: displayed.tokens,
     displayedSharePercent,
+    shareBasis: creditsUsable ? "credits" : "tokens",
     estimatedDisplayedBurnPercent:
       displayedSharePercent === null
         ? null
@@ -268,8 +307,13 @@ function summary(events) {
     (sum, event) => sum + (Number(event.totalTokens) || 0),
     0,
   );
-  const calls = events.length;
-  const threadIds = new Set(events.map((event) => event.threadId).filter(Boolean));
+  const calls = events.reduce(
+    (sum, event) => sum + usageCallCount(event),
+    0,
+  );
+  const threadIds = new Set(
+    events.flatMap((event) => usageThreadIds(event)),
+  );
   const outputTokens = events.reduce(
     (sum, event) => sum + (Number(event.outputTokens) || 0),
     0,
@@ -510,9 +554,15 @@ function snapshotLine(freshness, enabled) {
 
 function headerLines(stats, bounds, frameWidth, options, enabled, freshness) {
   const left = colorize("TOKEN LEDGER", TITLE_STYLE, enabled);
-  const date = colorize(dateLabel(bounds, options.range), TEXT_STYLE, enabled);
+  const date = colorize(
+    dateLabel(bounds, options.range, options.rollingLabel),
+    TEXT_STYLE,
+    enabled,
+  );
   const modeLabel = options.range === "rolling24h"
     ? "24 HOURS"
+    : options.range === "rolling"
+      ? options.rollingLabel.toUpperCase()
     : options.range === "week"
       ? "7 DAYS"
       : "DAY";
@@ -533,15 +583,17 @@ function headerLines(stats, bounds, frameWidth, options, enabled, freshness) {
   ].join(join);
   if (visibleLength(fullLine) < frameWidth) {
     const lines = [alignHeader(fullLine)];
-    if (options.range === "rolling24h") lines.push(alignHeader(snapshotLine(freshness, enabled)));
+    if (isRollingRange(options.range)) lines.push(alignHeader(snapshotLine(freshness, enabled)));
     return lines;
   }
 
-  const compactDate = dateLabel(bounds, options.range)
+  const compactDate = dateLabel(bounds, options.range, options.rollingLabel)
     .replace(/ 20\d{2}$/, "")
     .replace(" – ", "–");
   const compactMode = options.range === "rolling24h"
     ? "24H"
+    : options.range === "rolling"
+      ? `${options.rollingAmount}${options.rollingUnit.toUpperCase()}`
     : options.range === "week"
       ? "7D"
       : "DAY";
@@ -556,7 +608,7 @@ function headerLines(stats, bounds, frameWidth, options, enabled, freshness) {
   ].join(join);
   if (visibleLength(compactLine) < frameWidth) {
     const lines = [alignHeader(compactLine)];
-    if (options.range === "rolling24h") lines.push(alignHeader(snapshotLine(freshness, enabled)));
+    if (isRollingRange(options.range)) lines.push(alignHeader(snapshotLine(freshness, enabled)));
     return lines;
   }
 
@@ -571,7 +623,7 @@ function headerLines(stats, bounds, frameWidth, options, enabled, freshness) {
     compact(stats.projectCount),
   ].join(" ");
   const lines = [alignHeader(minimalLine)];
-  if (options.range === "rolling24h") lines.push(alignHeader(snapshotLine(freshness, enabled)));
+  if (isRollingRange(options.range)) lines.push(alignHeader(snapshotLine(freshness, enabled)));
   return lines;
 }
 
@@ -603,6 +655,14 @@ export function renderTerminal({
     lines.push("");
     lines.push(...sidebarLines(stats, frameWidth, enabled, options, quota));
   }
+  if (events.some((event) => event.rangeAllocationEstimated === true)) {
+    lines.push("");
+    lines.push(colorize(
+      "≈ Boundary-spanning compact history is allocated proportionally.",
+      SECONDARY_STYLE,
+      enabled,
+    ));
+  }
   lines.push("");
   lines.push(
     colorize(