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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,4 @@
1
+ import type { CliproxyUsageApiResponse } from './stats-fetcher';
2
+ export declare function buildUsageResponseFromCliproxyLogLines(lines: string[]): CliproxyUsageApiResponse;
3
+ export declare function buildUsageResponseFromCliproxyMainLog(): CliproxyUsageApiResponse | null;
4
+ //# sourceMappingURL=oauth-usage-log-transformer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oauth-usage-log-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAyIhE,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAmChG;AAUD,wBAAgB,qCAAqC,IAAI,wBAAwB,GAAG,IAAI,CASvF"}
@@ -0,0 +1,162 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.buildUsageResponseFromCliproxyMainLog = exports.buildUsageResponseFromCliproxyLogLines = void 0;
27
+ const fs = __importStar(require("fs"));
28
+ const path = __importStar(require("path"));
29
+ const path_resolver_1 = require("../config/path-resolver");
30
+ const usage_compatibility_transformer_1 = require("./usage-compatibility-transformer");
31
+ function unquote(value) {
32
+ return value.trim().replace(/^['"]|['"]$/g, '');
33
+ }
34
+ function extractTimestamp(line) {
35
+ const isoTimestamp = line.match(/\d{4}-\d{2}-\d{2}T[^\s\]]+/)?.[0];
36
+ if (isoTimestamp) {
37
+ return isoTimestamp.replace(/[,\]]+$/, '');
38
+ }
39
+ const bracketedTimestamp = line
40
+ .match(/^\[(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}:\d{2})\]/)
41
+ ?.slice(1, 3);
42
+ if (!bracketedTimestamp) {
43
+ return undefined;
44
+ }
45
+ const [datePart, timePart] = bracketedTimestamp;
46
+ const [year, month, day] = datePart.split('-').map(Number);
47
+ const [hour, minute, second] = timePart.split(':').map(Number);
48
+ return new Date(year, month - 1, day, hour, minute, second).toISOString();
49
+ }
50
+ function extractRequestId(line) {
51
+ const explicitRequestId = line.match(/\b(?:request[_-]?id|req[_-]?id|rid)[=:]\s*([A-Za-z0-9._:-]+)/i)?.[1];
52
+ if (explicitRequestId) {
53
+ return explicitRequestId;
54
+ }
55
+ const bracketedRequestId = line.match(/^\[[^\]]+\]\s+\[([^\]]+)\]/)?.[1]?.trim();
56
+ return bracketedRequestId && bracketedRequestId !== '--------' ? bracketedRequestId : undefined;
57
+ }
58
+ function parseOAuthSelection(line) {
59
+ const match = line.match(/Use OAuth\s+provider=([^\s]+)\s+auth_file=("[^"]+"|'[^']+'|[^\s]+)\s+for model\s+("[^"]+"|'[^']+'|[^\s]+)/i);
60
+ if (!match) {
61
+ return null;
62
+ }
63
+ return {
64
+ timestamp: extractTimestamp(line),
65
+ provider: unquote(match[1] ?? 'unknown'),
66
+ authFile: unquote(match[2] ?? 'unknown'),
67
+ model: unquote(match[3] ?? 'unknown'),
68
+ requestId: extractRequestId(line),
69
+ };
70
+ }
71
+ function parseProviderCompletion(line) {
72
+ const match = line.match(/\b(?:POST|GET)\s+"?\/api\/provider\/([^/"\s]+)\//i);
73
+ if (!match) {
74
+ return null;
75
+ }
76
+ return {
77
+ timestamp: extractTimestamp(line),
78
+ provider: unquote(match[1] ?? 'unknown'),
79
+ requestId: extractRequestId(line),
80
+ failed: /\b(?:failed|failure|error)\b/i.test(line) ||
81
+ /\bstatus[=:]\s*[45]\d\d\b/i.test(line) ||
82
+ /\s[45]\d\d(?:\s|$)/.test(line),
83
+ };
84
+ }
85
+ function addPendingRequest(pending, byRequestId, byProvider) {
86
+ if (pending.requestId) {
87
+ const previous = byRequestId.get(pending.requestId);
88
+ if (previous) {
89
+ const previousProviderQueue = byProvider.get(previous.provider) ?? [];
90
+ byProvider.set(previous.provider, previousProviderQueue.filter((entry) => entry !== previous));
91
+ }
92
+ byRequestId.set(pending.requestId, pending);
93
+ }
94
+ const providerQueue = byProvider.get(pending.provider) ?? [];
95
+ providerQueue.push(pending);
96
+ byProvider.set(pending.provider, providerQueue);
97
+ }
98
+ function takePendingRequest(completion, byRequestId, byProvider) {
99
+ const byId = completion.requestId ? byRequestId.get(completion.requestId) : undefined;
100
+ if (byId) {
101
+ byRequestId.delete(completion.requestId ?? '');
102
+ const providerQueue = byProvider.get(byId.provider) ?? [];
103
+ byProvider.set(byId.provider, providerQueue.filter((entry) => entry !== byId));
104
+ return byId;
105
+ }
106
+ const providerQueue = byProvider.get(completion.provider) ?? [];
107
+ const next = providerQueue.shift();
108
+ byProvider.set(completion.provider, providerQueue);
109
+ if (next?.requestId) {
110
+ byRequestId.delete(next.requestId);
111
+ }
112
+ return next ?? null;
113
+ }
114
+ function buildUsageResponseFromCliproxyLogLines(lines) {
115
+ const pendingByRequestId = new Map();
116
+ const pendingByProvider = new Map();
117
+ const records = [];
118
+ for (const line of lines) {
119
+ const selection = parseOAuthSelection(line);
120
+ if (selection) {
121
+ addPendingRequest(selection, pendingByRequestId, pendingByProvider);
122
+ continue;
123
+ }
124
+ const completion = parseProviderCompletion(line);
125
+ if (!completion) {
126
+ continue;
127
+ }
128
+ const pending = takePendingRequest(completion, pendingByRequestId, pendingByProvider);
129
+ if (!pending) {
130
+ continue;
131
+ }
132
+ records.push({
133
+ timestamp: completion.timestamp ?? pending.timestamp ?? '1970-01-01T00:00:00.000Z',
134
+ provider: pending.provider,
135
+ model: pending.model,
136
+ source: `provider=${pending.provider} auth_file=${pending.authFile}`,
137
+ auth_index: pending.authFile,
138
+ request_id: completion.requestId ?? pending.requestId,
139
+ failed: completion.failed,
140
+ tokens: {},
141
+ });
142
+ }
143
+ return (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)(records);
144
+ }
145
+ exports.buildUsageResponseFromCliproxyLogLines = buildUsageResponseFromCliproxyLogLines;
146
+ function readLogFile(filePath) {
147
+ if (!fs.existsSync(filePath)) {
148
+ return null;
149
+ }
150
+ return fs.readFileSync(filePath, 'utf-8');
151
+ }
152
+ function buildUsageResponseFromCliproxyMainLog() {
153
+ const logPath = path.join((0, path_resolver_1.getCliproxyWritablePath)(), 'logs', 'main.log');
154
+ const contents = readLogFile(logPath);
155
+ if (!contents) {
156
+ return null;
157
+ }
158
+ const response = buildUsageResponseFromCliproxyLogLines(contents.split(/\r?\n/));
159
+ return (0, usage_compatibility_transformer_1.hasUsageDetails)(response) ? response : null;
160
+ }
161
+ exports.buildUsageResponseFromCliproxyMainLog = buildUsageResponseFromCliproxyMainLog;
162
+ //# sourceMappingURL=oauth-usage-log-transformer.js.map
@@ -0,0 +1 @@
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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"}
@@ -53,6 +53,7 @@ export interface CliproxyRequestDetail {
53
53
  timestamp: string;
54
54
  source: string;
55
55
  auth_index: string | number;
56
+ request_id?: string;
56
57
  tokens: {
57
58
  input_tokens: number;
58
59
  output_tokens: number;
@@ -101,6 +102,9 @@ export declare function fetchCliproxyStats(port?: number): Promise<CliproxyStats
101
102
  * Returns the unprocessed API response for transformation by cliproxy-usage-transformer
102
103
  */
103
104
  export declare function fetchCliproxyUsageRaw(port?: number): Promise<CliproxyUsageApiResponse | null>;
105
+ export declare const __testExports: {
106
+ clearCachedUsageQueueResponse(): void;
107
+ };
104
108
  /** OpenAI-compatible model object from /v1/models endpoint */
105
109
  export interface CliproxyModel {
106
110
  id: string;
@@ -1 +1 @@
1
- {"version":3,"file":"stats-fetcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stats-fetcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA2BH,mCAAmC;AACnC,MAAM,WAAW,iBAAiB;IAChC,4EAA4E;IAC5E,UAAU,EAAE,MAAM,CAAC;IACnB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC5B,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB;IACnB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,gCAAgC;IAChC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,mCAAmC;IACnC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,kCAAkC;IAClC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAChD,4CAA4C;IAC5C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,sCAAsC;AACtC,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,gBAAgB,EAAE,MAAM,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,oDAAoD;AACpD,KAAK,aAAa,GAAG,qBAAqB,CAAC;AAE3C,wEAAwE;AACxE,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE;QACN,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CACX,MAAM,EACN;YACE,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,YAAY,CAAC,EAAE,MAAM,CAAC;YACtB,MAAM,CAAC,EAAE,MAAM,CACb,MAAM,EACN;gBACE,cAAc,CAAC,EAAE,MAAM,CAAC;gBACxB,YAAY,CAAC,EAAE,MAAM,CAAC;gBACtB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;aAC3B,CACF,CAAC;SACH,CACF,CAAC;KACH,CAAC;CACH;AAED,oEAAoE;AACpE,MAAM,WAAW,0BAA0B;IACzC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAOD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAgBrF;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAyF1C;AA6GD,eAAO,MAAM,aAAa;qCACS,IAAI;CAGtC,CAAC;AAEF,8DAA8D;AAC9D,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAQD,yCAAyC;AACzC,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAsD/F;AAED,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAOD;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAkC9F;AAED;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoCxB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAuBvE"}
@@ -6,10 +6,16 @@
6
6
  * Requires usage-statistics-enabled: true in config.yaml.
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.isCliproxyRunning = exports.fetchCliproxyErrorLogContent = exports.fetchCliproxyErrorLogs = exports.fetchCliproxyModels = exports.fetchCliproxyUsageRaw = exports.fetchCliproxyStats = void 0;
9
+ exports.isCliproxyRunning = exports.fetchCliproxyErrorLogContent = exports.fetchCliproxyErrorLogs = exports.fetchCliproxyModels = exports.__testExports = exports.fetchCliproxyUsageRaw = exports.fetchCliproxyStats = void 0;
10
10
  const auth_token_manager_1 = require("../auth/auth-token-manager");
11
11
  const proxy_target_resolver_1 = require("../proxy/proxy-target-resolver");
12
12
  const stats_transformer_1 = require("./stats-transformer");
13
+ const oauth_usage_log_transformer_1 = require("./oauth-usage-log-transformer");
14
+ const usage_compatibility_transformer_1 = require("./usage-compatibility-transformer");
15
+ const cachedUsageQueueResponses = new Map();
16
+ const USAGE_QUEUE_BATCH_SIZE = 1000;
17
+ const USAGE_QUEUE_MAX_BATCHES = 100;
18
+ const USAGE_QUEUE_DRAIN_TIMEOUT_MS = 30000;
13
19
  /**
14
20
  * Fetch usage statistics from CLIProxyAPI management API
15
21
  * @param port CLIProxyAPI port (default: 8317)
@@ -37,14 +43,119 @@ exports.fetchCliproxyStats = fetchCliproxyStats;
37
43
  * Returns the unprocessed API response for transformation by cliproxy-usage-transformer
38
44
  */
39
45
  async function fetchCliproxyUsageRaw(port) {
46
+ let localLogUsage;
47
+ const getLocalLogUsage = () => {
48
+ if (localLogUsage !== undefined) {
49
+ return localLogUsage;
50
+ }
51
+ localLogUsage = (0, proxy_target_resolver_1.getProxyTarget)().isRemote ? null : (0, oauth_usage_log_transformer_1.buildUsageResponseFromCliproxyMainLog)();
52
+ return localLogUsage;
53
+ };
54
+ const mergeLocalLogUsage = (response) => (0, usage_compatibility_transformer_1.mergeUsageResponseWithMissingDetails)(response, getLocalLogUsage());
55
+ const mergeAggregateWithDetails = (aggregate, details) => (0, usage_compatibility_transformer_1.mergeUsageResponseWithMissingDetails)(aggregate, details, { appendExtraDetails: false });
56
+ let legacyAggregateUsage = null;
57
+ const legacyUsage = await fetchManagementJson('/v0/management/usage', port);
58
+ if (legacyUsage?.ok && legacyUsage.data) {
59
+ if ((0, usage_compatibility_transformer_1.hasUsageDetails)(legacyUsage.data)) {
60
+ return mergeLocalLogUsage(legacyUsage.data);
61
+ }
62
+ legacyAggregateUsage = legacyUsage.data;
63
+ }
64
+ let cachedUsageQueueResponse;
65
+ const usageQueue = await fetchUsageQueueRecords(port);
66
+ if (usageQueue?.cacheKey) {
67
+ cachedUsageQueueResponse = cachedUsageQueueResponses.get(usageQueue.cacheKey);
68
+ }
69
+ if (usageQueue && Array.isArray(usageQueue.data)) {
70
+ const queueResponse = (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)(usageQueue.data);
71
+ if ((0, usage_compatibility_transformer_1.hasUsageDetails)(queueResponse)) {
72
+ const mergedUsageQueueResponse = cachedUsageQueueResponse
73
+ ? (0, usage_compatibility_transformer_1.mergeUsageResponses)(cachedUsageQueueResponse, queueResponse)
74
+ : queueResponse;
75
+ cachedUsageQueueResponses.set(usageQueue.cacheKey, mergedUsageQueueResponse);
76
+ cachedUsageQueueResponse = mergedUsageQueueResponse;
77
+ if (usageQueue.ok) {
78
+ const response = legacyAggregateUsage
79
+ ? mergeAggregateWithDetails(legacyAggregateUsage, mergedUsageQueueResponse)
80
+ : mergedUsageQueueResponse;
81
+ return mergeLocalLogUsage(response);
82
+ }
83
+ }
84
+ }
85
+ if (legacyAggregateUsage) {
86
+ const response = cachedUsageQueueResponse
87
+ ? mergeAggregateWithDetails(legacyAggregateUsage, cachedUsageQueueResponse)
88
+ : legacyAggregateUsage;
89
+ return mergeLocalLogUsage(response);
90
+ }
91
+ const apiKeyUsage = await fetchManagementJson('/v0/management/api-key-usage', port);
92
+ if (apiKeyUsage?.ok && apiKeyUsage.data) {
93
+ const apiKeyResponseWithCachedDetails = cachedUsageQueueResponse
94
+ ? mergeAggregateWithDetails((0, usage_compatibility_transformer_1.buildUsageResponseFromApiKeyUsage)(apiKeyUsage.data), cachedUsageQueueResponse)
95
+ : (0, usage_compatibility_transformer_1.buildUsageResponseFromApiKeyUsage)(apiKeyUsage.data);
96
+ const apiKeyResponse = mergeLocalLogUsage(apiKeyResponseWithCachedDetails);
97
+ if ((0, usage_compatibility_transformer_1.hasUsageTotals)(apiKeyResponse)) {
98
+ return apiKeyResponse;
99
+ }
100
+ }
101
+ if (cachedUsageQueueResponse) {
102
+ return mergeLocalLogUsage(cachedUsageQueueResponse);
103
+ }
104
+ const logUsage = getLocalLogUsage();
105
+ if (logUsage && (0, usage_compatibility_transformer_1.hasUsageDetails)(logUsage)) {
106
+ return logUsage;
107
+ }
108
+ if (usageQueue?.ok) {
109
+ return (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)([]);
110
+ }
111
+ return null;
112
+ }
113
+ exports.fetchCliproxyUsageRaw = fetchCliproxyUsageRaw;
114
+ async function fetchUsageQueueRecords(port) {
115
+ const records = [];
116
+ const seenFullBatchSignatures = new Set();
117
+ let cacheKey = '';
118
+ let status = 0;
119
+ const drainStartedAt = Date.now();
120
+ for (let batchCount = 0; batchCount < USAGE_QUEUE_MAX_BATCHES; batchCount++) {
121
+ const result = await fetchManagementJson(`/v0/management/usage-queue?count=${USAGE_QUEUE_BATCH_SIZE}`, port);
122
+ if (!result) {
123
+ return records.length > 0 ? { ok: false, status, data: records, cacheKey } : null;
124
+ }
125
+ cacheKey || (cacheKey = result.cacheKey);
126
+ status = result.status;
127
+ if (!result.ok || !Array.isArray(result.data)) {
128
+ return records.length > 0 ? { ok: false, status, data: records, cacheKey } : result;
129
+ }
130
+ if (result.data.length === USAGE_QUEUE_BATCH_SIZE) {
131
+ const batchSignature = createUsageQueueBatchSignature(result.data);
132
+ if (seenFullBatchSignatures.has(batchSignature)) {
133
+ return { ok: false, status, data: records, cacheKey };
134
+ }
135
+ seenFullBatchSignatures.add(batchSignature);
136
+ }
137
+ records.push(...result.data);
138
+ if (result.data.length < USAGE_QUEUE_BATCH_SIZE) {
139
+ return { ok: true, status, data: records, cacheKey };
140
+ }
141
+ if (Date.now() - drainStartedAt >= USAGE_QUEUE_DRAIN_TIMEOUT_MS) {
142
+ return { ok: false, status, data: records, cacheKey };
143
+ }
144
+ }
145
+ return { ok: false, status, data: records, cacheKey };
146
+ }
147
+ function createUsageQueueBatchSignature(records) {
148
+ return JSON.stringify(records);
149
+ }
150
+ async function fetchManagementJson(endpointPath, port, timeoutMs = 5000) {
151
+ const controller = new AbortController();
152
+ const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
40
153
  try {
41
- const controller = new AbortController();
42
- const timeoutId = setTimeout(() => controller.abort(), 5000);
43
154
  const target = (0, proxy_target_resolver_1.getProxyTarget)();
44
155
  if (port !== undefined && !target.isRemote) {
45
156
  target.port = port;
46
157
  }
47
- const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, '/v0/management/usage');
158
+ const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, endpointPath);
48
159
  const headers = target.isRemote
49
160
  ? (0, proxy_target_resolver_1.buildManagementHeaders)(target)
50
161
  : { Accept: 'application/json', Authorization: `Bearer ${(0, auth_token_manager_1.getEffectiveManagementSecret)()}` };
@@ -52,44 +163,41 @@ async function fetchCliproxyUsageRaw(port) {
52
163
  signal: controller.signal,
53
164
  headers,
54
165
  });
55
- clearTimeout(timeoutId);
56
166
  if (!response.ok) {
57
- return null;
167
+ return { ok: false, status: response.status, data: null, cacheKey: url };
58
168
  }
59
- return (await response.json());
169
+ return {
170
+ ok: true,
171
+ status: response.status,
172
+ data: (await response.json()),
173
+ cacheKey: url,
174
+ };
60
175
  }
61
176
  catch {
62
177
  return null;
63
178
  }
179
+ finally {
180
+ clearTimeout(timeoutId);
181
+ }
64
182
  }
