@kaitranntt/ccs 8.9.0 → 8.10.0-dev.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -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/ai-providers/codex-plan-compatibility.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js +10 -8
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts +11 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +61 -21
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.js +5 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.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/config/thinking-config.d.ts.map +1 -1
- package/dist/cliproxy/config/thinking-config.js +5 -5
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +1 -1
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +2 -1
- package/dist/cliproxy/executor/index.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 +7 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +140 -11
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/proxy/tool-sanitization-proxy.d.ts.map +1 -1
- package/dist/cliproxy/proxy/tool-sanitization-proxy.js +3 -1
- package/dist/cliproxy/proxy/tool-sanitization-proxy.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/cliproxy/types/config-types.d.ts +3 -0
- package/dist/cliproxy/types/config-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/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.js +5 -1
- package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
- package/dist/cursor/cursor-daemon.d.ts.map +1 -1
- package/dist/cursor/cursor-daemon.js +7 -4
- package/dist/cursor/cursor-daemon.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/dispatcher/flows/cliproxy-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/cliproxy-flow.js +1 -0
- package/dist/dispatcher/flows/cliproxy-flow.js.map +1 -1
- package/dist/dispatcher/flows/settings-flow.d.ts.map +1 -1
- package/dist/dispatcher/flows/settings-flow.js +3 -1
- package/dist/dispatcher/flows/settings-flow.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/management/shared-manager/plugin-metadata-normalizer.d.ts.map +1 -1
- package/dist/management/shared-manager/plugin-metadata-normalizer.js +72 -21
- package/dist/management/shared-manager/plugin-metadata-normalizer.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-lb7IJ7fS.js} +1 -1
- package/dist/ui/assets/{accounts-DMMNI7g4.js → accounts-BmdjkRdd.js} +1 -1
- package/dist/ui/assets/{alert-dialog-BIWuuEiP.js → alert-dialog-QI7ssXmW.js} +1 -1
- package/dist/ui/assets/{api-BKTghVxS.js → api-yR-jnOTk.js} +1 -1
- package/dist/ui/assets/{auth-section-BKDcPs0P.js → auth-section-UKobnpsa.js} +1 -1
- package/dist/ui/assets/{backups-section-DB1N4X1P.js → backups-section-Bje38hdS.js} +1 -1
- package/dist/ui/assets/{channels-dhk_rRcA.js → channels-CIcZH84-.js} +1 -1
- package/dist/ui/assets/{checkbox-h1pwW_6m.js → checkbox-kTCwj4DC.js} +1 -1
- package/dist/ui/assets/{claude-extension-WLOGl6eK.js → claude-extension-DFIM_obP.js} +1 -1
- package/dist/ui/assets/cliproxy-CnK8Pxlp.js +4 -0
- package/dist/ui/assets/{cliproxy-ai-providers-DVkAmHVF.js → cliproxy-ai-providers-CrszOINU.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-D25OT5u5.js → cliproxy-control-panel-DkZ0lSNm.js} +1 -1
- package/dist/ui/assets/{codex-Bqc25al7.js → codex-BhDm5zRh.js} +1 -1
- package/dist/ui/assets/{confirm-dialog-BnAIV9ZB.js → confirm-dialog-60zCksm4.js} +1 -1
- package/dist/ui/assets/{copilot-BdjZjuRs.js → copilot-DYNOTCn0.js} +1 -1
- package/dist/ui/assets/{cursor-DTbIQ-d7.js → cursor-Cf9xEm7_.js} +1 -1
- package/dist/ui/assets/{droid-DAjrpAjP.js → droid-D-hRvXnW.js} +1 -1
- package/dist/ui/assets/{globalenv-section-BzirfKtN.js → globalenv-section-CiMNWxaM.js} +1 -1
- package/dist/ui/assets/{health-CDCop1Et.js → health-SNz-VyXt.js} +1 -1
- package/dist/ui/assets/{index-vdkPayvk.js → index-B2-0piAo.js} +1 -1
- package/dist/ui/assets/{index-B4yjQknk.js → index-BFSwIiWI.js} +36 -36
- package/dist/ui/assets/{index-bC8F80OC.js → index-BFVDO-nS.js} +1 -1
- package/dist/ui/assets/{index-Dkee4NQG.js → index-CHFm1Cvg.js} +1 -1
- package/dist/ui/assets/{index-DMGiMF5C.js → index-D4duw9yj.js} +1 -1
- package/dist/ui/assets/{index-BhGdNER3.js → index-OcUP97hO.js} +1 -1
- package/dist/ui/assets/{index-BF4hYrQf.js → index-eT0MCNwt.js} +1 -1
- package/dist/ui/assets/{logs-Bb1BaiFq.js → logs-CMuCN17Z.js} +1 -1
- package/dist/ui/assets/{masked-input-DxWhb6sQ.js → masked-input-BwaApqdO.js} +1 -1
- package/dist/ui/assets/proxy-status-widget-BeAaBd0j.js +1 -0
- package/dist/ui/assets/{raw-json-settings-editor-panel-BeZJbsnO.js → raw-json-settings-editor-panel-QE0I9KQE.js} +1 -1
- package/dist/ui/assets/{searchable-select-CcXdAHJm.js → searchable-select-C_K2MS5j.js} +1 -1
- package/dist/ui/assets/{separator-O1g2RdCE.js → separator-D7Dw51fp.js} +1 -1
- package/dist/ui/assets/{shared-Ct6UqE0N.js → shared-CaL1210c.js} +1 -1
- package/dist/ui/assets/{table-D4ZJKsoh.js → table-BTmymca2.js} +1 -1
- package/dist/ui/assets/{updates-jnNBispr.js → updates-QvH7D5Ap.js} +1 -1
- package/dist/ui/assets/{use-accounts-DXwh5f2t.js → use-accounts-Cgk1IgNc.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/openai-compat-launch-settings.d.ts +11 -1
- package/dist/utils/openai-compat-launch-settings.d.ts.map +1 -1
- package/dist/utils/openai-compat-launch-settings.js +55 -5
- package/dist/utils/openai-compat-launch-settings.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 +126 -11
- 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/dist/web-server/usage/aggregator.d.ts.map +1 -1
- package/dist/web-server/usage/aggregator.js +36 -2
- package/dist/web-server/usage/aggregator.js.map +1 -1
- package/package.json +4 -1
- package/scripts/dev-release.sh +1 -1
- package/dist/ui/assets/cliproxy-CE_mZIGU.js +0 -4
- package/dist/ui/assets/proxy-status-widget-Dj_46CdP.js +0 -1
|
@@ -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":"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;AAK/C,eAAO,MAAM,0BAA0B,kCAAkC,CAAC;AAC1E,eAAO,MAAM,mCAAmC,kDAAkD,CAAC;AACnG,eAAO,MAAM,sBAAsB,kDAAkD,CAAC;AACtF,eAAO,MAAM,0BAA0B,kDAAkD,CAAC;AAuC1F,wBAAgB,gCAAgC,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAS1E;AAED,UAAU,0BAA0B;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,wBAAgB,6BAA6B,CAAC,iBAAiB,EAAE,eAAe,GAAG,IAAI,CActF;AAED,wBAAgB,mBAAmB,CACjC,OAAO,GAAE,eAAiC,EAC1C,OAAO,GAAE,0BAA+B,GACvC,eAAe,CAejB;AAWD,wBAAgB,0BAA0B,IAAI,eAAe,CAE5D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,0BAA+B,GAAG,eAAe,CAE9F;AAWD,wBAAsB,gCAAgC,CAAC,CAAC,EACtD,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAC1B,OAAO,CAAC,CAAC,CAAC,CAGZ;AAmBD;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,OAAO,CAAkB;gBAErB,MAAM,GAAE,OAAO,CAAC,mBAAmB,CAAM,EAAE,OAAO,CAAC,EAAE,eAAe;IAOhF,2EAA2E;IACrE,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,2EAA2E;IACrE,eAAe,IAAI,OAAO,CAAC,iBAAiB,CAAC;IASnD,yCAAyC;IACzC,aAAa,IAAI,MAAM;IAIvB,6BAA6B;IAC7B,iBAAiB,IAAI,OAAO;IAI5B,mCAAmC;IAC7B,aAAa,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAIjD,+CAA+C;IAC/C,YAAY,IAAI,IAAI;CAGrB;AAED,MAAM,WAAW,2BAA2B;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,kDAAkD;AAClD,wBAAsB,oBAAoB,CACxC,OAAO,UAAQ,EACf,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAAC,MAAM,CAAC,CA6BjB;AAED,+CAA+C;AAC/C,wBAAgB,mBAAmB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAItE;AAED,kDAAkD;AAClD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAIjE;AAED,2DAA2D;AAC3D,wBAAgB,2BAA2B,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,MAAM,CAO7E;AAED,UAAU,0BAA0B;IAClC,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,EACpC,OAAO,EAAE,eAAe,KACrB,IAAI,CAAC,aAAa,EAAE,mBAAmB,GAAG,cAAc,GAAG,cAAc,CAAC,CAAC;IAChF,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,eAAe,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,2BAA2B,CAAC;IACzD,0BAA0B,CAAC,EAAE,OAAO,gCAAgC,CAAC;CACtE;AAED,gDAAgD;AAChD,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,OAAO,UAAQ,EACf,OAAO,CAAC,EAAE,eAAe,EACzB,IAAI,GAAE,0BAA+B,GACpC,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED,2DAA2D;AAC3D,wBAAsB,0BAA0B,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAK3F;AAED,2CAA2C;AAC3C,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IAErB,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,2CAA2C;AAC3C,wBAAsB,mBAAmB,CACvC,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,yBAAyB,CAAC,CAsBpC;AAGD,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,iBAAiB,GAClB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -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":"thinking-config.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAQxE,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"thinking-config.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAQxE,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AA6CpD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAMhE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEzF;AAkDD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,cAAc,GAC7B,MAAM,CAiBR;AAED;;GAEG;AACH,UAAU,qBAAqB;IAC7B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,EAClC,qBAAqB,CAAC,EAAE;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EACD,cAAc,CAAC,EAAE;IACf,IAAI,CAAC,EAAE,qBAAqB,CAAC;IAC7B,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,KAAK,CAAC,EAAE,qBAAqB,CAAC;CAC/B,GACA,MAAM,CAAC,UAAU,CAqJnB"}
|
|
@@ -11,9 +11,9 @@ const thinking_validator_1 = require("../thinking-validator");
|
|
|
11
11
|
const model_id_normalizer_1 = require("../ai-providers/model-id-normalizer");
|
|
12
12
|
const ui_1 = require("../../utils/ui");
|
|
13
13
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
14
|
-
const CODEX_EFFORT_REGEX = /^(minimal|low|medium|high|xhigh)$/i;
|
|
15
|
-
const CODEX_FAST_TUNING_VALUE_REGEX = /^(?:(minimal|low|medium|high|xhigh)-fast|fast-(minimal|low|medium|high|xhigh)|fast)$/i;
|
|
16
|
-
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:minimal|low|medium|high|xhigh)(?:-fast)?|-fast(?:-(?:minimal|low|medium|high|xhigh))?)$/i;
|
|
14
|
+
const CODEX_EFFORT_REGEX = /^(none|minimal|low|medium|high|xhigh|max)$/i;
|
|
15
|
+
const CODEX_FAST_TUNING_VALUE_REGEX = /^(?:(none|minimal|low|medium|high|xhigh|max)-fast|fast-(none|minimal|low|medium|high|xhigh|max)|fast)$/i;
|
|
16
|
+
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:none|minimal|low|medium|high|xhigh|max)(?:-fast)?|-fast(?:-(?:none|minimal|low|medium|high|xhigh|max))?)$/i;
|
|
17
17
|
/**
|
|
18
18
|
* Normalize model ID for provider capability lookup.
|
|
19
19
|
* Codex may carry effort/service-tier suffixes in legacy "(high)" or current "-high-fast" forms.
|
|
@@ -24,12 +24,12 @@ function normalizeModelForThinkingLookup(model, provider) {
|
|
|
24
24
|
if (provider !== 'codex')
|
|
25
25
|
return providerNormalized;
|
|
26
26
|
// New codex suffix forms: gpt-5.4-low-fast, gpt-5.4-fast-high -> gpt-5.4
|
|
27
|
-
const codexSuffixMatch = providerNormalized.match(/^(.*?)(?:-(?:minimal|low|medium|high|xhigh)(?:-fast)?|-fast(?:-(?:minimal|low|medium|high|xhigh))?)$/i);
|
|
27
|
+
const codexSuffixMatch = providerNormalized.match(/^(.*?)(?:-(?:none|minimal|low|medium|high|xhigh|max)(?:-fast)?|-fast(?:-(?:none|minimal|low|medium|high|xhigh|max))?)$/i);
|
|
28
28
|
if (codexSuffixMatch?.[1]) {
|
|
29
29
|
return codexSuffixMatch[1].trim();
|
|
30
30
|
}
|
|
31
31
|
// Legacy codex suffix form: gpt-5.3-codex(high) -> gpt-5.3-codex
|
|
32
|
-
const codexLegacyMatch = providerNormalized.match(/^(.*)\((minimal|low|medium|high|xhigh)\)$/i);
|
|
32
|
+
const codexLegacyMatch = providerNormalized.match(/^(.*)\((none|minimal|low|medium|high|xhigh|max)\)$/i);
|
|
33
33
|
if (codexLegacyMatch?.[1]) {
|
|
34
34
|
return codexLegacyMatch[1].trim();
|
|
35
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,4EAAmF;AAGnF,oDAA6E;AAC7E,8DAA6E;AAC7E,6EAAkF;AAClF,uCAAsC;AACtC,4EAAsE;AAKtE,MAAM,kBAAkB,GAAG,
|
|
1
|
+
{"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ const defaultCliproxyImageAnalysisDeps = {
|
|
|
53
53
|
resolveImageAnalysisRuntimeStatus: image_analysis_runtime_status_1.resolveImageAnalysisRuntimeStatus,
|
|
54
54
|
getLocalRuntimeApiKey: auth_token_manager_1.getEffectiveApiKey,
|
|
55
55
|
};
|
|
56
|
-
const CODEX_EFFORT_SUFFIX_REGEX = /^(.*)-(minimal|low|medium|high|xhigh)$/i;
|
|
56
|
+
const CODEX_EFFORT_SUFFIX_REGEX = /^(.*)-(none|minimal|low|medium|high|xhigh|max)$/i;
|
|
57
57
|
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
|
|
58
58
|
function normalizeCodexModelForDirectUpstream(model) {
|
|
59
59
|
const withoutExtendedContext = model.trim().replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '').trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,iEAMoC;AACpC,+EAA+E;AAG/E,+FAIuD;AACvD,mGAAoG;AACpG,iHAAqG;AACrG,mGAAuF;AACvF,+DAAiF;AAIjF,6EAG6C;AAE7C,mEAAgE;AAChE,+CAA+D;AAC/D,6DAAqE;AAoErE,MAAM,gCAAgC,GAA8B;IAClE,uBAAuB,EAAvB,qDAAuB;IACvB,2BAA2B,EAA3B,kEAA2B;IAC3B,oBAAoB,EAApB,oDAAoB;IACpB,iCAAiC,EAAjC,iEAAiC;IACjC,qBAAqB,EAAE,uCAAkB;CAC1C,CAAC;AAEF,MAAM,yBAAyB,GAAG,
|
|
1
|
+
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.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;AAeH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB5D,OAAO,EACL,mCAAmC,IAAI,oCAAoC,EAE5E,MAAM,sBAAsB,CAAC;AA+C9B;;;;;;;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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAeH,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB5D,OAAO,EACL,mCAAmC,IAAI,oCAAoC,EAE5E,MAAM,sBAAsB,CAAC;AA+C9B;;;;;;;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,CAsef;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIzE,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnG,OAAO,EAAE,mCAAmC,IAAI,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAEnH,eAAO,MAAM,aAAa;;CAEzB,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
@@ -114,9 +114,10 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
114
114
|
cfg,
|
|
115
115
|
log,
|
|
116
116
|
});
|
|
117
|
-
const { browserLaunchOverride, argsWithoutBrowserFlags, parseFailed: browserLaunchParseFailed, } = (0, browser_launch_setup_1.resolveBrowserLaunchFlags)(proxyResolution.argsWithoutProxy);
|
|
117
|
+
const { browserLaunchOverride: argsBrowserLaunchOverride, argsWithoutBrowserFlags, parseFailed: browserLaunchParseFailed, } = (0, browser_launch_setup_1.resolveBrowserLaunchFlags)(proxyResolution.argsWithoutProxy);
|
|
118
118
|
if (browserLaunchParseFailed)
|
|
119
119
|
return;
|
|
120
|
+
const browserLaunchOverride = cfg.browserLaunchOverride ?? argsBrowserLaunchOverride;
|
|
120
121
|
const { proxyConfig, useRemoteProxy, localBackend, binaryPath, argsWithoutProxy } = await (0, proxy_resolver_1.resolveExecutorProxy)(proxyResolution, {
|
|
121
122
|
unifiedConfig,
|
|
122
123
|
allProviders,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.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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"}
|
|
@@ -19,7 +19,7 @@ export interface ThinkingSupport {
|
|
|
19
19
|
/** Valid level names (for levels type) */
|
|
20
20
|
levels?: string[];
|
|
21
21
|
/** Maximum reasoning effort level (caps effort at this level for levels type) */
|
|
22
|
-
maxLevel?: 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
|
|
22
|
+
maxLevel?: 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
|
|
23
23
|
/** Whether zero/disabled thinking is allowed */
|
|
24
24
|
zeroAllowed?: boolean;
|
|
25
25
|
/** Whether dynamic/auto thinking is allowed */
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../../src/cliproxy/model-catalog.ts"],"names":[],"mappings":"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"}
|