@kaitranntt/ccs 7.42.0 → 7.43.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.
Files changed (211) hide show
  1. package/config/base-glm.settings.json +4 -4
  2. package/config/base-glmt.settings.json +4 -4
  3. package/config/base-ollama-cloud.settings.json +2 -2
  4. package/dist/api/services/profile-reader.d.ts.map +1 -1
  5. package/dist/api/services/profile-reader.js +4 -1
  6. package/dist/api/services/profile-reader.js.map +1 -1
  7. package/dist/api/services/provider-presets.js +4 -4
  8. package/dist/api/services/provider-presets.js.map +1 -1
  9. package/dist/auth/profile-detector.d.ts +14 -3
  10. package/dist/auth/profile-detector.d.ts.map +1 -1
  11. package/dist/auth/profile-detector.js +35 -15
  12. package/dist/auth/profile-detector.js.map +1 -1
  13. package/dist/ccs.js +12 -1
  14. package/dist/ccs.js.map +1 -1
  15. package/dist/cliproxy/composite-validator.d.ts +20 -0
  16. package/dist/cliproxy/composite-validator.d.ts.map +1 -0
  17. package/dist/cliproxy/composite-validator.js +85 -0
  18. package/dist/cliproxy/composite-validator.js.map +1 -0
  19. package/dist/cliproxy/config/env-builder.d.ts +24 -0
  20. package/dist/cliproxy/config/env-builder.d.ts.map +1 -1
  21. package/dist/cliproxy/config/env-builder.js +72 -1
  22. package/dist/cliproxy/config/env-builder.js.map +1 -1
  23. package/dist/cliproxy/config/thinking-config.d.ts +19 -2
  24. package/dist/cliproxy/config/thinking-config.d.ts.map +1 -1
  25. package/dist/cliproxy/config/thinking-config.js +59 -9
  26. package/dist/cliproxy/config/thinking-config.js.map +1 -1
  27. package/dist/cliproxy/executor/env-resolver.d.ts +16 -0
  28. package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
  29. package/dist/cliproxy/executor/env-resolver.js +82 -26
  30. package/dist/cliproxy/executor/env-resolver.js.map +1 -1
  31. package/dist/cliproxy/executor/index.d.ts.map +1 -1
  32. package/dist/cliproxy/executor/index.js +147 -34
  33. package/dist/cliproxy/executor/index.js.map +1 -1
  34. package/dist/cliproxy/executor/retry-handler.d.ts +11 -0
  35. package/dist/cliproxy/executor/retry-handler.d.ts.map +1 -1
  36. package/dist/cliproxy/executor/retry-handler.js +30 -1
  37. package/dist/cliproxy/executor/retry-handler.js.map +1 -1
  38. package/dist/cliproxy/provider-capabilities.d.ts +22 -0
  39. package/dist/cliproxy/provider-capabilities.d.ts.map +1 -0
  40. package/dist/cliproxy/provider-capabilities.js +95 -0
  41. package/dist/cliproxy/provider-capabilities.js.map +1 -0
  42. package/dist/cliproxy/remote-auth-fetcher.d.ts.map +1 -1
  43. package/dist/cliproxy/remote-auth-fetcher.js +3 -26
  44. package/dist/cliproxy/remote-auth-fetcher.js.map +1 -1
  45. package/dist/cliproxy/services/index.d.ts +1 -1
  46. package/dist/cliproxy/services/index.d.ts.map +1 -1
  47. package/dist/cliproxy/services/index.js +3 -1
  48. package/dist/cliproxy/services/index.js.map +1 -1
  49. package/dist/cliproxy/services/variant-config-adapter.d.ts +15 -0
  50. package/dist/cliproxy/services/variant-config-adapter.d.ts.map +1 -1
  51. package/dist/cliproxy/services/variant-config-adapter.js +84 -11
  52. package/dist/cliproxy/services/variant-config-adapter.js.map +1 -1
  53. package/dist/cliproxy/services/variant-service.d.ts +26 -0
  54. package/dist/cliproxy/services/variant-service.d.ts.map +1 -1
  55. package/dist/cliproxy/services/variant-service.js +163 -9
  56. package/dist/cliproxy/services/variant-service.js.map +1 -1
  57. package/dist/cliproxy/services/variant-settings.d.ts +18 -0
  58. package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
  59. package/dist/cliproxy/services/variant-settings.js +126 -4
  60. package/dist/cliproxy/services/variant-settings.js.map +1 -1
  61. package/dist/cliproxy/types.d.ts +13 -0
  62. package/dist/cliproxy/types.d.ts.map +1 -1
  63. package/dist/cliproxy/types.js.map +1 -1
  64. package/dist/commands/api-command.js +1 -1
  65. package/dist/commands/api-command.js.map +1 -1
  66. package/dist/commands/cliproxy/auth-subcommand.d.ts.map +1 -1
  67. package/dist/commands/cliproxy/auth-subcommand.js +2 -1
  68. package/dist/commands/cliproxy/auth-subcommand.js.map +1 -1
  69. package/dist/commands/cliproxy/help-subcommand.d.ts.map +1 -1
  70. package/dist/commands/cliproxy/help-subcommand.js +2 -0
  71. package/dist/commands/cliproxy/help-subcommand.js.map +1 -1
  72. package/dist/commands/cliproxy/index.d.ts.map +1 -1
  73. package/dist/commands/cliproxy/index.js +4 -0
  74. package/dist/commands/cliproxy/index.js.map +1 -1
  75. package/dist/commands/cliproxy/variant-subcommand.d.ts +1 -0
  76. package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
  77. package/dist/commands/cliproxy/variant-subcommand.js +307 -3
  78. package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
  79. package/dist/commands/command-execution-contract.d.ts +23 -0
  80. package/dist/commands/command-execution-contract.d.ts.map +1 -0
  81. package/dist/commands/command-execution-contract.js +21 -0
  82. package/dist/commands/command-execution-contract.js.map +1 -0
  83. package/dist/commands/cursor-command.d.ts +12 -0
  84. package/dist/commands/cursor-command.d.ts.map +1 -0
  85. package/dist/commands/cursor-command.js +225 -0
  86. package/dist/commands/cursor-command.js.map +1 -0
  87. package/dist/commands/help-command.d.ts.map +1 -1
  88. package/dist/commands/help-command.js +16 -2
  89. package/dist/commands/help-command.js.map +1 -1
  90. package/dist/commands/shell-completion-command.d.ts +20 -0
  91. package/dist/commands/shell-completion-command.d.ts.map +1 -1
  92. package/dist/commands/shell-completion-command.js +45 -30
  93. package/dist/commands/shell-completion-command.js.map +1 -1
  94. package/dist/config/reserved-names.d.ts +1 -1
  95. package/dist/config/reserved-names.d.ts.map +1 -1
  96. package/dist/config/reserved-names.js +2 -0
  97. package/dist/config/reserved-names.js.map +1 -1
  98. package/dist/config/unified-config-loader.d.ts +6 -1
  99. package/dist/config/unified-config-loader.d.ts.map +1 -1
  100. package/dist/config/unified-config-loader.js +56 -2
  101. package/dist/config/unified-config-loader.js.map +1 -1
  102. package/dist/config/unified-config-types.d.ts +71 -2
  103. package/dist/config/unified-config-types.d.ts.map +1 -1
  104. package/dist/config/unified-config-types.js +27 -2
  105. package/dist/config/unified-config-types.js.map +1 -1
  106. package/dist/cursor/cursor-auth.d.ts +58 -0
  107. package/dist/cursor/cursor-auth.d.ts.map +1 -0
  108. package/dist/cursor/cursor-auth.js +295 -0
  109. package/dist/cursor/cursor-auth.js.map +1 -0
  110. package/dist/cursor/cursor-daemon.d.ts +47 -0
  111. package/dist/cursor/cursor-daemon.d.ts.map +1 -0
  112. package/dist/cursor/cursor-daemon.js +332 -0
  113. package/dist/cursor/cursor-daemon.js.map +1 -0
  114. package/dist/cursor/cursor-executor.d.ts +81 -0
  115. package/dist/cursor/cursor-executor.d.ts.map +1 -0
  116. package/dist/cursor/cursor-executor.js +821 -0
  117. package/dist/cursor/cursor-executor.js.map +1 -0
  118. package/dist/cursor/cursor-models.d.ts +43 -0
  119. package/dist/cursor/cursor-models.d.ts.map +1 -0
  120. package/dist/cursor/cursor-models.js +205 -0
  121. package/dist/cursor/cursor-models.js.map +1 -0
  122. package/dist/cursor/cursor-protobuf-decoder.d.ts +52 -0
  123. package/dist/cursor/cursor-protobuf-decoder.d.ts.map +1 -0
  124. package/dist/cursor/cursor-protobuf-decoder.js +311 -0
  125. package/dist/cursor/cursor-protobuf-decoder.js.map +1 -0
  126. package/dist/cursor/cursor-protobuf-encoder.d.ts +54 -0
  127. package/dist/cursor/cursor-protobuf-encoder.d.ts.map +1 -0
  128. package/dist/cursor/cursor-protobuf-encoder.js +173 -0
  129. package/dist/cursor/cursor-protobuf-encoder.js.map +1 -0
  130. package/dist/cursor/cursor-protobuf-schema.d.ts +215 -0
  131. package/dist/cursor/cursor-protobuf-schema.d.ts.map +1 -0
  132. package/dist/cursor/cursor-protobuf-schema.js +120 -0
  133. package/dist/cursor/cursor-protobuf-schema.js.map +1 -0
  134. package/dist/cursor/cursor-protobuf.d.ts +21 -0
  135. package/dist/cursor/cursor-protobuf.d.ts.map +1 -0
  136. package/dist/cursor/cursor-protobuf.js +116 -0
  137. package/dist/cursor/cursor-protobuf.js.map +1 -0
  138. package/dist/cursor/cursor-stream-parser.d.ts +52 -0
  139. package/dist/cursor/cursor-stream-parser.d.ts.map +1 -0
  140. package/dist/cursor/cursor-stream-parser.js +142 -0
  141. package/dist/cursor/cursor-stream-parser.js.map +1 -0
  142. package/dist/cursor/cursor-translator.d.ts +39 -0
  143. package/dist/cursor/cursor-translator.d.ts.map +1 -0
  144. package/dist/cursor/cursor-translator.js +118 -0
  145. package/dist/cursor/cursor-translator.js.map +1 -0
  146. package/dist/cursor/index.d.ts +11 -0
  147. package/dist/cursor/index.d.ts.map +1 -0
  148. package/dist/cursor/index.js +53 -0
  149. package/dist/cursor/index.js.map +1 -0
  150. package/dist/cursor/types.d.ts +81 -0
  151. package/dist/cursor/types.d.ts.map +1 -0
  152. package/dist/cursor/types.js +8 -0
  153. package/dist/cursor/types.js.map +1 -0
  154. package/dist/glmt/glmt-transformer.js +2 -2
  155. package/dist/glmt/glmt-transformer.js.map +1 -1
  156. package/dist/glmt/pipeline/response-builder.js +1 -1
  157. package/dist/glmt/pipeline/response-builder.js.map +1 -1
  158. package/dist/types/index.d.ts +1 -1
  159. package/dist/types/index.d.ts.map +1 -1
  160. package/dist/types/index.js.map +1 -1
  161. package/dist/ui/assets/{accounts-Cmy4B3s3.js → accounts-LXwFswMc.js} +1 -1
  162. package/dist/ui/assets/{alert-dialog-Ci3IwVRK.js → alert-dialog-BKnbIzpC.js} +1 -1
  163. package/dist/ui/assets/{api-CMJQo-ae.js → api-HGhC6kaG.js} +1 -1
  164. package/dist/ui/assets/{auth-section-xbPmGCHG.js → auth-section-bIz0VLWG.js} +1 -1
  165. package/dist/ui/assets/{backups-section-DMZ1siUW.js → backups-section-88UDFKsL.js} +1 -1
  166. package/dist/ui/assets/{cliproxy-ClHCRgW3.js → cliproxy-B0NpNh6D.js} +1 -1
  167. package/dist/ui/assets/{cliproxy-control-panel-CB1Wj0B3.js → cliproxy-control-panel-CAthBXkU.js} +1 -1
  168. package/dist/ui/assets/{confirm-dialog-7eg5natz.js → confirm-dialog-CSMCw8g2.js} +1 -1
  169. package/dist/ui/assets/{copilot-_ZU6nKEw.js → copilot-DZdFrnjR.js} +2 -2
  170. package/dist/ui/assets/{globalenv-section-D6DWcbDZ.js → globalenv-section-syugoJp7.js} +1 -1
  171. package/dist/ui/assets/{health-Dpl0okvg.js → health-DBytaQTM.js} +1 -1
  172. package/dist/ui/assets/{index-D1CCnTcX.js → index-B0xeuj61.js} +1 -1
  173. package/dist/ui/assets/{index-PCZbkaIr.js → index-Bi2Er_0S.js} +4 -4
  174. package/dist/ui/assets/index-ByiEOnlQ.css +1 -0
  175. package/dist/ui/assets/index-C5-sLMSX.js +1 -0
  176. package/dist/ui/assets/{index-CkDRsX56.js → index-CPwZdoQy.js} +1 -1
  177. package/dist/ui/assets/{index-Ba3Snw9K.js → index-Cx9gKR-j.js} +1 -1
  178. package/dist/ui/assets/{proxy-status-widget-C2z2X6KL.js → proxy-status-widget-HwCcD2pD.js} +1 -1
  179. package/dist/ui/assets/{shared-B1dw-m4_.js → shared-B5G9CgzC.js} +1 -1
  180. package/dist/ui/assets/{switch-8IiokRDq.js → switch-wgNvGwAd.js} +1 -1
  181. package/dist/ui/index.html +2 -2
  182. package/dist/utils/config-manager.d.ts.map +1 -1
  183. package/dist/utils/config-manager.js +18 -7
  184. package/dist/utils/config-manager.js.map +1 -1
  185. package/dist/web-server/jsonl-parser.js +1 -1
  186. package/dist/web-server/jsonl-parser.js.map +1 -1
  187. package/dist/web-server/model-pricing.d.ts.map +1 -1
  188. package/dist/web-server/model-pricing.js +22 -16
  189. package/dist/web-server/model-pricing.js.map +1 -1
  190. package/dist/web-server/routes/account-routes.d.ts.map +1 -1
  191. package/dist/web-server/routes/account-routes.js +5 -11
  192. package/dist/web-server/routes/account-routes.js.map +1 -1
  193. package/dist/web-server/routes/cursor-routes.d.ts +6 -0
  194. package/dist/web-server/routes/cursor-routes.d.ts.map +1 -0
  195. package/dist/web-server/routes/cursor-routes.js +163 -0
  196. package/dist/web-server/routes/cursor-routes.js.map +1 -0
  197. package/dist/web-server/routes/cursor-settings-routes.d.ts +6 -0
  198. package/dist/web-server/routes/cursor-settings-routes.d.ts.map +1 -0
  199. package/dist/web-server/routes/cursor-settings-routes.js +171 -0
  200. package/dist/web-server/routes/cursor-settings-routes.js.map +1 -0
  201. package/dist/web-server/routes/index.d.ts.map +1 -1
  202. package/dist/web-server/routes/index.js +3 -0
  203. package/dist/web-server/routes/index.js.map +1 -1
  204. package/dist/web-server/routes/variant-routes.d.ts.map +1 -1
  205. package/dist/web-server/routes/variant-routes.js +107 -6
  206. package/dist/web-server/routes/variant-routes.js.map +1 -1
  207. package/package.json +5 -2
  208. package/scripts/hardening-inventory.js +526 -0
  209. package/scripts/maintainability-baseline.js +309 -0
  210. package/dist/ui/assets/index-C9MZ96Gj.js +0 -1
  211. package/dist/ui/assets/index-QvMpU4Lc.css +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"env-builder.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAkElE,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAEhF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,GACnC,MAAM,CAAC,UAAU,CAiCnB;AA6ED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,mBAAmB,CAAC,EAAE,wBAAwB,GAC7C,MAAM,CAAC,UAAU,CAkEnB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAmBvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7F,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmFxB"}
