claude-usage-dashboard 1.3.4 → 1.3.6

package/server/parser.js

@@ -1,109 +1,109 @@
-import fs from 'fs';
-import path from 'path';
-
-export function deriveProjectName(dirName) {
-  // Strip drive prefix like "C--" at the start
-  const clean = dirName.replace(/^[A-Za-z]--/, '');
-
-  // Known parent directory markers (case-insensitive search)
-  // Match the last occurrence of common parent dirs to get the project folder name
-  const lower = clean.toLowerCase();
-  const markers = ['-workspace-', '-projects-', '-repos-', '-src-', '-home-', '-desktop-', '-documents-', '-downloads-'];
-  let bestIdx = -1;
-  let bestLen = 0;
-  for (const m of markers) {
-    const idx = lower.lastIndexOf(m);
-    if (idx > bestIdx) {
-      bestIdx = idx;
-      bestLen = m.length;
-    }
-  }
-  if (bestIdx !== -1) {
-    const result = clean.slice(bestIdx + bestLen);
-    // Handle worktree subdirs: "project--claude-worktrees-branch-name" → "project"
-    const wtIdx = result.indexOf('--claude-worktrees');
-    return wtIdx !== -1 ? result.slice(0, wtIdx) : result;
-  }
-
-  // Fallback: strip Users-username prefix, return the rest
-  const userMatch = clean.match(/^Users-[^-]+-(.+)$/);
-  if (userMatch) {
-    const rest = userMatch[1];
-    const wtIdx = rest.indexOf('--claude-worktrees');
-    return wtIdx !== -1 ? rest.slice(0, wtIdx) : rest;
-  }
-
-  return clean;
-}
-
-export function parseLogFile(filePath) {
-  const content = fs.readFileSync(filePath, 'utf-8');
-  const lines = content.split('\n').filter(line => line.trim());
-  const records = [];
-
-  for (const line of lines) {
-    let entry;
-    try {
-      entry = JSON.parse(line);
-    } catch {
-      continue;
-    }
-
-    if (entry.type !== 'assistant') continue;
-
-    const model = entry.message?.model;
-    if (!model || model === '<synthetic>') continue;
-
-    const usage = entry.message?.usage;
-    if (!usage) continue;
-
-    records.push({
-      sessionId: entry.sessionId,
-      timestamp: entry.timestamp,
-      model,
-      input_tokens: usage.input_tokens || 0,
-      output_tokens: usage.output_tokens || 0,
-      cache_creation_tokens: usage.cache_creation_input_tokens || 0,
-      cache_read_tokens: usage.cache_read_input_tokens || 0,
-    });
-  }
-
-  return records;
-}
-
-export function parseLogDirectory(baseDir) {
-  const allRecords = [];
-
-  let projectDirs;
-  try {
-    projectDirs = fs.readdirSync(baseDir, { withFileTypes: true })
-      .filter(d => d.isDirectory());
-  } catch {
-    return allRecords;
-  }
-
-  for (const dir of projectDirs) {
-    const projectName = deriveProjectName(dir.name);
-    const projectPath = path.join(baseDir, dir.name);
-
-    let files;
-    try {
-      files = fs.readdirSync(projectPath)
-        .filter(f => f.endsWith('.jsonl'));
-    } catch {
-      continue;
-    }
-
-    for (const file of files) {
-      const filePath = path.join(projectPath, file);
-      const records = parseLogFile(filePath);
-      for (const record of records) {
-        record.project = projectName;
-        record.projectDirName = dir.name;
-      }
-      allRecords.push(...records);
-    }
-  }
-
-  return allRecords;
-}
+import fs from 'fs';
+import path from 'path';
+
+export function deriveProjectName(dirName) {
+  // Strip drive prefix like "C--" at the start
+  const clean = dirName.replace(/^[A-Za-z]--/, '');
+
+  // Known parent directory markers (case-insensitive search)
+  // Match the last occurrence of common parent dirs to get the project folder name
+  const lower = clean.toLowerCase();
+  const markers = ['-workspace-', '-projects-', '-repos-', '-src-', '-home-', '-desktop-', '-documents-', '-downloads-'];
+  let bestIdx = -1;
+  let bestLen = 0;
+  for (const m of markers) {
+    const idx = lower.lastIndexOf(m);
+    if (idx > bestIdx) {
+      bestIdx = idx;
+      bestLen = m.length;
+    }
+  }
+  if (bestIdx !== -1) {
+    const result = clean.slice(bestIdx + bestLen);
+    // Handle worktree subdirs: "project--claude-worktrees-branch-name" → "project"
+    const wtIdx = result.indexOf('--claude-worktrees');
+    return wtIdx !== -1 ? result.slice(0, wtIdx) : result;
+  }
+
+  // Fallback: strip Users-username prefix, return the rest
+  const userMatch = clean.match(/^Users-[^-]+-(.+)$/);
+  if (userMatch) {
+    const rest = userMatch[1];
+    const wtIdx = rest.indexOf('--claude-worktrees');
+    return wtIdx !== -1 ? rest.slice(0, wtIdx) : rest;
+  }
+
+  return clean;
+}
+
+export function parseLogFile(filePath) {
+  const content = fs.readFileSync(filePath, 'utf-8');
+  const lines = content.split('\n').filter(line => line.trim());
+  const records = [];
+
+  for (const line of lines) {
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      continue;
+    }
+
+    if (entry.type !== 'assistant') continue;
+
+    const model = entry.message?.model;
+    if (!model || model === '<synthetic>') continue;
+
+    const usage = entry.message?.usage;
+    if (!usage) continue;
+
+    records.push({
+      sessionId: entry.sessionId,
+      timestamp: entry.timestamp,
+      model,
+      input_tokens: usage.input_tokens || 0,
+      output_tokens: usage.output_tokens || 0,
+      cache_creation_tokens: usage.cache_creation_input_tokens || 0,
+      cache_read_tokens: usage.cache_read_input_tokens || 0,
+    });
+  }
+
+  return records;
+}
+
+export function parseLogDirectory(baseDir) {
+  const allRecords = [];
+
+  let projectDirs;
+  try {
+    projectDirs = fs.readdirSync(baseDir, { withFileTypes: true })
+      .filter(d => d.isDirectory());
+  } catch {
+    return allRecords;
+  }
+
+  for (const dir of projectDirs) {
+    const projectName = deriveProjectName(dir.name);
+    const projectPath = path.join(baseDir, dir.name);
+
+    let files;
+    try {
+      files = fs.readdirSync(projectPath)
+        .filter(f => f.endsWith('.jsonl'));
+    } catch {
+      continue;
+    }
+
+    for (const file of files) {
+      const filePath = path.join(projectPath, file);
+      const records = parseLogFile(filePath);
+      for (const record of records) {
+        record.project = projectName;
+        record.projectDirName = dir.name;
+      }
+      allRecords.push(...records);
+    }
+  }
+
+  return allRecords;
+}