65
- exports.fetchCliproxyUsageRaw = fetchCliproxyUsageRaw;
66
183
  async function fetchCliproxyAuthFiles(port) {
67
184
  try {
68
- const controller = new AbortController();
69
- const timeoutId = setTimeout(() => controller.abort(), 5000);
70
- const target = (0, proxy_target_resolver_1.getProxyTarget)();
71
- if (port !== undefined && !target.isRemote) {
72
- target.port = port;
73
- }
74
- const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, '/v0/management/auth-files');
75
- const headers = target.isRemote
76
- ? (0, proxy_target_resolver_1.buildManagementHeaders)(target)
77
- : { Accept: 'application/json', Authorization: `Bearer ${(0, auth_token_manager_1.getEffectiveManagementSecret)()}` };
78
- const response = await fetch(url, {
79
- signal: controller.signal,
80
- headers,
81
- });
82
- clearTimeout(timeoutId);
83
- if (!response.ok) {
185
+ const result = await fetchManagementJson('/v0/management/auth-files', port);
186
+ if (!result?.ok || !result.data) {
84
187
  return null;
85
188
  }
86
- const data = (await response.json());
189
+ const data = result.data;
87
190
  return Array.isArray(data.files) ? data.files : null;
88
191
  }
89
192
  catch {
90
193
  return null;
91
194
  }
92
195
  }