1
+ {"version":3,"file":"env-builder.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AA6DxE,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,oBAAoB,CAEhF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,GACnC,MAAM,CAAC,UAAU,CAiCnB;AA6ED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,mBAAmB,CAAC,EAAE,wBAAwB,GAC7C,MAAM,CAAC,UAAU,CAkEnB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAmBvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7F,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmFxB;AAED,qEAAqE;AACrE,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,EAC7F,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,EACxC,IAAI,GAAE,MAA8B,EACpC,kBAAkB,CAAC,EAAE,MAAM,EAC3B,YAAY,CAAC,EAAE,qBAAqB,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwExB"}
@@ -27,7 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
27
27
  return result;
28
28
  };
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
- exports.getRemoteEnvVars = exports.ensureProviderSettings = exports.getEffectiveEnvVars = exports.getClaudeEnvVars = exports.getModelMapping = void 0;
30
+ exports.getCompositeEnvVars = exports.getRemoteEnvVars = exports.ensureProviderSettings = exports.getEffectiveEnvVars = exports.getClaudeEnvVars = exports.getModelMapping = void 0;
31
31
  const fs = __importStar(require("fs"));
32
32
  const base_config_loader_1 = require("../base-config-loader");
33
33
  const unified_config_loader_1 = require("../../config/unified-config-loader");
