@kaitranntt/ccs 8.9.0-dev.1 → 8.9.0-dev.11
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 +3 -3
- package/dist/cliproxy/accounts/drain-order.d.ts +9 -1
- package/dist/cliproxy/accounts/drain-order.d.ts.map +1 -1
- package/dist/cliproxy/accounts/drain-order.js +15 -1
- package/dist/cliproxy/accounts/drain-order.js.map +1 -1
- package/dist/cliproxy/binary/install-lifecycle-lock.d.ts +2 -0
- package/dist/cliproxy/binary/install-lifecycle-lock.d.ts.map +1 -0
- package/dist/cliproxy/binary/install-lifecycle-lock.js +63 -0
- package/dist/cliproxy/binary/install-lifecycle-lock.js.map +1 -0
- package/dist/cliproxy/binary/installer.d.ts +13 -1
- package/dist/cliproxy/binary/installer.d.ts.map +1 -1
- package/dist/cliproxy/binary/installer.js +81 -42
- package/dist/cliproxy/binary/installer.js.map +1 -1
- package/dist/cliproxy/binary/lifecycle.d.ts +6 -1
- package/dist/cliproxy/binary/lifecycle.d.ts.map +1 -1
- package/dist/cliproxy/binary/lifecycle.js +13 -10
- package/dist/cliproxy/binary/lifecycle.js.map +1 -1
- package/dist/cliproxy/binary/platform-detector.d.ts.map +1 -1
- package/dist/cliproxy/binary/platform-detector.js +5 -4
- package/dist/cliproxy/binary/platform-detector.js.map +1 -1
- package/dist/cliproxy/binary/version-checker.d.ts +2 -0
- package/dist/cliproxy/binary/version-checker.d.ts.map +1 -1
- package/dist/cliproxy/binary/version-checker.js +5 -1
- package/dist/cliproxy/binary/version-checker.js.map +1 -1
- package/dist/cliproxy/binary-manager.d.ts +2 -0
- package/dist/cliproxy/binary-manager.d.ts.map +1 -1
- package/dist/cliproxy/binary-manager.js +31 -29
- package/dist/cliproxy/binary-manager.js.map +1 -1
- package/dist/cliproxy/config/extended-context-config.d.ts.map +1 -1
- package/dist/cliproxy/config/extended-context-config.js +38 -1
- package/dist/cliproxy/config/extended-context-config.js.map +1 -1
- package/dist/cliproxy/executor/launch-settings.d.ts.map +1 -1
- package/dist/cliproxy/executor/launch-settings.js +9 -2
- package/dist/cliproxy/executor/launch-settings.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts +6 -0
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +42 -2
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/routing/routing-strategy.d.ts +4 -5
- package/dist/cliproxy/routing/routing-strategy.d.ts.map +1 -1
- package/dist/cliproxy/routing/routing-strategy.js +18 -13
- package/dist/cliproxy/routing/routing-strategy.js.map +1 -1
- package/dist/cliproxy/services/binary-service.d.ts.map +1 -1
- package/dist/cliproxy/services/binary-service.js +24 -20
- package/dist/cliproxy/services/binary-service.js.map +1 -1
- package/dist/cliproxy/services/catalog-cache.d.ts.map +1 -1
- package/dist/cliproxy/services/catalog-cache.js +2 -0
- package/dist/cliproxy/services/catalog-cache.js.map +1 -1
- package/dist/cliproxy/types/binary-types.d.ts +1 -0
- package/dist/cliproxy/types/binary-types.d.ts.map +1 -1
- package/dist/commands/cliproxy/order-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/order-subcommand.js +21 -0
- package/dist/commands/cliproxy/order-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand/format-helpers.js +1 -1
- package/dist/commands/cliproxy/quota-subcommand/handlers.js +1 -1
- package/dist/commands/cliproxy/quota-subcommand/handlers.js.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand/sections/claude.js +1 -1
- package/dist/commands/cliproxy/quota-subcommand/sections/claude.js.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand/sections/codex.js +1 -1
- package/dist/commands/cliproxy/quota-subcommand/sections/codex.js.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand/sections/gemini-cli.js +1 -1
- package/dist/commands/cliproxy/quota-subcommand/sections/gemini-cli.js.map +1 -1
- package/dist/delegation/delegation-handler.d.ts.map +1 -1
- package/dist/delegation/delegation-handler.js +12 -2
- package/dist/delegation/delegation-handler.js.map +1 -1
- package/dist/management/shared-manager/diverged-file-adopter.d.ts.map +1 -1
- package/dist/management/shared-manager/diverged-file-adopter.js +106 -76
- package/dist/management/shared-manager/diverged-file-adopter.js.map +1 -1
- package/dist/shared/extended-context-utils.d.ts +17 -1
- package/dist/shared/extended-context-utils.d.ts.map +1 -1
- package/dist/shared/extended-context-utils.js +37 -3
- package/dist/shared/extended-context-utils.js.map +1 -1
- package/dist/shared/provider-preset-catalog.d.ts +3 -2
- package/dist/shared/provider-preset-catalog.d.ts.map +1 -1
- package/dist/shared/provider-preset-catalog.js +19 -2
- package/dist/shared/provider-preset-catalog.js.map +1 -1
- package/dist/ui/assets/{Trans-dQ5QXCeL.js → Trans-CFovxljl.js} +1 -1
- package/dist/ui/assets/{accounts-DMMNI7g4.js → accounts-dagN4ycI.js} +1 -1
- package/dist/ui/assets/{alert-dialog-BIWuuEiP.js → alert-dialog-DJkGvE-_.js} +1 -1
- package/dist/ui/assets/{api-BKTghVxS.js → api-C3LysQ5X.js} +1 -1
- package/dist/ui/assets/{auth-section-BKDcPs0P.js → auth-section-BEIcNixR.js} +1 -1
- package/dist/ui/assets/{backups-section-DB1N4X1P.js → backups-section-CKhGhirR.js} +1 -1
- package/dist/ui/assets/{channels-dhk_rRcA.js → channels-BiBwXY06.js} +1 -1
- package/dist/ui/assets/{checkbox-h1pwW_6m.js → checkbox-BAMGOBUT.js} +1 -1
- package/dist/ui/assets/{claude-extension-WLOGl6eK.js → claude-extension-B1nt1ulT.js} +1 -1
- package/dist/ui/assets/{cliproxy-ai-providers-DVkAmHVF.js → cliproxy-ai-providers-CGEN2_tw.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-D25OT5u5.js → cliproxy-control-panel-BLkpXPri.js} +1 -1
- package/dist/ui/assets/{cliproxy-CE_mZIGU.js → cliproxy-fvgNUwXr.js} +3 -3
- package/dist/ui/assets/{codex-Bqc25al7.js → codex-CQSjWlPZ.js} +1 -1
- package/dist/ui/assets/{confirm-dialog-BnAIV9ZB.js → confirm-dialog-BZONByZ0.js} +1 -1
- package/dist/ui/assets/{copilot-BdjZjuRs.js → copilot-CWPqu-HF.js} +1 -1
- package/dist/ui/assets/{cursor-DTbIQ-d7.js → cursor-ULjTPFiL.js} +1 -1
- package/dist/ui/assets/{droid-DAjrpAjP.js → droid-CYomszN0.js} +1 -1
- package/dist/ui/assets/{globalenv-section-BzirfKtN.js → globalenv-section-CB5wPkY8.js} +1 -1
- package/dist/ui/assets/{health-CDCop1Et.js → health-DbBL3q3w.js} +1 -1
- package/dist/ui/assets/{index-vdkPayvk.js → index-CoMpJo_n.js} +1 -1
- package/dist/ui/assets/{index-BhGdNER3.js → index-CxUAdhtw.js} +1 -1
- package/dist/ui/assets/{index-DMGiMF5C.js → index-D0p405yf.js} +1 -1
- package/dist/ui/assets/{index-BF4hYrQf.js → index-D4JDNw3s.js} +1 -1
- package/dist/ui/assets/{index-bC8F80OC.js → index-DKwgHLt0.js} +1 -1
- package/dist/ui/assets/{index-Dkee4NQG.js → index-Vt-HZYJB.js} +1 -1
- package/dist/ui/assets/{index-B4yjQknk.js → index-m5EMndrQ.js} +36 -36
- package/dist/ui/assets/{logs-Bb1BaiFq.js → logs-vWuOwwU1.js} +1 -1
- package/dist/ui/assets/{masked-input-DxWhb6sQ.js → masked-input-CsDo2D0E.js} +1 -1
- package/dist/ui/assets/proxy-status-widget-y8f65qJb.js +1 -0
- package/dist/ui/assets/{raw-json-settings-editor-panel-BeZJbsnO.js → raw-json-settings-editor-panel-BuXCUjIt.js} +1 -1
- package/dist/ui/assets/{searchable-select-CcXdAHJm.js → searchable-select-x2D3DEEJ.js} +1 -1
- package/dist/ui/assets/{separator-O1g2RdCE.js → separator-Fw3KeL5O.js} +1 -1
- package/dist/ui/assets/{shared-Ct6UqE0N.js → shared-BZjxvNAq.js} +1 -1
- package/dist/ui/assets/{table-D4ZJKsoh.js → table-DmTBUO7C.js} +1 -1
- package/dist/ui/assets/{updates-jnNBispr.js → updates-DRQ9v7zh.js} +1 -1
- package/dist/ui/assets/{use-accounts-DXwh5f2t.js → use-accounts-C2nUYcFE.js} +1 -1
- package/dist/ui/icons/orcarouter.svg +1 -0
- package/dist/ui/index.html +1 -1
- package/dist/utils/hooks/image-analysis-backend-resolver.d.ts.map +1 -1
- package/dist/utils/hooks/image-analysis-backend-resolver.js +6 -0
- package/dist/utils/hooks/image-analysis-backend-resolver.js.map +1 -1
- package/dist/utils/hooks/image-analysis-runtime-status.d.ts.map +1 -1
- package/dist/utils/hooks/image-analysis-runtime-status.js +8 -3
- package/dist/utils/hooks/image-analysis-runtime-status.js.map +1 -1
- package/dist/utils/package-manager-detector.d.ts.map +1 -1
- package/dist/utils/package-manager-detector.js +6 -2
- package/dist/utils/package-manager-detector.js.map +1 -1
- package/dist/utils/websearch/agy.d.ts +3 -1
- package/dist/utils/websearch/agy.d.ts.map +1 -1
- package/dist/utils/websearch/agy.js +33 -23
- package/dist/utils/websearch/agy.js.map +1 -1
- package/dist/utils/websearch/gemini-cli.d.ts +3 -1
- package/dist/utils/websearch/gemini-cli.d.ts.map +1 -1
- package/dist/utils/websearch/gemini-cli.js +33 -23
- package/dist/utils/websearch/gemini-cli.js.map +1 -1
- package/dist/utils/websearch/grok-cli.d.ts +3 -1
- package/dist/utils/websearch/grok-cli.d.ts.map +1 -1
- package/dist/utils/websearch/grok-cli.js +33 -23
- package/dist/utils/websearch/grok-cli.js.map +1 -1
- package/dist/utils/websearch/opencode-cli.d.ts +3 -1
- package/dist/utils/websearch/opencode-cli.d.ts.map +1 -1
- package/dist/utils/websearch/opencode-cli.js +33 -23
- package/dist/utils/websearch/opencode-cli.js.map +1 -1
- package/dist/utils/websearch/status.d.ts +4 -1
- package/dist/utils/websearch/status.d.ts.map +1 -1
- package/dist/utils/websearch/status.js +47 -25
- package/dist/utils/websearch/status.js.map +1 -1
- package/dist/web-server/model-pricing.d.ts.map +1 -1
- package/dist/web-server/model-pricing.js +21 -10
- package/dist/web-server/model-pricing.js.map +1 -1
- package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts +5 -0
- package/dist/web-server/services/cliproxy-dashboard-install-service.d.ts.map +1 -1
- package/dist/web-server/services/cliproxy-dashboard-install-service.js +53 -36
- package/dist/web-server/services/cliproxy-dashboard-install-service.js.map +1 -1
- package/package.json +4 -1
- package/scripts/dev-release.sh +1 -1
- package/dist/ui/assets/proxy-status-widget-Dj_46CdP.js +0 -1
|
@@ -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
|
|
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 (
|
|
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":";AAAA;;;;;GAKG;;;AAUH,4BAA4B;AACf,QAAA,cAAc,GAAG;IAC5B,QAAQ,EAAE;QACR,IAAI,EAAE,2BAA2B;QACjC,YAAY,EAAE,aAAa;QAC3B,UAAU,EAAE,eAAe;QAC3B,eAAe,EAAE,QAAQ;KAC1B;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,4BAA4B;QAClC,YAAY,EAAE,iBAAiB;QAC/B,UAAU,EAAE,oBAAoB;QAChC,eAAe,EAAE,UAAU;KAC5B;CACO,CAAC;AAEX;;;;;;GAMG;AACU,QAAA,eAAe,GAAoB,UAAU,CAAC;AAE3D;;;;;GAKG;AACU,QAAA,yBAAyB,GAAG,sBAAc,CAAC,uBAAe,CAAC,CAAC,eAAe,CAAC;AAEzF;;;;;GAKG;AACU,QAAA,2BAA2B,GAAG,WAAW,CAAC;AAEvD;;;;GAIG;AACU,QAAA,qBAAqB,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;AAE1E,wDAAwD;AAC3C,QAAA,gBAAgB,GAAG,iCAAyB,CAAC;AAE1D,8EAA8E;AAC9E,MAAM,MAAM,GAA4C;IACtD,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,SAAS;CACjB,CAAC;AAEF,MAAM,QAAQ,GAA8C;IAC1D,GAAG,EAAE,OAAO;IACZ,KAAK,EAAE,OAAO;CACf,CAAC;AAEF,uEAAuE;AACvE,MAAM,gBAAgB,GAAyC;IAC7D,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;CACnB,CAAC;AAEF,MAAM,gCAAgC,GAAG,UAAU,CAAC;AACpD,MAAM,
|
|
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":";AAAA;;;GAGG;;;AAEH,6CAAyC;AACzC,mDAQyB;AACzB,mCAAiF;AACjF,mEAIqC;
|
|
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":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAO1D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EACL,iBAAiB,EAOjB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,iBAAiB,EAGjB,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;
|
|
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
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
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(
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
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 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-manager.js","sourceRoot":"","sources":["../../src/cliproxy/binary-manager.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAC7B,oCAAyC;AACzC,gEAAsD;AACtD,wDAA6D;AAE7D,kEAKoC;AACpC,gFAA+D;AAC/D,oDAAsD;AAEtD,qCAgBkB;
|
|
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":"extended-context-config.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/extended-context-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"extended-context-config.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/extended-context-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAejD,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElE;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,uBAAuB,CAAC,EAAE,OAAO,GAChC,OAAO,CAsBT;AAmCD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,QAAQ,EAAE,gBAAgB,EAC1B,uBAAuB,CAAC,EAAE,OAAO,GAChC,IAAI,CA6CN"}
|
|
@@ -49,6 +49,37 @@ function shouldApplyExtendedContext(provider, modelId, extendedContextOverride)
|
|
|
49
49
|
return false;
|
|
50
50
|
}
|
|
51
51
|
exports.shouldApplyExtendedContext = shouldApplyExtendedContext;
|
|
52
|
+
/**
|
|
53
|
+
* Whether a saved Anthropic tier mapping still carries a [1m] suffix after the
|
|
54
|
+
* per-key pass, i.e. the launch is a long-context launch.
|
|
55
|
+
*/
|
|
56
|
+
function hasSavedLongContextTier(envVars) {
|
|
57
|
+
return extended_context_utils_1.ANTHROPIC_MODEL_ENV_KEYS.some((key) => {
|
|
58
|
+
const value = envVars[key];
|
|
59
|
+
return typeof value === 'string' && (0, extended_context_utils_1.hasExtendedContextSuffix)(value);
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Give a long-context launch a fable tier when the profile does not map one.
|
|
64
|
+
*
|
|
65
|
+
* Claude Code falls back to its own bare Fable id for `--model fable` / the
|
|
66
|
+
* fable tier, and behind a proxy base URL a bare natively-1M id is clamped to
|
|
67
|
+
* the standard 200k window. Only the [1m] suffix lifts that clamp, so a
|
|
68
|
+
* model-neutral claude profile that asked for 1M elsewhere would otherwise get
|
|
69
|
+
* a 200k Fable. An explicit mapping (dashboard "fable tier" field or settings
|
|
70
|
+
* file) always wins; providers without a catalog Fable model are untouched.
|
|
71
|
+
*/
|
|
72
|
+
function fillFableTierForLongContext(envVars, provider) {
|
|
73
|
+
const existing = envVars.ANTHROPIC_DEFAULT_FABLE_MODEL;
|
|
74
|
+
if (typeof existing === 'string' && existing.trim().length > 0) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
const fableModel = (0, model_catalog_1.getDefaultFableTierModel)(provider);
|
|
78
|
+
if (!fableModel || !(0, model_catalog_1.supportsExtendedContext)(provider, fableModel)) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
envVars.ANTHROPIC_DEFAULT_FABLE_MODEL = (0, extended_context_utils_1.applyExtendedContextSuffix)(fableModel);
|
|
82
|
+
}
|
|
52
83
|
/**
|
|
53
84
|
* Apply extended context configuration to env vars.
|
|
54
85
|
* Modifies ANTHROPIC_MODEL and tier models with [1m] suffix.
|
|
@@ -62,13 +93,16 @@ function applyExtendedContextConfig(envVars, provider, extendedContextOverride)
|
|
|
62
93
|
Object.assign(envVars, (0, extended_context_utils_1.applyExtendedContextPreferenceToAnthropicModels)(envVars, extendedContextOverride, {
|
|
63
94
|
supportsExtendedContext: (modelId) => shouldApplyExtendedContext(provider, (0, extended_context_utils_1.stripModelConfigurationSuffixes)(modelId), extendedContextOverride),
|
|
64
95
|
}));
|
|
96
|
+
if (extendedContextOverride) {
|
|
97
|
+
fillFableTierForLongContext(envVars, provider);
|
|
98
|
+
}
|
|
65
99
|
return;
|
|
66
100
|
}
|
|
67
101
|
// Auto mode (no explicit --1m/--no-1m this launch): don't force-strip a
|
|
68
102
|
// previously saved [1m] preference just because the model is Claude — only
|
|
69
103
|
// strip when the model no longer supports extended context. Native Gemini
|
|
70
104
|
// models still get auto-toggled based on catalog support.
|
|
71
|
-
for (const key of extended_context_utils_1.
|
|
105
|
+
for (const key of extended_context_utils_1.EXTENDED_CONTEXT_MODEL_ENV_KEYS) {
|
|
72
106
|
const value = envVars[key];
|
|
73
107
|
if (typeof value !== 'string' || value.trim().length === 0) {
|
|
74
108
|
continue;
|
|
@@ -84,6 +118,9 @@ function applyExtendedContextConfig(envVars, provider, extendedContextOverride)
|
|
|
84
118
|
envVars[key] = (0, extended_context_utils_1.stripExtendedContextSuffix)(value);
|
|
85
119
|
}
|
|
86
120
|
}
|
|
121
|
+
if (hasSavedLongContextTier(envVars)) {
|
|
122
|
+
fillFableTierForLongContext(envVars, provider);
|
|
123
|
+
}
|
|
87
124
|
}
|
|
88
125
|
exports.applyExtendedContextConfig = applyExtendedContextConfig;
|
|
89
126
|
//# sourceMappingURL=extended-context-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extended-context-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/extended-context-config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAGH,
|
|
1
|
+
{"version":3,"file":"extended-context-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/extended-context-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;
|
|
1
|
+
{"version":3,"file":"launch-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAkCH;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB;IAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA0BzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CA6C/C"}
|
|
@@ -50,6 +50,7 @@ const fs = __importStar(require("fs"));
|
|
|
50
50
|
const os = __importStar(require("os"));
|
|
51
51
|
const path = __importStar(require("path"));
|
|
52
52
|
const shell_executor_1 = require("../../utils/shell-executor");
|
|
53
|
+
const extended_context_utils_1 = require("../../shared/extended-context-utils");
|
|
53
54
|
// SIBLING HELPER: src/utils/openai-compat-launch-settings.ts solves the same
|
|
54
55
|
// "persisted --settings env clobbers runtime routing env" problem by STRIPPING
|
|
55
56
|
// routing keys (process env wins by absence). This module instead OVERLAYS the
|
|
@@ -60,9 +61,15 @@ const shell_executor_1 = require("../../utils/shell-executor");
|
|
|
60
61
|
* Environment keys that control provider routing/model selection and are read
|
|
61
62
|
* by Claude from the settings `env` block. These must reflect the resolved
|
|
62
63
|
* proxy-chain environment, not the persisted on-disk values. Reuses the
|
|
63
|
-
* canonical routing/model key lists from shell-executor
|
|
64
|
+
* canonical routing/model key lists from shell-executor, plus the extra model
|
|
65
|
+
* keys the [1m] preference manages (subagent + startup default): a saved bare
|
|
66
|
+
* value there would otherwise clobber the resolved --1m/--no-1m result.
|
|
64
67
|
*/
|
|
65
|
-
const ROUTING_ENV_KEYS = [
|
|
68
|
+
const ROUTING_ENV_KEYS = [
|
|
69
|
+
...shell_executor_1.ANTHROPIC_ROUTING_ENV_KEYS,
|
|
70
|
+
...shell_executor_1.ANTHROPIC_MODEL_ENV_KEYS,
|
|
71
|
+
...extended_context_utils_1.EXTRA_EXTENDED_CONTEXT_MODEL_ENV_KEYS,
|
|
72
|
+
];
|
|
66
73
|
function isRecord(value) {
|
|
67
74
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
68
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,uCAAyB;AACzB,2CAA6B;AAE7B,+DAAkG;
|
|
1
|
+
{"version":3,"file":"launch-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/launch-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,6 +123,12 @@ export declare function supportsThinking(provider: CLIProxyProvider, modelId: st
|
|
|
123
123
|
* Returns true if model has extendedContext: true in catalog.
|
|
124
124
|
*/
|
|
125
125
|
export declare function supportsExtendedContext(provider: CLIProxyProvider, modelId: string): boolean;
|
|
126
|
+
/**
|
|
127
|
+
* Catalog model that backs the Claude Code `fable` tier for a provider.
|
|
128
|
+
* The catalog lists the newest Fable first, so the first match is the default.
|
|
129
|
+
* Returns undefined for providers that serve no Fable model.
|
|
130
|
+
*/
|
|
131
|
+
export declare function getDefaultFableTierModel(provider: CLIProxyProvider): string | undefined;
|
|
126
132
|
/**
|
|
127
133
|
* Check if a model can read image inputs natively.
|
|
128
134
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../src/cliproxy/model-catalog.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAchD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,wFAAwF;IACxF,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IACnC,8CAA8C;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,iFAAiF;IACjF,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;IACnE,gDAAgD;IAChD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,6FAA6F;IAC7F,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,CAAC;IAChC,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kCAAkC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iCAAiC;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,8EAA8E;IAC9E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../src/cliproxy/model-catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* Models are mapped to their internal names used by the proxy backend.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.isNativeGeminiModel = exports.supportsNativeImageInput = exports.supportsExtendedContext = exports.supportsThinking = exports.getModelMaxLevel = exports.getModelThinkingSupport = exports.getModelDeprecationReason = exports.isModelDeprecated = exports.getModelIssueUrl = exports.isModelBroken = exports.findModel = exports.getSuggestedReplacementModel = exports.getProviderCatalog = exports.supportsModelConfig = exports.MODEL_CATALOG = void 0;
|
|
9
|
+
exports.isNativeGeminiModel = exports.supportsNativeImageInput = exports.getDefaultFableTierModel = exports.supportsExtendedContext = exports.supportsThinking = exports.getModelMaxLevel = exports.getModelThinkingSupport = exports.getModelDeprecationReason = exports.isModelDeprecated = exports.getModelIssueUrl = exports.isModelBroken = exports.findModel = exports.getSuggestedReplacementModel = exports.getProviderCatalog = exports.supportsModelConfig = exports.MODEL_CATALOG = void 0;
|
|
10
10
|
const model_id_normalizer_1 = require("./ai-providers/model-id-normalizer");
|
|
11
11
|
const agy_gemini_pro_compatibility_1 = require("../shared/agy-gemini-pro-compatibility");
|
|
12
12
|
const extended_context_utils_1 = require("../shared/extended-context-utils");
|
|
@@ -250,6 +250,17 @@ exports.MODEL_CATALOG = {
|
|
|
250
250
|
description: 'Fast coding model for agentic software engineering workflows',
|
|
251
251
|
contextWindow: 256000,
|
|
252
252
|
},
|
|
253
|
+
{
|
|
254
|
+
id: 'grok-4.6',
|
|
255
|
+
name: 'Grok 4.6',
|
|
256
|
+
description: "SpaceXAI's smartest model built for long-running agents, interactive and visual work.",
|
|
257
|
+
contextWindow: 500000,
|
|
258
|
+
thinking: {
|
|
259
|
+
type: 'levels',
|
|
260
|
+
levels: ['low', 'medium', 'high', 'xhigh'],
|
|
261
|
+
zeroAllowed: false,
|
|
262
|
+
},
|
|
263
|
+
},
|
|
253
264
|
{
|
|
254
265
|
id: 'grok-4.5',
|
|
255
266
|
name: 'Grok 4.5',
|
|
@@ -446,10 +457,27 @@ exports.MODEL_CATALOG = {
|
|
|
446
457
|
},
|
|
447
458
|
extendedContext: true,
|
|
448
459
|
},
|
|
460
|
+
{
|
|
461
|
+
id: 'claude-fable-5-1',
|
|
462
|
+
name: 'Claude Fable 5.1',
|
|
463
|
+
description: 'Most powerful model (1M context, 128K output)',
|
|
464
|
+
contextWindow: 1000000,
|
|
465
|
+
nativeImageInput: true,
|
|
466
|
+
// Thinking is always on and cannot be disabled: Anthropic rejects both
|
|
467
|
+
// `thinking.type: "disabled"` and manual budget_tokens with 400. Depth is
|
|
468
|
+
// steered only through effort levels (default `high`).
|
|
469
|
+
thinking: {
|
|
470
|
+
type: 'levels',
|
|
471
|
+
levels: ['low', 'medium', 'high', 'xhigh', 'max'],
|
|
472
|
+
maxLevel: 'max',
|
|
473
|
+
dynamicAllowed: true,
|
|
474
|
+
},
|
|
475
|
+
extendedContext: true,
|
|
476
|
+
},
|
|
449
477
|
{
|
|
450
478
|
id: 'claude-fable-5',
|
|
451
479
|
name: 'Claude Fable 5',
|
|
452
|
-
description: '
|
|
480
|
+
description: 'Previous most powerful model',
|
|
453
481
|
contextWindow: 1000000,
|
|
454
482
|
nativeImageInput: true,
|
|
455
483
|
// New tier above Opus. Same adaptive-thinking surface as Opus 4.8:
|
|
@@ -741,6 +769,18 @@ function supportsExtendedContext(provider, modelId) {
|
|
|
741
769
|
return model?.extendedContext === true;
|
|
742
770
|
}
|
|
743
771
|
exports.supportsExtendedContext = supportsExtendedContext;
|
|
772
|
+
/**
|
|
773
|
+
* Catalog model that backs the Claude Code `fable` tier for a provider.
|
|
774
|
+
* The catalog lists the newest Fable first, so the first match is the default.
|
|
775
|
+
* Returns undefined for providers that serve no Fable model.
|
|
776
|
+
*/
|
|
777
|
+
function getDefaultFableTierModel(provider) {
|
|
778
|
+
const catalog = exports.MODEL_CATALOG[provider];
|
|
779
|
+
if (!catalog)
|
|
780
|
+
return undefined;
|
|
781
|
+
return catalog.models.find((model) => model.id.toLowerCase().startsWith('claude-fable-'))?.id;
|
|
782
|
+
}
|
|
783
|
+
exports.getDefaultFableTierModel = getDefaultFableTierModel;
|
|
744
784
|
/**
|
|
745
785
|
* Check if a model can read image inputs natively.
|
|
746
786
|
*/
|