196
+ exports.__testExports = {
197
+ clearCachedUsageQueueResponse() {
198
+ cachedUsageQueueResponses.clear();
199
+ },
200
+ };
93
201
  /**
94
202
  * Fetch available models from CLIProxyAPI /v1/models endpoint
95
203
  * @param port CLIProxyAPI port (default: 8317)
@@ -1 +1 @@
1
- {"version":3,"file":"stats-fetcher.js","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stats-fetcher.js","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-fetcher.ts"],"names":[],"mappings":"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"}
@@ -1 +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"}
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;AAqKD,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,wBAAwB,EAC9B,OAAO,GAAE,yBAA8B,GACtC,aAAa,CAqHf"}
@@ -11,6 +11,38 @@ function normalizeProvider(provider) {
11
11
  }
12
12
  return (0, provider_capabilities_1.mapExternalProviderName)(normalized) ?? normalized;
13
13
  }
14
+ function extractAuthFilenameFromSource(source) {
15
+ const authFileMatch = source.match(/(?:^|\s)auth_file=("[^"]+"|'[^']+'|[^\s]+)/i);
16
+ const rawValue = authFileMatch?.[1] ?? source;
17
+ const value = rawValue.trim().replace(/^['"]|['"]$/g, '');
18
+ const filenameCandidate = value.split('|').pop() ?? value;
19
+ return filenameCandidate.split(/[\\/]/).pop() ?? filenameCandidate.trim();
20
+ }
21
+ function stripKnownAuthPlanSuffix(value) {
22
+ return value.replace(/-(?:free|plus|pro|team|business|enterprise)$/i, '');
23
+ }
24
+ function normalizeAuthFilenameSource(provider, source) {
25
+ const filename = extractAuthFilenameFromSource(source);
26
+ const normalizedProvider = normalizeProvider(provider);
27
+ const hadJsonExtension = /\.json$/i.test(filename);
28
+ let candidate = filename.replace(/\.json$/i, '');
29
+ const providerPrefix = `${normalizedProvider}-`;
30
+ if (candidate.toLowerCase().startsWith(providerPrefix)) {
31
+ candidate = candidate.slice(providerPrefix.length);
32
+ }
33
+ candidate = candidate.replace(/^[a-f0-9]{8}[-_]/i, '');
34
+ if (hadJsonExtension) {
35
+ candidate = stripKnownAuthPlanSuffix(candidate);
36
+ }
37
+ const parts = candidate.split('@');
38
+ if (parts.length < 2) {
39
+ return null;
40
+ }
41
+ const localPart = parts[0]?.trim();
42
+ const domainPart = parts.slice(1).join('@').trim();
43
+ const email = `${localPart}@${domainPart}`;
44
+ return /^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(email) ? email.toLowerCase() : null;
45
+ }
14
46
  function buildAuthIndexLookup(authFiles) {
15
47
  const lookup = new Map();
16
48
  const duplicateEmailCounts = new Map();
@@ -61,10 +93,30 @@ function resolveSourceForDetail(resolvedProvider, detail, authIndexLookup) {
61
93
  }
62
94
  const source = detail.source?.trim();
63
95
  if (source) {
64
- return source;
96
+ return normalizeAuthFilenameSource(resolvedProvider, source) ?? source;
65
97
  }
66
98
  return resolvedAuthFile?.source ?? 'unknown';
67
99
  }
100
+ function resolveCountWithDetails(aggregateCount, detailCount) {
101
+ if (aggregateCount === undefined) {
102
+ return detailCount;
103
+ }
104
+ return aggregateCount < detailCount ? detailCount : aggregateCount;
105
+ }
106
+ function shouldReplaceLastUsedAt(current, next) {
107
+ if (!next) {
108
+ return false;
109
+ }
110
+ const nextTime = Date.parse(next);
111
+ if (!Number.isFinite(nextTime)) {
112
+ return false;
113
+ }
114
+ if (!current) {
115
+ return true;
116
+ }
117
+ const currentTime = Date.parse(current);
118
+ return !Number.isFinite(currentTime) || nextTime > currentTime;
119
+ }
68
120
  function buildCliproxyStatsFromUsageResponse(data, options = {}) {
69
121
  const usage = data.usage;
70
122
  const requestsByModel = {};
@@ -78,7 +130,7 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
78
130
  let sawAnyDetail = false;
79
131
  if (usage?.apis) {
80
132
  for (const [provider, providerData] of Object.entries(usage.apis)) {
81
- let sawProviderDetail = false;
133
+ let providerDetailCount = 0;
82
134
  if (!providerData.models) {
83
135
  const normalizedProvider = normalizeProvider(provider);
84
136
  requestsByProvider[normalizedProvider] =
@@ -86,13 +138,15 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
86
138
  continue;
87
139
  }
88
140
  for (const [model, modelData] of Object.entries(providerData.models)) {
89
- requestsByModel[model] = modelData.total_requests ?? 0;
141
+ let modelDetailCount = 0;
90
142
  if (!modelData.details) {
143
+ requestsByModel[model] = (requestsByModel[model] ?? 0) + (modelData.total_requests ?? 0);
91
144
  continue;
92
145
  }
93
146
  for (const detail of modelData.details) {
94
147
  sawAnyDetail = true;
95
- sawProviderDetail = true;
148
+ providerDetailCount++;
149
+ modelDetailCount++;
96
150
  const resolvedProvider = resolveProviderForDetail(provider, detail, authIndexLookup);
97
151
  const source = resolveSourceForDetail(resolvedProvider, detail, authIndexLookup);
98
152
  const accountKey = (0, account_stats_key_1.buildQualifiedAccountStatsKey)(resolvedProvider, source);
@@ -117,24 +171,42 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
117
171
  }
118
172
  const tokens = detail.tokens?.total_tokens ?? 0;
119
173
  accountStats[accountKey].totalTokens += tokens;
120
- accountStats[accountKey].lastUsedAt = detail.timestamp;
174
+ if (shouldReplaceLastUsedAt(accountStats[accountKey].lastUsedAt, detail.timestamp)) {
175
+ accountStats[accountKey].lastUsedAt = detail.timestamp;
176
+ }
121
177
  totalInputTokens += detail.tokens?.input_tokens ?? 0;
122
178
  totalOutputTokens += detail.tokens?.output_tokens ?? 0;
123
179
  }
180
+ requestsByModel[model] =
181
+ (requestsByModel[model] ?? 0) +
182
+ resolveCountWithDetails(modelData.total_requests, modelDetailCount);
124
183
  }
125
- if (!sawProviderDetail) {
184
+ const providerTotal = providerData.total_requests ?? 0;
185
+ if (providerDetailCount === 0) {
126
186
  const normalizedProvider = normalizeProvider(provider);
127
187
  requestsByProvider[normalizedProvider] =
128
- (requestsByProvider[normalizedProvider] ?? 0) + (providerData.total_requests ?? 0);
188
+ (requestsByProvider[normalizedProvider] ?? 0) + providerTotal;
189
+ }
190
+ else if (providerTotal > providerDetailCount) {
191
+ const normalizedProvider = normalizeProvider(provider);
192
+ requestsByProvider[normalizedProvider] =
193
+ (requestsByProvider[normalizedProvider] ?? 0) + (providerTotal - providerDetailCount);
129
194
  }
130
195
  }
131
196
  }
197
+ const aggregateFailureCount = usage?.failure_count ?? data.failed_requests;
198
+ const successCount = sawAnyDetail
199
+ ? resolveCountWithDetails(usage?.success_count, totalSuccessCount)
200
+ : (usage?.success_count ?? 0);
201
+ const failureCount = sawAnyDetail
202
+ ? resolveCountWithDetails(aggregateFailureCount, totalFailureCount)
203
+ : (aggregateFailureCount ?? 0);
204
+ const providerTotalRequests = Object.values(requestsByProvider).reduce((total, count) => total + count, 0);
205
+ const totalRequests = Math.max(usage?.total_requests ?? 0, successCount + failureCount, providerTotalRequests);
132
206
  return {
133
- totalRequests: usage?.total_requests ?? 0,
134
- successCount: sawAnyDetail ? totalSuccessCount : (usage?.success_count ?? 0),
135
- failureCount: sawAnyDetail
136
- ? totalFailureCount
137
- : (usage?.failure_count ?? data.failed_requests ?? 0),
207
+ totalRequests,
208
+ successCount,
209
+ failureCount,
138
210
  tokens: {
139
211
  input: totalInputTokens,
140
212
  output: totalOutputTokens,
@@ -143,7 +215,7 @@ function buildCliproxyStatsFromUsageResponse(data, options = {}) {
143
215
  requestsByModel,
144
216
  requestsByProvider,
145
217
  accountStats,
146
- quotaExceededCount: usage?.failure_count ?? data.failed_requests ?? 0,
218
+ quotaExceededCount: failureCount,
147
219
  retryCount: 0,
148
220
  collectedAt: new Date().toISOString(),
149
221
  };
@@ -1 +1 @@
1
- {"version":3,"file":"stats-transformer.js","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-transformer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stats-transformer.js","sourceRoot":"","sources":["../../../src/cliproxy/services/stats-transformer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ import type { CliproxyUsageApiResponse } from './stats-fetcher';
2
+ interface MergeMissingDetailsOptions {
3
+ appendExtraDetails?: boolean;
4
+ }
5
+ export declare function buildUsageResponseFromQueueRecords(records: unknown[]): CliproxyUsageApiResponse;
6
+ export declare function mergeUsageResponses(base: CliproxyUsageApiResponse, incoming: CliproxyUsageApiResponse): CliproxyUsageApiResponse;
7
+ export declare function mergeUsageResponseWithMissingDetails(base: CliproxyUsageApiResponse, incoming: CliproxyUsageApiResponse | null | undefined, options?: MergeMissingDetailsOptions): CliproxyUsageApiResponse;
8
+ export declare function buildUsageResponseFromApiKeyUsage(rawResponse: unknown): CliproxyUsageApiResponse;
9
+ export declare function hasUsageDetails(response: CliproxyUsageApiResponse): boolean;
10
+ export declare function hasUsageTotals(response: CliproxyUsageApiResponse): boolean;
11
+ export {};
12
+ //# sourceMappingURL=usage-compatibility-transformer.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,458 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.hasUsageTotals = exports.hasUsageDetails = exports.buildUsageResponseFromApiKeyUsage = exports.mergeUsageResponseWithMissingDetails = exports.mergeUsageResponses = exports.buildUsageResponseFromQueueRecords = void 0;
4
+ function asRecord(value) {
5
+ return value !== null && typeof value === 'object' && !Array.isArray(value)
6
+ ? value
7
+ : null;
8
+ }
9
+ function asString(value, fallback) {
10
+ return typeof value === 'string' && value.trim() ? value.trim() : fallback;
11
+ }
12
+ function asNumber(value) {
13
+ if (typeof value === 'number' && Number.isFinite(value)) {
14
+ return value;
15
+ }
16
+ if (typeof value === 'string' && value.trim()) {
17
+ const parsed = Number(value);
18
+ return Number.isFinite(parsed) ? parsed : 0;
19
+ }
20
+ return 0;
21
+ }
22
+ function asBoolean(value) {
23
+ return value === true;
24
+ }
25
+ function normalizeTokens(rawTokens) {
26
+ const tokens = asRecord(rawTokens) ?? {};
27
+ const input = asNumber(tokens.input_tokens);
28
+ const output = asNumber(tokens.output_tokens);
29
+ const reasoning = asNumber(tokens.reasoning_tokens);
30
+ const cached = asNumber(tokens.cached_tokens);
31
+ const explicitTotal = asNumber(tokens.total_tokens);
32
+ const total = explicitTotal || input + output + reasoning + cached;
33
+ return {
34
+ input_tokens: input,
35
+ output_tokens: output,
36
+ reasoning_tokens: reasoning,
37
+ cached_tokens: cached,
38
+ total_tokens: total,
39
+ };
40
+ }
41
+ function normalizeQueueRecord(record) {
42
+ const raw = asRecord(record);
43
+ if (!raw) {
44
+ return null;
45
+ }
46
+ const provider = asString(raw.provider, 'unknown');
47
+ const model = asString(raw.model, asString(raw.alias, 'unknown'));
48
+ const source = asString(raw.source, 'unknown');
49
+ const authIndex = typeof raw.auth_index === 'string' || typeof raw.auth_index === 'number'
50
+ ? raw.auth_index
51
+ : source;
52
+ return {
53
+ timestamp: asString(raw.timestamp, new Date().toISOString()),
54
+ provider,
55
+ model,
56
+ alias: asString(raw.alias, model),
57
+ source,
58
+ auth_index: authIndex,
59
+ request_id: asString(raw.request_id, ''),
60
+ tokens: normalizeTokens(raw.tokens),
61
+ failed: asBoolean(raw.failed),
62
+ };
63
+ }
64
+ function ensureProviderBucket(response, provider) {
65
+ const usage = (response.usage ?? (response.usage = { apis: {} }));
66
+ const apis = (usage.apis ?? (usage.apis = {}));
67
+ return (apis[provider] ?? (apis[provider] = { total_requests: 0, total_tokens: 0, models: {} }));
68
+ }
69
+ function ensureModelBucket(providerBucket, model) {
70
+ const models = (providerBucket.models ?? (providerBucket.models = {}));
71
+ return (models[model] ?? (models[model] = { total_requests: 0, total_tokens: 0, details: [] }));
72
+ }
73
+ function addDetail(response, provider, model, detail) {
74
+ const usage = (response.usage ?? (response.usage = { apis: {} }));
75
+ const providerBucket = ensureProviderBucket(response, provider);
76
+ const modelBucket = ensureModelBucket(providerBucket, model);
77
+ const totalTokens = detail.tokens?.total_tokens ?? 0;
78
+ usage.total_requests = (usage.total_requests ?? 0) + 1;
79
+ usage.total_tokens = (usage.total_tokens ?? 0) + totalTokens;
80
+ if (detail.failed) {
81
+ usage.failure_count = (usage.failure_count ?? 0) + 1;
82
+ response.failed_requests = (response.failed_requests ?? 0) + 1;
83
+ }
84
+ else {
85
+ usage.success_count = (usage.success_count ?? 0) + 1;
86
+ }
87
+ providerBucket.total_requests = (providerBucket.total_requests ?? 0) + 1;
88
+ providerBucket.total_tokens = (providerBucket.total_tokens ?? 0) + totalTokens;
89
+ modelBucket.total_requests = (modelBucket.total_requests ?? 0) + 1;
90
+ modelBucket.total_tokens = (modelBucket.total_tokens ?? 0) + totalTokens;
91
+ (modelBucket.details ?? (modelBucket.details = [])).push(detail);
92
+ }
93
+ function createDetailSignature(provider, model, detail) {
94
+ return [
95
+ provider,
96
+ model,
97
+ detail.request_id?.trim() ?? '',
98
+ detail.timestamp,
99
+ detail.source,
100
+ String(detail.auth_index),
101
+ detail.tokens?.input_tokens ?? 0,
102
+ detail.tokens?.output_tokens ?? 0,
103
+ detail.tokens?.reasoning_tokens ?? 0,
104
+ detail.tokens?.cached_tokens ?? 0,
105
+ detail.tokens?.total_tokens ?? 0,
106
+ detail.failed ? '1' : '0',
107
+ ].join('|');
108
+ }
109
+ function collectResponseDetails(response) {
110
+ const entries = [];
111
+ for (const [provider, providerData] of Object.entries(response.usage?.apis ?? {})) {
112
+ for (const [model, modelData] of Object.entries(providerData.models ?? {})) {
113
+ for (const detail of modelData.details ?? []) {
114
+ entries.push({ provider, model, detail });
115
+ }
116
+ }
117
+ }
118
+ return entries;
119
+ }
120
+ function buildUsageResponseFromQueueRecords(records) {
121
+ const response = {
122
+ failed_requests: 0,
123
+ usage: {
124
+ total_requests: 0,
125
+ success_count: 0,
126
+ failure_count: 0,
127
+ total_tokens: 0,
128
+ apis: {},
129
+ },
130
+ };
131
+ for (const rawRecord of records) {
132
+ const record = normalizeQueueRecord(rawRecord);
133
+ if (!record) {
134
+ continue;
135
+ }
136
+ addDetail(response, record.provider ?? 'unknown', record.model ?? 'unknown', {
137
+ timestamp: record.timestamp ?? new Date().toISOString(),
138
+ source: record.source ?? 'unknown',
139
+ auth_index: record.auth_index ?? record.source ?? 'unknown',
140
+ request_id: record.request_id || undefined,
141
+ tokens: normalizeTokens(record.tokens),
142
+ failed: record.failed === true,
143
+ });
144
+ }
145
+ return response;
146
+ }
147
+ exports.buildUsageResponseFromQueueRecords = buildUsageResponseFromQueueRecords;
148
+ function mergeUsageResponses(base, incoming) {
149
+ const merged = buildUsageResponseFromQueueRecords([]);
150
+ const seen = new Set();
151
+ for (const entry of [...collectResponseDetails(base), ...collectResponseDetails(incoming)]) {
152
+ const signature = createDetailSignature(entry.provider, entry.model, entry.detail);
153
+ if (seen.has(signature)) {
154
+ continue;
155
+ }
156
+ seen.add(signature);
157
+ addDetail(merged, entry.provider, entry.model, entry.detail);
158
+ }
159
+ return merged;
160
+ }
161
+ exports.mergeUsageResponses = mergeUsageResponses;
162
+ function cloneUsageResponse(response) {
163
+ return {
164
+ failed_requests: response.failed_requests ?? 0,
165
+ usage: {
166
+ total_requests: response.usage?.total_requests ?? 0,
167
+ success_count: response.usage?.success_count ?? 0,
168
+ failure_count: response.usage?.failure_count ?? 0,
169
+ total_tokens: response.usage?.total_tokens ?? 0,
170
+ apis: Object.fromEntries(Object.entries(response.usage?.apis ?? {}).map(([provider, providerData]) => [
171
+ provider,
172
+ {
173
+ total_requests: providerData.total_requests ?? 0,
174
+ total_tokens: providerData.total_tokens ?? 0,
175
+ models: Object.fromEntries(Object.entries(providerData.models ?? {}).map(([model, modelData]) => [
176
+ model,
177
+ {
178
+ total_requests: modelData.total_requests ?? 0,
179
+ total_tokens: modelData.total_tokens ?? 0,
180
+ details: (modelData.details ?? []).map((detail) => ({
181
+ ...detail,
182
+ tokens: { ...detail.tokens },
183
+ })),
184
+ },
185
+ ])),
186
+ },
187
+ ])),
188
+ },
189
+ };
190
+ }
191
+ function cloneDetail(detail) {
192
+ return {
193
+ ...detail,
194
+ tokens: { ...detail.tokens },
195
+ };
196
+ }
197
+ function createMissingDetailMergeKey(provider, model, detail) {
198
+ return [
199
+ provider,
200
+ model,
201
+ detail.request_id?.trim() ?? '',
202
+ detail.timestamp,
203
+ detail.source?.trim() ?? '',
204
+ String(detail.auth_index ?? '').trim(),
205
+ detail.tokens?.input_tokens ?? 0,
206
+ detail.tokens?.output_tokens ?? 0,
207
+ detail.tokens?.reasoning_tokens ?? 0,
208
+ detail.tokens?.cached_tokens ?? 0,
209
+ detail.tokens?.total_tokens ?? 0,
210
+ detail.failed ? '1' : '0',
211
+ ].join('|');
212
+ }
213
+ function extractDuplicateIdentityValue(value) {
214
+ const authFileMatch = value.match(/(?:^|\s)auth_file=("[^"]+"|'[^']+'|[^\s]+)/i);
215
+ const rawValue = authFileMatch?.[1] ?? value;
216
+ const unquotedValue = rawValue.trim().replace(/^['"]|['"]$/g, '');
217
+ const pipeCandidate = unquotedValue.split('|').pop() ?? unquotedValue;
218
+ return pipeCandidate.split(/[\\/]/).pop() ?? pipeCandidate.trim();
219
+ }
220
+ function stripKnownAuthPlanSuffix(value) {
221
+ return value.replace(/-(?:free|plus|pro|team|business|enterprise)$/i, '');
222
+ }
223
+ function normalizeDuplicateIdentity(provider, value) {
224
+ const rawValue = String(value ?? '').trim();
225
+ if (!rawValue) {
226
+ return '';
227
+ }
228
+ const normalizedProvider = provider.trim().toLowerCase();
229
+ const identityValue = extractDuplicateIdentityValue(rawValue);
230
+ const hadJsonExtension = /\.json$/i.test(identityValue);
231
+ let candidate = identityValue.replace(/\.json$/i, '');
232
+ const providerPrefix = `${normalizedProvider}-`;
233
+ if (candidate.toLowerCase().startsWith(providerPrefix)) {
234
+ candidate = candidate.slice(providerPrefix.length);
235
+ }
236
+ candidate = candidate.replace(/^[a-f0-9]{8}[-_]/i, '').trim();
237
+ if (hadJsonExtension) {
238
+ candidate = stripKnownAuthPlanSuffix(candidate);
239
+ }
240
+ return candidate ? candidate.toLowerCase() : rawValue.toLowerCase();
241
+ }
242
+ function resolveCompleteDetailDuplicateIdentity(provider, detail) {
243
+ return (normalizeDuplicateIdentity(provider, detail.source) ||
244
+ normalizeDuplicateIdentity(provider, detail.auth_index) ||
245
+ 'unknown');
246
+ }
247
+ function createLikelyLogDuplicateKey(provider, model, detail) {
248
+ return [
249
+ provider,
250
+ model,
251
+ resolveCompleteDetailDuplicateIdentity(provider, detail),
252
+ detail.failed ? '1' : '0',
253
+ ].join('|');
254
+ }
255
+ function createRequestIdDuplicateKey(provider, model, detail) {
256
+ const requestId = detail.request_id?.trim();
257
+ return requestId ? [provider, model, requestId, detail.failed ? '1' : '0'].join('|') : '';
258
+ }
259
+ function parseDetailTimestamp(detail) {
260
+ const timestampMs = Date.parse(detail.timestamp);
261
+ return Number.isFinite(timestampMs) ? timestampMs : null;
262
+ }
263
+ const TOKENLESS_LOG_DUPLICATE_WINDOW_MS = 5000;
264
+ function detailHasTokenUsage(detail) {
265
+ return ((detail.tokens?.input_tokens ?? 0) > 0 ||
266
+ (detail.tokens?.output_tokens ?? 0) > 0 ||
267
+ (detail.tokens?.reasoning_tokens ?? 0) > 0 ||
268
+ (detail.tokens?.cached_tokens ?? 0) > 0 ||
269
+ (detail.tokens?.total_tokens ?? 0) > 0);
270
+ }
271
+ function collectDetailMergeKeyCounts(response) {
272
+ const counts = new Map();
273
+ for (const entry of collectResponseDetails(response)) {
274
+ const key = createMissingDetailMergeKey(entry.provider, entry.model, entry.detail);
275
+ counts.set(key, (counts.get(key) ?? 0) + 1);
276
+ }
277
+ return counts;
278
+ }
279
+ function collectLikelyLogDuplicateCandidates(response) {
280
+ const candidates = {
281
+ byRequestId: new Map(),
282
+ byIdentity: new Map(),
283
+ };
284
+ for (const [provider, providerData] of Object.entries(response.usage?.apis ?? {})) {
285
+ for (const [model, modelData] of Object.entries(providerData.models ?? {})) {
286
+ const details = modelData.details ?? [];
287
+ const canUseIdentityWindow = (modelData.total_requests ?? 0) <= details.length;
288
+ for (const detail of details) {
289
+ const requestIdKey = createRequestIdDuplicateKey(provider, model, detail);
290
+ if (requestIdKey) {
291
+ candidates.byRequestId.set(requestIdKey, (candidates.byRequestId.get(requestIdKey) ?? 0) + 1);
292
+ }
293
+ if (!canUseIdentityWindow) {
294
+ continue;
295
+ }
296
+ const timestampMs = parseDetailTimestamp(detail);
297
+ if (timestampMs === null) {
298
+ continue;
299
+ }
300
+ const key = createLikelyLogDuplicateKey(provider, model, detail);
301
+ const timestamps = candidates.byIdentity.get(key) ?? [];
302
+ timestamps.push(timestampMs);
303
+ candidates.byIdentity.set(key, timestamps);
304
+ }
305
+ }
306
+ }
307
+ return candidates;
308
+ }
309
+ function consumeDetailKey(counts, key) {
310
+ const count = counts.get(key) ?? 0;
311
+ if (count <= 0) {
312
+ return false;
313
+ }
314
+ if (count === 1) {
315
+ counts.delete(key);
316
+ }
317
+ else {
318
+ counts.set(key, count - 1);
319
+ }
320
+ return true;
321
+ }
322
+ function consumeCount(counts, key) {
323
+ const count = counts.get(key) ?? 0;
324
+ if (count <= 0) {
325
+ return false;
326
+ }
327
+ if (count === 1) {
328
+ counts.delete(key);
329
+ }
330
+ else {
331
+ counts.set(key, count - 1);
332
+ }
333
+ return true;
334
+ }
335
+ function consumeLikelyLogDuplicateCandidate(candidates, provider, model, detail) {
336
+ if (detailHasTokenUsage(detail)) {
337
+ return false;
338
+ }
339
+ const requestIdKey = createRequestIdDuplicateKey(provider, model, detail);
340
+ if (requestIdKey && consumeCount(candidates.byRequestId, requestIdKey)) {
341
+ return true;
342
+ }
343
+ const timestampMs = parseDetailTimestamp(detail);
344
+ if (timestampMs === null) {
345
+ return false;
346
+ }
347
+ const key = createLikelyLogDuplicateKey(provider, model, detail);
348
+ const timestamps = candidates.byIdentity.get(key) ?? [];
349
+ const index = timestamps.findIndex((candidateTimestampMs) => Math.abs(candidateTimestampMs - timestampMs) <= TOKENLESS_LOG_DUPLICATE_WINDOW_MS);
350
+ if (index === -1) {
351
+ return false;
352
+ }
353
+ timestamps.splice(index, 1);
354
+ if (timestamps.length === 0) {
355
+ candidates.byIdentity.delete(key);
356
+ }
357
+ else {
358
+ candidates.byIdentity.set(key, timestamps);
359
+ }
360
+ return true;
361
+ }
362
+ function countProviderDetails(providerBucket) {
363
+ return Object.values(providerBucket.models ?? {}).reduce((total, modelData) => total + (modelData.details ?? []).length, 0);
364
+ }
365
+ function appendDetailToExistingProvider(merged, provider, model, detail, options) {
366
+ const providerBucket = ensureProviderBucket(merged, provider);
367
+ const shouldFillAggregateOnly = (providerBucket.total_requests ?? 0) > countProviderDetails(providerBucket);
368
+ if (!shouldFillAggregateOnly) {
369
+ if (!options.appendExtraDetails) {
370
+ return;
371
+ }
372
+ addDetail(merged, provider, model, cloneDetail(detail));
373
+ return;
374
+ }
375
+ const modelBucket = ensureModelBucket(providerBucket, model);
376
+ const shouldFillModelAggregateOnly = (modelBucket.total_requests ?? 0) > (modelBucket.details ?? []).length;
377
+ if (!shouldFillModelAggregateOnly) {
378
+ modelBucket.total_requests = (modelBucket.total_requests ?? 0) + 1;
379
+ }
380
+ (modelBucket.details ?? (modelBucket.details = [])).push(cloneDetail(detail));
381
+ }
382
+ function mergeUsageResponseWithMissingDetails(base, incoming, options = {}) {
383
+ if (!incoming || !hasUsageDetails(incoming)) {
384
+ return base;
385
+ }
386
+ const normalizedOptions = {
387
+ appendExtraDetails: options.appendExtraDetails ?? true,
388
+ };
389
+ const merged = cloneUsageResponse(base);
390
+ const existingDetailCounts = collectDetailMergeKeyCounts(base);
391
+ const likelyLogDuplicateCandidates = collectLikelyLogDuplicateCandidates(base);
392
+ for (const entry of collectResponseDetails(incoming)) {
393
+ const mergeKey = createMissingDetailMergeKey(entry.provider, entry.model, entry.detail);
394
+ if (consumeDetailKey(existingDetailCounts, mergeKey)) {
395
+ continue;
396
+ }
397
+ if (consumeLikelyLogDuplicateCandidate(likelyLogDuplicateCandidates, entry.provider, entry.model, entry.detail)) {
398
+ continue;
399
+ }
400
+ if (base.usage?.apis?.[entry.provider]) {
401
+ appendDetailToExistingProvider(merged, entry.provider, entry.model, entry.detail, normalizedOptions);
402
+ continue;
403
+ }
404
+ addDetail(merged, entry.provider, entry.model, cloneDetail(entry.detail));
405
+ }
406
+ return merged;
407
+ }
408
+ exports.mergeUsageResponseWithMissingDetails = mergeUsageResponseWithMissingDetails;
409
+ function buildUsageResponseFromApiKeyUsage(rawResponse) {
410
+ const response = buildUsageResponseFromQueueRecords([]);
411
+ const usage = response.usage ?? {
412
+ total_requests: 0,
413
+ success_count: 0,
414
+ failure_count: 0,
415
+ total_tokens: 0,
416
+ apis: {},
417
+ };
418
+ response.usage = usage;
419
+ const byProvider = asRecord(rawResponse);
420
+ if (!byProvider) {
421
+ return response;
422
+ }
423
+ for (const [provider, sources] of Object.entries(byProvider)) {
424
+ const sourceRecords = asRecord(sources);
425
+ if (!sourceRecords) {
426
+ continue;
427
+ }
428
+ let providerRequests = 0;
429
+ for (const entry of Object.values(sourceRecords)) {
430
+ const usageEntry = asRecord(entry);
431
+ if (!usageEntry) {
432
+ continue;
433
+ }
434
+ const success = asNumber(usageEntry.success);
435
+ const failed = asNumber(usageEntry.failed);
436
+ providerRequests += success + failed;
437
+ usage.success_count = (usage.success_count ?? 0) + success;
438
+ usage.failure_count = (usage.failure_count ?? 0) + failed;
439
+ response.failed_requests = (response.failed_requests ?? 0) + failed;
440
+ }
441
+ if (providerRequests > 0) {
442
+ const providerBucket = ensureProviderBucket(response, provider);
443
+ providerBucket.total_requests = (providerBucket.total_requests ?? 0) + providerRequests;
444
+ usage.total_requests = (usage.total_requests ?? 0) + providerRequests;
445
+ }
446
+ }
447
+ return response;
448
+ }
449
+ exports.buildUsageResponseFromApiKeyUsage = buildUsageResponseFromApiKeyUsage;
450
+ function hasUsageDetails(response) {
451
+ return collectResponseDetails(response).length > 0;
452
+ }
453
+ exports.hasUsageDetails = hasUsageDetails;
454
+ function hasUsageTotals(response) {
455
+ return (response.usage?.total_requests ?? 0) > 0;
456
+ }
457
+ exports.hasUsageTotals = hasUsageTotals;
458
+ //# sourceMappingURL=usage-compatibility-transformer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"usage-compatibility-transformer.js","sourceRoot":"","sources":["../../../src/cliproxy/services/usage-compatibility-transformer.ts"],"names":[],"mappings":";;;AAyBA,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc,EAAE,QAAgB;IAChD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC7E,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,KAAK,IAAI,CAAC;AACxB,CAAC;AAED,SAAS,eAAe,CAAC,SAAkB;IACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,aAAa,IAAI,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IAEnE,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,aAAa,EAAE,MAAM;QACrB,gBAAgB,EAAE,SAAS;QAC3B,aAAa,EAAE,MAAM;QACrB,YAAY,EAAE,KAAK;KACpB,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAe;IAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/C,MAAM,SAAS,GACb,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ;QACtE,CAAC,CAAC,GAAG,CAAC,UAAU;QAChB,CAAC,CAAC,MAAM,CAAC;IAEb,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC5D,QAAQ;QACR,KAAK;QACL,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC;QACjC,MAAM;QACN,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC;QACxC,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC;QACnC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;KAC9B,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,QAAkC,EAClC,QAAgB;IAEhB,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,KAAK,KAAd,QAAQ,CAAC,KAAK,GAAK,EAAE,IAAI,EAAE,EAAE,EAAE,EAAC,CAAC;IAChD,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAV,KAAK,CAAC,IAAI,GAAK,EAAE,EAAC,CAAC;IACjC,OAAO,CAAC,IAAI,CAAC,QAAQ,MAAb,IAAI,CAAC,QAAQ,IAAM,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAC,CAAC;AACjF,CAAC;AAED,SAAS,iBAAiB,CACxB,cAA2F,EAC3F,KAAa;IAEb,MAAM,MAAM,GAAG,CAAC,cAAc,CAAC,MAAM,KAArB,cAAc,CAAC,MAAM,GAAK,EAAE,EAAC,CAAC;IAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,MAAZ,MAAM,CAAC,KAAK,IAAM,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAC,CAAC;AACjF,CAAC;AAED,SAAS,SAAS,CAChB,QAAkC,EAClC,QAAgB,EAChB,KAAa,EACb,MAA6B;IAE7B,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,KAAK,KAAd,QAAQ,CAAC,KAAK,GAAK,EAAE,IAAI,EAAE,EAAE,EAAE,EAAC,CAAC;IAChD,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC,CAAC;IAErD,KAAK,CAAC,cAAc,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACvD,KAAK,CAAC,YAAY,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC;IAC7D,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,KAAK,CAAC,aAAa,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACrD,QAAQ,CAAC,eAAe,GAAG,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,aAAa,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,cAAc,CAAC,cAAc,GAAG,CAAC,cAAc,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACzE,cAAc,CAAC,YAAY,GAAG,CAAC,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC;IAC/E,WAAW,CAAC,cAAc,GAAG,CAAC,WAAW,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnE,WAAW,CAAC,YAAY,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,WAAW,CAAC;IACzE,CAAC,WAAW,CAAC,OAAO,KAAnB,WAAW,CAAC,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAgB,EAChB,KAAa,EACb,MAA6B;IAE7B,OAAO;QACL,QAAQ;QACR,KAAK;QACL,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;QAC/B,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QACzB,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC;QAChC,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC;QACjC,MAAM,CAAC,MAAM,EAAE,gBAAgB,IAAI,CAAC;QACpC,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC;QACjC,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;KAC1B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,SAAS,sBAAsB,CAC7B,QAAkC;IAElC,MAAM,OAAO,GAA8E,EAAE,CAAC;IAC9F,KAAK,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;QAClF,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3E,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;gBAC7C,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,kCAAkC,CAAC,OAAkB;IACnE,MAAM,QAAQ,GAA6B;QACzC,eAAe,EAAE,CAAC;QAClB,KAAK,EAAE;YACL,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,CAAC;YAChB,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,EAAE;SACT;KACF,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS;QACX,CAAC;QAED,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS,EAAE;YAC3E,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACvD,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;YAClC,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS;YAC3D,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,SAAS;YAC1C,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC;YACtC,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,IAAI;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA7BD,gFA6BC;AAED,SAAgB,mBAAmB,CACjC,IAA8B,EAC9B,QAAkC;IAElC,MAAM,MAAM,GAAG,kCAAkC,CAAC,EAAE,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,EAAE,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACnF,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,kDAiBC;AAED,SAAS,kBAAkB,CAAC,QAAkC;IAC5D,OAAO;QACL,eAAe,EAAE,QAAQ,CAAC,eAAe,IAAI,CAAC;QAC9C,KAAK,EAAE;YACL,cAAc,EAAE,QAAQ,CAAC,KAAK,EAAE,cAAc,IAAI,CAAC;YACnD,aAAa,EAAE,QAAQ,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;YACjD,aAAa,EAAE,QAAQ,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;YACjD,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,YAAY,IAAI,CAAC;YAC/C,IAAI,EAAE,MAAM,CAAC,WAAW,CACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC;gBAC3E,QAAQ;gBACR;oBACE,cAAc,EAAE,YAAY,CAAC,cAAc,IAAI,CAAC;oBAChD,YAAY,EAAE,YAAY,CAAC,YAAY,IAAI,CAAC;oBAC5C,MAAM,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;wBACpE,KAAK;wBACL;4BACE,cAAc,EAAE,SAAS,CAAC,cAAc,IAAI,CAAC;4BAC7C,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,CAAC;4BACzC,OAAO,EAAE,CAAC,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gCAClD,GAAG,MAAM;gCACT,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE;6BAC7B,CAAC,CAAC;yBACJ;qBACF,CAAC,CACH;iBACF;aACF,CAAC,CACH;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,MAA6B;IAChD,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,QAAgB,EAChB,KAAa,EACb,MAA6B;IAE7B,OAAO;QACL,QAAQ;QACR,KAAK;QACL,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE;QAC/B,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;QAC3B,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QACtC,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC;QAChC,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC;QACjC,MAAM,CAAC,MAAM,EAAE,gBAAgB,IAAI,CAAC;QACpC,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC;QACjC,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;KAC1B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAa;IAClD,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IAC7C,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,aAAa,CAAC;IACtE,OAAO,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;AACpE,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa;IAC7C,OAAO,KAAK,CAAC,OAAO,CAAC,+CAA+C,EAAE,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,0BAA0B,CAAC,QAAgB,EAAE,KAAkC;IACtF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,kBAAkB,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACzD,MAAM,aAAa,GAAG,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxD,IAAI,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,GAAG,kBAAkB,GAAG,CAAC;IAChD,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACvD,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9D,IAAI,gBAAgB,EAAE,CAAC;QACrB,SAAS,GAAG,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;AACtE,CAAC;AAED,SAAS,sCAAsC,CAC7C,QAAgB,EAChB,MAA6B;IAE7B,OAAO,CACL,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;QACnD,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QACvD,SAAS,CACV,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,QAAgB,EAChB,KAAa,EACb,MAA6B;IAE7B,OAAO;QACL,QAAQ;QACR,KAAK;QACL,sCAAsC,CAAC,QAAQ,EAAE,MAAM,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;KAC1B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,SAAS,2BAA2B,CAClC,QAAgB,EAChB,KAAa,EACb,MAA6B;IAE7B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;IAC5C,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5F,CAAC;AAED,SAAS,oBAAoB,CAAC,MAA6B;IACzD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3D,CAAC;AAED,MAAM,iCAAiC,GAAG,IAAK,CAAC;AAOhD,SAAS,mBAAmB,CAAC,MAA6B;IACxD,OAAO,CACL,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC;QACtC,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC,CAAC,GAAG,CAAC;QACvC,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,IAAI,CAAC,CAAC,GAAG,CAAC;QAC1C,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,CAAC,CAAC,GAAG,CAAC;QACvC,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CACvC,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,QAAkC;IACrE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,KAAK,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,2BAA2B,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACnF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mCAAmC,CAC1C,QAAkC;IAElC,MAAM,UAAU,GAAiC;QAC/C,WAAW,EAAE,IAAI,GAAG,EAAkB;QACtC,UAAU,EAAE,IAAI,GAAG,EAAoB;KACxC,CAAC;IACF,KAAK,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;QAClF,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3E,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC;YACxC,MAAM,oBAAoB,GAAG,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;YAC/E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,MAAM,YAAY,GAAG,2BAA2B,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC1E,IAAI,YAAY,EAAE,CAAC;oBACjB,UAAU,CAAC,WAAW,CAAC,GAAG,CACxB,YAAY,EACZ,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CACpD,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC1B,SAAS;gBACX,CAAC;gBAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;gBACjD,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;oBACzB,SAAS;gBACX,CAAC;gBAED,MAAM,GAAG,GAAG,2BAA2B,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;gBACjE,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACxD,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC7B,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA2B,EAAE,GAAW;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,MAA2B,EAAE,GAAW;IAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kCAAkC,CACzC,UAAwC,EACxC,QAAgB,EAChB,KAAa,EACb,MAA6B;IAE7B,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,YAAY,GAAG,2BAA2B,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1E,IAAI,YAAY,IAAI,YAAY,CAAC,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAG,2BAA2B,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACxD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAChC,CAAC,oBAAoB,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,oBAAoB,GAAG,WAAW,CAAC,IAAI,iCAAiC,CACpF,CAAC;IACF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,oBAAoB,CAC3B,cAA2F;IAE3F,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CACtD,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,EAC9D,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,8BAA8B,CACrC,MAAgC,EAChC,QAAgB,EAChB,KAAa,EACb,MAA6B,EAC7B,OAA6C;IAE7C,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,uBAAuB,GAC3B,CAAC,cAAc,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC9E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QACD,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QACxD,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC7D,MAAM,4BAA4B,GAChC,CAAC,WAAW,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAEzE,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClC,WAAW,CAAC,cAAc,GAAG,CAAC,WAAW,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IACD,CAAC,WAAW,CAAC,OAAO,KAAnB,WAAW,CAAC,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,SAAgB,oCAAoC,CAClD,IAA8B,EAC9B,QAAqD,EACrD,UAAsC,EAAE;IAExC,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,iBAAiB,GAAyC;QAC9D,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,IAAI,IAAI;KACvD,CAAC;IACF,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,4BAA4B,GAAG,mCAAmC,CAAC,IAAI,CAAC,CAAC;IAC/E,KAAK,MAAM,KAAK,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,2BAA2B,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACxF,IAAI,gBAAgB,CAAC,oBAAoB,EAAE,QAAQ,CAAC,EAAE,CAAC;YACrD,SAAS;QACX,CAAC;QAED,IACE,kCAAkC,CAChC,4BAA4B,EAC5B,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,CACb,EACD,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,8BAA8B,CAC5B,MAAM,EACN,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,EACZ,iBAAiB,CAClB,CAAC;YACF,SAAS;QACX,CAAC;QAED,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA/CD,oFA+CC;AAED,SAAgB,iCAAiC,CAAC,WAAoB;IACpE,MAAM,QAAQ,GAAG,kCAAkC,CAAC,EAAE,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI;QAC9B,cAAc,EAAE,CAAC;QACjB,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,CAAC;QAChB,YAAY,EAAE,CAAC;QACf,IAAI,EAAE,EAAE;KACT,CAAC;IACF,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAA+B,CAAC;IACvE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7D,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,SAAS;QACX,CAAC;QAED,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC3C,gBAAgB,IAAI,OAAO,GAAG,MAAM,CAAC;YACrC,KAAK,CAAC,aAAa,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC;YAC3D,KAAK,CAAC,aAAa,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC;YAC1D,QAAQ,CAAC,eAAe,GAAG,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC;QACtE,CAAC;QAED,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAChE,cAAc,CAAC,cAAc,GAAG,CAAC,cAAc,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC;YACxF,KAAK,CAAC,cAAc,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,gBAAgB,CAAC;QACxE,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA5CD,8EA4CC;AAED,SAAgB,eAAe,CAAC,QAAkC;IAChE,OAAO,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACrD,CAAC;AAFD,0CAEC;AAED,SAAgB,cAAc,CAAC,QAAkC;IAC/D,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;AACnD,CAAC;AAFD,wCAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kaitranntt/ccs",
3
- "version": "7.77.1-dev.3",
3
+ "version": "7.77.1-dev.4",
4
4
  "description": "Claude Code Switch - Instant profile switching between Claude, GLM, Kimi, and more",
5
5
  "keywords": [
6
6
  "cli",