@kaitranntt/ccs 7.77.1-dev.2 → 7.77.1-dev.4

package/dist/cliproxy/services/oauth-usage-log-transformer.js

@@ -0,0 +1,162 @@
+"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.buildUsageResponseFromCliproxyMainLog = exports.buildUsageResponseFromCliproxyLogLines = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const path_resolver_1 = require("../config/path-resolver");
+const usage_compatibility_transformer_1 = require("./usage-compatibility-transformer");
+function unquote(value) {
+    return value.trim().replace(/^['"]|['"]$/g, '');
+}
+function extractTimestamp(line) {
+    const isoTimestamp = line.match(/\d{4}-\d{2}-\d{2}T[^\s\]]+/)?.[0];
+    if (isoTimestamp) {
+        return isoTimestamp.replace(/[,\]]+$/, '');
+    }
+    const bracketedTimestamp = line
+        .match(/^\[(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}:\d{2})\]/)
+        ?.slice(1, 3);
+    if (!bracketedTimestamp) {
+        return undefined;
+    }
+    const [datePart, timePart] = bracketedTimestamp;
+    const [year, month, day] = datePart.split('-').map(Number);
+    const [hour, minute, second] = timePart.split(':').map(Number);
+    return new Date(year, month - 1, day, hour, minute, second).toISOString();
+}
+function extractRequestId(line) {
+    const explicitRequestId = line.match(/\b(?:request[_-]?id|req[_-]?id|rid)[=:]\s*([A-Za-z0-9._:-]+)/i)?.[1];
+    if (explicitRequestId) {
+        return explicitRequestId;
+    }
+    const bracketedRequestId = line.match(/^\[[^\]]+\]\s+\[([^\]]+)\]/)?.[1]?.trim();
+    return bracketedRequestId && bracketedRequestId !== '--------' ? bracketedRequestId : undefined;
+}
+function parseOAuthSelection(line) {
+    const match = line.match(/Use OAuth\s+provider=([^\s]+)\s+auth_file=("[^"]+"|'[^']+'|[^\s]+)\s+for model\s+("[^"]+"|'[^']+'|[^\s]+)/i);
+    if (!match) {
+        return null;
+    }
+    return {
+        timestamp: extractTimestamp(line),
+        provider: unquote(match[1] ?? 'unknown'),
+        authFile: unquote(match[2] ?? 'unknown'),
+        model: unquote(match[3] ?? 'unknown'),
+        requestId: extractRequestId(line),
+    };
+}
+function parseProviderCompletion(line) {
+    const match = line.match(/\b(?:POST|GET)\s+"?\/api\/provider\/([^/"\s]+)\//i);
+    if (!match) {
+        return null;
+    }
+    return {
+        timestamp: extractTimestamp(line),
+        provider: unquote(match[1] ?? 'unknown'),
+        requestId: extractRequestId(line),
+        failed: /\b(?:failed|failure|error)\b/i.test(line) ||
+            /\bstatus[=:]\s*[45]\d\d\b/i.test(line) ||
+            /\s[45]\d\d(?:\s|$)/.test(line),
+    };
+}
+function addPendingRequest(pending, byRequestId, byProvider) {
+    if (pending.requestId) {
+        const previous = byRequestId.get(pending.requestId);
+        if (previous) {
+            const previousProviderQueue = byProvider.get(previous.provider) ?? [];
+            byProvider.set(previous.provider, previousProviderQueue.filter((entry) => entry !== previous));
+        }
+        byRequestId.set(pending.requestId, pending);
+    }
+    const providerQueue = byProvider.get(pending.provider) ?? [];
+    providerQueue.push(pending);
+    byProvider.set(pending.provider, providerQueue);
+}
+function takePendingRequest(completion, byRequestId, byProvider) {
+    const byId = completion.requestId ? byRequestId.get(completion.requestId) : undefined;
+    if (byId) {
+        byRequestId.delete(completion.requestId ?? '');
+        const providerQueue = byProvider.get(byId.provider) ?? [];
+        byProvider.set(byId.provider, providerQueue.filter((entry) => entry !== byId));
+        return byId;
+    }
+    const providerQueue = byProvider.get(completion.provider) ?? [];
+    const next = providerQueue.shift();
+    byProvider.set(completion.provider, providerQueue);
+    if (next?.requestId) {
+        byRequestId.delete(next.requestId);
+    }
+    return next ?? null;
+}
+function buildUsageResponseFromCliproxyLogLines(lines) {
+    const pendingByRequestId = new Map();
+    const pendingByProvider = new Map();
+    const records = [];
+    for (const line of lines) {
+        const selection = parseOAuthSelection(line);
+        if (selection) {
+            addPendingRequest(selection, pendingByRequestId, pendingByProvider);
+            continue;
+        }
+        const completion = parseProviderCompletion(line);
+        if (!completion) {
+            continue;
+        }
+        const pending = takePendingRequest(completion, pendingByRequestId, pendingByProvider);
+        if (!pending) {
+            continue;
+        }
+        records.push({
+            timestamp: completion.timestamp ?? pending.timestamp ?? '1970-01-01T00:00:00.000Z',
+            provider: pending.provider,
+            model: pending.model,
+            source: `provider=${pending.provider} auth_file=${pending.authFile}`,
+            auth_index: pending.authFile,
+            request_id: completion.requestId ?? pending.requestId,
+            failed: completion.failed,
+            tokens: {},
+        });
+    }
+    return (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)(records);
+}
+exports.buildUsageResponseFromCliproxyLogLines = buildUsageResponseFromCliproxyLogLines;
+function readLogFile(filePath) {
+    if (!fs.existsSync(filePath)) {
+        return null;
+    }
+    return fs.readFileSync(filePath, 'utf-8');
+}
+function buildUsageResponseFromCliproxyMainLog() {
+    const logPath = path.join((0, path_resolver_1.getCliproxyWritablePath)(), 'logs', 'main.log');
+    const contents = readLogFile(logPath);
+    if (!contents) {
+        return null;
+    }
+    const response = buildUsageResponseFromCliproxyLogLines(contents.split(/\r?\n/));
+    return (0, usage_compatibility_transformer_1.hasUsageDetails)(response) ? response : null;
+}
+exports.buildUsageResponseFromCliproxyMainLog = buildUsageResponseFromCliproxyMainLog;
+//# sourceMappingURL=oauth-usage-log-transformer.js.map

