@kaitranntt/ccs 7.73.1 → 7.74.0-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.
- package/README.md +5 -1
- package/config/base-claude.settings.json +1 -1
- package/dist/api/services/profile-writer.d.ts +1 -1
- package/dist/api/services/profile-writer.d.ts.map +1 -1
- package/dist/api/services/profile-writer.js +11 -5
- package/dist/api/services/profile-writer.js.map +1 -1
- package/dist/bin/ccsxp-runtime.d.ts +8 -0
- package/dist/bin/ccsxp-runtime.d.ts.map +1 -1
- package/dist/bin/ccsxp-runtime.js +60 -3
- package/dist/bin/ccsxp-runtime.js.map +1 -1
- package/dist/ccs.js +68 -18
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/account-safety.d.ts +11 -0
- package/dist/cliproxy/account-safety.d.ts.map +1 -1
- package/dist/cliproxy/account-safety.js +114 -1
- package/dist/cliproxy/account-safety.js.map +1 -1
- package/dist/cliproxy/binary/lifecycle.d.ts.map +1 -1
- package/dist/cliproxy/binary/lifecycle.js +2 -1
- package/dist/cliproxy/binary/lifecycle.js.map +1 -1
- package/dist/cliproxy/binary/types.d.ts +3 -3
- package/dist/cliproxy/binary/types.d.ts.map +1 -1
- package/dist/cliproxy/binary/types.js +3 -3
- package/dist/cliproxy/binary/types.js.map +1 -1
- package/dist/cliproxy/binary-manager.d.ts +11 -14
- package/dist/cliproxy/binary-manager.d.ts.map +1 -1
- package/dist/cliproxy/binary-manager.js +56 -42
- package/dist/cliproxy/binary-manager.js.map +1 -1
- package/dist/cliproxy/catalog-cache.d.ts.map +1 -1
- package/dist/cliproxy/catalog-cache.js +7 -0
- package/dist/cliproxy/catalog-cache.js.map +1 -1
- package/dist/cliproxy/codex-plan-compatibility.d.ts.map +1 -1
- package/dist/cliproxy/codex-plan-compatibility.js +1 -0
- package/dist/cliproxy/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/codex-reasoning-proxy.d.ts +4 -0
- package/dist/cliproxy/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/codex-reasoning-proxy.js +41 -20
- package/dist/cliproxy/codex-reasoning-proxy.js.map +1 -1
- package/dist/cliproxy/config/env-builder.d.ts.map +1 -1
- package/dist/cliproxy/config/env-builder.js +0 -57
- package/dist/cliproxy/config/env-builder.js.map +1 -1
- package/dist/cliproxy/config/thinking-config.d.ts.map +1 -1
- package/dist/cliproxy/config/thinking-config.js +9 -1
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +2 -2
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/executor/https-tunnel-policy.d.ts +17 -0
- package/dist/cliproxy/executor/https-tunnel-policy.d.ts.map +1 -0
- package/dist/cliproxy/executor/https-tunnel-policy.js +20 -0
- package/dist/cliproxy/executor/https-tunnel-policy.js.map +1 -0
- package/dist/cliproxy/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +50 -16
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +30 -1
- 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 +1 -8
- package/dist/cliproxy/model-config.js.map +1 -1
- package/dist/cliproxy/model-id-normalizer.d.ts +2 -2
- package/dist/cliproxy/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/model-id-normalizer.js +20 -9
- package/dist/cliproxy/model-id-normalizer.js.map +1 -1
- package/dist/cliproxy/platform-detector.d.ts +5 -6
- package/dist/cliproxy/platform-detector.d.ts.map +1 -1
- package/dist/cliproxy/platform-detector.js +5 -6
- package/dist/cliproxy/platform-detector.js.map +1 -1
- package/dist/cliproxy/quota-manager.d.ts.map +1 -1
- package/dist/cliproxy/quota-manager.js +25 -2
- package/dist/cliproxy/quota-manager.js.map +1 -1
- package/dist/cliproxy/service-manager.d.ts +17 -1
- package/dist/cliproxy/service-manager.d.ts.map +1 -1
- package/dist/cliproxy/service-manager.js +10 -5
- package/dist/cliproxy/service-manager.js.map +1 -1
- package/dist/cliproxy/services/binary-service.d.ts.map +1 -1
- package/dist/cliproxy/services/binary-service.js +7 -14
- package/dist/cliproxy/services/binary-service.js.map +1 -1
- package/dist/cliproxy/services/variant-service.d.ts +2 -2
- package/dist/cliproxy/services/variant-service.js +2 -2
- package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-settings.js +2 -4
- package/dist/cliproxy/services/variant-settings.js.map +1 -1
- package/dist/cliproxy/sync/profile-mapper.d.ts.map +1 -1
- package/dist/cliproxy/sync/profile-mapper.js +21 -0
- package/dist/cliproxy/sync/profile-mapper.js.map +1 -1
- package/dist/cliproxy/thinking-validator.d.ts +6 -1
- package/dist/cliproxy/thinking-validator.d.ts.map +1 -1
- package/dist/cliproxy/thinking-validator.js +22 -2
- package/dist/cliproxy/thinking-validator.js.map +1 -1
- package/dist/cliproxy/tool-sanitization-proxy.d.ts +4 -0
- package/dist/cliproxy/tool-sanitization-proxy.d.ts.map +1 -1
- package/dist/cliproxy/tool-sanitization-proxy.js +49 -27
- package/dist/cliproxy/tool-sanitization-proxy.js.map +1 -1
- package/dist/cliproxy/types.d.ts +11 -4
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/cliproxy/types.js.map +1 -1
- package/dist/commands/api-command/create-command.d.ts.map +1 -1
- package/dist/commands/api-command/create-command.js +4 -1
- package/dist/commands/api-command/create-command.js.map +1 -1
- package/dist/commands/api-command/help.d.ts.map +1 -1
- package/dist/commands/api-command/help.js +4 -0
- package/dist/commands/api-command/help.js.map +1 -1
- package/dist/commands/api-command/shared.d.ts +2 -1
- package/dist/commands/api-command/shared.d.ts.map +1 -1
- package/dist/commands/api-command/shared.js +9 -0
- package/dist/commands/api-command/shared.js.map +1 -1
- package/dist/commands/browser-command.d.ts.map +1 -1
- package/dist/commands/browser-command.js +243 -12
- package/dist/commands/browser-command.js.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.js +2 -2
- package/dist/commands/cliproxy/help-subcommand.js.map +1 -1
- package/dist/commands/command-catalog.d.ts +1 -1
- package/dist/commands/command-catalog.d.ts.map +1 -1
- package/dist/commands/command-catalog.js +8 -3
- package/dist/commands/command-catalog.js.map +1 -1
- package/dist/commands/completion-backend.d.ts.map +1 -1
- package/dist/commands/completion-backend.js +21 -0
- package/dist/commands/completion-backend.js.map +1 -1
- package/dist/commands/config-thinking-command.js +1 -1
- package/dist/commands/config-thinking-command.js.map +1 -1
- package/dist/commands/proxy-command.d.ts +1 -0
- package/dist/commands/proxy-command.d.ts.map +1 -1
- package/dist/commands/proxy-command.js +105 -25
- package/dist/commands/proxy-command.js.map +1 -1
- package/dist/config/unified-config-loader.d.ts.map +1 -1
- package/dist/config/unified-config-loader.js +32 -6
- package/dist/config/unified-config-loader.js.map +1 -1
- package/dist/config/unified-config-types.d.ts +17 -2
- package/dist/config/unified-config-types.d.ts.map +1 -1
- package/dist/config/unified-config-types.js +10 -2
- package/dist/config/unified-config-types.js.map +1 -1
- package/dist/cursor/cursor-anthropic-translator.d.ts.map +1 -1
- package/dist/cursor/cursor-anthropic-translator.js +17 -3
- package/dist/cursor/cursor-anthropic-translator.js.map +1 -1
- package/dist/cursor/cursor-anthropic-types.d.ts +3 -0
- package/dist/cursor/cursor-anthropic-types.d.ts.map +1 -1
- package/dist/cursor/cursor-default-models.d.ts +1 -1
- package/dist/cursor/cursor-default-models.d.ts.map +1 -1
- package/dist/cursor/cursor-default-models.js +11 -1
- package/dist/cursor/cursor-default-models.js.map +1 -1
- package/dist/delegation/headless-executor.d.ts.map +1 -1
- package/dist/delegation/headless-executor.js +29 -2
- package/dist/delegation/headless-executor.js.map +1 -1
- package/dist/glmt/delta-accumulator.d.ts +4 -0
- package/dist/glmt/delta-accumulator.d.ts.map +1 -1
- package/dist/glmt/delta-accumulator.js +17 -5
- package/dist/glmt/delta-accumulator.js.map +1 -1
- package/dist/glmt/pipeline/stream-parser.d.ts +0 -3
- package/dist/glmt/pipeline/stream-parser.d.ts.map +1 -1
- package/dist/glmt/pipeline/stream-parser.js +20 -27
- package/dist/glmt/pipeline/stream-parser.js.map +1 -1
- package/dist/glmt/pipeline/tool-call-handler.d.ts +0 -7
- package/dist/glmt/pipeline/tool-call-handler.d.ts.map +1 -1
- package/dist/glmt/pipeline/tool-call-handler.js +15 -24
- package/dist/glmt/pipeline/tool-call-handler.js.map +1 -1
- package/dist/proxy/index.d.ts +1 -0
- package/dist/proxy/index.d.ts.map +1 -1
- package/dist/proxy/index.js +1 -0
- package/dist/proxy/index.js.map +1 -1
- package/dist/proxy/proxy-daemon-entry.js +2 -1
- package/dist/proxy/proxy-daemon-entry.js.map +1 -1
- package/dist/proxy/proxy-daemon-paths.d.ts +9 -3
- package/dist/proxy/proxy-daemon-paths.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon-paths.js +21 -6
- package/dist/proxy/proxy-daemon-paths.js.map +1 -1
- package/dist/proxy/proxy-daemon-state.d.ts +10 -5
- package/dist/proxy/proxy-daemon-state.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon-state.js +81 -12
- package/dist/proxy/proxy-daemon-state.js.map +1 -1
- package/dist/proxy/proxy-daemon.d.ts +4 -3
- package/dist/proxy/proxy-daemon.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon.js +351 -92
- package/dist/proxy/proxy-daemon.js.map +1 -1
- package/dist/proxy/proxy-port-resolver.d.ts +9 -0
- package/dist/proxy/proxy-port-resolver.d.ts.map +1 -0
- package/dist/proxy/proxy-port-resolver.js +62 -0
- package/dist/proxy/proxy-port-resolver.js.map +1 -0
- package/dist/proxy/server/messages-route.d.ts.map +1 -1
- package/dist/proxy/server/messages-route.js +2 -7
- package/dist/proxy/server/messages-route.js.map +1 -1
- package/dist/proxy/server/proxy-server.d.ts.map +1 -1
- package/dist/proxy/server/proxy-server.js +35 -23
- package/dist/proxy/server/proxy-server.js.map +1 -1
- package/dist/proxy/transformers/request-transformer.d.ts.map +1 -1
- package/dist/proxy/transformers/request-transformer.js +23 -18
- package/dist/proxy/transformers/request-transformer.js.map +1 -1
- package/dist/targets/claude-adapter.d.ts.map +1 -1
- package/dist/targets/claude-adapter.js +2 -2
- package/dist/targets/claude-adapter.js.map +1 -1
- package/dist/targets/codex-adapter.d.ts.map +1 -1
- package/dist/targets/codex-adapter.js +1 -1
- package/dist/targets/codex-adapter.js.map +1 -1
- package/dist/targets/droid-config-manager.d.ts.map +1 -1
- package/dist/targets/droid-config-manager.js +40 -0
- package/dist/targets/droid-config-manager.js.map +1 -1
- package/dist/targets/target-metadata.js +1 -1
- package/dist/targets/target-metadata.js.map +1 -1
- package/dist/targets/target-resolver.d.ts.map +1 -1
- package/dist/targets/target-resolver.js +15 -0
- package/dist/targets/target-resolver.js.map +1 -1
- package/dist/ui/assets/{accounts-BNSlujHd.js → accounts-DCJVsC1R.js} +1 -1
- package/dist/ui/assets/{alert-dialog-DHK6l5WN.js → alert-dialog-BZtIoyBc.js} +1 -1
- package/dist/ui/assets/{api-Bixmu-o6.js → api-DNXD8EA9.js} +1 -1
- package/dist/ui/assets/{auth-section-BXHLEs4g.js → auth-section-2-a8KRNY.js} +1 -1
- package/dist/ui/assets/{backups-section-BWGX4IT_.js → backups-section-CezuWNFi.js} +1 -1
- package/dist/ui/assets/{channels-Du6Q5wGz.js → channels-DaijLXYu.js} +1 -1
- package/dist/ui/assets/{checkbox-CdduUSQP.js → checkbox-D6sWns2x.js} +1 -1
- package/dist/ui/assets/{claude-extension-D407M3LZ.js → claude-extension-BFbvT7N_.js} +1 -1
- package/dist/ui/assets/cliproxy-4Z6gEF3R.js +3 -0
- package/dist/ui/assets/{cliproxy-ai-providers-BRrCP6ap.js → cliproxy-ai-providers-BZ0mTP-l.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-_Yccw80J.js → cliproxy-control-panel-CFFjKRRQ.js} +1 -1
- package/dist/ui/assets/codex-D9ivkuYH.js +27 -0
- package/dist/ui/assets/{confirm-dialog-0poiyBAw.js → confirm-dialog-CpZGygf5.js} +1 -1
- package/dist/ui/assets/{copilot-8xH7Nk9a.js → copilot-DMmn_rxB.js} +1 -1
- package/dist/ui/assets/{cursor-Dgg-ni59.js → cursor-D_Q86_Ei.js} +1 -1
- package/dist/ui/assets/{droid-CDpc1L0C.js → droid-BAf_vL2l.js} +1 -1
- package/dist/ui/assets/{globalenv-section-CcdoEVNK.js → globalenv-section-B8jXcXvb.js} +1 -1
- package/dist/ui/assets/health-BO8TUGV-.js +1 -0
- package/dist/ui/assets/icons-DyorC3Xk.js +1 -0
- package/dist/ui/assets/index-8bXW-BpK.js +72 -0
- package/dist/ui/assets/index-BXEJ1fT2.css +1 -0
- package/dist/ui/assets/index-BsAeVEGk.js +1 -0
- package/dist/ui/assets/{index-CJgNAOTk.js → index-CC4Wj5Im.js} +1 -1
- package/dist/ui/assets/{index-DumrYfrM.js → index-DcX4r1mv.js} +1 -1
- package/dist/ui/assets/index-DwhLYuc2.js +1 -0
- package/dist/ui/assets/index-mHMlp8Vb.js +1 -0
- package/dist/ui/assets/{index-CQp8Tx8Q.js → index-vlkxIfEe.js} +1 -1
- package/dist/ui/assets/{logs-qfToZXwm.js → logs-Be6Ybx9a.js} +1 -1
- package/dist/ui/assets/{masked-input-BMznu3pB.js → masked-input-DXnXVYlE.js} +1 -1
- package/dist/ui/assets/proxy-g4_N-fbB.js +9 -0
- package/dist/ui/assets/{proxy-status-widget-BaDK8Rtz.js → proxy-status-widget-BnvVPoy1.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-DgDt3Vlv.js → raw-json-settings-editor-panel-Bzz3efQU.js} +1 -1
- package/dist/ui/assets/{searchable-select-7ZDkhIXd.js → searchable-select-DZale_hJ.js} +1 -1
- package/dist/ui/assets/{separator-BjiPsa_I.js → separator-BkmmPPJc.js} +1 -1
- package/dist/ui/assets/{shared-B-IiUz1s.js → shared-ruYPWqHA.js} +1 -1
- package/dist/ui/assets/{table-BrWMZ3pU.js → table-DdulTUSB.js} +1 -1
- package/dist/ui/assets/updates-COyrJbQd.js +1 -0
- package/dist/ui/index.html +3 -3
- package/dist/utils/browser/browser-policy.d.ts +22 -0
- package/dist/utils/browser/browser-policy.d.ts.map +1 -0
- package/dist/utils/browser/browser-policy.js +65 -0
- package/dist/utils/browser/browser-policy.js.map +1 -0
- package/dist/utils/browser/browser-settings.d.ts +11 -2
- package/dist/utils/browser/browser-settings.d.ts.map +1 -1
- package/dist/utils/browser/browser-settings.js +65 -42
- package/dist/utils/browser/browser-settings.js.map +1 -1
- package/dist/utils/browser/browser-setup.d.ts +21 -0
- package/dist/utils/browser/browser-setup.d.ts.map +1 -0
- package/dist/utils/browser/browser-setup.js +68 -0
- package/dist/utils/browser/browser-setup.js.map +1 -0
- package/dist/utils/browser/browser-status.d.ts +8 -5
- package/dist/utils/browser/browser-status.d.ts.map +1 -1
- package/dist/utils/browser/browser-status.js +97 -33
- package/dist/utils/browser/browser-status.js.map +1 -1
- package/dist/utils/browser/index.d.ts +7 -3
- package/dist/utils/browser/index.d.ts.map +1 -1
- package/dist/utils/browser/index.js +15 -1
- package/dist/utils/browser/index.js.map +1 -1
- package/dist/utils/config-manager.d.ts +5 -0
- package/dist/utils/config-manager.d.ts.map +1 -1
- package/dist/utils/config-manager.js +16 -3
- package/dist/utils/config-manager.js.map +1 -1
- package/dist/utils/hooks/get-image-analysis-hook-env.d.ts.map +1 -1
- package/dist/utils/hooks/get-image-analysis-hook-env.js +7 -3
- package/dist/utils/hooks/get-image-analysis-hook-env.js.map +1 -1
- package/dist/utils/shell-executor.d.ts +14 -0
- package/dist/utils/shell-executor.d.ts.map +1 -1
- package/dist/utils/shell-executor.js +98 -23
- package/dist/utils/shell-executor.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts +2 -2
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/dist/web-server/model-pricing.d.ts.map +1 -1
- package/dist/web-server/model-pricing.js +7 -0
- package/dist/web-server/model-pricing.js.map +1 -1
- package/dist/web-server/routes/browser-routes.d.ts.map +1 -1
- package/dist/web-server/routes/browser-routes.js +76 -10
- package/dist/web-server/routes/browser-routes.js.map +1 -1
- package/dist/web-server/routes/profile-routes.d.ts.map +1 -1
- package/dist/web-server/routes/profile-routes.js +13 -3
- package/dist/web-server/routes/profile-routes.js.map +1 -1
- package/dist/web-server/routes/route-helpers.d.ts +1 -0
- package/dist/web-server/routes/route-helpers.d.ts.map +1 -1
- package/dist/web-server/routes/route-helpers.js +11 -0
- package/dist/web-server/routes/route-helpers.js.map +1 -1
- package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts.map +1 -1
- package/dist/web-server/services/cliproxy-dashboard-install-service.js +1 -2
- package/dist/web-server/services/cliproxy-dashboard-install-service.js.map +1 -1
- package/lib/mcp/ccs-browser-server.cjs +5921 -430
- package/package.json +5 -3
- package/scripts/ci-parity-gate.sh +11 -3
- package/scripts/ensure-deps.sh +18 -0
- package/scripts/run-test-bucket.js +186 -0
- package/dist/ui/assets/cliproxy-BcXcp3jL.js +0 -3
- package/dist/ui/assets/codex-C-Aq41_4.js +0 -27
- package/dist/ui/assets/health-dj20C2Gn.js +0 -1
- package/dist/ui/assets/icons-Dmi9qMuE.js +0 -1
- package/dist/ui/assets/index-B2ffORVS.js +0 -9
- package/dist/ui/assets/index-BPjLIQ2v.js +0 -1
- package/dist/ui/assets/index-DJiXf8E8.js +0 -1
- package/dist/ui/assets/index-DuTB1_9r.css +0 -1
- package/dist/ui/assets/index-TR572mqL.js +0 -72
- package/dist/ui/assets/updates-CxJ8al_e.js +0 -1
|
@@ -213,6 +213,8 @@ async function findHealthyAccount(provider, exclude) {
|
|
|
213
213
|
if (!isManagedQuotaProvider(provider)) {
|
|
214
214
|
return null;
|
|
215
215
|
}
|
|
216
|
+
const { restoreExpiredQuotaPauses } = await Promise.resolve().then(() => __importStar(require('./account-safety')));
|
|
217
|
+
restoreExpiredQuotaPauses();
|
|
216
218
|
const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
|
|
217
219
|
const tierPriority = config.quota_management?.auto?.tier_priority ?? ['ultra', 'pro', 'free'];
|
|
218
220
|
const threshold = config.quota_management?.auto?.exhaustion_threshold ?? 5;
|
|
@@ -292,6 +294,8 @@ async function preflightCheck(provider) {
|
|
|
292
294
|
const defaultAccount = (0, account_manager_1.getDefaultAccount)(provider);
|
|
293
295
|
return { proceed: true, accountId: defaultAccount?.id || '' };
|
|
294
296
|
}
|
|
297
|
+
const { pauseAccountForQuotaCooldown, restoreExpiredQuotaPauses } = await Promise.resolve().then(() => __importStar(require('./account-safety')));
|
|
298
|
+
restoreExpiredQuotaPauses();
|
|
295
299
|
const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
|
|
296
300
|
const quotaConfig = config.quota_management;
|
|
297
301
|
// Skip if preflight disabled or mode is manual
|
|
@@ -337,9 +341,26 @@ async function preflightCheck(provider) {
|
|
|
337
341
|
const avgQuota = quotaPercent;
|
|
338
342
|
const threshold = quotaConfig.auto?.exhaustion_threshold ?? 5;
|
|
339
343
|
if (avgQuota < threshold) {
|
|
340
|
-
// Apply cooldown to exhausted account
|
|
341
344
|
applyCooldown(provider, defaultAccount.id, quotaConfig.auto?.cooldown_minutes ?? 5);
|
|
342
|
-
|
|
345
|
+
const alternative = await findHealthyAccount(provider, [defaultAccount.id]);
|
|
346
|
+
if (!alternative) {
|
|
347
|
+
return {
|
|
348
|
+
proceed: true,
|
|
349
|
+
accountId: defaultAccount.id,
|
|
350
|
+
reason: `Quota exhausted (${avgQuota.toFixed(1)}%), no alternatives available`,
|
|
351
|
+
quotaPercent,
|
|
352
|
+
};
|
|
353
|
+
}
|
|
354
|
+
pauseAccountForQuotaCooldown(provider, defaultAccount.id, quotaConfig.auto?.cooldown_minutes ?? 5);
|
|
355
|
+
(0, account_manager_1.setDefaultAccount)(provider, alternative.id);
|
|
356
|
+
(0, account_manager_1.touchAccount)(provider, alternative.id);
|
|
357
|
+
return {
|
|
358
|
+
proceed: true,
|
|
359
|
+
accountId: alternative.id,
|
|
360
|
+
switchedFrom: defaultAccount.id,
|
|
361
|
+
reason: `Quota exhausted (${avgQuota.toFixed(1)}%)`,
|
|
362
|
+
quotaPercent: alternative.lastQuota,
|
|
363
|
+
};
|
|
343
364
|
}
|
|
344
365
|
return {
|
|
345
366
|
proceed: true,
|
|
@@ -353,6 +374,8 @@ exports.preflightCheck = preflightCheck;
|
|
|
353
374
|
* Used by CLI status command
|
|
354
375
|
*/
|
|
355
376
|
async function getQuotaStatus(provider) {
|
|
377
|
+
const { restoreExpiredQuotaPauses } = await Promise.resolve().then(() => __importStar(require('./account-safety')));
|
|
378
|
+
restoreExpiredQuotaPauses();
|
|
356
379
|
const accounts = (0, account_manager_1.getProviderAccounts)(provider);
|
|
357
380
|
const defaultAccount = (0, account_manager_1.getDefaultAccount)(provider);
|
|
358
381
|
const results = await Promise.all(accounts.map(async (account) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-manager.js","sourceRoot":"","sources":["../../src/cliproxy/quota-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"quota-manager.js","sourceRoot":"","sources":["../../src/cliproxy/quota-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,mDAAiE;AACjE,iEAA0D;AAE1D,uDAO2B;AAC3B,2EAA4E;AAM5E,MAAM,uBAAuB,GAAoC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AAEnF,SAAS,sBAAsB,CAAC,QAA0B;IACxD,OAAO,uBAAuB,CAAC,QAAQ,CAAC,QAAgC,CAAC,CAAC;AAC5E,CAAC;AAWD,MAAM,YAAY,GAAG,KAAM,CAAC,CAAC,aAAa;AAC1C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAsB,CAAC;AAEjD,6FAA6F;AAC7F,MAAM,cAAc,GAAG,IAAI,GAAG,EAAuC,CAAC;AAEtE,SAAS,WAAW,CAAC,QAA0B,EAAE,SAAiB;IAChE,OAAO,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,QAA0B,EAC1B,SAAiB;IAEjB,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAElC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;QAChD,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,CAAC;AACtB,CAAC;AAfD,wCAeC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,QAA0B,EAC1B,SAAiB,EACjB,MAA0B;IAE1B,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AACzD,CAAC;AAPD,wCAOC;AAED;;GAEG;AACH,SAAgB,eAAe;IAC7B,UAAU,CAAC,KAAK,EAAE,CAAC;AACrB,CAAC;AAFD,0CAEC;AAED;;;GAGG;AACH,KAAK,UAAU,mBAAmB,CAChC,QAA8B,EAC9B,SAAiB,EACjB,OAAO,GAAG,KAAK;IAEf,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE7C,qCAAqC;IACrC,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,+BAA+B;IAC/B,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC;SACjE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACf,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;SACD,KAAK,CAAC,GAAuB,EAAE;QAC9B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,EAAE;gBACX,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;gBAC3C,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;gBACvB,KAAK,EAAE,8BAA8B;gBACrC,SAAS;aACV,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IACjE,CAAC,CAAC;SACD,OAAO,CAAC,GAAG,EAAE;QACZ,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEL,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACtC,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,QAA8B,EAC9B,SAAiB,EACjB,OAAgB;IAEhB,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAA,uCAAgB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAA,iCAAiB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAUD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAyB,CAAC;AAErD;;GAEG;AACH,SAAgB,YAAY,CAAC,QAA0B,EAAE,SAAiB;IACxE,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEnC,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IAEzB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAZD,oCAYC;AAED;;GAEG;AACH,SAAgB,aAAa,CAC3B,QAA0B,EAC1B,SAAiB,EACjB,OAAe;IAEf,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AACpE,CAAC;AAPD,sCAOC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,QAA0B,EAAE,SAAiB;IACzE,MAAM,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC;AAHD,sCAGC;AAED,+EAA+E;AAC/E,mBAAmB;AACnB,+EAA+E;AAE/E;;;;;GAKG;AACH,KAAK,UAAU,UAAU,CACvB,KAAU,EACV,EAA2B,EAC3B,WAAW,GAAG,EAAE,EAChB,OAAO,GAAG,GAAG;IAEb,MAAM,OAAO,GAAQ,EAAE,CAAC;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAkBD,SAAS,wBAAwB,CAAC,KAAkB;IAClD,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;AACrC,CAAC;AAED,SAAS,2BAA2B,CAAC,KAAwB;IAC3D,IAAI,CAAC,KAAK,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAEhC,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,MAAM,CAC7E,CAAC,MAAM,EAAwC,EAAE,CAAC,CAAC,CAAC,MAAM,CAC3D,CAAC;IACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC;IAC1F,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,KAAyB;IACtD,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;QACtB,OAAO,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,2BAA2B,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,kBAAkB,CACtC,QAA0B,EAC1B,OAAiB;IAEjB,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,yBAAyB,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;IACvE,yBAAyB,EAAE,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;IAC3C,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,aAAa,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9F,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,oBAAoB,IAAI,CAAC,CAAC;IAE3E,MAAM,QAAQ,GAAG,IAAA,qCAAmB,EAAC,QAAQ,CAAC,CAAC;IAE/C,4BAA4B;IAC5B,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAC/B,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAA,iCAAe,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAC/F,CAAC;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAExC,+EAA+E;IAC/E,MAAM,UAAU,GAAG,MAAM,UAAU,CACjC,SAAS,EACT,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,IAAI,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAE9C,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS;YAC/B,SAAS,EAAE,QAAQ;SACpB,CAAC;IACJ,CAAC,EACD,EAAE,CACH,CAAC;IAEF,uFAAuF;IACvF,6FAA6F;IAC7F,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IACjG,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,8CAA8C;IAC9C,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACvB,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9C,MAAM,UAAU,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;QAE9C,IAAI,UAAU,KAAK,UAAU;YAAE,OAAO,UAAU,GAAG,UAAU,CAAC;QAC9D,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;AACvB,CAAC;AA/DD,gDA+DC;AAED;;GAEG;AACH,KAAK,UAAU,aAAa,CAC1B,QAA8B,EAC9B,gBAAwB,EACxB,MAAc;IAEd,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAE3E,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,8DAA8D;QAC9D,OAAO;YACL,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,gBAAgB;YAC3B,MAAM,EAAE,GAAG,MAAM,6BAA6B;SAC/C,CAAC;IACJ,CAAC;IAED,iBAAiB;IACjB,IAAA,mCAAiB,EAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAC5C,IAAA,8BAAY,EAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IAEvC,OAAO;QACL,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,WAAW,CAAC,EAAE;QACzB,YAAY,EAAE,gBAAgB;QAC9B,MAAM;QACN,YAAY,EAAE,WAAW,CAAC,SAAS;KACpC,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,cAAc,CAAC,QAA0B;IAC7D,0EAA0E;IAC1E,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;IAChE,CAAC;IAED,MAAM,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,GAAG,wDAClE,kBAAkB,GACnB,CAAC;IACF,yBAAyB,EAAE,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAE5C,+CAA+C;IAC/C,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,eAAe,IAAI,WAAW,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1E,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;IAChE,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;IAC7E,CAAC;IAED,8CAA8C;IAC9C,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC;IACzD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,aAAa,GAAG,IAAA,qCAAmB,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;QACxF,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;QAC3F,CAAC;IACH,CAAC;IAED,6BAA6B;IAC7B,IAAI,IAAA,iCAAe,EAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC;QACjD,OAAO,MAAM,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE,2BAA2B,CAAC,CAAC;IACvF,CAAC;IAED,iBAAiB;IACjB,IAAI,YAAY,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC;QAC9C,OAAO,MAAM,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE,6BAA6B,CAAC,CAAC;IACzF,CAAC;IAED,6CAA6C;IAC7C,IAAI,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,yCAAyC;IACzC,gGAAgG;IAChG,MAAM,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClD,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,cAAc,CAAC,EAAE;YAC5B,MAAM,EAAE,0CAA0C;SACnD,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,YAAY,CAAC;IAC9B,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,EAAE,oBAAoB,IAAI,CAAC,CAAC;IAE9D,IAAI,QAAQ,GAAG,SAAS,EAAE,CAAC;QACzB,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE,WAAW,CAAC,IAAI,EAAE,gBAAgB,IAAI,CAAC,CAAC,CAAC;QAEpF,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,cAAc,CAAC,EAAE;gBAC5B,MAAM,EAAE,oBAAoB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B;gBAC9E,YAAY;aACb,CAAC;QACJ,CAAC;QAED,4BAA4B,CAC1B,QAAQ,EACR,cAAc,CAAC,EAAE,EACjB,WAAW,CAAC,IAAI,EAAE,gBAAgB,IAAI,CAAC,CACxC,CAAC;QACF,IAAA,mCAAiB,EAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAA,8BAAY,EAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACvC,OAAO;YACL,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,WAAW,CAAC,EAAE;YACzB,YAAY,EAAE,cAAc,CAAC,EAAE;YAC/B,MAAM,EAAE,oBAAoB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;YACnD,YAAY,EAAE,WAAW,CAAC,SAAS;SACpC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,cAAc,CAAC,EAAE;QAC5B,YAAY;KACb,CAAC;AACJ,CAAC;AAnGD,wCAmGC;AAED;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,QAA0B;IAS7D,MAAM,EAAE,yBAAyB,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;IACvE,yBAAyB,EAAE,CAAC;IAE5B,MAAM,QAAQ,GAAG,IAAA,qCAAmB,EAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,cAAc,GAAG,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC7B,IAAI,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/C,KAAK,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE7D,OAAO;YACL,OAAO;YACP,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAC7C,UAAU,EAAE,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAC9C,SAAS,EAAE,cAAc,EAAE,EAAE,KAAK,OAAO,CAAC,EAAE;SAC7C,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAnCD,wCAmCC;AAED,+EAA+E;AAC/E,kEAAkE;AAClE,+EAA+E;AAE/E,gDAAgD;AAChD,IAAI,YAAY,GAAyC,IAAI,CAAC;AAE9D,4DAA4D;AAC5D,IAAI,oBAAoB,GAAG,KAAK,CAAC;AAEjC,iEAAiE;AACjE,IAAI,cAAc,GAAG,KAAK,CAAC;AAE3B;;;GAGG;AACH,SAAS,gBAAgB,CACvB,QAA8B,EAC9B,SAAiB,EACjB,aAAmC,EACnC,UAAkB;IAElB,YAAY,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QACnC,oEAAoE;QACpE,IAAI,cAAc;YAAE,OAAO;QAE3B,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC7D,IAAI,cAAc;gBAAE,OAAO,CAAC,6BAA6B;YACzD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAE9C,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,uFAAuF;gBACvF,gBAAgB,CACd,QAAQ,EACR,SAAS,EACT,aAAa,EACb,aAAa,CAAC,uBAAuB,GAAG,IAAI,CAC7C,CAAC;gBACF,OAAO;YACT,CAAC;YAED,IAAI,QAAQ,IAAI,aAAa,CAAC,oBAAoB,EAAE,CAAC;gBACnD,0DAA0D;gBAC1D,wEAAwE;gBACxE,sEAAsE;gBACtE,wEAAwE;gBACxE,MAAM,EAAE,qBAAqB,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;gBACnE,MAAM,qBAAqB,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC;gBACjF,YAAY,GAAG,IAAI,CAAC;gBACpB,OAAO,CAAC,eAAe;YACzB,CAAC;YAED,IAAI,QAAQ,IAAI,aAAa,CAAC,cAAc,EAAE,CAAC;gBAC7C,kDAAkD;gBAClD,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC1B,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,kBAAkB,GAAC,CAAC;oBAC/D,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;oBACvC,oBAAoB,GAAG,IAAI,CAAC;gBAC9B,CAAC;gBACD,gBAAgB,CACd,QAAQ,EACR,SAAS,EACT,aAAa,EACb,aAAa,CAAC,yBAAyB,GAAG,IAAI,CAC/C,CAAC;gBACF,OAAO;YACT,CAAC;YAED,gCAAgC;YAChC,gBAAgB,CACd,QAAQ,EACR,SAAS,EACT,aAAa,EACb,aAAa,CAAC,uBAAuB,GAAG,IAAI,CAC7C,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,oDAAoD;YACpD,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;QACnE,CAAC;IACH,CAAC,EAAE,UAAU,CAAC,CAAC;IAEf,qDAAqD;IACrD,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;QAChF,YAAY,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAC,QAA0B,EAAE,SAAiB;IAC7E,2DAA2D;IAC3D,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC;QAAE,OAAO;IAE9C,6BAA6B;IAC7B,IAAI,YAAY;QAAE,OAAO;IAEzB,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAE5C,0DAA0D;IAC1D,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,kDAAkD;IAClD,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO;IAC1C,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,OAAO;QAAE,OAAO;IAElD,0FAA0F;IAC1F,MAAM,aAAa,GAAG,WAAW,CAAC,eAAe,CAAC;IAClD,IAAI,aAAa,CAAC,cAAc,IAAI,aAAa,CAAC,oBAAoB,EAAE,CAAC;QACvE,OAAO,CAAC,qEAAqE;IAC/E,CAAC;IAED,oBAAoB,GAAG,KAAK,CAAC;IAC7B,cAAc,GAAG,KAAK,CAAC;IAEvB,sCAAsC;IACtC,gBAAgB,CACd,QAAQ,EACR,SAAS,EACT,WAAW,CAAC,eAAe,EAC3B,WAAW,CAAC,eAAe,CAAC,uBAAuB,GAAG,IAAI,CAC3D,CAAC;AACJ,CAAC;AAjCD,8CAiCC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,cAAc,GAAG,IAAI,CAAC;IACtB,IAAI,YAAY,EAAE,CAAC;QACjB,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,oBAAoB,GAAG,KAAK,CAAC;AAC/B,CAAC;AAPD,4CAOC"}
|
|
@@ -10,6 +10,10 @@
|
|
|
10
10
|
* Unlike cliproxy-executor.ts which runs proxy per-session,
|
|
11
11
|
* this module manages a persistent background instance.
|
|
12
12
|
*/
|
|
13
|
+
import { ensureCLIProxyBinary } from './binary-manager';
|
|
14
|
+
import { configNeedsRegeneration } from './config-generator';
|
|
15
|
+
import { detectRunningProxy } from './proxy-detector';
|
|
16
|
+
import { withStartupLock } from './startup-lock';
|
|
13
17
|
import { type RefreshResult } from './auth/token-refresh-worker';
|
|
14
18
|
export interface ServiceStartResult {
|
|
15
19
|
started: boolean;
|
|
@@ -18,6 +22,17 @@ export interface ServiceStartResult {
|
|
|
18
22
|
configRegenerated?: boolean;
|
|
19
23
|
error?: string;
|
|
20
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* Test-only seams for ensureCliproxyService. Production callers omit this and
|
|
27
|
+
* get the real implementations. Tests inject stubs to avoid bun's
|
|
28
|
+
* `mock.module()`, which is process-wide and leaks across test files.
|
|
29
|
+
*/
|
|
30
|
+
export interface EnsureCliproxyServiceDeps {
|
|
31
|
+
ensureBinaryFn?: typeof ensureCLIProxyBinary;
|
|
32
|
+
detectRunningProxyFn?: typeof detectRunningProxy;
|
|
33
|
+
configNeedsRegenerationFn?: typeof configNeedsRegeneration;
|
|
34
|
+
withStartupLockFn?: typeof withStartupLock;
|
|
35
|
+
}
|
|
21
36
|
/**
|
|
22
37
|
* Ensure CLIProxy service is running
|
|
23
38
|
*
|
|
@@ -26,9 +41,10 @@ export interface ServiceStartResult {
|
|
|
26
41
|
*
|
|
27
42
|
* @param port CLIProxy port (default: 8317)
|
|
28
43
|
* @param verbose Show debug output
|
|
44
|
+
* @param deps Test-only dependency overrides (see EnsureCliproxyServiceDeps)
|
|
29
45
|
* @returns Result indicating success and whether it was already running
|
|
30
46
|
*/
|
|
31
|
-
export declare function ensureCliproxyService(port?: number, verbose?: boolean): Promise<ServiceStartResult>;
|
|
47
|
+
export declare function ensureCliproxyService(port?: number, verbose?: boolean, deps?: EnsureCliproxyServiceDeps): Promise<ServiceStartResult>;
|
|
32
48
|
/**
|
|
33
49
|
* Stop the managed CLIProxy service
|
|
34
50
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;
|
|
1
|
+
{"version":3,"file":"service-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAGL,uBAAuB,EAGxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,kBAAkB,EAAuB,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,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;;;;GAIG;AACH,MAAM,WAAW,yBAAyB;IACxC,cAAc,CAAC,EAAE,OAAO,oBAAoB,CAAC;IAC7C,oBAAoB,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACjD,yBAAyB,CAAC,EAAE,OAAO,uBAAuB,CAAC;IAC3D,iBAAiB,CAAC,EAAE,OAAO,eAAe,CAAC;CAC5C;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,GAAE,MAA8B,EACpC,OAAO,GAAE,OAAe,EACxB,IAAI,GAAE,yBAA8B,GACnC,OAAO,CAAC,kBAAkB,CAAC,CAkK7B;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"}
|
|
@@ -136,9 +136,14 @@ function startTokenRefreshWorker(verbose) {
|
|
|
136
136
|
*
|
|
137
137
|
* @param port CLIProxy port (default: 8317)
|
|
138
138
|
* @param verbose Show debug output
|
|
139
|
+
* @param deps Test-only dependency overrides (see EnsureCliproxyServiceDeps)
|
|
139
140
|
* @returns Result indicating success and whether it was already running
|
|
140
141
|
*/
|
|
141
|
-
async function ensureCliproxyService(port = config_generator_1.CLIPROXY_DEFAULT_PORT, verbose = false) {
|
|
142
|
+
async function ensureCliproxyService(port = config_generator_1.CLIPROXY_DEFAULT_PORT, verbose = false, deps = {}) {
|
|
143
|
+
const ensureBinaryFn = deps.ensureBinaryFn ?? binary_manager_1.ensureCLIProxyBinary;
|
|
144
|
+
const detectRunningProxyFn = deps.detectRunningProxyFn ?? proxy_detector_1.detectRunningProxy;
|
|
145
|
+
const configNeedsRegenerationFn = deps.configNeedsRegenerationFn ?? config_generator_1.configNeedsRegeneration;
|
|
146
|
+
const withStartupLockFn = deps.withStartupLockFn ?? startup_lock_1.withStartupLock;
|
|
142
147
|
const log = (msg) => {
|
|
143
148
|
if (verbose) {
|
|
144
149
|
console.error(`[cliproxy-service] ${msg}`);
|
|
@@ -146,16 +151,16 @@ async function ensureCliproxyService(port = config_generator_1.CLIPROXY_DEFAULT_
|
|
|
146
151
|
};
|
|
147
152
|
// Check if config needs update (even if running)
|
|
148
153
|
let configRegenerated = false;
|
|
149
|
-
if ((
|
|
154
|
+
if (configNeedsRegenerationFn()) {
|
|
150
155
|
log('Config outdated, regenerating...');
|
|
151
156
|
(0, config_generator_1.regenerateConfig)(port);
|
|
152
157
|
configRegenerated = true;
|
|
153
158
|
}
|
|
154
159
|
// Use startup lock to coordinate with other CCS processes (ccs agy, ccs config, etc.)
|
|
155
|
-
return await (
|
|
160
|
+
return await withStartupLockFn(async () => {
|
|
156
161
|
// Use unified detection (HTTP check + session-lock + port-process)
|
|
157
162
|
log(`Checking if CLIProxy is running on port ${port}...`);
|
|
158
|
-
const proxyStatus = await (
|
|
163
|
+
const proxyStatus = await detectRunningProxyFn(port);
|
|
159
164
|
log(`Proxy detection: ${JSON.stringify(proxyStatus)}`);
|
|
160
165
|
if (proxyStatus.running && proxyStatus.verified) {
|
|
161
166
|
// Already running and healthy
|
|
@@ -196,7 +201,7 @@ async function ensureCliproxyService(port = config_generator_1.CLIPROXY_DEFAULT_
|
|
|
196
201
|
// 1. Ensure binary exists
|
|
197
202
|
let binaryPath;
|
|
198
203
|
try {
|
|
199
|
-
binaryPath = await (
|
|
204
|
+
binaryPath = await ensureBinaryFn(verbose, {
|
|
200
205
|
allowInstall: false,
|
|
201
206
|
skipAutoUpdate: true,
|
|
202
207
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-manager.js","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service-manager.js","sourceRoot":"","sources":["../../src/cliproxy/service-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/binary-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"binary-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/binary-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAeH,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,2BAA2B;AAC3B,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,eAAe,CAAC;CAC1B;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,kCAAkC;AAClC,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,kBAAkB,CAa7E;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyBhG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,OAAO,UAAQ,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,CAAC,CA6BxB;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,UAAQ,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,aAAa,CAAC,CAiCxB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAK3D;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAKlE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAKxD"}
|
|
@@ -41,8 +41,7 @@ const unified_config_loader_1 = require("../../config/unified-config-loader");
|
|
|
41
41
|
*/
|
|
42
42
|
function getBinaryStatus(backend) {
|
|
43
43
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
44
|
-
(0, binary_manager_1.
|
|
45
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
44
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
46
45
|
const backendConfig = platform_detector_1.BACKEND_CONFIG[effectiveBackend];
|
|
47
46
|
return {
|
|
48
47
|
installed: (0, binary_manager_1.isCLIProxyInstalled)(effectiveBackend),
|
|
@@ -59,8 +58,7 @@ exports.getBinaryStatus = getBinaryStatus;
|
|
|
59
58
|
*/
|
|
60
59
|
async function checkLatestVersion(backend) {
|
|
61
60
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
62
|
-
(0, binary_manager_1.
|
|
63
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
61
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
64
62
|
try {
|
|
65
63
|
// Use checkCliproxyUpdate which is backend-aware (uses correct GitHub repo)
|
|
66
64
|
const { checkCliproxyUpdate } = await Promise.resolve().then(() => __importStar(require('../binary-manager')));
|
|
@@ -102,8 +100,7 @@ async function installVersion(version, verbose = false, backend) {
|
|
|
102
100
|
};
|
|
103
101
|
}
|
|
104
102
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
105
|
-
(0, binary_manager_1.
|
|
106
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
103
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
107
104
|
try {
|
|
108
105
|
await (0, binary_manager_1.installCliproxyVersion)(version, verbose, effectiveBackend);
|
|
109
106
|
(0, binary_manager_1.savePinnedVersion)(version, effectiveBackend);
|
|
@@ -127,8 +124,7 @@ exports.installVersion = installVersion;
|
|
|
127
124
|
*/
|
|
128
125
|
async function installLatest(verbose = false, backend) {
|
|
129
126
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
130
|
-
(0, binary_manager_1.
|
|
131
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
127
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
132
128
|
try {
|
|
133
129
|
const latestVersion = await (0, binary_manager_1.fetchLatestCliproxyVersion)(effectiveBackend);
|
|
134
130
|
const currentVersion = (0, binary_manager_1.getInstalledCliproxyVersion)(effectiveBackend);
|
|
@@ -162,8 +158,7 @@ exports.installLatest = installLatest;
|
|
|
162
158
|
*/
|
|
163
159
|
function isPinned(backend) {
|
|
164
160
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
165
|
-
(0, binary_manager_1.
|
|
166
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
161
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
167
162
|
return (0, binary_manager_1.isVersionPinned)(effectiveBackend);
|
|
168
163
|
}
|
|
169
164
|
exports.isPinned = isPinned;
|
|
@@ -172,8 +167,7 @@ exports.isPinned = isPinned;
|
|
|
172
167
|
*/
|
|
173
168
|
function getPinned(backend) {
|
|
174
169
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
175
|
-
(0, binary_manager_1.
|
|
176
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
170
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
177
171
|
return (0, binary_manager_1.getPinnedVersion)(effectiveBackend);
|
|
178
172
|
}
|
|
179
173
|
exports.getPinned = getPinned;
|
|
@@ -182,8 +176,7 @@ exports.getPinned = getPinned;
|
|
|
182
176
|
*/
|
|
183
177
|
function clearPin(backend) {
|
|
184
178
|
const configuredBackend = backend ?? (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
185
|
-
(0, binary_manager_1.
|
|
186
|
-
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { warnOnFallback: true });
|
|
179
|
+
const effectiveBackend = (0, binary_manager_1.resolveLocalBackend)(configuredBackend, { notifyOnPlus: true });
|
|
187
180
|
(0, binary_manager_1.clearPinnedVersion)(effectiveBackend);
|
|
188
181
|
}
|
|
189
182
|
exports.clearPin = clearPin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-service.js","sourceRoot":"","sources":["../../../src/cliproxy/services/binary-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"binary-service.js","sourceRoot":"","sources":["../../../src/cliproxy/services/binary-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,8 @@ export interface VariantOperationResult {
|
|
|
22
22
|
export declare function validateProfileName(name: string): string | null;
|
|
23
23
|
/**
|
|
24
24
|
* Validate provider/backend compatibility
|
|
25
|
-
* Returns error message if a provider requires Plus while local CLIProxy is
|
|
26
|
-
*
|
|
25
|
+
* Returns an error message if a provider requires Plus while local CLIProxy is
|
|
26
|
+
* configured for the default original backend.
|
|
27
27
|
*/
|
|
28
28
|
export declare function validateProviderBackend(provider: CLIProxyProfileName): string | null;
|
|
29
29
|
/**
|
|
@@ -68,8 +68,8 @@ function validateProfileName(name) {
|
|
|
68
68
|
exports.validateProfileName = validateProfileName;
|
|
69
69
|
/**
|
|
70
70
|
* Validate provider/backend compatibility
|
|
71
|
-
* Returns error message if a provider requires Plus while local CLIProxy is
|
|
72
|
-
*
|
|
71
|
+
* Returns an error message if a provider requires Plus while local CLIProxy is
|
|
72
|
+
* configured for the default original backend.
|
|
73
73
|
*/
|
|
74
74
|
function validateProviderBackend(provider) {
|
|
75
75
|
// Normalize provider to lowercase for case-insensitive comparison
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAKlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"variant-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAKlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAkGxE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAA8B,GACnC,MAAM,CAkCR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAA8B,GACnC,MAAM,CAkCR;AAwBD;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,EAC7F,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,EACxC,IAAI,GAAE,MAA8B,EACpC,oBAAoB,CAAC,EAAE,MAAM,GAC5B,MAAM,CA6ER;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,mBAAmB,EAC9B,OAAO,CAAC,EAAE;IACR,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CAC/C,GACA,IAAI,CA4CN;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAA8B,GACnC,IAAI,CA+CN"}
|
|
@@ -43,12 +43,10 @@ const hooks_1 = require("../../utils/hooks");
|
|
|
43
43
|
const auth_token_manager_1 = require("../auth-token-manager");
|
|
44
44
|
const ui_1 = require("../../utils/ui");
|
|
45
45
|
const model_id_normalizer_1 = require("../model-id-normalizer");
|
|
46
|
-
const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
|
|
47
46
|
function canonicalizeModelForProvider(provider, model) {
|
|
48
|
-
const withoutCodexSuffix = provider === 'codex' ? model.replace(CODEX_EFFORT_SUFFIX_REGEX, '') : model;
|
|
49
47
|
if (!provider)
|
|
50
|
-
return
|
|
51
|
-
return (0, model_id_normalizer_1.normalizeModelIdForProvider)(
|
|
48
|
+
return model;
|
|
49
|
+
return (0, model_id_normalizer_1.normalizeModelIdForProvider)(model, provider);
|
|
52
50
|
}
|
|
53
51
|
/**
|
|
54
52
|
* Build settings env object for a variant
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"variant-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-mapper.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/sync/profile-mapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,YAAY,EAAE,OAAO,CAAC;IACtB,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAkBD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,eAAe,EAAE,CA8CxD;AAUD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"profile-mapper.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/sync/profile-mapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,YAAY,EAAE,OAAO,CAAC;IACtB,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAkBD;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,eAAe,EAAE,CA8CxD;AAUD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAsEhF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,SAAS,EAAE,CAYjD;AAED;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,mBAAmB,IAAI,eAAe,EAAE,CAavD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAE9D"}
|
|
@@ -135,6 +135,27 @@ function mapProfileToClaudeKey(profile) {
|
|
|
135
135
|
alias: '',
|
|
136
136
|
},
|
|
137
137
|
];
|
|
138
|
+
// Append extra models from ANTHROPIC_EXTRA_MODELS env var (comma-separated).
|
|
139
|
+
// Skip duplicates of the primary model and any repeated entries to keep
|
|
140
|
+
// the synced CLIProxy `models` array clean.
|
|
141
|
+
const extraModelsRaw = env.ANTHROPIC_EXTRA_MODELS;
|
|
142
|
+
if (extraModelsRaw && extraModelsRaw.trim()) {
|
|
143
|
+
const seen = new Set([modelName]);
|
|
144
|
+
const extraModels = extraModelsRaw
|
|
145
|
+
.split(',')
|
|
146
|
+
.map((m) => m.trim())
|
|
147
|
+
.filter((m) => m.length > 0);
|
|
148
|
+
for (const extra of extraModels) {
|
|
149
|
+
if (seen.has(extra)) {
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
seen.add(extra);
|
|
153
|
+
claudeKey.models.push({
|
|
154
|
+
name: extra,
|
|
155
|
+
alias: '',
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
}
|
|
138
159
|
}
|
|
139
160
|
return claudeKey;
|
|
140
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-mapper.js","sourceRoot":"","sources":["../../../src/cliproxy/sync/profile-mapper.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAC7B,+DAAuD;AACvD,iDAAiD;AACjD,sEAA4F;AAwB5F,SAAS,0BAA0B,CAAC,YAAoB;IACtD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACpD,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAS,GAAE,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,IAAA,oBAAU,EAAC,YAAY,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,SAAgB,oBAAoB;IAClC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAe,GAAE,CAAC;IACvC,MAAM,QAAQ,GAAsB,EAAE,CAAC;IAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,6BAA6B;QAC7B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,SAAS;QACX,CAAC;QAED,6DAA6D;QAC7D,mEAAmE;QACnE,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChC,SAAS;QACX,CAAC;QAED,kCAAkC;QAClC,MAAM,YAAY,GAAG,0BAA0B,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEtE,IAAI,GAAuC,CAAC;QAC5C,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChC,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAiB,CAAC;gBACrD,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YACrB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;YACzC,SAAS;QACX,CAAC;QAED,iCAAiC;QACjC,MAAM,KAAK,GAAG,GAAG,EAAE,oBAAoB,CAAC;QACxC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACjE,SAAS;QACX,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY;YACZ,YAAY,EAAE,IAAI;YAClB,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AA9CD,oDA8CC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,OAAwB;IAC5D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAEtB,MAAM,MAAM,GAAG,GAAG,CAAC,oBAAoB,CAAC;IACxC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,MAAM,OAAO,GAAG,GAAG,CAAC,kBAAkB,CAAC;IACvC,MAAM,SAAS,GAAG,GAAG,CAAC,eAAe,CAAC;IAEtC,4DAA4D;IAC5D,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,EAAE,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC,CAAC,mCAAmC;IAClD,CAAC;IAED,uCAAuC;IACvC,IAAI,aAAa,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oFAAoF;IACpF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,aAAa,GAAG,CAAC;IAEnC,MAAM,SAAS,GAAc;QAC3B,SAAS,EAAE,MAAM;QACjB,MAAM;KACP,CAAC;IAEF,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;IAClC,CAAC;IAED,0DAA0D;IAC1D,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,MAAM,GAAG;YACjB;gBACE,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,EAAE;aACV;SACF,CAAC;
|
|
1
|
+
{"version":3,"file":"profile-mapper.js","sourceRoot":"","sources":["../../../src/cliproxy/sync/profile-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,11 @@ export interface ThinkingValidationResult {
|
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
28
|
* Named thinking level mappings to budget values (when converting level→budget)
|
|
29
|
+
*
|
|
30
|
+
* `max` sits above `xhigh` to represent unconstrained thinking (Claude Opus 4.7,
|
|
31
|
+
* Mythos). The numeric value is a CCS-internal mapping, not an Anthropic wire
|
|
32
|
+
* value: Opus 4.7 uses adaptive thinking with an effort string, and other
|
|
33
|
+
* max-capable models already treat the level as a qualitative cap.
|
|
29
34
|
*/
|
|
30
35
|
export declare const THINKING_LEVEL_BUDGETS: Record<string, number>;
|
|
31
36
|
/**
|
|
@@ -35,7 +40,7 @@ export declare const THINKING_LEVEL_RANK: Record<string, number>;
|
|
|
35
40
|
/**
|
|
36
41
|
* Valid thinking level names
|
|
37
42
|
*/
|
|
38
|
-
export declare const VALID_THINKING_LEVELS: readonly ["minimal", "low", "medium", "high", "xhigh", "auto"];
|
|
43
|
+
export declare const VALID_THINKING_LEVELS: readonly ["minimal", "low", "medium", "high", "xhigh", "max", "auto"];
|
|
39
44
|
export type ThinkingLevel = (typeof VALID_THINKING_LEVELS)[number];
|
|
40
45
|
/**
|
|
41
46
|
* Valid tier names for tier_defaults configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thinking-validator.d.ts","sourceRoot":"","sources":["../../src/cliproxy/thinking-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAC1C,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,+CAA+C;IAC/C,KAAK,EAAE,OAAO,CAAC;IACf,oDAAoD;IACpD,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED
|
|
1
|
+
{"version":3,"file":"thinking-validator.d.ts","sourceRoot":"","sources":["../../src/cliproxy/thinking-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAC1C,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,+CAA+C;IAC/C,KAAK,EAAE,OAAO,CAAC;IACf,oDAAoD;IACpD,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,wCAAwC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOzD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOtD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,uEAQxB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE;;GAEG;AACH,eAAO,MAAM,oBAAoB,sCAAuC,CAAC;AACzE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAQpC;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,2CAA4C,CAAC;AAC7E,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAE1C;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAS1D;AA6CD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,wBAAwB,CAqE1B"}
|
|
@@ -18,6 +18,11 @@ exports.THINKING_BUDGET_MAX = 100000;
|
|
|
18
18
|
exports.THINKING_BUDGET_DEFAULT_MIN = 512;
|
|
19
19
|
/**
|
|
20
20
|
* Named thinking level mappings to budget values (when converting level→budget)
|
|
21
|
+
*
|
|
22
|
+
* `max` sits above `xhigh` to represent unconstrained thinking (Claude Opus 4.7,
|
|
23
|
+
* Mythos). The numeric value is a CCS-internal mapping, not an Anthropic wire
|
|
24
|
+
* value: Opus 4.7 uses adaptive thinking with an effort string, and other
|
|
25
|
+
* max-capable models already treat the level as a qualitative cap.
|
|
21
26
|
*/
|
|
22
27
|
exports.THINKING_LEVEL_BUDGETS = {
|
|
23
28
|
minimal: 512,
|
|
@@ -25,6 +30,7 @@ exports.THINKING_LEVEL_BUDGETS = {
|
|
|
25
30
|
medium: 8192,
|
|
26
31
|
high: 24576,
|
|
27
32
|
xhigh: 32768,
|
|
33
|
+
max: 65536,
|
|
28
34
|
};
|
|
29
35
|
/**
|
|
30
36
|
* Level rank for comparison (higher = more intensive)
|
|
@@ -35,11 +41,20 @@ exports.THINKING_LEVEL_RANK = {
|
|
|
35
41
|
medium: 3,
|
|
36
42
|
high: 4,
|
|
37
43
|
xhigh: 5,
|
|
44
|
+
max: 6,
|
|
38
45
|
};
|
|
39
46
|
/**
|
|
40
47
|
* Valid thinking level names
|
|
41
48
|
*/
|
|
42
|
-
exports.VALID_THINKING_LEVELS = [
|
|
49
|
+
exports.VALID_THINKING_LEVELS = [
|
|
50
|
+
'minimal',
|
|
51
|
+
'low',
|
|
52
|
+
'medium',
|
|
53
|
+
'high',
|
|
54
|
+
'xhigh',
|
|
55
|
+
'max',
|
|
56
|
+
'auto',
|
|
57
|
+
];
|
|
43
58
|
/**
|
|
44
59
|
* Valid tier names for tier_defaults configuration
|
|
45
60
|
*/
|
|
@@ -95,7 +110,12 @@ function findClosestLevel(input, validLevels) {
|
|
|
95
110
|
return level;
|
|
96
111
|
}
|
|
97
112
|
}
|
|
98
|
-
// Common aliases
|
|
113
|
+
// Common aliases.
|
|
114
|
+
//
|
|
115
|
+
// `max: 'xhigh'` is a graceful fallback for models whose levels list does not
|
|
116
|
+
// include `max` (e.g. Codex `gpt-5.4`). Exact match above takes priority, so
|
|
117
|
+
// Opus 4.7 (which has `max` in its validLevels) returns `max` directly while
|
|
118
|
+
// Codex still maps `max` → `xhigh`.
|
|
99
119
|
const aliases = {
|
|
100
120
|
min: 'minimal',
|
|
101
121
|
lo: 'low',
|