@@ -356,4 +356,75 @@ function getRemoteEnvVars(provider, remoteConfig, customSettingsPath) {
356
356
  return env;
357
357
  }
358
358
  exports.getRemoteEnvVars = getRemoteEnvVars;
359
+ /**
360
+ * Get environment variables for composite variant.
361
+ * Uses root URL (no /api/provider/ path) for model-based routing.
362
+ * Each tier maps to a different provider's model, routed by CLIProxyAPI.
363
+ *
364
+ * @param tiers Per-tier provider+model mappings
365
+ * @param defaultTier Which tier ANTHROPIC_MODEL equals
366
+ * @param port Local CLIProxy port (ignored if remoteConfig provided)
367
+ * @param customSettingsPath Optional path to user's custom settings file
368
+ * @param remoteConfig Optional remote proxy config (overrides localhost URL/auth)
369
+ */
370
+ function getCompositeEnvVars(tiers, defaultTier, port = port_manager_1.CLIPROXY_DEFAULT_PORT, customSettingsPath, remoteConfig) {
371
+ const globalEnv = getGlobalEnvVars();
372
+ // Load user settings if provided (may contain additional env vars like hooks)
373
+ let additionalEnvVars = {};
374
+ if (customSettingsPath) {
375
+ const expandedPath = (0, helpers_1.expandPath)(customSettingsPath);
376
+ if (fs.existsSync(expandedPath)) {
377
+ try {
378
+ const content = fs.readFileSync(expandedPath, 'utf-8');
379
+ const settings = JSON.parse(content);
380
+ if (settings.env && typeof settings.env === 'object') {
381
+ // Extract non-core env vars (hooks, etc.)
382
+ const { ANTHROPIC_BASE_URL: _baseUrl, ANTHROPIC_AUTH_TOKEN: _authToken, ANTHROPIC_MODEL: _model, ANTHROPIC_DEFAULT_OPUS_MODEL: _opus, ANTHROPIC_DEFAULT_SONNET_MODEL: _sonnet, ANTHROPIC_DEFAULT_HAIKU_MODEL: _haiku, ...extra } = settings.env;
383
+ additionalEnvVars = extra;
384
+ }
385
+ }
386
+ catch {
387
+ // Invalid JSON — ignore
388
+ }
389
+ }
390
+ }
391
+ const validPort = (0, port_manager_1.validatePort)(port);
392
+ // Defensive: handle missing tiers gracefully
393
+ const opusModel = tiers.opus?.model;
394
+ const sonnetModel = tiers.sonnet?.model;
395
+ const haikuModel = tiers.haiku?.model;
396
+ const defaultModel = tiers[defaultTier]?.model;
397
+ // If default tier is missing, we cannot proceed meaningfully
398
+ if (!defaultModel) {
399
+ throw new Error(`Missing model for default tier '${defaultTier}'`);
400
+ }
401
+ // Determine base URL and auth token based on remote vs local mode
402
+ const baseUrl = remoteConfig
403
+ ? (() => {
404
+ const normalizedProtocol = (0, port_manager_1.normalizeProtocol)(remoteConfig.protocol);
405
+ const effectivePort = (0, port_manager_1.validateRemotePort)(remoteConfig.port) ?? (0, port_manager_1.getRemoteDefaultPort)(normalizedProtocol);
406
+ const standardWebPort = normalizedProtocol === 'https' ? 443 : 80;
407
+ const portSuffix = effectivePort === standardWebPort ? '' : `:${effectivePort}`;
408
+ return `${normalizedProtocol}://${remoteConfig.host}${portSuffix}`;
409
+ })()
410
+ : `http://127.0.0.1:${validPort}`;
411
+ const authToken = remoteConfig?.authToken ?? (0, auth_token_manager_1.getEffectiveApiKey)();
412
+ const env = {
413
+ ...globalEnv,
414
+ ...additionalEnvVars,
415
+ // Root URL — CLIProxyAPI routes based on model name in request body
416
+ ANTHROPIC_BASE_URL: baseUrl,
417
+ ANTHROPIC_AUTH_TOKEN: authToken,
418
+ ANTHROPIC_MODEL: defaultModel,
419
+ };
420
+ // Only set tier env vars if the tier exists
421
+ if (opusModel)
422
+ env.ANTHROPIC_DEFAULT_OPUS_MODEL = opusModel;
423
+ if (sonnetModel)
424
+ env.ANTHROPIC_DEFAULT_SONNET_MODEL = sonnetModel;
425
+ if (haikuModel)
426
+ env.ANTHROPIC_DEFAULT_HAIKU_MODEL = haikuModel;
427
+ return env;
428
+ }
429
+ exports.getCompositeEnvVars = getCompositeEnvVars;
359
430
  //# sourceMappingURL=env-builder.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"env-builder.js","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"env-builder.js","sourceRoot":"","sources":["../../../src/cliproxy/config/env-builder.ts"],"names":[],"mappings":"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"}
