tokens-metric 0.4.6 → 0.4.7

package/dist/core/history.js

@@ -91,10 +91,16 @@ function aggregate(now) {
         if (ts !== null && (oldest === null || ts < oldest))
             oldest = ts;
     }
+    // last7Days: the 7 most recent days with data, oldest→newest
+    const last7Days = Array.from({ length: 7 }, (_, i) => ({
+        dayStart: startToday - (6 - i) * 86_400_000,
+        byModel: { ...(merged.get(startToday - (6 - i) * 86_400_000)?.byModel ?? {}) },
+    }));
     const snap = {
         today: { byModel: {}, sessions: new Set() },
         d7: { byModel: {}, sessions: new Set() },
         d30: { byModel: {}, sessions: new Set() },
+        last7Days,
         scannedFiles: cache.size,
         generatedAt: now,
         oldestMtimeMs: oldest,
@@ -150,10 +156,15 @@ export function bucketTopModel(b) {
     return topModel;
 }
 function emptySnapshot(now, scannedFiles) {
+    const startToday = startOfDay(now);
     return {
         today: { byModel: {}, sessions: new Set() },
         d7: { byModel: {}, sessions: new Set() },
         d30: { byModel: {}, sessions: new Set() },
+        last7Days: Array.from({ length: 7 }, (_, i) => ({
+            dayStart: startToday - (6 - i) * 86_400_000,
+            byModel: {},
+        })),
         scannedFiles,
         generatedAt: now,
         oldestMtimeMs: null,

package/dist/tui/index.js

@@ -327,9 +327,45 @@ function BarRow({ label, value, max, total, color, cost, }) {
 }
 // ── History panel ────────────────────────────────────────────────────────────
 function HistoryPanel({ history }) {
-    return (_jsxs(Box, { borderStyle: "round", borderColor: "blue", paddingX: 1, flexDirection: "column", width: "100%", children: [_jsxs(Text, { bold: true, color: "blue", children: ['Usage history', _jsx(Text, { bold: false, color: "blue", children: " \u00B7 refreshes every 60s" })] }), !history ? (_jsx(Text, { dimColor: true, children: "Scanning ~/.claude/projects\u2026" })) : history.scannedFiles === 0 ? (_jsx(Text, { dimColor: true, children: "No transcripts found." })) : (_jsxs(_Fragment, { children: [_jsx(HistoryRow, { label: "", today: "Today", d7: "7d", d30: "30d", dim: true }), _jsx(HistoryRow, { label: "Tokens ", today: fmtNumber(bucketTokens(history.today)), d7: fmtNumber(bucketTokens(history.d7)), d30: fmtNumber(bucketTokens(history.d30)) }), _jsx(HistoryRow, { label: "Cost~  ", today: fmtCost(bucketCostUSD(history.today)), d7: fmtCost(bucketCostUSD(history.d7)), d30: fmtCost(bucketCostUSD(history.d30)) }), _jsx(HistoryRow, { label: "Sessions", today: String(history.today.sessions.size), d7: String(history.d7.sessions.size), d30: String(history.d30.sessions.size) }), _jsx(HistoryRow, { label: "Top model", today: fmtTopModel(history.today), d7: fmtTopModel(history.d7), d30: fmtTopModel(history.d30) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: [`scanned ${history.scannedFiles} transcripts`, history.oldestMtimeMs !== null &&
+    return (_jsxs(Box, { borderStyle: "round", borderColor: "blue", paddingX: 1, flexDirection: "column", width: "100%", children: [_jsxs(Text, { bold: true, color: "blue", children: ['Usage history', _jsx(Text, { bold: false, color: "blue", children: " \u00B7 refreshes every 60s" })] }), !history ? (_jsx(Text, { dimColor: true, children: "Scanning\u2026" })) : history.scannedFiles === 0 ? (_jsx(Text, { dimColor: true, children: "No transcripts found." })) : (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1, children: _jsx(DualBarChart, { days: history.last7Days, now: history.generatedAt }) }), _jsxs(Box, { marginTop: 1, children: [_jsx(HistoryRow, { label: "", today: "Today", d7: "7d", d30: "30d", dim: true }), _jsx(HistoryRow, { label: "Tokens ", today: fmtNumber(bucketTokens(history.today)), d7: fmtNumber(bucketTokens(history.d7)), d30: fmtNumber(bucketTokens(history.d30)) }), _jsx(HistoryRow, { label: "Cost~  ", today: fmtCost(bucketCostUSD(history.today)), d7: fmtCost(bucketCostUSD(history.d7)), d30: fmtCost(bucketCostUSD(history.d30)) }), _jsx(HistoryRow, { label: "Sessions", today: String(history.today.sessions.size), d7: String(history.d7.sessions.size), d30: String(history.d30.sessions.size) })] }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: [`scanned ${history.scannedFiles} transcripts`, history.oldestMtimeMs !== null &&
                                     ` · data since ${fmtDate(history.oldestMtimeMs)} (${daysAgo(history.oldestMtimeMs, history.generatedAt)} days)`] }) })] }))] }));
 }
+// ── Dual bar chart ────────────────────────────────────────────────────────────
+const CHART_BAR_WIDTH = 28;
+function claudeTokens(byModel) {
+    return Object.entries(byModel)
+        .filter(([m]) => m !== 'codex')
+        .reduce((s, [, u]) => s + totalTokens(u), 0);
+}
+function codexTokens(byModel) {
+    return totalTokens(byModel['codex'] ?? { input_tokens: 0, output_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 });
+}
+function claudeCost(byModel) {
+    return Object.entries(byModel)
+        .filter(([m]) => m !== 'codex')
+        .reduce((s, [m, u]) => s + (estimateCostUSD(m, u) ?? 0), 0);
+}
+function DualBarChart({ days, now }) {
+    const maxTokens = Math.max(1, ...days.flatMap((d) => [claudeTokens(d.byModel), codexTokens(d.byModel)]));
+    const DAY_LABELS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+    const todayStart = (() => { const d = new Date(now); d.setHours(0, 0, 0, 0); return d.getTime(); })();
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: 'last 7 days' }), days.map((day) => {
+                const ct = claudeTokens(day.byModel);
+                const cxt = codexTokens(day.byModel);
+                const cc = claudeCost(day.byModel);
+                const cxc = Object.entries(day.byModel)
+                    .filter(([m]) => m === 'codex')
+                    .reduce((s, [m, u]) => s + (estimateCostUSD(m, u) ?? 0), 0);
+                const isToday = day.dayStart === todayStart;
+                const label = isToday ? 'today' : DAY_LABELS[new Date(day.dayStart).getDay()];
+                const hasData = ct > 0 || cxt > 0;
+                return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { bold: isToday, color: isToday ? 'white' : undefined, children: [label.padEnd(6), !hasData && _jsx(Text, { dimColor: true, children: "  no data" })] }), ct > 0 && (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: '  claude  ' }), _jsx(Text, { color: "cyan", children: solidBar(ct / maxTokens, CHART_BAR_WIDTH) }), _jsx(Text, { children: '  ' }), _jsx(Text, { bold: true, children: fmtNumber(ct).padStart(7) }), cc > 0 && _jsx(Text, { dimColor: true, children: `  ~${fmtUSD(cc)}` })] })), cxt > 0 && (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: '  codex   ' }), _jsx(Text, { color: "magenta", children: solidBar(cxt / maxTokens, CHART_BAR_WIDTH) }), _jsx(Text, { children: '  ' }), _jsx(Text, { bold: true, children: fmtNumber(cxt).padStart(7) }), cxc > 0 && _jsx(Text, { dimColor: true, children: `  ~${fmtUSD(cxc)}` })] }))] }, day.dayStart));
+            })] }));
+}
+function solidBar(ratio, width) {
+    const filled = Math.round(Math.min(1, ratio) * width);
+    return '█'.repeat(filled) + '░'.repeat(width - filled);
+}
 function fmtDate(ms) {
     const d = new Date(ms);
     const y = d.getFullYear();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokens-metric",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Real-time token usage meter for Claude Code — statusline + Ink TUI.",
   "type": "module",
   "bin": {