@kaitranntt/ccs 7.43.0 → 7.44.0-dev.1
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.
- package/README.md +49 -2
- package/config/base-codex.settings.json +4 -4
- package/dist/api/services/profile-reader.d.ts.map +1 -1
- package/dist/api/services/profile-reader.js +4 -1
- package/dist/api/services/profile-reader.js.map +1 -1
- package/dist/auth/profile-detector.d.ts +14 -3
- package/dist/auth/profile-detector.d.ts.map +1 -1
- package/dist/auth/profile-detector.js +35 -15
- package/dist/auth/profile-detector.js.map +1 -1
- package/dist/ccs.js +34 -4
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/auth/auth-types.d.ts +28 -1
- package/dist/cliproxy/auth/auth-types.d.ts.map +1 -1
- package/dist/cliproxy/auth/auth-types.js +70 -4
- package/dist/cliproxy/auth/auth-types.js.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +19 -4
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/composite-validator.d.ts +20 -0
- package/dist/cliproxy/composite-validator.d.ts.map +1 -0
- package/dist/cliproxy/composite-validator.js +85 -0
- package/dist/cliproxy/composite-validator.js.map +1 -0
- package/dist/cliproxy/config/env-builder.d.ts +24 -0
- package/dist/cliproxy/config/env-builder.d.ts.map +1 -1
- package/dist/cliproxy/config/env-builder.js +72 -1
- package/dist/cliproxy/config/env-builder.js.map +1 -1
- package/dist/cliproxy/config/thinking-config.d.ts +19 -2
- package/dist/cliproxy/config/thinking-config.d.ts.map +1 -1
- package/dist/cliproxy/config/thinking-config.js +127 -27
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.d.ts +16 -0
- package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +82 -26
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +202 -67
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/cliproxy/executor/retry-handler.d.ts +11 -0
- package/dist/cliproxy/executor/retry-handler.d.ts.map +1 -1
- package/dist/cliproxy/executor/retry-handler.js +30 -1
- package/dist/cliproxy/executor/retry-handler.js.map +1 -1
- package/dist/cliproxy/executor/thinking-arg-parser.d.ts +27 -0
- package/dist/cliproxy/executor/thinking-arg-parser.d.ts.map +1 -0
- package/dist/cliproxy/executor/thinking-arg-parser.js +80 -0
- package/dist/cliproxy/executor/thinking-arg-parser.js.map +1 -0
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +14 -3
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/model-config.d.ts.map +1 -1
- package/dist/cliproxy/model-config.js +27 -7
- package/dist/cliproxy/model-config.js.map +1 -1
- package/dist/cliproxy/provider-capabilities.d.ts +22 -0
- package/dist/cliproxy/provider-capabilities.d.ts.map +1 -0
- package/dist/cliproxy/provider-capabilities.js +95 -0
- package/dist/cliproxy/provider-capabilities.js.map +1 -0
- package/dist/cliproxy/quota-fetcher-codex.d.ts.map +1 -1
- package/dist/cliproxy/quota-fetcher-codex.js +106 -87
- package/dist/cliproxy/quota-fetcher-codex.js.map +1 -1
- package/dist/cliproxy/remote-auth-fetcher.d.ts.map +1 -1
- package/dist/cliproxy/remote-auth-fetcher.js +3 -26
- package/dist/cliproxy/remote-auth-fetcher.js.map +1 -1
- package/dist/cliproxy/service-manager.d.ts.map +1 -1
- package/dist/cliproxy/service-manager.js +3 -6
- package/dist/cliproxy/service-manager.js.map +1 -1
- package/dist/cliproxy/services/index.d.ts +2 -2
- package/dist/cliproxy/services/index.d.ts.map +1 -1
- package/dist/cliproxy/services/index.js +4 -1
- package/dist/cliproxy/services/index.js.map +1 -1
- package/dist/cliproxy/services/proxy-lifecycle-service.d.ts +15 -3
- package/dist/cliproxy/services/proxy-lifecycle-service.d.ts.map +1 -1
- package/dist/cliproxy/services/proxy-lifecycle-service.js +15 -6
- package/dist/cliproxy/services/proxy-lifecycle-service.js.map +1 -1
- package/dist/cliproxy/services/variant-config-adapter.d.ts +15 -0
- package/dist/cliproxy/services/variant-config-adapter.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-config-adapter.js +84 -11
- package/dist/cliproxy/services/variant-config-adapter.js.map +1 -1
- package/dist/cliproxy/services/variant-service.d.ts +26 -0
- package/dist/cliproxy/services/variant-service.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-service.js +164 -9
- package/dist/cliproxy/services/variant-service.js.map +1 -1
- package/dist/cliproxy/services/variant-settings.d.ts +19 -1
- package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-settings.js +150 -12
- package/dist/cliproxy/services/variant-settings.js.map +1 -1
- package/dist/cliproxy/types.d.ts +13 -0
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/cliproxy/types.js.map +1 -1
- package/dist/commands/cliproxy/auth-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/auth-subcommand.js +2 -1
- package/dist/commands/cliproxy/auth-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.js +4 -0
- package/dist/commands/cliproxy/help-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/index.d.ts.map +1 -1
- package/dist/commands/cliproxy/index.js +12 -0
- package/dist/commands/cliproxy/index.js.map +1 -1
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.d.ts +9 -0
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.js +92 -6
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand.js +106 -4
- package/dist/commands/cliproxy/quota-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.d.ts +1 -0
- package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.js +307 -3
- package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
- package/dist/commands/command-execution-contract.d.ts +23 -0
- package/dist/commands/command-execution-contract.d.ts.map +1 -0
- package/dist/commands/command-execution-contract.js +21 -0
- package/dist/commands/command-execution-contract.js.map +1 -0
- package/dist/commands/cursor-command-display.d.ts +6 -0
- package/dist/commands/cursor-command-display.d.ts.map +1 -0
- package/dist/commands/cursor-command-display.js +100 -0
- package/dist/commands/cursor-command-display.js.map +1 -0
- package/dist/commands/cursor-command.d.ts +12 -0
- package/dist/commands/cursor-command.d.ts.map +1 -0
- package/dist/commands/cursor-command.js +222 -0
- package/dist/commands/cursor-command.js.map +1 -0
- package/dist/commands/help-command.d.ts.map +1 -1
- package/dist/commands/help-command.js +30 -3
- package/dist/commands/help-command.js.map +1 -1
- package/dist/commands/shell-completion-command.d.ts +20 -0
- package/dist/commands/shell-completion-command.d.ts.map +1 -1
- package/dist/commands/shell-completion-command.js +45 -30
- package/dist/commands/shell-completion-command.js.map +1 -1
- package/dist/config/reserved-names.d.ts +1 -1
- package/dist/config/reserved-names.d.ts.map +1 -1
- package/dist/config/reserved-names.js +2 -0
- package/dist/config/reserved-names.js.map +1 -1
- package/dist/config/unified-config-loader.d.ts +6 -1
- package/dist/config/unified-config-loader.d.ts.map +1 -1
- package/dist/config/unified-config-loader.js +63 -3
- package/dist/config/unified-config-loader.js.map +1 -1
- package/dist/config/unified-config-types.d.ts +79 -2
- package/dist/config/unified-config-types.d.ts.map +1 -1
- package/dist/config/unified-config-types.js +28 -2
- package/dist/config/unified-config-types.js.map +1 -1
- package/dist/cursor/cursor-auth.d.ts +58 -0
- package/dist/cursor/cursor-auth.d.ts.map +1 -0
- package/dist/cursor/cursor-auth.js +295 -0
- package/dist/cursor/cursor-auth.js.map +1 -0
- package/dist/cursor/cursor-daemon-entry.d.ts +14 -0
- package/dist/cursor/cursor-daemon-entry.d.ts.map +1 -0
- package/dist/cursor/cursor-daemon-entry.js +236 -0
- package/dist/cursor/cursor-daemon-entry.js.map +1 -0
- package/dist/cursor/cursor-daemon-pid.d.ts +4 -0
- package/dist/cursor/cursor-daemon-pid.d.ts.map +1 -0
- package/dist/cursor/cursor-daemon-pid.js +77 -0
- package/dist/cursor/cursor-daemon-pid.js.map +1 -0
- package/dist/cursor/cursor-daemon.d.ts +36 -0
- package/dist/cursor/cursor-daemon.d.ts.map +1 -0
- package/dist/cursor/cursor-daemon.js +315 -0
- package/dist/cursor/cursor-daemon.js.map +1 -0
- package/dist/cursor/cursor-executor.d.ts +81 -0
- package/dist/cursor/cursor-executor.d.ts.map +1 -0
- package/dist/cursor/cursor-executor.js +821 -0
- package/dist/cursor/cursor-executor.js.map +1 -0
- package/dist/cursor/cursor-models.d.ts +43 -0
- package/dist/cursor/cursor-models.d.ts.map +1 -0
- package/dist/cursor/cursor-models.js +288 -0
- package/dist/cursor/cursor-models.js.map +1 -0
- package/dist/cursor/cursor-protobuf-decoder.d.ts +52 -0
- package/dist/cursor/cursor-protobuf-decoder.d.ts.map +1 -0
- package/dist/cursor/cursor-protobuf-decoder.js +311 -0
- package/dist/cursor/cursor-protobuf-decoder.js.map +1 -0
- package/dist/cursor/cursor-protobuf-encoder.d.ts +54 -0
- package/dist/cursor/cursor-protobuf-encoder.d.ts.map +1 -0
- package/dist/cursor/cursor-protobuf-encoder.js +173 -0
- package/dist/cursor/cursor-protobuf-encoder.js.map +1 -0
- package/dist/cursor/cursor-protobuf-schema.d.ts +215 -0
- package/dist/cursor/cursor-protobuf-schema.d.ts.map +1 -0
- package/dist/cursor/cursor-protobuf-schema.js +120 -0
- package/dist/cursor/cursor-protobuf-schema.js.map +1 -0
- package/dist/cursor/cursor-protobuf.d.ts +21 -0
- package/dist/cursor/cursor-protobuf.d.ts.map +1 -0
- package/dist/cursor/cursor-protobuf.js +116 -0
- package/dist/cursor/cursor-protobuf.js.map +1 -0
- package/dist/cursor/cursor-stream-parser.d.ts +52 -0
- package/dist/cursor/cursor-stream-parser.d.ts.map +1 -0
- package/dist/cursor/cursor-stream-parser.js +142 -0
- package/dist/cursor/cursor-stream-parser.js.map +1 -0
- package/dist/cursor/cursor-translator.d.ts +39 -0
- package/dist/cursor/cursor-translator.d.ts.map +1 -0
- package/dist/cursor/cursor-translator.js +118 -0
- package/dist/cursor/cursor-translator.js.map +1 -0
- package/dist/cursor/daemon-process-ownership.d.ts +3 -0
- package/dist/cursor/daemon-process-ownership.d.ts.map +1 -0
- package/dist/cursor/daemon-process-ownership.js +96 -0
- package/dist/cursor/daemon-process-ownership.js.map +1 -0
- package/dist/cursor/index.d.ts +11 -0
- package/dist/cursor/index.d.ts.map +1 -0
- package/dist/cursor/index.js +55 -0
- package/dist/cursor/index.js.map +1 -0
- package/dist/cursor/types.d.ts +80 -0
- package/dist/cursor/types.d.ts.map +1 -0
- package/dist/cursor/types.js +8 -0
- package/dist/cursor/types.js.map +1 -0
- package/dist/management/oauth-port-diagnostics.d.ts +4 -7
- package/dist/management/oauth-port-diagnostics.d.ts.map +1 -1
- package/dist/management/oauth-port-diagnostics.js +12 -23
- package/dist/management/oauth-port-diagnostics.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/ui/assets/{accounts-CkN_roEn.js → accounts-Cr5UiSqw.js} +1 -1
- package/dist/ui/assets/{alert-dialog-Dy-8Z_Ud.js → alert-dialog-RKd6P34V.js} +1 -1
- package/dist/ui/assets/api-BjsYBaDO.js +1 -0
- package/dist/ui/assets/auth-section-DJjkM3Pc.js +1 -0
- package/dist/ui/assets/{backups-section-CDuqhiZo.js → backups-section-C3OoH74L.js} +1 -1
- package/dist/ui/assets/cliproxy-bUQ9JQSI.js +3 -0
- package/dist/ui/assets/{cliproxy-control-panel-DJd_zNR3.js → cliproxy-control-panel-bWG4j7j-.js} +1 -1
- package/dist/ui/assets/confirm-dialog-39RkxEsp.js +1 -0
- package/dist/ui/assets/copilot-CT5QKd7M.js +3 -0
- package/dist/ui/assets/cursor-CgHXk53L.js +1 -0
- package/dist/ui/assets/{globalenv-section-Cn5ufgRh.js → globalenv-section-JUD29aAr.js} +1 -1
- package/dist/ui/assets/{health-BsMhSeFz.js → health-P6WZCBRj.js} +1 -1
- package/dist/ui/assets/{icons-D5eAI-GR.js → icons-DGASzt3M.js} +1 -1
- package/dist/ui/assets/{index-CEF_VhSR.js → index-B-T25xBs.js} +1 -1
- package/dist/ui/assets/index-BZe6NG3v.js +1 -0
- package/dist/ui/assets/{index-B2GQ_Joi.js → index-Bikvb5yX.js} +1 -1
- package/dist/ui/assets/index-BteqkOAf.js +47 -0
- package/dist/ui/assets/index-ByiEOnlQ.css +1 -0
- package/dist/ui/assets/index-CIB-ESXC.js +1 -0
- package/dist/ui/assets/{proxy-status-widget-Cb7KfEqq.js → proxy-status-widget-BgJE3cHN.js} +1 -1
- package/dist/ui/assets/separator-yty7hz16.js +1 -0
- package/dist/ui/assets/{shared-BsWeldW8.js → shared-BxLyXLjd.js} +1 -1
- package/dist/ui/assets/sidebar/cursor.svg +1 -0
- package/dist/ui/assets/{switch-D6XSRTo_.js → switch-Dq8eo1UY.js} +1 -1
- package/dist/ui/index.html +3 -3
- package/dist/utils/config-manager.d.ts.map +1 -1
- package/dist/utils/config-manager.js +17 -6
- package/dist/utils/config-manager.js.map +1 -1
- package/dist/web-server/jsonl-parser.js +1 -1
- package/dist/web-server/jsonl-parser.js.map +1 -1
- package/dist/web-server/routes/account-routes.d.ts.map +1 -1
- package/dist/web-server/routes/account-routes.js +5 -11
- package/dist/web-server/routes/account-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts +5 -0
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.js +73 -6
- package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js +43 -4
- package/dist/web-server/routes/cliproxy-stats-routes.js.map +1 -1
- package/dist/web-server/routes/cursor-routes.d.ts +16 -0
- package/dist/web-server/routes/cursor-routes.d.ts.map +1 -0
- package/dist/web-server/routes/cursor-routes.js +171 -0
- package/dist/web-server/routes/cursor-routes.js.map +1 -0
- package/dist/web-server/routes/cursor-settings-routes.d.ts +6 -0
- package/dist/web-server/routes/cursor-settings-routes.d.ts.map +1 -0
- package/dist/web-server/routes/cursor-settings-routes.js +305 -0
- package/dist/web-server/routes/cursor-settings-routes.js.map +1 -0
- package/dist/web-server/routes/index.d.ts.map +1 -1
- package/dist/web-server/routes/index.js +3 -0
- package/dist/web-server/routes/index.js.map +1 -1
- package/dist/web-server/routes/variant-routes.d.ts.map +1 -1
- package/dist/web-server/routes/variant-routes.js +107 -6
- package/dist/web-server/routes/variant-routes.js.map +1 -1
- package/package.json +5 -2
- package/scripts/hardening-inventory.js +526 -0
- package/scripts/maintainability-baseline.js +309 -0
- package/dist/ui/assets/api-2TN7yVwm.js +0 -1
- package/dist/ui/assets/auth-section-CeKCNzzC.js +0 -1
- package/dist/ui/assets/cliproxy-626zUpA_.js +0 -3
- package/dist/ui/assets/confirm-dialog-DtYrWaa7.js +0 -1
- package/dist/ui/assets/copilot-DHdywZ9L.js +0 -4
- package/dist/ui/assets/index-Bmgylhgn.js +0 -1
- package/dist/ui/assets/index-Cr6iEc8x.js +0 -47
- package/dist/ui/assets/index-DkMR3J96.js +0 -1
- package/dist/ui/assets/index-QvMpU4Lc.css +0 -1
|
@@ -37,6 +37,8 @@ const account_manager_1 = require("./account-manager");
|
|
|
37
37
|
const auth_utils_1 = require("./auth-utils");
|
|
38
38
|
/** ChatGPT backend API base URL */
|
|
39
39
|
const CODEX_API_BASE = 'https://chatgpt.com/backend-api';
|
|
40
|
+
const CODEX_QUOTA_TIMEOUT_MS = 12000;
|
|
41
|
+
const CODEX_QUOTA_MAX_ATTEMPTS = 2;
|
|
40
42
|
/**
|
|
41
43
|
* User agent matching Codex CLI for API compatibility.
|
|
42
44
|
* Update when Codex CLI releases new versions to maintain compatibility.
|
|
@@ -191,107 +193,124 @@ async function fetchCodexQuota(accountId, verbose = false) {
|
|
|
191
193
|
};
|
|
192
194
|
}
|
|
193
195
|
const url = `${CODEX_API_BASE}/wham/usage`;
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
const
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
success
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
196
|
+
let lastErrorMsg = 'Unknown error';
|
|
197
|
+
for (let attempt = 1; attempt <= CODEX_QUOTA_MAX_ATTEMPTS; attempt++) {
|
|
198
|
+
const controller = new AbortController();
|
|
199
|
+
const timeoutId = setTimeout(() => controller.abort(), CODEX_QUOTA_TIMEOUT_MS);
|
|
200
|
+
try {
|
|
201
|
+
const response = await fetch(url, {
|
|
202
|
+
method: 'GET',
|
|
203
|
+
signal: controller.signal,
|
|
204
|
+
headers: {
|
|
205
|
+
Authorization: `Bearer ${authData.accessToken}`,
|
|
206
|
+
'ChatGPT-Account-Id': authData.accountId,
|
|
207
|
+
'User-Agent': USER_AGENT,
|
|
208
|
+
},
|
|
209
|
+
});
|
|
210
|
+
clearTimeout(timeoutId);
|
|
211
|
+
if (verbose)
|
|
212
|
+
console.error(`[i] Codex API status: ${response.status} (attempt ${attempt})`);
|
|
213
|
+
if (response.status === 401) {
|
|
214
|
+
return {
|
|
215
|
+
success: false,
|
|
216
|
+
windows: [],
|
|
217
|
+
planType: null,
|
|
218
|
+
lastUpdated: Date.now(),
|
|
219
|
+
error: 'Token expired or invalid',
|
|
220
|
+
accountId,
|
|
221
|
+
needsReauth: true,
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
if (response.status === 403) {
|
|
225
|
+
// 403 = account lacks API access (not same as quota exhausted)
|
|
226
|
+
// Keep success=false with isForbidden flag for UI to show distinct "403" badge
|
|
227
|
+
return {
|
|
228
|
+
success: false,
|
|
229
|
+
windows: [],
|
|
230
|
+
planType: null,
|
|
231
|
+
lastUpdated: Date.now(),
|
|
232
|
+
error: '403 Forbidden - No quota API access',
|
|
233
|
+
accountId,
|
|
234
|
+
isForbidden: true,
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
if (response.status === 429) {
|
|
238
|
+
return {
|
|
239
|
+
success: false,
|
|
240
|
+
windows: [],
|
|
241
|
+
planType: null,
|
|
242
|
+
lastUpdated: Date.now(),
|
|
243
|
+
error: 'Rate limited - try again later',
|
|
244
|
+
accountId,
|
|
245
|
+
};
|
|
246
|
+
}
|
|
247
|
+
if (!response.ok) {
|
|
248
|
+
return {
|
|
249
|
+
success: false,
|
|
250
|
+
windows: [],
|
|
251
|
+
planType: null,
|
|
252
|
+
lastUpdated: Date.now(),
|
|
253
|
+
error: `API error: ${response.status}`,
|
|
254
|
+
accountId,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
const data = (await response.json());
|
|
258
|
+
const windows = buildCodexQuotaWindows(data);
|
|
259
|
+
// Extract plan type
|
|
260
|
+
const planTypeRaw = data.plan_type || data.planType;
|
|
261
|
+
let planType = null;
|
|
262
|
+
if (planTypeRaw) {
|
|
263
|
+
const normalized = planTypeRaw.toLowerCase();
|
|
264
|
+
if (normalized === 'free')
|
|
265
|
+
planType = 'free';
|
|
266
|
+
else if (normalized === 'plus')
|
|
267
|
+
planType = 'plus';
|
|
268
|
+
else if (normalized === 'team')
|
|
269
|
+
planType = 'team';
|
|
270
|
+
}
|
|
271
|
+
if (verbose)
|
|
272
|
+
console.error(`[i] Codex windows found: ${windows.length}`);
|
|
234
273
|
return {
|
|
235
|
-
success:
|
|
236
|
-
windows
|
|
237
|
-
planType
|
|
274
|
+
success: true,
|
|
275
|
+
windows,
|
|
276
|
+
planType,
|
|
238
277
|
lastUpdated: Date.now(),
|
|
239
|
-
error: 'Rate limited - try again later',
|
|
240
278
|
accountId,
|
|
241
279
|
};
|
|
242
280
|
}
|
|
243
|
-
|
|
281
|
+
catch (err) {
|
|
282
|
+
clearTimeout(timeoutId);
|
|
283
|
+
const isAbortError = err instanceof Error && err.name === 'AbortError';
|
|
284
|
+
lastErrorMsg = isAbortError
|
|
285
|
+
? 'Request timeout'
|
|
286
|
+
: err instanceof Error
|
|
287
|
+
? err.message
|
|
288
|
+
: 'Unknown error';
|
|
289
|
+
if (verbose) {
|
|
290
|
+
console.error(`[!] Codex quota error (attempt ${attempt}): ${lastErrorMsg}`);
|
|
291
|
+
}
|
|
292
|
+
// Retry timeout once; other failures return immediately.
|
|
293
|
+
if (isAbortError && attempt < CODEX_QUOTA_MAX_ATTEMPTS) {
|
|
294
|
+
continue;
|
|
295
|
+
}
|
|
244
296
|
return {
|
|
245
297
|
success: false,
|
|
246
298
|
windows: [],
|
|
247
299
|
planType: null,
|
|
248
300
|
lastUpdated: Date.now(),
|
|
249
|
-
error:
|
|
301
|
+
error: lastErrorMsg,
|
|
250
302
|
accountId,
|
|
251
303
|
};
|
|
252
304
|
}
|
|
253
|
-
const data = (await response.json());
|
|
254
|
-
const windows = buildCodexQuotaWindows(data);
|
|
255
|
-
// Extract plan type
|
|
256
|
-
const planTypeRaw = data.plan_type || data.planType;
|
|
257
|
-
let planType = null;
|
|
258
|
-
if (planTypeRaw) {
|
|
259
|
-
const normalized = planTypeRaw.toLowerCase();
|
|
260
|
-
if (normalized === 'free')
|
|
261
|
-
planType = 'free';
|
|
262
|
-
else if (normalized === 'plus')
|
|
263
|
-
planType = 'plus';
|
|
264
|
-
else if (normalized === 'team')
|
|
265
|
-
planType = 'team';
|
|
266
|
-
}
|
|
267
|
-
if (verbose)
|
|
268
|
-
console.error(`[i] Codex windows found: ${windows.length}`);
|
|
269
|
-
return {
|
|
270
|
-
success: true,
|
|
271
|
-
windows,
|
|
272
|
-
planType,
|
|
273
|
-
lastUpdated: Date.now(),
|
|
274
|
-
accountId,
|
|
275
|
-
};
|
|
276
|
-
}
|
|
277
|
-
catch (err) {
|
|
278
|
-
clearTimeout(timeoutId);
|
|
279
|
-
const errorMsg = err instanceof Error && err.name === 'AbortError'
|
|
280
|
-
? 'Request timeout'
|
|
281
|
-
: err instanceof Error
|
|
282
|
-
? err.message
|
|
283
|
-
: 'Unknown error';
|
|
284
|
-
if (verbose)
|
|
285
|
-
console.error(`[!] Codex quota error: ${errorMsg}`);
|
|
286
|
-
return {
|
|
287
|
-
success: false,
|
|
288
|
-
windows: [],
|
|
289
|
-
planType: null,
|
|
290
|
-
lastUpdated: Date.now(),
|
|
291
|
-
error: errorMsg,
|
|
292
|
-
accountId,
|
|
293
|
-
};
|
|
294
305
|
}
|
|
306
|
+
return {
|
|
307
|
+
success: false,
|
|
308
|
+
windows: [],
|
|
309
|
+
planType: null,
|
|
310
|
+
lastUpdated: Date.now(),
|
|
311
|
+
error: lastErrorMsg,
|
|
312
|
+
accountId,
|
|
313
|
+
};
|
|
295
314
|
}
|
|
296
315
|
exports.fetchCodexQuota = fetchCodexQuota;
|
|
297
316
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-fetcher-codex.js","sourceRoot":"","sources":["../../src/cliproxy/quota-fetcher-codex.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4CAA8B;AAC9B,gDAAkC;AAClC,yDAAgD;AAChD,uDAAsE;AACtE,6CAA6D;AAG7D,mCAAmC;AACnC,MAAM,cAAc,GAAG,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-fetcher-codex.js","sourceRoot":"","sources":["../../src/cliproxy/quota-fetcher-codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-auth-fetcher.d.ts","sourceRoot":"","sources":["../../src/cliproxy/remote-auth-fetcher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAIL,WAAW,EACZ,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-auth-fetcher.d.ts","sourceRoot":"","sources":["../../src/cliproxy/remote-auth-fetcher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAIL,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAkBjC,kCAAkC;AAClC,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,aAAa,CAAC;CAC/C;AAED,6CAA6C;AAC7C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA4C7F"}
|
|
@@ -6,32 +6,9 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.fetchRemoteAuthStatus = void 0;
|
|
8
8
|
const proxy_target_resolver_1 = require("./proxy-target-resolver");
|
|
9
|
+
const provider_capabilities_1 = require("./provider-capabilities");
|
|
9
10
|
/** Timeout for remote fetch requests (ms) */
|
|
10
11
|
const REMOTE_FETCH_TIMEOUT_MS = 5000;
|
|
11
|
-
/** Map CLIProxyAPI provider names to CCS internal names */
|
|
12
|
-
const PROVIDER_MAP = {
|
|
13
|
-
gemini: 'gemini',
|
|
14
|
-
'gemini-cli': 'gemini', // CLIProxyAPI uses 'gemini-cli' for Gemini CLI auth
|
|
15
|
-
antigravity: 'agy',
|
|
16
|
-
codex: 'codex',
|
|
17
|
-
qwen: 'qwen',
|
|
18
|
-
iflow: 'iflow',
|
|
19
|
-
kiro: 'kiro',
|
|
20
|
-
codewhisperer: 'kiro', // CLIProxyAPI may use 'codewhisperer' for Kiro
|
|
21
|
-
ghcp: 'ghcp',
|
|
22
|
-
'github-copilot': 'ghcp',
|
|
23
|
-
copilot: 'ghcp',
|
|
24
|
-
};
|
|
25
|
-
/** Display names for providers */
|
|
26
|
-
const PROVIDER_DISPLAY_NAMES = {
|
|
27
|
-
gemini: 'Google Gemini',
|
|
28
|
-
agy: 'AntiGravity',
|
|
29
|
-
codex: 'Codex',
|
|
30
|
-
qwen: 'Qwen',
|
|
31
|
-
iflow: 'iFlow',
|
|
32
|
-
kiro: 'Kiro (AWS)',
|
|
33
|
-
ghcp: 'GitHub Copilot (OAuth)',
|
|
34
|
-
};
|
|
35
12
|
/**
|
|
36
13
|
* Fetch auth status from remote CLIProxyAPI
|
|
37
14
|
* @throws Error if remote is unreachable or returns error
|
|
@@ -80,7 +57,7 @@ exports.fetchRemoteAuthStatus = fetchRemoteAuthStatus;
|
|
|
80
57
|
function transformRemoteAuthFiles(files) {
|
|
81
58
|
const byProvider = new Map();
|
|
82
59
|
for (const file of files) {
|
|
83
|
-
const provider =
|
|
60
|
+
const provider = (0, provider_capabilities_1.mapExternalProviderName)(file.provider);
|
|
84
61
|
if (!provider) {
|
|
85
62
|
// Unknown provider, skip (could add logging in debug mode)
|
|
86
63
|
continue;
|
|
@@ -104,7 +81,7 @@ function transformRemoteAuthFiles(files) {
|
|
|
104
81
|
}));
|
|
105
82
|
result.push({
|
|
106
83
|
provider,
|
|
107
|
-
displayName:
|
|
84
|
+
displayName: (0, provider_capabilities_1.getProviderDisplayName)(provider),
|
|
108
85
|
authenticated: activeFiles.length > 0,
|
|
109
86
|
tokenFiles: providerFiles.length,
|
|
110
87
|
accounts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-auth-fetcher.js","sourceRoot":"","sources":["../../src/cliproxy/remote-auth-fetcher.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mEAKiC;
|
|
1
|
+
{"version":3,"file":"remote-auth-fetcher.js","sourceRoot":"","sources":["../../src/cliproxy/remote-auth-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAgBH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"service-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAgBH,OAAO,EAAsB,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAyGrF,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,GAAE,MAA8B,EACpC,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC,kBAAkB,CAAC,CA2J7B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAc7C;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,GAAE,MAA8B,GAAG,OAAO,CAAC;IACpF,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAKD;AAED;;GAEG;AACH,wBAAgB,2BAA2B,IAAI,OAAO,CAErD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;CACrC,CASA"}
|
|
@@ -82,7 +82,7 @@ async function waitForPort(port, timeout = 5000, pollInterval = 100) {
|
|
|
82
82
|
return false;
|
|
83
83
|
}
|
|
84
84
|
/**
|
|
85
|
-
* Register cleanup handlers
|
|
85
|
+
* Register process-exit cleanup handlers for in-process workers.
|
|
86
86
|
*/
|
|
87
87
|
function registerCleanup() {
|
|
88
88
|
if (cleanupRegistered)
|
|
@@ -93,11 +93,8 @@ function registerCleanup() {
|
|
|
93
93
|
tokenRefreshWorker.stop();
|
|
94
94
|
tokenRefreshWorker = null;
|
|
95
95
|
}
|
|
96
|
-
//
|
|
97
|
-
|
|
98
|
-
proxyProcess.kill('SIGTERM');
|
|
99
|
-
proxyProcess = null;
|
|
100
|
-
}
|
|
96
|
+
// Do not stop detached CLIProxy on parent exit.
|
|
97
|
+
// Persistence is expected across CCS command lifecycles.
|
|
101
98
|
};
|
|
102
99
|
process.once('exit', cleanup);
|
|
103
100
|
process.once('SIGTERM', cleanup);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-manager.js","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,iDAAoD;AACpD,yCAA2B;AAC3B,qDAAwD;AACxD,yDAM4B;AAC5B,uDAAoD;AACpD,qDAA2E;AAC3E,iDAAiD;AACjD,mDAAoD;AACpD,sEAAqF;AACrF,sEAAoE;AAEpE,yCAAyC;AACzC,IAAI,YAAY,GAAwB,IAAI,CAAC;AAE7C,oCAAoC;AACpC,IAAI,kBAAkB,GAA8B,IAAI,CAAC;AAEzD,8BAA8B;AAC9B,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAE9B;;GAEG;AACH,KAAK,UAAU,WAAW,CACxB,IAAY,EACZ,UAAkB,IAAI,EACtB,eAAuB,GAAG;IAE1B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,OAAO,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE;oBACpE,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACzB,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE;oBAC1B,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC1C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,CAAC,wBAAwB;QACvC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,SAAS,eAAe;IACtB,IAAI,iBAAiB;QAAE,OAAO;IAE9B,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,kCAAkC;QAClC,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACxD,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAC1B,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,
|
|
1
|
+
{"version":3,"file":"service-manager.js","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* CLIProxy Services
|
|
3
3
|
* Central export point for cliproxy service layer
|
|
4
4
|
*/
|
|
5
|
-
export { validateProfileName, variantExists, listVariants, createVariant, removeVariant, type VariantConfig, type VariantOperationResult, } from './variant-service';
|
|
6
|
-
export { getProxyStatus, stopProxy, isProxyRunning, getActiveSessionCount, type ProxyStatusResult, type StopProxyResult, } from './proxy-lifecycle-service';
|
|
5
|
+
export { validateProfileName, variantExists, listVariants, createVariant, createCompositeVariant, updateCompositeVariant, removeVariant, type VariantConfig, type VariantOperationResult, type CreateCompositeVariantOptions, type UpdateCompositeVariantOptions, } from './variant-service';
|
|
6
|
+
export { getProxyStatus, stopProxy, startProxy, isProxyRunning, getActiveSessionCount, type ProxyStatusResult, type StopProxyResult, type StartProxyResult, } from './proxy-lifecycle-service';
|
|
7
7
|
export { getBinaryStatus, checkLatestVersion, isValidVersionFormat, installVersion, installLatest, isPinned, getPinned, clearPin, type BinaryStatusResult, type InstallResult, type LatestVersionResult, } from './binary-service';
|
|
8
8
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,aAAa,EACb,KAAK,aAAa,EAClB,KAAK,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,sBAAsB,EACtB,sBAAsB,EACtB,aAAa,EACb,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,6BAA6B,GACnC,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,cAAc,EACd,SAAS,EACT,UAAU,EACV,cAAc,EACd,qBAAqB,EACrB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,gBAAgB,GACtB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,mBAAmB,GACzB,MAAM,kBAAkB,CAAC"}
|
|
@@ -4,18 +4,21 @@
|
|
|
4
4
|
* Central export point for cliproxy service layer
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.clearPin = exports.getPinned = exports.isPinned = exports.installLatest = exports.installVersion = exports.isValidVersionFormat = exports.checkLatestVersion = exports.getBinaryStatus = exports.getActiveSessionCount = exports.isProxyRunning = exports.stopProxy = exports.getProxyStatus = exports.removeVariant = exports.createVariant = exports.listVariants = exports.variantExists = exports.validateProfileName = void 0;
|
|
7
|
+
exports.clearPin = exports.getPinned = exports.isPinned = exports.installLatest = exports.installVersion = exports.isValidVersionFormat = exports.checkLatestVersion = exports.getBinaryStatus = exports.getActiveSessionCount = exports.isProxyRunning = exports.startProxy = exports.stopProxy = exports.getProxyStatus = exports.removeVariant = exports.updateCompositeVariant = exports.createCompositeVariant = exports.createVariant = exports.listVariants = exports.variantExists = exports.validateProfileName = void 0;
|
|
8
8
|
// Variant management
|
|
9
9
|
var variant_service_1 = require("./variant-service");
|
|
10
10
|
Object.defineProperty(exports, "validateProfileName", { enumerable: true, get: function () { return variant_service_1.validateProfileName; } });
|
|
11
11
|
Object.defineProperty(exports, "variantExists", { enumerable: true, get: function () { return variant_service_1.variantExists; } });
|
|
12
12
|
Object.defineProperty(exports, "listVariants", { enumerable: true, get: function () { return variant_service_1.listVariants; } });
|
|
13
13
|
Object.defineProperty(exports, "createVariant", { enumerable: true, get: function () { return variant_service_1.createVariant; } });
|
|
14
|
+
Object.defineProperty(exports, "createCompositeVariant", { enumerable: true, get: function () { return variant_service_1.createCompositeVariant; } });
|
|
15
|
+
Object.defineProperty(exports, "updateCompositeVariant", { enumerable: true, get: function () { return variant_service_1.updateCompositeVariant; } });
|
|
14
16
|
Object.defineProperty(exports, "removeVariant", { enumerable: true, get: function () { return variant_service_1.removeVariant; } });
|
|
15
17
|
// Proxy lifecycle
|
|
16
18
|
var proxy_lifecycle_service_1 = require("./proxy-lifecycle-service");
|
|
17
19
|
Object.defineProperty(exports, "getProxyStatus", { enumerable: true, get: function () { return proxy_lifecycle_service_1.getProxyStatus; } });
|
|
18
20
|
Object.defineProperty(exports, "stopProxy", { enumerable: true, get: function () { return proxy_lifecycle_service_1.stopProxy; } });
|
|
21
|
+
Object.defineProperty(exports, "startProxy", { enumerable: true, get: function () { return proxy_lifecycle_service_1.startProxy; } });
|
|
19
22
|
Object.defineProperty(exports, "isProxyRunning", { enumerable: true, get: function () { return proxy_lifecycle_service_1.isProxyRunning; } });
|
|
20
23
|
Object.defineProperty(exports, "getActiveSessionCount", { enumerable: true, get: function () { return proxy_lifecycle_service_1.getActiveSessionCount; } });
|
|
21
24
|
// Binary management
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cliproxy/services/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,qBAAqB;AACrB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cliproxy/services/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,qBAAqB;AACrB,qDAY2B;AAXzB,sHAAA,mBAAmB,OAAA;AACnB,gHAAA,aAAa,OAAA;AACb,+GAAA,YAAY,OAAA;AACZ,gHAAA,aAAa,OAAA;AACb,yHAAA,sBAAsB,OAAA;AACtB,yHAAA,sBAAsB,OAAA;AACtB,gHAAA,aAAa,OAAA;AAOf,kBAAkB;AAClB,qEASmC;AARjC,yHAAA,cAAc,OAAA;AACd,oHAAA,SAAS,OAAA;AACT,qHAAA,UAAU,OAAA;AACV,yHAAA,cAAc,OAAA;AACd,gIAAA,qBAAqB,OAAA;AAMvB,oBAAoB;AACpB,mDAY0B;AAXxB,iHAAA,eAAe,OAAA;AACf,oHAAA,kBAAkB,OAAA;AAClB,sHAAA,oBAAoB,OAAA;AACpB,gHAAA,cAAc,OAAA;AACd,+GAAA,aAAa,OAAA;AACb,0GAAA,QAAQ,OAAA;AACR,2GAAA,SAAS,OAAA;AACT,0GAAA,QAAQ,OAAA"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* CLIProxy Proxy Lifecycle Service
|
|
3
3
|
*
|
|
4
4
|
* Handles start/stop/status operations for CLIProxy instances.
|
|
5
|
-
* Delegates to session-tracker for actual process management.
|
|
5
|
+
* Delegates to session-tracker and service-manager for actual process management.
|
|
6
6
|
*/
|
|
7
7
|
/** Proxy status result */
|
|
8
8
|
export interface ProxyStatusResult {
|
|
@@ -19,14 +19,26 @@ export interface StopProxyResult {
|
|
|
19
19
|
sessionCount?: number;
|
|
20
20
|
error?: string;
|
|
21
21
|
}
|
|
22
|
+
/** Start proxy result */
|
|
23
|
+
export interface StartProxyResult {
|
|
24
|
+
started: boolean;
|
|
25
|
+
alreadyRunning: boolean;
|
|
26
|
+
port: number;
|
|
27
|
+
configRegenerated?: boolean;
|
|
28
|
+
error?: string;
|
|
29
|
+
}
|
|
22
30
|
/**
|
|
23
31
|
* Get current proxy status
|
|
24
32
|
*/
|
|
25
|
-
export declare function getProxyStatus(): ProxyStatusResult;
|
|
33
|
+
export declare function getProxyStatus(port?: number): ProxyStatusResult;
|
|
26
34
|
/**
|
|
27
35
|
* Stop the running CLIProxy instance
|
|
28
36
|
*/
|
|
29
|
-
export declare function stopProxy(): Promise<StopProxyResult>;
|
|
37
|
+
export declare function stopProxy(port?: number): Promise<StopProxyResult>;
|
|
38
|
+
/**
|
|
39
|
+
* Start CLIProxy service (or reuse existing running instance)
|
|
40
|
+
*/
|
|
41
|
+
export declare function startProxy(port?: number, verbose?: boolean): Promise<StartProxyResult>;
|
|
30
42
|
/**
|
|
31
43
|
* Check if proxy is currently running
|
|
32
44
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-lifecycle-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/proxy-lifecycle-service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"proxy-lifecycle-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/proxy-lifecycle-service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,0BAA0B;AAC1B,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAwB;AACxB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,yBAAyB;AACzB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAE/D;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAEvE;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE,MAA8B,EACpC,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAE3B;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAGxC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAG9C"}
|
|
@@ -3,25 +3,34 @@
|
|
|
3
3
|
* CLIProxy Proxy Lifecycle Service
|
|
4
4
|
*
|
|
5
5
|
* Handles start/stop/status operations for CLIProxy instances.
|
|
6
|
-
* Delegates to session-tracker for actual process management.
|
|
6
|
+
* Delegates to session-tracker and service-manager for actual process management.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.getActiveSessionCount = exports.isProxyRunning = exports.stopProxy = exports.getProxyStatus = void 0;
|
|
9
|
+
exports.getActiveSessionCount = exports.isProxyRunning = exports.startProxy = exports.stopProxy = exports.getProxyStatus = void 0;
|
|
10
10
|
const session_tracker_1 = require("../session-tracker");
|
|
11
|
+
const service_manager_1 = require("../service-manager");
|
|
12
|
+
const config_generator_1 = require("../config-generator");
|
|
11
13
|
/**
|
|
12
14
|
* Get current proxy status
|
|
13
15
|
*/
|
|
14
|
-
function getProxyStatus() {
|
|
15
|
-
return (0, session_tracker_1.getProxyStatus)();
|
|
16
|
+
function getProxyStatus(port) {
|
|
17
|
+
return (0, session_tracker_1.getProxyStatus)(port);
|
|
16
18
|
}
|
|
17
19
|
exports.getProxyStatus = getProxyStatus;
|
|
18
20
|
/**
|
|
19
21
|
* Stop the running CLIProxy instance
|
|
20
22
|
*/
|
|
21
|
-
async function stopProxy() {
|
|
22
|
-
return (0, session_tracker_1.stopProxy)();
|
|
23
|
+
async function stopProxy(port) {
|
|
24
|
+
return (0, session_tracker_1.stopProxy)(port);
|
|
23
25
|
}
|
|
24
26
|
exports.stopProxy = stopProxy;
|
|
27
|
+
/**
|
|
28
|
+
* Start CLIProxy service (or reuse existing running instance)
|
|
29
|
+
*/
|
|
30
|
+
async function startProxy(port = config_generator_1.CLIPROXY_DEFAULT_PORT, verbose = false) {
|
|
31
|
+
return (0, service_manager_1.ensureCliproxyService)(port, verbose);
|
|
32
|
+
}
|
|
33
|
+
exports.startProxy = startProxy;
|
|
25
34
|
/**
|
|
26
35
|
* Check if proxy is currently running
|
|
27
36
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-lifecycle-service.js","sourceRoot":"","sources":["../../../src/cliproxy/services/proxy-lifecycle-service.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,wDAG4B;
|
|
1
|
+
{"version":3,"file":"proxy-lifecycle-service.js","sourceRoot":"","sources":["../../../src/cliproxy/services/proxy-lifecycle-service.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,wDAG4B;AAC5B,wDAA2D;AAC3D,0DAA4D;AA4B5D;;GAEG;AACH,SAAgB,cAAc,CAAC,IAAa;IAC1C,OAAO,IAAA,gCAAqB,EAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAFD,wCAEC;AAED;;GAEG;AACI,KAAK,UAAU,SAAS,CAAC,IAAa;IAC3C,OAAO,IAAA,2BAAgB,EAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAFD,8BAEC;AAED;;GAEG;AACI,KAAK,UAAU,UAAU,CAC9B,OAAe,wCAAqB,EACpC,UAAmB,KAAK;IAExB,OAAO,IAAA,uCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AALD,gCAKC;AAED;;GAEG;AACH,SAAgB,cAAc;IAC5B,MAAM,MAAM,GAAG,IAAA,gCAAqB,GAAE,CAAC;IACvC,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC;AAHD,wCAGC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,MAAM,MAAM,GAAG,IAAA,gCAAqB,GAAE,CAAC;IACvC,OAAO,MAAM,CAAC,YAAY,IAAI,CAAC,CAAC;AAClC,CAAC;AAHD,sDAGC"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Handles reading/writing variant config in both unified and legacy formats.
|
|
5
5
|
*/
|
|
6
6
|
import { CLIProxyProvider } from '../types';
|
|
7
|
+
import { CompositeVariantConfig, CompositeTierConfig } from '../../config/unified-config-types';
|
|
7
8
|
/** First port for variant profiles (8318 = default + 1) */
|
|
8
9
|
export declare const VARIANT_PORT_BASE: number;
|
|
9
10
|
/** Maximum port offset for variants (100 ports: 8318-8417) */
|
|
@@ -15,6 +16,16 @@ export interface VariantConfig {
|
|
|
15
16
|
account?: string;
|
|
16
17
|
model?: string;
|
|
17
18
|
port?: number;
|
|
19
|
+
/** Composite variant fields */
|
|
20
|
+
type?: 'composite';
|
|
21
|
+
default_tier?: 'opus' | 'sonnet' | 'haiku';
|
|
22
|
+
tiers?: {
|
|
23
|
+
opus: CompositeTierConfig;
|
|
24
|
+
sonnet: CompositeTierConfig;
|
|
25
|
+
haiku: CompositeTierConfig;
|
|
26
|
+
};
|
|
27
|
+
/** Whether any tier has fallback configured */
|
|
28
|
+
hasFallback?: boolean;
|
|
18
29
|
}
|
|
19
30
|
/**
|
|
20
31
|
* Check if variant exists in config
|
|
@@ -29,6 +40,10 @@ export declare function getNextAvailablePort(): number;
|
|
|
29
40
|
* List variants from config
|
|
30
41
|
*/
|
|
31
42
|
export declare function listVariantsFromConfig(): Record<string, VariantConfig>;
|
|
43
|
+
/**
|
|
44
|
+
* Save composite variant to unified config
|
|
45
|
+
*/
|
|
46
|
+
export declare function saveCompositeVariantUnified(name: string, config: CompositeVariantConfig): void;
|
|
32
47
|
/**
|
|
33
48
|
* Save variant to unified config
|
|
34
49
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-config-adapter.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-config-adapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"variant-config-adapter.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-config-adapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAEL,sBAAsB,EACtB,mBAAmB,EAEpB,MAAM,mCAAmC,CAAC;AAQ3C,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,QAA4B,CAAC;AAE3D,8DAA8D;AAC9D,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,sCAAsC;AACtC,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3C,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,mBAAmB,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAC5B,KAAK,EAAE,mBAAmB,CAAC;KAC5B,CAAC;IACF,+CAA+C;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAW3D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAsB7C;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CA2FtE;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAgB9F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CAsBN;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA6BN;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CA4BjF;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CA0BhF"}
|