@kaitranntt/ccs 8.9.0 → 8.10.0-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.
Files changed (175) hide show
  1. package/README.md +3 -3
  2. package/dist/cliproxy/accounts/drain-order.d.ts +9 -1
  3. package/dist/cliproxy/accounts/drain-order.d.ts.map +1 -1
  4. package/dist/cliproxy/accounts/drain-order.js +15 -1
  5. package/dist/cliproxy/accounts/drain-order.js.map +1 -1
  6. package/dist/cliproxy/ai-providers/codex-plan-compatibility.js +2 -2
  7. package/dist/cliproxy/ai-providers/codex-plan-compatibility.js.map +1 -1
  8. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts +1 -1
  9. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
  10. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +4 -2
  11. package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
  12. package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts +1 -1
  13. package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
  14. package/dist/cliproxy/ai-providers/model-id-normalizer.js +5 -1
  15. package/dist/cliproxy/ai-providers/model-id-normalizer.js.map +1 -1
  16. package/dist/cliproxy/binary/install-lifecycle-lock.d.ts +2 -0
  17. package/dist/cliproxy/binary/install-lifecycle-lock.d.ts.map +1 -0
  18. package/dist/cliproxy/binary/install-lifecycle-lock.js +63 -0
  19. package/dist/cliproxy/binary/install-lifecycle-lock.js.map +1 -0
  20. package/dist/cliproxy/binary/installer.d.ts +13 -1
  21. package/dist/cliproxy/binary/installer.d.ts.map +1 -1
  22. package/dist/cliproxy/binary/installer.js +81 -42
  23. package/dist/cliproxy/binary/installer.js.map +1 -1
  24. package/dist/cliproxy/binary/lifecycle.d.ts +6 -1
  25. package/dist/cliproxy/binary/lifecycle.d.ts.map +1 -1
  26. package/dist/cliproxy/binary/lifecycle.js +13 -10
  27. package/dist/cliproxy/binary/lifecycle.js.map +1 -1
  28. package/dist/cliproxy/binary/platform-detector.d.ts.map +1 -1
  29. package/dist/cliproxy/binary/platform-detector.js +5 -4
  30. package/dist/cliproxy/binary/platform-detector.js.map +1 -1
  31. package/dist/cliproxy/binary/version-checker.d.ts +2 -0
  32. package/dist/cliproxy/binary/version-checker.d.ts.map +1 -1
  33. package/dist/cliproxy/binary/version-checker.js +5 -1
  34. package/dist/cliproxy/binary/version-checker.js.map +1 -1
  35. package/dist/cliproxy/binary-manager.d.ts +2 -0
  36. package/dist/cliproxy/binary-manager.d.ts.map +1 -1
  37. package/dist/cliproxy/binary-manager.js +31 -29
  38. package/dist/cliproxy/binary-manager.js.map +1 -1
  39. package/dist/cliproxy/config/extended-context-config.d.ts.map +1 -1
  40. package/dist/cliproxy/config/extended-context-config.js +38 -1
  41. package/dist/cliproxy/config/extended-context-config.js.map +1 -1
  42. package/dist/cliproxy/config/thinking-config.d.ts.map +1 -1
  43. package/dist/cliproxy/config/thinking-config.js +5 -5
  44. package/dist/cliproxy/config/thinking-config.js.map +1 -1
  45. package/dist/cliproxy/executor/env-resolver.js +1 -1
  46. package/dist/cliproxy/executor/env-resolver.js.map +1 -1
  47. package/dist/cliproxy/executor/launch-settings.d.ts.map +1 -1
  48. package/dist/cliproxy/executor/launch-settings.js +9 -2
  49. package/dist/cliproxy/executor/launch-settings.js.map +1 -1
  50. package/dist/cliproxy/model-catalog.d.ts +6 -0
  51. package/dist/cliproxy/model-catalog.d.ts.map +1 -1
  52. package/dist/cliproxy/model-catalog.js +56 -3
  53. package/dist/cliproxy/model-catalog.js.map +1 -1
  54. package/dist/cliproxy/routing/routing-strategy.d.ts +4 -5
  55. package/dist/cliproxy/routing/routing-strategy.d.ts.map +1 -1
  56. package/dist/cliproxy/routing/routing-strategy.js +18 -13
  57. package/dist/cliproxy/routing/routing-strategy.js.map +1 -1
  58. package/dist/cliproxy/services/binary-service.d.ts.map +1 -1
  59. package/dist/cliproxy/services/binary-service.js +24 -20
  60. package/dist/cliproxy/services/binary-service.js.map +1 -1
  61. package/dist/cliproxy/services/catalog-cache.d.ts.map +1 -1
  62. package/dist/cliproxy/services/catalog-cache.js +2 -0
  63. package/dist/cliproxy/services/catalog-cache.js.map +1 -1
  64. package/dist/cliproxy/types/binary-types.d.ts +1 -0
  65. package/dist/cliproxy/types/binary-types.d.ts.map +1 -1
  66. package/dist/commands/cliproxy/order-subcommand.d.ts.map +1 -1
  67. package/dist/commands/cliproxy/order-subcommand.js +21 -0
  68. package/dist/commands/cliproxy/order-subcommand.js.map +1 -1
  69. package/dist/commands/cliproxy/quota-subcommand/format-helpers.js +1 -1
  70. package/dist/commands/cliproxy/quota-subcommand/handlers.js +1 -1
  71. package/dist/commands/cliproxy/quota-subcommand/handlers.js.map +1 -1
  72. package/dist/commands/cliproxy/quota-subcommand/sections/claude.js +1 -1
  73. package/dist/commands/cliproxy/quota-subcommand/sections/claude.js.map +1 -1
  74. package/dist/commands/cliproxy/quota-subcommand/sections/codex.js +1 -1
  75. package/dist/commands/cliproxy/quota-subcommand/sections/codex.js.map +1 -1
  76. package/dist/commands/cliproxy/quota-subcommand/sections/gemini-cli.js +1 -1
  77. package/dist/commands/cliproxy/quota-subcommand/sections/gemini-cli.js.map +1 -1
  78. package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
  79. package/dist/commands/cliproxy/variant-subcommand.js +5 -1
  80. package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
  81. package/dist/delegation/delegation-handler.d.ts.map +1 -1
  82. package/dist/delegation/delegation-handler.js +12 -2
  83. package/dist/delegation/delegation-handler.js.map +1 -1
  84. package/dist/management/shared-manager/diverged-file-adopter.d.ts.map +1 -1
  85. package/dist/management/shared-manager/diverged-file-adopter.js +106 -76
  86. package/dist/management/shared-manager/diverged-file-adopter.js.map +1 -1
  87. package/dist/shared/extended-context-utils.d.ts +17 -1
  88. package/dist/shared/extended-context-utils.d.ts.map +1 -1
  89. package/dist/shared/extended-context-utils.js +37 -3
  90. package/dist/shared/extended-context-utils.js.map +1 -1
  91. package/dist/shared/provider-preset-catalog.d.ts +3 -2
  92. package/dist/shared/provider-preset-catalog.d.ts.map +1 -1
  93. package/dist/shared/provider-preset-catalog.js +19 -2
  94. package/dist/shared/provider-preset-catalog.js.map +1 -1
  95. package/dist/ui/assets/{Trans-dQ5QXCeL.js → Trans-BFurXtDk.js} +1 -1
  96. package/dist/ui/assets/{accounts-DMMNI7g4.js → accounts-B_ik6YOD.js} +1 -1
  97. package/dist/ui/assets/{alert-dialog-BIWuuEiP.js → alert-dialog-C6fhMbXC.js} +1 -1
  98. package/dist/ui/assets/{api-BKTghVxS.js → api-CxCFoBC0.js} +1 -1
  99. package/dist/ui/assets/{auth-section-BKDcPs0P.js → auth-section-CtmO77JA.js} +1 -1
  100. package/dist/ui/assets/{backups-section-DB1N4X1P.js → backups-section-BYKnAWUa.js} +1 -1
  101. package/dist/ui/assets/{channels-dhk_rRcA.js → channels-3uR41jWp.js} +1 -1
  102. package/dist/ui/assets/{checkbox-h1pwW_6m.js → checkbox-fCmjUiDn.js} +1 -1
  103. package/dist/ui/assets/{claude-extension-WLOGl6eK.js → claude-extension-BplTVbCF.js} +1 -1
  104. package/dist/ui/assets/cliproxy-BdW2ctsn.js +4 -0
  105. package/dist/ui/assets/{cliproxy-ai-providers-DVkAmHVF.js → cliproxy-ai-providers-D4OTiwA3.js} +1 -1
  106. package/dist/ui/assets/{cliproxy-control-panel-D25OT5u5.js → cliproxy-control-panel-DCyhsdm1.js} +1 -1
  107. package/dist/ui/assets/{codex-Bqc25al7.js → codex-BGF20GsK.js} +1 -1
  108. package/dist/ui/assets/{confirm-dialog-BnAIV9ZB.js → confirm-dialog-BtMwDW6c.js} +1 -1
  109. package/dist/ui/assets/{copilot-BdjZjuRs.js → copilot-r1b0KLFf.js} +1 -1
  110. package/dist/ui/assets/{cursor-DTbIQ-d7.js → cursor-BhVKTiz1.js} +1 -1
  111. package/dist/ui/assets/{droid-DAjrpAjP.js → droid-lol9hAdK.js} +1 -1
  112. package/dist/ui/assets/{globalenv-section-BzirfKtN.js → globalenv-section-B0gg-kuR.js} +1 -1
  113. package/dist/ui/assets/{health-CDCop1Et.js → health-Bu6RFYCP.js} +1 -1
  114. package/dist/ui/assets/{index-vdkPayvk.js → index-BbPI5sU_.js} +1 -1
  115. package/dist/ui/assets/{index-DMGiMF5C.js → index-BmjgsjcO.js} +1 -1
  116. package/dist/ui/assets/{index-BF4hYrQf.js → index-Djse8iLV.js} +1 -1
  117. package/dist/ui/assets/{index-bC8F80OC.js → index-Pn_n_HFQ.js} +1 -1
  118. package/dist/ui/assets/{index-BhGdNER3.js → index-awbhDVzL.js} +1 -1
  119. package/dist/ui/assets/{index-B4yjQknk.js → index-pHOoeHgY.js} +36 -36
  120. package/dist/ui/assets/{index-Dkee4NQG.js → index-ptYEAEzZ.js} +1 -1
  121. package/dist/ui/assets/{logs-Bb1BaiFq.js → logs-B5Sbi4IG.js} +1 -1
  122. package/dist/ui/assets/{masked-input-DxWhb6sQ.js → masked-input-BnrL_TdT.js} +1 -1
  123. package/dist/ui/assets/proxy-status-widget-ColaQQXh.js +1 -0
  124. package/dist/ui/assets/{raw-json-settings-editor-panel-BeZJbsnO.js → raw-json-settings-editor-panel-PStRjNEl.js} +1 -1
  125. package/dist/ui/assets/{searchable-select-CcXdAHJm.js → searchable-select-BDpwwNsP.js} +1 -1
  126. package/dist/ui/assets/{separator-O1g2RdCE.js → separator-CJCyWDRS.js} +1 -1
  127. package/dist/ui/assets/{shared-Ct6UqE0N.js → shared-6BrToCad.js} +1 -1
  128. package/dist/ui/assets/{table-D4ZJKsoh.js → table-CnZev3Iu.js} +1 -1
  129. package/dist/ui/assets/{updates-jnNBispr.js → updates-BiS0o8aM.js} +1 -1
  130. package/dist/ui/assets/{use-accounts-DXwh5f2t.js → use-accounts-89FOqhFc.js} +1 -1
  131. package/dist/ui/icons/orcarouter.svg +1 -0
  132. package/dist/ui/index.html +1 -1
  133. package/dist/utils/hooks/image-analysis-backend-resolver.d.ts.map +1 -1
  134. package/dist/utils/hooks/image-analysis-backend-resolver.js +6 -0
  135. package/dist/utils/hooks/image-analysis-backend-resolver.js.map +1 -1
  136. package/dist/utils/hooks/image-analysis-runtime-status.d.ts.map +1 -1
  137. package/dist/utils/hooks/image-analysis-runtime-status.js +8 -3
  138. package/dist/utils/hooks/image-analysis-runtime-status.js.map +1 -1
  139. package/dist/utils/package-manager-detector.d.ts.map +1 -1
  140. package/dist/utils/package-manager-detector.js +6 -2
  141. package/dist/utils/package-manager-detector.js.map +1 -1
  142. package/dist/utils/websearch/agy.d.ts +3 -1
  143. package/dist/utils/websearch/agy.d.ts.map +1 -1
  144. package/dist/utils/websearch/agy.js +33 -23
  145. package/dist/utils/websearch/agy.js.map +1 -1
  146. package/dist/utils/websearch/gemini-cli.d.ts +3 -1
  147. package/dist/utils/websearch/gemini-cli.d.ts.map +1 -1
  148. package/dist/utils/websearch/gemini-cli.js +33 -23
  149. package/dist/utils/websearch/gemini-cli.js.map +1 -1
  150. package/dist/utils/websearch/grok-cli.d.ts +3 -1
  151. package/dist/utils/websearch/grok-cli.d.ts.map +1 -1
  152. package/dist/utils/websearch/grok-cli.js +33 -23
  153. package/dist/utils/websearch/grok-cli.js.map +1 -1
  154. package/dist/utils/websearch/opencode-cli.d.ts +3 -1
  155. package/dist/utils/websearch/opencode-cli.d.ts.map +1 -1
  156. package/dist/utils/websearch/opencode-cli.js +33 -23
  157. package/dist/utils/websearch/opencode-cli.js.map +1 -1
  158. package/dist/utils/websearch/status.d.ts +4 -1
  159. package/dist/utils/websearch/status.d.ts.map +1 -1
  160. package/dist/utils/websearch/status.js +47 -25
  161. package/dist/utils/websearch/status.js.map +1 -1
  162. package/dist/web-server/model-pricing.d.ts.map +1 -1
  163. package/dist/web-server/model-pricing.js +50 -11
  164. package/dist/web-server/model-pricing.js.map +1 -1
  165. package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts +5 -0
  166. package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts.map +1 -1
  167. package/dist/web-server/services/cliproxy-dashboard-install-service.js +53 -36
  168. package/dist/web-server/services/cliproxy-dashboard-install-service.js.map +1 -1
  169. package/dist/web-server/usage/aggregator.d.ts.map +1 -1
  170. package/dist/web-server/usage/aggregator.js +36 -2
  171. package/dist/web-server/usage/aggregator.js.map +1 -1
  172. package/package.json +4 -1
  173. package/scripts/dev-release.sh +1 -1
  174. package/dist/ui/assets/cliproxy-CE_mZIGU.js +0 -4
  175. package/dist/ui/assets/proxy-status-widget-Dj_46CdP.js +0 -1
