opencode-token-tracker 1.5.6 → 1.6.0

package/README.md

@@ -152,8 +152,76 @@ Breakdown options (`--by`):
 - `agent` - Group by agent (e.g., sisyphus, coder)
 - `provider` - Group by provider (e.g., anthropic, openai)
 - `daily` - Show day-by-day breakdown
+- `session` - Group by session ID
 - `all` - Show all breakdowns
 
+### Trend Chart
+
+Visualize your daily token usage and cost over time:
+
+```bash
+# 30-day cost trend (default)
+opencode-tokens trend
+
+# 7-day token count trend
+opencode-tokens trend --days 7 --metric tokens
+
+# Compact chart
+opencode-tokens trend --width 40
+```
+
+Options:
+- `--days N` — Number of days to chart (default 30)
+- `--metric` — `cost` (default), `tokens`, or `messages`
+- `--width W` — Chart width in characters (default 60)
+
+### Data Export
+
+Export your token usage data for analysis:
+
+```bash
+# Export all data as CSV
+opencode-tokens export
+
+# Export this month as JSON
+opencode-tokens export --format json --period month
+
+# Export to file
+opencode-tokens export --format csv --output usage.csv
+```
+
+Options:
+- `--format` — `csv` (default) or `json`
+- `--period` — `today`, `week`, `month`, `all` (default)
+- `--output FILE` — Write to file instead of stdout
+
+### Config Management
+
+Manage budget and toast settings directly from the CLI:
+
+```bash
+# Show current config
+opencode-tokens config
+
+# Set daily budget to $10
+opencode-tokens config set budget.daily 10
+
+# Disable toast notifications
+opencode-tokens config set toast.enabled false
+
+# Check a value
+opencode-tokens config get budget.warnAt
+
+# Reset to default
+opencode-tokens config unset budget.daily
+```
+
+Settable keys:
+- `budget.daily`, `budget.weekly`, `budget.monthly`, `budget.warnAt`
+- `toast.enabled`, `toast.duration`, `toast.showOnIdle`
+
+Config changes are automatically backed up to `token-tracker.json.bak`.
+
 ### Pricing & Config Commands
 
 ```bash

package/dist/bin/opencode-tokens.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { BUILTIN_PRICING, DEFAULT_CONFIG, findModelConfigPricing, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig } from "../lib/shared.js";
-import { readFileSync, existsSync, writeFileSync, openSync, readSync, closeSync, statSync } from "fs";
+import { readFileSync, existsSync, writeFileSync, copyFileSync, mkdirSync, openSync, readSync, closeSync, statSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 const CONFIG_DIR = join(homedir(), ".config", "opencode");
@@ -15,6 +15,64 @@ function padRight(str, len) {
 function padLeft(str, len) {
     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;
+}
+function parseArgs(args) {
+    const positional = [];
+    const flags = new Map();
+    let i = 0;
+    while (i < args.length) {
+        const arg = args[i];
+        if (arg === "--help" || arg === "-h") {
+            flags.set("help", true);
+            i++;
+            continue;
+        }
+        if (arg.startsWith("--")) {
+            const eqIndex = arg.indexOf("=");
+            if (eqIndex !== -1) {
+                flags.set(arg.slice(2, eqIndex), arg.slice(eqIndex + 1));
+            }
+            else {
+                const next = args[i + 1];
+                if (next && !next.startsWith("-")) {
+                    flags.set(arg.slice(2), next);
+                    i++;
+                }
+                else {
+                    flags.set(arg.slice(2), true);
+                }
+            }
+            i++;
+            continue;
+        }
+        if (arg.startsWith("-") && arg.length === 2 && arg !== "--") {
+            const next = args[i + 1];
+            if (next && !next.startsWith("-")) {
+                flags.set(arg.slice(1), next);
+                i++;
+            }
+            else {
+                flags.set(arg.slice(1), true);
+            }
+            i++;
+            continue;
+        }
+        positional.push(arg);
+        i++;
+    }
+    return { command: positional[0] || "", flags, positional };
+}
+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
 // ============================================================================
@@ -246,6 +304,9 @@ function cmdStats(period, breakdown) {
         case "daily":
             printDailyBreakdown(entries);
             break;
+        case "session":
+            printTable("By Session", groupBy(entries, (e) => truncateSessionId(e.sessionId)), "Session");
+            break;
         case "all":
             printTable("By Model", groupBy(entries, (e) => e.model ?? "unknown"), "Model");
             printTable("By Agent", groupBy(entries, (e) => e.agent ?? "unknown"), "Agent");
@@ -325,17 +386,29 @@ function cmdModels() {
     console.log(`  ${padRight("Model", modelWidth)}  ${padRight("Provider", providerWidth)}  ${padLeft("Msgs", countWidth)}  ${padRight("Pricing", statusWidth)}`);
     console.log(`  ${"-".repeat(modelWidth)}  ${"-".repeat(providerWidth)}  ${"-".repeat(countWidth)}  ${"-".repeat(statusWidth)}`);
     for (const { model, provider, count } of sorted) {
-        let status = "built-in";
+        let status;
+        // Mirror the runtime pricing resolution order (getModelPricing in index.ts)
         if (config.providers?.[provider]) {
             status = "provider cfg";
         }
-        else if (findModelConfigPricing(config.models, model, provider)) {
+        else if (findModelConfigPricing(config.models, model, provider, false)) {
             status = "model cfg";
         }
-        else if (!BUILTIN_PRICING[model]) {
-            // Check partial match
-            const hasMatch = Object.keys(BUILTIN_PRICING).some(k => k !== "_default" && model.toLowerCase().includes(k.toLowerCase()));
-            status = hasMatch ? "built-in" : "default";
+        else if (BUILTIN_PRICING[model]) {
+            status = "built-in";
+        }
+        else {
+            const modelLower = model.toLowerCase();
+            const hasBuiltinPartial = Object.keys(BUILTIN_PRICING).some(k => k !== "_default" && modelLower.includes(k.toLowerCase()));
+            if (hasBuiltinPartial) {
+                status = "built-in";
+            }
+            else if (findModelConfigPricing(config.models, model, provider, true)) {
+                status = "model cfg";
+            }
+            else {
+                status = "default";
+            }
         }
         console.log(`  ${padRight(model, modelWidth)}  ${padRight(provider, providerWidth)}  ${padLeft(count.toString(), countWidth)}  ${padRight(status, statusWidth)}`);
     }
@@ -347,7 +420,8 @@ function cmdModels() {
     console.log(`    default      = unknown model, using $1/$4 per 1M tokens`);
     console.log();
 }
-function cmdConfig(action) {
+function cmdConfig(positional) {
+    const action = positional[1];
     const config = loadConfig();
     const entries = loadEntries();
     if (action === "init" || action === "generate") {
@@ -454,6 +528,72 @@ function cmdConfig(action) {
         }
         return;
     }
+    if (action === "get") {
+        const key = positional[2];
+        if (!key) {
+            console.log("\n  Usage: opencode-tokens config get <key>\n");
+            return;
+        }
+        const value = resolveConfigKey(config, key);
+        if (value === undefined) {
+            console.log(`\n  Unknown key: ${key}\n  Available: ${Object.keys(SETTABLE_KEYS).join(", ")}\n`);
+        }
+        else {
+            console.log(`\n  ${key} = ${JSON.stringify(value)}\n`);
+        }
+        return;
+    }
+    if (action === "set") {
+        const key = positional[2];
+        const rawValue = positional[3];
+        if (!key || !rawValue) {
+            console.log("\n  Usage: opencode-tokens config set <key> <value>\n");
+            return;
+        }
+        const spec = SETTABLE_KEYS[key];
+        if (!spec) {
+            console.log(`\n  Unknown key: ${key}\n  Available: ${Object.keys(SETTABLE_KEYS).join(", ")}\n`);
+            return;
+        }
+        const value = parseConfigValue(rawValue);
+        if (typeof value !== spec.type) {
+            console.log(`\n  Invalid type: expected ${spec.type}, got ${typeof value}\n`);
+            return;
+        }
+        if (typeof value === "number") {
+            if (value < 0) {
+                console.log(`\n  Value must be >= 0\n`);
+                return;
+            }
+            if (spec.max !== undefined && value > spec.max) {
+                console.log(`\n  Value must be <= ${spec.max}\n`);
+                return;
+            }
+        }
+        applyConfigSet(key, value, config);
+        console.log(`\n  Set ${key} = ${JSON.stringify(value)}\n`);
+        return;
+    }
+    if (action === "unset") {
+        const key = positional[2];
+        if (!key) {
+            console.log("\n  Usage: opencode-tokens config unset <key>\n");
+            return;
+        }
+        const spec = SETTABLE_KEYS[key];
+        if (!spec) {
+            console.log(`\n  Unknown key: ${key}\n  Available: ${Object.keys(SETTABLE_KEYS).join(", ")}\n`);
+            return;
+        }
+        applyConfigUnset(key, config);
+        console.log(`\n  Unset ${key} (reverted to default)\n`);
+        return;
+    }
+    if (action && action !== "show") {
+        console.log(`\n  Unknown config action: ${action}`);
+        console.log(`  Usage: opencode-tokens config [show|init|generate|get|set|unset]\n`);
+        return;
+    }
     // Show current config
     console.log(`
   Current Configuration