package/dist/cliproxy/services/oauth-usage-log-transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-usage-log-transformer.js","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/services/stats-fetcher.d.ts

@@ -53,6 +53,7 @@ export interface CliproxyRequestDetail {
     timestamp: string;
     source: string;
     auth_index: string | number;
+    request_id?: string;
     tokens: {
         input_tokens: number;
         output_tokens: number;
@@ -101,6 +102,9 @@ export declare function fetchCliproxyStats(port?: number): Promise<CliproxyStats
  * Returns the unprocessed API response for transformation by cliproxy-usage-transformer
  */
 export declare function fetchCliproxyUsageRaw(port?: number): Promise<CliproxyUsageApiResponse | null>;
+export declare const __testExports: {
+    clearCachedUsageQueueResponse(): void;
+};
 /** OpenAI-compatible model object from /v1/models endpoint */
 export interface CliproxyModel {
     id: string;

package/dist/cliproxy/services/stats-fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stats-fetcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stats-fetcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/services/stats-fetcher.js

@@ -6,10 +6,16 @@
  * Requires usage-statistics-enabled: true in config.yaml.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCliproxyRunning = exports.fetchCliproxyErrorLogContent = exports.fetchCliproxyErrorLogs = exports.fetchCliproxyModels = exports.fetchCliproxyUsageRaw = exports.fetchCliproxyStats = void 0;
+exports.isCliproxyRunning = exports.fetchCliproxyErrorLogContent = exports.fetchCliproxyErrorLogs = exports.fetchCliproxyModels = exports.__testExports = exports.fetchCliproxyUsageRaw = exports.fetchCliproxyStats = void 0;
 const auth_token_manager_1 = require("../auth/auth-token-manager");
 const proxy_target_resolver_1 = require("../proxy/proxy-target-resolver");
 const stats_transformer_1 = require("./stats-transformer");
+const oauth_usage_log_transformer_1 = require("./oauth-usage-log-transformer");
+const usage_compatibility_transformer_1 = require("./usage-compatibility-transformer");
+const cachedUsageQueueResponses = new Map();
+const USAGE_QUEUE_BATCH_SIZE = 1000;
+const USAGE_QUEUE_MAX_BATCHES = 100;
+const USAGE_QUEUE_DRAIN_TIMEOUT_MS = 30000;
 /**
  * Fetch usage statistics from CLIProxyAPI management API
  * @param port CLIProxyAPI port (default: 8317)
@@ -37,14 +43,119 @@ exports.fetchCliproxyStats = fetchCliproxyStats;
  * Returns the unprocessed API response for transformation by cliproxy-usage-transformer
  */
 async function fetchCliproxyUsageRaw(port) {
+    let localLogUsage;
+    const getLocalLogUsage = () => {
+        if (localLogUsage !== undefined) {
+            return localLogUsage;
+        }
+        localLogUsage = (0, proxy_target_resolver_1.getProxyTarget)().isRemote ? null : (0, oauth_usage_log_transformer_1.buildUsageResponseFromCliproxyMainLog)();
+        return localLogUsage;
+    };
+    const mergeLocalLogUsage = (response) => (0, usage_compatibility_transformer_1.mergeUsageResponseWithMissingDetails)(response, getLocalLogUsage());
+    const mergeAggregateWithDetails = (aggregate, details) => (0, usage_compatibility_transformer_1.mergeUsageResponseWithMissingDetails)(aggregate, details, { appendExtraDetails: false });
+    let legacyAggregateUsage = null;
+    const legacyUsage = await fetchManagementJson('/v0/management/usage', port);
+    if (legacyUsage?.ok && legacyUsage.data) {
+        if ((0, usage_compatibility_transformer_1.hasUsageDetails)(legacyUsage.data)) {
+            return mergeLocalLogUsage(legacyUsage.data);
+        }
+        legacyAggregateUsage = legacyUsage.data;
+    }
+    let cachedUsageQueueResponse;
+    const usageQueue = await fetchUsageQueueRecords(port);
+    if (usageQueue?.cacheKey) {
+        cachedUsageQueueResponse = cachedUsageQueueResponses.get(usageQueue.cacheKey);
+    }
+    if (usageQueue && Array.isArray(usageQueue.data)) {
+        const queueResponse = (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)(usageQueue.data);
+        if ((0, usage_compatibility_transformer_1.hasUsageDetails)(queueResponse)) {
+            const mergedUsageQueueResponse = cachedUsageQueueResponse
+                ? (0, usage_compatibility_transformer_1.mergeUsageResponses)(cachedUsageQueueResponse, queueResponse)
+                : queueResponse;
+            cachedUsageQueueResponses.set(usageQueue.cacheKey, mergedUsageQueueResponse);
+            cachedUsageQueueResponse = mergedUsageQueueResponse;
+            if (usageQueue.ok) {
+                const response = legacyAggregateUsage
+                    ? mergeAggregateWithDetails(legacyAggregateUsage, mergedUsageQueueResponse)
+                    : mergedUsageQueueResponse;
+                return mergeLocalLogUsage(response);
+            }
+        }
+    }
+    if (legacyAggregateUsage) {
+        const response = cachedUsageQueueResponse
+            ? mergeAggregateWithDetails(legacyAggregateUsage, cachedUsageQueueResponse)
+            : legacyAggregateUsage;
+        return mergeLocalLogUsage(response);
+    }
+    const apiKeyUsage = await fetchManagementJson('/v0/management/api-key-usage', port);
+    if (apiKeyUsage?.ok && apiKeyUsage.data) {
+        const apiKeyResponseWithCachedDetails = cachedUsageQueueResponse
+            ? mergeAggregateWithDetails((0, usage_compatibility_transformer_1.buildUsageResponseFromApiKeyUsage)(apiKeyUsage.data), cachedUsageQueueResponse)
+            : (0, usage_compatibility_transformer_1.buildUsageResponseFromApiKeyUsage)(apiKeyUsage.data);
+        const apiKeyResponse = mergeLocalLogUsage(apiKeyResponseWithCachedDetails);
+        if ((0, usage_compatibility_transformer_1.hasUsageTotals)(apiKeyResponse)) {
+            return apiKeyResponse;
+        }
+    }
+    if (cachedUsageQueueResponse) {
+        return mergeLocalLogUsage(cachedUsageQueueResponse);
+    }
+    const logUsage = getLocalLogUsage();
+    if (logUsage && (0, usage_compatibility_transformer_1.hasUsageDetails)(logUsage)) {
+        return logUsage;
+    }
+    if (usageQueue?.ok) {
+        return (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)([]);
+    }
+    return null;
+}
+exports.fetchCliproxyUsageRaw = fetchCliproxyUsageRaw;
+async function fetchUsageQueueRecords(port) {
+    const records = [];
+    const seenFullBatchSignatures = new Set();
+    let cacheKey = '';
+    let status = 0;
+    const drainStartedAt = Date.now();
+    for (let batchCount = 0; batchCount < USAGE_QUEUE_MAX_BATCHES; batchCount++) {
+        const result = await fetchManagementJson(`/v0/management/usage-queue?count=${USAGE_QUEUE_BATCH_SIZE}`, port);
+        if (!result) {
+            return records.length > 0 ? { ok: false, status, data: records, cacheKey } : null;
+        }
+        cacheKey || (cacheKey = result.cacheKey);
+        status = result.status;
+        if (!result.ok || !Array.isArray(result.data)) {
+            return records.length > 0 ? { ok: false, status, data: records, cacheKey } : result;
+        }
+        if (result.data.length === USAGE_QUEUE_BATCH_SIZE) {
+            const batchSignature = createUsageQueueBatchSignature(result.data);
+            if (seenFullBatchSignatures.has(batchSignature)) {
+                return { ok: false, status, data: records, cacheKey };
+            }
+            seenFullBatchSignatures.add(batchSignature);
+        }
+        records.push(...result.data);
+        if (result.data.length < USAGE_QUEUE_BATCH_SIZE) {
+            return { ok: true, status, data: records, cacheKey };
+        }
+        if (Date.now() - drainStartedAt >= USAGE_QUEUE_DRAIN_TIMEOUT_MS) {
+            return { ok: false, status, data: records, cacheKey };
+        }
+    }
+    return { ok: false, status, data: records, cacheKey };
+}
+function createUsageQueueBatchSignature(records) {
+    return JSON.stringify(records);
+}
+async function fetchManagementJson(endpointPath, port, timeoutMs = 5000) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
     try {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 5000);
         const target = (0, proxy_target_resolver_1.getProxyTarget)();
         if (port !== undefined && !target.isRemote) {
             target.port = port;
         }
-        const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, '/v0/management/usage');
+        const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, endpointPath);
         const headers = target.isRemote
             ? (0, proxy_target_resolver_1.buildManagementHeaders)(target)
             : { Accept: 'application/json', Authorization: `Bearer ${(0, auth_token_manager_1.getEffectiveManagementSecret)()}` };
@@ -52,44 +163,41 @@ async function fetchCliproxyUsageRaw(port) {
             signal: controller.signal,
             headers,
         });
