tokenleak 1.0.1 → 1.1.0

package/tokenleak

@@ -755,8 +755,236 @@ function computePreviousPeriod(current) {
     until: formatDateStringUtc(prevUntil)
   };
 }
+// packages/core/dist/aggregation/more.js
+function daysInMonth(dateString) {
+  const [year, month] = dateString.split("-").map(Number);
+  if (!year || !month) {
+    return 30;
+  }
+  return new Date(Date.UTC(year, month, 0)).getUTCDate();
+}
+function buildInputOutput(providers) {
+  let inputTokens = 0;
+  let outputTokens = 0;
+  for (const provider of providers) {
+    for (const day of provider.daily) {
+      inputTokens += day.inputTokens;
+      outputTokens += day.outputTokens;
+    }
+  }
+  const nonCacheTokens = inputTokens + outputTokens;
+  return {
+    inputPerOutput: outputTokens > 0 ? inputTokens / outputTokens : null,
+    outputPerInput: inputTokens > 0 ? outputTokens / inputTokens : null,
+    outputShare: nonCacheTokens > 0 ? outputTokens / nonCacheTokens : 0
+  };
+}
+function buildMonthlyBurn(providers, range) {
+  const monthPrefix = range.until.slice(0, 7);
+  const monthStart = `${monthPrefix}-01`;
+  const observedSince = range.since > monthStart ? range.since : monthStart;
+  const observedDays = Math.max(1, Math.round((Date.parse(`${range.until}T00:00:00Z`) - Date.parse(`${observedSince}T00:00:00Z`)) / 86400000) + 1);
+  let observedTokens = 0;
+  let observedCost = 0;
+  for (const provider of providers) {
+    for (const day of provider.daily) {
+      if (day.date >= observedSince && day.date <= range.until) {
+        observedTokens += day.totalTokens;
+        observedCost += day.cost;
+      }
+    }
+  }
+  const calendarDays = daysInMonth(range.until);
+  const tokensPerDay = observedTokens / observedDays;
+  const costPerDay = observedCost / observedDays;
+  return {
+    projectedTokens: tokensPerDay * calendarDays,
+    projectedCost: costPerDay * calendarDays,
+    observedDays,
+    calendarDays
+  };
+}
+function buildCacheEconomics(providers) {
+  let readTokens = 0;
+  let writeTokens = 0;
+  let inputTokens = 0;
+  for (const provider of providers) {
+    for (const day of provider.daily) {
+      readTokens += day.cacheReadTokens;
+      writeTokens += day.cacheWriteTokens;
+      inputTokens += day.inputTokens;
+    }
+  }
+  const readCoverage = readTokens + inputTokens > 0 ? readTokens / (readTokens + inputTokens) : 0;
+  return {
+    readTokens,
+    writeTokens,
+    readCoverage,
+    reuseRatio: writeTokens > 0 ? readTokens / writeTokens : null
+  };
+}
+function collectEvents(providers) {
+  return providers.flatMap((provider) => provider.events ?? []);
+}
+function buildHourOfDay(events) {
+  const buckets = Array.from({ length: 24 }, (_, hour) => ({
+    hour,
+    tokens: 0,
+    cost: 0,
+    count: 0
+  }));
+  for (const event of events) {
+    const date = new Date(event.timestamp);
+    if (Number.isNaN(date.getTime())) {
+      continue;
+    }
+    const bucket = buckets[date.getUTCHours()];
+    if (!bucket) {
+      continue;
+    }
+    bucket.tokens += event.totalTokens;
+    bucket.cost += event.cost;
+    bucket.count += 1;
+  }
+  return buckets;
+}
+function buildSessionMetrics(events) {
+  const sessions = new Map;
+  const projects = new Map;
+  for (const event of events) {
+    const key = event.sessionId?.trim() || `${event.provider}:${event.timestamp}`;
+    const timestamp = Date.parse(event.timestamp);
+    const safeTime = Number.isFinite(timestamp) ? timestamp : 0;
+    let session = sessions.get(key);
+    if (!session) {
+      session = {
+        label: event.projectId?.trim() || event.sessionId?.trim() || key,
+        tokens: 0,
+        cost: 0,
+        count: 0,
+        projectId: event.projectId?.trim() || undefined,
+        firstTimestamp: safeTime,
+        lastTimestamp: safeTime,
+        explicitDurationMs: 0,
+        hasExplicitDuration: false
+      };
+      sessions.set(key, session);
+    }
+    session.tokens += event.totalTokens;
+    session.cost += event.cost;
+    session.count += 1;
+    session.firstTimestamp = Math.min(session.firstTimestamp, safeTime);
+    session.lastTimestamp = Math.max(session.lastTimestamp, safeTime);
+    if (typeof event.durationMs === "number" && Number.isFinite(event.durationMs)) {
+      session.explicitDurationMs += Math.max(0, event.durationMs);
+      session.hasExplicitDuration = true;
+    }
+    if (event.projectId?.trim()) {
+      projects.set(event.projectId, (projects.get(event.projectId) ?? 0) + event.totalTokens);
+    }
+  }
+  const sessionEntries = [...sessions.values()];
+  const totalSessions = sessionEntries.length;
+  let totalTokens = 0;
+  let totalCost = 0;
+  let totalMessages = 0;
+  let durationTotal = 0;
+  let durationCount = 0;
+  let longestSession = null;
+  let longestSessionDuration = -1;
+  for (const session of sessionEntries) {
+    totalTokens += session.tokens;
+    totalCost += session.cost;
+    totalMessages += session.count;
+    const derivedDurationMs = session.hasExplicitDuration ? session.explicitDurationMs : session.lastTimestamp > session.firstTimestamp ? session.lastTimestamp - session.firstTimestamp : 0;
+    if (derivedDurationMs > 0) {
+      durationTotal += derivedDurationMs;
+      durationCount += 1;
+    }
+    if (derivedDurationMs > longestSessionDuration || derivedDurationMs === longestSessionDuration && (!longestSession || session.tokens > longestSession.tokens)) {
+      longestSessionDuration = derivedDurationMs;
+      longestSession = {
+        label: session.label,
+        tokens: session.tokens,
+        cost: session.cost,
+        count: session.count,
+        durationMs: derivedDurationMs > 0 ? derivedDurationMs : null
+      };
+    }
+  }
+  let topProject = null;
+  for (const [name, tokens] of projects) {
+    if (!topProject || tokens > topProject.tokens) {
+      topProject = { name, tokens };
+    }
+  }
+  return {
+    totalSessions,
+    averageTokens: totalSessions > 0 ? totalTokens / totalSessions : 0,
+    averageCost: totalSessions > 0 ? totalCost / totalSessions : 0,
+    averageMessages: totalSessions > 0 ? totalMessages / totalSessions : 0,
+    averageDurationMs: durationCount > 0 ? durationTotal / durationCount : null,
+    longestSession,
+    projectCount: projects.size,
+    topProject
+  };
+}
+function computeModelMixShift(currentProviders, previousProviders, limit = 5) {
+  const currentModelTokens = new Map;
+  const previousModelTokens = new Map;
+  let currentTotal = 0;
+  let previousTotal = 0;
+  for (const provider of currentProviders) {
+    for (const day of provider.daily) {
+      for (const model of day.models) {
+        currentModelTokens.set(model.model, (currentModelTokens.get(model.model) ?? 0) + model.totalTokens);
+        currentTotal += model.totalTokens;
+      }
+    }
+  }
+  for (const provider of previousProviders) {
+    for (const day of provider.daily) {
+      for (const model of day.models) {
+        previousModelTokens.set(model.model, (previousModelTokens.get(model.model) ?? 0) + model.totalTokens);
+        previousTotal += model.totalTokens;
+      }
+    }
+  }
+  const models = new Set([
+    ...currentModelTokens.keys(),
+    ...previousModelTokens.keys()
+  ]);
+  return [...models].map((model) => {
+    const currentTokens = currentModelTokens.get(model) ?? 0;
+    const previousTokens = previousModelTokens.get(model) ?? 0;
+    const currentShare = currentTotal > 0 ? currentTokens / currentTotal : 0;
+    const previousShare = previousTotal > 0 ? previousTokens / previousTotal : 0;
+    return {
+      model,
+      currentShare,
+      previousShare,
+      deltaShare: currentShare - previousShare,
+      currentTokens,
+      previousTokens
+    };
+  }).sort((a, b) => Math.abs(b.deltaShare) - Math.abs(a.deltaShare)).slice(0, limit);
+}
+function buildMoreStats(providers, range, compare = null) {
+  const events = collectEvents(providers);
+  return {
+    inputOutput: buildInputOutput(providers),
+    monthlyBurn: buildMonthlyBurn(providers, range),
+    cacheEconomics: buildCacheEconomics(providers),
+    hourOfDay: buildHourOfDay(events),
+    sessionMetrics: buildSessionMetrics(events),
+    compare: compare ? {
+      previousRange: compare.previousRange,
+      modelMixShift: computeModelMixShift(providers, compare.previousProviders)
+    } : null
+  };
+}
 // packages/core/dist/index.js
-var VERSION = "1.0.1";
+var VERSION = "1.0.2";
 
 // packages/registry/dist/models/normalizer.js
 var DATE_SUFFIX_PATTERN = /-\d{8}$/;
@@ -1022,7 +1250,7 @@ async function* splitJsonlRecords(filePath) {
 }
 // packages/registry/dist/providers/claude-code.js
 import { existsSync, readdirSync, statSync } from "fs";
-import { join } from "path";
+import { dirname, join, relative, sep } from "path";
 import { homedir } from "os";
 
 // packages/registry/dist/utils.js
