ai-usage-analyzer 0.2.0 → 0.3.0

package/src/loaders.js

@@ -207,6 +207,113 @@ function walkJsonl(root, prefix) {
   return out;
 }
 
+// Walks Claude's projects/ tree. Top-level .jsonl files are sessions; files
+// under any `subagents/` subdir are deliberately skipped (their usage is
+// already represented in the parent session's assistant messages).
+function walkClaudeSessions(root) {
+  const out = [];
+  function walk(dir) {
+    let entries;
+    try { entries = readdirSync(dir, { withFileTypes: true }); } catch { return; }
+    for (const e of entries) {
+      const full = join(dir, e.name);
+      if (e.isDirectory()) {
+        if (e.name === 'subagents') continue;
+        walk(full);
+      } else if (e.isFile() && e.name.endsWith('.jsonl')) {
+        out.push(full);
+      }
+    }
+  }
+  walk(root);
+  return out;
+}
+
+// ---------------------------------------------------------------------------
+// Claude Code JSONL loader
+// ---------------------------------------------------------------------------
+//
+// Each top-level file under projects/<encoded-cwd>/<UUID>.jsonl is one session.
+// Per assistant line, `message.usage` carries the per-turn token counts; we
+// dedupe by `message.id` (Claude Code emits streaming duplicates) and sum
+// across unique messages. cwd / model / timestamp come from the line itself.
+
+async function loadClaudeJsonl(rootDir) {
+  const records = [];
+  const errors = [];
+  const files = walkClaudeSessions(rootDir);
+
+  for (const f of files) {
+    try {
+      const rec = await parseClaudeSession(f);
+      if (rec) records.push(rec);
+    } catch (e) {
+      errors.push(`${f}: ${e.message}`);
+    }
+  }
+  return { records, errors };
+}
+
+async function parseClaudeSession(path) {
+  const sessionId = path.split('/').pop().replace('.jsonl', '');
+  const seenIds = new Set();
+  let cwd = '';
+  let model = '';
+  let firstTs = null;
+
+  let tokensInput = 0;
+  let tokensOutput = 0;
+  let tokensCacheRead = 0;
+  let tokensCacheWrite = 0;
+
+  const stream = createReadStream(path, { encoding: 'utf8' });
+  const rl = createInterface({ input: stream, crlfDelay: Infinity });
+  for await (const line of rl) {
+    if (!line) continue;
+    let ev;
+    try { ev = JSON.parse(line); } catch { continue; }
+    if (ev.type !== 'assistant') continue;
+    const msg = ev.message || {};
+    const usage = msg.usage;
+    if (!usage) continue;
+    const id = msg.id;
+    if (id) {
+      if (seenIds.has(id)) continue;
+      seenIds.add(id);
+    }
+    if (!cwd && typeof ev.cwd === 'string') cwd = ev.cwd;
+    if (!model && typeof msg.model === 'string') model = msg.model;
+    const ts = parseIsoMs(ev.timestamp);
+    if (firstTs === null && ts !== null) firstTs = ts;
+    tokensInput += usage.input_tokens || 0;
+    tokensOutput += usage.output_tokens || 0;
+    tokensCacheRead += usage.cache_read_input_tokens || 0;
+    tokensCacheWrite += usage.cache_creation_input_tokens || 0;
+  }
+
+  const tot = tokensInput + tokensOutput + tokensCacheRead + tokensCacheWrite;
+  if (tot === 0) return null;
+  const ts = firstTs ?? Date.now();
+
+  return {
+    tool: 'claude',
+    sessionId,
+    project: compactHome(cwd),
+    title: '',
+    week: isoWeekKey(ts),
+    month: monthKey(ts),
+    ts,
+    tokensInput,
+    tokensOutput,
+    tokensCacheRead,
+    tokensCacheWrite,
+    tokensReasoning: 0,
+    tokensTotal: tot,
+    cost: 0,
+    model,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Public: load all session records for given detectors
 // ---------------------------------------------------------------------------
@@ -226,8 +333,12 @@ export async function loadAll(detections) {
       const r = await loadCodexRollouts(d.path);
       all.push(...r.records);
       if (r.errors) errors.push(...r.errors);
+    } else if (d.key === 'claude') {
+      const r = await loadClaudeJsonl(d.path);
+      all.push(...r.records);
+      if (r.errors) errors.push(...r.errors);
     }
-    // For other tools (claude, copilot, antigravity, gemini), we only have
+    // For other tools (copilot, antigravity, gemini), we only have
     // presence info — no token data to load.
   }
   return { records: all, errors };

package/src/markdown.js

@@ -3,9 +3,10 @@
 // copies cleanly into issues, PRs, Notion, etc.
 
 import {
-  perProject, perMonth, perWeek, perTool, overall, topSessions, tokenBreakdown,
+  perProject, perMonth, perWeek, perTool, perToolPerMonth, overall, topSessions, tokenBreakdown,
   MONTH_NAMES,
 } from './aggregate.js';
+import { getToolBarChar, TOOLS } from './tools.js';
 
 // ---------------------------------------------------------------------------
 // Number formatting helpers (re-implemented locally to avoid TUI deps)
@@ -41,6 +42,29 @@ function bar(value, max, width) {
   return '█'.repeat(filled) + '░'.repeat(width - filled);
 }
 
+// Markdown has no color, so each tool's stacked-bar segment is shown with
+// a distinct block character. The character for each tool is defined in
+// src/tools.js alongside its color.
+function stackedBar(byTool, width) {
+  const total = Object.values(byTool).reduce((a, b) => a + b, 0);
+  if (total <= 0 || width <= 0) return ' '.repeat(Math.max(0, width));
+  const entries = Object.entries(byTool)
+    .filter(([, v]) => v > 0)
+    .sort((a, b) => b[1] - a[1]);
+  let out = '';
+  let x = 0;
+  for (let i = 0; i < entries.length; i++) {
+    const [tool, value] = entries[i];
+    const segW = i === entries.length - 1
+      ? width - x
+      : Math.round((value / total) * width);
+    if (segW <= 0) continue;
+    out += getToolBarChar(tool).repeat(segW);
+    x += segW;
+  }
+  return out;
+}
+
 function pct(x) { return (x * 100).toFixed(1) + '%'; }
 
 function mdEscape(s) {
@@ -151,15 +175,53 @@ export function renderMarkdown({
   // Per Project ---------------------------------------------------------
   const projects = perProject(records);
   if (projects.length > 0) {
-    const max = projects[0].tokensTotal;
     out.push(`## Per Project`);
     out.push(``);
-    out.push(`| Tool | Project | Sessions | Input | Output | Cache | Total | Dist |`);
-    out.push(`|---|---|---:|---:|---:|---:|---:|---|`);
+    out.push(`| Project | Sessions | Input | Output | Cache | Total | Dist |`);
+    out.push(`|---|---:|---:|---:|---:|---:|---|`);
     for (const p of projects) {
       const cache = p.tokensCacheRead + p.tokensCacheWrite;
       const proj = compactHome(p.project);
-      out.push(`| ${mdEscape(p.tool)} | \`${mdEscape(proj)}\` | ${fmtInt(p.n)} | ${fmtCompact(p.tokensInput)} | ${fmtCompact(p.tokensOutput)} | ${fmtCompact(cache)} | ${fmtCompact(p.tokensTotal)} | ${bar(p.tokensTotal, max, 20)} |`);
+      out.push(`| \`${mdEscape(proj)}\` | ${fmtInt(p.n)} | ${fmtCompact(p.tokensInput)} | ${fmtCompact(p.tokensOutput)} | ${fmtCompact(cache)} | ${fmtCompact(p.tokensTotal)} | ${stackedBar(p.byTool, 20)} |`);
+    }
+    out.push(``);
+    const legend = TOOLS
+      .filter(t => t.hasTokens)
+      .map(t => `\`${t.barChar}\` ${t.label}`)
+      .join(' · ');
+    out.push(`_Bar legend: ${legend} · \`·\` other_`);
+    out.push(``);
+  }
+
+  // Per Tool ------------------------------------------------------------
+  const toolRows = perTool(records);
+  if (toolRows.length > 0) {
+    const max = toolRows[0].tokensTotal;
+    out.push(`## Per Tool`);
+    out.push(``);
+    out.push(`| Tool | Sessions | Input | Output | Cache | Total | Cost | Avg/sess | Dist |`);
+    out.push(`|---|---:|---:|---:|---:|---:|---:|---:|---|`);
+    for (const p of toolRows) {
+      const cache = p.tokensCacheRead + p.tokensCacheWrite;
+      out.push(`| ${mdEscape(p.tool)} | ${fmtInt(p.n)} | ${fmtCompact(p.tokensInput)} | ${fmtCompact(p.tokensOutput)} | ${fmtCompact(cache)} | ${fmtCompact(p.tokensTotal)} | ${fmtCost(p.cost)} | ${fmtCompact(p.avg)} | ${bar(p.tokensTotal, max, 20)} |`);
+    }
+    out.push(``);
+  }
+
+  // Per Tool per Month ---------------------------------------------------
+  const tpmRows = perToolPerMonth(records);
+  if (tpmRows.length > 0) {
+    const max = tpmRows[0].tokensTotal;
+    out.push(`## Per Tool per Month`);
+    out.push(``);
+    out.push(`| Tool | Month | Sessions | Input | Output | Cache | Total | Dist |`);
+    out.push(`|---|---|---:|---:|---:|---:|---:|---|`);
+    for (const p of tpmRows) {
+      const cache = p.tokensCacheRead + p.tokensCacheWrite;
+      const yyyy = p.month.slice(0, 4);
+      const mm = p.month.slice(5, 7);
+      const label = `${MONTH_NAMES[mm] || mm} ${yyyy}`;
+      out.push(`| ${mdEscape(p.tool)} | ${label} | ${fmtInt(p.n)} | ${fmtCompact(p.tokensInput)} | ${fmtCompact(p.tokensOutput)} | ${fmtCompact(cache)} | ${fmtCompact(p.tokensTotal)} | ${bar(p.tokensTotal, max, 18)} |`);
     }
     out.push(``);
   }
@@ -167,16 +229,15 @@ export function renderMarkdown({
   // Per Month -----------------------------------------------------------
   const months = perMonth(records);
   if (months.length > 0) {
-    const max = Math.max(...months.map(m => m.tokensTotal));
     out.push(`## Per Month`);
     out.push(``);
-    out.push(`| Month | Sessions | Input | Output | Total | OC | CX | MM | Dist |`);
-    out.push(`|---|---:|---:|---:|---:|---:|---:|---:|---|`);
+    out.push(`| Month | Sessions | Input | Output | Total | Dist |`);
+    out.push(`|---|---:|---:|---:|---:|---|`);
     for (const m of months) {
       const yyyy = m.month.slice(0, 4);
       const mm = m.month.slice(5, 7);
       const label = `${MONTH_NAMES[mm] || mm} ${yyyy}`;
-      out.push(`| ${label} | ${fmtInt(m.n)} | ${fmtCompact(m.tokensInput)} | ${fmtCompact(m.tokensOutput)} | ${fmtCompact(m.tokensTotal)} | ${m.byTool.opencode ? fmtCompact(m.byTool.opencode) : '—'} | ${m.byTool.codex ? fmtCompact(m.byTool.codex) : '—'} | ${m.byTool.mimocode ? fmtCompact(m.byTool.mimocode) : '—'} | ${bar(m.tokensTotal, max, 20)} |`);
+      out.push(`| ${label} | ${fmtInt(m.n)} | ${fmtCompact(m.tokensInput)} | ${fmtCompact(m.tokensOutput)} | ${fmtCompact(m.tokensTotal)} | ${stackedBar(m.byTool, 20)} |`);
     }
     out.push(``);
   }
@@ -184,13 +245,12 @@ export function renderMarkdown({
   // Per Week ------------------------------------------------------------
   const weeks = perWeek(records);
   if (weeks.length > 0) {
-    const max = Math.max(...weeks.map(w => w.tokensTotal));
     out.push(`## Per Week`);
     out.push(``);
-    out.push(`| Week | Sessions | Input | Output | Total | OC | CX | MM | Dist |`);
-    out.push(`|---|---:|---:|---:|---:|---:|---:|---:|---|`);
+    out.push(`| Week | Sessions | Input | Output | Total | Dist |`);
+    out.push(`|---|---:|---:|---:|---:|---|`);
     for (const w of weeks) {
-      out.push(`| ${w.week} | ${fmtInt(w.n)} | ${fmtCompact(w.tokensInput)} | ${fmtCompact(w.tokensOutput)} | ${fmtCompact(w.tokensTotal)} | ${w.byTool.opencode ? fmtCompact(w.byTool.opencode) : '—'} | ${w.byTool.codex ? fmtCompact(w.byTool.codex) : '—'} | ${w.byTool.mimocode ? fmtCompact(w.byTool.mimocode) : '—'} | ${bar(w.tokensTotal, max, 18)} |`);
+      out.push(`| ${w.week} | ${fmtInt(w.n)} | ${fmtCompact(w.tokensInput)} | ${fmtCompact(w.tokensOutput)} | ${fmtCompact(w.tokensTotal)} | ${stackedBar(w.byTool, 18)} |`);
     }
     out.push(``);
   }

package/src/render.js

@@ -6,9 +6,10 @@ import boxen from 'boxen';
 import gradient from 'gradient-string';
 import process from 'node:process';
 import {
-  perProject, perMonth, perWeek, perTool, overall, topSessions, tokenBreakdown,
+  perProject, perMonth, perWeek, perTool, perToolPerMonth, overall, topSessions, tokenBreakdown,
   MONTH_NAMES,
 } from './aggregate.js';
+import { getToolColor } from './tools.js';
 
 // ---------------------------------------------------------------------------
 // Terminal width detection
@@ -63,34 +64,45 @@ export function fmtCost(n) {
 // Color helpers
 // ---------------------------------------------------------------------------
 
-const TOOL_COLORS = {
-  opencode: 'cyan',
-  codex: 'magenta',
-  mimocode: 'yellow',
-  claude: 'blue',
-  copilot: 'green',
-  antigravity: 'red',
-  gemini: 'gray',
-};
-
-export function toolColor(t) { return TOOL_COLORS[t] || 'white'; }
-export function colorize(t, c) { return chalk.hex(toHex(c))(t); }
-
-function toHex(name) {
-  const m = {
-    red: '#ff5555', green: '#50fa7b', yellow: '#f1fa8c',
-    blue: '#8be9fd', magenta: '#ff79c6', cyan: '#8be9fd',
-    white: '#f8f8f2', gray: '#6272a4',
-  };
-  return m[name] || '#ffffff';
-}
+export function toolColor(t) { return getToolColor(t); }
+export function colorize(t, c) { return chalk.hex(c)(t); }
+
+// Cool-to-warm gradient: small bars feel subtle, large bars pop.
+const BAR_GRADIENT = gradient(['#3b82f6', '#14b8a6', '#f1fa8c', '#ff9e64']);
 
-function bar(value, max, width, color) {
+function bar(value, max, width) {
   if (max <= 0) return ' '.repeat(width);
   const pct = Math.max(0, Math.min(1, value / max));
   const filled = Math.round(pct * width);
   const empty = width - filled;
-  return chalk.hex(toHex(color))('█'.repeat(filled)) + chalk.gray('░'.repeat(empty));
+  if (filled === 0) return chalk.gray('░'.repeat(width));
+  return BAR_GRADIENT('█'.repeat(filled)) + chalk.gray('░'.repeat(empty));
+}
+
+// Stacked bar — one segment per tool, widths proportional to that tool's
+// share of the row's total. Used wherever a row spans multiple tools
+// (per-project / per-month / per-week). Single-tool rows are just one
+// colored segment; no change in feel.
+function stackedBar(byTool, width) {
+  const total = Object.values(byTool).reduce((a, b) => a + b, 0);
+  if (total <= 0 || width <= 0) return ' '.repeat(Math.max(0, width));
+  const entries = Object.entries(byTool)
+    .filter(([, v]) => v > 0)
+    .sort((a, b) => b[1] - a[1]);
+  let out = '';
+  let x = 0;
+  for (let i = 0; i < entries.length; i++) {
+    const [tool, value] = entries[i];
+    // Last segment fills the remaining width so rounding doesn't leave
+    // a visible gap or overshoot.
+    const segW = i === entries.length - 1
+      ? width - x
+      : Math.round((value / total) * width);
+    if (segW <= 0) continue;
+    out += chalk.hex(toolColor(tool))('█'.repeat(segW));
+    x += segW;
+  }
+  return out;
 }
 
 function shortModel(m) {
@@ -250,23 +262,60 @@ function pct(x) { return (x * 100).toFixed(1) + '%'; }
 export function renderPerProject(records) {
   const items = perProject(records);
   if (items.length === 0) return '';
-  const max = items[0].tokensTotal;
   const barW = NARROW ? 10 : 18;
 
   // Narrow mode: drop In/Out/Cache columns, just show n + Total + Dist
   const head = NARROW
-    ? [chalk.bold('Tool'), chalk.bold('Project'), chalk.bold('n'),
+    ? [chalk.bold('Project'), chalk.bold('n'),
        chalk.bold('Total'), chalk.bold('Dist')]
-    : [chalk.bold('Tool'), chalk.bold('Project'), chalk.bold('n'),
+    : [chalk.bold('Project'), chalk.bold('n'),
        chalk.bold('In'), chalk.bold('Out'),
        chalk.bold('Cache'), chalk.bold('Total'), chalk.bold('Dist')];
   const t = new Table({ head, style: { head: [], border: [] } });
 
+  for (const p of items) {
+    const cache = p.tokensCacheRead + p.tokensCacheWrite;
+    const row = [truncEnd(p.project, NARROW ? 28 : 40), fmtInt(p.n)];
+    if (!NARROW) {
+      row.push(
+        fmtCompact(p.tokensInput),
+        fmtCompact(p.tokensOutput),
+        fmtCompact(cache),
+      );
+    }
+    row.push(fmtCompact(p.tokensTotal), stackedBar(p.byTool, barW));
+    t.push(row);
+  }
+  return boxen(t.toString(), {
+    title: chalk.bold('Per Project'),
+    borderStyle: 'round',
+    borderColor: 'cyan',
+    padding: { top: 0, bottom: 0, left: 1, right: 1 },
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Per Tool (detailed — complements the brief summary in Overview)
+// ---------------------------------------------------------------------------
+
+export function renderPerTool(records) {
+  const items = perTool(records);
+  if (items.length === 0) return '';
+  const max = items[0].tokensTotal;
+  const barW = NARROW ? 10 : 18;
+
+  const head = NARROW
+    ? [chalk.bold('Tool'), chalk.bold('n'),
+       chalk.bold('Total'), chalk.bold('Cost'), chalk.bold('Avg/sess'), chalk.bold('Dist')]
+    : [chalk.bold('Tool'), chalk.bold('n'),
+       chalk.bold('Input'), chalk.bold('Output'), chalk.bold('Cache'),
+       chalk.bold('Total'), chalk.bold('Cost'), chalk.bold('Avg/sess'), chalk.bold('Dist')];
+  const t = new Table({ head, style: { head: [], border: [] } });
+
   for (const p of items) {
     const cache = p.tokensCacheRead + p.tokensCacheWrite;
     const row = [
       colorize(p.tool, toolColor(p.tool)),
-      truncEnd(p.project, NARROW ? 26 : 38),
       fmtInt(p.n),
     ];
     if (!NARROW) {
@@ -278,12 +327,63 @@ export function renderPerProject(records) {
     }
     row.push(
       fmtCompact(p.tokensTotal),
-      bar(p.tokensTotal, max, barW, toolColor(p.tool)),
+      fmtCost(p.cost),
+      fmtCompact(p.avg),
+      bar(p.tokensTotal, max, barW),
     );
     t.push(row);
   }
   return boxen(t.toString(), {
-    title: chalk.bold('Per Project'),
+    title: chalk.bold('Per Tool'),
+    borderStyle: 'round',
+    borderColor: 'magenta',
+    padding: { top: 0, bottom: 0, left: 1, right: 1 },
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Per Tool per Month (cross-tab — one row per (tool, month))
+// ---------------------------------------------------------------------------
+
+export function renderPerToolPerMonth(records) {
+  const items = perToolPerMonth(records);
+  if (items.length === 0) return '';
+  const max = items[0].tokensTotal;
+  const barW = NARROW ? 8 : 16;
+
+  const head = NARROW
+    ? [chalk.bold('Tool'), chalk.bold('Month'), chalk.bold('n'),
+       chalk.bold('Total'), chalk.bold('Dist')]
+    : [chalk.bold('Tool'), chalk.bold('Month'), chalk.bold('n'),
+       chalk.bold('Input'), chalk.bold('Output'), chalk.bold('Cache'),
+       chalk.bold('Total'), chalk.bold('Dist')];
+  const t = new Table({ head, style: { head: [], border: [] } });
+
+  for (const p of items) {
+    const cache = p.tokensCacheRead + p.tokensCacheWrite;
+    const yyyy = p.month.slice(0, 4);
+    const mm = p.month.slice(5, 7);
+    const monthLabel = `${MONTH_NAMES[mm] || mm} ${yyyy}`;
+    const row = [
+      colorize(p.tool, toolColor(p.tool)),
+      chalk.bold(monthLabel),
+      fmtInt(p.n),
+    ];
+    if (!NARROW) {
+      row.push(
+        fmtCompact(p.tokensInput),
+        fmtCompact(p.tokensOutput),
+        fmtCompact(cache),
+      );
+    }
+    row.push(
+      fmtCompact(p.tokensTotal),
+      bar(p.tokensTotal, max, barW),
+    );
+    t.push(row);
+  }
+  return boxen(t.toString(), {
+    title: chalk.bold('Per Tool per Month'),
     borderStyle: 'round',
     borderColor: 'cyan',
     padding: { top: 0, bottom: 0, left: 1, right: 1 },
@@ -297,64 +397,42 @@ export function renderPerProject(records) {
 export function renderPerMonth(records) {
   const items = perMonth(records);
   if (items.length === 0) return '';
-  const max = Math.max(...items.map(p => p.tokensTotal));
   const barW = NARROW ? 10 : 16;
-  const t1 = perTool(records);
 
-  // Narrow mode: drop the byTool columns (OC/CX/MM), keep core metrics
-  const head = NARROW
-    ? [chalk.bold('Month'), chalk.bold('n'),
-       chalk.bold('Input'), chalk.bold('Output'),
-       chalk.bold('Total'), chalk.bold('Dist')]
-    : [chalk.bold('Month'), chalk.bold('n'),
-       chalk.bold('Input'), chalk.bold('Output'),
-       chalk.bold('Total'), chalk.bold('OC'),
-       chalk.bold('CX'), chalk.bold('MM'), chalk.bold('Dist')];
+  const head = [
+    chalk.bold('Month'), chalk.bold('n'),
+    chalk.bold('Input'), chalk.bold('Output'),
+    chalk.bold('Total'), chalk.bold('Dist'),
+  ];
   const t = new Table({ head, style: { head: [], border: [] } });
 
   for (const p of items) {
     const yyyy = p.month.slice(0, 4);
     const mm = p.month.slice(5, 7);
     const label = `${MONTH_NAMES[mm] || mm} ${yyyy}`;
-    const row = [
+    t.push([
       chalk.bold(label),
       fmtInt(p.n),
       fmtCompact(p.tokensInput),
       fmtCompact(p.tokensOutput),
       fmtCompact(p.tokensTotal),
-    ];
-    if (!NARROW) {
-      row.push(
-        p.byTool.opencode ? fmtCompact(p.byTool.opencode) : chalk.dim('—'),
-        p.byTool.codex ? fmtCompact(p.byTool.codex) : chalk.dim('—'),
-        p.byTool.mimocode ? fmtCompact(p.byTool.mimocode) : chalk.dim('—'),
-      );
-    }
-    row.push(bar(p.tokensTotal, max, barW, 'green'));
-    t.push(row);
+      stackedBar(p.byTool, barW),
+    ]);
   }
 
   // TOTAL row
   const tot = overall(records);
-  const totalRow = [
+  t.push([
     chalk.bgGray.white.bold(' TOTAL '),
     chalk.bgGray.white.bold(fmtInt(records.length)),
     chalk.bgGray.white.bold(fmtCompact(tot.tokensInput)),
     chalk.bgGray.white.bold(fmtCompact(tot.tokensOutput)),
     chalk.bgGray.white.bold(fmtCompact(tot.tokensTotal)),
-  ];
-  if (!NARROW) {
-    totalRow.push(
-      chalk.bgGray.white.bold(fmtCompact(t1.find(p => p.tool === 'opencode')?.tokensTotal || 0)),
-      chalk.bgGray.white.bold(fmtCompact(t1.find(p => p.tool === 'codex')?.tokensTotal || 0)),
-      chalk.bgGray.white.bold(fmtCompact(t1.find(p => p.tool === 'mimocode')?.tokensTotal || 0)),
-    );
-  }
-  totalRow.push('');
-  t.push(totalRow);
+    '',
+  ]);
 
   return boxen(t.toString(), {
-    title: chalk.bold('Per Bulan (Monthly)'),
+    title: chalk.bold('Per Month'),
     borderStyle: 'round',
     borderColor: 'green',
     padding: { top: 0, bottom: 0, left: 1, right: 1 },
@@ -368,60 +446,38 @@ export function renderPerMonth(records) {
 export function renderPerWeek(records) {
   const items = perWeek(records);
   if (items.length === 0) return '';
-  const max = Math.max(...items.map(p => p.tokensTotal));
   const barW = NARROW ? 10 : 14;
-  const t1 = perTool(records);
 
-  const head = NARROW
-    ? [chalk.bold('ISO Week'), chalk.bold('n'),
-       chalk.bold('Input'), chalk.bold('Output'),
-       chalk.bold('Total'), chalk.bold('Dist')]
-    : [chalk.bold('ISO Week'), chalk.bold('n'),
-       chalk.bold('Input'), chalk.bold('Output'),
-       chalk.bold('Total'), chalk.bold('OC'),
-       chalk.bold('CX'), chalk.bold('MM'), chalk.bold('Dist')];
+  const head = [
+    chalk.bold('ISO Week'), chalk.bold('n'),
+    chalk.bold('Input'), chalk.bold('Output'),
+    chalk.bold('Total'), chalk.bold('Dist'),
+  ];
   const t = new Table({ head, style: { head: [], border: [] } });
 
   for (const p of items) {
-    const dominantTool = Object.entries(p.byTool).sort((a, b) => b[1] - a[1])[0]?.[0] || 'opencode';
-    const row = [
+    t.push([
       chalk.bold(p.week),
       fmtInt(p.n),
       fmtCompact(p.tokensInput),
       fmtCompact(p.tokensOutput),
       fmtCompact(p.tokensTotal),
-    ];
-    if (!NARROW) {
-      row.push(
-        p.byTool.opencode ? fmtCompact(p.byTool.opencode) : chalk.dim('—'),
-        p.byTool.codex ? fmtCompact(p.byTool.codex) : chalk.dim('—'),
-        p.byTool.mimocode ? fmtCompact(p.byTool.mimocode) : chalk.dim('—'),
-      );
-    }
-    row.push(bar(p.tokensTotal, max, barW, toolColor(dominantTool)));
-    t.push(row);
+      stackedBar(p.byTool, barW),
+    ]);
   }
   // TOTAL row
   const tot = overall(records);
-  const totalRow = [
+  t.push([
     chalk.bgGray.white.bold(' TOTAL '),
     chalk.bgGray.white.bold(fmtInt(records.length)),
     chalk.bgGray.white.bold(fmtCompact(tot.tokensInput)),
     chalk.bgGray.white.bold(fmtCompact(tot.tokensOutput)),
     chalk.bgGray.white.bold(fmtCompact(tot.tokensTotal)),
-  ];
-  if (!NARROW) {
-    totalRow.push(
-      chalk.bgGray.white.bold(fmtCompact(t1.find(p => p.tool === 'opencode')?.tokensTotal || 0)),
-      chalk.bgGray.white.bold(fmtCompact(t1.find(p => p.tool === 'codex')?.tokensTotal || 0)),
-      chalk.bgGray.white.bold(fmtCompact(t1.find(p => p.tool === 'mimocode')?.tokensTotal || 0)),
-    );
-  }
-  totalRow.push('');
-  t.push(totalRow);
+    '',
+  ]);
 
   return boxen(t.toString(), {
-    title: chalk.bold('Per Minggu (Weekly)'),
+    title: chalk.bold('Per Week'),
     borderStyle: 'round',
     borderColor: 'magenta',
     padding: { top: 0, bottom: 0, left: 1, right: 1 },