@@ -26,14 +26,31 @@ export declare function applyThinkingSuffix(model: string, thinkingValue: string
26
26
  * Respects provider-specific overrides if configured.
27
27
  */
28
28
  export declare function getThinkingValueForTier(tier: ModelTier, provider: CLIProxyProvider, thinkingConfig: ThinkingConfig): string;
29
+ /**
30
+ * Composite tier config for provider lookup (subset of full CompositeTierConfig)
31
+ */
32
+ interface CompositeTierProvider {
33
+ provider?: CLIProxyProvider;
34
+ }
29
35
  /**
30
36
  * Apply thinking configuration to env vars.
31
37
  * Modifies ANTHROPIC_MODEL and tier models with thinking suffixes.
32
38
  *
33
39
  * @param envVars - Environment variables to modify
34
- * @param provider - CLIProxy provider
40
+ * @param provider - CLIProxy provider (default provider for base model)
35
41
  * @param thinkingOverride - Optional CLI override (takes priority over config)
42
+ * @param compositeTierThinking - Optional per-tier thinking overrides for composite variants
43
+ * @param compositeTiers - Optional per-tier provider config for composite variants
36
44
  * @returns Modified env vars with thinking suffixes applied
37
45
  */
38
- export declare function applyThinkingConfig(envVars: NodeJS.ProcessEnv, provider: CLIProxyProvider, thinkingOverride?: string | number): NodeJS.ProcessEnv;
46
+ export declare function applyThinkingConfig(envVars: NodeJS.ProcessEnv, provider: CLIProxyProvider, thinkingOverride?: string | number, compositeTierThinking?: {
47
+ opus?: string;
48
+ sonnet?: string;
49
+ haiku?: string;
50
+ }, compositeTiers?: {
51
+ opus?: CompositeTierProvider;
52
+ sonnet?: CompositeTierProvider;
53
+ haiku?: CompositeTierProvider;
54
+ }): NodeJS.ProcessEnv;
55
+ export {};
39
56
  //# sourceMappingURL=thinking-config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"thinking-config.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAkC,MAAM,mCAAmC,CAAC;AAMnG,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAUpD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAKhE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAOzF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,cAAc,GAC7B,MAAM,CAQR;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,GACjC,MAAM,CAAC,UAAU,CAgFnB"}
1
+ {"version":3,"file":"thinking-config.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAkC,MAAM,mCAAmC,CAAC;AAMnG,oDAAoD;AACpD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAUpD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAKhE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAOzF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,cAAc,GAC7B,MAAM,CAQR;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,CAkInB"}
@@ -66,17 +66,27 @@ exports.getThinkingValueForTier = getThinkingValueForTier;
66
66
  * Modifies ANTHROPIC_MODEL and tier models with thinking suffixes.
67
67
  *
68
68
  * @param envVars - Environment variables to modify
69
- * @param provider - CLIProxy provider
69
+ * @param provider - CLIProxy provider (default provider for base model)
70
70
  * @param thinkingOverride - Optional CLI override (takes priority over config)
71
+ * @param compositeTierThinking - Optional per-tier thinking overrides for composite variants
72
+ * @param compositeTiers - Optional per-tier provider config for composite variants
71
73
  * @returns Modified env vars with thinking suffixes applied
72
74
  */
73
- function applyThinkingConfig(envVars, provider, thinkingOverride) {
75
+ function applyThinkingConfig(envVars, provider, thinkingOverride, compositeTierThinking, compositeTiers) {
74
76
  const thinkingConfig = (0, unified_config_loader_1.getThinkingConfig)();
75
77
  const result = { ...envVars };
76
78
  // Check if thinking is off
77
79
  if (thinkingConfig.mode === 'off' && thinkingOverride === undefined) {
78
80
  return result;
79
81
  }
82
+ // Explicit "off" (CLI override or manual config override) must disable ALL tier thinking.
83
+ const explicitOffOverride = thinkingOverride === 'off' ||
84
+ (thinkingOverride === undefined &&
85
+ thinkingConfig.mode === 'manual' &&
86
+ thinkingConfig.override === 'off');
87
+ if (explicitOffOverride) {
88
+ return result;
89
+ }
80
90
  // Get base model to check thinking support
81
91
  const baseModel = result.ANTHROPIC_MODEL || '';
82
92
  if (!(0, model_catalog_1.supportsThinking)(provider, baseModel)) {
@@ -99,7 +109,14 @@ function applyThinkingConfig(envVars, provider, thinkingOverride) {
99
109
  else if (thinkingConfig.mode === 'auto') {
100
110
  // Auto mode: detect tier and apply default
101
111
  const tier = detectTierFromModel(baseModel);
102
- thinkingValue = getThinkingValueForTier(tier, provider, thinkingConfig);
112
+ // Check per-tier config first if composite
113
+ const perTierValue = compositeTierThinking?.[tier];
114
+ if (perTierValue !== undefined) {
115
+ thinkingValue = perTierValue;
116
+ }
117
+ else {
118
+ thinkingValue = getThinkingValueForTier(tier, provider, thinkingConfig);
119
+ }
103
120
  }
104
121
  else {
105
122
  return result; // No thinking to apply
@@ -110,12 +127,18 @@ function applyThinkingConfig(envVars, provider, thinkingOverride) {
110
127
  console.warn((0, ui_1.warn)(validation.warning));
111
128
  }
112
129
  thinkingValue = validation.value;
113
- // If validation says off, don't apply suffix
130
+ // If auto-detection resolves default tier to "off", skip the main model but still allow
131
+ // explicit per-tier thinking values for other tiers.
114
132
  if (thinkingValue === 'off') {
115
- return result;
133
+ const hasPerTierThinking = compositeTierThinking &&
134
+ Object.values(compositeTierThinking).some((v) => v !== undefined && v !== 'off');
135
+ if (!hasPerTierThinking) {
136
+ return result; // No thinking to apply anywhere
137
+ }
138
+ // Otherwise, continue to process tiers with their own config (skip main model)
116
139
  }
117
- // Apply thinking suffix to main model
118
- if (result.ANTHROPIC_MODEL) {
140
+ else if (result.ANTHROPIC_MODEL) {
141
+ // Apply thinking suffix to main model (only if not off)
119
142
  result.ANTHROPIC_MODEL = applyThinkingSuffix(result.ANTHROPIC_MODEL, thinkingValue);
120
143
  }
121
144
  // Apply to tier models if they support thinking
@@ -126,14 +149,41 @@ function applyThinkingConfig(envVars, provider, thinkingOverride) {
126
149
  ];
127
150
  for (const tierVar of tierModels) {
128
151
  const model = result[tierVar];
129
- if (model && (0, model_catalog_1.supportsThinking)(provider, model)) {
152
+ if (model) {
130
153
  // Get tier-specific thinking value
131
154
  const tier = tierVar.includes('OPUS')
132
155
  ? 'opus'
133
156
  : tierVar.includes('SONNET')
134
157
  ? 'sonnet'
135
158
  : 'haiku';
136
- const tierThinkingValue = thinkingOverride ?? getThinkingValueForTier(tier, provider, thinkingConfig);
159
+ // P2 FIX: Use tier-specific provider from compositeTiers for mixed-provider composites
160
+ // Falls back to the default provider if not a composite or tier not specified
161
+ const tierProvider = compositeTiers?.[tier]?.provider ?? provider;
162
+ // Check if this tier's model supports thinking (using tier-specific provider)
163
+ if (!(0, model_catalog_1.supportsThinking)(tierProvider, model)) {
164
+ continue;
165
+ }
166
+ // Priority chain: CLI --thinking > per-tier config > global config > defaults
167
+ let tierThinkingValue;
168
+ if (thinkingOverride !== undefined) {
169
+ // CLI override takes priority
170
+ tierThinkingValue = thinkingOverride;
171
+ }
172
+ else {
173
+ const perTierValue = compositeTierThinking?.[tier];
174
+ if (perTierValue !== undefined) {
175
+ // Per-tier config from composite variant
176
+ tierThinkingValue = perTierValue;
177
+ }
178
+ else {
179
+ // Global config or defaults (use tier-specific provider for provider overrides)
180
+ tierThinkingValue = getThinkingValueForTier(tier, tierProvider, thinkingConfig);
181
+ }
182
+ }
183
+ // If per-tier thinking is 'off', skip this tier
184
+ if (tierThinkingValue === 'off') {
185
+ continue;
186
+ }
137
187
  result[tierVar] = applyThinkingSuffix(model, tierThinkingValue);
138
188
  }
139
189
  }
@@ -1 +1 @@
1
- {"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,7 @@
9
9
  * - WebSearch and ImageAnalysis hook integration
10
10
  */
11
11
  import { CLIProxyProvider } from '../types';
12
+ import { CompositeTierConfig } from '../../config/unified-config-types';
12
13
  import { CodexReasoningProxy } from '../codex-reasoning-proxy';
13
14
  import { ToolSanitizationProxy } from '../tool-sanitization-proxy';
14
15
  import { HttpsTunnelProxy } from '../https-tunnel-proxy';
@@ -34,6 +35,16 @@ export interface ProxyChainConfig {
34
35
  /** Extended context override: true = force on, false = force off, undefined = auto */
35
36
  extendedContextOverride?: boolean;
36
37
  verbose: boolean;
38
+ /** Composite variant: true when mixing providers per tier */
39
+ isComposite?: boolean;
40
+ /** Composite variant: per-tier provider+model mappings */
41
+ compositeTiers?: {
42
+ opus: CompositeTierConfig;
43
+ sonnet: CompositeTierConfig;
44
+ haiku: CompositeTierConfig;
45
+ };
46
+ /** Composite variant: which tier is the default */
47
+ compositeDefaultTier?: 'opus' | 'sonnet' | 'haiku';
37
48
  }
38
49
  /**
39
50
  * Build final environment variables for Claude CLI execution
@@ -44,4 +55,9 @@ export declare function buildClaudeEnvironment(config: ProxyChainConfig): Record
44
55
  * Log environment configuration for debugging
45
56
  */
46
57
  export declare function logEnvironment(env: Record<string, string>, webSearchEnv: Record<string, string>, verbose: boolean): void;
58
+ /** Apply fallback provider config to env vars for a failed tier */
59
+ export declare function applyFallback(env: Record<string, string>, failedTier: 'opus' | 'sonnet' | 'haiku', fallback: {
60
+ provider: string;
61
+ model: string;
62
+ }): Record<string, string>;
47
63
  //# sourceMappingURL=env-resolver.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"env-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,sFAAsF;IACtF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAuGvF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,OAAO,EAAE,OAAO,GACf,IAAI,CAgBN"}
1
+ {"version":3,"file":"env-resolver.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,sFAAsF;IACtF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,6DAA6D;IAC7D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0DAA0D;IAC1D,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,mBAAmB,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAC5B,KAAK,EAAE,mBAAmB,CAAC;KAC5B,CAAC;IACF,mDAAmD;IACnD,oBAAoB,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;CACpD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA6JvF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,OAAO,EAAE,OAAO,GACf,IAAI,CAgBN;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAC3B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,EACvC,QAAQ,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC5C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAcxB"}
@@ -10,7 +10,7 @@
10
10
  * - WebSearch and ImageAnalysis hook integration
11
11
  */
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.logEnvironment = exports.buildClaudeEnvironment = void 0;
13
+ exports.applyFallback = exports.logEnvironment = exports.buildClaudeEnvironment = void 0;
14
14
  const config_generator_1 = require("../config-generator");
15
15
  const extended_context_config_1 = require("../config/extended-context-config");
16
16
  const websearch_manager_1 = require("../../utils/websearch-manager");
@@ -20,43 +20,82 @@ const get_image_analysis_hook_env_1 = require("../../utils/hooks/get-image-analy
20
20
  * Handles proxy chain ordering and integration with hooks
21
21
  */
22
22
  function buildClaudeEnvironment(config) {
23
- const { provider, useRemoteProxy, remoteConfig, httpsTunnel, tunnelPort, localPort, customSettingsPath, thinkingOverride, extendedContextOverride, codexReasoningPort, toolSanitizationPort, } = config;
24
- // Build base env vars - remote or local
23
+ const { provider, useRemoteProxy, remoteConfig, httpsTunnel, tunnelPort, localPort, customSettingsPath, thinkingOverride, extendedContextOverride, codexReasoningPort, toolSanitizationPort, isComposite, compositeTiers, compositeDefaultTier, } = config;
24
+ // Build base env vars - check remote mode first
25
25
  let envVars;
26
26
  if (useRemoteProxy && remoteConfig) {
27
27
  if (httpsTunnel && tunnelPort) {
28
- // HTTPS remote via local tunnel - use HTTP to tunnel
29
- envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
30
- host: '127.0.0.1',
31
- port: tunnelPort,
32
- protocol: 'http', // Tunnel speaks HTTP locally
33
- authToken: remoteConfig.authToken,
34
- }, customSettingsPath);
28
+ // HTTPS remote via local tunnel
29
+ if (isComposite && compositeTiers && compositeDefaultTier) {
30
+ envVars = (0, config_generator_1.getCompositeEnvVars)(compositeTiers, compositeDefaultTier, tunnelPort, customSettingsPath, {
31
+ host: '127.0.0.1',
32
+ port: tunnelPort,
33
+ protocol: 'http',
34
+ authToken: remoteConfig.authToken,
35
+ });
36
+ }
37
+ else {
38
+ envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
39
+ host: '127.0.0.1',
40
+ port: tunnelPort,
41
+ protocol: 'http', // Tunnel speaks HTTP locally
42
+ authToken: remoteConfig.authToken,
43
+ }, customSettingsPath);
44
+ }
35
45
  }
36
46
  else {
37
47
  // HTTP remote - direct connection
38
- envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
39
- host: remoteConfig.host,
40
- port: remoteConfig.port,
41
- protocol: remoteConfig.protocol,
42
- authToken: remoteConfig.authToken,
43
- }, customSettingsPath);
48
+ if (isComposite && compositeTiers && compositeDefaultTier) {
49
+ envVars = (0, config_generator_1.getCompositeEnvVars)(compositeTiers, compositeDefaultTier, remoteConfig.port, customSettingsPath, {
50
+ host: remoteConfig.host,
51
+ port: remoteConfig.port,
52
+ protocol: remoteConfig.protocol,
53
+ authToken: remoteConfig.authToken,
54
+ });
55
+ }
56
+ else {
57
+ envVars = (0, config_generator_1.getRemoteEnvVars)(provider, {
58
+ host: remoteConfig.host,
59
+ port: remoteConfig.port,
60
+ protocol: remoteConfig.protocol,
61
+ authToken: remoteConfig.authToken,
62
+ }, customSettingsPath);
63
+ }
44
64
  }
45
65
  }
46
66
  else {
47
67
  // Local proxy mode
48
- const remoteRewriteConfig = remoteConfig
49
- ? {
50
- host: remoteConfig.host,
51
- port: remoteConfig.port,
52
- protocol: remoteConfig.protocol,
53
- authToken: remoteConfig.authToken,
54
- }
55
- : undefined;
56
- envVars = (0, config_generator_1.getEffectiveEnvVars)(provider, localPort, customSettingsPath, remoteRewriteConfig);
68
+ if (isComposite && compositeTiers && compositeDefaultTier) {
69
+ envVars = (0, config_generator_1.getCompositeEnvVars)(compositeTiers, compositeDefaultTier, localPort, customSettingsPath);
70
+ }
71
+ else {
72
+ const remoteRewriteConfig = remoteConfig
73
+ ? {
74
+ host: remoteConfig.host,
75
+ port: remoteConfig.port,
76
+ protocol: remoteConfig.protocol,
77
+ authToken: remoteConfig.authToken,
78
+ }
79
+ : undefined;
80
+ envVars = (0, config_generator_1.getEffectiveEnvVars)(provider, localPort, customSettingsPath, remoteRewriteConfig);
81
+ }
82
+ }
83
+ // Extract per-tier thinking from composite config
84
+ let compositeTierThinking;
85
+ if (isComposite && compositeTiers) {
86
+ const tierThinking = {};
87
+ if (compositeTiers.opus?.thinking)
88
+ tierThinking.opus = compositeTiers.opus.thinking;
89
+ if (compositeTiers.sonnet?.thinking)
90
+ tierThinking.sonnet = compositeTiers.sonnet.thinking;
91
+ if (compositeTiers.haiku?.thinking)
92
+ tierThinking.haiku = compositeTiers.haiku.thinking;
93
+ if (Object.keys(tierThinking).length > 0) {
94
+ compositeTierThinking = tierThinking;
95
+ }
57
96
  }
58
97
  // Apply thinking configuration to model (auto tier-based or manual override)
59
- (0, config_generator_1.applyThinkingConfig)(envVars, provider, thinkingOverride);
98
+ (0, config_generator_1.applyThinkingConfig)(envVars, provider, thinkingOverride, compositeTierThinking, compositeTiers);
60
99
  // Apply extended context suffix for 1M token context window
61
100
  // Auto-enabled for Gemini, opt-in for Claude (--1m flag)
62
101
  (0, extended_context_config_1.applyExtendedContextConfig)(envVars, provider, extendedContextOverride);
@@ -107,4 +146,21 @@ function logEnvironment(env, webSearchEnv, verbose) {
107
146
  }
108
147
  }
109
148
  exports.logEnvironment = logEnvironment;
149
+ /** Apply fallback provider config to env vars for a failed tier */
150
+ function applyFallback(env, failedTier, fallback) {
151
+ const tierEnvMap = {
152
+ opus: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
153
+ sonnet: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
154
+ haiku: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
155
+ };
156
+ const result = { ...env };
157
+ const originalModel = result[tierEnvMap[failedTier]];
158
+ result[tierEnvMap[failedTier]] = fallback.model;
159
+ // If failed tier is default tier, also update ANTHROPIC_MODEL
160
+ if (result.ANTHROPIC_MODEL === originalModel) {
161
+ result.ANTHROPIC_MODEL = fallback.model;
162
+ }
163
+ return result;
164
+ }
165
+ exports.applyFallback = applyFallback;
110
166
  //# sourceMappingURL=env-resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":"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"}
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;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAkDlG;;;;;;;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,CAitBf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAkDlG;;;;;;;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,CA00Bf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}