@kaitranntt/ccs 7.74.0-dev.11 → 7.74.0-dev.12

package/dist/web-server/usage/droid-native-usage-collector.js

@@ -0,0 +1,201 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scanDroidNativeUsageEntries = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const droid_dashboard_service_1 = require("../services/droid-dashboard-service");
+const ui_1 = require("../../utils/ui");
+const sqlite_cli_1 = require("./sqlite-cli");
+const DROID_COST_BATCH_SIZE = 1000;
+function isObject(value) {
+    return typeof value === 'object' && value !== null;
+}
+function asString(value) {
+    return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null;
+}
+function asNumber(value) {
+    const numeric = typeof value === 'number' ? value : Number(value);
+    return Number.isFinite(numeric) && numeric >= 0 ? numeric : null;
+}
+function isCcsManagedSelector(selector) {
+    return selector.startsWith('custom:CCS-') || selector.startsWith('custom:ccs-');
+}
+function buildSelectorAlias(displayName, index) {
+    return `${displayName.trim().replace(/\s+/g, '-')}-${index}`;
+}
+function normalizeCustomModels(settings) {
+    const raw = settings.customModels ?? settings.custom_models;
+    if (Array.isArray(raw)) {
+        return raw.filter((entry) => isObject(entry));
+    }
+    if (isObject(raw)) {
+        return Object.values(raw).filter((entry) => isObject(entry));
+    }
+    return [];
+}
+function buildCustomModelMap(settingsPath) {
+    const selectors = new Map();
+    if (!fs.existsSync(settingsPath))
+        return selectors;
+    try {
+        const parsed = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+        if (!isObject(parsed))
+            return selectors;
+        for (const [index, entry] of normalizeCustomModels(parsed).entries()) {
+            const displayName = asString(entry.displayName ?? entry.model_display_name);
+            const model = asString(entry.model);
+            if (!displayName || !model)
+                continue;
+            selectors.set(`custom:${buildSelectorAlias(displayName, index)}`, model);
+        }
+    }
+    catch {
+        return selectors;
+    }
+    return selectors;
+}
+function collectSessionFiles(dir, suffix, results = []) {
+    if (!fs.existsSync(dir))
+        return results;
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const entryPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            collectSessionFiles(entryPath, suffix, results);
+            continue;
+        }
+        if (entry.isFile() && entry.name.endsWith(suffix)) {
+            results.push(entryPath);
+        }
+    }
+    return results;
+}
+function readSessionStartMetadata(filePath) {
+    try {
+        const firstLine = fs.readFileSync(filePath, 'utf8').split('\n')[0];
+        const parsed = JSON.parse(firstLine);
+        if (parsed?.type !== 'session_start')
+            return null;
+        return {
+            projectPath: asString(parsed.cwd) ?? '/',
+            version: typeof parsed.version === 'number'
+                ? String(parsed.version)
+                : (asString(parsed.version) ?? undefined),
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function loadSessionMetadata(factoryDir) {
+    const metadata = new Map();
+    const selectorMap = buildCustomModelMap(path.join(factoryDir, 'settings.json'));
+    const sessionsDir = path.join(factoryDir, 'sessions');
+    for (const settingsPath of collectSessionFiles(sessionsDir, '.settings.json')) {
+        const sessionId = path.basename(settingsPath, '.settings.json');
+        const jsonlPath = settingsPath.replace(/\.settings\.json$/, '.jsonl');
+        const start = readSessionStartMetadata(jsonlPath);
+        if (!start)
+            continue;
+        try {
+            const parsed = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+            const rawSelector = asString(parsed?.model) ?? 'unknown-droid-model';
+            metadata.set(sessionId, {
+                model: selectorMap.get(rawSelector) ?? rawSelector,
+                projectPath: start.projectPath,
+                rawSelector,
+                version: start.version,
+            });
+        }
+        catch {
+            continue;
+        }
+    }
+    return metadata;
+}
+async function scanDroidNativeUsageEntries(options = {}) {
+    const query = options.querySqliteJson ?? sqlite_cli_1.querySqliteJson;
+    const { settingsPath } = (0, droid_dashboard_service_1.resolveDroidConfigPaths)({
+        env: options.env,
+        homeDir: options.homeDir,
+    });
+    const factoryDir = path.dirname(settingsPath);
+    const costsDbPath = path.join(factoryDir, 'costs.db');
+    if (!fs.existsSync(costsDbPath))
+        return [];
+    const rows = [];
+    let offset = 0;
+    while (true) {
+        const batch = await query(costsDbPath, `SELECT session_id, timestamp, input_tokens, output_tokens FROM costs ` +
+            `ORDER BY timestamp ASC LIMIT ${DROID_COST_BATCH_SIZE} OFFSET ${offset};`);
+        if (!batch.length)
+            break;
+        rows.push(...batch);
+        if (batch.length < DROID_COST_BATCH_SIZE)
+            break;
+        offset += batch.length;
+    }
+    if (!rows.length)
+        return [];
+    const metadata = loadSessionMetadata(factoryDir);
+    const entries = [];
+    let skippedRowsWithoutMetadata = 0;
+    for (const row of rows) {
+        if (!isObject(row))
+            continue;
+        const sessionId = asString(row.session_id);
+        const timestamp = asString(row.timestamp);
+        const inputTokens = asNumber(row.input_tokens);
+        const outputTokens = asNumber(row.output_tokens);
+        if (!sessionId || !timestamp || inputTokens === null || outputTokens === null)
+            continue;
+        const session = metadata.get(sessionId);
+        if (!session) {
+            skippedRowsWithoutMetadata++;
+            continue;
+        }
+        if (!options.includeCcsManagedSessions && isCcsManagedSelector(session.rawSelector)) {
+            continue;
+        }
+        entries.push({
+            inputTokens,
+            outputTokens,
+            cacheCreationTokens: 0,
+            cacheReadTokens: 0,
+            model: session.model,
+            sessionId,
+            timestamp,
+            projectPath: session.projectPath,
+            version: session.version,
+            target: 'droid',
+        });
+    }
+    if (skippedRowsWithoutMetadata > 0) {
+        console.log((0, ui_1.warn)(`Skipped ${skippedRowsWithoutMetadata} Droid native cost row(s) without local session metadata`));
+    }
+    return entries;
+}
+exports.scanDroidNativeUsageEntries = scanDroidNativeUsageEntries;
+//# sourceMappingURL=droid-native-usage-collector.js.map

package/dist/web-server/usage/droid-native-usage-collector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"droid-native-usage-collector.js","sourceRoot":"","sources":["../../../src/web-server/usage/droid-native-usage-collector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,iFAA8E;AAC9E,uCAAsC;AACtC,6CAA+C;AAkB/C,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAEnC,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACpF,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClE,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACnE,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,OAAO,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB,EAAE,KAAa;IAC5D,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAiC;IAC9D,MAAM,GAAG,GAAG,QAAQ,CAAC,YAAY,IAAI,QAAQ,CAAC,aAAa,CAAC;IAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,EAAoC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAoC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,SAAS,CAAC;IAEnD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAC;QAExC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,qBAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACrE,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5E,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrC,SAAS,CAAC,GAAG,CAAC,UAAU,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,MAAc,EAAE,UAAoB,EAAE;IAC9E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC;IAExC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAChD,SAAS;QACX,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,wBAAwB,CAC/B,QAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,EAAE,IAAI,KAAK,eAAe;YAAE,OAAO,IAAI,CAAC;QAClD,OAAO;YACL,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG;YACxC,OAAO,EACL,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gBAChC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;gBACxB,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;SAC9C,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAkB;IAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;IACzD,MAAM,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtD,KAAK,MAAM,YAAY,IAAI,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,CAAC;QAC9E,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK;YAAE,SAAS;QAErB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,qBAAqB,CAAC;YACrE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE;gBACtB,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,WAAW;gBAClD,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,WAAW;gBACX,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,2BAA2B,CAC/C,UAA4C,EAAE;IAE9C,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,IAAI,4BAAe,CAAC;IACzD,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,iDAAuB,EAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,EAAE,CAAC;IAE3C,MAAM,IAAI,GAAmC,EAAE,CAAC;IAChD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,KAAK,CACvB,WAAW,EACX,uEAAuE;YACrE,gCAAgC,qBAAqB,WAAW,MAAM,GAAG,CAC5E,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,MAAM;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QACpB,IAAI,KAAK,CAAC,MAAM,GAAG,qBAAqB;YAAE,MAAM;QAChD,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IACzB,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,QAAQ,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,IAAI,0BAA0B,GAAG,CAAC,CAAC;IAEnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,SAAS;QAC7B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,WAAW,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI;YAAE,SAAS;QAExF,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,0BAA0B,EAAE,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,oBAAoB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACpF,SAAS;QACX,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,WAAW;YACX,YAAY;YACZ,mBAAmB,EAAE,CAAC;YACtB,eAAe,EAAE,CAAC;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS;YACT,SAAS;YACT,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO;SAChB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,0BAA0B,GAAG,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EACF,WAAW,0BAA0B,0DAA0D,CAChG,CACF,CAAC;IACJ,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAxED,kEAwEC"}

package/dist/web-server/usage/handlers.d.ts

@@ -19,6 +19,7 @@ export interface UsageQuery {
 export declare function validateDate(dateString?: string): string | undefined;
 export declare function validateLimit(limit?: string): number;
 export declare function validateOffset(offset?: string): number;
+export declare function validateDateRangeOrder(since?: string, until?: string): void;
 export declare function filterByDateRange<T extends {
     date?: string;
     month?: string;

package/dist/web-server/usage/handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/handlers.ts"],"names":[],"mappings":"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"}

package/dist/web-server/usage/handlers.js

@@ -6,7 +6,7 @@
  * Separated from routes for better testability and organization.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleInsights = exports.handleStatus = exports.handleRefresh = exports.handleMonthly = exports.handleSessions = exports.handleModels = exports.handleHourly = exports.handleDaily = exports.handleSummary = exports.summarizeAnomalies = exports.detectAnomalies = exports.fillHourlyGaps = exports.calculateTokenBreakdownCosts = exports.errorResponse = exports.filterByDateRange = exports.validateOffset = exports.validateLimit = exports.validateDate = void 0;
+exports.handleInsights = exports.handleStatus = exports.handleRefresh = exports.handleMonthly = exports.handleSessions = exports.handleModels = exports.handleHourly = exports.handleDaily = exports.handleSummary = exports.summarizeAnomalies = exports.detectAnomalies = exports.fillHourlyGaps = exports.calculateTokenBreakdownCosts = exports.errorResponse = exports.filterByDateRange = exports.validateDateRangeOrder = exports.validateOffset = exports.validateLimit = exports.validateDate = void 0;
 const model_pricing_1 = require("../model-pricing");
 const aggregator_1 = require("./aggregator");
 // ============================================================================
@@ -65,6 +65,14 @@ function validateOffset(offset) {
     return num;
 }
 exports.validateOffset = validateOffset;
+function validateDateRangeOrder(since, until) {
+    if (!since || !until)
+        return;
+    if (since > until) {
+        throw new Error('The "since" date must be earlier than or equal to "until"');
+    }
+}
+exports.validateDateRangeOrder = validateDateRangeOrder;
 function filterByDateRange(data, since, until) {
     if (!data || !Array.isArray(data))
         return [];
@@ -96,6 +104,45 @@ function errorResponse(res, error, defaultMessage) {
     });
 }
 exports.errorResponse = errorResponse;
+function roundToCurrency(value) {
+    return Math.round((value + Number.EPSILON) * 100) / 100;
+}
+function calculateUsageTotalTokens(input, output, cacheCreation, cacheRead) {
+    return input + output + cacheCreation + cacheRead;
+}
+function parseDateKey(dateString) {
+    return new Date(Date.UTC(Number(dateString.slice(0, 4)), Number(dateString.slice(4, 6)) - 1, Number(dateString.slice(6, 8))));
+}
+function getInclusiveDayCount(start, end) {
+    const dayMs = 24 * 60 * 60 * 1000;
+    return Math.floor((end.getTime() - start.getTime()) / dayMs) + 1;
+}
+function countCalendarDays(data, since, until) {
+    const sortedDates = [...data]
+        .map((item) => item.date.replace(/-/g, ''))
+        .sort((a, b) => a.localeCompare(b));
+    const earliestDate = sortedDates[0];
+    const latestDate = sortedDates[sortedDates.length - 1];
+    if (since && until) {
+        return getInclusiveDayCount(parseDateKey(since), parseDateKey(until));
+    }
+    if (since) {
+        const end = until
+            ? parseDateKey(until)
+            : latestDate
+                ? parseDateKey(latestDate)
+                : parseDateKey(since);
+        return getInclusiveDayCount(parseDateKey(since), end);
+    }
+    if (until) {
+        const start = earliestDate ? parseDateKey(earliestDate) : parseDateKey(until);
+        return getInclusiveDayCount(start, parseDateKey(until));
+    }
+    if (data.length === 0) {
+        return 0;
+    }
+    return getInclusiveDayCount(parseDateKey(earliestDate), parseDateKey(latestDate));
+}
 // ============================================================================
 // Cost Calculation Helpers
 // ============================================================================
@@ -117,10 +164,10 @@ function calculateTokenBreakdownCosts(dailyData) {
         }
     }
     return {
-        input: { tokens: inputTokens, cost: Math.round(inputCost * 100) / 100 },
-        output: { tokens: outputTokens, cost: Math.round(outputCost * 100) / 100 },
-        cacheCreation: { tokens: cacheCreationTokens, cost: Math.round(cacheCreationCost * 100) / 100 },
-        cacheRead: { tokens: cacheReadTokens, cost: Math.round(cacheReadCost * 100) / 100 },
+        input: { tokens: inputTokens, cost: roundToCurrency(inputCost) },
+        output: { tokens: outputTokens, cost: roundToCurrency(outputCost) },
+        cacheCreation: { tokens: cacheCreationTokens, cost: roundToCurrency(cacheCreationCost) },
+        cacheRead: { tokens: cacheReadTokens, cost: roundToCurrency(cacheReadCost) },
     };
 }
 exports.calculateTokenBreakdownCosts = calculateTokenBreakdownCosts;
@@ -271,6 +318,7 @@ async function handleSummary(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
+        validateDateRangeOrder(since, until);
         const dailyData = await (0, aggregator_1.getCachedDailyData)();
         const filtered = filterByDateRange(dailyData, since, until);
         let totalInputTokens = 0, totalOutputTokens = 0;
@@ -282,8 +330,10 @@ async function handleSummary(req, res) {
             totalCacheReadTokens += day.cacheReadTokens;
             totalCost += day.totalCost;
         }
-        const totalTokens = totalInputTokens + totalOutputTokens;
+        const totalTokens = calculateUsageTotalTokens(totalInputTokens, totalOutputTokens, totalCacheCreationTokens, totalCacheReadTokens);
         const tokenBreakdown = calculateTokenBreakdownCosts(filtered);
+        const totalDays = countCalendarDays(filtered, since, until);
+        const activeDays = filtered.length;
         res.json({
             success: true,
             data: {
@@ -293,11 +343,14 @@ async function handleSummary(req, res) {
                 totalCacheTokens: totalCacheCreationTokens + totalCacheReadTokens,
                 totalCacheCreationTokens,
                 totalCacheReadTokens,
-                totalCost: Math.round(totalCost * 100) / 100,
+                totalCost: roundToCurrency(totalCost),
                 tokenBreakdown,
-                totalDays: filtered.length,
-                averageTokensPerDay: filtered.length > 0 ? Math.round(totalTokens / filtered.length) : 0,
-                averageCostPerDay: filtered.length > 0 ? Math.round((totalCost / filtered.length) * 100) / 100 : 0,
+                totalDays,
+                activeDays,
+                averageTokensPerDay: totalDays > 0 ? Math.round(totalTokens / totalDays) : 0,
+                averageTokensPerActiveDay: activeDays > 0 ? Math.round(totalTokens / activeDays) : 0,
+                averageCostPerDay: totalDays > 0 ? roundToCurrency(totalCost / totalDays) : 0,
+                averageCostPerActiveDay: activeDays > 0 ? roundToCurrency(totalCost / activeDays) : 0,
             },
         });
     }
@@ -310,15 +363,16 @@ async function handleDaily(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
+        validateDateRangeOrder(since, until);
         const dailyData = await (0, aggregator_1.getCachedDailyData)();
         const filtered = filterByDateRange(dailyData, since, until);
         const trends = filtered.map((day) => ({
             date: day.date,
-            tokens: day.inputTokens + day.outputTokens,
+            tokens: calculateUsageTotalTokens(day.inputTokens, day.outputTokens, day.cacheCreationTokens, day.cacheReadTokens),
             inputTokens: day.inputTokens,
             outputTokens: day.outputTokens,
             cacheTokens: day.cacheCreationTokens + day.cacheReadTokens,
-            cost: Math.round(day.totalCost * 100) / 100,
+            cost: roundToCurrency(day.totalCost),
             modelsUsed: day.modelsUsed.length,
         }));
         res.json({ success: true, data: trends });
@@ -332,6 +386,7 @@ async function handleHourly(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
+        validateDateRangeOrder(since, until);
         const hourlyData = await (0, aggregator_1.getCachedHourlyData)();
         const filtered = (hourlyData || []).filter((h) => {
             const hourDate = h.hour.slice(0, 10).replace(/-/g, '');
@@ -343,13 +398,13 @@ async function handleHourly(req, res) {
         });
         const trends = filtered.map((hour) => ({
             hour: hour.hour,
-            tokens: hour.inputTokens + hour.outputTokens,
+            tokens: calculateUsageTotalTokens(hour.inputTokens, hour.outputTokens, hour.cacheCreationTokens, hour.cacheReadTokens),
             inputTokens: hour.inputTokens,
             outputTokens: hour.outputTokens,
             cacheTokens: hour.cacheCreationTokens + hour.cacheReadTokens,
-            cost: Math.round(hour.totalCost * 100) / 100,
+            cost: roundToCurrency(hour.totalCost),
             modelsUsed: hour.modelsUsed.length,
-            requests: hour.modelBreakdowns.length,
+            requests: hour.requestCount ?? hour.modelBreakdowns.length,
         }));
         const filledTrends = fillHourlyGaps(trends, since, until);
         res.json({ success: true, data: filledTrends });
@@ -363,6 +418,7 @@ async function handleModels(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
+        validateDateRangeOrder(since, until);
         const dailyData = await (0, aggregator_1.getCachedDailyData)();
         const filtered = filterByDateRange(dailyData, since, until);
         const modelMap = new Map();
@@ -385,7 +441,8 @@ async function handleModels(req, res) {
             }
         }
         const models = Array.from(modelMap.values());
-        const totalTokens = models.reduce((sum, m) => sum + m.inputTokens + m.outputTokens, 0);
+        const totalTokens = models.reduce((sum, model) => sum +
+            calculateUsageTotalTokens(model.inputTokens, model.outputTokens, model.cacheCreationTokens, model.cacheReadTokens), 0);
         const result = models
             .map((m) => {
             const pricing = (0, model_pricing_1.getModelPricing)(m.model);
@@ -394,26 +451,25 @@ async function handleModels(req, res) {
             const cacheCreationCost = (m.cacheCreationTokens / 1000000) * pricing.cacheCreationPerMillion;
             const cacheReadCost = (m.cacheReadTokens / 1000000) * pricing.cacheReadPerMillion;
             const ioRatio = m.outputTokens > 0 ? m.inputTokens / m.outputTokens : 0;
+            const totalModelTokens = calculateUsageTotalTokens(m.inputTokens, m.outputTokens, m.cacheCreationTokens, m.cacheReadTokens);
             return {
                 model: m.model,
-                tokens: m.inputTokens + m.outputTokens,
+                tokens: totalModelTokens,
                 inputTokens: m.inputTokens,
                 outputTokens: m.outputTokens,
                 cacheCreationTokens: m.cacheCreationTokens,
                 cacheReadTokens: m.cacheReadTokens,
                 cacheTokens: m.cacheCreationTokens + m.cacheReadTokens,
-                cost: Math.round(m.cost * 100) / 100,
-                percentage: totalTokens > 0
-                    ? Math.round(((m.inputTokens + m.outputTokens) / totalTokens) * 1000) / 10
-                    : 0,
+                cost: roundToCurrency(m.cost),
+                percentage: totalTokens > 0 ? Math.round((totalModelTokens / totalTokens) * 1000) / 10 : 0,
                 costBreakdown: {
-                    input: { tokens: m.inputTokens, cost: Math.round(inputCost * 100) / 100 },
-                    output: { tokens: m.outputTokens, cost: Math.round(outputCost * 100) / 100 },
+                    input: { tokens: m.inputTokens, cost: roundToCurrency(inputCost) },
+                    output: { tokens: m.outputTokens, cost: roundToCurrency(outputCost) },
                     cacheCreation: {
                         tokens: m.cacheCreationTokens,
-                        cost: Math.round(cacheCreationCost * 100) / 100,
+                        cost: roundToCurrency(cacheCreationCost),
                     },
-                    cacheRead: { tokens: m.cacheReadTokens, cost: Math.round(cacheReadCost * 100) / 100 },
+                    cacheRead: { tokens: m.cacheReadTokens, cost: roundToCurrency(cacheReadCost) },
                 },
                 ioRatio: Math.round(ioRatio * 10) / 10,
             };
@@ -430,6 +486,7 @@ async function handleSessions(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
+        validateDateRangeOrder(since, until);
         const limit = validateLimit(req.query.limit);
         const offset = validateOffset(req.query.offset);
         const sessionData = await (0, aggregator_1.getCachedSessionData)();
@@ -439,10 +496,10 @@ async function handleSessions(req, res) {
         const sessions = paginated.map((s) => ({
             sessionId: s.sessionId,
             projectPath: s.projectPath,
-            tokens: s.inputTokens + s.outputTokens,
+            tokens: calculateUsageTotalTokens(s.inputTokens, s.outputTokens, s.cacheCreationTokens, s.cacheReadTokens),
             inputTokens: s.inputTokens,
             outputTokens: s.outputTokens,
-            cost: Math.round(s.totalCost * 100) / 100,
+            cost: roundToCurrency(s.totalCost),
             lastActivity: s.lastActivity,
             modelsUsed: s.modelsUsed,
             target: s.target || 'claude',
@@ -467,24 +524,72 @@ async function handleMonthly(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
-        const monthlyData = await (0, aggregator_1.getCachedMonthlyData)();
-        const filtered = since || until
-            ? monthlyData.filter((m) => {
-                const monthDate = m.month.replace('-', '') + '01';
-                if (since && monthDate < since)
-                    return false;
-                if (until && monthDate > until)
-                    return false;
-                return true;
-            })
-            : monthlyData;
+        validateDateRangeOrder(since, until);
+        let filtered;
+        if (since || until) {
+            const dailyData = filterByDateRange(await (0, aggregator_1.getCachedDailyData)(), since, until);
+            const monthMap = new Map();
+            for (const day of dailyData) {
+                const month = day.date.slice(0, 7);
+                const existing = monthMap.get(month) ?? {
+                    month,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheCreationTokens: 0,
+                    cacheReadTokens: 0,
+                    totalCost: 0,
+                    modelsUsed: new Set(),
+                    modelBreakdowns: new Map(),
+                };
+                existing.inputTokens += day.inputTokens;
+                existing.outputTokens += day.outputTokens;
+                existing.cacheCreationTokens += day.cacheCreationTokens;
+                existing.cacheReadTokens += day.cacheReadTokens;
+                existing.totalCost += day.totalCost;
+                for (const model of day.modelsUsed) {
+                    existing.modelsUsed.add(model);
+                }
+                for (const breakdown of day.modelBreakdowns) {
+                    const existingBreakdown = existing.modelBreakdowns.get(breakdown.modelName) ?? {
+                        modelName: breakdown.modelName,
+                        inputTokens: 0,
+                        outputTokens: 0,
+                        cacheCreationTokens: 0,
+                        cacheReadTokens: 0,
+                        cost: 0,
+                    };
+                    existingBreakdown.inputTokens += breakdown.inputTokens;
+                    existingBreakdown.outputTokens += breakdown.outputTokens;
+                    existingBreakdown.cacheCreationTokens += breakdown.cacheCreationTokens;
+                    existingBreakdown.cacheReadTokens += breakdown.cacheReadTokens;
+                    existingBreakdown.cost += breakdown.cost;
+                    existing.modelBreakdowns.set(breakdown.modelName, existingBreakdown);
+                }
+                monthMap.set(month, existing);
+            }
+            filtered = Array.from(monthMap.values())
+                .map((month) => ({
+                month: month.month,
+                inputTokens: month.inputTokens,
+                outputTokens: month.outputTokens,
+                cacheCreationTokens: month.cacheCreationTokens,
+                cacheReadTokens: month.cacheReadTokens,
+                totalCost: month.totalCost,
+                modelsUsed: Array.from(month.modelsUsed),
+                modelBreakdowns: Array.from(month.modelBreakdowns.values()),
+            }))
+                .sort((a, b) => a.month.localeCompare(b.month));
+        }
+        else {
+            filtered = await (0, aggregator_1.getCachedMonthlyData)();
+        }
         const result = filtered.map((m) => ({
             month: m.month,
-            tokens: m.inputTokens + m.outputTokens,
+            tokens: calculateUsageTotalTokens(m.inputTokens, m.outputTokens, m.cacheCreationTokens, m.cacheReadTokens),
             inputTokens: m.inputTokens,
             outputTokens: m.outputTokens,
             cacheTokens: m.cacheCreationTokens + m.cacheReadTokens,
-            cost: Math.round(m.totalCost * 100) / 100,
+            cost: roundToCurrency(m.totalCost),
             modelsUsed: m.modelsUsed.length,
         }));
         res.json({ success: true, data: result.sort((a, b) => a.month.localeCompare(b.month)) });
@@ -505,10 +610,9 @@ async function handleRefresh(_req, res) {
 }
 exports.handleRefresh = handleRefresh;
 function handleStatus(_req, res) {
-    const cache = new Map(); // Note: this is a placeholder, actual cache is in aggregator
     res.json({
         success: true,
-        data: { lastFetch: (0, aggregator_1.getLastFetchTimestamp)(), cacheSize: cache.size },
+        data: { lastFetch: (0, aggregator_1.getLastFetchTimestamp)(), cacheSize: (0, aggregator_1.getUsageCacheSize)() },
     });
 }
 exports.handleStatus = handleStatus;
@@ -516,6 +620,7 @@ async function handleInsights(req, res) {
     try {
         const since = validateDate(req.query.since);
         const until = validateDate(req.query.until);
+        validateDateRangeOrder(since, until);
         const dailyData = await (0, aggregator_1.getCachedDailyData)();
         const filtered = filterByDateRange(dailyData, since, until);
         const anomalies = detectAnomalies(filtered);