tokenleak 0.5.0 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenleak",
-  "version": "0.5.0",
+  "version": "1.0.0",
   "description": "Visualise your AI coding-assistant token usage across providers — heatmaps, dashboards, and shareable cards.",
   "type": "module",
   "bin": {

package/tokenleak.js

@@ -663,6 +663,26 @@ function computeTotalDays(daily) {
   return Math.round((last - first) / ONE_DAY_MS) + 1;
 }
 // packages/core/dist/aggregation/merge.js
+function mergeModelArrays(existing, incoming) {
+  const map = new Map;
+  for (const m of existing) {
+    map.set(m.model, { ...m });
+  }
+  for (const m of incoming) {
+    const prev = map.get(m.model);
+    if (prev) {
+      prev.inputTokens += m.inputTokens;
+      prev.outputTokens += m.outputTokens;
+      prev.cacheReadTokens += m.cacheReadTokens;
+      prev.cacheWriteTokens += m.cacheWriteTokens;
+      prev.totalTokens += m.totalTokens;
+      prev.cost += m.cost;
+    } else {
+      map.set(m.model, { ...m });
+    }
+  }
+  return [...map.values()];
+}
 function mergeProviderData(providers) {
   const dateMap = new Map;
   for (const provider of providers) {
@@ -675,7 +695,7 @@ function mergeProviderData(providers) {
         existing.cacheWriteTokens += entry.cacheWriteTokens;
         existing.totalTokens += entry.totalTokens;
         existing.cost += entry.cost;
-        existing.models = [...existing.models, ...entry.models];
+        existing.models = mergeModelArrays(existing.models, entry.models);
       } else {
         dateMap.set(entry.date, {
           date: entry.date,
@@ -736,7 +756,7 @@ function computePreviousPeriod(current) {
   };
 }
 // packages/core/dist/index.js
-var VERSION = "0.5.0";
+var VERSION = "1.0.0";
 
 // packages/registry/dist/models/normalizer.js
 var DATE_SUFFIX_PATTERN = /-\d{8}$/;
@@ -1361,8 +1381,17 @@ function buildProviderData(records) {
   };
 }
 function loadFromSqlite(dbPath, range) {
-  const db = new Database(dbPath, { readonly: true });
+  let db;
+  try {
+    db = new Database(dbPath, { readonly: true });
+  } catch {
+    return [];
+  }
   try {
+    const tables = db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='messages'").all();
+    if (tables.length === 0) {
+      return [];
+    }
     const rows = db.query("SELECT model, input_tokens, output_tokens, created_at FROM messages WHERE role = 'assistant'").all();
     const records = [];
     for (const row of rows) {
@@ -1377,6 +1406,8 @@ function loadFromSqlite(dbPath, range) {
       }
     }
     return records;
+  } catch {
+    return [];
   } finally {
     db.close();
   }
@@ -1385,24 +1416,28 @@ function loadFromJson(sessionsDir, range) {
   const files = readdirSync3(sessionsDir).filter((f) => f.endsWith(".json"));
   const records = [];
   for (const file of files) {
-    const content = readFileSync(join3(sessionsDir, file), "utf-8");
-    const session = JSON.parse(content);
-    if (!Array.isArray(session.messages)) {
-      continue;
-    }
-    for (const msg of session.messages) {
-      if (msg.role !== "assistant" || !msg.usage) {
+    try {
+      const content = readFileSync(join3(sessionsDir, file), "utf-8");
+      const session = JSON.parse(content);
+      if (!Array.isArray(session.messages)) {
         continue;
       }
-      const date = extractDate2(msg.created_at);
-      if (isInRange(date, range)) {
-        records.push({
-          date,
-          model: msg.model,
-          inputTokens: msg.usage.input_tokens,
-          outputTokens: msg.usage.output_tokens
-        });
+      for (const msg of session.messages) {
+        if (msg.role !== "assistant" || !msg.usage) {
+          continue;
+        }
+        const date = extractDate2(msg.created_at);
+        if (isInRange(date, range)) {
+          records.push({
+            date,
+            model: msg.model,
+            inputTokens: msg.usage.input_tokens,
+            outputTokens: msg.usage.output_tokens
+          });
+        }
       }
+    } catch {
+      continue;
     }
   }
   return records;
@@ -3063,8 +3098,21 @@ function inferFormatFromPath(filePath) {
       return null;
   }
 }
+var DATE_FORMAT = /^\d{4}-\d{2}-\d{2}$/;
+function isValidDate(dateStr) {
+  if (!DATE_FORMAT.test(dateStr))
+    return false;
+  const d = new Date(dateStr + "T00:00:00Z");
+  return !Number.isNaN(d.getTime()) && d.toISOString().slice(0, 10) === dateStr;
+}
 function computeDateRange(args) {
   const until = args.until ?? new Date().toISOString().slice(0, 10);
+  if (args.until && !isValidDate(args.until)) {
+    throw new TokenleakError(`Invalid --until date: "${args.until}". Use YYYY-MM-DD format.`);
+  }
+  if (args.since && !isValidDate(args.since)) {
+    throw new TokenleakError(`Invalid --since date: "${args.since}". Use YYYY-MM-DD format.`);
+  }
   let since;
   if (args.since) {
     since = args.since;
@@ -3074,6 +3122,9 @@ function computeDateRange(args) {
     d.setDate(d.getDate() - daysBack);
     since = d.toISOString().slice(0, 10);
   }
+  if (since > until) {
+    throw new TokenleakError(`--since (${since}) must not be after --until (${until}).`);
+  }
   return { since, until };
 }
 function resolveConfig(cliArgs) {
@@ -3230,6 +3281,10 @@ async function run(cliArgs) {
     throw new TokenleakError("No provider data found");
   }
   if (config.compare) {
+    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);
     if (config.output) {
@@ -3261,6 +3316,19 @@ async function run(cliArgs) {
     aggregated: stats
   };
   if (config.liveServer) {
+    const ignoredFlags = [];
+    if (config.output)
+      ignoredFlags.push("--output");
+    if (config.clipboard)
+      ignoredFlags.push("--clipboard");
+    if (config.open)
+      ignoredFlags.push("--open");
+    if (config.upload)
+      ignoredFlags.push("--upload");
+    if (ignoredFlags.length > 0) {
+      process.stderr.write(`Warning: ${ignoredFlags.join(", ")} ignored in --live-server mode.
+`);
+    }
     const renderOptions2 = {
       format: config.format,
       theme: config.theme,