@@ -1101,6 +1329,7 @@ function extractUsage(record) {
   }
   return {
     date,
+    timestamp,
     model,
     inputTokens,
     outputTokens,
@@ -1181,13 +1410,18 @@ class ClaudeCodeProvider {
   async load(range) {
     const files = collectJsonlFiles(this.baseDir);
     const allRecords = [];
+    const allEvents = [];
     for (const file of files) {
       const latestRecordsByMessageId = new Map;
       const anonymousRecords = [];
+      const relativeFile = relative(this.baseDir, file).split(sep).join("/");
+      const projectId = relative(this.baseDir, dirname(file)).split(sep).join("/");
       try {
         for await (const record of splitJsonlRecords(file)) {
           const usage = extractUsage(record);
           if (usage !== null && isInRange(usage.date, range)) {
+            usage.sessionId = relativeFile;
+            usage.projectId = projectId;
             if (usage.messageId) {
               latestRecordsByMessageId.set(usage.messageId, usage);
             } else {
@@ -1201,6 +1435,24 @@ class ClaudeCodeProvider {
       allRecords.push(...latestRecordsByMessageId.values(), ...anonymousRecords);
     }
     const daily = buildDailyUsage(allRecords);
+    for (const record of allRecords) {
+      const normalizedModel = normalizeModelName(record.model);
+      const cost = estimateCost(record.model, record.inputTokens, record.outputTokens, record.cacheReadTokens, record.cacheWriteTokens);
+      allEvents.push({
+        provider: this.name,
+        timestamp: record.timestamp,
+        date: record.date,
+        model: normalizedModel,
+        inputTokens: record.inputTokens,
+        outputTokens: record.outputTokens,
+        cacheReadTokens: record.cacheReadTokens,
+        cacheWriteTokens: record.cacheWriteTokens,
+        totalTokens: record.inputTokens + record.outputTokens + record.cacheReadTokens + record.cacheWriteTokens,
+        cost,
+        sessionId: record.sessionId,
+        projectId: record.projectId
+      });
+    }
     const totalTokens = daily.reduce((sum, d) => sum + d.totalTokens, 0);
     const totalCost = daily.reduce((sum, d) => sum + d.cost, 0);
     return {
@@ -1209,13 +1461,14 @@ class ClaudeCodeProvider {
       daily,
       totalTokens,
       totalCost,
-      colors: this.colors
+      colors: this.colors,
+      events: allEvents
     };
   }
 }
 // packages/registry/dist/providers/codex.js
 import { existsSync as existsSync2, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
-import { join as join2 } from "path";
+import { dirname as dirname2, join as join2, relative as relative2, sep as sep2 } from "path";
 import { homedir as homedir2 } from "os";
 var CODEX_COLORS = {
   primary: "#10a37f",
@@ -1373,6 +1626,7 @@ function parseTokenCountUsage(record, context) {
   const inputTokens = Math.max(0, usage.inputTokens - cacheReadTokens);
   return {
     date,
+    timestamp,
     model: context.model,
     inputTokens,
     outputTokens: usage.outputTokens,
@@ -1403,6 +1657,7 @@ function parseUsageRecord(record, context) {
   }
   return {
     date,
+    timestamp: legacyEvent.timestamp,
     model: compactModelDateSuffix(legacyEvent.model),
     inputTokens: legacyEvent.usage.input_tokens,
     outputTokens: legacyEvent.usage.output_tokens,
@@ -1429,11 +1684,14 @@ class CodexProvider {
   async load(range) {
     const dailyMap = new Map;
     const files = collectJsonlFiles2(this.sessionsDir);
+    const events = [];
     for (const file of files) {
       const context = {
         model: "gpt-5",
         previousTotals: null
       };
+      const relativeFile = relative2(this.sessionsDir, file).split(sep2).join("/");
+      const projectDir = relative2(this.sessionsDir, dirname2(file)).split(sep2).join("/");
       try {
         for await (const record of splitJsonlRecords(file)) {
           const usage = parseUsageRecord(record, context);
@@ -1443,12 +1701,28 @@ class CodexProvider {
           if (!isInRange(usage.date, range)) {
             continue;
           }
+          usage.sessionId = relativeFile;
+          usage.projectId = projectDir === "." ? undefined : projectDir;
           const normalizedModel = normalizeModelName(compactModelDateSuffix(usage.model));
           const inputTokens = usage.inputTokens;
           const outputTokens = usage.outputTokens;
           const cacheReadTokens = usage.cacheReadTokens;
           const cacheWriteTokens = usage.cacheWriteTokens;
           const cost = estimateCost(normalizedModel, inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens);
+          events.push({
+            provider: this.name,
+            timestamp: usage.timestamp,
+            date: usage.date,
+            model: normalizedModel,
+            inputTokens,
+            outputTokens,
+            cacheReadTokens,
+            cacheWriteTokens,
+            totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
+            cost,
+            sessionId: usage.sessionId,
+            projectId: usage.projectId
+          });
           if (!dailyMap.has(usage.date)) {
             dailyMap.set(usage.date, new Map);
           }
@@ -1503,7 +1777,8 @@ class CodexProvider {
       daily,
       totalTokens,
       totalCost,
-      colors: this.colors
+      colors: this.colors,
+      events
     };
   }
 }
@@ -1513,7 +1788,7 @@ import { join as join3 } from "path";
 import { homedir as homedir3 } from "os";
 import { Database } from "bun:sqlite";
 var PROVIDER_NAME = "open-code";
-var DISPLAY_NAME = "Open Code";
+var DISPLAY_NAME = "OpenCode";
 var COLORS = {
   primary: "#6366f1",
   secondary: "#a78bfa",
@@ -1549,12 +1824,46 @@ function extractDate2(createdAt) {
   }
   return date.toISOString().slice(0, 10);
 }
+function toTimestampMillis(createdAt) {
+  const timestamp = typeof createdAt === "number" ? createdAt : Number.isNaN(Number(createdAt)) ? Date.parse(createdAt) : Number(createdAt);
+  if (!Number.isFinite(timestamp)) {
+    return null;
+  }
+  const millis = Math.abs(timestamp) >= 1000000000000 ? timestamp : timestamp * 1000;
+  return Number.isFinite(millis) ? millis : null;
+}
+function toIsoTimestamp(createdAt) {
+  const millis = toTimestampMillis(createdAt);
+  if (millis === null) {
+    return null;
+  }
+  const date = new Date(millis);
+  return Number.isNaN(date.getTime()) ? null : date.toISOString();
+}
 function getRecordCost(record) {
   if (typeof record.explicitCost === "number" && Number.isFinite(record.explicitCost)) {
     return record.explicitCost;
   }
   return estimateCost(record.model, record.inputTokens, record.outputTokens, record.cacheReadTokens, record.cacheWriteTokens);
 }
+function toUsageEvent(record) {
+  const totalTokens = record.inputTokens + record.outputTokens + record.cacheReadTokens + record.cacheWriteTokens;
+  return {
+    provider: PROVIDER_NAME,
+    timestamp: record.timestamp,
+    date: record.date,
+    model: normalizeModelName(record.model),
+    inputTokens: record.inputTokens,
+    outputTokens: record.outputTokens,
+    cacheReadTokens: record.cacheReadTokens,
+    cacheWriteTokens: record.cacheWriteTokens,
+    totalTokens,
+    cost: getRecordCost(record),
+    sessionId: record.sessionId,
+    projectId: record.projectId,
+    durationMs: record.durationMs
+  };
+}
 function buildProviderData(records) {
   const byDate = new Map;
   for (const record of records) {
@@ -1614,7 +1923,8 @@ function buildProviderData(records) {
     daily,
     totalTokens,
     totalCost,
-    colors: COLORS
+    colors: COLORS,
+    events: records.map(toUsageEvent)
   };
 }
 function loadFromSqlite(dbPath, range) {
@@ -1629,18 +1939,21 @@ function loadFromSqlite(dbPath, range) {
     if (tables.length === 0) {
       return [];
     }
-    const rows = db.query("SELECT model, input_tokens, output_tokens, created_at FROM messages WHERE role = 'assistant'").all();
+    const rows = db.query("SELECT model, session_id, input_tokens, output_tokens, created_at FROM messages WHERE role = 'assistant'").all();
     const records = [];
     for (const row of rows) {
       const date = extractDate2(row.created_at);
-      if (date && isInRange(date, range)) {
+      const timestamp = toIsoTimestamp(row.created_at);
+      if (date && timestamp && isInRange(date, range)) {
         records.push({
           date,
+          timestamp,
           model: row.model,
           inputTokens: row.input_tokens,
           outputTokens: row.output_tokens,
           cacheReadTokens: 0,
-          cacheWriteTokens: 0
+          cacheWriteTokens: 0,
+          sessionId: row.session_id
         });
       }
     }
@@ -1666,14 +1979,17 @@ function loadFromLegacyJson(sessionsDir, range) {
           continue;
         }
         const date = extractDate2(msg.created_at);
-        if (date && isInRange(date, range)) {
+        const timestamp = toIsoTimestamp(msg.created_at);
+        if (date && timestamp && isInRange(date, range)) {
           records.push({
             date,
+            timestamp,
             model: msg.model,
             inputTokens: msg.usage.input_tokens,
             outputTokens: msg.usage.output_tokens,
             cacheReadTokens: 0,
-            cacheWriteTokens: 0
+            cacheWriteTokens: 0,
+            sessionId: file
           });
         }
       }
@@ -1711,7 +2027,8 @@ function loadFromCurrentStorage(baseDir, range) {
           continue;
         }
         const date = extractDate2(createdAt);
-        if (!date || !isInRange(date, range)) {
+        const timestamp = toIsoTimestamp(createdAt);
+        if (!date || !timestamp || !isInRange(date, range)) {
           continue;
         }
         const inputTokens = typeof message.tokens?.input === "number" ? message.tokens.input : 0;
@@ -1720,13 +2037,21 @@ function loadFromCurrentStorage(baseDir, range) {
         const cacheWriteTokens = typeof message.tokens?.cache?.write === "number" ? message.tokens.cache.write : 0;
         const record = {
           date,
+          timestamp,
           model,
           inputTokens,
           outputTokens,
           cacheReadTokens,
           cacheWriteTokens,
-          explicitCost: typeof message.cost === "number" ? message.cost : undefined
+          explicitCost: typeof message.cost === "number" ? message.cost : undefined,
+          sessionId: typeof message.sessionID === "string" && message.sessionID || sessionDir
         };
+        const completedAt = message.time?.completed;
+        const completedMs = typeof completedAt === "string" || typeof completedAt === "number" ? toTimestampMillis(completedAt) : null;
+        const createdMs = Date.parse(record.timestamp);
+        if (completedMs !== null && Number.isFinite(createdMs) && completedMs > createdMs) {
+          record.durationMs = completedMs - createdMs;
+        }
         const totalTokens = inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens;
         if (totalTokens === 0 && !(typeof record.explicitCost === "number" && record.explicitCost > 0)) {
           continue;
@@ -1792,66 +2117,10 @@ class JsonRenderer {
     return JSON.stringify(output, null, 2);
   }
 }
-// packages/renderers/dist/svg/theme.js
-var DARK_THEME = {
-  background: "#0d1117",
-  foreground: "#e6edf3",
-  muted: "#7d8590",
-  border: "#30363d",
-  cardBackground: "#161b22",
-  heatmap: ["#161b22", "#1e3a5f", "#2563eb", "#3b82f6", "#1d4ed8"],
-  accent: "#58a6ff",
-  accentSecondary: "#bc8cff",
-  barFill: "#3b82f6",
-  barBackground: "#21262d"
-};
-var LIGHT_THEME = {
-  background: "#ffffff",
-  foreground: "#1a1a2e",
-  muted: "#8b8fa3",
-  border: "#e5e7eb",
-  cardBackground: "#f8f9fc",
-  heatmap: ["#ebedf0", "#c6d4f7", "#8da4ef", "#5b6abf", "#2f3778"],
-  accent: "#3b5bdb",
-  accentSecondary: "#7048e8",
-  barFill: "#5b6abf",
-  barBackground: "#ebedf0"
-};
-function getTheme(mode) {
-  return mode === "dark" ? DARK_THEME : LIGHT_THEME;
-}
-
-// packages/renderers/dist/svg/layout.js
-var PADDING = 40;
-var CELL_SIZE = 16;
-var CELL_GAP = 4;
-var MONTH_LABEL_HEIGHT = 24;
-var DAY_LABEL_WIDTH = 44;
-var HEATMAP_ROWS = 7;
-var SECTION_GAP = 32;
-var FONT_SIZE_TITLE = 28;
-var FONT_SIZE_SUBTITLE = 14;
-var FONT_SIZE_SMALL = 11;
-var FONT_SIZE_STAT_VALUE = 32;
-var FONT_SIZE_STAT_LABEL = 11;
-var FONT_FAMILY = "'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif";
-
 // packages/renderers/dist/svg/utils.js
 function escapeXml(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 }
-function rect(x, y, w, h, fill, rx) {
-  const rxAttr = rx !== undefined ? ` rx="${rx}"` : "";
-  return `<rect x="${x}" y="${y}" width="${w}" height="${h}" fill="${escapeXml(fill)}"${rxAttr}/>`;
-}
-function text(x, y, content, attrs) {
-  const attrStr = attrs ? Object.entries(attrs).map(([k, v]) => ` ${k}="${typeof v === "string" ? escapeXml(v) : v}"`).join("") : "";
-  return `<text x="${x}" y="${y}"${attrStr}>${escapeXml(content)}</text>`;
-}
-function group(children, transform) {
-  const transformAttr = transform ? ` transform="${escapeXml(transform)}"` : "";
-  return `<g${transformAttr}>${children.join("")}</g>`;
-}
 function formatNumber(n) {
   if (n >= 1e6) {
     const millions = Number((n / 1e6).toFixed(1));
@@ -1879,282 +2148,45 @@ function formatCost(cost) {
   return `$${cost.toFixed(4)}`;
 }
 
-// packages/renderers/dist/svg/heatmap.js
-var DAY_LABELS2 = ["Mon", "", "Wed", "", "Fri", "", "Sun"];
-var MONTH_NAMES = [
-  "Jan",
-  "Feb",
-  "Mar",
-  "Apr",
-  "May",
-  "Jun",
-  "Jul",
-  "Aug",
-  "Sep",
-  "Oct",
-  "Nov",
-  "Dec"
-];
-function getLevel(tokens, quantiles) {
-  if (tokens <= 0)
-    return 0;
-  if (tokens <= quantiles[0])
-    return 1;
-  if (tokens <= quantiles[1])
-    return 2;
-  if (tokens <= quantiles[2])
-    return 3;
-  return 4;
-}
-function computeQuantiles(values) {
-  const nonZero = values.filter((v) => v > 0).sort((a, b) => a - b);
-  if (nonZero.length === 0)
-    return [0, 0, 0];
-  const q = (p) => {
-    const idx = Math.floor(p * (nonZero.length - 1));
-    return nonZero[idx] ?? 0;
-  };
-  return [q(0.25), q(0.5), q(0.75)];
-}
-function renderHeatmap(daily, theme, options = {}) {
-  const tokenMap = new Map;
-  for (const d of daily) {
-    const existing = tokenMap.get(d.date) ?? 0;
-    tokenMap.set(d.date, existing + d.totalTokens);
-  }
-  const dates = daily.map((d) => d.date).sort();
-  const endStr = options.endDate ?? dates[dates.length - 1] ?? new Date().toISOString().slice(0, 10);
-  const startStr = options.startDate ?? dates[0] ?? endStr;
-  const end = new Date(endStr + "T00:00:00Z");
-  const start = new Date(startStr + "T00:00:00Z");
-  const startDay = start.getUTCDay();
-  start.setUTCDate(start.getUTCDate() - startDay);
-  const cells = [];
-  const allTokens = Array.from(tokenMap.values());
-  const quantiles = computeQuantiles(allTokens);
-  const current = new Date(start);
-  let col = 0;
-  const monthLabels = [];
-  let lastMonth = -1;
-  const cellRadius = 3;
-  while (current <= end) {
-    const row = current.getUTCDay();
-    const dateStr = current.toISOString().slice(0, 10);
-    const tokens = tokenMap.get(dateStr) ?? 0;
-    const level = getLevel(tokens, quantiles);
-    const x = DAY_LABEL_WIDTH + col * (CELL_SIZE + CELL_GAP);
-    const y = MONTH_LABEL_HEIGHT + row * (CELL_SIZE + CELL_GAP);
-    const title = `${dateStr}: ${tokens.toLocaleString()} tokens`;
-    cells.push(`<rect x="${x}" y="${y}" width="${CELL_SIZE}" height="${CELL_SIZE}" fill="${escapeXml(theme.heatmap[level])}" rx="${cellRadius}"><title>${escapeXml(title)}</title></rect>`);
-    const month = current.getUTCMonth();
-    if (month !== lastMonth && row === 0) {
-      lastMonth = month;
-      monthLabels.push(text(x, MONTH_LABEL_HEIGHT - 8, MONTH_NAMES[month] ?? "", {
-        fill: theme.muted,
-        "font-size": FONT_SIZE_SMALL,
-        "font-family": FONT_FAMILY
-      }));
-    }
-    if (row === 6) {
-      col++;
-    }
-    current.setUTCDate(current.getUTCDate() + 1);
-  }
-  const dayLabels = DAY_LABELS2.map((label, i) => {
-    if (!label)
-      return "";
-    const y = MONTH_LABEL_HEIGHT + i * (CELL_SIZE + CELL_GAP) + CELL_SIZE - 2;
-    return text(0, y, label, {
-      fill: theme.muted,
-      "font-size": FONT_SIZE_SMALL,
-      "font-family": FONT_FAMILY
-    });
-  });
-  const totalCols = col + 1;
-  const gridWidth = DAY_LABEL_WIDTH + totalCols * CELL_SIZE + Math.max(0, totalCols - 1) * CELL_GAP;
-  const height = MONTH_LABEL_HEIGHT + HEATMAP_ROWS * CELL_SIZE + (HEATMAP_ROWS - 1) * CELL_GAP;
-  const legendY = height + 16;
-  const legendItems = [];
-  const legendStartX = 0;
-  legendItems.push(text(legendStartX, legendY + CELL_SIZE - 2, "LESS", {
-    fill: theme.muted,
-    "font-size": 9,
-    "font-family": FONT_FAMILY,
-    "font-weight": "600",
-    "letter-spacing": "0.5"
-  }));
-  const legendBoxStart = legendStartX + 40;
-  for (let i = 0;i < 5; i++) {
-    legendItems.push(`<rect x="${legendBoxStart + i * (CELL_SIZE + 3)}" y="${legendY}" width="${CELL_SIZE}" height="${CELL_SIZE}" fill="${escapeXml(theme.heatmap[i])}" rx="${cellRadius}"/>`);
-  }
-  legendItems.push(text(legendBoxStart + 5 * (CELL_SIZE + 3) + 4, legendY + CELL_SIZE - 2, "MORE", {
-    fill: theme.muted,
-    "font-size": 9,
-    "font-family": FONT_FAMILY,
-    "font-weight": "600",
-    "letter-spacing": "0.5"
-  }));
-  const totalHeight = legendY + CELL_SIZE + 8;
-  const legendRightX = legendBoxStart + 5 * (CELL_SIZE + 3) + 4 + 40;
-  const width = Math.max(gridWidth, legendRightX);
-  const svg = group([...monthLabels, ...dayLabels, ...cells, ...legendItems]);
-  return { svg, width, height: totalHeight };
-}
-
-// packages/renderers/dist/svg/svg-renderer.js
-var MIN_SVG_WIDTH = 1000;
-var MAX_STAT_VALUE_CHARS = 28;
-function truncateText(value, maxChars) {
-  if (value.length <= maxChars)
-    return value;
-  return value.slice(0, maxChars - 1) + "\u2026";
-}
-function renderHeaderStat(x, y, label, value, theme, align = "end") {
-  const anchor = align === "end" ? "end" : "start";
-  return group([
-    text(x, y, label, {
-      fill: theme.muted,
-      "font-size": FONT_SIZE_STAT_LABEL,
-      "font-family": FONT_FAMILY,
-      "font-weight": "700",
-      "text-anchor": anchor,
-      "letter-spacing": "1"
-    }),
-    text(x, y + 34, value, {
-      fill: theme.foreground,
-      "font-size": FONT_SIZE_STAT_VALUE,
-      "font-family": FONT_FAMILY,
-      "font-weight": "700",
-      "text-anchor": anchor
-    })
-  ]);
-}
-function renderBottomStat(x, y, label, value, theme) {
-  return group([
-    text(x, y, label, {
-      fill: theme.muted,
-      "font-size": FONT_SIZE_STAT_LABEL,
-      "font-family": FONT_FAMILY,
-      "font-weight": "700",
-      "letter-spacing": "0.8"
-    }),
-    text(x, y + 32, value, {
-      fill: theme.foreground,
-      "font-size": 18,
-      "font-family": FONT_FAMILY,
-      "font-weight": "700"
-    })
-  ]);
-}
-
-class SvgRenderer {
-  format = "svg";
-  async render(output, options) {
-    const theme = getTheme(options.theme);
-    const sections = [];
-    const sectionWidths = [];
-    let y = PADDING;
-    const providerName = output.providers.length > 0 ? output.providers.map((p) => p.displayName).join(" + ") : "Tokenleak";
-    sections.push(text(PADDING, y + FONT_SIZE_TITLE, providerName, {
-      fill: theme.foreground,
-      "font-size": FONT_SIZE_TITLE,
-      "font-family": FONT_FAMILY,
-      "font-weight": "700"
-    }));
-    sections.push(text(PADDING, y + FONT_SIZE_TITLE + 22, `${output.dateRange.since} \u2014 ${output.dateRange.until}`, {
-      fill: theme.muted,
-      "font-size": FONT_SIZE_SUBTITLE,
-      "font-family": FONT_FAMILY
-    }));
-    const allDaily = output.providers.flatMap((p) => p.daily);
-    const heatmap = renderHeatmap(allDaily, theme, {
-      startDate: output.dateRange.since,
-      endDate: output.dateRange.until
-    });
-    sectionWidths.push(heatmap.width);
-    const contentWidth = Math.max(heatmap.width, MIN_SVG_WIDTH - PADDING * 2);
-    const stats = output.aggregated;
-    const headerStatSpacing = 180;
-    const headerStatsX = PADDING + contentWidth;
-    sections.push(renderHeaderStat(headerStatsX, y, "INPUT TOKENS", formatNumber(stats.totalInputTokens), theme));
-    sections.push(renderHeaderStat(headerStatsX - headerStatSpacing, y, "OUTPUT TOKENS", formatNumber(stats.totalOutputTokens), theme));
-    sections.push(renderHeaderStat(headerStatsX - headerStatSpacing * 2, y, "TOTAL TOKENS", formatNumber(stats.totalTokens), theme));
-    y += FONT_SIZE_TITLE + 22 + SECTION_GAP;
-    if (allDaily.length > 0) {
-      sections.push(group([heatmap.svg], `translate(${PADDING}, ${y})`));
-      y += heatmap.height + SECTION_GAP + 8;
-    }
-    sections.push(`<line x1="${PADDING}" y1="${y}" x2="${PADDING + contentWidth}" y2="${y}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`);
-    y += SECTION_GAP;
-    const col1Width = contentWidth * 0.35;
-    const col2Width = contentWidth * 0.35;
-    const col3Width = contentWidth * 0.15;
-    const col4Width = contentWidth * 0.15;
-    const topModel = stats.topModels.length > 0 ? stats.topModels[0] : null;
-    const topModelLabel = topModel ? truncateText(`${topModel.model} (${formatNumber(topModel.tokens)})`, MAX_STAT_VALUE_CHARS) : "N/A";
-    sections.push(renderBottomStat(PADDING, y, "MOST USED MODEL", topModelLabel, theme));
-    const recent30Label = stats.rolling30dTopModel ? truncateText(`${stats.rolling30dTopModel} (${formatNumber(stats.rolling30dTokens)})`, MAX_STAT_VALUE_CHARS) : formatNumber(stats.rolling30dTokens);
-    sections.push(renderBottomStat(PADDING + col1Width, y, "RECENT USE (LAST 30 DAYS)", recent30Label, theme));
-    sections.push(renderBottomStat(PADDING + col1Width + col2Width, y, "LONGEST STREAK", `${stats.longestStreak} days`, theme));
-    sections.push(renderBottomStat(PADDING + col1Width + col2Width + col3Width, y, "CURRENT STREAK", `${stats.currentStreak} days`, theme));
-    y += 56 + SECTION_GAP;
-    const evenCardWidth = contentWidth / 4;
-    sections.push(`<line x1="${PADDING}" y1="${y - SECTION_GAP / 2}" x2="${PADDING + contentWidth}" y2="${y - SECTION_GAP / 2}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`);
-    sections.push(renderBottomStat(PADDING, y, "TOTAL COST", stats.totalCost >= 100 ? `$${stats.totalCost.toFixed(0)}` : `$${stats.totalCost.toFixed(2)}`, theme));
-    sections.push(renderBottomStat(PADDING + evenCardWidth, y, "CACHE HIT RATE", `${(stats.cacheHitRate * 100).toFixed(1)}%`, theme));
-    sections.push(renderBottomStat(PADDING + evenCardWidth * 2, y, "ACTIVE DAYS", `${stats.activeDays} / ${stats.totalDays}`, theme));
-    sections.push(renderBottomStat(PADDING + evenCardWidth * 3, y, "AVG DAILY TOKENS", formatNumber(stats.averageDailyTokens), theme));
-    y += 56 + PADDING;
-    const totalHeight = y;
-    const svgWidth = Math.max(contentWidth + PADDING * 2, MIN_SVG_WIDTH);
-    sections.push(text(svgWidth - PADDING, totalHeight - 16, "tokenleak", {
-      fill: theme.muted,
-      "font-size": 10,
-      "font-family": FONT_FAMILY,
-      "text-anchor": "end",
-      opacity: "0.4"
-    }));
-    const svgContent = [
-      `<svg xmlns="http://www.w3.org/2000/svg" width="${svgWidth}" height="${totalHeight}" viewBox="0 0 ${svgWidth} ${totalHeight}">`,
-      `<defs><style>@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&amp;display=swap');</style></defs>`,
-      rect(0, 0, svgWidth, totalHeight, theme.background, 12),
-      ...sections,
-      "</svg>"
-    ].join(`
-`);
-    return svgContent;
-  }
-}
-// packages/renderers/dist/png/terminal-card.js
+// packages/renderers/dist/card/layout.js
 var CARD_PADDING = 48;
 var TITLEBAR_HEIGHT = 48;
 var DOT_RADIUS = 6;
 var DOT_GAP = 8;
-var CELL_SIZE2 = 16;
-var CELL_GAP2 = 4;
+var CELL_SIZE = 16;
+var CELL_GAP = 4;
 var STAT_GRID_COLS = 3;
-var MODEL_BAR_HEIGHT = 8;
-var DAY_LABEL_WIDTH2 = 44;
-var MONTH_LABEL_HEIGHT2 = 24;
+var MODEL_BAR_HEIGHT = 11;
+var DAY_LABEL_WIDTH = 44;
+var MONTH_LABEL_HEIGHT = 24;
 var PROVIDER_SECTION_GAP = 36;
-var FONT_FAMILY2 = "'JetBrains Mono', 'SF Mono', 'Cascadia Code', 'Fira Code', monospace";
+var MIN_CONTENT_WIDTH = 700;
+var MODEL_NAME_WIDTH = 220;
+var MODEL_BAR_GAP = 36;
+var MODEL_PERCENT_WIDTH = 40;
+
+// packages/renderers/dist/png/terminal-card.js
+var FONT_FAMILY = "'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif";
+var MONO_FONT_FAMILY = "'JetBrains Mono', 'SF Mono', 'Cascadia Code', 'Fira Code', monospace";
 function getCardTheme(mode) {
   if (mode === "dark") {
     return {
-      bg: "#0c0c0c",
-      fg: "#ffffff",
-      muted: "#52525b",
-      border: "rgba(255,255,255,0.06)",
-      accent: "#10b981",
-      heatmapEmpty: "#1a1a1a",
-      barTrack: "#1c1c1c",
-      titlebarBorder: "rgba(255,255,255,0.06)"
+      bg: "#09090b",
+      fg: "#f0f0f0",
+      muted: "#6b7280",
+      labelFg: "#b0b8c4",
+      border: "rgba(255,255,255,0.08)",
+      accent: "#34d399",
+      heatmapEmpty: "#1a1a22",
+      barTrack: "#151520",
+      titlebarBorder: "rgba(255,255,255,0.08)"
     };
   }
   return {
     bg: "#fafafa",
     fg: "#18181b",
     muted: "#a1a1aa",
+    labelFg: "#71717a",
     border: "rgba(0,0,0,0.08)",
     accent: "#059669",
     heatmapEmpty: "#e4e4e7",
@@ -2166,7 +2198,7 @@ function buildHeatmapScale(colors, isDark) {
   const [startHex, endHex] = colors.gradient;
   const s = hexToRgb(startHex);
   const e = hexToRgb(endHex);
-  const opacities = isDark ? [0.15, 0.35, 0.6, 1] : [0.2, 0.4, 0.65, 1];
+  const opacities = isDark ? [0.25, 0.5, 0.75, 1] : [0.2, 0.4, 0.65, 1];
   return [
     "transparent",
     ...opacities.map((t) => {
@@ -2189,7 +2221,7 @@ function rgbToHex(r, g, b) {
   const toHex = (n) => n.toString(16).padStart(2, "0");
   return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
 }
-function computeQuantiles2(values) {
+function computeQuantiles(values) {
   const nonZero = values.filter((v) => v > 0).sort((a, b) => a - b);
   if (nonZero.length === 0)
     return [0, 0, 0];
@@ -2199,7 +2231,7 @@ function computeQuantiles2(values) {
   };
   return [q(0.25), q(0.5), q(0.75)];
 }
-function getLevel2(tokens, quantiles) {
+function getLevel(tokens, quantiles) {
   if (tokens <= 0)
     return 0;
   if (tokens <= quantiles[0])
@@ -2210,7 +2242,7 @@ function getLevel2(tokens, quantiles) {
     return 3;
   return 4;
 }
-var MONTH_NAMES2 = [
+var MONTH_NAMES = [
   "Jan",
   "Feb",
   "Mar",
@@ -2253,6 +2285,41 @@ function formatPercentage(rate) {
 function formatStreak(n) {
   return `${n} day${n !== 1 ? "s" : ""}`;
 }
+function formatRatio(value, suffix = "x") {
+  if (value === null || !Number.isFinite(value)) {
+    return "n/a";
+  }
+  return `${value.toFixed(value >= 10 ? 1 : 2)}${suffix}`;
+}
+function formatPercentPoints(value) {
+  const prefix = value >= 0 ? "+" : "";
+  return `${prefix}${(value * 100).toFixed(1)}pp`;
+}
+function formatHour(hour) {
+  return `${hour.toString().padStart(2, "0")}:00`;
+}
+function formatDuration(durationMs) {
+  if (durationMs === null || durationMs === undefined || durationMs <= 0) {
+    return "n/a";
+  }
+  const totalMinutes = Math.round(durationMs / 60000);
+  if (totalMinutes < 60) {
+    return `${totalMinutes}m`;
+  }
+  const hours = Math.floor(totalMinutes / 60);
+  const minutes = totalMinutes % 60;
+  return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`;
+}
+function truncateText(value, maxLength) {
+  return value.length > maxLength ? `${value.slice(0, maxLength - 1)}\u2026` : value;
+}
+function formatSessionSummary(summary) {
+  const duration = formatDuration(summary.durationMs);
+  if (duration === "n/a") {
+    return truncateText(summary.label, 20);
+  }
+  return truncateText(`${summary.label} \xB7 ${duration}`, 24);
+}
 function renderProviderHeatmap(daily, since, until, heatmapColors, emptyColor) {
   const tokenMap = new Map;
   for (const d of daily) {
@@ -2265,7 +2332,7 @@ function renderProviderHeatmap(daily, since, until, heatmapColors, emptyColor) {
   const start = new Date(startStr + "T00:00:00Z");
   start.setUTCDate(start.getUTCDate() - start.getUTCDay());
   const allTokens = Array.from(tokenMap.values());
-  const quantiles = computeQuantiles2(allTokens);
+  const quantiles = computeQuantiles(allTokens);
   const cells = [];
   const monthLabels = [];
   let lastMonth = -1;
@@ -2275,37 +2342,183 @@ function renderProviderHeatmap(daily, since, until, heatmapColors, emptyColor) {
     const row = current.getUTCDay();
     const dateStr = current.toISOString().slice(0, 10);
     const tokens = tokenMap.get(dateStr) ?? 0;
-    const level = getLevel2(tokens, quantiles);
-    const x = DAY_LABEL_WIDTH2 + col * (CELL_SIZE2 + CELL_GAP2);
-    const y = MONTH_LABEL_HEIGHT2 + row * (CELL_SIZE2 + CELL_GAP2);
+    const level = getLevel(tokens, quantiles);
+    const x = DAY_LABEL_WIDTH + col * (CELL_SIZE + CELL_GAP);
+    const y = MONTH_LABEL_HEIGHT + row * (CELL_SIZE + CELL_GAP);
     const fill = level === 0 ? emptyColor : heatmapColors[level];
     const title = `${dateStr}: ${tokens.toLocaleString()} tokens`;
-    cells.push(`<rect x="${x}" y="${y}" width="${CELL_SIZE2}" height="${CELL_SIZE2}" fill="${escapeXml(fill)}" rx="3"><title>${escapeXml(title)}</title></rect>`);
+    cells.push(`<rect x="${x}" y="${y}" width="${CELL_SIZE}" height="${CELL_SIZE}" fill="${escapeXml(fill)}" rx="3"><title>${escapeXml(title)}</title></rect>`);
     const month = current.getUTCMonth();
     if (month !== lastMonth && row === 0) {
       lastMonth = month;
-      monthLabels.push(`<text x="${x}" y="${MONTH_LABEL_HEIGHT2 - 8}" fill="__MUTED__" font-size="11" font-family="${escapeXml(FONT_FAMILY2)}">${escapeXml(MONTH_NAMES2[month] ?? "")}</text>`);
+      monthLabels.push(`<text x="${x}" y="${MONTH_LABEL_HEIGHT - 8}" fill="__MUTED__" font-size="11" font-family="${escapeXml(FONT_FAMILY)}">${escapeXml(MONTH_NAMES[month] ?? "")}</text>`);
     }
     if (row === 6)
       col++;
     current.setUTCDate(current.getUTCDate() + 1);
   }
   const dayLabels = [
+    { label: "Sun", row: 0 },
     { label: "Mon", row: 1 },
+    { label: "Tue", row: 2 },
     { label: "Wed", row: 3 },
+    { label: "Thu", row: 4 },
     { label: "Fri", row: 5 },
-    { label: "Sun", row: 0 }
+    { label: "Sat", row: 6 }
   ].map((d) => {
-    const y = MONTH_LABEL_HEIGHT2 + d.row * (CELL_SIZE2 + CELL_GAP2) + CELL_SIZE2 - 2;
-    return `<text x="0" y="${y}" fill="__MUTED__" font-size="11" font-family="${escapeXml(FONT_FAMILY2)}">${escapeXml(d.label)}</text>`;
+    const y = MONTH_LABEL_HEIGHT + d.row * (CELL_SIZE + CELL_GAP) + CELL_SIZE - 2;
+    return `<text x="0" y="${y}" fill="__MUTED__" font-size="11" font-family="${escapeXml(FONT_FAMILY)}">${escapeXml(d.label)}</text>`;
   }).join("");
   const totalCols = col + 1;
-  const gridWidth = DAY_LABEL_WIDTH2 + totalCols * (CELL_SIZE2 + CELL_GAP2);
-  const height = MONTH_LABEL_HEIGHT2 + 7 * (CELL_SIZE2 + CELL_GAP2);
+  const gridWidth = DAY_LABEL_WIDTH + totalCols * (CELL_SIZE + CELL_GAP);
+  const height = MONTH_LABEL_HEIGHT + 7 * (CELL_SIZE + CELL_GAP);
   const svg = [dayLabels, ...monthLabels, ...cells].join(`
 `);
   return { svg, gridWidth, height };
 }
+function renderSectionHeader(x, y, title, theme, cardAccent) {
+  const parts = [];
+  parts.push(`<rect x="${x}" y="${y - 8}" width="3" height="10" rx="1.5" fill="${escapeXml(cardAccent)}" opacity="0.6"/>`);
+  parts.push(`<text x="${x + 12}" y="${y}" fill="${escapeXml(theme.labelFg)}" font-size="11" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" letter-spacing="1.8">${escapeXml(title)}</text>`);
+  return parts.join(`
+`);
+}
+function renderMetricCard(x, y, width, title, lines, theme, cardAccent) {
+  const parts = [];
+  const height = 38 + lines.length * 22;
+  parts.push(`<rect x="${x}" y="${y}" width="${width}" height="${height}" rx="10" fill="${escapeXml(theme.barTrack)}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`);
+  parts.push(`<text x="${x + 18}" y="${y + 22}" fill="${escapeXml(theme.labelFg)}" font-size="10" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" letter-spacing="1.6">${escapeXml(title)}</text>`);
+  lines.forEach((line, index) => {
+    const lineY = y + 48 + index * 22;
+    parts.push(`<text x="${x + 18}" y="${lineY}" fill="${escapeXml(theme.fg)}" font-size="11" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600">${escapeXml(line.label)}</text>`);
+    parts.push(`<text x="${x + width - 18}" y="${lineY}" fill="${escapeXml(line.accent ? cardAccent : theme.fg)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" text-anchor="end">${escapeXml(line.value)}</text>`);
+  });
+  return parts.join(`
+`);
+}
+function buildProviderHourBuckets(providers) {
+  return providers.map((p) => {
+    const hours = new Array(24).fill(0);
+    for (const event of p.events ?? []) {
+      const date = new Date(event.timestamp);
+      if (!Number.isNaN(date.getTime())) {
+        const h = date.getUTCHours();
+        hours[h] += event.totalTokens;
+      }
+    }
+    return { provider: p.provider, color: p.colors.primary, hours };
+  });
+}
+function renderHourOfDayChart(x, y, width, hourOfDay, theme, cardAccent, providers, isDark) {
+  const chartHeight = 140;
+  const innerHeight = 72;
+  const baselineY = y + 92;
+  const barAreaX = x + 18;
+  const barAreaWidth = width - 36;
+  const barGap = 4;
+  const barWidth = (barAreaWidth - barGap * 23) / 24;
+  const maxTokens = Math.max(...hourOfDay.map((entry) => entry.tokens), 0);
+  const busiest = hourOfDay.reduce((best, entry) => best === null || entry.tokens > best.tokens ? entry : best, null);
+  const isMulti = providers.length > 1;
+  const providerBuckets = isMulti ? buildProviderHourBuckets(providers) : [];
+  let legendSvg = "";
+  if (isMulti && providerBuckets.length > 0) {
+    const titleWidth = 105;
+    let legendX = x + 18 + titleWidth + 12;
+    const legendY = y + 22;
+    for (const bucket of providerBuckets) {
+      const displayName = providers.find((p) => p.provider === bucket.provider)?.displayName ?? bucket.provider;
+      legendSvg += `<rect x="${legendX}" y="${legendY - 8}" width="8" height="8" rx="2" fill="${escapeXml(bucket.color)}" opacity="0.85"/>` + `<text x="${legendX + 12}" y="${legendY - 1}" fill="${escapeXml(theme.fg)}" font-size="9" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600">${escapeXml(displayName)}</text>`;
+      legendX += 12 + displayName.length * 5.5 + 16;
+    }
+  }
+  const bars = [
+    `<rect x="${x}" y="${y}" width="${width}" height="${chartHeight}" rx="10" fill="${escapeXml(theme.barTrack)}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`,
+    `<text x="${x + 18}" y="${y + 22}" fill="${escapeXml(theme.labelFg)}" font-size="10" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" letter-spacing="1.6">HOUR OF DAY</text>`,
+    legendSvg,
+    `<text x="${x + width - 18}" y="${y + 22}" fill="${escapeXml(theme.labelFg)}" font-size="11" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500" text-anchor="end">${escapeXml(busiest ? `${formatHour(busiest.hour)} peak` : "No session events")}</text>`,
+    `<line x1="${barAreaX}" y1="${baselineY}" x2="${barAreaX + barAreaWidth}" y2="${baselineY}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`
+  ];
+  bars.push(`<defs><filter id="peakGlow" x="-50%" y="-50%" width="200%" height="200%">` + `<feGaussianBlur stdDeviation="4" result="blur"/>` + `<feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>` + `</filter></defs>`);
+  if (isMulti) {
+    const provBaseOpacity = isDark ? "0.45" : "0.3";
+    const provMidOpacity = isDark ? "0.85" : "0.75";
+    for (let bi = 0;bi < providerBuckets.length; bi++) {
+      const gradId = `hod-prov-${bi}`;
+      bars.push(`<defs><linearGradient id="${escapeXml(gradId)}" x1="0%" y1="100%" x2="0%" y2="0%">` + `<stop offset="0%" stop-color="${escapeXml(providerBuckets[bi].color)}" stop-opacity="${provBaseOpacity}"/>` + `<stop offset="60%" stop-color="${escapeXml(providerBuckets[bi].color)}" stop-opacity="${provMidOpacity}"/>` + `<stop offset="100%" stop-color="${escapeXml(providerBuckets[bi].color)}" stop-opacity="1"/>` + `</linearGradient></defs>`);
+    }
+    hourOfDay.forEach((entry, index) => {
+      if (entry.tokens <= 0)
+        return;
+      const totalRatio = entry.tokens / maxTokens;
+      const totalBarHeight = Math.max(4, totalRatio * innerHeight);
+      const colX = barAreaX + index * (barWidth + barGap);
+      const isPeak = busiest !== null && entry.hour === busiest.hour;
+      if (isPeak) {
+        const topY2 = baselineY - totalBarHeight;
+        bars.push(`<rect x="${colX - 2}" y="${topY2 - 2}" width="${barWidth + 4}" height="${totalBarHeight + 4}" rx="5" fill="${escapeXml(providerBuckets[0]?.color ?? cardAccent)}" opacity="0.12" filter="url(#peakGlow)"/>`);
+      }
+      const clipId = `hod-clip-${index}`;
+      const topY = baselineY - totalBarHeight;
+      bars.push(`<defs><clipPath id="${escapeXml(clipId)}">` + `<rect x="${colX}" y="${topY}" width="${barWidth}" height="${totalBarHeight}" rx="3"/>` + `</clipPath></defs>`);
+      let offsetY = 0;
+      for (let bi = 0;bi < providerBuckets.length; bi++) {
+        const tokens = providerBuckets[bi].hours[index] ?? 0;
+        if (tokens <= 0)
+          continue;
+        const segHeight = tokens / entry.tokens * totalBarHeight;
+        const segY = baselineY - offsetY - segHeight;
+        bars.push(`<rect x="${colX}" y="${segY}" width="${barWidth}" height="${segHeight}" fill="url(#hod-prov-${bi})" clip-path="url(#${escapeXml(clipId)})"/>`);
+        offsetY += segHeight;
+      }
+    });
+  } else {
+    const hodGradId = "hod-bar-grad";
+    const hodBaseOpacity = isDark ? "0.25" : "0.1";
+    const hodMidOpacity = isDark ? "0.75" : "0.6";
+    bars.push(`<defs><linearGradient id="${escapeXml(hodGradId)}" x1="0%" y1="100%" x2="0%" y2="0%">` + `<stop offset="0%" stop-color="${escapeXml(cardAccent)}" stop-opacity="${hodBaseOpacity}"/>` + `<stop offset="40%" stop-color="${escapeXml(cardAccent)}" stop-opacity="${hodMidOpacity}"/>` + `<stop offset="100%" stop-color="${escapeXml(cardAccent)}" stop-opacity="1"/>` + `</linearGradient></defs>`);
+    hourOfDay.forEach((entry, index) => {
+      const ratio = maxTokens > 0 ? entry.tokens / maxTokens : 0;
+      const barHeight = maxTokens > 0 ? Math.max(4, ratio * innerHeight) : 4;
+      const colX = barAreaX + index * (barWidth + barGap);
+      const colY = baselineY - barHeight;
+      const isPeak = busiest !== null && entry.hour === busiest.hour && entry.tokens > 0;
+      if (isPeak) {
+        bars.push(`<rect x="${colX - 2}" y="${colY - 2}" width="${barWidth + 4}" height="${barHeight + 4}" rx="5" fill="${escapeXml(cardAccent)}" opacity="0.15" filter="url(#peakGlow)"/>`);
+      }
+      bars.push(`<rect x="${colX}" y="${colY}" width="${barWidth}" height="${barHeight}" rx="3" fill="url(#${escapeXml(hodGradId)})" opacity="${0.35 + ratio * 0.65}"/>`);
+    });
+  }
+  [0, 3, 6, 9, 12, 15, 18, 21].forEach((hour) => {
+    const labelX = barAreaX + hour * (barWidth + barGap) + barWidth / 2;
+    bars.push(`<text x="${labelX}" y="${y + 116}" fill="${escapeXml(theme.labelFg)}" font-size="9" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500" text-anchor="middle">${escapeXml(hour.toString().padStart(2, "0"))}</text>`);
+  });
+  return {
+    svg: bars.join(`
+`),
+    height: chartHeight
+  };
+}
+function renderModelMixShift(x, y, width, more, theme, cardAccent) {
+  if (!more.compare || more.compare.modelMixShift.length === 0) {
+    return { svg: "", height: 0 };
+  }
+  const rows = more.compare.modelMixShift.slice(0, 4);
+  const height = 38 + rows.length * 24;
+  const parts = [
+    `<rect x="${x}" y="${y}" width="${width}" height="${height}" rx="10" fill="${escapeXml(theme.barTrack)}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`,
+    `<text x="${x + 18}" y="${y + 22}" fill="${escapeXml(theme.labelFg)}" font-size="10" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" letter-spacing="1.6">MODEL MIX SHIFT</text>`,
+    `<text x="${x + width - 18}" y="${y + 22}" fill="${escapeXml(theme.labelFg)}" font-size="11" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500" text-anchor="end">${escapeXml(`${more.compare.previousRange.since} \u2192 ${more.compare.previousRange.until}`)}</text>`
+  ];
+  rows.forEach((row, index) => {
+    const lineY = y + 48 + index * 24;
+    parts.push(`<text x="${x + 18}" y="${lineY}" fill="${escapeXml(theme.fg)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600">${escapeXml(truncateText(row.model, 28))}</text>`);
+    parts.push(`<text x="${x + width - 18}" y="${lineY}" fill="${escapeXml(row.deltaShare >= 0 ? cardAccent : "#f97316")}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" text-anchor="end">${escapeXml(formatPercentPoints(row.deltaShare))}</text>`);
+    parts.push(`<text x="${x + width - 110}" y="${lineY}" fill="${escapeXml(theme.labelFg)}" font-size="11" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500" text-anchor="end">${escapeXml(`${(row.previousShare * 100).toFixed(1)}% \u2192 ${(row.currentShare * 100).toFixed(1)}%`)}</text>`);
+  });
+  return { svg: parts.join(`
+`), height };
+}
 function renderTerminalCardSvg(output, options) {
   const theme = getCardTheme(options.theme);
   const isDark = options.theme === "dark";
@@ -2313,6 +2526,8 @@ function renderTerminalCardSvg(output, options) {
   const stats = output.aggregated;
   const { since, until } = output.dateRange;
   const providers = output.providers;
+  const cardAccent = providers.length === 1 ? providers[0]?.colors.primary ?? theme.accent : theme.accent;
+  const barAccent = providers.length > 1 ? isDark ? "#c4d0e0" : "#000000" : cardAccent;
   const providerHeatmaps = providers.map((p) => {
     const heatmapColors = buildHeatmapScale(p.colors, isDark);
     return {
@@ -2322,7 +2537,7 @@ function renderTerminalCardSvg(output, options) {
     };
   });
   const maxHeatmapWidth = providerHeatmaps.reduce((max, ph) => Math.max(max, ph.heatmap.gridWidth), 0);
-  const minContentWidth = Math.max(maxHeatmapWidth, 700);
+  const minContentWidth = Math.max(maxHeatmapWidth, MIN_CONTENT_WIDTH);
   const cardWidth = minContentWidth + pad * 2;
   const contentWidth = cardWidth - pad * 2;
   let y = 0;
@@ -2340,24 +2555,22 @@ function renderTerminalCardSvg(output, options) {
   for (const dot of dots) {
     sections.push(`<circle cx="${dot.cx}" cy="${dotY}" r="${DOT_RADIUS}" fill="${escapeXml(dot.color)}"/>`);
   }
-  const titleX = dots[2].cx + DOT_RADIUS + 20;
-  sections.push(`<text x="${titleX}" y="${dotY + 5}" fill="${escapeXml(theme.muted)}" font-size="13" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="500">${escapeXml("tokenleak")}</text>`);
   sections.push(`<line x1="0" y1="${TITLEBAR_HEIGHT}" x2="${cardWidth}" y2="${TITLEBAR_HEIGHT}" stroke="${escapeXml(theme.titlebarBorder)}" stroke-width="1"/>`);
   y = TITLEBAR_HEIGHT + pad * 0.6;
-  sections.push(`<text x="${pad}" y="${y + 16}" font-size="15" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="500">` + `<tspan fill="${escapeXml(theme.accent)}">$</tspan>` + `<tspan fill="${escapeXml(theme.fg)}"> tokenleak</tspan>` + `<tspan fill="${escapeXml(theme.accent)}">_</tspan>` + `</text>`);
+  sections.push(`<text x="${pad}" y="${y + 16}" font-size="15" font-family="${escapeXml(MONO_FONT_FAMILY)}" font-weight="500">` + `<tspan fill="${escapeXml(cardAccent)}">$</tspan>` + `<tspan fill="${escapeXml(theme.fg)}"> tokenleak</tspan>` + `<tspan fill="${escapeXml(cardAccent)}">_</tspan>` + `</text>`);
   y += 40;
   const dateRangeText = formatDateRange(since, until);
-  sections.push(`<text x="${pad}" y="${y + 14}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="600" letter-spacing="2">${escapeXml(dateRangeText)}</text>`);
+  sections.push(`<text x="${pad}" y="${y + 14}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600" letter-spacing="2">${escapeXml(dateRangeText)}</text>`);
   y += 40;
   for (let pi = 0;pi < providerHeatmaps.length; pi++) {
     const { provider, heatmap, heatmapColors } = providerHeatmaps[pi];
-    const provDotRadius = 5;
+    const provDotRadius = 7;
     const provColor = provider.colors.primary;
-    sections.push(`<circle cx="${pad + provDotRadius}" cy="${y + 8}" r="${provDotRadius}" fill="${escapeXml(provColor)}"/>`);
-    sections.push(`<text x="${pad + provDotRadius * 2 + 10}" y="${y + 13}" fill="${escapeXml(theme.fg)}" font-size="14" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="600">${escapeXml(provider.displayName)}</text>`);
+    sections.push(`<circle cx="${pad + provDotRadius}" cy="${y + 10}" r="${provDotRadius}" fill="${escapeXml(provColor)}"/>`);
+    sections.push(`<text x="${pad + provDotRadius * 2 + 12}" y="${y + 15}" fill="${escapeXml(theme.fg)}" font-size="17" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700">${escapeXml(provider.displayName)}</text>`);
     const summaryText = `${formatNumber(provider.totalTokens)} tokens \xB7 ${formatCost(provider.totalCost)}`;
-    sections.push(`<text x="${cardWidth - pad}" y="${y + 13}" fill="${escapeXml(theme.muted)}" font-size="11" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="500" text-anchor="end">${escapeXml(summaryText)}</text>`);
-    y += 28;
+    sections.push(`<text x="${cardWidth - pad}" y="${y + 15}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500" text-anchor="end">${escapeXml(summaryText)}</text>`);
+    y += 32;
     const heatmapSvg = heatmap.svg.replace(/__MUTED__/g, escapeXml(theme.muted));
     sections.push(`<g transform="translate(${pad}, ${y})">`);
     sections.push(heatmapSvg);
@@ -2372,13 +2585,13 @@ function renderTerminalCardSvg(output, options) {
     }
   }
   if (providers.length === 0) {
-    sections.push(`<text x="${pad}" y="${y + 14}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="500">${escapeXml("No provider data")}</text>`);
+    sections.push(`<text x="${pad}" y="${y + 14}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500">${escapeXml("No provider data")}</text>`);
     y += 32;
   }
   sections.push(`<line x1="${pad}" y1="${y}" x2="${cardWidth - pad}" y2="${y}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`);
   y += 28;
   if (providers.length > 1) {
-    sections.push(`<text x="${pad}" y="${y}" fill="${escapeXml(theme.muted)}" font-size="10" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="600" letter-spacing="2">${escapeXml("OVERALL")}</text>`);
+    sections.push(`<text x="${pad}" y="${y}" fill="${escapeXml(theme.muted)}" font-size="10" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600" letter-spacing="2">${escapeXml("OVERALL")}</text>`);
     y += 24;
   }
   const statColWidth = contentWidth / STAT_GRID_COLS;
@@ -2396,9 +2609,9 @@ function renderTerminalCardSvg(output, options) {
     for (let i = 0;i < row.length; i++) {
       const stat = row[i];
       const x = pad + i * statColWidth;
-      sections.push(`<text x="${x}" y="${startY}" fill="${escapeXml(theme.muted)}" font-size="10" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="600" letter-spacing="1.5">${escapeXml(stat.label)}</text>`);
-      const valueColor = stat.accent ? theme.accent : theme.fg;
-      sections.push(`<text x="${x}" y="${startY + 28}" fill="${escapeXml(valueColor)}" font-size="22" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="700">${escapeXml(stat.value)}</text>`);
+      sections.push(`<text x="${x}" y="${startY}" fill="${escapeXml(theme.muted)}" font-size="10" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600" letter-spacing="1.5">${escapeXml(stat.label)}</text>`);
+      const valueColor = stat.accent && providers.length === 1 ? cardAccent : theme.fg;
+      sections.push(`<text x="${x}" y="${startY + 28}" fill="${escapeXml(valueColor)}" font-size="22" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700">${escapeXml(stat.value)}</text>`);
     }
   }
   renderStatRow(statsRow1, y);
@@ -2408,38 +2621,152 @@ function renderTerminalCardSvg(output, options) {
   y += 8;
   sections.push(`<line x1="${pad}" y1="${y}" x2="${cardWidth - pad}" y2="${y}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`);
   y += 28;
-  sections.push(`<text x="${pad}" y="${y}" fill="${escapeXml(theme.muted)}" font-size="10" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="600" letter-spacing="2">${escapeXml("TOP MODELS")}</text>`);
+  sections.push(renderSectionHeader(pad, y, "TOP MODELS", theme, cardAccent));
   y += 24;
   const topModels2 = stats.topModels.slice(0, 3);
-  const modelNameWidth = 200;
-  const percentWidth = 60;
-  const barMaxWidth = contentWidth - modelNameWidth - percentWidth - 20;
-  for (const model of topModels2) {
+  const rankWidth = 28;
+  const modelNameWidth = MODEL_NAME_WIDTH;
+  const barGap = MODEL_BAR_GAP;
+  const percentX = cardWidth - pad;
+  const barX = pad + rankWidth + modelNameWidth;
+  const barMaxWidth = Math.max(48, percentX - barX - barGap);
+  for (const [index, model] of topModels2.entries()) {
     const barWidth = Math.max(4, model.percentage / 100 * barMaxWidth);
-    sections.push(`<text x="${pad}" y="${y + MODEL_BAR_HEIGHT + 4}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="400">${escapeXml(model.model)}</text>`);
-    const barX = pad + modelNameWidth;
-    sections.push(`<rect x="${barX}" y="${y}" width="${barMaxWidth}" height="${MODEL_BAR_HEIGHT}" rx="4" fill="${escapeXml(theme.barTrack)}"/>`);
-    const gradId = `grad-${model.model.replace(/[^a-zA-Z0-9]/g, "")}`;
-    sections.push(`<defs><linearGradient id="${escapeXml(gradId)}" x1="0%" y1="0%" x2="100%" y2="0%">` + `<stop offset="0%" stop-color="${escapeXml(theme.accent)}44"/>` + `<stop offset="100%" stop-color="${escapeXml(theme.accent)}"/>` + `</linearGradient></defs>`);
-    sections.push(`<rect x="${barX}" y="${y}" width="${barWidth}" height="${MODEL_BAR_HEIGHT}" rx="4" fill="url(#${escapeXml(gradId)})"/>`);
-    sections.push(`<text x="${barX + barMaxWidth + 12}" y="${y + MODEL_BAR_HEIGHT + 4}" fill="${escapeXml(theme.muted)}" font-size="12" font-family="${escapeXml(FONT_FAMILY2)}" font-weight="500" text-anchor="end">${escapeXml(`${model.percentage.toFixed(0)}%`)}</text>`);
+    sections.push(`<text x="${pad}" y="${y + MODEL_BAR_HEIGHT - 1}" fill="${escapeXml(cardAccent)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="700" opacity="0.7">${escapeXml(String(index + 1))}</text>`);
+    sections.push(`<text x="${pad + rankWidth}" y="${y + MODEL_BAR_HEIGHT - 1}" fill="${escapeXml(theme.fg)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="500">${escapeXml(model.model)}</text>`);
+    const trackColor = isDark ? "rgba(255,255,255,0.10)" : "rgba(0,0,0,0.06)";
+    sections.push(`<rect x="${barX}" y="${y}" width="${barMaxWidth}" height="${MODEL_BAR_HEIGHT}" rx="6" fill="${escapeXml(trackColor)}"/>`);
+    const gradId = `grad-${index}-${model.model.replace(/[^a-zA-Z0-9]/g, "")}`;
+    sections.push(`<defs><linearGradient id="${escapeXml(gradId)}" x1="0%" y1="0%" x2="100%" y2="0%">` + `<stop offset="0%" stop-color="${escapeXml(barAccent)}" stop-opacity="${isDark ? "0.45" : "0.27"}"/>` + `<stop offset="100%" stop-color="${escapeXml(barAccent)}" stop-opacity="1"/>` + `</linearGradient></defs>`);
+    sections.push(`<rect x="${barX}" y="${y}" width="${barWidth}" height="${MODEL_BAR_HEIGHT}" rx="6" fill="url(#${escapeXml(gradId)})"/>`);
+    sections.push(`<text x="${percentX}" y="${y + MODEL_BAR_HEIGHT - 1}" fill="${escapeXml(theme.fg)}" font-size="12" font-family="${escapeXml(FONT_FAMILY)}" font-weight="600" text-anchor="end">${escapeXml(`${model.percentage.toFixed(0)}%`)}</text>`);
     y += 32;
   }
-  y += pad * 0.5;
-  const cardHeight = y;
-  const svg = sections.join(`
+  if (options.more && output.more) {
+    const more = output.more;
+    const cardGap = 16;
+    const detailCardWidth = (contentWidth - cardGap) / 2;
+    y += 8;
+    sections.push(`<line x1="${pad}" y1="${y}" x2="${cardWidth - pad}" y2="${y}" stroke="${escapeXml(theme.border)}" stroke-width="1"/>`);
+    y += 28;
+    sections.push(renderSectionHeader(pad, y, "MORE", theme, cardAccent));
+    y += 24;
+    const efficiencyLines = [
+      {
+        label: "Input / Output",
+        value: more.inputOutput.inputPerOutput === null ? "n/a" : `${more.inputOutput.inputPerOutput.toFixed(2)} : 1`,
+        accent: true
+      },
+      {
+        label: "Output / Input",
+        value: formatRatio(more.inputOutput.outputPerInput)
+      },
+      {
+        label: "Output Share",
+        value: formatPercentage(more.inputOutput.outputShare)
+      }
+    ];
+    sections.push(renderMetricCard(pad, y, detailCardWidth, "INPUT / OUTPUT", efficiencyLines, theme, cardAccent));
+    const burnLines = [
+      {
+        label: "Projected Cost",
+        value: formatCost(more.monthlyBurn.projectedCost),
+        accent: true
+      },
+      {
+        label: "Projected Tokens",
+        value: formatNumber(more.monthlyBurn.projectedTokens)
+      },
+      {
+        label: "Based On",
+        value: `${more.monthlyBurn.observedDays} / ${more.monthlyBurn.calendarDays} days`
+      }
+    ];
+    sections.push(renderMetricCard(pad + detailCardWidth + cardGap, y, detailCardWidth, "PROJECTED MONTHLY BURN", burnLines, theme, cardAccent));
+    y += 38 + Math.max(efficiencyLines.length, burnLines.length) * 22 + 16;
+    const cacheLines = [
+      {
+        label: "Cache Reads",
+        value: formatNumber(more.cacheEconomics.readTokens),
+        accent: true
+      },
+      {
+        label: "Cache Writes",
+        value: formatNumber(more.cacheEconomics.writeTokens)
+      },
+      {
+        label: "Read Coverage",
+        value: formatPercentage(more.cacheEconomics.readCoverage)
+      },
+      {
+        label: "Reuse Ratio",
+        value: formatRatio(more.cacheEconomics.reuseRatio)
+      }
+    ];
+    sections.push(renderMetricCard(pad, y, detailCardWidth, "CACHE ECONOMICS", cacheLines, theme, cardAccent));
+    const sessionLines = [
+      {
+        label: "Sessions",
+        value: String(more.sessionMetrics.totalSessions),
+        accent: true
+      },
+      {
+        label: "Avg Tokens",
+        value: formatNumber(more.sessionMetrics.averageTokens)
+      },
+      {
+        label: "Avg Messages",
+        value: more.sessionMetrics.averageMessages.toFixed(1)
+      },
+      {
+        label: "Avg Duration",
+        value: formatDuration(more.sessionMetrics.averageDurationMs)
+      },
+      {
+        label: "Longest Session",
+        value: more.sessionMetrics.longestSession ? formatSessionSummary(more.sessionMetrics.longestSession) : "n/a"
+      },
+      {
+        label: "Top Project",
+        value: more.sessionMetrics.topProject ? truncateText(more.sessionMetrics.topProject.name, 20) : "n/a"
+      }
+    ];
+    sections.push(renderMetricCard(pad + detailCardWidth + cardGap, y, detailCardWidth, "SESSION STATS", sessionLines, theme, cardAccent));
+    y += 38 + Math.max(cacheLines.length, sessionLines.length) * 22 + 16;
+    const hourChart = renderHourOfDayChart(pad, y, contentWidth, more.hourOfDay, theme, cardAccent, providers, isDark);
+    sections.push(hourChart.svg);
+    y += hourChart.height + 16;
+    const mixShift = renderModelMixShift(pad, y, contentWidth, more, theme, cardAccent);
+    if (mixShift.height > 0) {
+      sections.push(mixShift.svg);
+      y += mixShift.height + 12;
+    }
+  }
+  y += pad * 0.5;
+  const cardHeight = y;
+  const svg = sections.join(`
 `).replace("__CARD_HEIGHT__", String(cardHeight));
   return [
-    `<svg xmlns="http://www.w3.org/2000/svg" width="${cardWidth}" height="${cardHeight}" viewBox="0 0 ${cardWidth} ${cardHeight}" shape-rendering="geometricPrecision" text-rendering="geometricPrecision">`,
+    `<svg xmlns="http://www.w3.org/2000/svg" width="${cardWidth}" height="${cardHeight}" viewBox="0 0 ${cardWidth} ${cardHeight}" shape-rendering="geometricPrecision" text-rendering="optimizeLegibility" color-rendering="optimizeQuality">`,
     svg,
     "</svg>"
   ].join(`
 `);
 }
 
+// packages/renderers/dist/svg/svg-renderer.js
+class SvgRenderer {
+  format = "svg";
+  async render(output, options) {
+    return renderTerminalCardSvg(output, {
+      ...options,
+      format: "svg"
+    });
+  }
+}
 // packages/renderers/dist/png/png-renderer.js
 import sharp from "sharp";
-var PNG_DENSITY = 288;
+var PNG_DENSITY = 432;
 
 class PngRenderer {
   format = "png";
@@ -2448,7 +2775,9 @@ class PngRenderer {
     const pngBuffer = await sharp(Buffer.from(svgString), {
       density: PNG_DENSITY
     }).png({
-      compressionLevel: 9
+      adaptiveFiltering: true,
+      compressionLevel: 9,
+      force: true
     }).toBuffer();
     return pngBuffer;
   }
@@ -2475,20 +2804,8 @@ var HEATMAP_BLOCKS = {
   DARK: "\u2593",
   MEDIUM: "\u2592",
   LIGHT: "\u2591",
-  EMPTY: " "
+  EMPTY: "\xB7"
 };
-function intensityBlock(value, max) {
-  if (max <= 0 || value <= 0)
-    return HEATMAP_BLOCKS.EMPTY;
-  const ratio = value / max;
-  if (ratio >= 0.75)
-    return HEATMAP_BLOCKS.FULL;
-  if (ratio >= 0.5)
-    return HEATMAP_BLOCKS.DARK;
-  if (ratio >= 0.25)
-    return HEATMAP_BLOCKS.MEDIUM;
-  return HEATMAP_BLOCKS.LIGHT;
-}
 function intensityColor(value, max) {
   if (max <= 0 || value <= 0)
     return "dim";
@@ -2503,9 +2820,10 @@ function intensityColor(value, max) {
 }
 
 // packages/renderers/dist/terminal/heatmap.js
-var DAY_LABELS3 = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+var DAY_LABELS2 = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 var MONTH_LABELS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-var DAY_LABEL_WIDTH3 = 4;
+var DAY_LABEL_WIDTH2 = 4;
+var WEEK_COLUMN_WIDTH = 2;
 var LEGEND_TEXT = "Less";
 var LEGEND_TEXT_MORE = "More";
 function buildUsageMap(daily) {
@@ -2515,83 +2833,117 @@ function buildUsageMap(daily) {
   }
   return map;
 }
-function renderTerminalHeatmap(daily, options) {
-  if (daily.length === 0) {
-    return "  No usage data available.";
+function computeQuantiles2(values) {
+  const nonZero = values.filter((value) => value > 0).sort((a, b) => a - b);
+  if (nonZero.length === 0)
+    return [0, 0, 0];
+  const quantile = (ratio) => {
+    const index = Math.floor(ratio * (nonZero.length - 1));
+    return nonZero[index] ?? 0;
+  };
+  return [quantile(0.25), quantile(0.5), quantile(0.75)];
+}
+function getHeatmapBlock(tokens, quantiles) {
+  if (tokens <= 0)
+    return HEATMAP_BLOCKS.EMPTY;
+  if (tokens <= quantiles[0])
+    return HEATMAP_BLOCKS.LIGHT;
+  if (tokens <= quantiles[1])
+    return HEATMAP_BLOCKS.MEDIUM;
+  if (tokens <= quantiles[2])
+    return HEATMAP_BLOCKS.DARK;
+  return HEATMAP_BLOCKS.FULL;
+}
+function formatDate(date) {
+  const year = date.getUTCFullYear();
+  const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const day = String(date.getUTCDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+function buildMonthHeader(weeks) {
+  const header = Array.from({ length: weeks.length * WEEK_COLUMN_WIDTH }, () => " ");
+  let lastMonth = -1;
+  let nextFreeIndex = 0;
+  for (let weekIndex = 0;weekIndex < weeks.length; weekIndex++) {
+    const firstDay = weeks[weekIndex]?.[0];
+    if (!firstDay)
+      continue;
+    const month = firstDay.getUTCMonth();
+    if (month === lastMonth)
+      continue;
+    lastMonth = month;
+    const desiredStart = weekIndex * WEEK_COLUMN_WIDTH;
+    const startIndex = Math.max(desiredStart, nextFreeIndex);
+    const remaining = header.length - startIndex;
+    if (remaining <= 0)
+      continue;
+    const fullLabel = MONTH_LABELS[month] ?? "";
+    const label = remaining >= fullLabel.length ? fullLabel : remaining >= 2 ? fullLabel.slice(0, 2) : fullLabel.slice(0, 1);
+    for (let offset = 0;offset < label.length; offset++) {
+      header[startIndex + offset] = label[offset] ?? " ";
+    }
+    nextFreeIndex = startIndex + label.length + 1;
   }
-  const usageMap = buildUsageMap(daily);
-  const maxTokens = Math.max(...usageMap.values(), 0);
-  const dates = daily.map((d) => d.date).sort();
-  const startDate = new Date(dates[0]);
-  const endDate = new Date(dates[dates.length - 1]);
+  return `${" ".repeat(DAY_LABEL_WIDTH2)}${header.join("")}`;
+}
+function buildWeeks(startDate, endDate) {
   const alignedStart = new Date(startDate);
-  alignedStart.setDate(alignedStart.getDate() - alignedStart.getDay());
+  alignedStart.setUTCDate(alignedStart.getUTCDate() - alignedStart.getUTCDay());
   const weeks = [];
-  const current = new Date(alignedStart);
-  while (current <= endDate) {
+  const cursor = new Date(alignedStart);
+  while (cursor <= endDate) {
     const week = [];
-    for (let d = 0;d < 7; d++) {
-      week.push(new Date(current));
-      current.setDate(current.getDate() + 1);
+    for (let day = 0;day < 7; day++) {
+      week.push(new Date(cursor));
+      cursor.setUTCDate(cursor.getUTCDate() + 1);
     }
     weeks.push(week);
   }
-  const availableWidth = options.width - DAY_LABEL_WIDTH3;
-  const maxWeeks = Math.min(weeks.length, availableWidth);
-  const displayWeeks = weeks.slice(Math.max(0, weeks.length - maxWeeks));
-  const lines = [];
-  let monthHeader = " ".repeat(DAY_LABEL_WIDTH3);
-  let lastMonth = -1;
-  for (const week of displayWeeks) {
-    const month = week[0].getMonth();
-    if (month !== lastMonth) {
-      monthHeader += MONTH_LABELS[month];
-      lastMonth = month;
-      const labelLen = MONTH_LABELS[month].length;
-    } else {
-      monthHeader += " ";
-    }
-  }
-  if (monthHeader.length > options.width) {
-    monthHeader = monthHeader.slice(0, options.width);
+  return weeks;
+}
+function renderTerminalHeatmap(daily, options) {
+  if (daily.length === 0) {
+    return "  No usage data available.";
   }
-  lines.push(monthHeader);
-  for (let dayIdx = 0;dayIdx < 7; dayIdx++) {
-    const label = dayIdx % 2 === 1 ? DAY_LABELS3[dayIdx] : "   ";
-    let line = label + " ";
-    line = line.slice(0, DAY_LABEL_WIDTH3);
+  const usageMap = buildUsageMap(daily);
+  const quantiles = computeQuantiles2(Array.from(usageMap.values()));
+  const maxTokens = Math.max(...usageMap.values(), 0);
+  const dates = daily.map((entry) => entry.date).sort();
+  const startDate = new Date(`${dates[0]}T00:00:00Z`);
+  const endDate = new Date(`${dates[dates.length - 1]}T00:00:00Z`);
+  const weeks = buildWeeks(startDate, endDate);
+  const availableColumns = Math.max(WEEK_COLUMN_WIDTH, options.width - DAY_LABEL_WIDTH2);
+  const maxWeeks = Math.max(1, Math.floor(availableColumns / WEEK_COLUMN_WIDTH));
+  const displayWeeks = weeks.slice(Math.max(0, weeks.length - maxWeeks));
+  const lines = [buildMonthHeader(displayWeeks)];
+  for (let dayIndex = 0;dayIndex < 7; dayIndex++) {
+    const label = DAY_LABELS2[dayIndex] ?? "   ";
+    let line = `${label} `.slice(0, DAY_LABEL_WIDTH2);
     for (const week of displayWeeks) {
-      const date = week[dayIdx];
-      if (!date || date > endDate || date < startDate) {
-        line += " ";
+      const date = week[dayIndex];
+      if (!date || date < startDate || date > endDate) {
+        line += `${HEATMAP_BLOCKS.EMPTY} `;
         continue;
       }
-      const dateStr = formatDate(date);
-      const tokens = usageMap.get(dateStr) ?? 0;
-      const block = intensityBlock(tokens, maxTokens);
+      const dateString = formatDate(date);
+      const tokens = usageMap.get(dateString) ?? 0;
+      const block = getHeatmapBlock(tokens, quantiles);
       const color = intensityColor(tokens, maxTokens);
-      line += colorize(block, color, options.noColor);
+      line += `${colorize(block, color, options.noColor)} `;
     }
-    lines.push(line);
+    lines.push(line.trimEnd());
   }
-  const legendBlocks = [
+  const legend = `${" ".repeat(DAY_LABEL_WIDTH2)}${LEGEND_TEXT} ${[
     HEATMAP_BLOCKS.EMPTY,
     HEATMAP_BLOCKS.LIGHT,
     HEATMAP_BLOCKS.MEDIUM,
     HEATMAP_BLOCKS.DARK,
     HEATMAP_BLOCKS.FULL
-  ];
-  const legend = `${" ".repeat(DAY_LABEL_WIDTH3)}${LEGEND_TEXT} ${legendBlocks.join("")} ${LEGEND_TEXT_MORE}`;
+  ].join("")} ${LEGEND_TEXT_MORE}`;
   lines.push(legend);
   return lines.join(`
 `);
 }
-function formatDate(date) {
-  const y = date.getFullYear();
-  const m = String(date.getMonth() + 1).padStart(2, "0");
-  const d = String(date.getDate()).padStart(2, "0");
-  return `${y}-${m}-${d}`;
-}
 
 // packages/renderers/dist/terminal/dashboard.js
 var BOX_H = "\u2500";
@@ -2686,11 +3038,18 @@ function renderDayOfWeek(stats, width, noColor2) {
 }
 function renderTopModels(stats, width, noColor2) {
   const lines = [];
+  const nameWidth = Math.min(28, Math.max(16, Math.floor(width * 0.35)));
+  const pctWidth = 4;
+  const barGap = 2;
+  const barWidth = Math.max(8, width - nameWidth - pctWidth - 6);
   for (const model of stats.topModels.slice(0, 5)) {
     const pct = formatSharePercent(model.percentage);
-    const tokens = formatTokens(model.tokens);
-    const line = `  ${colorize(model.model, "yellow", noColor2)}  ${tokens}  ${pct}`;
-    lines.push(line.length > width ? line.slice(0, width) : line);
+    const normalizedName = model.model.length > nameWidth ? `${model.model.slice(0, nameWidth - 1)}\u2026` : model.model;
+    const fillLength = Math.max(1, Math.round(model.percentage / 100 * barWidth));
+    const fill = colorize(BAR_CHAR.repeat(fillLength), "green", noColor2);
+    const track = "\u2591".repeat(Math.max(0, barWidth - fillLength));
+    const line = `  ${colorize(normalizedName.padEnd(nameWidth), "yellow", noColor2)}${" ".repeat(barGap)}${fill}${track}${" ".repeat(barGap)}${pct.padStart(pctWidth)}`;
+    lines.push(line);
   }
   return lines.join(`
 `);
@@ -2757,7 +3116,8 @@ function renderDashboard(output, options) {
   }
   for (let i = 0;i < output.providers.length; i++) {
     const provider = output.providers[i];
-    sections.push(renderProviderSection(provider, output.aggregated, width, noColor2, options.showInsights));
+    const providerStats = aggregate(provider.daily, output.dateRange.until);
+    sections.push(renderProviderSection(provider, providerStats, width, noColor2, options.showInsights));
     if (i < output.providers.length - 1) {
       sections.push("");
       sections.push(divider(width));
@@ -2802,7 +3162,7 @@ class TerminalRenderer {
   }
 }
 // packages/renderers/dist/live/template.js
-var MONTH_NAMES3 = [
+var MONTH_NAMES2 = [
   "Jan",
   "Feb",
   "Mar",
@@ -2858,7 +3218,7 @@ function computeQuantiles3(values) {
   };
   return [q(0.25), q(0.5), q(0.75)];
 }
-function getLevel3(tokens, quantiles) {
+function getLevel2(tokens, quantiles) {
   if (tokens <= 0)
     return 0;
   if (tokens <= quantiles[0])
@@ -2918,12 +3278,12 @@ function buildHeatmapCells(daily, since, until) {
     const row = current.getUTCDay();
     const dateStr = current.toISOString().slice(0, 10);
     const tokens = tokenMap.get(dateStr) ?? 0;
-    const level = getLevel3(tokens, quantiles);
+    const level = getLevel2(tokens, quantiles);
     cells.push({ date: dateStr, tokens, level, row, col });
     const month = current.getUTCMonth();
     if (month !== lastMonth && row === 0) {
       lastMonth = month;
-      months.push({ label: MONTH_NAMES3[month] ?? "", col });
+      months.push({ label: MONTH_NAMES2[month] ?? "", col });
     }
     if (row === 6)
       col++;
@@ -2934,21 +3294,17 @@ function buildHeatmapCells(daily, since, until) {
 function renderProviderHeatmapHtml(provider, since, until, isDark, emptyCell) {
   const heatmapColors = buildHeatmapScale2(provider.colors, isDark);
   const { cells, months, totalCols } = buildHeatmapCells(provider.daily, since, until);
-  const cellSize = 16;
-  const cellGap = 4;
-  const dayLabelWidth = 44;
-  const monthLabelHeight = 24;
-  const heatmapWidth = dayLabelWidth + totalCols * (cellSize + cellGap);
-  const heatmapHeight = monthLabelHeight + 7 * (cellSize + cellGap);
+  const heatmapWidth = DAY_LABEL_WIDTH + totalCols * (CELL_SIZE + CELL_GAP);
+  const heatmapHeight = MONTH_LABEL_HEIGHT + 7 * (CELL_SIZE + CELL_GAP);
   const cellsHtml = cells.map((c) => {
-    const x = dayLabelWidth + c.col * (cellSize + cellGap);
-    const y = monthLabelHeight + c.row * (cellSize + cellGap);
+    const x = DAY_LABEL_WIDTH + c.col * (CELL_SIZE + CELL_GAP);
+    const y = MONTH_LABEL_HEIGHT + c.row * (CELL_SIZE + CELL_GAP);
     const fill = c.level === 0 ? emptyCell : heatmapColors[c.level];
     return `<div class="heatmap-cell" style="left:${x}px;top:${y}px;background:${fill}" data-date="${esc(c.date)}" data-tokens="${c.tokens}"></div>`;
   }).join(`
 `);
   const monthLabelsHtml = months.map((m) => {
-    const x = dayLabelWidth + m.col * (cellSize + cellGap);
+    const x = DAY_LABEL_WIDTH + m.col * (CELL_SIZE + CELL_GAP);
     return `<span class="month-label" style="left:${x}px">${esc(m.label)}</span>`;
   }).join(`
 `);
@@ -2958,7 +3314,7 @@ function renderProviderHeatmapHtml(provider, since, until, isDark, emptyCell) {
     { label: "Fri", row: 5 },
     { label: "Sun", row: 0 }
   ].map((d) => {
-    const y = monthLabelHeight + d.row * (cellSize + cellGap) + cellSize - 2;
+    const y = MONTH_LABEL_HEIGHT + d.row * (CELL_SIZE + CELL_GAP) + CELL_SIZE - 2;
     return `<span class="day-label" style="top:${y - 10}px">${d.label}</span>`;
   }).join(`
 `);
@@ -3080,8 +3436,8 @@ function generateHtml(output, options) {
   .heatmap-container { position: relative; margin-bottom: 8px; }
   .heatmap-cell {
     position: absolute;
-    width: 16px;
-    height: 16px;
+    width: ${CELL_SIZE}px;
+    height: ${CELL_SIZE}px;
     border-radius: 3px;
     cursor: pointer;
   }
@@ -3111,11 +3467,17 @@ function generateHtml(output, options) {
   .stat-value.accent { color: ${accent}; }
   .models-section { margin-top: 8px; }
   .models-label { color: ${muted}; font-size: 10px; font-weight: 600; letter-spacing: 2px; margin-bottom: 16px; }
-  .model-row { display: flex; align-items: center; gap: 12px; margin-bottom: 16px; }
-  .model-name { color: ${muted}; font-size: 12px; width: 200px; flex-shrink: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-  .model-bar-track { flex: 1; height: 8px; background: ${barTrack}; border-radius: 4px; overflow: hidden; }
+  .model-row {
+    display: grid;
+    grid-template-columns: ${MODEL_NAME_WIDTH}px minmax(0, 1fr) ${MODEL_PERCENT_WIDTH}px;
+    align-items: center;
+    column-gap: ${MODEL_BAR_GAP}px;
+    margin-bottom: 16px;
+  }
+  .model-name { color: ${muted}; font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+  .model-bar-track { width: 100%; height: 8px; background: ${barTrack}; border-radius: 4px; overflow: hidden; }
   .model-bar-fill { height: 100%; border-radius: 4px; background: linear-gradient(90deg, ${accent}44, ${accent}); }
-  .model-pct { color: ${muted}; font-size: 12px; width: 40px; text-align: right; flex-shrink: 0; }
+  .model-pct { color: ${muted}; font-size: 12px; text-align: right; }
   .refresh-btn {
     display: inline-flex;
     align-items: center;
@@ -3299,6 +3661,1097 @@ function handleError(error) {
   process.exit(1);
 }
 
+// packages/cli/src/flags.ts
+var CLI_FLAG_ORDER = [
+  "format",
+  "theme",
+  "since",
+  "until",
+  "days",
+  "output",
+  "width",
+  "provider",
+  "compare",
+  "upload",
+  "claude",
+  "codex",
+  "openCode",
+  "allProviders",
+  "listProviders",
+  "more",
+  "clipboard",
+  "open",
+  "liveServer",
+  "noColor",
+  "noInsights"
+];
+var CLI_FLAG_NAMES = {
+  format: "--format",
+  theme: "--theme",
+  since: "--since",
+  until: "--until",
+  days: "--days",
+  output: "--output",
+  width: "--width",
+  provider: "--provider",
+  compare: "--compare",
+  upload: "--upload",
+  claude: "--claude",
+  codex: "--codex",
+  openCode: "--open-code",
+  allProviders: "--all-providers",
+  listProviders: "--list-providers",
+  more: "--more",
+  clipboard: "--clipboard",
+  open: "--open",
+  liveServer: "--live-server",
+  noColor: "--no-color",
+  noInsights: "--no-insights"
+};
+function buildCliArgTokens(cliArgs) {
+  const tokens = [];
+  for (const key of CLI_FLAG_ORDER) {
+    const value = cliArgs[key];
+    if (value === undefined || value === false || value === null) {
+      continue;
+    }
+    const flag = CLI_FLAG_NAMES[key];
+    if (!flag)
+      continue;
+    tokens.push(flag);
+    if (value !== true) {
+      tokens.push(String(value));
+    }
+  }
+  return tokens;
+}
+function buildCliPreview(cliArgs) {
+  const tokens = buildCliArgTokens(cliArgs);
+  return tokens.length === 0 ? "tokenleak" : `tokenleak ${tokens.join(" ")}`;
+}
+
+// packages/cli/src/interactive.ts
+import { emitKeypressEvents } from "readline";
+import { createInterface } from "readline/promises";
+var INTERACTIVE_FLAG_LINES = [
+  "-f, --format <format>   terminal | png | svg | json",
+  "-t, --theme <theme>     dark | light",
+  "-s, --since <date>      YYYY-MM-DD start date",
+  "-u, --until <date>      YYYY-MM-DD end date",
+  "-d, --days <number>     trailing days window",
+  "-o, --output <path>     write output to a file",
+  "-w, --width <number>    terminal render width",
+  "-p, --provider <list>   comma-separated providers",
+  "    --claude            shortcut for Claude Code",
+  "    --codex             shortcut for Codex",
+  "    --open-code         shortcut for Open Code",
+  "    --all-providers     ignore provider filters",
+  "    --list-providers    show provider registry",
+  "    --compare <range>   auto or YYYY-MM-DD..YYYY-MM-DD",
+  "    --more              richer PNG/SVG stats",
+  "    --clipboard         copy rendered output",
+  "    --open              open generated file",
+  "    --upload <target>   gist",
+  "-L, --live-server       local interactive dashboard",
+  "    --no-color          disable ANSI colors",
+  "    --no-insights       hide terminal insights",
+  "    --help              print help",
+  "    --version           print version"
+];
+var ESC2 = "\x1B[";
+var RESET = `${ESC2}0m`;
+var BOLD = `${ESC2}1m`;
+var DIM = `${ESC2}2m`;
+var CYAN = `${ESC2}36m`;
+var GREEN = `${ESC2}32m`;
+var YELLOW = `${ESC2}33m`;
+var RED = `${ESC2}31m`;
+var WHITE = `${ESC2}97m`;
+var HOME_CLEAR = "\x1B[H\x1B[J";
+var HIDE_CURSOR = "\x1B[?25l";
+var SHOW_CURSOR = "\x1B[?25h";
+var ALT_SCREEN_ON = "\x1B[?1049h";
+var ALT_SCREEN_OFF = "\x1B[?1049l";
+var LOADING_TICK_MS = 120;
+function color(text2, code) {
+  return `${code}${text2}${RESET}`;
+}
+function stripAnsi(text2) {
+  return text2.replace(/\x1b\[[0-9;?]*[A-Za-z]/g, "");
+}
+function visibleLength(text2) {
+  return stripAnsi(text2).length;
+}
+function padVisible(text2, width) {
+  const padding = Math.max(0, width - visibleLength(text2));
+  return text2 + " ".repeat(padding);
+}
+function truncateVisible(text2, width) {
+  if (width <= 0)
+    return "";
+  const plain = stripAnsi(text2);
+  if (plain.length <= width)
+    return text2;
+  const limit = width <= 3 ? width : width - 3;
+  let visibleCount = 0;
+  let index = 0;
+  let result = "";
+  let sawAnsi = false;
+  while (index < text2.length && visibleCount < limit) {
+    if (text2[index] === "\x1B") {
+      const match = text2.slice(index).match(/^\x1b\[[0-9;?]*[A-Za-z]/);
+      if (match) {
+        result += match[0];
+        index += match[0].length;
+        sawAnsi = true;
+        continue;
+      }
+    }
+    result += text2[index];
+    index += 1;
+    visibleCount += 1;
+  }
+  if (width <= 3) {
+    return sawAnsi ? `${result}${RESET}` : result;
+  }
+  return sawAnsi ? `${result}...${RESET}` : `${result}...`;
+}
+function joinColumns(left, right, totalWidth) {
+  const gutter = 3;
+  const leftWidth = Math.max(42, Math.min(58, Math.floor(totalWidth * 0.44)));
+  const rightWidth = Math.max(36, totalWidth - leftWidth - gutter);
+  const rows = Math.max(left.length, right.length);
+  const lines = [];
+  for (let index = 0;index < rows; index++) {
+    const leftLine = truncateVisible(left[index] ?? "", leftWidth);
+    const rightLine = truncateVisible(right[index] ?? "", rightWidth);
+    lines.push(`${padVisible(leftLine, leftWidth)}${" ".repeat(gutter)}${rightLine}`);
+  }
+  return lines;
+}
+function renderRule(width) {
+  return color("-".repeat(width), DIM);
+}
+function describeRequest(args) {
+  const output = typeof args["output"] === "string" ? args["output"] : null;
+  if (args["liveServer"]) {
+    return {
+      title: "Live Dashboard",
+      loadingTitle: "Starting live dashboard",
+      loadingDetail: "Launching the local server. Press Ctrl-C in the live view to stop it, then you will return here.",
+      executionMode: "inherit"
+    };
+  }
+  if (args["listProviders"]) {
+    return {
+      title: "Provider Registry",
+      loadingTitle: "Loading provider registry",
+      loadingDetail: "Checking registered providers and current availability.",
+      executionMode: "capture"
+    };
+  }
+  if (args["compare"]) {
+    return {
+      title: "Compare Report",
+      loadingTitle: "Building compare report",
+      loadingDetail: output ? `Computing period deltas and writing the report to ${output}.` : "Computing period deltas for the current and previous windows.",
+      executionMode: "capture"
+    };
+  }
+  switch (args["format"]) {
+    case "json":
+      return {
+        title: "JSON Export",
+        loadingTitle: "Generating JSON report",
+        loadingDetail: output ? `Collecting token usage and writing JSON to ${output}.` : "Collecting token usage and building structured JSON output.",
+        executionMode: "capture"
+      };
+    case "svg":
+      return {
+        title: "SVG Export",
+        loadingTitle: "Rendering SVG",
+        loadingDetail: output ? `Rendering a vector card and writing it to ${output}.` : "Rendering a vector card from your usage data.",
+        executionMode: "capture"
+      };
+    case "png":
+      return {
+        title: "PNG Export",
+        loadingTitle: "Rendering PNG",
+        loadingDetail: output ? `Rendering the PNG card and writing it to ${output}. This can take a few seconds.` : "Rendering the PNG card. This can take a few seconds.",
+        executionMode: "capture"
+      };
+    default:
+      return {
+        title: "Terminal Dashboard",
+        loadingTitle: "Generating terminal dashboard",
+        loadingDetail: "Reading provider logs and aggregating token usage.",
+        executionMode: "capture"
+      };
+  }
+}
+function finalizeCliArgs(args) {
+  const finalized = { ...args };
+  const format = finalized["format"];
+  if (finalized["compare"] && (format === "png" || format === "svg")) {
+    finalized["more"] = true;
+  }
+  if (finalized["open"] && finalized["output"] === undefined && typeof format === "string") {
+    if (format === "png" || format === "svg" || format === "json") {
+      finalized["output"] = `tokenleak.${format}`;
+    } else {
+      delete finalized["open"];
+    }
+  }
+  if (format === "png") {
+    delete finalized["clipboard"];
+    delete finalized["upload"];
+  }
+  return finalized;
+}
+function createRunCommand(args) {
+  const finalizedArgs = finalizeCliArgs(args);
+  return {
+    type: "run",
+    request: {
+      args: finalizedArgs,
+      preview: buildCliPreview(finalizedArgs),
+      ...describeRequest(finalizedArgs)
+    }
+  };
+}
+function renderMenu(options, selectedIndex) {
+  return options.map((option, index) => {
+    const isSelected = index === selectedIndex;
+    const prefix = isSelected ? color(">", GREEN) : " ";
+    const number = isSelected ? color(option.digit, WHITE + BOLD) : color(option.digit, YELLOW);
+    const title = isSelected ? color(option.title, WHITE + BOLD) : color(option.title, WHITE);
+    const description = isSelected ? color(option.description, CYAN) : color(option.description, DIM);
+    return `${prefix} [${number}] ${title} ${description}`;
+  });
+}
+function renderFlagPanel() {
+  return [
+    color("All Flags", WHITE + BOLD),
+    color("Every flag remains available while using the launcher.", DIM),
+    "",
+    ...INTERACTIVE_FLAG_LINES.map((line) => color(line, CYAN))
+  ];
+}
+function renderMenuPanel(context, options, selectedIndex) {
+  const selected = options[selectedIndex];
+  return [
+    color("Tokenleak Interactive Launcher", WHITE + BOLD),
+    `${color(`v${context.version}`, YELLOW)} ${color("interactive command center", CYAN)}`,
+    "",
+    color("Arrow keys move. Number keys jump directly. Enter runs the selected action.", DIM),
+    color("Commands run inside this session, so you can keep selecting without leaving tokenleak.", DIM),
+    "",
+    ...renderMenu(options, selectedIndex),
+    "",
+    color("Preview", WHITE + BOLD),
+    color(selected.preview, GREEN),
+    "",
+    color("Keys", WHITE + BOLD),
+    `${color("Up/Down", YELLOW)} move  ${color("Enter", YELLOW)} run  ${color("H", YELLOW)} help  ${color("Q", YELLOW)} quit`,
+    "",
+    renderRule(44)
+  ];
+}
+function renderHelpOverlay(helpText, width) {
+  const lines = helpText.trimEnd().split(`
+`);
+  const header = [
+    color("Tokenleak Help", WHITE + BOLD),
+    color("Press Enter, Escape, H, or Q to return to the launcher.", DIM),
+    ""
+  ];
+  return `${HOME_CLEAR}${HIDE_CURSOR}${[...header, ...lines.map((line) => truncateVisible(line, width))].join(`
+`)}`;
+}
+function renderLauncher(context, options, selectedIndex) {
+  const width = process.stdout.columns ?? 120;
+  const menuPanel = renderMenuPanel(context, options, selectedIndex);
+  const flagPanel = renderFlagPanel();
+  const body = width >= 118 ? joinColumns(menuPanel, flagPanel, width) : [...menuPanel, "", ...flagPanel];
+  return `${HOME_CLEAR}${HIDE_CURSOR}${body.join(`
+`)}`;
+}
+function renderProgressBar(frame, width) {
+  const innerWidth = Math.max(12, width - 2);
+  const headSize = Math.max(4, Math.floor(innerWidth / 5));
+  const travel = Math.max(1, innerWidth - headSize);
+  const cycle = travel * 2;
+  const offset = frame % cycle;
+  const start = offset <= travel ? offset : cycle - offset;
+  const cells = Array.from({ length: innerWidth }, (_, index) => {
+    if (index >= start && index < start + headSize) {
+      return "=";
+    }
+    return "-";
+  }).join("");
+  return color(`[${cells}]`, CYAN);
+}
+function renderLoading(request, frame = 0, startedAt = Date.now()) {
+  const elapsedSeconds = Math.max(0, Math.floor((Date.now() - startedAt) / 1000));
+  const progressBar = renderProgressBar(frame, 34);
+  const lines = [
+    color(request.loadingTitle, WHITE + BOLD),
+    color(request.preview, CYAN),
+    "",
+    color(request.loadingDetail, DIM),
+    "",
+    color("Status", WHITE + BOLD),
+    color("Working... stay in tokenleak while this finishes.", YELLOW),
+    "",
+    color("Progress", WHITE + BOLD),
+    progressBar,
+    color(`Elapsed ${elapsedSeconds}s`, DIM),
+    "",
+    renderRule(44)
+  ];
+  return `${HOME_CLEAR}${HIDE_CURSOR}${lines.join(`
+`)}`;
+}
+function clipOutputLines(lines, limit) {
+  if (limit <= 0)
+    return [];
+  if (lines.length <= limit)
+    return lines;
+  const visible = lines.slice(0, Math.max(0, limit - 1));
+  visible.push(color(`... ${lines.length - visible.length} more lines hidden`, DIM));
+  return visible;
+}
+function renderOutputSection(title, content, width, maxLines) {
+  const normalized = content.trimEnd();
+  if (!normalized)
+    return [];
+  const lines = normalized.split(`
+`).map((line) => truncateVisible(line, width));
+  return [
+    color(title, WHITE + BOLD),
+    ...clipOutputLines(lines, maxLines),
+    ""
+  ];
+}
+function renderResult(request, result) {
+  const width = Math.max(60, (process.stdout.columns ?? 120) - 1);
+  const rows = process.stdout.rows ?? 40;
+  const statusColor = result.ok ? GREEN : RED;
+  const statusLabel = result.ok ? "Completed" : "Failed";
+  const fixedLines = 10;
+  const outputBudget = Math.max(8, rows - fixedLines);
+  const firstSectionLines = result.stdout.trim() && result.stderr.trim() ? Math.max(4, Math.floor(outputBudget * 0.6)) : outputBudget;
+  const secondSectionLines = Math.max(4, outputBudget - firstSectionLines);
+  const body = [
+    color(request.title, WHITE + BOLD),
+    color(request.preview, CYAN),
+    "",
+    `${color("Status", WHITE + BOLD)} ${color(statusLabel, statusColor)}`,
+    color(result.summary, DIM),
+    "",
+    ...renderOutputSection("Output", result.stdout, width, firstSectionLines),
+    ...renderOutputSection("Messages", result.stderr, width, secondSectionLines),
+    renderRule(44),
+    `${color("Enter", YELLOW)} launcher  ${color("Q", YELLOW)} quit`
+  ];
+  return `${HOME_CLEAR}${HIDE_CURSOR}${body.join(`
+`)}`;
+}
+function enterAltScreen() {
+  process.stdout.write(`${ALT_SCREEN_ON}${HOME_CLEAR}${HIDE_CURSOR}`);
+}
+function leaveAltScreen() {
+  process.stdout.write(`${SHOW_CURSOR}${ALT_SCREEN_OFF}`);
+}
+function paint(content) {
+  process.stdout.write(content);
+}
+function suspendRawMode() {
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(false);
+  }
+  process.stdin.pause();
+  process.stdout.write(SHOW_CURSOR);
+}
+function resumeRawMode() {
+  if (process.stdin.isTTY) {
+    process.stdin.setRawMode(true);
+  }
+  process.stdin.resume();
+  process.stdout.write(HIDE_CURSOR);
+}
+
+class InteractiveExitError extends Error {
+  constructor() {
+    super("Interactive session cancelled");
+    this.name = "InteractiveExitError";
+  }
+}
+var PROVIDER_CHOICES = [
+  { value: "claude-code", label: "Claude Code", description: "Anthropic project logs" },
+  { value: "codex", label: "Codex", description: "OpenAI session logs" },
+  { value: "open-code", label: "Open Code", description: "Open Code storage and database" }
+];
+function isInteractiveExitError(error) {
+  return error instanceof InteractiveExitError;
+}
+function parsePositiveInteger(value) {
+  const trimmed = value.trim();
+  if (trimmed === "")
+    return null;
+  const parsed = Number(trimmed);
+  if (!Number.isInteger(parsed) || parsed <= 0) {
+    throw new Error(`Expected a positive whole number, received "${value}".`);
+  }
+  return parsed;
+}
+function renderChoiceScreen(title, description, options, selectedIndex, selectedValues, footer = `${color("Up/Down", YELLOW)} move  ${color("Space", YELLOW)} toggle  ${color("Enter", YELLOW)} confirm  ${color("Ctrl-C", YELLOW)} exit`) {
+  const optionLines = options.map((option, index) => {
+    const isSelected = index === selectedIndex;
+    const isChecked = selectedValues ? selectedValues.has(option.value) : isSelected;
+    const pointer = isSelected ? color(">", GREEN) : " ";
+    const checkbox = selectedValues ? isChecked ? color("[x]", GREEN) : color("[ ]", DIM) : isSelected ? color("[\u2022]", GREEN) : color("[ ]", DIM);
+    const titleColor = isSelected ? WHITE + BOLD : WHITE;
+    const descriptionColor = isSelected ? CYAN : DIM;
+    return `${pointer} ${checkbox} ${color(option.label, titleColor)} ${color(option.description, descriptionColor)}`;
+  });
+  const lines = [
+    color(title, WHITE + BOLD),
+    color(description, DIM),
+    "",
+    ...optionLines,
+    "",
+    renderRule(44),
+    footer
+  ];
+  return `${HOME_CLEAR}${HIDE_CURSOR}${lines.join(`
+`)}`;
+}
+async function ask(prompt, initialValue = "") {
+  const readline = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  let settled = false;
+  return new Promise((resolve, reject) => {
+    const finish = (fn) => {
+      if (settled)
+        return;
+      settled = true;
+      readline.off("SIGINT", onSigint);
+      readline.close();
+      fn();
+    };
+    const onSigint = () => {
+      finish(() => reject(new InteractiveExitError));
+    };
+    readline.on("SIGINT", onSigint);
+    const suffix = initialValue ? ` (${initialValue})` : "";
+    readline.question(`${prompt}${suffix}: `).then((value) => {
+      finish(() => resolve(value.trim() || initialValue));
+    }).catch((error) => {
+      finish(() => reject(error));
+    });
+  });
+}
+async function askYesNo(prompt, defaultValue = false) {
+  const hint = defaultValue ? "Y/n" : "y/N";
+  const value = (await ask(`${prompt} [${hint}]`)).toLowerCase();
+  if (value === "")
+    return defaultValue;
+  return value === "y" || value === "yes";
+}
+async function promptSingleChoice(title, description, options, initialIndex = 0) {
+  return new Promise((resolve, reject) => {
+    let selectedIndex = Math.max(0, Math.min(initialIndex, options.length - 1));
+    const onKeypress = (_input, key) => {
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        reject(new InteractiveExitError);
+        return;
+      }
+      if (key.name === "up") {
+        selectedIndex = (selectedIndex - 1 + options.length) % options.length;
+        render();
+        return;
+      }
+      if (key.name === "down") {
+        selectedIndex = (selectedIndex + 1) % options.length;
+        render();
+        return;
+      }
+      const digit = key.sequence?.match(/^[1-9]$/)?.[0];
+      if (digit) {
+        const index = Number(digit) - 1;
+        if (index < options.length) {
+          selectedIndex = index;
+          cleanup();
+          resolve(options[selectedIndex].value);
+        }
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        cleanup();
+        resolve(options[selectedIndex].value);
+      }
+    };
+    function render() {
+      paint(renderChoiceScreen(title, description, options, selectedIndex, undefined, `${color("Up/Down", YELLOW)} move  ${color("1-9", YELLOW)} pick  ${color("Enter", YELLOW)} confirm  ${color("Ctrl-C", YELLOW)} exit`));
+    }
+    function cleanup() {
+      process.stdin.off("keypress", onKeypress);
+      suspendRawMode();
+    }
+    render();
+    resumeRawMode();
+    process.stdin.on("keypress", onKeypress);
+  });
+}
+async function promptMultiChoice(title, description, options, initialValues = []) {
+  return new Promise((resolve, reject) => {
+    let selectedIndex = 0;
+    const selectedValues = new Set(initialValues);
+    const onKeypress = (_input, key) => {
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        reject(new InteractiveExitError);
+        return;
+      }
+      if (key.name === "up") {
+        selectedIndex = (selectedIndex - 1 + options.length) % options.length;
+        render();
+        return;
+      }
+      if (key.name === "down") {
+        selectedIndex = (selectedIndex + 1) % options.length;
+        render();
+        return;
+      }
+      if (key.name === "space") {
+        toggleSelected(selectedIndex);
+        render();
+        return;
+      }
+      const digit = key.sequence?.match(/^[1-9]$/)?.[0];
+      if (digit) {
+        const index = Number(digit) - 1;
+        if (index < options.length) {
+          selectedIndex = index;
+          toggleSelected(selectedIndex);
+          render();
+        }
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        cleanup();
+        resolve(Array.from(selectedValues));
+      }
+    };
+    function toggleSelected(index) {
+      const value = options[index].value;
+      if (selectedValues.has(value)) {
+        selectedValues.delete(value);
+      } else {
+        selectedValues.add(value);
+      }
+    }
+    function render() {
+      paint(renderChoiceScreen(title, description, options, selectedIndex, selectedValues));
+    }
+    function cleanup() {
+      process.stdin.off("keypress", onKeypress);
+      suspendRawMode();
+    }
+    render();
+    resumeRawMode();
+    process.stdin.on("keypress", onKeypress);
+  });
+}
+function applySelectedProviders(args, providers) {
+  if (providers.length === 0)
+    return;
+  args["provider"] = providers.join(",");
+}
+async function promptTheme(defaultTheme = "dark") {
+  const theme = await promptSingleChoice("Theme", "Pick the rendering theme.", [
+    { value: "dark", label: "Dark", description: "High-contrast dark canvas" },
+    { value: "light", label: "Light", description: "Bright export with light background" }
+  ], defaultTheme === "light" ? 1 : 0);
+  return theme;
+}
+async function promptDateWindow() {
+  const choice = await promptSingleChoice("Date Window", "Choose how much history to include.", [
+    { value: "7", label: "Last 7 days", description: "Quick recent snapshot" },
+    { value: "30", label: "Last 30 days", description: "Short-term trend window" },
+    { value: "90", label: "Last 90 days", description: "Default overview" },
+    { value: "365", label: "Last 365 days", description: "Long-range usage pattern" },
+    { value: "custom", label: "Custom range", description: "Enter exact dates manually" }
+  ], 2);
+  if (choice !== "custom") {
+    return { days: Number(choice) };
+  }
+  const since = await ask("Since date YYYY-MM-DD");
+  const until = await ask("Until date YYYY-MM-DD (blank for today)");
+  const args = { since };
+  if (until)
+    args["until"] = until;
+  return args;
+}
+async function promptProviderSelection(title = "Provider Filter") {
+  return promptMultiChoice(title, "Toggle one or more providers. Leave everything unchecked to use auto-detection.", PROVIDER_CHOICES);
+}
+async function promptOutputPath(defaultPath) {
+  return ask("Output file", defaultPath);
+}
+async function promptWidth() {
+  const choice = await promptSingleChoice("Terminal Width", "Choose the dashboard width.", [
+    { value: "80", label: "80 columns", description: "Standard terminal width" },
+    { value: "100", label: "100 columns", description: "Balanced dashboard layout" },
+    { value: "120", label: "120 columns", description: "Wide dashboard layout" },
+    { value: "custom", label: "Custom width", description: "Enter an exact width" }
+  ], 1);
+  if (choice !== "custom") {
+    return Number(choice);
+  }
+  while (true) {
+    try {
+      const parsed = parsePositiveInteger(await ask("Custom width"));
+      if (parsed !== null) {
+        return parsed;
+      }
+      paint(`${HOME_CLEAR}${SHOW_CURSOR}${color("Width required", RED)}
+${color("Enter a positive whole number to continue.", DIM)}
+
+Press Enter to try again.`);
+      await ask("");
+    } catch (error) {
+      paint(`${HOME_CLEAR}${SHOW_CURSOR}${color("Invalid width", RED)}
+${color(error instanceof Error ? error.message : String(error), DIM)}
+
+Press Enter to try again.`);
+      await ask("");
+    }
+  }
+}
+async function promptCompareSetting() {
+  const choice = await promptSingleChoice("Compare Mode", "Optionally compare the current range against an earlier period.", [
+    { value: "off", label: "No compare", description: "Render a standard single-period report" },
+    { value: "auto", label: "Auto compare", description: "Split the selected window automatically" },
+    { value: "custom", label: "Custom compare range", description: "Provide an explicit YYYY-MM-DD..YYYY-MM-DD range" }
+  ]);
+  if (choice === "off")
+    return null;
+  if (choice === "auto")
+    return "auto";
+  return ask("Previous range YYYY-MM-DD..YYYY-MM-DD");
+}
+async function buildDashboardPreset() {
+  const rangeArgs = await promptDateWindow();
+  const providers = await promptProviderSelection();
+  const width = await promptWidth();
+  const noInsights = await askYesNo("Hide insights panel", false);
+  const noColor2 = await askYesNo("Disable ANSI colors", false);
+  const args = { ...rangeArgs };
+  applySelectedProviders(args, providers);
+  if (width)
+    args["width"] = width;
+  if (noInsights)
+    args["noInsights"] = true;
+  if (noColor2)
+    args["noColor"] = true;
+  return createRunCommand(args);
+}
+async function buildJsonPreset() {
+  const rangeArgs = await promptDateWindow();
+  const providers = await promptProviderSelection();
+  const compare = await promptCompareSetting();
+  const saveToFile = await askYesNo("Write JSON to a file", false);
+  const clipboard = !saveToFile && await askYesNo("Copy JSON to clipboard after render", false);
+  const args = {
+    format: "json",
+    ...rangeArgs
+  };
+  applySelectedProviders(args, providers);
+  if (compare)
+    args["compare"] = compare;
+  if (saveToFile) {
+    args["output"] = await promptOutputPath(compare ? "tokenleak-compare.json" : "tokenleak.json");
+  }
+  if (clipboard)
+    args["clipboard"] = true;
+  return createRunCommand(args);
+}
+async function buildImagePreset(format) {
+  const theme = await promptTheme();
+  const rangeArgs = await promptDateWindow();
+  const providers = await promptProviderSelection("Provider Filter");
+  const compare = await promptCompareSetting();
+  const output = await promptOutputPath(`tokenleak.${format}`);
+  const shouldOpen = await askYesNo("Open the file when done", true);
+  const more = compare ? true : await askYesNo("Enable --more stats", format === "png");
+  const args = {
+    format,
+    theme,
+    output,
+    open: shouldOpen,
+    more,
+    ...rangeArgs
+  };
+  applySelectedProviders(args, providers);
+  if (compare)
+    args["compare"] = compare;
+  return createRunCommand(args);
+}
+async function buildComparePreset() {
+  const rangeArgs = await promptDateWindow();
+  const providers = await promptProviderSelection();
+  const compareMode = await promptSingleChoice("Reference Period", "Choose how the earlier comparison period should be defined.", [
+    { value: "auto", label: "Auto compare", description: "Split the chosen window automatically" },
+    { value: "custom", label: "Custom compare range", description: "Enter an explicit prior range manually" }
+  ]);
+  const compare = compareMode === "custom" ? await ask("Previous range YYYY-MM-DD..YYYY-MM-DD") : "auto";
+  const saveToFile = await askYesNo("Write compare output to a file", false);
+  const args = {
+    format: "json",
+    compare,
+    ...rangeArgs
+  };
+  applySelectedProviders(args, providers);
+  if (saveToFile) {
+    args["output"] = await promptOutputPath("tokenleak-compare.json");
+  }
+  return createRunCommand(args);
+}
+async function buildLivePreset() {
+  const theme = await promptTheme();
+  const rangeArgs = await promptDateWindow();
+  const providers = await promptProviderSelection();
+  const more = await askYesNo("Enable --more stats", true);
+  const args = {
+    liveServer: true,
+    theme,
+    more,
+    ...rangeArgs
+  };
+  applySelectedProviders(args, providers);
+  return createRunCommand(args);
+}
+async function askFormatChoice() {
+  return promptSingleChoice("Output Format", "Choose the primary renderer for this command.", [
+    { value: "terminal", label: "Terminal", description: "Dashboard in the current terminal" },
+    { value: "json", label: "JSON", description: "Structured machine-readable output" },
+    { value: "svg", label: "SVG", description: "Shareable vector export" },
+    { value: "png", label: "PNG", description: "Raster export for social and docs" }
+  ]);
+}
+async function buildCustomCommand() {
+  const mode = await promptSingleChoice("Command Type", "Choose the command family you want to configure.", [
+    { value: "run", label: "Standard command", description: "Render terminal, JSON, SVG, or PNG output" },
+    { value: "live-server", label: "Live server", description: "Launch the browser dashboard locally" },
+    { value: "list-providers", label: "List providers", description: "Inspect registered provider backends" }
+  ]);
+  if (mode === "live-server") {
+    return buildLivePreset();
+  }
+  if (mode === "list-providers") {
+    return createRunCommand({ listProviders: true });
+  }
+  const format = await askFormatChoice();
+  const theme = format === "terminal" ? null : await promptTheme();
+  const rangeArgs = await promptDateWindow();
+  const providers = await promptProviderSelection();
+  const compare = await promptCompareSetting();
+  const width = format === "terminal" ? await promptWidth() : null;
+  const output = format === "terminal" ? await ask("Output file (blank keeps stdout)") : format === "json" ? await ask("Output file (blank keeps stdout)") : await ask("Output file", `tokenleak.${format}`);
+  const noColor2 = await askYesNo("Disable ANSI colors", false);
+  const noInsights = format === "terminal" ? await askYesNo("Hide insights", false) : false;
+  const more = await askYesNo("Enable --more stats", format === "png" || format === "svg");
+  const clipboard = format !== "png" ? await askYesNo("Copy output to clipboard", false) : false;
+  const open = format !== "terminal" ? await askYesNo("Open generated file", false) : false;
+  const upload = format !== "png" ? await ask("Upload target [blank/gist]") : "";
+  const args = {
+    format,
+    ...rangeArgs
+  };
+  if (theme)
+    args["theme"] = theme;
+  if (compare)
+    args["compare"] = compare;
+  if (width)
+    args["width"] = width;
+  if (output)
+    args["output"] = output;
+  if (noColor2)
+    args["noColor"] = true;
+  if (noInsights)
+    args["noInsights"] = true;
+  if (more)
+    args["more"] = true;
+  if (clipboard)
+    args["clipboard"] = true;
+  if (open)
+    args["open"] = true;
+  if (upload)
+    args["upload"] = upload;
+  applySelectedProviders(args, providers);
+  return createRunCommand(args);
+}
+function createMenuOptions() {
+  return [
+    {
+      digit: "1",
+      title: "Launch Dashboard",
+      description: "guided terminal view",
+      preview: "tokenleak --days 90",
+      select: buildDashboardPreset
+    },
+    {
+      digit: "2",
+      title: "Export JSON",
+      description: "structured output for scripts",
+      preview: "tokenleak --format json",
+      select: buildJsonPreset
+    },
+    {
+      digit: "3",
+      title: "Export SVG",
+      description: "shareable vector card",
+      preview: "tokenleak --format svg --output tokenleak.svg",
+      select: async () => buildImagePreset("svg")
+    },
+    {
+      digit: "4",
+      title: "Export PNG",
+      description: "social-ready raster image",
+      preview: "tokenleak --format png --output tokenleak.png --more",
+      select: async () => buildImagePreset("png")
+    },
+    {
+      digit: "5",
+      title: "Compare Periods",
+      description: "diff current vs previous usage",
+      preview: "tokenleak --compare auto --format json",
+      select: buildComparePreset
+    },
+    {
+      digit: "6",
+      title: "Start Live Server",
+      description: "browser dashboard on localhost",
+      preview: "tokenleak --live-server --theme dark",
+      select: buildLivePreset
+    },
+    {
+      digit: "7",
+      title: "Build Custom Command",
+      description: "configure flags interactively",
+      preview: "tokenleak --format terminal --days 90",
+      select: buildCustomCommand
+    },
+    {
+      digit: "8",
+      title: "Full Help",
+      description: "examples and complete usage",
+      preview: "tokenleak --help",
+      select: async () => ({ type: "show-help" })
+    },
+    {
+      digit: "9",
+      title: "List Providers",
+      description: "detect available registries",
+      preview: "tokenleak --list-providers",
+      select: async () => createRunCommand({ listProviders: true })
+    },
+    {
+      digit: "0",
+      title: "Exit",
+      description: "close the launcher",
+      preview: "exit",
+      select: async () => ({ type: "exit" })
+    }
+  ];
+}
+async function waitForSingleKey() {
+  return new Promise((resolve) => {
+    const onKeypress = (_input, key) => {
+      process.stdin.off("keypress", onKeypress);
+      suspendRawMode();
+      resolve(key);
+    };
+    resumeRawMode();
+    process.stdin.on("keypress", onKeypress);
+  });
+}
+async function promptForMenuCommand(context, options, state) {
+  let showHelp = false;
+  let resolving = false;
+  return new Promise((resolve, reject) => {
+    const onKeypress = async (_input, key) => {
+      if (resolving) {
+        return;
+      }
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        resolve({ type: "exit" });
+        return;
+      }
+      if (showHelp) {
+        if (key.name === "escape" || key.name === "return" || key.name === "enter" || key.name === "q" || key.name === "h") {
+          showHelp = false;
+          paint(renderLauncher(context, options, state.selectedIndex));
+        }
+        return;
+      }
+      if (key.name === "up") {
+        state.selectedIndex = (state.selectedIndex - 1 + options.length) % options.length;
+        paint(renderLauncher(context, options, state.selectedIndex));
+        return;
+      }
+      if (key.name === "down") {
+        state.selectedIndex = (state.selectedIndex + 1) % options.length;
+        paint(renderLauncher(context, options, state.selectedIndex));
+        return;
+      }
+      if (key.name === "h") {
+        showHelp = true;
+        paint(renderHelpOverlay(context.helpText, Math.max(60, (process.stdout.columns ?? 120) - 1)));
+        return;
+      }
+      if (key.name === "q" || key.name === "escape") {
+        cleanup();
+        resolve({ type: "exit" });
+        return;
+      }
+      const digit = key.sequence?.match(/^[0-9]$/)?.[0];
+      if (digit) {
+        const nextIndex = options.findIndex((option) => option.digit === digit);
+        if (nextIndex >= 0) {
+          state.selectedIndex = nextIndex;
+          if (digit === "8") {
+            showHelp = true;
+            paint(renderHelpOverlay(context.helpText, Math.max(60, (process.stdout.columns ?? 120) - 1)));
+            return;
+          }
+          resolving = true;
+          cleanup();
+          try {
+            const command = await options[nextIndex].select();
+            resolve(command);
+          } catch (error) {
+            if (isInteractiveExitError(error)) {
+              resolve({ type: "exit" });
+              return;
+            }
+            reject(error);
+          }
+        }
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        if (options[state.selectedIndex].digit === "8") {
+          showHelp = true;
+          paint(renderHelpOverlay(context.helpText, Math.max(60, (process.stdout.columns ?? 120) - 1)));
+          return;
+        }
+        resolving = true;
+        cleanup();
+        try {
+          const command = await options[state.selectedIndex].select();
+          resolve(command);
+        } catch (error) {
+          if (isInteractiveExitError(error)) {
+            resolve({ type: "exit" });
+            return;
+          }
+          reject(error);
+        }
+      }
+    };
+    function cleanup() {
+      process.stdin.off("keypress", onKeypress);
+      suspendRawMode();
+    }
+    paint(renderLauncher(context, options, state.selectedIndex));
+    resumeRawMode();
+    process.stdin.on("keypress", onKeypress);
+  });
+}
+async function showExecutionResult(request, result) {
+  paint(renderResult(request, result));
+  const key = await waitForSingleKey();
+  if (key.ctrl && key.name === "c")
+    return "exit";
+  if (key.name === "q" || key.name === "escape")
+    return "exit";
+  return "menu";
+}
+function shouldStartInteractiveCli(argv, stdinIsTTY, stdoutIsTTY) {
+  return argv.length === 0 && stdinIsTTY && stdoutIsTTY;
+}
+async function startInteractiveCli(context, execute) {
+  const options = createMenuOptions();
+  const state = { selectedIndex: 0 };
+  let interrupted = false;
+  let ignoreSigint = false;
+  const onSigint = () => {
+    if (!ignoreSigint) {
+      interrupted = true;
+    }
+  };
+  emitKeypressEvents(process.stdin);
+  enterAltScreen();
+  process.on("SIGINT", onSigint);
+  try {
+    while (true) {
+      if (interrupted) {
+        return;
+      }
+      const command = await promptForMenuCommand(context, options, state);
+      if (command.type === "exit") {
+        return;
+      }
+      if (command.type === "show-help") {
+        continue;
+      }
+      const startedAt = Date.now();
+      let loadingFrame = 0;
+      paint(renderLoading(command.request, loadingFrame, startedAt));
+      const loadingTicker = setInterval(() => {
+        loadingFrame += 1;
+        paint(renderLoading(command.request, loadingFrame, startedAt));
+      }, LOADING_TICK_MS);
+      let result;
+      try {
+        if (command.request.executionMode === "inherit") {
+          clearInterval(loadingTicker);
+          leaveAltScreen();
+          try {
+            ignoreSigint = true;
+            result = await execute(command.request);
+          } finally {
+            ignoreSigint = false;
+            enterAltScreen();
+          }
+        } else {
+          result = await execute(command.request);
+        }
+      } finally {
+        clearInterval(loadingTicker);
+      }
+      if (interrupted) {
+        return;
+      }
+      const next = await showExecutionResult(command.request, result);
+      if (next === "exit") {
+        return;
+      }
+    }
+  } finally {
+    process.off("SIGINT", onSigint);
+    suspendRawMode();
+    leaveAltScreen();
+  }
+}
+
 // packages/cli/src/sharing/clipboard.ts
 var PLATFORM_COMMANDS = {
   darwin: ["pbcopy"],
@@ -3400,6 +4853,248 @@ async function uploadToGist(content, filename, description) {
 // packages/cli/src/cli.ts
 var FORMAT_VALUES = ["json", "svg", "png", "terminal"];
 var THEME_VALUES = ["dark", "light"];
+var PROVIDER_SHORTCUTS = {
+  claude: "claude-code",
+  codex: "codex",
+  openCode: "open-code"
+};
+var PROVIDER_ALIASES = {
+  anthropic: "claude-code",
+  claude: "claude-code",
+  "claude-code": "claude-code",
+  claudecode: "claude-code",
+  codex: "codex",
+  openai: "codex",
+  "open-code": "open-code",
+  open_code: "open-code",
+  opencode: "open-code"
+};
+var PROVIDER_ALIAS_GROUPS = {
+  "claude-code": ["anthropic", "claude", "claudecode"],
+  codex: ["openai"],
+  "open-code": ["opencode", "open_code"]
+};
+function normalizeProviderToken(token) {
+  const normalized = token.trim().toLowerCase().replace(/\s+/g, "-");
+  return PROVIDER_ALIASES[normalized] ?? normalized;
+}
+function getRequestedProviders(config) {
+  const requested = new Set;
+  if (config.provider) {
+    for (const token of config.provider.split(",")) {
+      const normalized = normalizeProviderToken(token);
+      if (normalized) {
+        requested.add(normalized);
+      }
+    }
+  }
+  if (config.claude)
+    requested.add(PROVIDER_SHORTCUTS.claude);
+  if (config.codex)
+    requested.add(PROVIDER_SHORTCUTS.codex);
+  if (config.openCode)
+    requested.add(PROVIDER_SHORTCUTS.openCode);
+  return requested;
+}
+function providerMatchesFilter(provider, requested) {
+  if (requested.size === 0)
+    return true;
+  const candidates = [
+    normalizeProviderToken(provider.name),
+    normalizeProviderToken(provider.displayName)
+  ];
+  return candidates.some((candidate) => requested.has(candidate));
+}
+function buildHelpText() {
+  return [
+    `tokenleak ${VERSION}`,
+    "Visualize AI coding assistant token usage across providers.",
+    "Running `tokenleak` with no flags opens an interactive launcher in a TTY.",
+    "",
+    "Usage:",
+    "  tokenleak [flags]",
+    "",
+    "Provider Shortcuts:",
+    "  --claude                Only include Claude Code",
+    "  --codex                 Only include Codex",
+    "  --open-code             Only include OpenCode",
+    "  --all-providers         Ignore provider filters and use every available provider",
+    "  --list-providers        Show registered providers and aliases",
+    "",
+    "Flags:",
+    "  -f, --format <format>   Output format: terminal, png, svg, json",
+    "  -t, --theme <theme>     Theme for png/svg/live output: dark, light",
+    "  -s, --since <date>      Start date in YYYY-MM-DD format",
+    "  -u, --until <date>      End date in YYYY-MM-DD format",
+    `  -d, --days <number>     Number of trailing days to include (default: ${DEFAULT_DAYS})`,
+    "  -o, --output <path>     Write output to a file and infer format from extension",
+    "  -w, --width <number>    Terminal render width",
+    "  -p, --provider <list>   Provider filter list, comma-separated",
+    "      --compare <range>   Compare against YYYY-MM-DD..YYYY-MM-DD or auto",
+    "      --more             Add expanded PNG/SVG stats and unlock compare cards",
+    "      --clipboard         Copy rendered output to the clipboard",
+    "      --open              Open the generated output file",
+    "      --upload <target>   Upload rendered output, currently: gist",
+    "  -L, --live-server       Start the interactive local dashboard",
+    "      --no-color          Disable ANSI colors",
+    "      --no-insights       Hide insights in terminal mode",
+    "      --help              Show this help",
+    "      --version           Show version information",
+    "",
+    "Examples:",
+    "  tokenleak",
+    "  tokenleak --claude --days 30",
+    "  tokenleak --codex --format png --output codex.png",
+    "  tokenleak --open-code --since 2026-01-01 --until 2026-03-01",
+    "  tokenleak --provider claude,codex --format svg --output usage.svg",
+    "  tokenleak --provider anthropic,openai",
+    "  tokenleak --list-providers",
+    "  tokenleak --compare auto --format terminal",
+    "  tokenleak --live-server --theme light",
+    "",
+    "Version:",
+    `  CLI ${VERSION}`,
+    `  Schema ${SCHEMA_VERSION}`,
+    ""
+  ].join(`
+`);
+}
+function buildVersionText() {
+  return `tokenleak ${VERSION}
+schema ${SCHEMA_VERSION}
+`;
+}
+function normalizeCliArg(arg) {
+  const flagMap = {
+    "--all-providers": "--allProviders",
+    "--list-providers": "--listProviders",
+    "--open-code": "--openCode",
+    "--live-server": "--liveServer",
+    "--no-color": "--noColor",
+    "--no-insights": "--noInsights"
+  };
+  return flagMap[arg] ?? arg;
+}
+function buildInteractiveSummary(cliArgs, ok, exitCode) {
+  if (!ok) {
+    return `Command exited with code ${exitCode}.`;
+  }
+  if (typeof cliArgs["output"] === "string") {
+    const outputPath = cliArgs["output"];
+    const format2 = String(cliArgs["format"] ?? inferFormatFromPath(outputPath) ?? "output").toUpperCase();
+    return `${format2} written to ${outputPath}.`;
+  }
+  if (cliArgs["listProviders"]) {
+    return "Provider registry loaded.";
+  }
+  if (cliArgs["liveServer"]) {
+    return "Live dashboard stopped.";
+  }
+  if (cliArgs["compare"]) {
+    return "Compare report generated.";
+  }
+  const format = String(cliArgs["format"] ?? "terminal");
+  if (format === "terminal") {
+    return "Terminal dashboard generated.";
+  }
+  return `${format.toUpperCase()} command finished successfully.`;
+}
+async function executeInteractiveCommand(request) {
+  try {
+    const cliPath = process.argv[1];
+    if (!cliPath) {
+      return {
+        ok: false,
+        summary: "Could not resolve the current tokenleak entrypoint.",
+        stdout: "",
+        stderr: "Error: process.argv[1] is missing."
+      };
+    }
+    const command = [process.execPath, cliPath, ...buildCliArgTokens(request.args)];
+    if (request.executionMode === "inherit") {
+      const proc2 = Bun.spawn(command, {
+        stdin: "inherit",
+        stdout: "inherit",
+        stderr: "inherit"
+      });
+      const exitCode2 = await proc2.exited;
+      return {
+        ok: exitCode2 === 0,
+        summary: buildInteractiveSummary(request.args, exitCode2 === 0, exitCode2),
+        stdout: "",
+        stderr: ""
+      };
+    }
+    const proc = Bun.spawn(command, {
+      stdin: "ignore",
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const [exitCode, stdout, stderr] = await Promise.all([
+      proc.exited,
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text()
+    ]);
+    return {
+      ok: exitCode === 0,
+      summary: buildInteractiveSummary(request.args, exitCode === 0, exitCode),
+      stdout,
+      stderr
+    };
+  } catch (error) {
+    return {
+      ok: false,
+      summary: "Interactive command failed before it could finish.",
+      stdout: "",
+      stderr: error instanceof Error ? `Error: ${error.message}` : `Error: ${String(error)}`
+    };
+  }
+}
+function normalizeCliArgv(argv) {
+  const normalized = argv.map(normalizeCliArg);
+  const result = [];
+  for (let i = 0;i < normalized.length; i++) {
+    const arg = normalized[i];
+    if (arg === "--provider" || arg === "-p") {
+      result.push(arg);
+      const providerParts = [];
+      let j = i + 1;
+      while (j < normalized.length) {
+        const next = normalized[j];
+        if (next.startsWith("-"))
+          break;
+        providerParts.push(next);
+        j++;
+      }
+      if (providerParts.length > 0) {
+        result.push(providerParts.join(" "));
+        i = j - 1;
+      }
+      continue;
+    }
+    result.push(arg);
+  }
+  return result;
+}
+function registerBuiltInProviders(registry) {
+  registry.register(new ClaudeCodeProvider);
+  registry.register(new CodexProvider);
+  registry.register(new OpenCodeProvider);
+}
+function buildProviderList(providers, availability) {
+  const lines = ["Registered providers:", ""];
+  for (const provider of providers) {
+    const aliases = PROVIDER_ALIAS_GROUPS[provider.name] ?? [];
+    const status = availability.get(provider.name) ? "available" : "unavailable";
+    lines.push(`- ${provider.name} (${provider.displayName}) [${status}]`);
+    if (aliases.length > 0) {
+      lines.push(`  aliases: ${aliases.join(", ")}`);
+    }
+  }
+  lines.push("");
+  return lines.join(`
+`);
+}
 function inferFormatFromPath(filePath) {
   const ext = filePath.split(".").pop()?.toLowerCase();
   switch (ext) {
@@ -3453,6 +5148,12 @@ function resolveConfig(cliArgs) {
     width: 80,
     noColor: false,
     noInsights: false,
+    more: false,
+    claude: false,
+    codex: false,
+    openCode: false,
+    allProviders: false,
+    listProviders: false,
     clipboard: false,
     open: false,
     liveServer: false
@@ -3471,6 +5172,8 @@ function resolveConfig(cliArgs) {
     merged.noColor = fileConfig.noColor;
   if (fileConfig.noInsights !== undefined)
     merged.noInsights = fileConfig.noInsights;
+  if (fileConfig.more !== undefined)
+    merged.more = fileConfig.more;
   if (envConfig.format)
     merged.format = envConfig.format;
   if (envConfig.theme)
@@ -3512,12 +5215,30 @@ function resolveConfig(cliArgs) {
   if (cliArgs["noInsights"] !== undefined) {
     result.noInsights = cliArgs["noInsights"];
   }
+  if (cliArgs["more"] !== undefined) {
+    result.more = cliArgs["more"];
+  }
   if (cliArgs["compare"] !== undefined) {
     result.compare = cliArgs["compare"];
   }
   if (cliArgs["provider"] !== undefined) {
     result.provider = cliArgs["provider"];
   }
+  if (cliArgs["claude"] !== undefined) {
+    result.claude = cliArgs["claude"];
+  }
+  if (cliArgs["codex"] !== undefined) {
+    result.codex = cliArgs["codex"];
+  }
+  if (cliArgs["openCode"] !== undefined) {
+    result.openCode = cliArgs["openCode"];
+  }
+  if (cliArgs["allProviders"] !== undefined) {
+    result.allProviders = cliArgs["allProviders"];
+  }
+  if (cliArgs["listProviders"] !== undefined) {
+    result.listProviders = cliArgs["listProviders"];
+  }
   if (cliArgs["clipboard"] !== undefined) {
     result.clipboard = cliArgs["clipboard"];
   }
@@ -3574,34 +5295,82 @@ async function runCompare(compareStr, currentRange, _registry, available) {
     loadAndAggregate(currentRange, available),
     loadAndAggregate(previousRange, available)
   ]);
-  return buildCompareOutput({ range: currentRange, stats: currentResult.stats }, { range: previousRange, stats: previousResult.stats });
+  return {
+    compareOutput: buildCompareOutput({ range: currentRange, stats: currentResult.stats }, { range: previousRange, stats: previousResult.stats }),
+    currentData: currentResult.data,
+    previousData: previousResult.data
+  };
 }
 async function run(cliArgs) {
   const config = resolveConfig(cliArgs);
+  if (config.allProviders && (config.provider || config.claude || config.codex || config.openCode)) {
+    throw new TokenleakError("--all-providers cannot be combined with provider filters");
+  }
+  const registry = new ProviderRegistry;
+  registerBuiltInProviders(registry);
+  if (config.listProviders) {
+    const providers = registry.getAll();
+    const availabilityResults = await Promise.all(providers.map(async (provider) => [provider.name, await provider.isAvailable()]));
+    process.stdout.write(buildProviderList(providers, new Map(availabilityResults)));
+    return;
+  }
   const dateRange = computeDateRange({
     since: config.since,
     until: config.until,
     days: config.days
   });
-  const registry = new ProviderRegistry;
-  registry.register(new ClaudeCodeProvider);
-  registry.register(new CodexProvider);
-  registry.register(new OpenCodeProvider);
   let available = await registry.getAvailable();
-  if (config.provider) {
-    const requested = new Set(config.provider.split(",").map((s) => s.trim().toLowerCase()));
-    available = available.filter((p) => requested.has(p.name.toLowerCase()) || requested.has(p.displayName.toLowerCase()));
+  const requestedProviders = getRequestedProviders(config);
+  if (!config.allProviders && requestedProviders.size > 0) {
+    if (config.provider && (config.claude || config.codex || config.openCode)) {
+      process.stderr.write(`Combining provider filters: ${Array.from(requestedProviders).join(", ")}
+`);
+    }
+    available = available.filter((provider) => providerMatchesFilter(provider, requestedProviders));
   }
   if (available.length === 0) {
     throw new TokenleakError("No provider data found");
   }
   if (config.compare) {
+    const compareResult = await runCompare(config.compare, dateRange, registry, available);
+    if (config.more && (config.format === "png" || config.format === "svg")) {
+      const compareOutput = {
+        schemaVersion: SCHEMA_VERSION,
+        generated: new Date().toISOString(),
+        dateRange,
+        providers: compareResult.currentData,
+        aggregated: compareResult.compareOutput.periodA.stats,
+        more: buildMoreStats(compareResult.currentData, dateRange, {
+          previousRange: compareResult.compareOutput.periodB.range,
+          previousProviders: compareResult.previousData
+        })
+      };
+      const renderer2 = getRenderer(config.format);
+      const renderOptions2 = {
+        format: config.format,
+        theme: config.theme,
+        width: config.width,
+        showInsights: !config.noInsights,
+        noColor: config.noColor,
+        output: config.output,
+        more: true
+      };
+      const rendered3 = await renderer2.render(compareOutput, renderOptions2);
+      if (config.output) {
+        const data = typeof rendered3 === "string" ? rendered3 : Buffer.from(rendered3);
+        writeFileSync(config.output, data);
+      } else {
+        const text2 = typeof rendered3 === "string" ? rendered3 : rendered3.toString("utf-8");
+        process.stdout.write(text2 + `
+`);
+      }
+      return;
+    }
     if (config.format !== "json" && config.format !== "terminal") {
       process.stderr.write(`Warning: --compare only supports JSON output. Ignoring --format ${config.format}.
 `);
     }
-    const compareOutput = await runCompare(config.compare, dateRange, registry, available);
-    const rendered2 = JSON.stringify(compareOutput, null, 2);
+    const rendered2 = JSON.stringify(compareResult.compareOutput, null, 2);
     if (config.output) {
       writeFileSync(config.output, rendered2);
     } else {
@@ -3628,7 +5397,8 @@ async function run(cliArgs) {
     generated: new Date().toISOString(),
     dateRange,
     providers: providerDataList,
-    aggregated: stats
+    aggregated: stats,
+    more: config.more ? buildMoreStats(providerDataList, dateRange) : null
   };
   if (config.liveServer) {
     const ignoredFlags = [];
@@ -3650,7 +5420,8 @@ async function run(cliArgs) {
       width: config.width,
       showInsights: !config.noInsights,
       noColor: config.noColor,
-      output: config.output
+      output: config.output,
+      more: config.more
     };
     const { port } = await startLiveServer(output, renderOptions2);
     await new Promise((resolve) => {
@@ -3673,7 +5444,8 @@ Shutting down server...
     width: config.width,
     showInsights: !config.noInsights,
     noColor: config.noColor,
-    output: config.output
+    output: config.output,
+    more: config.more
   };
   const rendered = await renderer.render(output, renderOptions);
   if (config.output) {
@@ -3762,6 +5534,11 @@ var main = defineCommand({
       description: "Hide insights panel",
       default: false
     },
+    more: {
+      type: "boolean",
+      description: "Add expanded PNG/SVG stats and compare cards",
+      default: false
+    },
     compare: {
       type: "string",
       description: "Compare two date ranges (YYYY-MM-DD..YYYY-MM-DD)"
@@ -3771,6 +5548,31 @@ var main = defineCommand({
       alias: "p",
       description: "Filter to specific provider(s), comma-separated"
     },
+    claude: {
+      type: "boolean",
+      description: "Shortcut for --provider claude-code",
+      default: false
+    },
+    codex: {
+      type: "boolean",
+      description: "Shortcut for --provider codex",
+      default: false
+    },
+    openCode: {
+      type: "boolean",
+      description: "Shortcut for --provider open-code",
+      default: false
+    },
+    allProviders: {
+      type: "boolean",
+      description: "Ignore provider filters and use every available provider",
+      default: false
+    },
+    listProviders: {
+      type: "boolean",
+      description: "List registered providers and aliases",
+      default: false
+    },
     clipboard: {
       type: "boolean",
       description: "Copy output to clipboard after rendering",
@@ -3813,10 +5615,22 @@ var main = defineCommand({
         cliArgs["noColor"] = true;
       if (args.noInsights)
         cliArgs["noInsights"] = true;
+      if (args.more)
+        cliArgs["more"] = true;
       if (args.compare !== undefined)
         cliArgs["compare"] = args.compare;
       if (args.provider !== undefined)
         cliArgs["provider"] = args.provider;
+      if (args.claude)
+        cliArgs["claude"] = true;
+      if (args.codex)
+        cliArgs["codex"] = true;
+      if (args.openCode)
+        cliArgs["openCode"] = true;
+      if (args.allProviders)
+        cliArgs["allProviders"] = true;
+      if (args.listProviders)
+        cliArgs["listProviders"] = true;
       if (args.clipboard)
         cliArgs["clipboard"] = true;
       if (args.open)
@@ -3833,11 +5647,31 @@ var main = defineCommand({
 });
 var isDirectExecution = typeof Bun !== "undefined" ? Bun.main === import.meta.path : process.argv[1] !== undefined && import.meta.url.endsWith(process.argv[1].replace(/\\/g, "/"));
 if (isDirectExecution) {
-  runMain(main);
+  const normalizedArgv = normalizeCliArgv(process.argv.slice(2));
+  process.argv = [...process.argv.slice(0, 2), ...normalizedArgv];
+  const argv = normalizedArgv;
+  if (argv.includes("--help") || argv.includes("-h")) {
+    process.stdout.write(buildHelpText());
+    process.exit(0);
+  }
+  if (argv.includes("--version") || argv.includes("-v")) {
+    process.stdout.write(buildVersionText());
+    process.exit(0);
+  }
+  if (shouldStartInteractiveCli(argv, Boolean(process.stdin.isTTY), Boolean(process.stdout.isTTY))) {
+    await startInteractiveCli({
+      version: VERSION,
+      helpText: buildHelpText()
+    }, executeInteractiveCommand);
+  } else {
+    await runMain(main);
+  }
 }
 export {
   run,
   resolveConfig,
+  normalizeCliArgv,
   inferFormatFromPath,
-  computeDateRange
+  computeDateRange,
+  buildInteractiveSummary
 };