tledger 0.1.3 → 0.2.0

package/bin/token-ledger-terminal.mjs

@@ -1,17 +1,25 @@
+import {
+  normalizeQuotaTimeline,
+  weeklyQuotaObservations,
+} from "./token-ledger-trend.mjs";
+
 const RESET = "\u001b[0m";
-const DIM = [38, 5, 245];
-const TEAL = [38, 5, 80];
+const PRIMARY_STYLE = [38, 2, 255, 255, 255];
+const SECONDARY_STYLE = [38, 2, 155, 155, 155];
+const ACCENT_STYLE = [38, 2, 51, 156, 255];
+const BORDER_STYLE = [38, 2, 88, 88, 88];
+const TRACK_STYLE = [38, 2, 59, 59, 59];
 export const MODEL_COLORS = {
-  sol: [38, 5, 67],
-  luna: [38, 5, 80],
-  terra: [38, 5, 179],
-  gpt: [38, 5, 176],
-  autoReview: [38, 5, 153],
-  other: [38, 5, 60],
+  sol: [38, 2, 120, 185, 242],
+  luna: ACCENT_STYLE,
+  terra: [38, 2, 214, 168, 95],
+  gpt: [38, 2, 174, 139, 219],
+  other: [38, 2, 116, 125, 144],
 };
