@zhangferry-dev/tokendash 1.4.2 → 1.6.0

package/dist/server/analyticsParser.js

@@ -48,9 +48,56 @@ function countLines(text) {
 // Claude Code session scanning & tool extraction
 // ---------------------------------------------------------------------------
 const CLAUDE_PROJECTS_DIR = join(homedir(), '.claude', 'projects');
+const projectNameCache = new Map();
+/** Decode Claude's encoded project directory name.
+ *  Claude encodes paths: /Users/foo/bar → -Users-foo-bar
+ *  Since '-' replaces '/' and project names can contain '-',
+ *  we use filesystem checks to find the correct last segment.
+ */
 function extractProjectName(dirName) {
-    const parts = dirName.replace(/^-/, '').split('-');
-    return parts[parts.length - 1] || dirName;
+    if (!dirName.startsWith('-'))
+        return dirName;
+    const cached = projectNameCache.get(dirName);
+    if (cached)
+        return cached;
+    const segments = dirName.replace(/^-/, '').split('-').filter(Boolean);
+    if (segments.length === 0) {
+        projectNameCache.set(dirName, dirName);
+        return dirName;
+    }
+    if (segments.length === 1) {
+        projectNameCache.set(dirName, segments[0]);
+        return segments[0];
+    }
+    let bestName = segments[segments.length - 1];
+    for (let splitAt = segments.length - 1; splitAt >= 1; splitAt--) {
+        const parentSegments = segments.slice(0, splitAt);
+        const candidateName = segments.slice(splitAt).join('-');
+        let parentPath = '/';
+        let valid = true;
+        for (const seg of parentSegments) {
+            const regular = join(parentPath, seg);
+            const hidden = join(parentPath, '.' + seg);
+            if (existsSync(regular)) {
+                parentPath = regular;
+            }
+            else if (existsSync(hidden)) {
+                parentPath = hidden;
+            }
+            else {
+                valid = false;
+                break;
+            }
+        }
+        if (!valid)
+            continue;
+        if (existsSync(join(parentPath, candidateName)) || existsSync(join(parentPath, '.' + candidateName))) {
+            bestName = candidateName;
+            break;
+        }
+    }
+    projectNameCache.set(dirName, bestName);
+    return bestName;
 }
 function matchesProject(dirName, filter) {
     return extractProjectName(dirName) === extractProjectName(filter);
@@ -273,5 +320,22 @@ export function computeAnalytics(toolCalls, timezone = 'Asia/Shanghai') {
         toolCallTrend.push(entry);
     }
     toolCallTrend.sort((a, b) => a.date.localeCompare(b.date));
+    // Fill missing tool values with 0 so chart lines don't break
+    if (toolCallTrend.length > 0) {
+        const allTools = new Set();
+        for (const entry of toolCallTrend) {
+            for (const key of Object.keys(entry)) {
+                if (key !== 'date')
+                    allTools.add(key);
+            }
+        }
+        for (const entry of toolCallTrend) {
+            for (const tool of allTools) {
+                if (entry[tool] === undefined) {
+                    entry[tool] = 0;
+                }
+            }
+        }
+    }
     return { codeChangeTrend, toolUsageDistribution, productivityKPIs, toolCallTrend };
 }

package/dist/server/claudeBlocksParser.js

@@ -24,13 +24,56 @@ const ClaudeEventSchema = z.object({
 // Helpers
 // ---------------------------------------------------------------------------
 const CLAUDE_PROJECTS_DIR = join(homedir(), '.claude', 'projects');
-/** Extract project display name from encoded directory path.
- *  -Users-zhangferry-AI-Ideas → Ideas
- *  -Users-zhangferry-Desktop-Develop-DailyNewsReport → DailyNewsReport
+const projectNameCache = new Map();
+/** Decode Claude's encoded project directory name.
+ *  Claude encodes paths: /Users/foo/bar → -Users-foo-bar
+ *  Since '-' replaces '/' and project names can contain '-',
+ *  we use filesystem checks to find the correct last segment.
  */
 function extractProjectName(dirName) {
-    const parts = dirName.replace(/^-/, '').split('-');
-    return parts[parts.length - 1] || dirName;
+    if (!dirName.startsWith('-'))
+        return dirName;
+    const cached = projectNameCache.get(dirName);
+    if (cached)
+        return cached;
+    const segments = dirName.replace(/^-/, '').split('-').filter(Boolean);
+    if (segments.length === 0) {
+        projectNameCache.set(dirName, dirName);
+        return dirName;
+    }
+    if (segments.length === 1) {
+        projectNameCache.set(dirName, segments[0]);
+        return segments[0];
+    }
+    let bestName = segments[segments.length - 1];
+    for (let splitAt = segments.length - 1; splitAt >= 1; splitAt--) {
+        const parentSegments = segments.slice(0, splitAt);
+        const candidateName = segments.slice(splitAt).join('-');
+        let parentPath = '/';
+        let valid = true;
+        for (const seg of parentSegments) {
+            const regular = join(parentPath, seg);
+            const hidden = join(parentPath, '.' + seg);
+            if (existsSync(regular)) {
+                parentPath = regular;
+            }
+            else if (existsSync(hidden)) {
+                parentPath = hidden;
+            }
+            else {
+                valid = false;
+                break;
+            }
+        }
+        if (!valid)
+            continue;
+        if (existsSync(join(parentPath, candidateName)) || existsSync(join(parentPath, '.' + candidateName))) {
+            bestName = candidateName;
+            break;
+        }
+    }
+    projectNameCache.set(dirName, bestName);
+    return bestName;
 }
 /** Match project display name against a filter (also normalizes the filter) */
 function matchesProject(dirName, filter) {
@@ -99,7 +142,7 @@ export function getClaudeBlocksByProject(project) {
                 const outputTokens = usage.output_tokens;
                 const cacheCreationTokens = usage.cache_creation_input_tokens;
                 const cacheReadTokens = usage.cache_read_input_tokens;
-                const totalTokens = inputTokens + outputTokens + cacheReadTokens;
+                const totalTokens = inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens;
                 if (totalTokens === 0)
                     continue;
                 const hourKey = getHourKey(event.timestamp);
@@ -124,7 +167,7 @@ export function getClaudeBlocksByProject(project) {
     const blocks = [];
     let idx = 0;
     for (const [hourKey, bucket] of hourMap) {
-        const totalTokens = bucket.inputTokens + bucket.outputTokens + bucket.cacheReadTokens;
+        const totalTokens = bucket.inputTokens + bucket.outputTokens + bucket.cacheCreationTokens + bucket.cacheReadTokens;
         blocks.push({
             id: `claude-project-${idx}`,
             startTime: `${hourKey}:00:00.000Z`,

package/dist/server/claudeJsonlParser.d.ts

@@ -1,5 +1,11 @@
 import type { DailyResponse, ProjectsResponse, BlockEntry } from '../shared/types.js';
-export declare function calculateCost(inputTokens: number, cacheReadTokens: number, outputTokens: number, model: string): number;
+export declare function calculateCost(inputTokens: number, cacheReadTokens: number, outputTokens: number, model: string, cacheCreationTokens?: number): number;
+/** Decode Claude's encoded project directory name.
+ *  Claude encodes paths: /Users/foo/bar → -Users-foo-bar
+ *  Since '-' replaces '/' and project names can contain '-',
+ *  we use filesystem checks to find the correct last segment.
+ */
+export declare function extractProjectName(dirName: string): string;
 export declare function getDateKey(timestamp: string, tz: string): string;
 export declare function getHourKey(timestamp: string, tz: string): string;
 export declare function getDailyResponse(project?: string | null, tz?: string): DailyResponse;

package/dist/server/claudeJsonlParser.js

@@ -3,18 +3,18 @@ import { join } from 'node:path';
 import { homedir } from 'node:os';
 const MODEL_PRICING = {
     // Claude 4.6
-    'claude-opus-4-6': { inputPer1M: 15, cacheReadPer1M: 1.50, outputPer1M: 75 },
-    'claude-sonnet-4-6': { inputPer1M: 3, cacheReadPer1M: 0.30, outputPer1M: 15 },
+    'claude-opus-4-6': { inputPer1M: 15, cacheCreationPer1M: 18.75, cacheReadPer1M: 1.50, outputPer1M: 75 },
+    'claude-sonnet-4-6': { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.30, outputPer1M: 15 },
     // Claude 4.5
-    'claude-sonnet-4-5-20250514': { inputPer1M: 3, cacheReadPer1M: 0.30, outputPer1M: 15 },
-    'claude-haiku-4-5-20251001': { inputPer1M: 0.80, cacheReadPer1M: 0.08, outputPer1M: 4 },
+    'claude-sonnet-4-5-20250514': { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.30, outputPer1M: 15 },
+    'claude-haiku-4-5-20251001': { inputPer1M: 0.80, cacheCreationPer1M: 1, cacheReadPer1M: 0.08, outputPer1M: 4 },
     // Older Claude models
-    'claude-3-5-sonnet-20241022': { inputPer1M: 3, cacheReadPer1M: 0.30, outputPer1M: 15 },
-    'claude-3-5-haiku-20241022': { inputPer1M: 0.80, cacheReadPer1M: 0.08, outputPer1M: 4 },
-    'claude-3-opus-20240229': { inputPer1M: 15, cacheReadPer1M: 1.50, outputPer1M: 75 },
-    'claude-3-haiku-20240307': { inputPer1M: 0.25, cacheReadPer1M: 0.03, outputPer1M: 1.25 },
+    'claude-3-5-sonnet-20241022': { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.30, outputPer1M: 15 },
+    'claude-3-5-haiku-20241022': { inputPer1M: 0.80, cacheCreationPer1M: 1, cacheReadPer1M: 0.08, outputPer1M: 4 },
+    'claude-3-opus-20240229': { inputPer1M: 15, cacheCreationPer1M: 18.75, cacheReadPer1M: 1.50, outputPer1M: 75 },
+    'claude-3-haiku-20240307': { inputPer1M: 0.25, cacheCreationPer1M: 0.30, cacheReadPer1M: 0.03, outputPer1M: 1.25 },
 };
-const DEFAULT_PRICING = { inputPer1M: 3, cacheReadPer1M: 0.30, outputPer1M: 15 };
+const DEFAULT_PRICING = { inputPer1M: 3, cacheCreationPer1M: 3.75, cacheReadPer1M: 0.30, outputPer1M: 15 };
 function getPricing(model) {
     // Try exact match first, then prefix match
     if (MODEL_PRICING[model])
@@ -26,21 +26,73 @@ function getPricing(model) {
     }
     return DEFAULT_PRICING;
 }
-export function calculateCost(inputTokens, cacheReadTokens, outputTokens, model) {
+export function calculateCost(inputTokens, cacheReadTokens, outputTokens, model, cacheCreationTokens = 0) {
     const p = getPricing(model);
-    const nonCachedInput = Math.max(inputTokens - cacheReadTokens, 0);
-    return (nonCachedInput / 1_000_000) * p.inputPer1M
+    return (inputTokens / 1_000_000) * p.inputPer1M
+        + (cacheCreationTokens / 1_000_000) * p.cacheCreationPer1M
         + (cacheReadTokens / 1_000_000) * p.cacheReadPer1M
         + (outputTokens / 1_000_000) * p.outputPer1M;
 }
+function totalClaudeTokens(inputTokens, outputTokens, cacheCreationTokens, cacheReadTokens) {
+    return inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens;
+}
 // ---------------------------------------------------------------------------
 // JSONL parsing with mtime cache
 // ---------------------------------------------------------------------------
 const CLAUDE_PROJECTS_DIR = join(homedir(), '.claude', 'projects');
 const fileCache = new Map();
-function extractProjectName(dirName) {
-    const parts = dirName.replace(/^-/, '').split('-');
-    return parts[parts.length - 1] || dirName;
+const projectNameCache = new Map();
+/** Decode Claude's encoded project directory name.
+ *  Claude encodes paths: /Users/foo/bar → -Users-foo-bar
+ *  Since '-' replaces '/' and project names can contain '-',
+ *  we use filesystem checks to find the correct last segment.
+ */
+export function extractProjectName(dirName) {
+    if (!dirName.startsWith('-'))
+        return dirName;
+    const cached = projectNameCache.get(dirName);
+    if (cached)
+        return cached;
+    const segments = dirName.replace(/^-/, '').split('-').filter(Boolean);
+    if (segments.length === 0) {
+        projectNameCache.set(dirName, dirName);
+        return dirName;
+    }
+    if (segments.length === 1) {
+        projectNameCache.set(dirName, segments[0]);
+        return segments[0];
+    }
+    let bestName = segments[segments.length - 1];
+    // Try from right: find the longest last segment that forms a valid path
+    for (let splitAt = segments.length - 1; splitAt >= 1; splitAt--) {
+        const parentSegments = segments.slice(0, splitAt);
+        const candidateName = segments.slice(splitAt).join('-');
+        // Build parent path, handling hidden directories (dot prefix)
+        let parentPath = '/';
+        let valid = true;
+        for (const seg of parentSegments) {
+            const regular = join(parentPath, seg);
+            const hidden = join(parentPath, '.' + seg);
+            if (existsSync(regular)) {
+                parentPath = regular;
+            }
+            else if (existsSync(hidden)) {
+                parentPath = hidden;
+            }
+            else {
+                valid = false;
+                break;
+            }
+        }
+        if (!valid)
+            continue;
+        if (existsSync(join(parentPath, candidateName)) || existsSync(join(parentPath, '.' + candidateName))) {
+            bestName = candidateName;
+            break;
+        }
+    }
+    projectNameCache.set(dirName, bestName);
+    return bestName;
 }
 function matchesProject(dirName, filter) {
     return extractProjectName(dirName) === extractProjectName(filter);
@@ -111,7 +163,7 @@ function parseAllSessions(project) {
                 const outputTokens = usage.output_tokens || 0;
                 const cacheCreationTokens = usage.cache_creation_input_tokens || 0;
                 const cacheReadTokens = usage.cache_read_input_tokens || 0;
-                const totalTokens = inputTokens + outputTokens + cacheReadTokens;
+                const totalTokens = totalClaudeTokens(inputTokens, outputTokens, cacheCreationTokens, cacheReadTokens);
                 if (totalTokens === 0)
                     continue;
                 entries.push({
@@ -199,8 +251,8 @@ export function getDailyResponse(project, tz = DEFAULT_TZ) {
         agg.outputTokens += e.outputTokens;
         agg.cacheCreationTokens += e.cacheCreationTokens;
         agg.cacheReadTokens += e.cacheReadTokens;
-        agg.totalTokens += e.inputTokens + e.outputTokens + e.cacheReadTokens;
-        const cost = calculateCost(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model);
+        agg.totalTokens += totalClaudeTokens(e.inputTokens, e.outputTokens, e.cacheCreationTokens, e.cacheReadTokens);
+        const cost = calculateCost(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model, e.cacheCreationTokens);
         agg.totalCost += cost;
         if (!agg.models.has(e.model)) {
             agg.models.set(e.model, { input: 0, output: 0, cacheCreation: 0, cacheRead: 0, cost: 0 });
@@ -228,7 +280,7 @@ export function getProjectsResponse(tz = DEFAULT_TZ) {
     const projectMap = new Map();
     for (const e of entries) {
         const date = getDateKey(e.timestamp, tz);
-        const projectName = e.projectDir;
+        const projectName = extractProjectName(e.projectDir);
         if (!projectMap.has(projectName)) {
             projectMap.set(projectName, new Map());
         }
@@ -245,8 +297,8 @@ export function getProjectsResponse(tz = DEFAULT_TZ) {
         agg.outputTokens += e.outputTokens;
         agg.cacheCreationTokens += e.cacheCreationTokens;
         agg.cacheReadTokens += e.cacheReadTokens;
-        agg.totalTokens += e.inputTokens + e.outputTokens + e.cacheReadTokens;
-        const cost = calculateCost(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model);
+        agg.totalTokens += totalClaudeTokens(e.inputTokens, e.outputTokens, e.cacheCreationTokens, e.cacheReadTokens);
+        const cost = calculateCost(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model, e.cacheCreationTokens);
         agg.totalCost += cost;
         if (!agg.models.has(e.model)) {
             agg.models.set(e.model, { input: 0, output: 0, cacheCreation: 0, cacheRead: 0, cost: 0 });
@@ -282,13 +334,13 @@ export function getBlocksResponse(project, tz = DEFAULT_TZ) {
         bucket.outputTokens += e.outputTokens;
         bucket.cacheCreationTokens += e.cacheCreationTokens;
         bucket.cacheReadTokens += e.cacheReadTokens;
-        bucket.costUSD += calculateCost(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model);
+        bucket.costUSD += calculateCost(e.inputTokens, e.cacheReadTokens, e.outputTokens, e.model, e.cacheCreationTokens);
         bucket.models.add(e.model);
     }
     const blocks = [];
     let idx = 0;
     for (const [hourKey, bucket] of hourMap) {
-        const totalTokens = bucket.inputTokens + bucket.outputTokens + bucket.cacheReadTokens;
+        const totalTokens = totalClaudeTokens(bucket.inputTokens, bucket.outputTokens, bucket.cacheCreationTokens, bucket.cacheReadTokens);
         blocks.push({
             id: `claude-${idx}`,
             startTime: `${hourKey}:00:00`,

package/dist/server/codexParser.d.ts

@@ -1,5 +1,5 @@
 import type { DailyResponse, ProjectsResponse, BlocksResponse } from '../shared/types.js';
-interface ParsedTokenEvent {
+export interface ParsedTokenEvent {
     timestamp: string;
     inputTokens: number;
     cachedInputTokens: number;
@@ -37,10 +37,14 @@ export declare function scanCodexSessions(): string[];
 export declare function parseCodexSession(filepath: string): ParsedSession | null;
 /** Parse all Codex sessions. */
 export declare function parseAllSessions(): ParsedSession[];
+export declare function buildCodexResponsesFromSessions(sessions: ParsedSession[], options?: Partial<AggregateOptions>): {
+    daily: DailyResponse;
+    projects: ProjectsResponse;
+    blocks: BlocksResponse;
+};
 /** Aggregate and return DailyResponse format (for /daily?agent=codex) */
 export declare function getDailyResponse(options?: Partial<AggregateOptions>): DailyResponse;
 /** Aggregate and return ProjectsResponse format (for /projects?agent=codex) */
 export declare function getProjectsResponse(options?: Partial<AggregateOptions>): ProjectsResponse;
 /** Aggregate and return BlocksResponse format (hourly, for /blocks?agent=codex) */
 export declare function getBlocksResponse(options?: Partial<AggregateOptions>): BlocksResponse;
-export {};