@kaitranntt/ccs 7.77.1-dev.1 → 7.77.1-dev.10

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.
Files changed (131) hide show
  1. package/README.md +2 -1
  2. package/dist/auth/account-profile-diagnostics.d.ts +21 -0
  3. package/dist/auth/account-profile-diagnostics.d.ts.map +1 -0
  4. package/dist/auth/account-profile-diagnostics.js +130 -0
  5. package/dist/auth/account-profile-diagnostics.js.map +1 -0
  6. package/dist/auth/auth-commands.d.ts.map +1 -1
  7. package/dist/auth/auth-commands.js +12 -8
  8. package/dist/auth/auth-commands.js.map +1 -1
  9. package/dist/auth/commands/create-command.d.ts.map +1 -1
  10. package/dist/auth/commands/create-command.js +7 -1
  11. package/dist/auth/commands/create-command.js.map +1 -1
  12. package/dist/auth/commands/show-command.d.ts.map +1 -1
  13. package/dist/auth/commands/show-command.js +42 -0
  14. package/dist/auth/commands/show-command.js.map +1 -1
  15. package/dist/auth/commands/types.d.ts +20 -0
  16. package/dist/auth/commands/types.d.ts.map +1 -1
  17. package/dist/auth/commands/types.js.map +1 -1
  18. package/dist/ccs.js +1 -1
  19. package/dist/ccs.js.map +1 -1
  20. package/dist/cliproxy/ai-providers/codex-plan-compatibility.d.ts.map +1 -1
  21. package/dist/cliproxy/ai-providers/codex-plan-compatibility.js +2 -2
  22. package/dist/cliproxy/ai-providers/codex-plan-compatibility.js.map +1 -1
  23. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts +8 -2
  24. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
  25. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +82 -33
  26. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
  27. package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts +1 -1
  28. package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
  29. package/dist/cliproxy/ai-providers/model-id-normalizer.js +28 -11
  30. package/dist/cliproxy/ai-providers/model-id-normalizer.js.map +1 -1
  31. package/dist/cliproxy/auth/oauth-handler.d.ts +5 -1
  32. package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
  33. package/dist/cliproxy/auth/oauth-handler.js +44 -1
  34. package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
  35. package/dist/cliproxy/config/thinking-config.d.ts.map +1 -1
  36. package/dist/cliproxy/config/thinking-config.js +9 -8
  37. package/dist/cliproxy/config/thinking-config.js.map +1 -1
  38. package/dist/cliproxy/model-catalog.d.ts +2 -0
  39. package/dist/cliproxy/model-catalog.d.ts.map +1 -1
  40. package/dist/cliproxy/model-catalog.js +2 -0
  41. package/dist/cliproxy/model-catalog.js.map +1 -1
  42. package/dist/cliproxy/provider-capabilities.d.ts +3 -0
  43. package/dist/cliproxy/provider-capabilities.d.ts.map +1 -1
  44. package/dist/cliproxy/provider-capabilities.js +14 -2
  45. package/dist/cliproxy/provider-capabilities.js.map +1 -1
  46. package/dist/cliproxy/services/oauth-usage-log-transformer.d.ts +4 -0
  47. package/dist/cliproxy/services/oauth-usage-log-transformer.d.ts.map +1 -0
  48. package/dist/cliproxy/services/oauth-usage-log-transformer.js +162 -0
  49. package/dist/cliproxy/services/oauth-usage-log-transformer.js.map +1 -0
  50. package/dist/cliproxy/services/stats-fetcher.d.ts +4 -0
  51. package/dist/cliproxy/services/stats-fetcher.d.ts.map +1 -1
  52. package/dist/cliproxy/services/stats-fetcher.js +133 -25
  53. package/dist/cliproxy/services/stats-fetcher.js.map +1 -1
  54. package/dist/cliproxy/services/stats-transformer.d.ts.map +1 -1
  55. package/dist/cliproxy/services/stats-transformer.js +85 -13
  56. package/dist/cliproxy/services/stats-transformer.js.map +1 -1
  57. package/dist/cliproxy/services/usage-compatibility-transformer.d.ts +12 -0
  58. package/dist/cliproxy/services/usage-compatibility-transformer.d.ts.map +1 -0
  59. package/dist/cliproxy/services/usage-compatibility-transformer.js +458 -0
  60. package/dist/cliproxy/services/usage-compatibility-transformer.js.map +1 -0
  61. package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
  62. package/dist/commands/cliproxy/variant-subcommand.js +44 -12
  63. package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
  64. package/dist/commands/command-catalog.js +2 -2
  65. package/dist/commands/command-catalog.js.map +1 -1
  66. package/dist/commands/copilot-command.js +3 -1
  67. package/dist/commands/copilot-command.js.map +1 -1
  68. package/dist/commands/help-command.js +1 -1
  69. package/dist/commands/help-command.js.map +1 -1
  70. package/dist/config/loader/yaml-serializer.d.ts.map +1 -1
  71. package/dist/config/loader/yaml-serializer.js +4 -3
  72. package/dist/config/loader/yaml-serializer.js.map +1 -1
  73. package/dist/config/schemas/copilot-cursor.d.ts +2 -2
  74. package/dist/config/schemas/copilot-cursor.js +1 -1
  75. package/dist/config/schemas/unified-config.d.ts +1 -1
  76. package/dist/config/schemas/unified-config.d.ts.map +1 -1
  77. package/dist/delegation/delegation-handler.d.ts.map +1 -1
  78. package/dist/delegation/delegation-handler.js +107 -33
  79. package/dist/delegation/delegation-handler.js.map +1 -1
  80. package/dist/proxy/upstream-url.d.ts.map +1 -1
  81. package/dist/proxy/upstream-url.js +8 -0
  82. package/dist/proxy/upstream-url.js.map +1 -1
  83. package/dist/shared/provider-preset-catalog.d.ts +1 -1
  84. package/dist/shared/provider-preset-catalog.d.ts.map +1 -1
  85. package/dist/shared/provider-preset-catalog.js +1 -1
  86. package/dist/shared/provider-preset-catalog.js.map +1 -1
  87. package/dist/ui/assets/accounts-CZAk1r5e.js +1 -0
  88. package/dist/ui/assets/{alert-dialog-C6npAhT0.js → alert-dialog-CDKh6Iej.js} +1 -1
  89. package/dist/ui/assets/{api-DZosWVkR.js → api-BHoqwj9I.js} +1 -1
  90. package/dist/ui/assets/{auth-section-D4MZkgcP.js → auth-section--qaXBZqv.js} +1 -1
  91. package/dist/ui/assets/{backups-section-DvMJrmHH.js → backups-section-B0UrPJSd.js} +1 -1
  92. package/dist/ui/assets/{channels-BVftYfOn.js → channels-LNSoyw91.js} +1 -1
  93. package/dist/ui/assets/{checkbox-BLRznRTO.js → checkbox-qW_Bg5Pj.js} +1 -1
  94. package/dist/ui/assets/{claude-extension-C6OeBQ73.js → claude-extension-CMbaulCy.js} +1 -1
  95. package/dist/ui/assets/cliproxy-275p7_R-.js +3 -0
  96. package/dist/ui/assets/{cliproxy-ai-providers-BAJ78pUc.js → cliproxy-ai-providers-DM_Qss9R.js} +1 -1
  97. package/dist/ui/assets/{cliproxy-control-panel-XEvUMVJe.js → cliproxy-control-panel-L8agopTe.js} +1 -1
  98. package/dist/ui/assets/{codex-CY2vikqX.js → codex-Bq4vc-Bt.js} +1 -1
  99. package/dist/ui/assets/{confirm-dialog-DjLHh1qX.js → confirm-dialog-DT--b5KS.js} +1 -1
  100. package/dist/ui/assets/{copilot-afee2lL9.js → copilot-C-h6PKsb.js} +2 -2
  101. package/dist/ui/assets/{cursor-DuWy60wp.js → cursor-BNYNTdOU.js} +1 -1
  102. package/dist/ui/assets/{droid-FlceoQ6k.js → droid-BDcKP8ys.js} +1 -1
  103. package/dist/ui/assets/{globalenv-section-DpJ7unxC.js → globalenv-section-B-MZK7oT.js} +1 -1
  104. package/dist/ui/assets/{health-BEMgcKD3.js → health-Z4tbeEMB.js} +1 -1
  105. package/dist/ui/assets/{icons-DQFHtVq5.js → icons-DIVjDO-z.js} +1 -1
  106. package/dist/ui/assets/{index-Cj7EjEq6.js → index-BYH8td_-.js} +1 -1
  107. package/dist/ui/assets/index-BnUnpDeI.js +72 -0
  108. package/dist/ui/assets/{index-Cq9VySs6.js → index-Bx05FUIb.js} +1 -1
  109. package/dist/ui/assets/{index-Ba4ysocb.js → index-CNr-xTDQ.js} +1 -1
  110. package/dist/ui/assets/index-CczVFk1P.css +1 -0
  111. package/dist/ui/assets/{index-0GkznW41.js → index-DeESkz1L.js} +1 -1
  112. package/dist/ui/assets/{index-0n_43sCZ.js → index-XlZulaah.js} +1 -1
  113. package/dist/ui/assets/{index-DOC7_hun.js → index-lrKih76J.js} +1 -1
  114. package/dist/ui/assets/{logs-Dth4naJl.js → logs-CPq1nOO3.js} +1 -1
  115. package/dist/ui/assets/{masked-input-DL6pJ8pE.js → masked-input-DKEaMpuM.js} +1 -1
  116. package/dist/ui/assets/{proxy-status-widget-DW4cPFeD.js → proxy-status-widget-DHvXGB-0.js} +1 -1
  117. package/dist/ui/assets/{raw-json-settings-editor-panel-Dcumu3Qi.js → raw-json-settings-editor-panel-DYFizqns.js} +1 -1
  118. package/dist/ui/assets/{searchable-select-CWL2D5Ft.js → searchable-select-0sMBiw79.js} +1 -1
  119. package/dist/ui/assets/{separator-Do_vqTQD.js → separator-Iwj015MP.js} +1 -1
  120. package/dist/ui/assets/{shared-CwWuZx24.js → shared-DsbHybKL.js} +1 -1
  121. package/dist/ui/assets/{table-BP6nBZzg.js → table-BtToEVHU.js} +1 -1
  122. package/dist/ui/assets/{updates-BTHJZ7Rk.js → updates-TpeG63IU.js} +1 -1
  123. package/dist/ui/index.html +3 -3
  124. package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
  125. package/dist/web-server/routes/cliproxy-auth-routes.js +3 -0
  126. package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
  127. package/package.json +1 -1
  128. package/dist/ui/assets/accounts-CybVGDsm.js +0 -1
  129. package/dist/ui/assets/cliproxy-B3Jyu3r9.js +0 -3
  130. package/dist/ui/assets/index-6xrth3Oz.css +0 -1
  131. package/dist/ui/assets/index-BRtgic66.js +0 -72
@@ -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":"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"}
@@ -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"}