-        clearTimeout(timeoutId);
         if (!response.ok) {
-            return null;
+            return { ok: false, status: response.status, data: null, cacheKey: url };
         }
-        return (await response.json());
+        return {
+            ok: true,
+            status: response.status,
+            data: (await response.json()),
+            cacheKey: url,
+        };
     }
     catch {
         return null;
     }
+    finally {
+        clearTimeout(timeoutId);
+    }
 }
-exports.fetchCliproxyUsageRaw = fetchCliproxyUsageRaw;
 async function fetchCliproxyAuthFiles(port) {
     try {
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 5000);
-        const target = (0, proxy_target_resolver_1.getProxyTarget)();
-        if (port !== undefined && !target.isRemote) {
-            target.port = port;
-        }
-        const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, '/v0/management/auth-files');
-        const headers = target.isRemote
-            ? (0, proxy_target_resolver_1.buildManagementHeaders)(target)
-            : { Accept: 'application/json', Authorization: `Bearer ${(0, auth_token_manager_1.getEffectiveManagementSecret)()}` };
-        const response = await fetch(url, {
-            signal: controller.signal,
-            headers,
-        });
-        clearTimeout(timeoutId);
-        if (!response.ok) {
+        const result = await fetchManagementJson('/v0/management/auth-files', port);
+        if (!result?.ok || !result.data) {
             return null;
         }
-        const data = (await response.json());
+        const data = result.data;
         return Array.isArray(data.files) ? data.files : null;
     }
     catch {
         return null;
     }
 }
