@kaitranntt/ccs 7.47.0-dev.5 → 7.47.0-dev.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/base-codex.settings.json +4 -4
- package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +34 -0
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/model-config.d.ts.map +1 -1
- package/dist/cliproxy/model-config.js +6 -6
- package/dist/cliproxy/model-config.js.map +1 -1
- package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-settings.js +12 -13
- package/dist/cliproxy/services/variant-settings.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
"env": {
|
|
3
3
|
"ANTHROPIC_BASE_URL": "http://127.0.0.1:8317/api/provider/codex",
|
|
4
4
|
"ANTHROPIC_AUTH_TOKEN": "ccs-internal-managed",
|
|
5
|
-
"ANTHROPIC_MODEL": "gpt-5.3-codex
|
|
6
|
-
"ANTHROPIC_DEFAULT_OPUS_MODEL": "gpt-5.3-codex
|
|
7
|
-
"ANTHROPIC_DEFAULT_SONNET_MODEL": "gpt-5.3-codex
|
|
8
|
-
"ANTHROPIC_DEFAULT_HAIKU_MODEL": "gpt-5-mini
|
|
5
|
+
"ANTHROPIC_MODEL": "gpt-5.3-codex",
|
|
6
|
+
"ANTHROPIC_DEFAULT_OPUS_MODEL": "gpt-5.3-codex",
|
|
7
|
+
"ANTHROPIC_DEFAULT_SONNET_MODEL": "gpt-5.3-codex",
|
|
8
|
+
"ANTHROPIC_DEFAULT_HAIKU_MODEL": "gpt-5-mini"
|
|
9
9
|
}
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
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;AAIxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,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;
|
|
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;AAIxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,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;AAkCD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA+KvF;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,CAexB"}
|
|
@@ -17,6 +17,33 @@ const websearch_manager_1 = require("../../utils/websearch-manager");
|
|
|
17
17
|
const get_image_analysis_hook_env_1 = require("../../utils/hooks/get-image-analysis-hook-env");
|
|
18
18
|
const shell_executor_1 = require("../../utils/shell-executor");
|
|
19
19
|
const model_id_normalizer_1 = require("../model-id-normalizer");
|
|
20
|
+
const CODEX_EFFORT_SUFFIX_REGEX = /^(.*)-(xhigh|high|medium)$/i;
|
|
21
|
+
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
|
|
22
|
+
function normalizeCodexModelForDirectUpstream(model) {
|
|
23
|
+
const withoutExtendedContext = model.trim().replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '').trim();
|
|
24
|
+
if (!withoutExtendedContext)
|
|
25
|
+
return withoutExtendedContext;
|
|
26
|
+
const effortMatch = withoutExtendedContext.match(CODEX_EFFORT_SUFFIX_REGEX);
|
|
27
|
+
if (!effortMatch?.[1] || !effortMatch[2]) {
|
|
28
|
+
return withoutExtendedContext;
|
|
29
|
+
}
|
|
30
|
+
return `${effortMatch[1].trim()}(${effortMatch[2].toLowerCase()})`;
|
|
31
|
+
}
|
|
32
|
+
function normalizeCodexEnvForDirectUpstream(envVars) {
|
|
33
|
+
let nextEnv = null;
|
|
34
|
+
for (const key of model_id_normalizer_1.MODEL_ENV_VAR_KEYS) {
|
|
35
|
+
const value = envVars[key];
|
|
36
|
+
if (typeof value !== 'string' || value.trim().length === 0)
|
|
37
|
+
continue;
|
|
38
|
+
const normalizedValue = normalizeCodexModelForDirectUpstream(value);
|
|
39
|
+
if (normalizedValue === value)
|
|
40
|
+
continue;
|
|
41
|
+
if (!nextEnv)
|
|
42
|
+
nextEnv = { ...envVars };
|
|
43
|
+
nextEnv[key] = normalizedValue;
|
|
44
|
+
}
|
|
45
|
+
return nextEnv ?? envVars;
|
|
46
|
+
}
|
|
20
47
|
/**
|
|
21
48
|
* Build final environment variables for Claude CLI execution
|
|
22
49
|
* Handles proxy chain ordering and integration with hooks
|
|
@@ -101,6 +128,13 @@ function buildClaudeEnvironment(config) {
|
|
|
101
128
|
// Apply extended context suffix for 1M token context window
|
|
102
129
|
// Auto-enabled for Gemini, opt-in for Claude (--1m flag)
|
|
103
130
|
(0, extended_context_config_1.applyExtendedContextConfig)(envVars, provider, extendedContextOverride);
|
|
131
|
+
// Fallback compatibility for Codex:
|
|
132
|
+
// CLIProxyAPI provider lookup recognizes model(level) suffix form, while CCS stores codex
|
|
133
|
+
// effort aliases as model-level (e.g., gpt-5.3-codex-high). If codex reasoning proxy is
|
|
134
|
+
// unavailable, normalize to model(level) to avoid "unknown provider for model ..." failures.
|
|
135
|
+
if (provider === 'codex' && !isComposite && !codexReasoningPort) {
|
|
136
|
+
envVars = normalizeCodexEnvForDirectUpstream(envVars);
|
|
137
|
+
}
|
|
104
138
|
// Determine the final ANTHROPIC_BASE_URL based on active proxies
|
|
105
139
|
// Chain order: Claude CLI → [CodexReasoningProxy] → [ToolSanitizationProxy] → CLIProxy
|
|
106
140
|
let finalBaseUrl = envVars.ANTHROPIC_BASE_URL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,0DAK6B;AAC7B,+EAA+E;AAG/E,qEAAoE;AACpE,+FAAwF;AACxF,+DAAgE;AAIhE,
|
|
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":"model-config.d.ts","sourceRoot":"","sources":["../../src/cliproxy/model-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/cliproxy/model-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAgB3C;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAGnE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,gBAAgB,EAC1B,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,GAAG,SAAS,CAYpB;AAoCD;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,GAAE,OAAe,EACtB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,OAAO,CAAC,CAgIlB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CjF"}
|
|
@@ -43,10 +43,10 @@ function stripCodexEffortSuffix(model, provider) {
|
|
|
43
43
|
return model;
|
|
44
44
|
return model.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
|
|
45
45
|
}
|
|
46
|
-
function normalizeCodexTierModel(provider, model
|
|
46
|
+
function normalizeCodexTierModel(provider, model) {
|
|
47
47
|
if (provider !== 'codex')
|
|
48
48
|
return model;
|
|
49
|
-
return
|
|
49
|
+
return stripCodexEffortSuffix(model, provider);
|
|
50
50
|
}
|
|
51
51
|
/**
|
|
52
52
|
* Check if provider has user settings configured
|
|
@@ -158,10 +158,10 @@ async function configureProviderModel(provider, force = false, customSettingsPat
|
|
|
158
158
|
});
|
|
159
159
|
// Get base env vars for defaults
|
|
160
160
|
const baseEnv = (0, config_generator_1.getClaudeEnvVars)(provider);
|
|
161
|
-
const selectedDefaultModel = normalizeCodexTierModel(provider, selectedModel
|
|
162
|
-
const selectedOpusModel = normalizeCodexTierModel(provider, selectedModel
|
|
163
|
-
const selectedSonnetModel = normalizeCodexTierModel(provider, selectedModel
|
|
164
|
-
const selectedHaikuModel = normalizeCodexTierModel(provider, baseEnv.ANTHROPIC_DEFAULT_HAIKU_MODEL || selectedModel
|
|
161
|
+
const selectedDefaultModel = normalizeCodexTierModel(provider, selectedModel);
|
|
162
|
+
const selectedOpusModel = normalizeCodexTierModel(provider, selectedModel);
|
|
163
|
+
const selectedSonnetModel = normalizeCodexTierModel(provider, selectedModel);
|
|
164
|
+
const selectedHaikuModel = normalizeCodexTierModel(provider, baseEnv.ANTHROPIC_DEFAULT_HAIKU_MODEL || selectedModel);
|
|
165
165
|
// Read existing settings to preserve user customizations
|
|
166
166
|
let existingSettings = {};
|
|
167
167
|
let existingEnv = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-config.js","sourceRoot":"","sources":["../../src/cliproxy/model-config.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,uCAAyB;AACzB,4CAAoD;AACpD,mDAAsF;AACtF,yDAA+E;AAE/E,oCAAyE;AACzE,4DAAoD;AAEpD,MAAM,yBAAyB,GAAG,wBAAwB,CAAC;AAE3D,SAAS,sBAAsB,CAAC,KAAa,EAAE,QAA0B;IACvE,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACvC,OAAO,KAAK,CAAC,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,uBAAuB,
|
|
1
|
+
{"version":3,"file":"model-config.js","sourceRoot":"","sources":["../../src/cliproxy/model-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAKlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"variant-settings.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAKlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AA+ExE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAA8B,GACnC,MAAM,CAkBR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAA8B,GACnC,MAAM,CAkBR;AAwBD;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,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,oBAAoB,CAAC,EAAE,MAAM,GAC5B,MAAM,CA0DR;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,mBAAmB,GAC7B,IAAI,CAyCN;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,MAA8B,GACnC,IAAI,CA+CN"}
|
|
@@ -41,23 +41,21 @@ const image_analyzer_profile_hook_injector_1 = require("../../utils/hooks/image-
|
|
|
41
41
|
const auth_token_manager_1 = require("../auth-token-manager");
|
|
42
42
|
const ui_1 = require("../../utils/ui");
|
|
43
43
|
const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
|
|
44
|
-
function
|
|
45
|
-
return CODEX_EFFORT_SUFFIX_REGEX.test(model);
|
|
46
|
-
}
|
|
47
|
-
function normalizeCodexTierModel(provider, model, fallbackEffort) {
|
|
44
|
+
function canonicalizeModelForProvider(provider, model) {
|
|
48
45
|
if (provider !== 'codex')
|
|
49
46
|
return model;
|
|
50
|
-
return
|
|
47
|
+
return model.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
|
|
51
48
|
}
|
|
52
49
|
/**
|
|
53
50
|
* Build settings env object for a variant
|
|
54
51
|
*/
|
|
55
52
|
function buildSettingsEnv(provider, model, port = config_generator_1.CLIPROXY_DEFAULT_PORT) {
|
|
56
53
|
const baseEnv = (0, config_generator_1.getClaudeEnvVars)(provider, port);
|
|
57
|
-
const
|
|
58
|
-
const
|
|
59
|
-
const
|
|
60
|
-
const
|
|
54
|
+
const normalizedModel = canonicalizeModelForProvider(provider, model);
|
|
55
|
+
const defaultModel = normalizedModel;
|
|
56
|
+
const opusModel = normalizedModel;
|
|
57
|
+
const sonnetModel = normalizedModel;
|
|
58
|
+
const haikuModel = canonicalizeModelForProvider(provider, baseEnv.ANTHROPIC_DEFAULT_HAIKU_MODEL || model);
|
|
61
59
|
return {
|
|
62
60
|
ANTHROPIC_BASE_URL: baseEnv.ANTHROPIC_BASE_URL || '',
|
|
63
61
|
ANTHROPIC_AUTH_TOKEN: baseEnv.ANTHROPIC_AUTH_TOKEN || '',
|
|
@@ -244,11 +242,12 @@ function updateSettingsModel(settingsPath, model, provider) {
|
|
|
244
242
|
const settings = JSON.parse(content);
|
|
245
243
|
if (model) {
|
|
246
244
|
settings.env = settings.env || {};
|
|
247
|
-
|
|
248
|
-
settings.env.
|
|
249
|
-
settings.env.
|
|
245
|
+
const normalizedModel = canonicalizeModelForProvider(provider, model);
|
|
246
|
+
settings.env.ANTHROPIC_MODEL = normalizedModel;
|
|
247
|
+
settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = normalizedModel;
|
|
248
|
+
settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL = normalizedModel;
|
|
250
249
|
if (provider === 'codex' && settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL) {
|
|
251
|
-
settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL =
|
|
250
|
+
settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = canonicalizeModelForProvider(provider, settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL);
|
|
252
251
|
}
|
|
253
252
|
}
|
|
254
253
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAC7B,uCAAyB;AAEzB,+DAAuD;AACvD,iDAAiD;AACjD,0DAA8E;AAG9E,uFAAiF;AACjF,iHAAwH;AACxH,8DAA2D;AAC3D,uCAAsC;AAkBtC,MAAM,yBAAyB,GAAG,wBAAwB,CAAC;AAE3D,SAAS,
|
|
1
|
+
{"version":3,"file":"variant-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"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"}
|