@@ -469,10 +609,155 @@ function cmdConfig(action) {
         console.log();
     }
     console.log(`  Commands:`);
-    console.log(`    opencode-tokens config init      Show example config with explanation`);
-    console.log(`    opencode-tokens config generate  Create config file`);
+    console.log(`    opencode-tokens config show              Show current config`);
+    console.log(`    opencode-tokens config init              Show example config with explanation`);
+    console.log(`    opencode-tokens config generate          Create config file`);
+    console.log(`    opencode-tokens config get <key>         Get a config value`);
+    console.log(`    opencode-tokens config set <key> <value> Set a config value`);
+    console.log(`    opencode-tokens config unset <key>       Reset a config value to default`);
     console.log();
 }
+const SETTABLE_KEYS = {
+    "budget.daily": { type: "number", path: ["budget", "daily"], default: undefined },
+    "budget.weekly": { type: "number", path: ["budget", "weekly"], default: undefined },
+    "budget.monthly": { type: "number", path: ["budget", "monthly"], default: undefined },
+    "budget.warnAt": { type: "number", path: ["budget", "warnAt"], default: 0.8, max: 1 },
+    "toast.enabled": { type: "boolean", path: ["toast", "enabled"], default: true },
+    "toast.duration": { type: "number", path: ["toast", "duration"], default: 3000 },
+    "toast.showOnIdle": { type: "boolean", path: ["toast", "showOnIdle"], default: true },
+};
+function parseConfigValue(s) {
+    if (s === "true")
+        return true;
+    if (s === "false")
+        return false;
+    if (s === "null")
+        return null;
+    if (/^-?\d+(\.\d+)?$/.test(s))
+        return Number(s);
+    return s;
+}
+function resolveConfigKey(config, key) {
+    const spec = SETTABLE_KEYS[key];
+    if (!spec)
+        return undefined;
+    let obj = config;
+    for (let i = 0; i < spec.path.length - 1; i++) {
+        obj = obj[spec.path[i]];
+        if (!obj)
+            return spec.default;
+    }
+    return obj[spec.path[spec.path.length - 1]] ?? spec.default;
+}
+function applyConfigSet(key, value, config) {
+    const spec = SETTABLE_KEYS[key];
+    const fullConfig = loadOrInitConfig();
+    let obj = fullConfig;
+    for (let i = 0; i < spec.path.length - 1; i++) {
+        if (!obj[spec.path[i]])
+            obj[spec.path[i]] = {};
+        obj = obj[spec.path[i]];
+    }
+    obj[spec.path[spec.path.length - 1]] = value;
+    saveConfig(fullConfig);
+}
+function applyConfigUnset(key, config) {
+    const spec = SETTABLE_KEYS[key];
+    const fullConfig = loadOrInitConfig();
+    let obj = fullConfig;
+    for (let i = 0; i < spec.path.length - 1; i++) {
+        if (!obj[spec.path[i]])
+            return;
+        obj = obj[spec.path[i]];
+    }
+    delete obj[spec.path[spec.path.length - 1]];
+    saveConfig(fullConfig);
+}
+function loadOrInitConfig() {
+    if (existsSync(CONFIG_FILE)) {
+        try {
+            return JSON.parse(readFileSync(CONFIG_FILE, "utf-8"));
+        }
+        catch { }
+    }
+    return {};
+}
+function saveConfig(raw) {
+    const dir = join(homedir(), ".config", "opencode");
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+    if (existsSync(CONFIG_FILE)) {
+        copyFileSync(CONFIG_FILE, CONFIG_FILE + ".bak");
+    }
+    writeFileSync(CONFIG_FILE, JSON.stringify(raw, null, 2) + "\n");
+}
+// ============================================================================
+// Export
+// ============================================================================
+function cmdExport(flags) {
+    const format = flagValue(flags, "format") || "csv";
+    const period = flagValue(flags, "period") || "all";
+    const outputFile = flagValue(flags, "output");
+    const now = new Date();
+    let since;
+    switch (period) {
+        case "today":
+            since = getStartOfDay(now);
+            break;
+        case "week":
+            since = getStartOfWeek(now);
+            break;
+        case "month":
+            since = getStartOfMonth(now);
+            break;
+    }
+    const entries = loadEntries(since);
+    if (entries.length === 0) {
+        console.log(`\n  No data to export for ${period}\n`);
+        return;
+    }
+    let output;
+    if (format === "json") {
+        output = JSON.stringify(entries, null, 2);
+    }
+    else {
+        const headers = ["timestamp", "date", "session_id", "message_id", "role", "agent", "model", "provider", "input", "output", "reasoning", "cache_read", "cache_write", "cost"];
+        const rows = entries.map(e => [
+            e._ts,
+            new Date(e._ts).toISOString().slice(0, 10),
+            e.sessionId ?? "",
+            e.messageId ?? "",
+            e.role ?? "",
+            e.agent ?? "",
+            e.model ?? "",
+            e.provider ?? "",
+            e.input ?? 0,
+            e.output ?? 0,
+            e.reasoning ?? 0,
+            e.cacheRead ?? 0,
+            e.cacheWrite ?? 0,
+            e.cost ?? 0,
+        ].map(csvEscape).join(","));
+        output = [headers.join(","), ...rows].join("\n") + "\n";
+    }
+    if (outputFile) {
+        writeFileSync(outputFile, output);
+        console.log(`\n  Exported ${entries.length} entries to ${outputFile}\n`);
+    }
+    else {
+        process.stdout.write(output);
+    }
+}
+function csvEscape(v) {
+    if (v == null)
+        return "";
+    const s = String(v);
+    if (/[",\n\r]/.test(s)) {
+        return `"${s.replace(/"/g, '""')}"`;
+    }
+    return s;
+}
 function cmdBudget() {
     const config = loadConfig();
     const budget = config.budget;
@@ -572,64 +857,206 @@ function cmdHelp() {
     (default)     Show usage statistics
     budget        Show budget status (daily/weekly/monthly)
     pricing       Show built-in pricing table
-    models        Show your used models and their pricing status  
-    config        Show/generate configuration
+    models        Show your used models and their pricing status
+    config        Show/generate/modify configuration
+    export        Export token data to CSV/JSON
+    trend         Show daily cost/tokens trend chart
 
   Statistics Options:
     today         Show today's usage
-    week          Show this week's usage  
+    week          Show this week's usage
     month         Show this month's usage
     all           Show all-time usage (default)
-    
-    --by <type>   Group by: model, agent, provider, daily, all
+
+    --by <type>   Group by: model, agent, provider, session, daily, all
+
+  Export Options:
+    --format      csv (default) or json
+    --period      today, week, month, all (default)
+    --output      Write to file instead of stdout
+
+  Trend Options:
+    --days N      Number of days to chart (default 30)
+    --metric      cost (default), tokens, or messages
+    --width W     Chart width in characters (default 60)
+
+  Config Sub-commands:
+    config show                  Show current config
+    config init                  Show example config with explanation
+    config generate              Create config file
+    config get <key>             Get a config value
+    config set <key> <value>     Set a config value
+    config unset <key>           Reset a config value to default
+
+  Settable config keys:
+    budget.daily, budget.weekly, budget.monthly, budget.warnAt
+    toast.enabled, toast.duration, toast.showOnIdle
 
   Examples:
-    opencode-tokens                  # All-time summary
-    opencode-tokens budget           # Check budget status
-    opencode-tokens today            # Today's summary
-    opencode-tokens week --by model  # This week, by model
-    opencode-tokens pricing          # Show pricing table
-    opencode-tokens models           # Show your models
-    opencode-tokens config init      # Generate example config
+    opencode-tokens                       # All-time summary
+    opencode-tokens today --by model      # Today by model
+    opencode-tokens week --by session     # This week by session
+    opencode-tokens trend --days 7        # 7-day cost trend
+    opencode-tokens export --format csv   # Export all data as CSV
+    opencode-tokens config set budget.daily 10  # Set daily budget to $10
+    opencode-tokens config get toast.enabled   # Check if toast is enabled
 `);
 }
 // ============================================================================
-// Main
+// Trend
 // ============================================================================
-function main() {
-    const args = process.argv.slice(2);
-    const command = args[0];
-    if (args.includes("--help") || args.includes("-h")) {
-        cmdHelp();
+function cmdTrend(flags) {
+    const days = parseInt(String(flagValue(flags, "days") ?? "30"), 10);
+    const metric = flagValue(flags, "metric") ?? "cost";
+    const width = parseInt(String(flagValue(flags, "width") ?? "60"), 10);
+    const since = getStartOfDay(new Date(Date.now() - days * 86400000));
+    const entries = loadEntries(since);
+    if (entries.length === 0) {
+        console.log(`\n  (no data in period)\n`);
         return;
     }
-    // Handle subcommands
-    if (command === "budget") {
-        cmdBudget();
-        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 });
+        }
+        const d = dayMap.get(dayStart);
+        d.cost += e.cost ?? 0;
+        d.tokens += (e.input ?? 0) + (e.output ?? 0) + (e.reasoning ?? 0);
+        d.messages += 1;
     }
-    if (command === "pricing") {
-        cmdPricing();
+    const sorted = Array.from(dayMap.entries()).sort(([a], [b]) => a - b);
+    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);
+            console.log(`\n  ${new Date(only[0]).toISOString().slice(0, 10)}: ${v}\n`);
+        }
         return;
     }
-    if (command === "models") {
-        cmdModels();
+    const values = sorted.map(([, d]) => metric === "tokens" ? d.tokens : metric === "messages" ? d.messages : d.cost);
+    const maxVal = Math.max(...values, 1);
+    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`);
         return;
     }
-    if (command === "config") {
-        cmdConfig(args[1]);
+    // 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 lines = [];
+    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)
+            : "";
+        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));
+                }
+            }
+        }
+        lines.push(line);
+    }
+    // Bottom axis
+    let axis = " ".repeat(9) + " └";
+    axis += "─".repeat(xStep * cols.length);
+    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);
+    console.log();
+    for (const l of lines)
+        console.log("  " + l);
+    console.log();
+}
+// ============================================================================
+// Main
+// ============================================================================
+function main() {
+    const args = process.argv.slice(2);
+    const parsed = parseArgs(args);
+    if (parsed.flags.has("help")) {
+        cmdHelp();
         return;
     }
-    // Parse stats arguments
+    const { command } = parsed;
+    switch (command) {
+        case "budget":
+            cmdBudget();
+            return;
+        case "pricing":
+            cmdPricing();
+            return;
+        case "models":
+            cmdModels();
+            return;
+        case "config":
+            cmdConfig(parsed.positional);
+            return;
+        case "export":
+            cmdExport(parsed.flags);
+            return;
+        case "trend":
+            cmdTrend(parsed.flags);
+            return;
+    }
+    // Default: stats
     let period = "all";
     let breakdown;
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        if (arg === "--by" || arg === "-b") {
-            breakdown = args[++i];
-        }
-        else if (["today", "week", "month", "all"].includes(arg)) {
-            period = arg;
+    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;
+            break;
         }
     }
     cmdStats(period, breakdown);