-const TEXT_STYLE = [38, 5, 255];
-const TITLE_STYLE = [1, 38, 5, 255];
-const SUBTITLE_STYLE = [38, 5, 245];
+const TEXT_STYLE = PRIMARY_STYLE;
+const TITLE_STYLE = [1, ...PRIMARY_STYLE];
+const SUBTITLE_STYLE = SECONDARY_STYLE;
+const SELECTED_BACKGROUND = "\u001b[48;2;42;42;42m";
 
 function colorsEnabled(options) {
   return options.forceColor ?? (!options.plain && !process.env.NO_COLOR && Boolean(process.stdout.isTTY));
@@ -23,16 +31,7 @@ function colorize(value, code, enabled) {
 }
 
 function stripAnsi(value) {
-  return String(value)
-    .replace(/\u001b\][^\u0007]*(?:\u0007|\u001b\\)/g, "")
-    .replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "");
-}
-
-function sanitizeText(value) {
-  return stripAnsi(value)
-    .replace(/[\u0000-\u001f\u007f-\u009f]+/g, " ")
-    .replace(/\s+/g, " ")
-    .trim();
+  return String(value).replace(/\u001b\[[0-9;]*m/g, "");
 }
 
 function visibleLength(value) {
@@ -94,11 +93,8 @@ function plural(value, singular, pluralForm = `${singular}s`) {
 }
 
 function modelLabel(value) {
-  const model = sanitizeText(value) || "Unknown model";
-  const lower = model.toLowerCase().replaceAll("_", "-");
-  if (lower === "codex-auto-review" || lower.startsWith("codex-auto-review-")) {
-    return "Auto Review";
-  }
+  const model = String(value || "Unknown model");
+  const lower = model.toLowerCase();
   if (lower.includes("sol")) return "Sol";
   if (lower.includes("luna")) return "Luna";
   if (lower.includes("terra")) return "Terra";
@@ -107,15 +103,13 @@ function modelLabel(value) {
 }
 
 function modelColor(model) {
-  const key = String(model || "")
-    .toLowerCase()
-    .replace(/[\s_-]+/g, "-");
-  if (key === "auto-review") return MODEL_COLORS.autoReview;
+  const key = String(model || "").toLowerCase();
   return MODEL_COLORS[key] ?? MODEL_COLORS.other;
 }
 
 function usageTypeLabel(value) {
-  const words = (sanitizeText(value) || "unknown")
+  const words = String(value || "unknown")
+    .trim()
     .replace(/[_-]+/g, " ")
     .split(/\s+/)
     .filter(Boolean);
@@ -130,7 +124,7 @@ function usageTypeLabel(value) {
 }
 
 function displayProject(row) {
-  return sanitizeText(row.displayProject || row.project) || "Unlabelled activity";
+  return row.displayProject || row.project || "Unlabelled activity";
 }
 
 function dateLabel(bounds, range = "day") {
@@ -174,9 +168,7 @@ function modelTotals(events) {
 function usageTypeTotals(events) {
   const totals = new Map();
   for (const event of events) {
-    const key = modelLabel(event.model) === "Auto Review"
-      ? "auto-review"
-      : String(event.useType || "unknown").trim().toLowerCase() || "unknown";
+    const key = String(event.useType || "unknown").trim().toLowerCase() || "unknown";
     totals.set(key, (totals.get(key) ?? 0) + (Number(event.totalTokens) || 0));
   }
   return [...totals.entries()]
@@ -188,22 +180,17 @@ function usageTypeTotals(events) {
     .sort((left, right) => right.totalTokens - left.totalTokens);
 }
 
-function latestWeeklyQuotaObservation(observations) {
-  const weekly = (observations ?? []).filter(
-    (item) => Number(item.windowMinutes) === 10_080,
-  );
-  const accountWide = weekly.filter((item) => item.scope !== "named");
-  const candidates = accountWide.length ? accountWide : weekly;
-  return [...candidates]
-    .sort(
-      (left, right) =>
-        new Date(left.timestamp).getTime() - new Date(right.timestamp).getTime(),
-    )
-    .at(-1) ?? null;
+function latestWeeklyQuotaObservation(snapshot) {
+  // The epoch-keyed timeline drops stale readings from superseded windows,
+  // so the last entry is the newest reading of the currently-live window.
+  const normalized = normalizeQuotaTimeline(weeklyQuotaObservations(snapshot));
+  const latest = normalized.at(-1);
+  if (!latest) return null;
+  return { ...latest, usedPercent: latest.normalizedUsedPercent };
 }
 
 export function quotaCycleSummary(snapshot = {}, displayedEvents = []) {
-  const observation = latestWeeklyQuotaObservation(snapshot.quotaObservations);
+  const observation = latestWeeklyQuotaObservation(snapshot);
   if (!observation) {
     return {
       available: false,
@@ -291,32 +278,6 @@ function summary(events) {
     const cached = Math.max(0, Number(event.cachedInputTokens) || 0);
     return sum + Math.min(input, cached);
   }, 0);
-  const turnCount = (rows) => {
-    const keys = new Set();
-    for (const [index, event] of rows.entries()) {
-      const turnId = String(event.turnId || "").trim();
-      keys.add(turnId ? `turn:${turnId}` : `event:${event.id || index}`);
-    }
-    return keys.size;
-  };
-  const totalTurns = turnCount(events);
-  const autoReviewEvents = events.filter(
-    (event) => modelLabel(event.model) === "Auto Review",
-  );
-  const autoReviewTokens = autoReviewEvents.reduce(
-    (sum, event) => sum + (Number(event.totalTokens) || 0),
-    0,
-  );
-  const autoReviewInputTokens = autoReviewEvents.reduce(
-    (sum, event) => sum + Math.max(0, Number(event.inputTokens) || 0),
-    0,
-  );
-  const autoReviewCachedInputTokens = autoReviewEvents.reduce((sum, event) => {
-    const input = Math.max(0, Number(event.inputTokens) || 0);
-    const cached = Math.max(0, Number(event.cachedInputTokens) || 0);
-    return sum + Math.min(input, cached);
-  }, 0);
-  const autoReviewTurns = turnCount(autoReviewEvents);
   return {
     totalTokens,
     calls,
@@ -327,30 +288,18 @@ function summary(events) {
     uncachedInputTokens: Math.max(0, inputTokens - cachedInputTokens),
     models: modelTotals(events),
     usageTypes: usageTypeTotals(events),
-    autoReview: {
-      present: autoReviewEvents.length > 0,
-      totalTokens: autoReviewTokens,
-      turns: autoReviewTurns,
-      turnShare: totalTurns > 0 ? (autoReviewTurns / totalTurns) * 100 : 0,
-      cachedInputShare: autoReviewInputTokens > 0
-        ? (autoReviewCachedInputTokens / autoReviewInputTokens) * 100
-        : 0,
-    },
   };
 }
 
 function modelLegendItems(models, totalTokens) {
   const known = new Map();
   for (const model of models) {
-    const key = ["Sol", "Luna", "Terra", "GPT", "Auto Review"].includes(model.model)
+    const key = ["Sol", "Luna", "Terra", "GPT"].includes(model.model)
       ? model.model
       : "Other";
     known.set(key, (known.get(key) ?? 0) + model.totalTokens);
   }
-  const order = ["Luna", "Sol", "Terra", "GPT"];
-  if ((known.get("Auto Review") ?? 0) > 0) order.push("Auto Review");
-  order.push("Other");
-  return order
+  return ["Luna", "Sol", "Terra", "GPT", "Other"]
     .map((model) => ({
       model,
       totalTokens: known.get(model) ?? 0,
@@ -358,27 +307,6 @@ function modelLegendItems(models, totalTokens) {
     }));
 }
 
-function visibleUsageTypeItems(items, limit = 5) {
-  if (items.length <= limit) return items;
-  const visible = items.slice(0, limit - 1);
-  const autoReview = items.find((item) => item.key === "auto-review");
-  if (autoReview && !visible.includes(autoReview)) {
-    visible[visible.length - 1] = autoReview;
-    visible.sort((left, right) => right.totalTokens - left.totalTokens);
-  }
-  const visibleKeys = new Set(visible.map((item) => item.key));
-  return [
-    ...visible,
-    {
-      key: "other",
-      label: "Other",
-      totalTokens: items
-        .filter((item) => !visibleKeys.has(item.key))
-        .reduce((sum, item) => sum + item.totalTokens, 0),
-    },
-  ];
-}
-
 function stackedBar(row, width, maximumTokens, options, enabled) {
   const symbol = options.ascii ? "#" : "█";
   const trackSymbol = options.ascii ? "." : "░";
@@ -408,7 +336,7 @@ function stackedBar(row, width, maximumTokens, options, enabled) {
     .join("");
   const blank = colorize(
     trackSymbol.repeat(Math.max(0, width - visibleLength(filled))),
-    DIM,
+    TRACK_STYLE,
     enabled,
   );
   return `${filled}${blank}`;
@@ -430,8 +358,13 @@ function panelLines(rows, allRows, totalTokens, panelWidth, options, enabled) {
     panelWidth - labelWidth - shareWidth - totalWidth - 1 - rightPadding,
   );
   const maxTokens = allRows[0]?.totalTokens ?? 0;
+  const totalCredits = allRows.reduce((sum, item) => sum + item.rateCardCredits, 0) || 1;
+  const selectedIndex = Math.min(
+    Math.max(0, Math.trunc(Number(options.selectedIndex) || 0)),
+    Math.max(0, rows.length - 1),
+  );
   const lines = [];
-  const heading = colorize("TOKENS BY PROJECT", TEAL, enabled);
+  const heading = colorize("TOKENS BY PROJECT", ACCENT_STYLE, enabled);
   const barHeaderWidth = barWidth;
   const maximumLabel = compactMode ? `${compact(maxTokens)} max` : `${compact(maxTokens)} (max)`;
   const axisLabel = barHeaderWidth >= maximumLabel.length + 2 ? maximumLabel : compact(maxTokens);
@@ -441,28 +374,33 @@ function panelLines(rows, allRows, totalTokens, panelWidth, options, enabled) {
   lines.push(
     `${fit(heading, labelWidth)}${fit(axisText, barHeaderWidth)}${fit("TOKENS", totalWidth, "right")}${fit("SHARE", shareWidth, "right")}${" ".repeat(rightPadding)}`,
   );
-  lines.push(colorize("─".repeat(panelWidth), DIM, enabled));
+  lines.push(colorize("─".repeat(panelWidth), BORDER_STYLE, enabled));
 
   for (const [index, row] of rows.entries()) {
     const share = totalTokens > 0 ? (row.totalTokens / totalTokens) * 100 : 0;
-    const selected = !options.static && index === (options.selectedIndex ?? 0);
+    const selected = index === selectedIndex;
     const caretValue = selected ? (options.ascii ? ">" : "▶") : " ";
     const prefix = `${caretValue} ${index + 1}. `;
     const projectText = truncateText(displayProject(row), labelWidth - prefix.length);
-    const caret = selected ? colorize(caretValue, [1, ...TEAL], enabled) : caretValue;
+    const caret = selected ? colorize(caretValue, [1, ...ACCENT_STYLE], enabled) : caretValue;
     const rank = colorize(`${index + 1}.`, TITLE_STYLE, enabled);
     const title = `${caret} ${rank} ${colorize(projectText, TITLE_STYLE, enabled)}`;
     const label = fit(title, labelWidth);
     const metrics = `${fit(compact(row.totalTokens), totalWidth, "right")}${fit(percent(share), shareWidth, "right")}${" ".repeat(rightPadding)}`;
     const bar = stackedBar(row, barWidth, maxTokens, options, enabled);
     const rowLine = `${label}${bar} ${metrics}`;
-    const detail = `${plural(row.threads, "thread")} · ${percent(share)} of tokens`;
+    const creditShare = row.rateCardCredits > 0 && row.rateCardCredits <= Number.MAX_SAFE_INTEGER
+      ? row.rateCardCredits
+      : 0;
+    const detail = `${plural(row.threads, "thread")} · ${percent(
+      creditShare > 0 ? (creditShare / totalCredits) * 100 : 0,
+    )}${labelWidth >= 35 ? " credits" : ""}`;
     const detailText = truncateText(detail, labelWidth - 4);
     const subtitle = colorize(detailText, SUBTITLE_STYLE, enabled);
     const detailLine = `${fit(`    ${subtitle}`, labelWidth)}${" ".repeat(barWidth + 1 + totalWidth + shareWidth + rightPadding)}`;
     if (selected && enabled && options.highlight !== false) {
-      lines.push(`\u001b[48;5;236m${fit(rowLine, panelWidth)}${RESET}`);
-      lines.push(`\u001b[48;5;236m${fit(detailLine, panelWidth)}${RESET}`);
+      lines.push(`${SELECTED_BACKGROUND}${fit(rowLine, panelWidth)}${RESET}`);
+      lines.push(`${SELECTED_BACKGROUND}${fit(detailLine, panelWidth)}${RESET}`);
     } else {
       lines.push(rowLine);
       lines.push(detailLine);
@@ -479,30 +417,36 @@ function sidebarLines(stats, panelWidth, enabled, options = {}, quota = null) {
   const push = (line = "") => {
     lines.push(`${" ".repeat(inset)}${fit(line, contentWidth)}${" ".repeat(inset)}`);
   };
-  const divider = () => push(colorize("─".repeat(contentWidth), DIM, enabled));
-  const heading = (value) => colorize(value, TEAL, enabled);
+  const divider = () => push(colorize("─".repeat(contentWidth), BORDER_STYLE, enabled));
+  const heading = (value) => colorize(value, ACCENT_STYLE, enabled);
   push(heading("MODEL MIX"));
   if (!compactSidebar) push();
   for (const item of modelLegendItems(stats.models, stats.totalTokens)) {
     const swatch = colorize("■", modelColor(item.model), enabled);
     push(`${swatch} ${fit(item.model, Math.max(1, contentWidth - 10))}${fit(percent(item.share), 8, "right")}`);
-    if (item.model === "Auto Review" && stats.autoReview.present) {
-      const turnLabel = stats.autoReview.turns === 1 ? "turn" : "turns";
-      push(`  ${compact(stats.autoReview.turns)} ${turnLabel} · ${percent(stats.autoReview.turnShare)}`);
-      push(`  ${compact(stats.autoReview.totalTokens)} · ${percent(stats.autoReview.cachedInputShare)} cached`);
-    }
   }
-  if (!compactSidebar) push();
+  push();
   divider();
   push(heading("USAGE TYPE · TOKENS"));
   if (!compactSidebar) push();
-  const usageItems = visibleUsageTypeItems(stats.usageTypes);
+  const usageItems = stats.usageTypes.length > 5
+    ? [
+        ...stats.usageTypes.slice(0, 4),
+        {
+          key: "other",
+          label: "Other",
+          totalTokens: stats.usageTypes
+            .slice(4)
+            .reduce((sum, item) => sum + item.totalTokens, 0),
+        },
+      ]
+    : stats.usageTypes;
   for (const item of usageItems) {
     const swatch = "■";
     const share = stats.totalTokens > 0 ? (item.totalTokens / stats.totalTokens) * 100 : 0;
     push(`${swatch} ${fit(item.label, Math.max(1, contentWidth - 10))}${fit(percent(share), 8, "right")}`);
   }
-  if (!compactSidebar) push();
+  push();
   divider();
   push(heading("CACHE · INPUT"));
   if (!compactSidebar) push();
@@ -516,7 +460,7 @@ function sidebarLines(stats, panelWidth, enabled, options = {}, quota = null) {
     push(`${swatch} ${fit(item.label, Math.max(1, contentWidth - 10))}${fit(percent(share), 8, "right")}`);
   }
   if (quota?.available) {
-    if (!compactSidebar) push();
+    push();
     divider();
     push(heading("RESET CYCLE"));
     if (!compactSidebar) push();
@@ -536,28 +480,29 @@ function panel(leftLines, rightLines, leftWidth, rightWidth, enabled, ascii) {
     ? { tl: "+", tr: "+", bl: "+", br: "+", h: "-", v: "|", tm: "+", bm: "+" }
     : { tl: "┌", tr: "┐", bl: "└", br: "┘", h: "─", v: "│", tm: "┬", bm: "┴" };
   const rows = Math.max(leftLines.length, rightLines?.length ?? 0);
-  const top = `${glyphs.tl}${glyphs.h.repeat(leftWidth)}${rightLines ? glyphs.tm : glyphs.tr}${rightLines ? glyphs.h.repeat(rightWidth) + glyphs.tr : ""}`;
+  const border = (value) => colorize(value, BORDER_STYLE, enabled);
+  const top = border(`${glyphs.tl}${glyphs.h.repeat(leftWidth)}${rightLines ? glyphs.tm : glyphs.tr}${rightLines ? glyphs.h.repeat(rightWidth) + glyphs.tr : ""}`);
   const body = [];
   for (let index = 0; index < rows; index += 1) {
     const left = fit(leftLines[index] ?? "", leftWidth);
     if (rightLines) {
       const right = fit(rightLines[index] ?? "", rightWidth);
-      body.push(`${glyphs.v}${left}${glyphs.v}${right}${glyphs.v}`);
+      body.push(`${border(glyphs.v)}${left}${border(glyphs.v)}${right}${border(glyphs.v)}`);
     } else {
-      body.push(`${glyphs.v}${left}${glyphs.v}`);
+      body.push(`${border(glyphs.v)}${left}${border(glyphs.v)}`);
     }
   }
-  const bottom = `${glyphs.bl}${glyphs.h.repeat(leftWidth)}${rightLines ? glyphs.bm : glyphs.br}${rightLines ? glyphs.h.repeat(rightWidth) + glyphs.br : ""}`;
+  const bottom = border(`${glyphs.bl}${glyphs.h.repeat(leftWidth)}${rightLines ? glyphs.bm : glyphs.br}${rightLines ? glyphs.h.repeat(rightWidth) + glyphs.br : ""}`);
   return [top, ...body, bottom];
 }
 
 function headerLines(stats, bounds, frameWidth, options, enabled) {
   const left = colorize("TOKEN LEDGER", TITLE_STYLE, enabled);
   const date = colorize(dateLabel(bounds, options.range), TEXT_STYLE, enabled);
-  const mode = colorize(options.range === "week" ? "7 DAYS" : "DAY", [1, ...TEAL], enabled);
+  const mode = colorize(options.range === "week" ? "7 DAYS" : "DAY", [1, ...ACCENT_STYLE], enabled);
   const metric = (value, label) =>
-    `${colorize(String(value), TITLE_STYLE, enabled)} ${colorize(label, DIM, enabled)}`;
-  const separator = colorize("·", DIM, enabled);
+    `${colorize(String(value), TITLE_STYLE, enabled)} ${colorize(label, SECONDARY_STYLE, enabled)}`;
+  const separator = colorize("·", SECONDARY_STYLE, enabled);
   const join = ` ${separator} `;
   const alignHeader = (line) => fit(` ${line}`, frameWidth);
   const fullLine = [
@@ -580,7 +525,7 @@ function headerLines(stats, bounds, frameWidth, options, enabled) {
   const compactLine = [
     left,
     colorize(compactDate, TEXT_STYLE, enabled),
-    colorize(compactMode, [1, ...TEAL], enabled),
+    colorize(compactMode, [1, ...ACCENT_STYLE], enabled),
     metric(`${compact(stats.totalTokens)}`, "T"),
     metric(stats.calls.toLocaleString("en-US"), "C"),
     metric(stats.threads.toLocaleString("en-US"), "TH"),
@@ -594,7 +539,7 @@ function headerLines(stats, bounds, frameWidth, options, enabled) {
   const minimalLine = [
     minimalTitle,
     colorize(compactDate.replaceAll(" ", ""), TEXT_STYLE, enabled),
-    colorize(compactMode, [1, ...TEAL], enabled),
+    colorize(compactMode, [1, ...ACCENT_STYLE], enabled),
     compact(stats.totalTokens),
     compact(stats.calls),
     compact(stats.threads),
@@ -611,7 +556,7 @@ export function renderTerminal({ options, snapshot, bounds, events, rows, allRow
   const columns = options.width ?? (Number(process.stdout.columns) || 120);
   const frameWidth = Math.max(38, Math.min(158, columns - 2));
   const sideBySide = options.forceSideBySide ?? frameWidth >= 100;
-  const sideWidth = sideBySide ? (stats.autoReview.present ? 28 : 26) : 0;
+  const sideWidth = sideBySide ? 26 : 0;
   const leftWidth = sideBySide ? frameWidth - sideWidth - 1 : frameWidth;
   const left = panelLines(rows, allRows, stats.totalTokens, leftWidth, options, enabled);
   const right = sideBySide ? sidebarLines(stats, sideWidth, enabled, options, quota) : null;
@@ -623,23 +568,21 @@ export function renderTerminal({ options, snapshot, bounds, events, rows, allRow
     lines.push("");
     lines.push(...sidebarLines(stats, frameWidth, enabled, options, quota));
   }
-  if (!options.static && !options.hideHelp) {
-    lines.push("");
-    lines.push(
-      colorize(
-        options.ascii
-          ? "[j/k] select   [q/esc] quit"
-          : "[↑↓ or j/k] select   [q/esc] quit",
-        DIM,
-        enabled,
-      ),
-    );
-  }
+  lines.push("");
+  lines.push(
+    colorize(
+      options.ascii
+        ? "[j/k] select   [enter] inspect   [d/w/m] range   [q] quit"
+        : "[↑↓] select   [enter] inspect   [d/w/m] range   [q] quit",
+      SECONDARY_STYLE,
+      enabled,
+    ),
+  );
   return lines.join("\n");
 }
 
-export const SCREEN_BASE = "\u001b[38;5;255m\u001b[48;2;16;16;18m";
-const PANEL_BASE = "\u001b[38;5;255m\u001b[48;2;5;5;6m";
+export const SCREEN_BASE = "\u001b[38;2;255;255;255m\u001b[48;2;30;30;30m";
+const PANEL_BASE = "\u001b[38;2;255;255;255m\u001b[48;2;24;24;24m";
 
 function paintFullscreenLine(line, width, background, enabled) {
   const fitted = fit(line, width);
@@ -660,7 +603,6 @@ export function renderFullscreen({ options, snapshot, bounds, events, rows, allR
       forceSideBySide: frameWidth >= 84,
       highlight: false,
       compactSidebar: true,
-      hideHelp: true,
       width: frameWidth + 2,
     },
     snapshot,
@@ -670,9 +612,10 @@ export function renderFullscreen({ options, snapshot, bounds, events, rows, allR
     allRows,
   });
   const staticLines = staticOutput.split("\n");
+  staticLines.pop();
   if (staticLines.at(-1) === "") staticLines.pop();
   const summaryLine = staticLines.shift() ?? "";
-  const help = colorize("↑/↓ move   •   j/k move   •   q/esc quit", DIM, enabled);
+  const help = colorize("↑/↓ move   •   j/k move   •   q/esc quit", SECONDARY_STYLE, enabled);
   const content = [
     { line: summaryLine, background: SCREEN_BASE },
     ...staticLines.map((line) => ({ line, background: PANEL_BASE })),