package/server/pricing.js

@@ -1,52 +1,52 @@
-export const MODEL_PRICING = {
-  'claude-opus-4-6': {
-    input_price_per_mtok: 5,
-    output_price_per_mtok: 25,
-    cache_read_price_per_mtok: 0.50,
-    cache_creation_price_per_mtok: 6.25,
-  },
-  'claude-sonnet-4-6': {
-    input_price_per_mtok: 3,
-    output_price_per_mtok: 15,
-    cache_read_price_per_mtok: 0.30,
-    cache_creation_price_per_mtok: 3.75,
-  },
-  'claude-haiku-4-5': {
-    input_price_per_mtok: 1,
-    output_price_per_mtok: 5,
-    cache_read_price_per_mtok: 0.10,
-    cache_creation_price_per_mtok: 1.25,
-  },
-};
-
-export const PLAN_DEFAULTS = {
-  pro: 20,
-  max5x: 100,
-  max20x: 200,
-};
-
-export function getModelPricing(modelId) {
-  return MODEL_PRICING[modelId] || null;
-}
-
-/**
- * Calculate the API cost for a single usage record.
- * Returns 0 for unknown models.
- *
- * In Claude Code logs, input_tokens is the non-cached input.
- * cache_read_tokens and cache_creation_tokens are separate, additive fields.
- * cost = input * input_rate + cache_read * read_rate + cache_creation * write_rate + output * output_rate
- */
-export function calculateRecordCost(record) {
-  const pricing = MODEL_PRICING[record.model];
-  if (!pricing) return 0;
-
-  const M = 1_000_000;
-
-  return (
-    (record.input_tokens / M) * pricing.input_price_per_mtok +
-    (record.cache_read_tokens / M) * pricing.cache_read_price_per_mtok +
-    (record.cache_creation_tokens / M) * pricing.cache_creation_price_per_mtok +
-    (record.output_tokens / M) * pricing.output_price_per_mtok
-  );
-}
+export const MODEL_PRICING = {
+  'claude-opus-4-6': {
+    input_price_per_mtok: 5,
+    output_price_per_mtok: 25,
+    cache_read_price_per_mtok: 0.50,
+    cache_creation_price_per_mtok: 6.25,
+  },
+  'claude-sonnet-4-6': {
+    input_price_per_mtok: 3,
+    output_price_per_mtok: 15,
+    cache_read_price_per_mtok: 0.30,
+    cache_creation_price_per_mtok: 3.75,
+  },
+  'claude-haiku-4-5': {
+    input_price_per_mtok: 1,
+    output_price_per_mtok: 5,
+    cache_read_price_per_mtok: 0.10,
+    cache_creation_price_per_mtok: 1.25,
+  },
+};
+
+export const PLAN_DEFAULTS = {
+  pro: 20,
+  max5x: 100,
+  max20x: 200,
+};
+
+export function getModelPricing(modelId) {
+  return MODEL_PRICING[modelId] || null;
+}
+
+/**
+ * Calculate the API cost for a single usage record.
+ * Returns 0 for unknown models.
+ *
+ * In Claude Code logs, input_tokens is the non-cached input.
+ * cache_read_tokens and cache_creation_tokens are separate, additive fields.
+ * cost = input * input_rate + cache_read * read_rate + cache_creation * write_rate + output * output_rate
+ */
+export function calculateRecordCost(record) {
+  const pricing = MODEL_PRICING[record.model];
+  if (!pricing) return 0;
+
+  const M = 1_000_000;
+
+  return (
+    (record.input_tokens / M) * pricing.input_price_per_mtok +
+    (record.cache_read_tokens / M) * pricing.cache_read_price_per_mtok +
+    (record.cache_creation_tokens / M) * pricing.cache_creation_price_per_mtok +
+    (record.output_tokens / M) * pricing.output_price_per_mtok
+  );
+}

