opencode-token-tracker 1.6.1 → 1.6.3

package/dist/bin/opencode-tokens.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "../lib/shared.js";
-import { readFileSync, existsSync, writeFileSync, copyFileSync, mkdirSync, openSync, readSync, closeSync, statSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
+import { closeSync, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readSync, statSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfMonth, getStartOfWeek, validateConfig } from "../lib/shared.js";
 const CONFIG_DIR = join(homedir(), ".config", "opencode");
 const CONFIG_FILE = join(CONFIG_DIR, "token-tracker.json");
 const LOG_FILE = join(CONFIG_DIR, "logs", "token-tracker", "tokens.jsonl");
@@ -10,15 +10,15 @@ const LOG_FILE = join(CONFIG_DIR, "logs", "token-tracker", "tokens.jsonl");
 // Helpers
 // ============================================================================
 function padRight(str, len) {
-    return str.length >= len ? str : str + " ".repeat(len - str.length);
+    return str.length >= len ? str : `${str}${" ".repeat(len - str.length)}`;
 }
 function padLeft(str, len) {
-    return str.length >= len ? str : " ".repeat(len - str.length) + str;
+    return str.length >= len ? str : `${" ".repeat(len - str.length)}${str}`;
 }
 function truncateSessionId(sessionId) {
     if (!sessionId)
         return "unknown";
-    return sessionId.length > 16 ? sessionId.slice(0, 14) + "…" : sessionId;
+    return sessionId.length > 16 ? `${sessionId.slice(0, 14)}…` : sessionId;
 }
 function parseArgs(args) {
     const positional = [];
@@ -70,9 +70,6 @@ function flagValue(flags, name) {
     const v = flags.get(name);
     return typeof v === "string" ? v : undefined;
 }
-function flagBool(flags, name) {
-    return flags.has(name);
-}
 // ============================================================================
 // Data Loading
 // ============================================================================
@@ -178,10 +175,11 @@ function groupBy(entries, keyFn) {
     const groups = new Map();
     for (const e of entries) {
         const key = keyFn(e);
-        if (!groups.has(key)) {
-            groups.set(key, createEmptyStats());
+        let stats = groups.get(key);
+        if (!stats) {
+            stats = createEmptyStats();
+            groups.set(key, stats);
         }
-        const stats = groups.get(key);
         stats.input += e.input ?? 0;
         stats.output += e.output ?? 0;
         stats.reasoning += e.reasoning ?? 0;
@@ -277,7 +275,6 @@ function cmdStats(period, breakdown) {
             since = getStartOfMonth(now);
             title = "This Month's Usage";
             break;
-        case "all":
         default:
             since = undefined;
             title = "All-Time Usage";
@@ -337,15 +334,15 @@ function cmdPricing() {
             const p = BUILTIN_PRICING[model];
             if (!p)
                 continue;
-            const overridden = config.models?.[model] ? " *" : "";
-            console.log(`  ${padRight(model + overridden, modelWidth)}  ${padLeft("$" + p.input.toString(), priceWidth)}  ${padLeft("$" + p.output.toString(), priceWidth)}  ${padLeft(p.cacheRead ? "$" + p.cacheRead.toString() : "-", priceWidth)}  ${padLeft(p.cacheWrite ? "$" + p.cacheWrite.toString() : "-", priceWidth)}`);
+            const overridden = config.models[model] ? " *" : "";
+            console.log(`  ${padRight(`${model}${overridden}`, modelWidth)}  ${padLeft(`$${p.input.toString()}`, priceWidth)}  ${padLeft(`$${p.output.toString()}`, priceWidth)}  ${padLeft(p.cacheRead ? `$${p.cacheRead.toString()}` : "-", priceWidth)}  ${padLeft(p.cacheWrite ? `$${p.cacheWrite.toString()}` : "-", priceWidth)}`);
         }
         console.log();
     }
     console.log(`  Default (unknown models)`);
     console.log(`  ${"-".repeat(modelWidth + priceWidth * 4 + 12)}`);
-    const def = BUILTIN_PRICING["_default"];
-    console.log(`  ${padRight("_default", modelWidth)}  ${padLeft("$" + def.input.toString(), priceWidth)}  ${padLeft("$" + def.output.toString(), priceWidth)}  ${padLeft("-", priceWidth)}  ${padLeft("-", priceWidth)}`);
+    const def = BUILTIN_PRICING._default;
+    console.log(`  ${padRight("_default", modelWidth)}  ${padLeft(`$${def.input.toString()}`, priceWidth)}  ${padLeft(`$${def.output.toString()}`, priceWidth)}  ${padLeft("-", priceWidth)}  ${padLeft("-", priceWidth)}`);
     console.log();
     if (Object.keys(config.models || {}).length > 0) {
         console.log(`  * = overridden in config`);
@@ -363,10 +360,11 @@ function cmdModels() {
         const model = e.model ?? "unknown";
         const provider = e.provider ?? "unknown";
         const key = `${model}|${provider}`;
-        if (!modelProviders.has(key)) {
-            modelProviders.set(key, { provider, count: 0, lastUsed: 0 });
+        let info = modelProviders.get(key);
+        if (!info) {
+            info = { provider, count: 0, lastUsed: 0 };
+            modelProviders.set(key, info);
         }
-        const info = modelProviders.get(key);
         info.count++;
         info.lastUsed = Math.max(info.lastUsed, e._ts);
     }
@@ -569,7 +567,7 @@ function cmdConfig(positional) {
                 return;
             }
         }
-        applyConfigSet(key, value, config);
+        applyConfigSet(key, value);
         console.log(`\n  Set ${key} = ${JSON.stringify(value)}\n`);
         return;
     }
@@ -584,7 +582,7 @@ function cmdConfig(positional) {
             console.log(`\n  Unknown key: ${key}\n  Available: ${Object.keys(SETTABLE_KEYS).join(", ")}\n`);
             return;
         }
-        applyConfigUnset(key, config);
+        applyConfigUnset(key);
         console.log(`\n  Unset ${key} (reverted to default)\n`);
         return;
     }
@@ -604,7 +602,7 @@ function cmdConfig(positional) {
     if (existsSync(CONFIG_FILE)) {
         console.log(`  Contents:`);
         console.log(`  ${"-".repeat(60)}`);
-        console.log(JSON.stringify(config, null, 2).split("\n").map(l => "  " + l).join("\n"));
+        console.log(JSON.stringify(config, null, 2).split("\n").map(l => `  ${l}`).join("\n"));
         console.log();
     }
     console.log(`  Commands:`);
@@ -648,7 +646,7 @@ function resolveConfigKey(config, key) {
     }
     return obj[spec.path[spec.path.length - 1]] ?? spec.default;
 }
-function applyConfigSet(key, value, config) {
+function applyConfigSet(key, value) {
     const spec = SETTABLE_KEYS[key];
     const fullConfig = loadOrInitConfig();
     let obj = fullConfig;
@@ -660,7 +658,7 @@ function applyConfigSet(key, value, config) {
     obj[spec.path[spec.path.length - 1]] = value;
     saveConfig(fullConfig);
 }
-function applyConfigUnset(key, config) {
+function applyConfigUnset(key) {
     const spec = SETTABLE_KEYS[key];
     const fullConfig = loadOrInitConfig();
     let obj = fullConfig;
@@ -687,9 +685,9 @@ function saveConfig(raw) {
         mkdirSync(dir, { recursive: true });
     }
     if (existsSync(CONFIG_FILE)) {
-        copyFileSync(CONFIG_FILE, CONFIG_FILE + ".bak");
+        copyFileSync(CONFIG_FILE, `${CONFIG_FILE}.bak`);
     }
-    writeFileSync(CONFIG_FILE, JSON.stringify(raw, null, 2) + "\n");
+    writeFileSync(CONFIG_FILE, `${JSON.stringify(raw, null, 2)}\n`);
 }
 // ============================================================================
 // Export
@@ -738,7 +736,7 @@ function cmdExport(flags) {
             e.cacheWrite ?? 0,
             e.cost ?? 0,
         ].map(csvEscape).join(","));
-        output = [headers.join(","), ...rows].join("\n") + "\n";
+        output = `${[headers.join(","), ...rows].join("\n")}\n`;
     }
     if (outputFile) {
         writeFileSync(outputFile, output);
@@ -901,9 +899,74 @@ function cmdHelp() {
     opencode-tokens config get toast.enabled   # Check if toast is enabled
 `);
 }
-// ============================================================================
-// Trend
-// ============================================================================
+function getTrendValue(point, metric) {
+    return metric === "tokens" ? point.tokens : metric === "messages" ? point.messages : point.cost;
+}
+function formatTrendValue(value, metric) {
+    return metric === "tokens" ? formatTokens(value) : metric === "messages" ? String(Math.round(value)) : formatCost(value);
+}
+function metricLabel(metric) {
+    return metric === "tokens" ? "Token Trend" : metric === "messages" ? "Message Trend" : "Cost Trend";
+}
+function createTrendRows(height, width, gridRows) {
+    const rows = [];
+    for (let row = 0; row < height; row++) {
+        const grid = gridRows.has(row);
+        rows.push(Array.from({ length: width }, (_, x) => grid && x % 2 === 0 ? "·" : " "));
+    }
+    return rows;
+}
+function drawTrendSegment(rows, from, to) {
+    const startX = Math.min(from.x, to.x);
+    const endX = Math.max(from.x, to.x);
+    const slope = to.y - from.y;
+    for (let x = startX; x <= endX; x++) {
+        const t = x === from.x ? 0 : (x - from.x) / (to.x - from.x);
+        const y = Math.round(from.y + slope * t);
+        const char = slope > 0 ? "╱" : slope < 0 ? "╲" : "─";
+        rows[y][x] = char;
+    }
+}
+function drawTrendArea(rows, points) {
+    for (let i = 1; i < points.length; i++) {
+        const from = points[i - 1];
+        const to = points[i];
+        const startX = Math.min(from.x, to.x);
+        const endX = Math.max(from.x, to.x);
+        for (let x = startX; x <= endX; x++) {
+            const t = x === from.x ? 0 : (x - from.x) / (to.x - from.x);
+            const y = Math.round(from.y + (to.y - from.y) * t);
+            for (let fillY = 0; fillY < y; fillY++) {
+                if (rows[fillY][x] === " " || rows[fillY][x] === "·") {
+                    rows[fillY][x] = "░";
+                }
+            }
+        }
+    }
+}
+function drawTrendPoints(rows, points) {
+    for (const point of points) {
+        rows[point.y][point.x] = "●";
+    }
+}
+function buildTrendXAxis(points, chartPoints, chartWidth) {
+    const labelChars = Array.from({ length: chartWidth }, () => " ");
+    const labelStep = Math.max(1, Math.ceil(points.length / 6));
+    for (let i = 0; i < chartPoints.length; i++) {
+        if (i % labelStep !== 0 && i !== chartPoints.length - 1)
+            continue;
+        const date = new Date(points[i][0]);
+        const label = `${date.getMonth() + 1}/${date.getDate()}`;
+        const start = Math.min(Math.max(0, chartPoints[i].x - Math.floor(label.length / 2)), Math.max(0, chartWidth - label.length));
+        const hasSpace = labelChars.slice(Math.max(0, start - 1), Math.min(chartWidth, start + label.length + 1)).every((c) => c === " ");
+        if (!hasSpace)
+            continue;
+        for (let j = 0; j < label.length; j++) {
+            labelChars[start + j] = label[j];
+        }
+    }
+    return labelChars.join("");
+}
 function cmdTrend(flags) {
     const days = parseInt(String(flagValue(flags, "days") ?? "30"), 10);
     const metric = flagValue(flags, "metric") ?? "cost";
@@ -914,14 +977,14 @@ function cmdTrend(flags) {
         console.log(`\n  (no data in period)\n`);
         return;
     }
-    // Aggregate by day
     const dayMap = new Map();
     for (const e of entries) {
         const dayStart = getStartOfDay(new Date(e._ts));
-        if (!dayMap.has(dayStart)) {
-            dayMap.set(dayStart, { cost: 0, tokens: 0, messages: 0 });
+        let d = dayMap.get(dayStart);
+        if (!d) {
+            d = { cost: 0, tokens: 0, messages: 0 };
+            dayMap.set(dayStart, d);
         }
-        const d = dayMap.get(dayStart);
         d.cost += e.cost ?? 0;
         d.tokens += (e.input ?? 0) + (e.output ?? 0) + (e.reasoning ?? 0);
         d.messages += 1;
@@ -930,91 +993,60 @@ function cmdTrend(flags) {
     if (sorted.length < 2) {
         const only = sorted[0];
         if (only) {
-            const v = metric === "tokens" ? formatTokens(only[1].tokens) : metric === "messages" ? String(only[1].messages) : formatCost(only[1].cost);
+            const v = formatTrendValue(getTrendValue(only[1], metric), metric);
             console.log(`\n  ${new Date(only[0]).toISOString().slice(0, 10)}: ${v}\n`);
         }
         return;
     }
-    const values = sorted.map(([, d]) => metric === "tokens" ? d.tokens : metric === "messages" ? d.messages : d.cost);
+    const values = sorted.map(([, d]) => getTrendValue(d, metric));
     const maxVal = Math.max(...values, 1);
+    const minVal = Math.min(...values);
+    const totalVal = values.reduce((sum, value) => sum + value, 0);
+    const avgVal = totalVal / values.length;
+    const deltaVal = values[values.length - 1] - values[0];
     const H = Math.max(5, Math.min(Math.floor(width / 3), 20));
     if (width < 35) {
         // Fallback: simple sparkline
         const chars = ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"];
         const spark = values.map(v => chars[Math.min(Math.floor((v / maxVal) * 7), 7)]).join("");
-        console.log(`\n  ${spark}\n`);
+        console.log(`\n  ${metricLabel(metric)}  ${spark}\n`);
         return;
     }
-    // Build chart
-    const cols = values.map((v) => ({ value: v, y: Math.round((v / maxVal) * (H - 1)) }));
     const chartWidth = Math.max(width - 12, 20);
-    const xStep = Math.max(2, Math.floor(chartWidth / sorted.length));
     const yLabelStep = Math.max(1, Math.floor(H / 5));
+    const gridRows = new Set();
+    for (let row = 0; row < H; row++) {
+        if (row === 0 || row === H - 1 || (H - 1 - row) % yLabelStep === 0) {
+            gridRows.add(row);
+        }
+    }
+    const chartPoints = values.map((value, i) => ({
+        x: values.length === 1 ? Math.floor(chartWidth / 2) : Math.round((i / (values.length - 1)) * (chartWidth - 1)),
+        y: Math.round((value / maxVal) * (H - 1)),
+    }));
+    const rows = createTrendRows(H, chartWidth, gridRows);
+    drawTrendArea(rows, chartPoints);
+    for (let i = 1; i < chartPoints.length; i++) {
+        drawTrendSegment(rows, chartPoints[i - 1], chartPoints[i]);
+    }
+    drawTrendPoints(rows, chartPoints);
     const lines = [];
+    lines.push(`${metricLabel(metric)} · ${sorted.length} days · peak ${formatTrendValue(maxVal, metric)} · avg ${formatTrendValue(avgVal, metric)} · Δ ${deltaVal >= 0 ? "+" : ""}${formatTrendValue(deltaVal, metric)}`);
+    lines.push(`range ${formatTrendValue(minVal, metric)} → ${formatTrendValue(maxVal, metric)}`);
     for (let row = H - 1; row >= 0; row--) {
-        let line = "";
         const valAtRow = (row / (H - 1)) * maxVal;
-        const label = row === H - 1 || row === 0 || (H - 1 - row) % yLabelStep === 0
-            ? metric === "tokens" ? formatTokens(valAtRow) : metric === "messages" ? String(Math.round(valAtRow)) : formatCost(valAtRow)
+        const label = gridRows.has(row)
+            ? formatTrendValue(valAtRow, metric)
             : "";
-        line += padLeft(label, 9);
-        line += row === 0 ? " ┼" : " ┤";
-        for (let ci = 0; ci < cols.length; ci++) {
-            const col = cols[ci];
-            const nextY = ci < cols.length - 1 ? cols[ci + 1].y : col.y;
-            if (col.y === row) {
-                if (ci > 0) {
-                    const prevY = cols[ci - 1].y;
-                    if (prevY < col.y && nextY <= col.y)
-                        line += "╭";
-                    else if (prevY > col.y && nextY >= col.y)
-                        line += "╰";
-                    else if (prevY < col.y || nextY < col.y)
-                        line += "╭";
-                    else if (prevY > col.y || nextY > col.y)
-                        line += "╰";
-                    else
-                        line += "─";
-                }
-                else {
-                    line += nextY > col.y ? "╭" : nextY < col.y ? "╰" : "─";
-                }
-                if (xStep > 1 && ci < cols.length - 1 && nextY === row) {
-                    line += "─".repeat(xStep - 1);
-                }
-            }
-            else if (ci > 0 && ci < cols.length) {
-                const prevY = cols[ci - 1].y;
-                if ((prevY < row && col.y > row) || (prevY > row && col.y < row)) {
-                    line += prevY < col.y ? "╱" : "╲";
-                }
-                else {
-                    line += " ".repeat(xStep > 1 && nextY !== row ? 1 : Math.min(xStep, 1));
-                }
-            }
-        }
+        const line = `${padLeft(label, 9)}${row === 0 ? " ┼" : " ┤"}${rows[row].join("")}`;
         lines.push(line);
     }
-    // Bottom axis
-    let axis = " ".repeat(9) + " └";
-    axis += "─".repeat(xStep * cols.length);
+    const axis = `${" ".repeat(9)} └${"─".repeat(chartWidth)}`;
     lines.push(axis);
-    // X axis labels
-    const labelStep = Math.max(1, Math.ceil(sorted.length / 6));
-    let xLabels = " ".repeat(11);
-    for (let i = 0; i < cols.length; i++) {
-        if (i % labelStep === 0 || i === cols.length - 1) {
-            const d = new Date(sorted[i][0]);
-            const ds = `${d.getMonth() + 1}/${d.getDate()}`;
-            xLabels += ds;
-            if (i < cols.length - 1)
-                xLabels += " ".repeat(Math.max(1, xStep - ds.length + 1));
-        }
-    }
-    lines.push(xLabels);
+    lines.push(`${" ".repeat(11)}${buildTrendXAxis(sorted, chartPoints, chartWidth)}`);
     console.log();
     for (const l of lines)
-        console.log("  " + l);
+        console.log(`  ${l}`);
     console.log();
 }
 // ============================================================================
@@ -1050,8 +1082,7 @@ function main() {
     }
     // Default: stats
     let period = "all";
-    let breakdown;
-    breakdown = flagValue(parsed.flags, "by") || (parsed.flags.has("b") ? String(parsed.flags.get("b")) : undefined);
+    const breakdown = flagValue(parsed.flags, "by") || (parsed.flags.has("b") ? String(parsed.flags.get("b")) : undefined);
     for (const p of ["today", "week", "month", "all"]) {
         if (parsed.positional.includes(p)) {
             period = p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-token-tracker",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Real-time token usage and cost tracking plugin for OpenCode with Toast notifications and CLI stats",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",