@zhangferry-dev/tokendash 1.1.4 → 1.2.1

package/dist/server/routes/projects.js

@@ -1,8 +1,8 @@
-import { runCcusage } from '../ccusage.js';
 import { cache } from '../cache.js';
 import { validateProjects } from '../../shared/schemas.js';
-import { getProjectsResponse } from '../codexParser.js';
+import { getProjectsResponse as getCodexProjectsResponse } from '../codexParser.js';
 import { getProjectsResponse as getOpenClawProjectsResponse } from '../openclawParser.js';
+import { getProjectsResponse as getClaudeProjectsResponse } from '../claudeJsonlParser.js';
 export async function getProjects(req, res) {
     const agent = req.query.agent || 'claude';
     const cacheKey = `projects:${agent}`;
@@ -12,24 +12,16 @@ export async function getProjects(req, res) {
             res.json(cached);
             return;
         }
-        if (agent === 'codex') {
-            const data = getProjectsResponse();
-            cache.set(cacheKey, data);
-            res.json(data);
-        }
-        else if (agent === 'openclaw') {
-            const data = getOpenClawProjectsResponse();
-            const validated = validateProjects(data);
-            cache.set(cacheKey, validated);
-            res.json(validated);
-        }
-        else {
-            const stdout = await runCcusage(['daily', '--instances', '--breakdown']);
-            const data = JSON.parse(stdout);
-            const validated = validateProjects(data);
-            cache.set(cacheKey, validated);
-            res.json(validated);
+        // Stale-while-revalidate
+        const stale = cache.getStale(cacheKey);
+        if (stale) {
+            refreshProjectsCache(agent, cacheKey);
+            res.json(stale);
+            return;
         }
+        const data = fetchProjectsData(agent);
+        cache.set(cacheKey, data);
+        res.json(data);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : 'Unknown error';
@@ -40,3 +32,20 @@ export async function getProjects(req, res) {
         });
     }
 }
+function fetchProjectsData(agent) {
+    if (agent === 'codex') {
+        return getCodexProjectsResponse();
+    }
+    else if (agent === 'openclaw') {
+        return validateProjects(getOpenClawProjectsResponse());
+    }
+    else {
+        // Claude Code: parse JSONL directly (fast, no CLI)
+        return validateProjects(getClaudeProjectsResponse());
+    }
+}
+function refreshProjectsCache(agent, cacheKey) {
+    Promise.resolve()
+        .then(() => { const data = fetchProjectsData(agent); cache.set(cacheKey, data); })
+        .catch(err => console.error('Background refresh failed (projects):', err));
+}

package/dist/server/routes/session.d.ts

@@ -1,2 +1,2 @@
 import { type Request, type Response } from 'express';
-export declare function getSession(_req: Request, res: Response): Promise<void>;
+export declare function getSession(req: Request, res: Response): Promise<void>;

package/dist/server/routes/session.js

@@ -1,24 +1,41 @@
-import { runCcusage } from '../ccusage.js';
 import { cache } from '../cache.js';
 import { validateDaily } from '../../shared/schemas.js';