package/server/routes/api.js

@@ -1,127 +1,127 @@
-import { Router } from 'express';
-import { parseLogDirectory } from '../parser.js';
-import { filterByDateRange, autoGranularity, aggregateByTime, aggregateBySession, aggregateByProject, aggregateByModel, aggregateCache } from '../aggregator.js';
-import { calculateRecordCost, PLAN_DEFAULTS } from '../pricing.js';
-import { createQuotaFetcher } from '../quota.js';
-import { getSubscriptionInfo } from '../credentials.js';
-
-export function createApiRouter(logBaseDir, options = {}) {
-  const router = Router();
-  const CACHE_TTL_MS = options.cacheTtlMs || 5000;
-  let cachedRecords = [];
-  let lastRefreshed = null;
-
-  function refreshRecords() {
-    const now = Date.now();
-    if (lastRefreshed && (now - lastRefreshed) < CACHE_TTL_MS) return cachedRecords;
-    try {
-      cachedRecords = parseLogDirectory(logBaseDir);
-      lastRefreshed = now;
-      console.log(`Parsed ${cachedRecords.length} records from ${logBaseDir}`);
-    } catch (err) {
-      console.error('Failed to parse log directory:', err.message);
-      // Keep stale data on failure
-      if (!lastRefreshed) lastRefreshed = now;
-    }
-    return cachedRecords;
-  }
-
-  // Initial parse
-  refreshRecords();
-
-  function applyFilters(query) {
-    let records = filterByDateRange(refreshRecords(), query.from, query.to);
-    if (query.project) records = records.filter(r => r.project === query.project);
-    if (query.model) records = records.filter(r => r.model === query.model);
-    return records;
-  }
-
-  router.get('/usage', (req, res) => {
-    try {
-      const records = applyFilters(req.query);
-      const granularity = req.query.granularity || autoGranularity(req.query.from, req.query.to);
-      const buckets = aggregateByTime(records, granularity);
-      const total = { input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, cache_creation_tokens: 0, estimated_api_cost_usd: 0 };
-      for (const r of records) {
-        total.input_tokens += r.input_tokens; total.output_tokens += r.output_tokens;
-        total.cache_read_tokens += r.cache_read_tokens; total.cache_creation_tokens += r.cache_creation_tokens;
-        total.estimated_api_cost_usd += calculateRecordCost(r);
-      }
-      total.estimated_api_cost_usd = Math.round(total.estimated_api_cost_usd * 100) / 100;
-      res.json({ granularity, buckets, total });
-    } catch (err) {
-      res.status(500).json({ error: err.message, code: 'PARSE_ERROR' });
-    }
-  });
-
-  router.get('/models', (req, res) => { res.json({ models: aggregateByModel(applyFilters(req.query)) }); });
-  router.get('/projects', (req, res) => { res.json({ projects: aggregateByProject(applyFilters(req.query)) }); });
-
-  router.get('/sessions', (req, res) => {
-    const records = applyFilters(req.query);
-    let sessions = aggregateBySession(records);
-    const sort = req.query.sort || 'date';
-    const order = req.query.order || 'desc';
-    const sortFn = { date: (a, b) => new Date(b.startTime) - new Date(a.startTime), cost: (a, b) => b.estimated_cost_usd - a.estimated_cost_usd, tokens: (a, b) => b.total_tokens - a.total_tokens }[sort] || ((a, b) => new Date(b.startTime) - new Date(a.startTime));
-    sessions.sort(sortFn);
-    if (order === 'asc') sessions.reverse();
-    const totalTokens = sessions.reduce((sum, s) => sum + s.total_tokens, 0);
-    const totalCost = sessions.reduce((sum, s) => sum + s.estimated_cost_usd, 0);
-    const page = parseInt(req.query.page) || 1;
-    const limit = parseInt(req.query.limit) || 20;
-    const totalSessions = sessions.length;
-    const totalPages = Math.ceil(totalSessions / limit);
-    sessions = sessions.slice((page - 1) * limit, page * limit);
-    res.json({ sessions, pagination: { page, limit, total_sessions: totalSessions, total_pages: totalPages }, totals: { total_tokens: totalTokens, estimated_cost_usd: Math.round(totalCost * 100) / 100 } });
-  });
-
-  router.get('/cost', (req, res) => {
-    const records = applyFilters(req.query);
-    const plan = req.query.plan || 'max5x';
-    const customPrice = req.query.customPrice ? parseFloat(req.query.customPrice) : null;
-    const subscriptionCost = customPrice || PLAN_DEFAULTS[plan] || 100;
-    let apiCost = 0;
-    for (const r of records) apiCost += calculateRecordCost(r);
-    apiCost = Math.round(apiCost * 100) / 100;
-    const dayMap = new Map();
-    for (const r of records) {
-      const d = new Date(r.timestamp);
-      const day = `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')}`;
-      dayMap.set(day, (dayMap.get(day) || 0) + calculateRecordCost(r));
-    }
-    const costPerDay = Array.from(dayMap.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([date, cost]) => {
-      const d = new Date(date);
-      const daysInMonth = new Date(d.getUTCFullYear(), d.getUTCMonth() + 1, 0).getUTCDate();
-      return { date, api_cost: Math.round(cost * 100) / 100, subscription_daily: Math.round((subscriptionCost / daysInMonth) * 100) / 100 };
-    });
-    const savings = apiCost - subscriptionCost;
-    res.json({ plan, subscription_cost_usd: subscriptionCost, api_equivalent_cost_usd: apiCost, savings_usd: Math.round(savings * 100) / 100, savings_percent: apiCost > 0 ? Math.round((savings / apiCost) * 1000) / 10 : 0, cost_per_day: costPerDay });
-  });
-
-  router.get('/cache', (req, res) => { res.json(aggregateCache(applyFilters(req.query))); });
-
-  const quotaFetcher = options.quotaFetcher || createQuotaFetcher();
-  router.get('/quota', async (req, res) => {
-    try {
-      const data = await quotaFetcher.fetchQuota();
-      res.json(data);
-    } catch (err) {
-      res.json({ available: false, error: err.message });
-    }
-  });
-
-  router.get('/subscription', (req, res) => {
-    const info = options.getSubscriptionInfo ? options.getSubscriptionInfo() : getSubscriptionInfo();
-    res.json(info || { plan: null, subscriptionType: null, rateLimitTier: null });
-  });
-
-  router.get('/status', (req, res) => {
-    res.json({
-      record_count: cachedRecords.length,
-      last_refreshed: lastRefreshed ? new Date(lastRefreshed).toISOString() : null,
-      cache_ttl_ms: CACHE_TTL_MS,
-    });
-  });
-
-  return router;
-}
+import { Router } from 'express';
+import { parseLogDirectory } from '../parser.js';
+import { filterByDateRange, autoGranularity, aggregateByTime, aggregateBySession, aggregateByProject, aggregateByModel, aggregateCache } from '../aggregator.js';
+import { calculateRecordCost, PLAN_DEFAULTS } from '../pricing.js';
+import { createQuotaFetcher } from '../quota.js';
+import { getSubscriptionInfo } from '../credentials.js';
+
+export function createApiRouter(logBaseDir, options = {}) {
+  const router = Router();
+  const CACHE_TTL_MS = options.cacheTtlMs || 5000;
+  let cachedRecords = [];
+  let lastRefreshed = null;
+
+  function refreshRecords() {
+    const now = Date.now();
+    if (lastRefreshed && (now - lastRefreshed) < CACHE_TTL_MS) return cachedRecords;
+    try {
+      cachedRecords = parseLogDirectory(logBaseDir);
+      lastRefreshed = now;
+      console.log(`Parsed ${cachedRecords.length} records from ${logBaseDir}`);
+    } catch (err) {
+      console.error('Failed to parse log directory:', err.message);
+      // Keep stale data on failure
+      if (!lastRefreshed) lastRefreshed = now;
+    }
+    return cachedRecords;
+  }
+
+  // Initial parse
+  refreshRecords();
+
+  function applyFilters(query) {
+    let records = filterByDateRange(refreshRecords(), query.from, query.to);
+    if (query.project) records = records.filter(r => r.project === query.project);
+    if (query.model) records = records.filter(r => r.model === query.model);
+    return records;
+  }
+
+  router.get('/usage', (req, res) => {
+    try {
+      const records = applyFilters(req.query);
+      const granularity = req.query.granularity || autoGranularity(req.query.from, req.query.to);
+      const buckets = aggregateByTime(records, granularity);
+      const total = { input_tokens: 0, output_tokens: 0, cache_read_tokens: 0, cache_creation_tokens: 0, estimated_api_cost_usd: 0 };
+      for (const r of records) {
+        total.input_tokens += r.input_tokens; total.output_tokens += r.output_tokens;
+        total.cache_read_tokens += r.cache_read_tokens; total.cache_creation_tokens += r.cache_creation_tokens;
+        total.estimated_api_cost_usd += calculateRecordCost(r);
+      }
+      total.estimated_api_cost_usd = Math.round(total.estimated_api_cost_usd * 100) / 100;
+      res.json({ granularity, buckets, total });
+    } catch (err) {
+      res.status(500).json({ error: err.message, code: 'PARSE_ERROR' });
+    }
+  });
+
+  router.get('/models', (req, res) => { res.json({ models: aggregateByModel(applyFilters(req.query)) }); });
+  router.get('/projects', (req, res) => { res.json({ projects: aggregateByProject(applyFilters(req.query)) }); });
+
+  router.get('/sessions', (req, res) => {
+    const records = applyFilters(req.query);
+    let sessions = aggregateBySession(records);
+    const sort = req.query.sort || 'date';
+    const order = req.query.order || 'desc';
+    const sortFn = { date: (a, b) => new Date(b.startTime) - new Date(a.startTime), cost: (a, b) => b.estimated_cost_usd - a.estimated_cost_usd, tokens: (a, b) => b.total_tokens - a.total_tokens }[sort] || ((a, b) => new Date(b.startTime) - new Date(a.startTime));
+    sessions.sort(sortFn);
+    if (order === 'asc') sessions.reverse();
+    const totalTokens = sessions.reduce((sum, s) => sum + s.total_tokens, 0);
+    const totalCost = sessions.reduce((sum, s) => sum + s.estimated_cost_usd, 0);
+    const page = parseInt(req.query.page) || 1;
+    const limit = parseInt(req.query.limit) || 20;
+    const totalSessions = sessions.length;
+    const totalPages = Math.ceil(totalSessions / limit);
+    sessions = sessions.slice((page - 1) * limit, page * limit);
+    res.json({ sessions, pagination: { page, limit, total_sessions: totalSessions, total_pages: totalPages }, totals: { total_tokens: totalTokens, estimated_cost_usd: Math.round(totalCost * 100) / 100 } });
+  });
+
+  router.get('/cost', (req, res) => {
+    const records = applyFilters(req.query);
+    const plan = req.query.plan || 'max5x';
+    const customPrice = req.query.customPrice ? parseFloat(req.query.customPrice) : null;
+    const subscriptionCost = customPrice || PLAN_DEFAULTS[plan] || 100;
+    let apiCost = 0;
+    for (const r of records) apiCost += calculateRecordCost(r);
+    apiCost = Math.round(apiCost * 100) / 100;
+    const dayMap = new Map();
+    for (const r of records) {
+      const d = new Date(r.timestamp);
+      const day = `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')}`;
+      dayMap.set(day, (dayMap.get(day) || 0) + calculateRecordCost(r));
+    }
+    const costPerDay = Array.from(dayMap.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([date, cost]) => {
+      const d = new Date(date);
+      const daysInMonth = new Date(d.getUTCFullYear(), d.getUTCMonth() + 1, 0).getUTCDate();
+      return { date, api_cost: Math.round(cost * 100) / 100, subscription_daily: Math.round((subscriptionCost / daysInMonth) * 100) / 100 };
+    });
+    const savings = apiCost - subscriptionCost;
+    res.json({ plan, subscription_cost_usd: subscriptionCost, api_equivalent_cost_usd: apiCost, savings_usd: Math.round(savings * 100) / 100, savings_percent: apiCost > 0 ? Math.round((savings / apiCost) * 1000) / 10 : 0, cost_per_day: costPerDay });
+  });
+
+  router.get('/cache', (req, res) => { res.json(aggregateCache(applyFilters(req.query))); });
+
+  const quotaFetcher = options.quotaFetcher || createQuotaFetcher();
+  router.get('/quota', async (req, res) => {
+    try {
+      const data = await quotaFetcher.fetchQuota();
+      res.json(data);
+    } catch (err) {
+      res.json({ available: false, error: err.message });
+    }
+  });
+
+  router.get('/subscription', (req, res) => {
+    const info = options.getSubscriptionInfo ? options.getSubscriptionInfo() : getSubscriptionInfo();
+    res.json(info || { plan: null, subscriptionType: null, rateLimitTier: null });
+  });
+
+  router.get('/status', (req, res) => {
+    res.json({
+      record_count: cachedRecords.length,
+      last_refreshed: lastRefreshed ? new Date(lastRefreshed).toISOString() : null,
+      cache_ttl_ms: CACHE_TTL_MS,
+    });
+  });
+
+  return router;
+}