@kaitranntt/ccs 7.73.0 → 7.73.1-dev.2
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/config/base-claude.settings.json +1 -1
- package/dist/ccs.js +47 -13
- 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-manager.d.ts +20 -0
- package/dist/cliproxy/binary-manager.d.ts.map +1 -1
- package/dist/cliproxy/binary-manager.js +95 -12
- package/dist/cliproxy/binary-manager.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/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +46 -28
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +15 -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 +10 -3
- package/dist/cliproxy/platform-detector.d.ts.map +1 -1
- package/dist/cliproxy/platform-detector.js +9 -2
- 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/services/binary-service.d.ts.map +1 -1
- package/dist/cliproxy/services/binary-service.js +21 -7
- package/dist/cliproxy/services/binary-service.js.map +1 -1
- package/dist/cliproxy/services/variant-service.d.ts +2 -1
- package/dist/cliproxy/services/variant-service.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-service.js +16 -18
- package/dist/cliproxy/services/variant-service.js.map +1 -1
- 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/types.d.ts +4 -2
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/cliproxy/types.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 +5 -1
- 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 +3 -7
- package/dist/commands/cliproxy/index.js.map +1 -1
- package/dist/commands/cliproxy/install-subcommand.js +1 -1
- package/dist/commands/cliproxy/install-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 +4 -2
- 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/proxy-command.d.ts +1 -0
- package/dist/commands/proxy-command.d.ts.map +1 -1
- package/dist/commands/proxy-command.js +93 -23
- 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 +10 -1
- package/dist/config/unified-config-loader.js.map +1 -1
- package/dist/config/unified-config-types.d.ts +13 -3
- package/dist/config/unified-config-types.d.ts.map +1 -1
- package/dist/config/unified-config-types.js +10 -3
- package/dist/config/unified-config-types.js.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/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-paths.d.ts +5 -2
- package/dist/proxy/proxy-daemon-paths.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon-paths.js +17 -5
- 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 -93
- package/dist/proxy/proxy-daemon.js.map +1 -1
- package/dist/proxy/proxy-port-resolver.d.ts +7 -0
- package/dist/proxy/proxy-port-resolver.d.ts.map +1 -0
- package/dist/proxy/proxy-port-resolver.js +22 -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 +21 -16
- package/dist/proxy/transformers/request-transformer.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-DfkqFx14.js → accounts-CdmEv5jU.js} +1 -1
- package/dist/ui/assets/{alert-dialog-BJ9GwHLZ.js → alert-dialog-pSzyQP3S.js} +1 -1
- package/dist/ui/assets/{api-BVo8Vm1B.js → api-6xZ1yyns.js} +1 -1
- package/dist/ui/assets/{auth-section-B-Ms1O_M.js → auth-section-DJMuqfhE.js} +1 -1
- package/dist/ui/assets/{backups-section-f8hvkPfH.js → backups-section-DGKT51IG.js} +1 -1
- package/dist/ui/assets/{channels-Bgvry5fT.js → channels-DezQJzMm.js} +1 -1
- package/dist/ui/assets/{checkbox-CbI3Vbww.js → checkbox-D0fhe2bc.js} +1 -1
- package/dist/ui/assets/{claude-extension-lDT7lp8C.js → claude-extension-zS7zGQAr.js} +1 -1
- package/dist/ui/assets/cliproxy-CllaWHzR.js +3 -0
- package/dist/ui/assets/{cliproxy-ai-providers-Cjrk90aJ.js → cliproxy-ai-providers-DsMeN_St.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-DL8JoyKU.js → cliproxy-control-panel-p9QVUsRu.js} +1 -1
- package/dist/ui/assets/{codex-B3bW7lzx.js → codex-BibvFkeM.js} +1 -1
- package/dist/ui/assets/{confirm-dialog-Bm2Y3ArL.js → confirm-dialog-Cl3M6ytT.js} +1 -1
- package/dist/ui/assets/{copilot-CPLBRpFA.js → copilot-fBbT2Giy.js} +1 -1
- package/dist/ui/assets/{cursor-D1xhqEEF.js → cursor-Df6ARj5V.js} +1 -1
- package/dist/ui/assets/{droid-DiFtSJkl.js → droid-DxoeGW_k.js} +1 -1
- package/dist/ui/assets/{globalenv-section-BadlR8mm.js → globalenv-section-Cpfv8x9d.js} +1 -1
- package/dist/ui/assets/{health-Bxol1p1X.js → health-DftbLTPo.js} +1 -1
- package/dist/ui/assets/{index-CA4r5qY8.js → index-BC_nh-r0.js} +1 -1
- package/dist/ui/assets/{index-x07V45Iw.js → index-BU5nSuXf.js} +1 -1
- package/dist/ui/assets/{index-CXRoMyUA.js → index-BeGXGfW3.js} +1 -1
- package/dist/ui/assets/index-Bg5fPsun.js +1 -0
- package/dist/ui/assets/{index-C2-J9AKi.js → index-Bz4O7ubX.js} +1 -1
- package/dist/ui/assets/{index-DM7Qb4kd.js → index-CXjGRa6N.js} +2 -2
- package/dist/ui/assets/{index-BPCsEKJ8.js → index-Dazklm4w.js} +1 -1
- package/dist/ui/assets/{logs-kvpMF-pw.js → logs-BO4HN515.js} +1 -1
- package/dist/ui/assets/{masked-input-CFQ05toP.js → masked-input-DOdZz311.js} +1 -1
- package/dist/ui/assets/{proxy-status-widget-Df_-wCR0.js → proxy-status-widget-BMrsa5c4.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-DeWgWDSP.js → raw-json-settings-editor-panel-DxneYnUX.js} +1 -1
- package/dist/ui/assets/{searchable-select-CPbVBSoE.js → searchable-select-D5MLlu56.js} +1 -1
- package/dist/ui/assets/{separator--T-CzItG.js → separator-MbLyvcwG.js} +1 -1
- package/dist/ui/assets/{shared-Dx_5pa5N.js → shared-Odb9AKYo.js} +1 -1
- package/dist/ui/assets/{table-wE_LUUUQ.js → table-CtGeOCTd.js} +1 -1
- package/dist/ui/assets/{updates-mWDqf-fm.js → updates-BnaFXuVV.js} +1 -1
- package/dist/ui/index.html +1 -1
- 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 +9 -1
- package/dist/utils/browser/browser-settings.d.ts.map +1 -1
- package/dist/utils/browser/browser-settings.js +53 -37
- 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 +6 -5
- package/dist/utils/browser/browser-status.d.ts.map +1 -1
- package/dist/utils/browser/browser-status.js +83 -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/web-server/middleware/auth-middleware.d.ts +1 -1
- 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 +51 -10
- package/dist/web-server/routes/browser-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts +3 -5
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js +3 -14
- package/dist/web-server/routes/cliproxy-stats-routes.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 +4 -2
- package/dist/web-server/services/cliproxy-dashboard-install-service.js.map +1 -1
- package/package.json +2 -2
- package/scripts/ensure-deps.sh +18 -0
- package/dist/ui/assets/cliproxy-D50Owb9u.js +0 -3
- package/dist/ui/assets/index-BZYBDV6A.js +0 -1
|
@@ -29,7 +29,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
29
29
|
return result;
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.migrateVersionPin = exports.isVersionPinned = exports.clearPinnedVersion = exports.savePinnedVersion = exports.getPinnedVersion = exports.getVersionPinPath = exports.checkCliproxyUpdate = exports.fetchLatestCliproxyVersion = exports.installCliproxyVersion = exports.getInstalledCliproxyVersion = exports.getCLIProxyPath = exports.isCLIProxyInstalled = exports.ensureCLIProxyBinary = exports.BinaryManager = void 0;
|
|
32
|
+
exports.migrateVersionPin = exports.isVersionPinned = exports.clearPinnedVersion = exports.savePinnedVersion = exports.getPinnedVersion = exports.getVersionPinPath = exports.checkCliproxyUpdate = exports.fetchLatestCliproxyVersion = exports.installCliproxyVersion = exports.getInstalledCliproxyVersion = exports.getCLIProxyPath = exports.isCLIProxyInstalled = exports.ensureCLIProxyBinary = exports.BinaryManager = exports.getConfiguredBackend = exports.getStoredConfiguredBackend = exports.syncPlusFallbackStateIfNeeded = exports.resolveLocalBackend = exports.getPlusBackendUnavailableMessage = exports.CLIPROXY_PLUS_TRACKING_URL = void 0;
|
|
33
|
+
const fs = __importStar(require("fs"));
|
|
34
|
+
const path = __importStar(require("path"));
|
|
33
35
|
const ui_1 = require("../utils/ui");
|
|
34
36
|
const config_generator_1 = require("./config-generator");
|
|
35
37
|
const platform_detector_1 = require("./platform-detector");
|
|
@@ -43,10 +45,57 @@ Object.defineProperty(exports, "clearPinnedVersion", { enumerable: true, get: fu
|
|
|
43
45
|
Object.defineProperty(exports, "isVersionPinned", { enumerable: true, get: function () { return binary_1.isVersionPinned; } });
|
|
44
46
|
Object.defineProperty(exports, "getVersionPinPath", { enumerable: true, get: function () { return binary_1.getVersionPinPath; } });
|
|
45
47
|
Object.defineProperty(exports, "migrateVersionPin", { enumerable: true, get: function () { return binary_1.migrateVersionPin; } });
|
|
48
|
+
const version_cache_1 = require("./binary/version-cache");
|
|
49
|
+
exports.CLIPROXY_PLUS_TRACKING_URL = 'https://github.com/kaitranntt/ccs/issues/1062';
|
|
46
50
|
/**
|
|
47
|
-
*
|
|
51
|
+
* Track whether we've already warned the user about the Plus fallback this
|
|
52
|
+
* process lifetime. Prevents spamming the warning on every command.
|
|
48
53
|
*/
|
|
49
|
-
|
|
54
|
+
let plusFallbackWarned = false;
|
|
55
|
+
function emitPlusFallbackWarning() {
|
|
56
|
+
if (plusFallbackWarned)
|
|
57
|
+
return;
|
|
58
|
+
plusFallbackWarned = true;
|
|
59
|
+
process.stderr.write(`${(0, ui_1.warn)('CLIProxyAPIPlus upstream repo is currently unavailable; local CLIProxy is falling back to ' +
|
|
60
|
+
'`backend: original`. Run `ccs config` to update your saved config. ' +
|
|
61
|
+
`Tracking: ${exports.CLIPROXY_PLUS_TRACKING_URL}`)}\n`);
|
|
62
|
+
}
|
|
63
|
+
function getPlusBackendUnavailableMessage(provider) {
|
|
64
|
+
const prefix = provider
|
|
65
|
+
? `${provider} requires CLIProxyAPIPlus,`
|
|
66
|
+
: 'CLIProxyAPIPlus upstream repo is currently unavailable,';
|
|
67
|
+
return (`${prefix} but local CLIProxy currently supports only \`backend: original\`. ` +
|
|
68
|
+
`Tracking: ${exports.CLIPROXY_PLUS_TRACKING_URL}`);
|
|
69
|
+
}
|
|
70
|
+
exports.getPlusBackendUnavailableMessage = getPlusBackendUnavailableMessage;
|
|
71
|
+
function resolveLocalBackend(backend = platform_detector_1.DEFAULT_BACKEND, options = {}) {
|
|
72
|
+
if (backend !== 'plus')
|
|
73
|
+
return backend;
|
|
74
|
+
if (options.warnOnFallback) {
|
|
75
|
+
emitPlusFallbackWarning();
|
|
76
|
+
}
|
|
77
|
+
return 'original';
|
|
78
|
+
}
|
|
79
|
+
exports.resolveLocalBackend = resolveLocalBackend;
|
|
80
|
+
function copyFallbackStateIfMissing(sourcePath, targetPath) {
|
|
81
|
+
if (!fs.existsSync(sourcePath) || fs.existsSync(targetPath))
|
|
82
|
+
return;
|
|
83
|
+
fs.mkdirSync(path.dirname(targetPath), { recursive: true });
|
|
84
|
+
fs.copyFileSync(sourcePath, targetPath);
|
|
85
|
+
}
|
|
86
|
+
function syncPlusFallbackStateIfNeeded(configuredBackend) {
|
|
87
|
+
if (configuredBackend !== 'plus')
|
|
88
|
+
return;
|
|
89
|
+
const plusDir = getBackendBinDir('plus');
|
|
90
|
+
const originalDir = getBackendBinDir('original');
|
|
91
|
+
copyFallbackStateIfMissing(path.join(plusDir, (0, platform_detector_1.getExecutableName)('plus')), path.join(originalDir, (0, platform_detector_1.getExecutableName)('original')));
|
|
92
|
+
copyFallbackStateIfMissing(path.join(plusDir, '.version'), path.join(originalDir, '.version'));
|
|
93
|
+
copyFallbackStateIfMissing((0, binary_1.getVersionPinPath)('plus'), (0, binary_1.getVersionPinPath)('original'));
|
|
94
|
+
copyFallbackStateIfMissing((0, binary_1.getVersionCachePath)('plus'), (0, binary_1.getVersionCachePath)('original'));
|
|
95
|
+
copyFallbackStateIfMissing((0, version_cache_1.getVersionListCachePath)('plus'), (0, version_cache_1.getVersionListCachePath)('original'));
|
|
96
|
+
}
|
|
97
|
+
exports.syncPlusFallbackStateIfNeeded = syncPlusFallbackStateIfNeeded;
|
|
98
|
+
function getConfiguredOrDefaultBackend() {
|
|
50
99
|
try {
|
|
51
100
|
const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
|
|
52
101
|
return config.cliproxy?.backend || platform_detector_1.DEFAULT_BACKEND;
|
|
@@ -55,6 +104,24 @@ function getConfiguredBackend() {
|
|
|
55
104
|
return platform_detector_1.DEFAULT_BACKEND;
|
|
56
105
|
}
|
|
57
106
|
}
|
|
107
|
+
function getStoredConfiguredBackend() {
|
|
108
|
+
return getConfiguredOrDefaultBackend();
|
|
109
|
+
}
|
|
110
|
+
exports.getStoredConfiguredBackend = getStoredConfiguredBackend;
|
|
111
|
+
/**
|
|
112
|
+
* Get backend from config, with runtime fallback to 'original' when the user
|
|
113
|
+
* still has `backend: plus` saved.
|
|
114
|
+
*
|
|
115
|
+
* Context (issue #1062): the upstream `router-for-me/CLIProxyAPIPlus` repo was
|
|
116
|
+
* deleted, so any `backend: plus` install/update path hits a 404. Rather than
|
|
117
|
+
* forcing users to manually edit config.yaml, we degrade to `original` at
|
|
118
|
+
* runtime and warn once. This keeps existing installations working without a
|
|
119
|
+
* reconfig step, while CCS self-maintains its own Plus fork (future work).
|
|
120
|
+
*/
|
|
121
|
+
function getConfiguredBackend(options = {}) {
|
|
122
|
+
return resolveLocalBackend(getConfiguredOrDefaultBackend(), options);
|
|
123
|
+
}
|
|
124
|
+
exports.getConfiguredBackend = getConfiguredBackend;
|
|
58
125
|
/**
|
|
59
126
|
* Get backend-specific binary directory.
|
|
60
127
|
* Stores binaries in separate dirs: bin/original/ and bin/plus/
|
|
@@ -63,7 +130,7 @@ function getBackendBinDir(backend = platform_detector_1.DEFAULT_BACKEND) {
|
|
|
63
130
|
const baseDir = (0, config_generator_1.getBinDir)();
|
|
64
131
|
return `${baseDir}/${backend}`;
|
|
65
132
|
}
|
|
66
|
-
/** Default configuration (uses backend from config.yaml or defaults to
|
|
133
|
+
/** Default configuration (uses backend from config.yaml or defaults to `DEFAULT_BACKEND`) */
|
|
67
134
|
function createDefaultConfig(backend = platform_detector_1.DEFAULT_BACKEND) {
|
|
68
135
|
const backendConfig = platform_detector_1.BACKEND_CONFIG[backend];
|
|
69
136
|
return {
|
|
@@ -83,7 +150,9 @@ function createDefaultConfig(backend = platform_detector_1.DEFAULT_BACKEND) {
|
|
|
83
150
|
*/
|
|
84
151
|
class BinaryManager {
|
|
85
152
|
constructor(config = {}, backend) {
|
|
86
|
-
|
|
153
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
154
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
155
|
+
this.backend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
87
156
|
const defaultConfig = createDefaultConfig(this.backend);
|
|
88
157
|
this.config = { ...defaultConfig, ...config };
|
|
89
158
|
}
|
|
@@ -115,7 +184,9 @@ class BinaryManager {
|
|
|
115
184
|
exports.BinaryManager = BinaryManager;
|
|
116
185
|
/** Convenience function respecting version pin */
|
|
117
186
|
async function ensureCLIProxyBinary(verbose = false, options = {}) {
|
|
118
|
-
const
|
|
187
|
+
const configuredBackend = getConfiguredOrDefaultBackend();
|
|
188
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
189
|
+
const backend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
119
190
|
// Migrate old shared pin to backend-specific location (one-time migration)
|
|
120
191
|
(0, binary_1.migrateVersionPin)(backend);
|
|
121
192
|
const pinnedVersion = (0, binary_1.getPinnedVersion)(backend);
|
|
@@ -139,25 +210,33 @@ async function ensureCLIProxyBinary(verbose = false, options = {}) {
|
|
|
139
210
|
exports.ensureCLIProxyBinary = ensureCLIProxyBinary;
|
|
140
211
|
/** Check if CLIProxyAPI binary is installed */
|
|
141
212
|
function isCLIProxyInstalled(backend) {
|
|
142
|
-
const
|
|
213
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
214
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
215
|
+
const effectiveBackend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
143
216
|
return new BinaryManager({}, effectiveBackend).isBinaryInstalled();
|
|
144
217
|
}
|
|
145
218
|
exports.isCLIProxyInstalled = isCLIProxyInstalled;
|
|
146
219
|
/** Get CLIProxyAPI binary path (may not exist) */
|
|
147
220
|
function getCLIProxyPath(backend) {
|
|
148
|
-
const
|
|
221
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
222
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
223
|
+
const effectiveBackend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
149
224
|
return new BinaryManager({}, effectiveBackend).getBinaryPath();
|
|
150
225
|
}
|
|
151
226
|
exports.getCLIProxyPath = getCLIProxyPath;
|
|
152
227
|
/** Get installed CLIProxyAPI version from .version file */
|
|
153
228
|
function getInstalledCliproxyVersion(backend) {
|
|
154
|
-
const
|
|
229
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
230
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
231
|
+
const effectiveBackend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
155
232
|
return (0, binary_1.readInstalledVersion)(getBackendBinDir(effectiveBackend), platform_detector_1.BACKEND_CONFIG[effectiveBackend].fallbackVersion);
|
|
156
233
|
}
|
|
157
234
|
exports.getInstalledCliproxyVersion = getInstalledCliproxyVersion;
|
|
158
235
|
/** Install a specific version of CLIProxyAPI */
|
|
159
236
|
async function installCliproxyVersion(version, verbose = false, backend, deps = {}) {
|
|
160
|
-
const
|
|
237
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
238
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
239
|
+
const effectiveBackend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
161
240
|
const manager = deps.createManager?.({ version, verbose, forceVersion: true }, effectiveBackend) ??
|
|
162
241
|
new BinaryManager({ version, verbose, forceVersion: true }, effectiveBackend);
|
|
163
242
|
const stopProxyFn = deps.stopProxyFn ?? proxy_lifecycle_service_1.stopProxy;
|
|
@@ -194,14 +273,18 @@ async function installCliproxyVersion(version, verbose = false, backend, deps =
|
|
|
194
273
|
exports.installCliproxyVersion = installCliproxyVersion;
|
|
195
274
|
/** Fetch the latest CLIProxyAPI version from GitHub API */
|
|
196
275
|
async function fetchLatestCliproxyVersion(backend) {
|
|
197
|
-
const
|
|
276
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
277
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
278
|
+
const effectiveBackend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
198
279
|
const result = await new BinaryManager({}, effectiveBackend).checkForUpdates();
|
|
199
280
|
return result.latestVersion;
|
|
200
281
|
}
|
|
201
282
|
exports.fetchLatestCliproxyVersion = fetchLatestCliproxyVersion;
|
|
202
283
|
/** Check for CLIProxyAPI binary updates */
|
|
203
284
|
async function checkCliproxyUpdate(backend) {
|
|
204
|
-
const
|
|
285
|
+
const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
|
|
286
|
+
syncPlusFallbackStateIfNeeded(configuredBackend);
|
|
287
|
+
const effectiveBackend = resolveLocalBackend(configuredBackend, { warnOnFallback: true });
|
|
205
288
|
const result = await new BinaryManager({}, effectiveBackend).checkForUpdates();
|
|
206
289
|
// Import isNewerVersion for stability check
|
|
207
290
|
const { isNewerVersion } = await Promise.resolve().then(() => __importStar(require('./binary/version-checker')));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-manager.js","sourceRoot":"","sources":["../../src/cliproxy/binary-manager.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oCAAyC;AACzC,yDAAsE;AAEtE,
|
|
1
|
+
{"version":3,"file":"binary-manager.js","sourceRoot":"","sources":["../../src/cliproxy/binary-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-builder.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"env-builder.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAwK7E,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAEhF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,GACnC,MAAM,CAAC,UAAU,CAmCnB;AAyBD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CA4B9E;AA2HD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,mBAAmB,CAAC,EAAE,wBAAwB,GAC7C,MAAM,CAAC,UAAU,CAsEnB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAsGvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7F,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqFxB;AAED,qEAAqE;AACrE,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,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,kBAAkB,CAAC,EAAE,MAAM,EAC3B,YAAY,CAAC,EAAE,qBAAqB,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiFxB"}
|
|
@@ -42,7 +42,6 @@ const model_id_normalizer_1 = require("../model-id-normalizer");
|
|
|
42
42
|
const DEPRECATED_MODEL_PREFIX = 'gemini-claude-';
|
|
43
43
|
/** Replacement prefix matching actual upstream model names */
|
|
44
44
|
const UPSTREAM_MODEL_PREFIX = 'claude-';
|
|
45
|
-
const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
|
|
46
45
|
const PRESET_MODEL_KEYS = ['default', 'opus', 'sonnet', 'haiku'];
|
|
47
46
|
const REQUIRED_PROVIDER_ENV_KEYS = [
|
|
48
47
|
'ANTHROPIC_BASE_URL',
|
|
@@ -60,9 +59,6 @@ const CURSOR_LEGACY_ENV_OVERRIDE_KEYS = new Set([
|
|
|
60
59
|
function isObjectRecord(value) {
|
|
61
60
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
62
61
|
}
|
|
63
|
-
function stripCodexEffortSuffix(modelId) {
|
|
64
|
-
return modelId.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
|
|
65
|
-
}
|
|
66
62
|
/**
|
|
67
63
|
* Migrate deprecated gemini-claude-* model names to upstream claude-* names in a settings file.
|
|
68
64
|
* CLIProxyAPI registry no longer recognizes the gemini-claude-* prefix convention.
|
|
@@ -120,53 +116,6 @@ function migrateDeprecatedModelNames(settingsPath, provider, settings) {
|
|
|
120
116
|
}
|
|
121
117
|
return migrated;
|
|
122
118
|
}
|
|
123
|
-
/**
|
|
124
|
-
* Migrate codex effort-suffixed model IDs in settings to canonical IDs.
|
|
125
|
-
* Example: gpt-5.3-codex-xhigh -> gpt-5.3-codex
|
|
126
|
-
*/
|
|
127
|
-
function migrateCodexEffortSuffixes(settingsPath, provider, settings) {
|
|
128
|
-
if (provider !== 'codex')
|
|
129
|
-
return false;
|
|
130
|
-
if (!settings.env || typeof settings.env !== 'object')
|
|
131
|
-
return false;
|
|
132
|
-
let migrated = false;
|
|
133
|
-
for (const key of model_id_normalizer_1.MODEL_ENV_VAR_KEYS) {
|
|
134
|
-
const value = settings.env[key];
|
|
135
|
-
if (typeof value !== 'string')
|
|
136
|
-
continue;
|
|
137
|
-
const canonical = stripCodexEffortSuffix(value);
|
|
138
|
-
if (canonical !== value) {
|
|
139
|
-
settings.env[key] = canonical;
|
|
140
|
-
migrated = true;
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
if (Array.isArray(settings.presets)) {
|
|
144
|
-
for (const preset of settings.presets) {
|
|
145
|
-
if (!preset || typeof preset !== 'object')
|
|
146
|
-
continue;
|
|
147
|
-
const presetRecord = preset;
|
|
148
|
-
for (const key of PRESET_MODEL_KEYS) {
|
|
149
|
-
const value = presetRecord[key];
|
|
150
|
-
if (typeof value !== 'string')
|
|
151
|
-
continue;
|
|
152
|
-
const canonical = stripCodexEffortSuffix(value);
|
|
153
|
-
if (canonical !== value) {
|
|
154
|
-
presetRecord[key] = canonical;
|
|
155
|
-
migrated = true;
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
if (migrated) {
|
|
161
|
-
try {
|
|
162
|
-
fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', { mode: 0o600 });
|
|
163
|
-
}
|
|
164
|
-
catch {
|
|
165
|
-
// Best-effort migration — don't block startup if write fails
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
return migrated;
|
|
169
|
-
}
|
|
170
119
|
/**
|
|
171
120
|
* Migrate legacy iFlow model IDs to current upstream model IDs.
|
|
172
121
|
* Example: iflow-default -> qwen3-coder-plus, kimi-k2.5 -> kimi-k2
|
|
@@ -418,8 +367,6 @@ function getEffectiveEnvVars(provider, port = port_manager_1.CLIPROXY_DEFAULT_PO
|
|
|
418
367
|
if (settings.env && typeof settings.env === 'object') {
|
|
419
368
|
// Migrate deprecated gemini-claude-* model names if present
|
|
420
369
|
migrateDeprecatedModelNames(expandedPath, provider, settings);
|
|
421
|
-
// Migrate codex effort suffixes to canonical IDs if present
|
|
422
|
-
migrateCodexEffortSuffixes(expandedPath, provider, settings);
|
|
423
370
|
// Migrate legacy iFlow placeholders to supported model IDs
|
|
424
371
|
migrateIFlowPlaceholderModel(expandedPath, provider, settings);
|
|
425
372
|
// Custom variant settings found - merge with global env
|
|
@@ -452,8 +399,6 @@ function getEffectiveEnvVars(provider, port = port_manager_1.CLIPROXY_DEFAULT_PO
|
|
|
452
399
|
if (settings.env && typeof settings.env === 'object') {
|
|
453
400
|
// Migrate deprecated gemini-claude-* model names if present
|
|
454
401
|
migrateDeprecatedModelNames(settingsPath, provider, settings);
|
|
455
|
-
// Migrate codex effort suffixes to canonical IDs if present
|
|
456
|
-
migrateCodexEffortSuffixes(settingsPath, provider, settings);
|
|
457
402
|
// Migrate legacy iFlow placeholders to supported model IDs
|
|
458
403
|
migrateIFlowPlaceholderModel(settingsPath, provider, settings);
|
|
459
404
|
// User override found - merge with global env
|
|
@@ -614,7 +559,6 @@ function getRemoteEnvVars(provider, remoteConfig, customSettingsPath) {
|
|
|
614
559
|
const settings = JSON.parse(content);
|
|
615
560
|
if (settings.env && typeof settings.env === 'object') {
|
|
616
561
|
migrateDeprecatedModelNames(expandedPath, provider, settings);
|
|
617
|
-
migrateCodexEffortSuffixes(expandedPath, provider, settings);
|
|
618
562
|
migrateIFlowPlaceholderModel(expandedPath, provider, settings);
|
|
619
563
|
userEnvVars = settings.env;
|
|
620
564
|
}
|
|
@@ -634,7 +578,6 @@ function getRemoteEnvVars(provider, remoteConfig, customSettingsPath) {
|
|
|
634
578
|
const settings = JSON.parse(content);
|
|
635
579
|
if (settings.env && typeof settings.env === 'object') {
|
|
636
580
|
migrateDeprecatedModelNames(settingsPath, provider, settings);
|
|
637
|
-
migrateCodexEffortSuffixes(settingsPath, provider, settings);
|
|
638
581
|
migrateIFlowPlaceholderModel(settingsPath, provider, settings);
|
|
639
582
|
userEnvVars = settings.env;
|
|
640
583
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-builder.js","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"env-builder.js","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAyBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAsGlG,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,GACX;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAuB7D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAE/D;AAMD;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CA2qCf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}
|
|
@@ -48,7 +48,6 @@ const config_generator_1 = require("../config-generator");
|
|
|
48
48
|
const remote_proxy_client_1 = require("../remote-proxy-client");
|
|
49
49
|
const auth_handler_1 = require("../auth-handler");
|
|
50
50
|
const types_1 = require("../types");
|
|
51
|
-
const platform_detector_1 = require("../platform-detector");
|
|
52
51
|
const model_config_1 = require("../model-config");
|
|
53
52
|
const codex_plan_compatibility_1 = require("../codex-plan-compatibility");
|
|
54
53
|
const proxy_config_resolver_1 = require("../proxy-config-resolver");
|
|
@@ -140,22 +139,8 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
140
139
|
: [];
|
|
141
140
|
// 0. Resolve proxy configuration (CLI > ENV > config.yaml > defaults)
|
|
142
141
|
const unifiedConfig = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
|
|
143
|
-
// 0a. Runtime backend/provider validation
|
|
144
|
-
const backend = unifiedConfig.cliproxy?.backend ?? platform_detector_1.DEFAULT_BACKEND;
|
|
145
142
|
// Collect all providers to validate (default + composite tiers)
|
|
146
143
|
const allProviders = [provider, ...compositeProviders];
|
|
147
|
-
for (const p of allProviders) {
|
|
148
|
-
if (backend === 'original' && types_1.PLUS_ONLY_PROVIDERS.includes(p)) {
|
|
149
|
-
console.error('');
|
|
150
|
-
console.error((0, ui_1.fail)(`${p} requires CLIProxyAPIPlus backend`));
|
|
151
|
-
console.error('');
|
|
152
|
-
console.error('To use this provider, either:');
|
|
153
|
-
console.error(' 1. Set `cliproxy.backend: plus` in ~/.ccs/config.yaml');
|
|
154
|
-
console.error(' 2. Use --backend=plus flag: ccs ' + p + ' --backend=plus');
|
|
155
|
-
console.error('');
|
|
156
|
-
throw new Error(`Provider ${p} requires Plus backend`);
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
144
|
const cliproxyServerConfig = unifiedConfig.cliproxy_server;
|
|
160
145
|
const { config: proxyConfig, remainingArgs: argsWithoutProxy } = (0, proxy_config_resolver_1.resolveProxyConfig)(args, {
|
|
161
146
|
remote: cliproxyServerConfig?.remote
|
|
@@ -176,6 +161,28 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
176
161
|
}
|
|
177
162
|
: undefined,
|
|
178
163
|
});
|
|
164
|
+
let browserLaunchOverride;
|
|
165
|
+
let argsWithoutBrowserFlags = argsWithoutProxy;
|
|
166
|
+
try {
|
|
167
|
+
const browserLaunchFlags = (0, browser_1.resolveBrowserLaunchFlagResolution)(argsWithoutProxy);
|
|
168
|
+
browserLaunchOverride = browserLaunchFlags.override;
|
|
169
|
+
argsWithoutBrowserFlags = browserLaunchFlags.argsWithoutFlags;
|
|
170
|
+
}
|
|
171
|
+
catch (error) {
|
|
172
|
+
console.error((0, ui_1.fail)(error.message));
|
|
173
|
+
process.exit(1);
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
const browserConfig = (0, unified_config_loader_1.getBrowserConfig)();
|
|
177
|
+
const browserAttachConfig = (0, browser_1.getEffectiveClaudeBrowserAttachConfig)(browserConfig);
|
|
178
|
+
const claudeBrowserExposure = (0, browser_1.resolveBrowserExposure)({
|
|
179
|
+
enabled: browserAttachConfig.enabled,
|
|
180
|
+
policy: browserConfig.claude.policy,
|
|
181
|
+
}, browserLaunchOverride);
|
|
182
|
+
const blockedBrowserOverrideWarning = (0, browser_1.getBlockedBrowserOverrideWarning)('Claude Browser Attach', claudeBrowserExposure);
|
|
183
|
+
if (blockedBrowserOverrideWarning) {
|
|
184
|
+
console.error((0, ui_1.warn)(blockedBrowserOverrideWarning));
|
|
185
|
+
}
|
|
179
186
|
// Port resolution and validation
|
|
180
187
|
if (cfg.port && cfg.port !== config_generator_1.CLIPROXY_DEFAULT_PORT) {
|
|
181
188
|
if (proxyConfig.port !== config_generator_1.CLIPROXY_DEFAULT_PORT) {
|
|
@@ -193,8 +200,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
193
200
|
// Setup first-class CCS WebSearch runtime
|
|
194
201
|
(0, websearch_manager_1.ensureWebSearchMcpOrThrow)();
|
|
195
202
|
const imageAnalysisMcpReady = (0, image_analysis_1.ensureImageAnalysisMcpOrThrow)();
|
|
196
|
-
const
|
|
197
|
-
const browserAttachRuntime = browserAttachConfig.enabled
|
|
203
|
+
const browserAttachRuntime = browserAttachConfig.enabled && claudeBrowserExposure.exposeForLaunch
|
|
198
204
|
? await (0, browser_1.resolveOptionalBrowserAttachRuntime)(browserAttachConfig)
|
|
199
205
|
: undefined;
|
|
200
206
|
const browserRuntimeEnv = browserAttachRuntime?.runtimeEnv;
|
|
@@ -210,6 +216,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
210
216
|
(0, account_safety_1.warnOAuthBanRisk)(provider);
|
|
211
217
|
// Check remote proxy if configured
|
|
212
218
|
let useRemoteProxy = false;
|
|
219
|
+
let localBackend = 'original';
|
|
213
220
|
if (proxyConfig.mode === 'remote' && proxyConfig.host) {
|
|
214
221
|
const status = await (0, remote_proxy_client_1.checkRemoteProxy)({
|
|
215
222
|
host: proxyConfig.host,
|
|
@@ -252,6 +259,17 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
252
259
|
}
|
|
253
260
|
}
|
|
254
261
|
}
|
|
262
|
+
if (!useRemoteProxy) {
|
|
263
|
+
localBackend = (0, binary_manager_1.getConfiguredBackend)({ warnOnFallback: true });
|
|
264
|
+
for (const p of allProviders) {
|
|
265
|
+
if (localBackend === 'original' && types_1.PLUS_ONLY_PROVIDERS.includes(p)) {
|
|
266
|
+
console.error('');
|
|
267
|
+
console.error((0, ui_1.fail)((0, binary_manager_1.getPlusBackendUnavailableMessage)(p)));
|
|
268
|
+
console.error('');
|
|
269
|
+
throw new Error(`Provider ${p} is temporarily unavailable on local CLIProxy`);
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
}
|
|
255
273
|
// Variables for local proxy mode
|
|
256
274
|
let binaryPath;
|
|
257
275
|
let sessionId;
|
|
@@ -806,10 +824,10 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
806
824
|
if (shouldSpawn && binaryPath) {
|
|
807
825
|
proxy = (0, lifecycle_manager_1.spawnProxy)(binaryPath, configPath, verbose);
|
|
808
826
|
// 7. Wait for proxy readiness
|
|
809
|
-
await (0, lifecycle_manager_1.waitForProxyReadyWithSpinner)(cfg.port, cfg.timeout, cfg.pollInterval,
|
|
827
|
+
await (0, lifecycle_manager_1.waitForProxyReadyWithSpinner)(cfg.port, cfg.timeout, cfg.pollInterval, localBackend, configPath);
|
|
810
828
|
// Register session
|
|
811
829
|
if (proxy.pid) {
|
|
812
|
-
sessionId = (0, session_bridge_1.registerProxySession)(cfg.port, proxy.pid,
|
|
830
|
+
sessionId = (0, session_bridge_1.registerProxySession)(cfg.port, proxy.pid, localBackend, verbose);
|
|
813
831
|
}
|
|
814
832
|
}
|
|
815
833
|
}
|
|
@@ -1059,7 +1077,7 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
1059
1077
|
'--settings',
|
|
1060
1078
|
...proxy_config_resolver_1.PROXY_CLI_FLAGS,
|
|
1061
1079
|
];
|
|
1062
|
-
const claudeArgs =
|
|
1080
|
+
const claudeArgs = argsWithoutBrowserFlags.filter((arg, idx) => {
|
|
1063
1081
|
if (ccsFlags.includes(arg))
|
|
1064
1082
|
return false;
|
|
1065
1083
|
if (arg.startsWith('--kiro-auth-method='))
|
|
@@ -1076,14 +1094,14 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
1076
1094
|
return false;
|
|
1077
1095
|
if (arg.startsWith('--1m=') || arg.startsWith('--no-1m='))
|
|
1078
1096
|
return false;
|
|
1079
|
-
if (
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1097
|
+
if (argsWithoutBrowserFlags[idx - 1] === '--use' ||
|
|
1098
|
+
argsWithoutBrowserFlags[idx - 1] === '--nickname' ||
|
|
1099
|
+
argsWithoutBrowserFlags[idx - 1] === '--kiro-auth-method' ||
|
|
1100
|
+
argsWithoutBrowserFlags[idx - 1] === '--kiro-idc-start-url' ||
|
|
1101
|
+
argsWithoutBrowserFlags[idx - 1] === '--kiro-idc-region' ||
|
|
1102
|
+
argsWithoutBrowserFlags[idx - 1] === '--kiro-idc-flow' ||
|
|
1103
|
+
argsWithoutBrowserFlags[idx - 1] === '--thinking' ||
|
|
1104
|
+
argsWithoutBrowserFlags[idx - 1] === '--effort')
|
|
1087
1105
|
return false;
|
|
1088
1106
|
return true;
|
|
1089
1107
|
});
|