@kaitranntt/ccs 7.77.1-dev.3 → 7.77.1-dev.5

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(),
     };

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

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

package/dist/cliproxy/services/usage-compatibility-transformer.d.ts

@@ -0,0 +1,12 @@
+import type { CliproxyUsageApiResponse } from './stats-fetcher';
+interface MergeMissingDetailsOptions {
+    appendExtraDetails?: boolean;
+}
+export declare function buildUsageResponseFromQueueRecords(records: unknown[]): CliproxyUsageApiResponse;
+export declare function mergeUsageResponses(base: CliproxyUsageApiResponse, incoming: CliproxyUsageApiResponse): CliproxyUsageApiResponse;
+export declare function mergeUsageResponseWithMissingDetails(base: CliproxyUsageApiResponse, incoming: CliproxyUsageApiResponse | null | undefined, options?: MergeMissingDetailsOptions): CliproxyUsageApiResponse;
+export declare function buildUsageResponseFromApiKeyUsage(rawResponse: unknown): CliproxyUsageApiResponse;
+export declare function hasUsageDetails(response: CliproxyUsageApiResponse): boolean;
+export declare function hasUsageTotals(response: CliproxyUsageApiResponse): boolean;
+export {};
+//# sourceMappingURL=usage-compatibility-transformer.d.ts.map

package/dist/cliproxy/services/usage-compatibility-transformer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-compatibility-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/usage-compatibility-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAqBvF,UAAU,0BAA0B;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAyJD,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,wBAAwB,CA6B/F;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,wBAAwB,EAC9B,QAAQ,EAAE,wBAAwB,GACjC,wBAAwB,CAc1B;AAkTD,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,wBAAwB,EAC9B,QAAQ,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,EACrD,OAAO,GAAE,0BAA+B,GACvC,wBAAwB,CA2C1B;AAED,wBAAgB,iCAAiC,CAAC,WAAW,EAAE,OAAO,GAAG,wBAAwB,CA4ChG;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,wBAAwB,GAAG,OAAO,CAE3E;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,wBAAwB,GAAG,OAAO,CAE1E"}

package/dist/cliproxy/services/usage-compatibility-transformer.js