package/dist/index.js

@@ -58,8 +58,8 @@ function getModelPricing(model, provider) {
     if (config.providers[provider]) {
         return config.providers[provider];
     }
-    // 2. Check user-defined model pricing
-    const configuredPricing = findModelConfigPricing(config.models, model, provider);
+    // 2. Check user-defined model pricing (exact match only)
+    const configuredPricing = findModelConfigPricing(config.models, model, provider, false);
     if (configuredPricing) {
         return configuredPricing;
     }
@@ -69,12 +69,17 @@ function getModelPricing(model, provider) {
     }
     // 4. Try partial match in built-in pricing
     const modelLower = model.toLowerCase();
-    for (const [key, pricing] of Object.entries(BUILTIN_PRICING)) {
+    for (const [key, pricing] of Object.entries(BUILTIN_PRICING).sort(([a], [b]) => b.length - a.length)) {
         if (key !== "_default" && modelLower.includes(key.toLowerCase())) {
             return pricing;
         }
     }
-    // 5. Fallback to default
+    // 5. Try partial match in user config
+    const partialUserPricing = findModelConfigPricing(config.models, model, provider, true);
+    if (partialUserPricing) {
+        return partialUserPricing;
+    }
+    // 6. Fallback to default
     return BUILTIN_PRICING["_default"];
 }
 export function getProviderFamily(model, provider) {

package/dist/lib/shared.d.ts

@@ -45,4 +45,4 @@ export interface ConfigValidationResult {
  * Invalid fields are silently corrected to defaults with warnings.
  */
 export declare function validateConfig(raw: unknown): ConfigValidationResult;
-export declare function findModelConfigPricing(models: TrackerConfig["models"], model: string, provider: string): ModelPricing | undefined;
+export declare function findModelConfigPricing(models: TrackerConfig["models"], model: string, provider: string, partial?: boolean): ModelPricing | undefined;

package/dist/lib/shared.js

@@ -174,6 +174,12 @@ function validatePricingMap(raw, section, warnings, allowProviderModels = false)
             warnings.push(`${entryPath} should be a pricing object, ignoring`);
             continue;
         }
+        // If the structure looks like flat pricing (has pricing field keys),
+        // don't fall through to nested provider pricing — validatePricingObject
+        // already issued the relevant warning for malformed flat pricing.
+        if (hasFlatPricingStructure(value)) {
+            continue;
+        }
         const providerPricing = validateNestedPricingMap(value, entryPath, warnings);
         if (Object.keys(providerPricing).length > 0) {
             result[key] = providerPricing;
@@ -246,11 +252,7 @@ function isPlainObject(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isDirectModelPricing(value) {
-    return hasFlatPricingStructure(value)
-        && isFiniteNumber(value.input)
-        && isFiniteNumber(value.output)
-        && (value.cacheRead === undefined || isFiniteNumber(value.cacheRead))
-        && (value.cacheWrite === undefined || isFiniteNumber(value.cacheWrite));
+    return hasFlatPricingStructure(value);
 }
 function resolveModelConfigEntry(entry, provider) {
     if (!entry)
@@ -259,13 +261,17 @@ function resolveModelConfigEntry(entry, provider) {
         return entry;
     return entry[provider];
 }
-export function findModelConfigPricing(models, model, provider) {
+export function findModelConfigPricing(models, model, provider, partial = true) {
     const exactMatch = resolveModelConfigEntry(models[model], provider);
     if (exactMatch) {
         return exactMatch;
     }
+    if (!partial)
+        return undefined;
     const modelLower = model.toLowerCase();
-    for (const [key, entry] of Object.entries(models)) {
+    // Sort by key length descending so longer (more specific) keys are checked first
+    const sorted = Object.entries(models).sort(([a], [b]) => b.length - a.length);
+    for (const [key, entry] of sorted) {
         if (modelLower.includes(key.toLowerCase())) {
             const partialMatch = resolveModelConfigEntry(entry, provider);
             if (partialMatch) {

package/dist/test/cli.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/cli.test.js

@@ -0,0 +1,55 @@
+import { describe, it } from "node:test";
+import { strict as assert } from "node:assert";
+import { execSync } from "child_process";
+import { fileURLToPath } from "url";
+import { join, dirname } from "path";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const CLI = join(__dirname, "..", "bin", "opencode-tokens.js");
+function run(args) {
+    return execSync(`node ${CLI} ${args}`, { encoding: "utf-8", timeout: 10000 });
+}
+describe("CLI help and stats", () => {
+    it("should show help", () => {
+        const out = run("--help");
+        assert.ok(out.includes("opencode-tokens - Token usage statistics CLI"));
+        assert.ok(out.includes("trend"));
+        assert.ok(out.includes("export"));
+        assert.ok(out.includes("config set"));
+    });
+    it("should show stats by session", () => {
+        const out = run("--by session");
+        assert.ok(out.includes("By Session") || out.includes("No data"));
+    });
+    it("should show budget", () => {
+        const out = run("budget");
+        assert.ok(out.includes("Budget Status"));
+    });
+});
+describe("CLI config", () => {
+    it("should set, get, and unset config value", () => {
+        run("config set toast.duration 5000");
+        const out = run("config get toast.duration");
+        assert.ok(out.includes("5000"));
+        run("config unset toast.duration");
+    });
+    it("should reject unknown config key", () => {
+        const out = run("config get nonexistent.key");
+        assert.ok(out.includes("Unknown key"));
+    });
+});
+describe("CLI export", () => {
+    it("should export as CSV", () => {
+        const out = run("export --format csv --period today");
+        assert.ok(out.includes("timestamp") || out.includes("No data"));
+    });
+    it("should export as JSON", () => {
+        const out = run("export --format json --period today");
+        assert.ok(out.startsWith("[") || out.includes("No data"));
+    });
+});
+describe("CLI trend", () => {
+    it("should show trend chart", () => {
+        const out = run("trend --days 7");
+        assert.ok(out.includes("┤") || out.includes("(no data"));
+    });
+});

package/dist/test/shared.test.js

@@ -237,6 +237,16 @@ describe("validateConfig", () => {
         assert.equal(result.config.models["not-object"], undefined);
         assert.ok(result.warnings.length >= 4);
     });
+    it("should produce one clear warning for malformed flat pricing (not nested fallthrough noise)", () => {
+        const result = validateConfig({
+            models: {
+                "my-model": { input: "free", output: 2 },
+            },
+        });
+        assert.equal(result.config.models["my-model"], undefined);
+        assert.equal(result.warnings.length, 1);
+        assert.ok(result.warnings[0].includes("input should be a non-negative number"));
+    });
     it("should warn and ignore invalid cacheRead/cacheWrite but keep entry", () => {
         const result = validateConfig({
             models: {
@@ -376,6 +386,40 @@ describe("findModelConfigPricing", () => {
         });
         assert.deepEqual(findModelConfigPricing(result.config.models, "prefix/my-model", "any-provider"), { input: 1, output: 2 });
     });
+    it("should prefer longer key over shorter key in partial matches (longest-first)", () => {
+        const result = validateConfig({
+            models: {
+                "gpt-4.1": { input: 3, output: 12 },
+                "gpt-4.1-mini": { input: 0.8, output: 3.2 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "gpt-4.1-mini-2025", "openai"), { input: 0.8, output: 3.2 });
+    });
+    it("should prefer longer key regardless of insertion order (longest-first)", () => {
+        const result = validateConfig({
+            models: {
+                "gpt-4.1-mini": { input: 0.8, output: 3.2 },
+                "gpt-4.1": { input: 3, output: 12 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "gpt-4.1-mini-2025", "openai"), { input: 0.8, output: 3.2 });
+    });
+    it("should not match partial keys when partial=false (exact-only mode)", () => {
+        const result = validateConfig({
+            models: {
+                "claude": { input: 0, output: 0 },
+            },
+        });
+        assert.equal(findModelConfigPricing(result.config.models, "claude-opus-4.6", "anthropic", false), undefined);
+    });
+    it("should match partial keys when partial=true (backward compatible)", () => {
+        const result = validateConfig({
+            models: {
+                "claude": { input: 0, output: 0 },
+            },
+        });
+        assert.deepEqual(findModelConfigPricing(result.config.models, "claude-opus-4.6", "anthropic", true), { input: 0, output: 0 });
+    });
 });
 // ============================================================================
 // getProviderFamily
@@ -455,3 +499,38 @@ describe("calculateCost", () => {
         assert.ok(Math.abs(costFallback - 4.91) < 0.0001, `expected 4.91, got ${costFallback}`);
     });
 });
+// ============================================================================
+// calculateCost partial match — longest-key-first regression
+// ============================================================================
+describe("calculateCost partial match (longest-key-first)", () => {
+    it("should match gpt-4o-mini over gpt-4o for variant model name", () => {
+        // gpt-4o-mini-2024-07-18 should match gpt-4o-mini ($0.15/$0.6), not gpt-4o ($2.5/$10)
+        const cost = calculateCost("gpt-4o-mini-2024-07-18", "openai", 1_000_000, 1_000_000);
+        // Expected: input 0.15 + output 0.6 = 0.75 (no cache in this test)
+        assert.ok(Math.abs(cost - 0.75) < 0.001, `expected 0.75, got ${cost}`);
+    });
+    it("should match o3-mini over o3 for variant model name", () => {
+        // o3-mini-high should match o3-mini ($1.1/$4.4), not o3 ($10/$40)
+        const cost = calculateCost("o3-mini-high", "openai", 1_000_000, 1_000_000);
+        // Expected: input 1.1 + output 4.4 = 5.5
+        assert.ok(Math.abs(cost - 5.5) < 0.001, `expected 5.5, got ${cost}`);
+    });
+    it("should match gemini-2.5-flash-lite over gemini-2.5-flash for variant model name", () => {
+        // gemini-2.5-flash-lite-preview should match gemini-2.5-flash-lite ($0.1/$0.4), not gemini-2.5-flash ($0.3/$2.5)
+        const cost = calculateCost("gemini-2.5-flash-lite-preview", "google", 1_000_000, 1_000_000);
+        // Expected: input 0.1 + output 0.4 = 0.5
+        assert.ok(Math.abs(cost - 0.5) < 0.001, `expected 0.5, got ${cost}`);
+    });
+    it("should match gpt-5.2-pro over gpt-5.2 for variant model name", () => {
+        // gpt-5.2-pro-2025 should match gpt-5.2-pro ($21/$168), not gpt-5.2 ($1.75/$14)
+        const cost = calculateCost("gpt-5.2-pro-2025", "openai", 1_000_000, 1_000_000);
+        // Expected: input 21 + output 168 = 189
+        assert.ok(Math.abs(cost - 189) < 0.01, `expected 189, got ${cost}`);
+    });
+    it("should match o1-mini over o1 for variant model name", () => {
+        // o1-mini-high should match o1-mini ($1.1/$4.4), not o1 ($15/$60)
+        const cost = calculateCost("o1-mini-high", "openai", 1_000_000, 1_000_000);
+        // Expected: input 1.1 + output 4.4 = 5.5
+        assert.ok(Math.abs(cost - 5.5) < 0.001, `expected 5.5, got ${cost}`);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-token-tracker",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "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",
@@ -8,6 +8,11 @@
   "bin": {
     "opencode-tokens": "dist/bin/opencode-tokens.js"
   },
+  "scripts": {
+    "build": "tsc",
+    "test": "tsc && node --test dist/test/shared.test.js dist/test/cli.test.js",
+    "prepublishOnly": "npm run build"
+  },
   "keywords": [
     "opencode",
     "plugin",
@@ -46,9 +51,5 @@
   ],
   "engines": {
     "node": ">=18.0.0"
-  },
-  "scripts": {
-    "build": "tsc",
-    "test": "tsc && node --test dist/test/shared.test.js"
   }
-}
+}