-export async function getSession(_req, res) {
+import { getDailyResponse as getClaudeDailyResponse } from '../claudeJsonlParser.js';
+import { getDailyResponse as getCodexDailyResponse } from '../codexParser.js';
+import { getDailyResponse as getOpenClawDailyResponse } from '../openclawParser.js';
+export async function getSession(req, res) {
+    const agent = req.query.agent || 'claude';
+    const cacheKey = `session:${agent}`;
     try {
-        const cached = cache.get('session');
+        const cached = cache.get(cacheKey);
         if (cached) {
             res.json(cached);
             return;
         }
-        const stdout = await runCcusage(['session']);
-        const data = JSON.parse(stdout);
-        const validated = validateDaily(data);
-        cache.set('session', validated);
-        res.json(validated);
+        const stale = cache.getStale(cacheKey);
+        if (stale) {
+            res.json(stale);
+            return;
+        }
+        // Session data uses same daily aggregation
+        let data;
+        if (agent === 'codex') {
+            data = validateDaily(getCodexDailyResponse());
+        }
+        else if (agent === 'openclaw') {
+            data = validateDaily(getOpenClawDailyResponse());
+        }
+        else {
+            data = validateDaily(getClaudeDailyResponse());
+        }
+        cache.set(cacheKey, data);
+        res.json(data);
     }
     catch (error) {
         const message = error instanceof Error ? error.message : 'Unknown error';
         console.error('Error fetching session data:', error);
         res.status(502).json({
-            error: 'Failed to fetch session data from ccusage',
+            error: 'Failed to fetch session data',
             hint: message,
         });
     }

package/dist/shared/schemas.d.ts

@@ -7,19 +7,19 @@ export declare const ModelBreakdownSchema: z.ZodObject<{
     cacheReadTokens: z.ZodDefault<z.ZodNumber>;
     cost: z.ZodDefault<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
+    cost: number;
     modelName: string;
     inputTokens: number;
     outputTokens: number;
     cacheCreationTokens: number;
     cacheReadTokens: number;
-    cost: number;
 }, {
     modelName: string;
+    cost?: number | undefined;
     inputTokens?: number | undefined;
     outputTokens?: number | undefined;
     cacheCreationTokens?: number | undefined;
     cacheReadTokens?: number | undefined;
-    cost?: number | undefined;
 }>;
 export declare const DailyEntrySchema: z.ZodObject<{
     date: z.ZodString;
@@ -38,19 +38,19 @@ export declare const DailyEntrySchema: z.ZodObject<{
         cacheReadTokens: z.ZodDefault<z.ZodNumber>;
         cost: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        cost: number;
         modelName: string;
         inputTokens: number;
         outputTokens: number;
         cacheCreationTokens: number;
         cacheReadTokens: number;
-        cost: number;
     }, {
         modelName: string;
+        cost?: number | undefined;
         inputTokens?: number | undefined;
         outputTokens?: number | undefined;
         cacheCreationTokens?: number | undefined;
         cacheReadTokens?: number | undefined;
-        cost?: number | undefined;
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
     date: string;
@@ -62,12 +62,12 @@ export declare const DailyEntrySchema: z.ZodObject<{
     totalCost: number;
     modelsUsed: string[];
     modelBreakdowns: {
+        cost: number;
         modelName: string;
         inputTokens: number;
         outputTokens: number;
         cacheCreationTokens: number;
         cacheReadTokens: number;
-        cost: number;
     }[];
 }, {
     date: string;
@@ -80,11 +80,11 @@ export declare const DailyEntrySchema: z.ZodObject<{
     modelsUsed?: string[] | undefined;
     modelBreakdowns?: {
         modelName: string;
+        cost?: number | undefined;
         inputTokens?: number | undefined;
         outputTokens?: number | undefined;
         cacheCreationTokens?: number | undefined;
         cacheReadTokens?: number | undefined;
-        cost?: number | undefined;
     }[] | undefined;
 }>;
 export declare const TotalsSchema: z.ZodObject<{
@@ -127,19 +127,19 @@ export declare const DailyResponseSchema: z.ZodObject<{
             cacheReadTokens: z.ZodDefault<z.ZodNumber>;
             cost: z.ZodDefault<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }, {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }>, "many">>;
     }, "strip", z.ZodTypeAny, {
         date: string;
@@ -151,12 +151,12 @@ export declare const DailyResponseSchema: z.ZodObject<{
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }, {
         date: string;
@@ -169,11 +169,11 @@ export declare const DailyResponseSchema: z.ZodObject<{
         modelsUsed?: string[] | undefined;
         modelBreakdowns?: {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }[] | undefined;
     }>, "many">>;
     totals: z.ZodObject<{
@@ -209,12 +209,12 @@ export declare const DailyResponseSchema: z.ZodObject<{
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }[];
     totals: {
@@ -245,11 +245,11 @@ export declare const DailyResponseSchema: z.ZodObject<{
         modelsUsed?: string[] | undefined;
         modelBreakdowns?: {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }[] | undefined;
     }[] | undefined;
 }>;
@@ -272,19 +272,19 @@ export declare const ProjectEntrySchema: z.ZodObject<{
             cacheReadTokens: z.ZodDefault<z.ZodNumber>;
             cost: z.ZodDefault<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }, {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }>, "many">>;
     }, "strip", z.ZodTypeAny, {
         date: string;
@@ -296,12 +296,12 @@ export declare const ProjectEntrySchema: z.ZodObject<{
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }, {
         date: string;
@@ -314,11 +314,11 @@ export declare const ProjectEntrySchema: z.ZodObject<{
         modelsUsed?: string[] | undefined;
         modelBreakdowns?: {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }[] | undefined;
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
@@ -333,12 +333,12 @@ export declare const ProjectEntrySchema: z.ZodObject<{
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }[];
 }, {
@@ -354,11 +354,11 @@ export declare const ProjectEntrySchema: z.ZodObject<{
         modelsUsed?: string[] | undefined;
         modelBreakdowns?: {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }[] | undefined;
     }[] | undefined;
 }>;
@@ -380,19 +380,19 @@ export declare const ProjectsResponseSchema: z.ZodObject<{
             cacheReadTokens: z.ZodDefault<z.ZodNumber>;
             cost: z.ZodDefault<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }, {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }>, "many">>;
     }, "strip", z.ZodTypeAny, {
         date: string;
@@ -404,12 +404,12 @@ export declare const ProjectsResponseSchema: z.ZodObject<{
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }, {
         date: string;
@@ -422,11 +422,11 @@ export declare const ProjectsResponseSchema: z.ZodObject<{
         modelsUsed?: string[] | undefined;
         modelBreakdowns?: {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }[] | undefined;
     }>, "many">>>>;
 }, "strip", z.ZodTypeAny, {
@@ -440,12 +440,12 @@ export declare const ProjectsResponseSchema: z.ZodObject<{
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }[]>;
 }, {
@@ -460,11 +460,11 @@ export declare const ProjectsResponseSchema: z.ZodObject<{
         modelsUsed?: string[] | undefined;
         modelBreakdowns?: {
             modelName: string;
+            cost?: number | undefined;
             inputTokens?: number | undefined;
             outputTokens?: number | undefined;
             cacheCreationTokens?: number | undefined;
             cacheReadTokens?: number | undefined;
-            cost?: number | undefined;
         }[] | undefined;
     }[] | undefined> | undefined;
 }>;
@@ -479,12 +479,12 @@ export declare function validateDaily(data: unknown): {
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }[];
     totals: {
@@ -507,12 +507,12 @@ export declare function validateProjects(data: unknown): {
         totalCost: number;
         modelsUsed: string[];
         modelBreakdowns: {
+            cost: number;
             modelName: string;
             inputTokens: number;
             outputTokens: number;
             cacheCreationTokens: number;
             cacheReadTokens: number;
-            cost: number;
         }[];
     }[]>;
 };
@@ -545,9 +545,9 @@ export declare const BlocksResponseSchema: z.ZodObject<{
         costUSD: z.ZodDefault<z.ZodNumber>;
         models: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
     }, "strip", z.ZodTypeAny, {
+        models: string[];
         entries: number;
         id: string;
-        models: string[];
         totalTokens: number;
         startTime: string;
         endTime: string;
@@ -565,8 +565,8 @@ export declare const BlocksResponseSchema: z.ZodObject<{
         id: string;
         startTime: string;
         endTime: string;
-        entries?: number | undefined;
         models?: string[] | undefined;
+        entries?: number | undefined;
         totalTokens?: number | undefined;
         actualEndTime?: string | null | undefined;
         isActive?: boolean | undefined;
@@ -581,9 +581,9 @@ export declare const BlocksResponseSchema: z.ZodObject<{
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
     blocks: {
+        models: string[];
         entries: number;
         id: string;
-        models: string[];
         totalTokens: number;
         startTime: string;
         endTime: string;
@@ -603,8 +603,8 @@ export declare const BlocksResponseSchema: z.ZodObject<{
         id: string;
         startTime: string;
         endTime: string;
-        entries?: number | undefined;
         models?: string[] | undefined;
+        entries?: number | undefined;
         totalTokens?: number | undefined;
         actualEndTime?: string | null | undefined;
         isActive?: boolean | undefined;
@@ -620,9 +620,9 @@ export declare const BlocksResponseSchema: z.ZodObject<{
 }>;
 export declare function validateBlocks(data: unknown): {
     blocks: {
+        models: string[];
         entries: number;
         id: string;
-        models: string[];
         totalTokens: number;
         startTime: string;
         endTime: string;
@@ -638,3 +638,25 @@ export declare function validateBlocks(data: unknown): {
         costUSD: number;
     }[];
 };
+export declare function validateAnalytics(data: unknown): {
+    codeChangeTrend: {
+        date: string;
+        linesAdded: number;
+        linesDeleted: number;
+        netChange: number;
+        filesModified: number;
+    }[];
+    toolUsageDistribution: {
+        name: string;
+        count: number;
+    }[];
+    productivityKPIs: {
+        avgLinesPerEdit: number;
+        filesModifiedPerDay: number;
+        addDeleteRatio: number;
+        totalEdits: number;
+        totalFilesModified: number;
+        activeDaysWithEdits: number;
+    };
+    toolCallTrend: Record<string, string | number>[];
+};

package/dist/shared/schemas.js

@@ -67,3 +67,32 @@ export const BlocksResponseSchema = z.object({
 export function validateBlocks(data) {
     return BlocksResponseSchema.parse(data);
 }
+// --- Analytics schemas ---
+const DailyCodeChangeSchema = z.object({
+    date: z.string(),
+    linesAdded: z.number().default(0),
+    linesDeleted: z.number().default(0),
+    netChange: z.number().default(0),
+    filesModified: z.number().default(0),
+});
+const ToolUsageEntrySchema = z.object({
+    name: z.string(),
+    count: z.number().default(0),
+});
+const ProductivityKPIsSchema = z.object({
+    avgLinesPerEdit: z.number().default(0),
+    filesModifiedPerDay: z.number().default(0),
+    addDeleteRatio: z.number().default(0),
+    totalEdits: z.number().default(0),
+    totalFilesModified: z.number().default(0),
+    activeDaysWithEdits: z.number().default(0),
+});
+const AnalyticsResponseSchema = z.object({
+    codeChangeTrend: z.array(DailyCodeChangeSchema).default([]),
+    toolUsageDistribution: z.array(ToolUsageEntrySchema).default([]),
+    productivityKPIs: ProductivityKPIsSchema,
+    toolCallTrend: z.array(z.record(z.union([z.string(), z.number()]))).default([]),
+});
+export function validateAnalytics(data) {
+    return AnalyticsResponseSchema.parse(data);
+}

package/dist/shared/types.d.ts

@@ -63,3 +63,32 @@ export interface BlocksResponse {
 }
 export type MetricMode = 'tokens' | 'usd';
 export type GranularityMode = 'day' | 'hour';
+export interface ToolUsageEntry {
+    name: string;
+    count: number;
+}
+export interface DailyCodeChange {
+    date: string;
+    linesAdded: number;
+    linesDeleted: number;
+    netChange: number;
+    filesModified: number;
+}
+export interface DailyToolCall {
+    date: string;
+    [toolName: string]: string | number;
+}
+export interface ProductivityKPIs {
+    avgLinesPerEdit: number;
+    filesModifiedPerDay: number;
+    addDeleteRatio: number;
+    totalEdits: number;
+    totalFilesModified: number;
+    activeDaysWithEdits: number;
+}
+export interface AnalyticsResponse {
+    codeChangeTrend: DailyCodeChange[];
+    toolUsageDistribution: ToolUsageEntry[];
+    productivityKPIs: ProductivityKPIs;
+    toolCallTrend: DailyToolCall[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangferry-dev/tokendash",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "type": "module",
   "description": "Token Usage Analytics Dashboard",
   "publishConfig": {
@@ -22,6 +22,9 @@
     "build": "vite build && tsc -p tsconfig.json",
     "start": "node dist/server/index.js",
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.frontend.json --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:e2e": "playwright test",
     "prepack": "npm run build"
   },
   "dependencies": {
@@ -33,6 +36,7 @@
     "zod": "^3.24.3"
   },
   "devDependencies": {
+    "@playwright/test": "^1.59.1",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.2",
     "@types/react": "^19.1.2",
@@ -41,6 +45,7 @@
     "concurrently": "^9.1.2",
     "tsx": "^4.19.3",
     "typescript": "^5.8.3",
-    "vite": "^6.3.3"
+    "vite": "^6.3.3",
+    "vitest": "^4.1.4"
   }
-}
+}