@@ -0,0 +1,458 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasUsageTotals = exports.hasUsageDetails = exports.buildUsageResponseFromApiKeyUsage = exports.mergeUsageResponseWithMissingDetails = exports.mergeUsageResponses = exports.buildUsageResponseFromQueueRecords = void 0;
+function asRecord(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : null;
+}
+function asString(value, fallback) {
+    return typeof value === 'string' && value.trim() ? value.trim() : fallback;
+}
+function asNumber(value) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value;
+    }
+    if (typeof value === 'string' && value.trim()) {
+        const parsed = Number(value);
+        return Number.isFinite(parsed) ? parsed : 0;
+    }
+    return 0;
+}
+function asBoolean(value) {
+    return value === true;
+}
+function normalizeTokens(rawTokens) {
+    const tokens = asRecord(rawTokens) ?? {};
+    const input = asNumber(tokens.input_tokens);
+    const output = asNumber(tokens.output_tokens);
+    const reasoning = asNumber(tokens.reasoning_tokens);
+    const cached = asNumber(tokens.cached_tokens);
+    const explicitTotal = asNumber(tokens.total_tokens);
+    const total = explicitTotal || input + output + reasoning + cached;
+    return {
+        input_tokens: input,
+        output_tokens: output,
+        reasoning_tokens: reasoning,
+        cached_tokens: cached,
+        total_tokens: total,
+    };
+}
+function normalizeQueueRecord(record) {
+    const raw = asRecord(record);
+    if (!raw) {
+        return null;
+    }
+    const provider = asString(raw.provider, 'unknown');
+    const model = asString(raw.model, asString(raw.alias, 'unknown'));
+    const source = asString(raw.source, 'unknown');
+    const authIndex = typeof raw.auth_index === 'string' || typeof raw.auth_index === 'number'
+        ? raw.auth_index
+        : source;
+    return {
+        timestamp: asString(raw.timestamp, new Date().toISOString()),
+        provider,
+        model,
+        alias: asString(raw.alias, model),
+        source,
+        auth_index: authIndex,
+        request_id: asString(raw.request_id, ''),
+        tokens: normalizeTokens(raw.tokens),
+        failed: asBoolean(raw.failed),
+    };
+}
+function ensureProviderBucket(response, provider) {
+    const usage = (response.usage ?? (response.usage = { apis: {} }));
+    const apis = (usage.apis ?? (usage.apis = {}));
+    return (apis[provider] ?? (apis[provider] = { total_requests: 0, total_tokens: 0, models: {} }));
+}
+function ensureModelBucket(providerBucket, model) {
+    const models = (providerBucket.models ?? (providerBucket.models = {}));
+    return (models[model] ?? (models[model] = { total_requests: 0, total_tokens: 0, details: [] }));
+}
+function addDetail(response, provider, model, detail) {
+    const usage = (response.usage ?? (response.usage = { apis: {} }));
+    const providerBucket = ensureProviderBucket(response, provider);
+    const modelBucket = ensureModelBucket(providerBucket, model);
+    const totalTokens = detail.tokens?.total_tokens ?? 0;
+    usage.total_requests = (usage.total_requests ?? 0) + 1;
+    usage.total_tokens = (usage.total_tokens ?? 0) + totalTokens;
+    if (detail.failed) {
+        usage.failure_count = (usage.failure_count ?? 0) + 1;
+        response.failed_requests = (response.failed_requests ?? 0) + 1;
+    }
+    else {
+        usage.success_count = (usage.success_count ?? 0) + 1;
+    }
+    providerBucket.total_requests = (providerBucket.total_requests ?? 0) + 1;
+    providerBucket.total_tokens = (providerBucket.total_tokens ?? 0) + totalTokens;
+    modelBucket.total_requests = (modelBucket.total_requests ?? 0) + 1;
+    modelBucket.total_tokens = (modelBucket.total_tokens ?? 0) + totalTokens;
+    (modelBucket.details ?? (modelBucket.details = [])).push(detail);
+}
+function createDetailSignature(provider, model, detail) {
+    return [
+        provider,
+        model,
+        detail.request_id?.trim() ?? '',
+        detail.timestamp,
+        detail.source,
+        String(detail.auth_index),
+        detail.tokens?.input_tokens ?? 0,
+        detail.tokens?.output_tokens ?? 0,
+        detail.tokens?.reasoning_tokens ?? 0,
+        detail.tokens?.cached_tokens ?? 0,
+        detail.tokens?.total_tokens ?? 0,
+        detail.failed ? '1' : '0',
+    ].join('|');
+}
+function collectResponseDetails(response) {
+    const entries = [];
+    for (const [provider, providerData] of Object.entries(response.usage?.apis ?? {})) {
+        for (const [model, modelData] of Object.entries(providerData.models ?? {})) {
+            for (const detail of modelData.details ?? []) {
+                entries.push({ provider, model, detail });
+            }
+        }
+    }
+    return entries;
+}
+function buildUsageResponseFromQueueRecords(records) {
+    const response = {
+        failed_requests: 0,
+        usage: {
+            total_requests: 0,
+            success_count: 0,
+            failure_count: 0,
+            total_tokens: 0,
+            apis: {},
+        },
+    };
+    for (const rawRecord of records) {
+        const record = normalizeQueueRecord(rawRecord);
+        if (!record) {
+            continue;
+        }
+        addDetail(response, record.provider ?? 'unknown', record.model ?? 'unknown', {
+            timestamp: record.timestamp ?? new Date().toISOString(),
+            source: record.source ?? 'unknown',
+            auth_index: record.auth_index ?? record.source ?? 'unknown',
+            request_id: record.request_id || undefined,
+            tokens: normalizeTokens(record.tokens),
+            failed: record.failed === true,
+        });
+    }
+    return response;
+}
+exports.buildUsageResponseFromQueueRecords = buildUsageResponseFromQueueRecords;
+function mergeUsageResponses(base, incoming) {
+    const merged = buildUsageResponseFromQueueRecords([]);
+    const seen = new Set();
+    for (const entry of [...collectResponseDetails(base), ...collectResponseDetails(incoming)]) {
+        const signature = createDetailSignature(entry.provider, entry.model, entry.detail);
+        if (seen.has(signature)) {
+            continue;
+        }
+        seen.add(signature);
+        addDetail(merged, entry.provider, entry.model, entry.detail);
+    }
+    return merged;
+}
+exports.mergeUsageResponses = mergeUsageResponses;
+function cloneUsageResponse(response) {
+    return {
+        failed_requests: response.failed_requests ?? 0,
+        usage: {
+            total_requests: response.usage?.total_requests ?? 0,
+            success_count: response.usage?.success_count ?? 0,
+            failure_count: response.usage?.failure_count ?? 0,
+            total_tokens: response.usage?.total_tokens ?? 0,
+            apis: Object.fromEntries(Object.entries(response.usage?.apis ?? {}).map(([provider, providerData]) => [
+                provider,
+                {
+                    total_requests: providerData.total_requests ?? 0,
+                    total_tokens: providerData.total_tokens ?? 0,
+                    models: Object.fromEntries(Object.entries(providerData.models ?? {}).map(([model, modelData]) => [
+                        model,
+                        {
+                            total_requests: modelData.total_requests ?? 0,
+                            total_tokens: modelData.total_tokens ?? 0,
+                            details: (modelData.details ?? []).map((detail) => ({
+                                ...detail,
+                                tokens: { ...detail.tokens },
+                            })),
+                        },
+                    ])),
+                },
+            ])),
+        },
+    };
+}
+function cloneDetail(detail) {
+    return {
+        ...detail,
+        tokens: { ...detail.tokens },
+    };
+}
+function createMissingDetailMergeKey(provider, model, detail) {
+    return [
+        provider,
+        model,
+        detail.request_id?.trim() ?? '',
+        detail.timestamp,
+        detail.source?.trim() ?? '',
+        String(detail.auth_index ?? '').trim(),
+        detail.tokens?.input_tokens ?? 0,
+        detail.tokens?.output_tokens ?? 0,
+        detail.tokens?.reasoning_tokens ?? 0,
+        detail.tokens?.cached_tokens ?? 0,
+        detail.tokens?.total_tokens ?? 0,
+        detail.failed ? '1' : '0',
+    ].join('|');
+}
+function extractDuplicateIdentityValue(value) {
+    const authFileMatch = value.match(/(?:^|\s)auth_file=("[^"]+"|'[^']+'|[^\s]+)/i);
+    const rawValue = authFileMatch?.[1] ?? value;
+    const unquotedValue = rawValue.trim().replace(/^['"]|['"]$/g, '');
+    const pipeCandidate = unquotedValue.split('|').pop() ?? unquotedValue;
+    return pipeCandidate.split(/[\\/]/).pop() ?? pipeCandidate.trim();
+}
+function stripKnownAuthPlanSuffix(value) {
+    return value.replace(/-(?:free|plus|pro|team|business|enterprise)$/i, '');
+}
+function normalizeDuplicateIdentity(provider, value) {
+    const rawValue = String(value ?? '').trim();
+    if (!rawValue) {
+        return '';
+    }
+    const normalizedProvider = provider.trim().toLowerCase();
+    const identityValue = extractDuplicateIdentityValue(rawValue);
+    const hadJsonExtension = /\.json$/i.test(identityValue);
+    let candidate = identityValue.replace(/\.json$/i, '');
+    const providerPrefix = `${normalizedProvider}-`;
+    if (candidate.toLowerCase().startsWith(providerPrefix)) {
+        candidate = candidate.slice(providerPrefix.length);
+    }
+    candidate = candidate.replace(/^[a-f0-9]{8}[-_]/i, '').trim();
+    if (hadJsonExtension) {
+        candidate = stripKnownAuthPlanSuffix(candidate);
+    }
+    return candidate ? candidate.toLowerCase() : rawValue.toLowerCase();
+}
+function resolveCompleteDetailDuplicateIdentity(provider, detail) {
+    return (normalizeDuplicateIdentity(provider, detail.source) ||
+        normalizeDuplicateIdentity(provider, detail.auth_index) ||
+        'unknown');
+}
+function createLikelyLogDuplicateKey(provider, model, detail) {
+    return [
+        provider,
+        model,
+        resolveCompleteDetailDuplicateIdentity(provider, detail),
+        detail.failed ? '1' : '0',
+    ].join('|');
+}
+function createRequestIdDuplicateKey(provider, model, detail) {
+    const requestId = detail.request_id?.trim();
+    return requestId ? [provider, model, requestId, detail.failed ? '1' : '0'].join('|') : '';
+}
+function parseDetailTimestamp(detail) {
+    const timestampMs = Date.parse(detail.timestamp);
+    return Number.isFinite(timestampMs) ? timestampMs : null;
+}
+const TOKENLESS_LOG_DUPLICATE_WINDOW_MS = 5000;
+function detailHasTokenUsage(detail) {
+    return ((detail.tokens?.input_tokens ?? 0) > 0 ||
+        (detail.tokens?.output_tokens ?? 0) > 0 ||
+        (detail.tokens?.reasoning_tokens ?? 0) > 0 ||
+        (detail.tokens?.cached_tokens ?? 0) > 0 ||
+        (detail.tokens?.total_tokens ?? 0) > 0);
+}
+function collectDetailMergeKeyCounts(response) {
+    const counts = new Map();
+    for (const entry of collectResponseDetails(response)) {
+        const key = createMissingDetailMergeKey(entry.provider, entry.model, entry.detail);
+        counts.set(key, (counts.get(key) ?? 0) + 1);
+    }
+    return counts;
+}
+function collectLikelyLogDuplicateCandidates(response) {
+    const candidates = {
+        byRequestId: new Map(),
+        byIdentity: new Map(),
+    };
+    for (const [provider, providerData] of Object.entries(response.usage?.apis ?? {})) {
+        for (const [model, modelData] of Object.entries(providerData.models ?? {})) {
+            const details = modelData.details ?? [];
+            const canUseIdentityWindow = (modelData.total_requests ?? 0) <= details.length;
+            for (const detail of details) {
+                const requestIdKey = createRequestIdDuplicateKey(provider, model, detail);
+                if (requestIdKey) {
+                    candidates.byRequestId.set(requestIdKey, (candidates.byRequestId.get(requestIdKey) ?? 0) + 1);
+                }
+                if (!canUseIdentityWindow) {
+                    continue;
+                }
+                const timestampMs = parseDetailTimestamp(detail);
+                if (timestampMs === null) {
+                    continue;
+                }
+                const key = createLikelyLogDuplicateKey(provider, model, detail);
+                const timestamps = candidates.byIdentity.get(key) ?? [];
+                timestamps.push(timestampMs);
+                candidates.byIdentity.set(key, timestamps);
+            }
+        }
+    }
+    return candidates;
+}
+function consumeDetailKey(counts, key) {
+    const count = counts.get(key) ?? 0;
+    if (count <= 0) {
+        return false;
+    }
+    if (count === 1) {
+        counts.delete(key);
+    }
+    else {
+        counts.set(key, count - 1);
+    }
+    return true;
+}
+function consumeCount(counts, key) {
+    const count = counts.get(key) ?? 0;
+    if (count <= 0) {
+        return false;
+    }
+    if (count === 1) {
+        counts.delete(key);
+    }
+    else {
+        counts.set(key, count - 1);
+    }
+    return true;
+}
+function consumeLikelyLogDuplicateCandidate(candidates, provider, model, detail) {
+    if (detailHasTokenUsage(detail)) {
+        return false;
+    }
+    const requestIdKey = createRequestIdDuplicateKey(provider, model, detail);
+    if (requestIdKey && consumeCount(candidates.byRequestId, requestIdKey)) {
+        return true;
+    }
+    const timestampMs = parseDetailTimestamp(detail);
+    if (timestampMs === null) {
+        return false;
+    }
+    const key = createLikelyLogDuplicateKey(provider, model, detail);
+    const timestamps = candidates.byIdentity.get(key) ?? [];
+    const index = timestamps.findIndex((candidateTimestampMs) => Math.abs(candidateTimestampMs - timestampMs) <= TOKENLESS_LOG_DUPLICATE_WINDOW_MS);
+    if (index === -1) {
+        return false;
+    }
+    timestamps.splice(index, 1);
+    if (timestamps.length === 0) {
+        candidates.byIdentity.delete(key);
+    }
+    else {
+        candidates.byIdentity.set(key, timestamps);
+    }
+    return true;
+}
+function countProviderDetails(providerBucket) {
+    return Object.values(providerBucket.models ?? {}).reduce((total, modelData) => total + (modelData.details ?? []).length, 0);
+}
+function appendDetailToExistingProvider(merged, provider, model, detail, options) {
+    const providerBucket = ensureProviderBucket(merged, provider);
+    const shouldFillAggregateOnly = (providerBucket.total_requests ?? 0) > countProviderDetails(providerBucket);
+    if (!shouldFillAggregateOnly) {
+        if (!options.appendExtraDetails) {
+            return;
+        }
+        addDetail(merged, provider, model, cloneDetail(detail));
+        return;
+    }
+    const modelBucket = ensureModelBucket(providerBucket, model);
+    const shouldFillModelAggregateOnly = (modelBucket.total_requests ?? 0) > (modelBucket.details ?? []).length;
+    if (!shouldFillModelAggregateOnly) {
+        modelBucket.total_requests = (modelBucket.total_requests ?? 0) + 1;
+    }
+    (modelBucket.details ?? (modelBucket.details = [])).push(cloneDetail(detail));
+}
+function mergeUsageResponseWithMissingDetails(base, incoming, options = {}) {
+    if (!incoming || !hasUsageDetails(incoming)) {
+        return base;
+    }
+    const normalizedOptions = {
+        appendExtraDetails: options.appendExtraDetails ?? true,
+    };
+    const merged = cloneUsageResponse(base);
+    const existingDetailCounts = collectDetailMergeKeyCounts(base);
+    const likelyLogDuplicateCandidates = collectLikelyLogDuplicateCandidates(base);
+    for (const entry of collectResponseDetails(incoming)) {
+        const mergeKey = createMissingDetailMergeKey(entry.provider, entry.model, entry.detail);
+        if (consumeDetailKey(existingDetailCounts, mergeKey)) {
+            continue;
+        }
+        if (consumeLikelyLogDuplicateCandidate(likelyLogDuplicateCandidates, entry.provider, entry.model, entry.detail)) {
+            continue;
+        }
+        if (base.usage?.apis?.[entry.provider]) {
+            appendDetailToExistingProvider(merged, entry.provider, entry.model, entry.detail, normalizedOptions);
+            continue;
+        }
+        addDetail(merged, entry.provider, entry.model, cloneDetail(entry.detail));
+    }
+    return merged;
+}
+exports.mergeUsageResponseWithMissingDetails = mergeUsageResponseWithMissingDetails;
+function buildUsageResponseFromApiKeyUsage(rawResponse) {
+    const response = buildUsageResponseFromQueueRecords([]);
+    const usage = response.usage ?? {
+        total_requests: 0,
+        success_count: 0,
+        failure_count: 0,
+        total_tokens: 0,
+        apis: {},
+    };
+    response.usage = usage;
+    const byProvider = asRecord(rawResponse);
+    if (!byProvider) {
+        return response;
+    }
+    for (const [provider, sources] of Object.entries(byProvider)) {
+        const sourceRecords = asRecord(sources);
+        if (!sourceRecords) {
+            continue;
+        }
+        let providerRequests = 0;
+        for (const entry of Object.values(sourceRecords)) {
+            const usageEntry = asRecord(entry);
+            if (!usageEntry) {
+                continue;
+            }
+            const success = asNumber(usageEntry.success);
+            const failed = asNumber(usageEntry.failed);
+            providerRequests += success + failed;
+            usage.success_count = (usage.success_count ?? 0) + success;
+            usage.failure_count = (usage.failure_count ?? 0) + failed;
+            response.failed_requests = (response.failed_requests ?? 0) + failed;
+        }
+        if (providerRequests > 0) {
+            const providerBucket = ensureProviderBucket(response, provider);
+            providerBucket.total_requests = (providerBucket.total_requests ?? 0) + providerRequests;
+            usage.total_requests = (usage.total_requests ?? 0) + providerRequests;
+        }
+    }
+    return response;
+}
+exports.buildUsageResponseFromApiKeyUsage = buildUsageResponseFromApiKeyUsage;
+function hasUsageDetails(response) {
+    return collectResponseDetails(response).length > 0;
+}
+exports.hasUsageDetails = hasUsageDetails;
+function hasUsageTotals(response) {
+    return (response.usage?.total_requests ?? 0) > 0;
+}
+exports.hasUsageTotals = hasUsageTotals;
+//# sourceMappingURL=usage-compatibility-transformer.js.map