@@ -30,83 +30,122 @@ Object.defineProperty(exports, "__esModule", { value: true });
30
30
  exports.getBinaryInfo = exports.isBinaryInstalled = exports.getBinaryPath = exports.deleteBinary = exports.downloadAndInstall = void 0;
31
31
  const fs = __importStar(require("fs"));
32
32
  const path = __importStar(require("path"));
33
+ const lockfile = __importStar(require("proper-lockfile"));
33
34
  const platform_detector_1 = require("../binary/platform-detector");
34
35
  const downloader_1 = require("./downloader");
35
36
  const verifier_1 = require("./verifier");
36
37
  const extractor_1 = require("./extractor");
37
- const version_cache_1 = require("./version-cache");
38
38
  const progress_indicator_1 = require("../../utils/progress-indicator");
39
39
  const ui_1 = require("../../utils/ui");
40
+ const error_types_1 = require("../../errors/error-types");
40
41
  /**
41
42
  * Download and install the binary
42
43
  */
43
- async function downloadAndInstall(config, verbose = false) {
44
+ async function downloadAndInstall(config, verbose = false, deps = {}) {
44
45
  const backend = config.backend ?? platform_detector_1.DEFAULT_BACKEND;
45
46
  const platform = (0, platform_detector_1.detectPlatform)(config.version, backend);
46
47
  const downloadUrl = (0, platform_detector_1.getDownloadUrl)(config.version, backend);
47
48
  const checksumsUrl = (0, platform_detector_1.getChecksumsUrl)(config.version, backend);
48
49
  const backendLabel = backend === 'plus' ? 'CLIProxy Plus' : 'CLIProxy';
50
+ const downloadWithRetryFn = deps.downloadWithRetryFn ?? downloader_1.downloadWithRetry;
51
+ const verifyChecksumFn = deps.verifyChecksumFn ?? verifier_1.verifyChecksum;
52
+ const extractArchiveFn = deps.extractArchiveFn ?? extractor_1.extractArchive;
53
+ const renameSyncFn = deps.renameSyncFn ?? fs.renameSync;
49
54
  fs.mkdirSync(config.binPath, { recursive: true });
50
- // Delete existing binary before install to prevent mismatched binaries.
51
- // Abort if binary is currently running (ETXTBSY) — cannot replace in-use binary.
52
- // Happens in Docker when dashboard tries to update while bootstrap's instance is active.
53
- const existingBinary = path.join(config.binPath, (0, platform_detector_1.getExecutableName)(backend));
54
- if (fs.existsSync(existingBinary)) {
55
- try {
56
- fs.unlinkSync(existingBinary);
57
- if (verbose)
58
- console.error(`[cliproxy] Removed existing binary: ${existingBinary}`);
59
- }
60
- catch (error) {
61
- const code = error instanceof Error && 'code' in error ? error.code : '';
62
- // ETXTBSY: Linux-specific error when unlinking a running executable.
63
- // EBUSY on Windows may mean something different (mount point, etc.),
64
- // so only treat ETXTBSY as "binary in use" to avoid misleading messages.
65
- if (code === 'ETXTBSY') {
66
- if (verbose)
67
- console.error(`[cliproxy] Binary is running, cannot replace: ${existingBinary}`);
68
- throw new Error('CLIProxy binary is currently running and cannot be replaced. Restart the container to apply the update.');
69
- }
70
- throw error;
71
- }
72
- }
73
- const archivePath = path.join(config.binPath, `cliproxy-archive.${platform.extension}`);
55
+ const releaseLock = await lockfile.lock(config.binPath, {
56
+ stale: 10 * 60 * 1000,
57
+ retries: { retries: 60, factor: 1, minTimeout: 250, maxTimeout: 250 },
58
+ });
59
+ let stagingPath;
74
60
  const spinner = new progress_indicator_1.ProgressIndicator(`Downloading ${backendLabel} v${config.version}`);
75
- spinner.start();
61
+ let installError;
76
62
  try {
77
- const result = await (0, downloader_1.downloadWithRetry)(downloadUrl, archivePath, {
63
+ for (const entry of fs.readdirSync(config.binPath)) {
64
+ if (entry.startsWith('.cliproxy-install-')) {
65
+ fs.rmSync(path.join(config.binPath, entry), { recursive: true, force: true });
66
+ }
67
+ }
68
+ stagingPath = fs.mkdtempSync(path.join(config.binPath, '.cliproxy-install-'));
69
+ const archivePath = path.join(stagingPath, `cliproxy-archive.${platform.extension}`);
70
+ const stagedBinary = path.join(stagingPath, (0, platform_detector_1.getExecutableName)(backend));
71
+ const stagedVersion = path.join(stagingPath, '.version');
72
+ const installedBinary = path.join(config.binPath, (0, platform_detector_1.getExecutableName)(backend));
73
+ const installedVersion = path.join(config.binPath, '.version');
74
+ const backupBinary = path.join(stagingPath, '.previous-binary');
75
+ const hadInstalledBinary = fs.existsSync(installedBinary);
76
+ spinner.start();
77
+ const result = await downloadWithRetryFn(downloadUrl, archivePath, {
78
78
  maxRetries: config.maxRetries,
79
79
  verbose,
80
80
  });
81
81
  if (!result.success) {
82
82
  spinner.fail('Download failed');
83
- throw new Error(result.error || 'Download failed after retries');
83
+ throw new error_types_1.NetworkError(result.error || 'Download failed after retries', downloadUrl);
84
84
  }
85
85
  spinner.update('Verifying checksum');
86
- const checksumResult = await (0, verifier_1.verifyChecksum)(archivePath, platform.binaryName, checksumsUrl, verbose);
86
+ const checksumResult = await verifyChecksumFn(archivePath, platform.binaryName, checksumsUrl, verbose);
87
87
  if (!checksumResult.valid) {
88
88
  spinner.fail('Checksum mismatch');
89
- fs.unlinkSync(archivePath);
90
- throw new Error(`Checksum mismatch for ${platform.binaryName}\nExpected: ${checksumResult.expected}\n` +
91
- `Actual: ${checksumResult.actual}\n\nManual download: ${downloadUrl}`);
89
+ throw new error_types_1.BinaryError(`Checksum mismatch for ${platform.binaryName}\nExpected: ${checksumResult.expected}\n` +
90
+ `Actual: ${checksumResult.actual}\n\nManual download: ${downloadUrl}`, stagedBinary);
92
91
  }
93
92
  spinner.update('Extracting binary');
94
- await (0, extractor_1.extractArchive)(archivePath, config.binPath, platform.extension, verbose, backend);
95
- spinner.succeed(`${backendLabel} ready`);
96
- fs.unlinkSync(archivePath);
97
- const binaryPath = path.join(config.binPath, (0, platform_detector_1.getExecutableName)(backend));
98
- if (platform.os !== 'windows' && fs.existsSync(binaryPath)) {
99
- fs.chmodSync(binaryPath, 0o755);
93
+ await extractArchiveFn(archivePath, stagingPath, platform.extension, verbose, backend);
94
+ if (!fs.existsSync(stagedBinary) || !fs.statSync(stagedBinary).isFile()) {
95
+ throw new error_types_1.BinaryError(`Extracted archive did not contain ${(0, platform_detector_1.getExecutableName)(backend)}`, stagedBinary);
96
+ }
97
+ if (platform.os !== 'windows') {
98
+ fs.chmodSync(stagedBinary, 0o755);
100
99
  if (verbose)
101
- console.error(`[cliproxy] Set executable permissions: ${binaryPath}`);
100
+ console.error(`[cliproxy] Set executable permissions: ${stagedBinary}`);
102
101
  }
103
- (0, version_cache_1.writeInstalledVersion)(config.binPath, config.version);
102
+ fs.writeFileSync(stagedVersion, config.version, 'utf8');
103
+ if (hadInstalledBinary) {
104
+ fs.copyFileSync(installedBinary, backupBinary);
105
+ if (platform.os !== 'windows')
106
+ fs.chmodSync(backupBinary, 0o755);
107
+ }
108
+ renameSyncFn(stagedBinary, installedBinary);
109
+ try {
110
+ renameSyncFn(stagedVersion, installedVersion);
111
+ }
112
+ catch (error) {
113
+ if (hadInstalledBinary) {
114
+ renameSyncFn(backupBinary, installedBinary);
115
+ }
116
+ else {
117
+ fs.unlinkSync(installedBinary);
118
+ }
119
+ throw error;
120
+ }
121
+ spinner.succeed(`${backendLabel} ready`);
104
122
  console.log((0, ui_1.ok)(`${backendLabel} v${config.version} installed successfully`));
105
123
  }
106
124
  catch (error) {
125
+ installError = error;
107
126
  spinner.fail('Installation failed');
108
127
  throw error;
109
128
  }
129
+ finally {
130
+ let cleanupError;
131
+ try {
132
+ if (stagingPath)
133
+ fs.rmSync(stagingPath, { recursive: true, force: true });
134
+ }
135
+ catch (error) {
136
+ cleanupError = error;
137
+ }
138
+ finally {
139
+ try {
140
+ await releaseLock();
141
+ }
142
+ catch (error) {
143
+ cleanupError ?? (cleanupError = error);
144
+ }
145
+ }
146
+ if (!installError && cleanupError)
147
+ throw cleanupError;
148
+ }
110
149
  }
111
150
  exports.downloadAndInstall = downloadAndInstall;
112
151
  /** Delete binary (for cleanup or reinstall) */
@@ -122,7 +161,7 @@ function deleteBinary(binPath, verbose = false, backend) {
122
161
  catch (error) {
123
162
  const code = error instanceof Error && 'code' in error ? error.code : '';
124
163
  if (code === 'ETXTBSY') {
125
- throw new Error('CLIProxy binary is currently running and cannot be deleted.');
164
+ throw new error_types_1.BinaryError('CLIProxy binary is currently running and cannot be deleted.', binaryPath);
126
165
  }
127
166
  throw error;
128
167
  }
@@ -1 +1 @@
1
- {"version":3,"file":"installer.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/installer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"installer.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/installer.ts"],"names":[],"mappings":"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"}
@@ -3,9 +3,14 @@
3
3
  * Handles ensuring binary availability and auto-updates.
4
4
  */
5
5
  import { BinaryManagerConfig } from '../types';
6
+ import { downloadAndInstall } from './installer';
6
7
  /**
7
8
  * Ensure binary is available (download if missing, update if outdated)
8
9
  * @returns Path to executable binary
9
10
  */
10
- export declare function ensureBinary(config: BinaryManagerConfig): Promise<string>;
11
+ interface EnsureBinaryDeps {
12
+ downloadAndInstallFn?: typeof downloadAndInstall;
13
+ }
14
+ export declare function ensureBinary(config: BinaryManagerConfig, deps?: EnsureBinaryDeps): Promise<string>;
15
+ export {};
11
16
  //# sourceMappingURL=lifecycle.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/lifecycle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,mBAAmB,EAAmB,MAAM,UAAU,CAAC;AA+FhE;;;GAGG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4D/E"}
1
+ {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/lifecycle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,mBAAmB,EAAmB,MAAM,UAAU,CAAC;AAOhE,OAAO,EAAE,kBAAkB,EAAiB,MAAM,aAAa,CAAC;AAyFhE;;;GAGG;AACH,UAAU,gBAAgB;IACxB,oBAAoB,CAAC,EAAE,OAAO,kBAAkB,CAAC;CAClD;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAoEjB"}
@@ -34,6 +34,7 @@ const installer_1 = require("./installer");
34
34
  const ui_1 = require("../../utils/ui");
35
35
  const stats_fetcher_1 = require("../services/stats-fetcher");
36
36
  const port_manager_1 = require("../config/port-manager");
37
+ const error_types_1 = require("../../errors/error-types");
37
38
  const platform_detector_1 = require("../binary/platform-detector");
38
39
  /** Log helper */
39
40
  function log(message, verbose) {
@@ -97,24 +98,26 @@ async function handleAutoUpdate(config, verbose) {
97
98
  else {
98
99
  console.log((0, ui_1.info)(updateMsg));
99
100
  console.log((0, ui_1.info)(`Updating ${backendLabel}...`));
100
- (0, installer_1.deleteBinary)(config.binPath, verbose, backend);
101
+ // The installer stages and validates the replacement before atomically swapping it.
101
102
  config.version = targetVersion;
102
103
  await (0, installer_1.downloadAndInstall)(config, verbose);
103
104
  }
104
105
  }
105
- /**
106
- * Ensure binary is available (download if missing, update if outdated)
107
- * @returns Path to executable binary
108
- */
109
- async function ensureBinary(config) {
106
+ async function ensureBinary(config, deps = {}) {
110
107
  const verbose = config.verbose;
111
108
  const backend = config.backend ?? platform_detector_1.DEFAULT_BACKEND;
112
109
  const binaryPath = (0, installer_1.getBinaryPath)(config.binPath, backend);
110
+ const downloadAndInstallFn = deps.downloadAndInstallFn ?? installer_1.downloadAndInstall;
113
111
  // Binary exists - check for updates unless forceVersion
114
112
  if (fs.existsSync(binaryPath)) {
115
113
  log(`Binary exists: ${binaryPath}`, verbose);
114
+ if (config.replaceExisting) {
115
+ log(`Force version mode: installing specified version ${config.version}`, verbose);
116
+ await downloadAndInstallFn(config, verbose);
117
+ return binaryPath;
118
+ }
116
119
  if (config.forceVersion) {
117
- log('Force version mode: skipping auto-update', verbose);
120
+ log(`Pinned version mode: using installed version ${config.version}`, verbose);
118
121
  return binaryPath;
119
122
  }
120
123
  if (config.skipAutoUpdate) {
@@ -132,8 +135,8 @@ async function ensureBinary(config) {
132
135
  }
133
136
  // Binary missing
134
137
  if (!config.allowInstall) {
135
- throw new Error(`${getBackendLabel(backend)} binary is not installed locally. ` +
136
- 'Run "ccs cliproxy install" when you have network access.');
138
+ throw new error_types_1.BinaryError(`${getBackendLabel(backend)} binary is not installed locally. ` +
139
+ 'Run "ccs cliproxy install" when you have network access.', binaryPath);
137
140
  }
138
141
  // Only log download intent when a download will actually happen
139
142
  log('Binary not found, downloading...', verbose);
@@ -156,7 +159,7 @@ async function ensureBinary(config) {
156
159
  else {
157
160
  log(`Force version mode: using specified version ${config.version}`, verbose);
158
161
  }
159
- await (0, installer_1.downloadAndInstall)(config, verbose);
162
+ await downloadAndInstallFn(config, verbose);
160
163
  return binaryPath;
161
164
  }
162
165
  exports.ensureBinary = ensureBinary;
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/lifecycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/lifecycle.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"platform-detector.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EAEZ,aAAa,EAEb,eAAe,EAChB,MAAM,UAAU,CAAC;AAElB,4BAA4B;AAC5B,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAajB,CAAC;AAEX;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,eAA4B,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,UAAkD,CAAC;AAEzF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,cAAc,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;;CAAuC,CAAC;AAE1E,wDAAwD;AACxD,eAAO,MAAM,gBAAgB,UAA4B,CAAC;AAwB1D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAGpF;AA2CD;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,YAAY,CA4Cd;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAIpF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAEvF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,MAAM,CAKR;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAErF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAO7C;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAW/C"}
1
+ {"version":3,"file":"platform-detector.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EAEZ,aAAa,EAEb,eAAe,EAChB,MAAM,UAAU,CAAC;AAElB,4BAA4B;AAC5B,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAajB,CAAC;AAEX;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,eAA4B,CAAC;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,UAAkD,CAAC;AAEzF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,cAAc,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;;CAAuC,CAAC;AAE1E,wDAAwD;AACxD,eAAO,MAAM,gBAAgB,UAA4B,CAAC;AA2B1D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAGpF;AAuCD;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,YAAY,CA4Cd;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAIpF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAEvF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,MAAM,CAKR;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,eAAiC,GACzC,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,eAAiC,GAAG,MAAM,CAErF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAO7C;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAW/C"}
@@ -69,7 +69,10 @@ const RELEASE_ARCH_MAP = {
69
69
  aarch64: 'aarch64',
70
70
  };
71
71
  const PLUS_NO_PLUGIN_ASSET_MIN_VERSION = '7.1.68-0';
72
- const PLUS_AARCH64_ASSET_MIN_VERSION = '7.1.45-1';
72
+ const AARCH64_ASSET_MIN_VERSION = {
73
+ original: '6.9.48',
74
+ plus: '6.10.0-0',
75
+ };
73
76
  function mapNodeArchToReleaseArch(nodeArch) {
74
77
  const arch = ARCH_MAP[nodeArch];
75
78
  return arch ? RELEASE_ARCH_MAP[arch] : undefined;
@@ -97,9 +100,7 @@ function usesPlusNoPluginAsset(version, os) {
97
100
  return os !== 'windows' && isAtLeastVersion(version, PLUS_NO_PLUGIN_ASSET_MIN_VERSION);
98
101
  }
99
102
  function getReleaseArchForBackend(backend, version, publicArch, releaseArch) {
100
- if (backend === 'plus' &&
101
- publicArch === 'arm64' &&
102
- !isAtLeastVersion(version, PLUS_AARCH64_ASSET_MIN_VERSION)) {
103
+ if (publicArch === 'arm64' && !isAtLeastVersion(version, AARCH64_ASSET_MIN_VERSION[backend])) {
103
104
  return 'arm64';
104
105
  }
105
106
  return releaseArch;
@@ -1 +1 @@
1
- {"version":3,"file":"platform-detector.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"platform-detector.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/platform-detector.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@
5
5
  import { fetchJson } from './downloader';
6
6
  import { UpdateCheckResult, VersionListResult } from './types';
7
7
  import type { CLIProxyBackend } from '../types';
8
+ export type CLIProxyBackendMinVersions = Readonly<Record<CLIProxyBackend, string>>;
8
9
  interface FetchLatestVersionDeps {
9
10
  fetchJsonFn?: typeof fetchJson;
10
11
  }
@@ -21,6 +22,7 @@ export declare function compareCliproxyVersions(a: string, b: string): number;
21
22
  * 7.1.31-1 still sort newer than 7.1.31-0.
22
23
  */
23
24
  export declare function isNewerVersion(latest: string, current: string): boolean;
25
+ export declare function meetsBackendMinimumVersion(installedVersion: string, backend: CLIProxyBackend, minimumByBackend: CLIProxyBackendMinVersions): boolean;
24
26
  /**
25
27
  * Check if version is within the faulty range (v81-85)
26
28
  * @returns true if version has known critical bugs
@@ -1 +1 @@
1
- {"version":3,"file":"version-checker.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-checker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAUzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAoB,MAAM,SAAS,CAAC;AAMjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,UAAU,sBAAsB;IAC9B,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC;CAChC;AAED,UAAU,mBAAmB;IAC3B,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACxF;AAED,UAAU,oBAAoB;IAC5B,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC;CAChC;AA0BD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAUpE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,UAAQ,EACf,OAAO,GAAE,eAAiC,EAC1C,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,OAAO,UAAQ,EACf,OAAO,GAAE,eAAiC,EAC1C,IAAI,GAAE,mBAAwB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,UAAQ,EACf,OAAO,GAAE,eAAiC,EAC1C,IAAI,GAAE,oBAAyB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAoD5B"}
1
+ {"version":3,"file":"version-checker.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-checker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAUzC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAoB,MAAM,SAAS,CAAC;AAMjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,MAAM,0BAA0B,GAAG,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AAEnF,UAAU,sBAAsB;IAC9B,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC;CAChC;AAED,UAAU,mBAAmB;IAC3B,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACxF;AAED,UAAU,oBAAoB;IAC5B,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC;CAChC;AA0BD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAUpE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvE;AAED,wBAAgB,0BAA0B,CACxC,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,eAAe,EACxB,gBAAgB,EAAE,0BAA0B,GAC3C,OAAO,CAET;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,UAAQ,EACf,OAAO,GAAE,eAAiC,EAC1C,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,OAAO,UAAQ,EACf,OAAO,GAAE,eAAiC,EAC1C,IAAI,GAAE,mBAAwB,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,UAAQ,EACf,OAAO,GAAE,eAAiC,EAC1C,IAAI,GAAE,oBAAyB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAoD5B"}
@@ -4,7 +4,7 @@
4
4
  * Handles checking GitHub API for latest version and comparing semver.
5
5
  */
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.fetchAllVersions = exports.checkForUpdates = exports.fetchLatestVersion = exports.isVersionFaulty = exports.isNewerVersion = exports.compareCliproxyVersions = void 0;
7
+ exports.fetchAllVersions = exports.checkForUpdates = exports.fetchLatestVersion = exports.isVersionFaulty = exports.meetsBackendMinimumVersion = exports.isNewerVersion = exports.compareCliproxyVersions = void 0;
8
8
  const downloader_1 = require("./downloader");
9
9
  const version_cache_1 = require("./version-cache");
10
10
  const types_1 = require("./types");
@@ -43,6 +43,10 @@ function isNewerVersion(latest, current) {
43
43
  return compareCliproxyVersions(latest, current) > 0;
44
44
  }
45
45
  exports.isNewerVersion = isNewerVersion;
46
+ function meetsBackendMinimumVersion(installedVersion, backend, minimumByBackend) {
47
+ return compareCliproxyVersions(installedVersion, minimumByBackend[backend]) >= 0;
48
+ }
49
+ exports.meetsBackendMinimumVersion = meetsBackendMinimumVersion;
46
50
  /**
47
51
  * Check if version is within the faulty range (v81-85)
48
52
  * @returns true if version has known critical bugs
@@ -1 +1 @@
1
- {"version":3,"file":"version-checker.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-checker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"version-checker.js","sourceRoot":"","sources":["../../../src/cliproxy/binary/version-checker.ts"],"names":[],"mappings":"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"}
@@ -27,6 +27,7 @@ export declare function getStoredConfiguredBackend(): CLIProxyBackend;
27
27
  * community fork instead of degrading to original.
28
28
  */
29
29
  export declare function getConfiguredBackend(options?: ResolveLocalBackendOptions): CLIProxyBackend;
30
+ export declare function withCliproxyInstallLifecycleLock<T>(backend: CLIProxyBackend, operation: () => Promise<T>): Promise<T>;
30
31
  /**
31
32
  * Binary Manager class for CLIProxyAPI binary lifecycle
32
33
  */
@@ -67,6 +68,7 @@ interface InstallCliproxyVersionDeps {
67
68
  formatInfo?: typeof info;
68
69
  formatWarn?: typeof warn;
69
70
  getInstalledVersion?: typeof getInstalledCliproxyVersion;
71
+ withInstallLifecycleLockFn?: typeof withCliproxyInstallLifecycleLock;
70
72
  }
71
73
  /** Install a specific version of CLIProxyAPI */
72
74
  export declare function installCliproxyVersion(version: string, verbose?: boolean, backend?: CLIProxyBackend, deps?: InstallCliproxyVersionDeps): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"binary-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/binary-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"binary-manager.d.ts","sourceRoot":"","sources":["../../src/cliproxy/binary-manager.ts"],"names":[],"mappings":"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"}
@@ -29,7 +29,7 @@ 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 = exports.getConfiguredBackend = exports.getStoredConfiguredBackend = exports.resolveLocalBackend = exports.syncPlusFallbackStateIfNeeded = exports.getPlusBackendUnavailableMessage = exports.CLIPROXY_PLUS_TRACKING_URL = exports.CLIPROXY_PLUS_FORK_URL = exports.CLIPROXY_PLUS_FALLBACK_TRACKING_URL = exports.CLIPROXY_DELETED_PLUS_REPO = 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.withCliproxyInstallLifecycleLock = exports.getConfiguredBackend = exports.getStoredConfiguredBackend = exports.resolveLocalBackend = exports.syncPlusFallbackStateIfNeeded = exports.getPlusBackendUnavailableMessage = exports.CLIPROXY_PLUS_TRACKING_URL = exports.CLIPROXY_PLUS_FORK_URL = exports.CLIPROXY_PLUS_FALLBACK_TRACKING_URL = exports.CLIPROXY_DELETED_PLUS_REPO = void 0;
33
33
  const fs = __importStar(require("fs"));
34
34
  const path = __importStar(require("path"));
35
35
  const ui_1 = require("../utils/ui");
@@ -47,6 +47,7 @@ Object.defineProperty(exports, "getVersionPinPath", { enumerable: true, get: fun
47
47
  Object.defineProperty(exports, "migrateVersionPin", { enumerable: true, get: function () { return binary_1.migrateVersionPin; } });
48
48
  const version_cache_1 = require("./binary/version-cache");
49
49
  const config_loader_facade_1 = require("../config/config-loader-facade");
50
+ const install_lifecycle_lock_1 = require("./binary/install-lifecycle-lock");
50
51
  exports.CLIPROXY_DELETED_PLUS_REPO = 'router-for-me/CLIProxyAPIPlus';
51
52
  exports.CLIPROXY_PLUS_FALLBACK_TRACKING_URL = 'https://github.com/kaitranntt/ccs/issues/1062';
52
53
  exports.CLIPROXY_PLUS_FORK_URL = 'https://github.com/kaitranntt/CLIProxyAPIPlus';
@@ -153,6 +154,11 @@ function getBackendBinDir(backend = platform_detector_1.DEFAULT_BACKEND) {
153
154
  const baseDir = (0, config_generator_1.getBinDir)();
154
155
  return `${baseDir}/${backend}`;
155
156
  }
157
+ async function withCliproxyInstallLifecycleLock(backend, operation) {
158
+ const lockTarget = path.join((0, config_generator_1.getBinDir)(), `.install-lifecycle-${backend}`);
159
+ return (0, install_lifecycle_lock_1.withInstallLifecycleLock)(lockTarget, operation);
160
+ }
161
+ exports.withCliproxyInstallLifecycleLock = withCliproxyInstallLifecycleLock;
156
162
  /** Default configuration (uses backend from config.yaml or defaults to `DEFAULT_BACKEND`) */
157
163
  function createDefaultConfig(backend = platform_detector_1.DEFAULT_BACKEND) {
158
164
  const backendConfig = platform_detector_1.BACKEND_CONFIG[backend];
@@ -163,6 +169,7 @@ function createDefaultConfig(backend = platform_detector_1.DEFAULT_BACKEND) {
163
169
  maxRetries: 3,
164
170
  verbose: false,
165
171
  forceVersion: false,
172
+ replaceExisting: false,
166
173
  skipAutoUpdate: false,
167
174
  allowInstall: true,
168
175
  backend, // Pass backend for installer to use correct download URL
@@ -254,39 +261,34 @@ exports.getInstalledCliproxyVersion = getInstalledCliproxyVersion;
254
261
  async function installCliproxyVersion(version, verbose = false, backend, deps = {}) {
255
262
  const configuredBackend = backend ?? getConfiguredOrDefaultBackend();
256
263
  const effectiveBackend = resolveLocalBackend(configuredBackend, { notifyOnPlus: true });
257
- const manager = deps.createManager?.({ version, verbose, forceVersion: true }, effectiveBackend) ??
258
- new BinaryManager({ version, verbose, forceVersion: true }, effectiveBackend);
264
+ const manager = deps.createManager?.({ version, verbose, forceVersion: true, replaceExisting: true }, effectiveBackend) ??
265
+ new BinaryManager({ version, verbose, forceVersion: true, replaceExisting: true }, effectiveBackend);
259
266
  const stopProxyFn = deps.stopProxyFn ?? proxy_lifecycle_service_1.stopProxy;
260
267
  const waitForPortFreeFn = deps.waitForPortFreeFn ?? port_utils_1.waitForPortFree;
261
268
  const formatInfo = deps.formatInfo ?? ui_1.info;
262
269
  const formatWarn = deps.formatWarn ?? ui_1.warn;
263
- const getInstalledVersion = deps.getInstalledVersion ?? getInstalledCliproxyVersion;
264
- // Always attempt a best-effort stop first so we also catch untracked proxies
265
- // that are running without a session lock.
266
- if (verbose)
267
- console.log(formatInfo('Stopping running CLIProxy before update...'));
268
- const result = await stopProxyFn();
269
- if (result.stopped) {
270
- const stoppedPort = result.port ?? (0, port_manager_1.resolveLifecyclePort)();
271
- // Wait for port to be fully released
272
- const portFree = await waitForPortFreeFn(stoppedPort, 5000);
273
- if (!portFree && verbose) {
274
- console.log(formatWarn('Port did not free up in time, proceeding anyway...'));
275
- }
276
- }
277
- else if (verbose && result.error && result.error !== 'No active CLIProxy session found') {
278
- console.log(formatWarn(`Could not stop proxy: ${result.error}`));
279
- }
280
- if (manager.isBinaryInstalled()) {
281
- const label = effectiveBackend === 'plus' ? 'CLIProxy Plus' : 'CLIProxy';
270
+ const withLifecycleLock = deps.withInstallLifecycleLockFn ?? withCliproxyInstallLifecycleLock;
271
+ await withLifecycleLock(effectiveBackend, async () => {
272
+ // Always attempt a best-effort stop first so we also catch untracked proxies
273
+ // that are running without a session lock.
282
274
  if (verbose)
283
- console.log(formatInfo(`Removing existing ${label} v${getInstalledVersion(effectiveBackend)}`));
284
- manager.deleteBinary();
285
- }
286
- await manager.ensureBinary();
287
- if (verbose) {
288
- console.log(formatInfo('New version will be active on next CLIProxy command'));
289
- }
275
+ console.log(formatInfo('Stopping running CLIProxy before update...'));
276
+ const result = await stopProxyFn();
277
+ if (result.stopped) {
278
+ const stoppedPort = result.port ?? (0, port_manager_1.resolveLifecyclePort)();
279
+ const portFree = await waitForPortFreeFn(stoppedPort, 5000);
280
+ if (!portFree && verbose) {
281
+ console.log(formatWarn('Port did not free up in time, proceeding anyway...'));
282
+ }
283
+ }
284
+ else if (verbose && result.error && result.error !== 'No active CLIProxy session found') {
285
+ console.log(formatWarn(`Could not stop proxy: ${result.error}`));
286
+ }
287
+ await manager.ensureBinary();
288
+ if (verbose) {
289
+ console.log(formatInfo('New version will be active on next CLIProxy command'));
290
+ }
291
+ });
290
292
  }
291
293
  exports.installCliproxyVersion = installCliproxyVersion;
292
294
  /** Fetch the latest CLIProxyAPI version from GitHub API */