+exports.__testExports = {
+    clearCachedUsageQueueResponse() {
+        cachedUsageQueueResponses.clear();
+    },
+};
 /**
  * Fetch available models from CLIProxyAPI /v1/models endpoint
  * @param port CLIProxyAPI port (default: 8317)

package/dist/cliproxy/services/stats-fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"stats-fetcher.js","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mEAA8F;AAC9F,0EAKwC;AACxC,2DAA0E;AAoG1E;;;;GAIG;AACI,KAAK,UAAU,kBAAkB,CAAC,IAAa;IACpD,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1C,qBAAqB,CAAC,IAAI,CAAC;YAC3B,sBAAsB,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAA,uDAAmC,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,EAAE,CAAC,CAAC;IACnF,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAhBD,gDAgBC;AAED;;;GAGG;AACI,KAAK,UAAU,qBAAqB,CACzC,IAAa;IAEb,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,IAAA,sCAAc,GAAE,CAAC;QAChC,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,qCAAa,EAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ;YAC7B,CAAC,CAAC,IAAA,8CAAsB,EAAC,MAAM,CAAC;YAChC,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,IAAA,iDAA4B,GAAE,EAAE,EAAE,CAAC;QAE9F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA6B,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAhCD,sDAgCC;AAED,KAAK,UAAU,sBAAsB,CAAC,IAAa;IACjD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,IAAA,sCAAc,GAAE,CAAC;QAChC,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,qCAAa,EAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;QAE/D,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ;YAC7B,CAAC,CAAC,IAAA,8CAAsB,EAAC,MAAM,CAAC;YAChC,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,IAAA,iDAA4B,GAAE,EAAE,EAAE,CAAC;QAE9F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA6C,CAAC;QACjF,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAuBD;;;;GAIG;AACI,KAAK,UAAU,mBAAmB,CAAC,IAAa;IACrD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QAE7D,4BAA4B;QAC5B,MAAM,MAAM,GAAG,IAAA,sCAAc,GAAE,CAAC;QAChC,6CAA6C;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,qCAAa,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAEhD,mFAAmF;QACnF,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ;YAC7B,CAAC,CAAC,IAAA,yCAAiB,EAAC,MAAM,CAAC;YAC3B,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,IAAA,uCAAkB,GAAE,EAAE,EAAE,CAAC;QAEpF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsB,CAAC;QAE1D,iCAAiC;QACjC,MAAM,UAAU,GAAoC,EAAE,CAAC;QACvD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,OAAO,CAAC;YAC3C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1B,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC5B,CAAC;YACD,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAED,kDAAkD;QAClD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/C,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,UAAU;YACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SAC7B,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAtDD,kDAsDC;AAuBD;;;;GAIG;AACI,KAAK,UAAU,sBAAsB,CAAC,IAAa;IACxD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QAE7D,4BAA4B;QAC5B,MAAM,MAAM,GAAG,IAAA,sCAAc,GAAE,CAAC;QAChC,6CAA6C;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,qCAAa,EAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;QAEvE,6FAA6F;QAC7F,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ;YAC7B,CAAC,CAAC,IAAA,8CAAsB,EAAC,MAAM,CAAC;YAChC,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,IAAA,iDAA4B,GAAE,EAAE,EAAE,CAAC;QAE9F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;QAC7D,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAlCD,wDAkCC;AAED;;;;;GAKG;AACI,KAAK,UAAU,4BAA4B,CAChD,IAAY,EACZ,IAAa;IAEb,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QAE7D,4BAA4B;QAC5B,MAAM,MAAM,GAAG,IAAA,sCAAc,GAAE,CAAC;QAChC,6CAA6C;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,qCAAa,EACvB,MAAM,EACN,qCAAqC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAChE,CAAC;QAEF,6FAA6F;QAC7F,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ;YAC7B,CAAC,CAAC,IAAA,8CAAsB,EAAC,MAAM,CAAC;YAChC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,IAAA,iDAA4B,GAAE,EAAE,EAAE,CAAC;QAElE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,OAAO;SACR,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAvCD,oEAuCC;AAED;;;;GAIG;AACI,KAAK,UAAU,iBAAiB,CAAC,IAAa;IACnD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,aAAa;QAE3E,4BAA4B;QAC5B,MAAM,MAAM,GAAG,IAAA,sCAAc,GAAE,CAAC;QAChC,6CAA6C;QAC7C,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,qCAAa,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvC,kDAAkD;QAClD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QACxB,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAvBD,8CAuBC"}
+{"version":3,"file":"stats-fetcher.js","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"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"}

package/dist/cliproxy/services/stats-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stats-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-transformer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,0BAA0B,EAE1B,aAAa,EACb,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AAEzB,UAAU,yBAAyB;IACjC,SAAS,CAAC,EAAE,0BAA0B,EAAE,CAAC;CAC1C;AAqGD,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,wBAAwB,EAC9B,OAAO,GAAE,yBAA8B,GACtC,aAAa,CAyFf"}
+{"version":3,"file":"stats-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-transformer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,0BAA0B,EAE1B,aAAa,EACb,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AAEzB,UAAU,yBAAyB;IACjC,SAAS,CAAC,EAAE,0BAA0B,EAAE,CAAC;CAC1C;AAqKD,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,wBAAwB,EAC9B,OAAO,GAAE,yBAA8B,GACtC,aAAa,CAqHf"}

package/dist/cliproxy/services/stats-transformer.js

@@ -11,6 +11,38 @@ function normalizeProvider(provider) {
     }
     return (0, provider_capabilities_1.mapExternalProviderName)(normalized) ?? normalized;
 }
+function extractAuthFilenameFromSource(source) {
+    const authFileMatch = source.match(/(?:^|\s)auth_file=("[^"]+"|'[^']+'|[^\s]+)/i);
+    const rawValue = authFileMatch?.[1] ?? source;
+    const value = rawValue.trim().replace(/^['"]|['"]$/g, '');
+    const filenameCandidate = value.split('|').pop() ?? value;
+    return filenameCandidate.split(/[\\/]/).pop() ?? filenameCandidate.trim();
+}
+function stripKnownAuthPlanSuffix(value) {
+    return value.replace(/-(?:free|plus|pro|team|business|enterprise)$/i, '');
+}
+function normalizeAuthFilenameSource(provider, source) {
+    const filename = extractAuthFilenameFromSource(source);
+    const normalizedProvider = normalizeProvider(provider);
+    const hadJsonExtension = /\.json$/i.test(filename);
+    let candidate = filename.replace(/\.json$/i, '');
+    const providerPrefix = `${normalizedProvider}-`;
+    if (candidate.toLowerCase().startsWith(providerPrefix)) {
+        candidate = candidate.slice(providerPrefix.length);
+    }
+    candidate = candidate.replace(/^[a-f0-9]{8}[-_]/i, '');
+    if (hadJsonExtension) {
+        candidate = stripKnownAuthPlanSuffix(candidate);
+    }
+    const parts = candidate.split('@');
+    if (parts.length < 2) {
+        return null;
+    }
+    const localPart = parts[0]?.trim();
+    const domainPart = parts.slice(1).join('@').trim();
+    const email = `${localPart}@${domainPart}`;
+    return /^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(email) ? email.toLowerCase() : null;
+}
 function buildAuthIndexLookup(authFiles) {
     const lookup = new Map();
     const duplicateEmailCounts = new Map();
@@ -61,10 +93,30 @@ function resolveSourceForDetail(resolvedProvider, detail, authIndexLookup) {
     }
     const source = detail.source?.trim();
     if (source) {
-        return source;
+        return normalizeAuthFilenameSource(resolvedProvider, source) ?? source;
     }
     return resolvedAuthFile?.source ?? 'unknown';
 }
+function resolveCountWithDetails(aggregateCount, detailCount) {
+    if (aggregateCount === undefined) {
+        return detailCount;
+    }
+    return aggregateCount < detailCount ? detailCount : aggregateCount;
+}
+function shouldReplaceLastUsedAt(current, next) {
+    if (!next) {
+        return false;
+    }
+    const nextTime = Date.parse(next);
+    if (!Number.isFinite(nextTime)) {
+        return false;
+    }
+    if (!current) {
+        return true;
+    }
+    const currentTime = Date.parse(current);
+    return !Number.isFinite(currentTime) || nextTime > currentTime;
+}
 function buildCliproxyStatsFromUsageResponse(data, options = {}) {
     const usage = data.usage;
     const requestsByModel = {};
@@ -78,7 +130,7 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
     let sawAnyDetail = false;
     if (usage?.apis) {
         for (const [provider, providerData] of Object.entries(usage.apis)) {
-            let sawProviderDetail = false;
+            let providerDetailCount = 0;
             if (!providerData.models) {
                 const normalizedProvider = normalizeProvider(provider);
                 requestsByProvider[normalizedProvider] =
@@ -86,13 +138,15 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
                 continue;
             }
             for (const [model, modelData] of Object.entries(providerData.models)) {
-                requestsByModel[model] = modelData.total_requests ?? 0;
+                let modelDetailCount = 0;
                 if (!modelData.details) {
+                    requestsByModel[model] = (requestsByModel[model] ?? 0) + (modelData.total_requests ?? 0);
                     continue;
                 }
                 for (const detail of modelData.details) {
                     sawAnyDetail = true;
-                    sawProviderDetail = true;
+                    providerDetailCount++;
+                    modelDetailCount++;
                     const resolvedProvider = resolveProviderForDetail(provider, detail, authIndexLookup);
                     const source = resolveSourceForDetail(resolvedProvider, detail, authIndexLookup);
                     const accountKey = (0, account_stats_key_1.buildQualifiedAccountStatsKey)(resolvedProvider, source);
@@ -117,24 +171,42 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
                     }
                     const tokens = detail.tokens?.total_tokens ?? 0;
                     accountStats[accountKey].totalTokens += tokens;
-                    accountStats[accountKey].lastUsedAt = detail.timestamp;
+                    if (shouldReplaceLastUsedAt(accountStats[accountKey].lastUsedAt, detail.timestamp)) {
+                        accountStats[accountKey].lastUsedAt = detail.timestamp;
+                    }
                     totalInputTokens += detail.tokens?.input_tokens ?? 0;
                     totalOutputTokens += detail.tokens?.output_tokens ?? 0;
                 }
+                requestsByModel[model] =
+                    (requestsByModel[model] ?? 0) +
+                        resolveCountWithDetails(modelData.total_requests, modelDetailCount);
             }
-            if (!sawProviderDetail) {
+            const providerTotal = providerData.total_requests ?? 0;
+            if (providerDetailCount === 0) {
                 const normalizedProvider = normalizeProvider(provider);
                 requestsByProvider[normalizedProvider] =
-                    (requestsByProvider[normalizedProvider] ?? 0) + (providerData.total_requests ?? 0);
+                    (requestsByProvider[normalizedProvider] ?? 0) + providerTotal;
+            }
+            else if (providerTotal > providerDetailCount) {
+                const normalizedProvider = normalizeProvider(provider);
+                requestsByProvider[normalizedProvider] =
+                    (requestsByProvider[normalizedProvider] ?? 0) + (providerTotal - providerDetailCount);
             }
         }
     }
+    const aggregateFailureCount = usage?.failure_count ?? data.failed_requests;
+    const successCount = sawAnyDetail
+        ? resolveCountWithDetails(usage?.success_count, totalSuccessCount)
+        : (usage?.success_count ?? 0);
+    const failureCount = sawAnyDetail
+        ? resolveCountWithDetails(aggregateFailureCount, totalFailureCount)
+        : (aggregateFailureCount ?? 0);
+    const providerTotalRequests = Object.values(requestsByProvider).reduce((total, count) => total + count, 0);
+    const totalRequests = Math.max(usage?.total_requests ?? 0, successCount + failureCount, providerTotalRequests);
     return {
-        totalRequests: usage?.total_requests ?? 0,
-        successCount: sawAnyDetail ? totalSuccessCount : (usage?.success_count ?? 0),
-        failureCount: sawAnyDetail
-            ? totalFailureCount
-            : (usage?.failure_count ?? data.failed_requests ?? 0),
+        totalRequests,
+        successCount,
+        failureCount,
         tokens: {
             input: totalInputTokens,
             output: totalOutputTokens,
@@ -143,7 +215,7 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
         requestsByModel,
         requestsByProvider,
         accountStats,
-        quotaExceededCount: usage?.failure_count ?? data.failed_requests ?? 0,
+        quotaExceededCount: failureCount,
         retryCount: 0,
         collectedAt: new Date().toISOString(),
     };