@kaitranntt/ccs 8.10.0-dev.1 → 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 +13 -2
- 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/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/model-catalog.d.ts +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +87 -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/types/config-types.d.ts +3 -0
- package/dist/cliproxy/types/config-types.d.ts.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/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/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/ui/assets/{Trans-DpzuO-3l.js → Trans-lb7IJ7fS.js} +1 -1
- package/dist/ui/assets/{accounts-B8La6EUn.js → accounts-BmdjkRdd.js} +1 -1
- package/dist/ui/assets/{alert-dialog-Bf9XTqpg.js → alert-dialog-QI7ssXmW.js} +1 -1
- package/dist/ui/assets/{api-BKN4bIkK.js → api-yR-jnOTk.js} +1 -1
- package/dist/ui/assets/{auth-section-C9nhoYzH.js → auth-section-UKobnpsa.js} +1 -1
- package/dist/ui/assets/{backups-section-xj1966O2.js → backups-section-Bje38hdS.js} +1 -1
- package/dist/ui/assets/{channels-BV6KMHQ-.js → channels-CIcZH84-.js} +1 -1
- package/dist/ui/assets/{checkbox-D3J3bEmY.js → checkbox-kTCwj4DC.js} +1 -1
- package/dist/ui/assets/{claude-extension-D8MBbLlg.js → claude-extension-DFIM_obP.js} +1 -1
- package/dist/ui/assets/cliproxy-CnK8Pxlp.js +4 -0
- package/dist/ui/assets/{cliproxy-ai-providers-BHXVZIDI.js → cliproxy-ai-providers-CrszOINU.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-Dnh8fwYy.js → cliproxy-control-panel-DkZ0lSNm.js} +1 -1
- package/dist/ui/assets/{codex-BSt3ZMe-.js → codex-BhDm5zRh.js} +1 -1
- package/dist/ui/assets/{confirm-dialog-BTwVtHIm.js → confirm-dialog-60zCksm4.js} +1 -1
- package/dist/ui/assets/{copilot-CFxIjoER.js → copilot-DYNOTCn0.js} +1 -1
- package/dist/ui/assets/{cursor-CJEGvYc8.js → cursor-Cf9xEm7_.js} +1 -1
- package/dist/ui/assets/{droid-BAZEtHVz.js → droid-D-hRvXnW.js} +1 -1
- package/dist/ui/assets/{globalenv-section-DvHEmWGW.js → globalenv-section-CiMNWxaM.js} +1 -1
- package/dist/ui/assets/{health-CucHeqaT.js → health-SNz-VyXt.js} +1 -1
- package/dist/ui/assets/{index-Bba-lL0F.js → index-B2-0piAo.js} +1 -1
- package/dist/ui/assets/{index-CjEHrRK5.js → index-BFSwIiWI.js} +2 -2
- package/dist/ui/assets/{index-D7hMaEi7.js → index-BFVDO-nS.js} +1 -1
- package/dist/ui/assets/{index-BAmMxAjc.js → index-CHFm1Cvg.js} +1 -1
- package/dist/ui/assets/{index-COHf4O5A.js → index-D4duw9yj.js} +1 -1
- package/dist/ui/assets/{index-DwB2dlO7.js → index-OcUP97hO.js} +1 -1
- package/dist/ui/assets/{index-DQ5lgrhi.js → index-eT0MCNwt.js} +1 -1
- package/dist/ui/assets/{logs-CmiNT73G.js → logs-CMuCN17Z.js} +1 -1
- package/dist/ui/assets/{masked-input-DRtifqT7.js → masked-input-BwaApqdO.js} +1 -1
- package/dist/ui/assets/{proxy-status-widget-FQJgTcgi.js → proxy-status-widget-BeAaBd0j.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-kpw_rzWt.js → raw-json-settings-editor-panel-QE0I9KQE.js} +1 -1
- package/dist/ui/assets/{searchable-select-BhSnRKdw.js → searchable-select-C_K2MS5j.js} +1 -1
- package/dist/ui/assets/{separator-DrUbmmEV.js → separator-D7Dw51fp.js} +1 -1
- package/dist/ui/assets/{shared-JBfU4vEx.js → shared-CaL1210c.js} +1 -1
- package/dist/ui/assets/{table-D3qUcyZ_.js → table-BTmymca2.js} +1 -1
- package/dist/ui/assets/{updates-vN6lQzZr.js → updates-QvH7D5Ap.js} +1 -1
- package/dist/ui/assets/{use-accounts-BQ8SCEa6.js → use-accounts-Cgk1IgNc.js} +1 -1
- package/dist/ui/index.html +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/web-server/model-pricing.d.ts.map +1 -1
- package/dist/web-server/model-pricing.js +105 -1
- package/dist/web-server/model-pricing.js.map +1 -1
- package/package.json +1 -1
- package/dist/ui/assets/cliproxy-D8g9HOG9.js +0 -4
package/README.md
CHANGED
|
@@ -64,8 +64,8 @@ CCS gives you one stable command surface while letting you switch between:
|
|
|
64
64
|
- multiple Claude subscriptions and isolated account contexts
|
|
65
65
|
- OAuth providers like Codex, xAI/Grok, Kiro, Claude, Kimi, and more, with legacy
|
|
66
66
|
Copilot compatibility for existing setups
|
|
67
|
-
- API and local-model profiles like GLM, Kimi, OpenRouter,
|
|
68
|
-
llama.cpp, Novita, Fireworks AI, and Alibaba Coding Plan
|
|
67
|
+
- API and local-model profiles like GLM, Kimi, OpenRouter, Requesty, OrcaRouter,
|
|
68
|
+
Ollama, llama.cpp, Novita, Fireworks AI, and Alibaba Coding Plan
|
|
69
69
|
|
|
70
70
|
Qwen Code account linking is not available in the bundled CLIProxy runtime yet;
|
|
71
71
|
use an API-key Qwen profile such as Alibaba Coding Plan for Qwen models.
|
|
@@ -97,6 +97,17 @@ model routing through `proxy.routing`, and explicit activation helpers such as
|
|
|
97
97
|
Guide:
|
|
98
98
|
[OpenAI-Compatible Provider Routing](https://docs.ccs.kaitran.ca/features/proxy/openai-compatible-providers).
|
|
99
99
|
|
|
100
|
+
### API Route custom profile
|
|
101
|
+
|
|
102
|
+
[API Route](https://www.api-route.com/docs/quickstart) serves an Anthropic-compatible Messages endpoint. Create a custom Claude Code profile and enter your API Route key when prompted:
|
|
103
|
+
|
|
104
|
+
```bash
|
|
105
|
+
ccs api create api-route --base-url https://global.api-route.com --model claude-haiku-4-5 --target claude
|
|
106
|
+
ccs api-route
|
|
107
|
+
```
|
|
108
|
+
|
|
109
|
+
Use the host without `/v1`, since Claude Code appends `/v1/messages`. Replace the example model with a Claude model ID available to your key; authenticated `GET https://global.api-route.com/v1/models` lists the IDs. API Route is a paid hosted service: see [API keys](https://www.api-route.com/api-keys) and [pricing](https://www.api-route.com/pricing). Profile settings use the existing [CCS configuration workflow](https://docs.ccs.kaitran.ca/getting-started/configuration).
|
|
110
|
+
|
|
100
111
|
### Related Project: claude-code-router
|
|
101
112
|
|
|
102
113
|
[claude-code-router](https://github.com/musistudio/claude-code-router) is an
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-plan-compatibility.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-plan-compatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-plan-compatibility.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-plan-compatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAoBzD,MAAM,WAAW,4BAA4B;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,UAAU,0BAA0B;IAClC,iBAAiB,CAAC,EAAE,OAAO,iBAAiB,CAAC;IAC7C,eAAe,CAAC,EAAE,OAAO,eAAe,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;CAC1B;AAUD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ3D;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE1E;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,YAAY,EAAE,MAAM,GACnB,0BAA0B,GAAG,IAAI,CAwBnC;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,4BAA4B,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GAAG,MAAM,GAAG,IAAI,CAiChB;AAED,wBAAsB,gCAAgC,CACpD,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;CAClB,EACD,IAAI,GAAE,0BAA+B,GACpC,OAAO,CAAC,IAAI,CAAC,CAiDf"}
|
|
@@ -9,15 +9,17 @@ const quota_response_cache_1 = require("../quota/quota-response-cache");
|
|
|
9
9
|
const ui_1 = require("../../utils/ui");
|
|
10
10
|
const FREE_SAFE_DEFAULT_MODEL = 'gpt-5.4';
|
|
11
11
|
const FREE_SAFE_FAST_MODEL = 'gpt-5.4-mini';
|
|
12
|
-
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:minimal|low|medium|high|xhigh)(?:-fast)?|-fast(?:-(?:minimal|low|medium|high|xhigh))?)$/i;
|
|
13
|
-
const CODEX_PAREN_SUFFIX_REGEX = /\((minimal|low|medium|high|xhigh)\)$/i;
|
|
12
|
+
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:none|minimal|low|medium|high|xhigh|max)(?:-fast)?|-fast(?:-(?:none|minimal|low|medium|high|xhigh|max))?)$/i;
|
|
13
|
+
const CODEX_PAREN_SUFFIX_REGEX = /\((none|minimal|low|medium|high|xhigh|max)\)$/i;
|
|
14
14
|
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
|
|
15
15
|
const KNOWN_CODEX_MODELS = new Set(((0, model_catalog_1.getProviderCatalog)('codex')?.models ?? []).map((model) => model.id.toLowerCase()));
|
|
16
|
-
const FREE_PLAN_FALLBACKS =
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
const FREE_PLAN_FALLBACKS = {
|
|
17
|
+
'gpt-6.1-sol': FREE_SAFE_DEFAULT_MODEL,
|
|
18
|
+
'gpt-6-sol': FREE_SAFE_DEFAULT_MODEL,
|
|
19
|
+
'gpt-5.5': FREE_SAFE_DEFAULT_MODEL,
|
|
20
|
+
'gpt-5.3-codex': FREE_SAFE_DEFAULT_MODEL,
|
|
21
|
+
'gpt-5.3-codex-spark': FREE_SAFE_FAST_MODEL,
|
|
22
|
+
};
|
|
21
23
|
function isRecord(value) {
|
|
22
24
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
23
25
|
}
|
|
@@ -39,7 +41,7 @@ function getDefaultCodexModel() {
|
|
|
39
41
|
}
|
|
40
42
|
exports.getDefaultCodexModel = getDefaultCodexModel;
|
|
41
43
|
function getFreePlanFallbackCodexModel(model) {
|
|
42
|
-
return FREE_PLAN_FALLBACKS
|
|
44
|
+
return FREE_PLAN_FALLBACKS[normalizeCodexModelId(model)] ?? null;
|
|
43
45
|
}
|
|
44
46
|
exports.getFreePlanFallbackCodexModel = getFreePlanFallbackCodexModel;
|
|
45
47
|
function parseCodexUnsupportedModelError(statusCode, responseBody) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-plan-compatibility.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-plan-compatibility.ts"],"names":[],"mappings":";;;AAAA,iEAAgE;AAChE,oDAAsD;AACtD,+DAAoE;AACpE,sEAA+D;AAC/D,wEAA+E;AAE/E,uCAA4C;AAI5C,MAAM,uBAAuB,GAAG,SAAS,CAAC;AAC1C,MAAM,oBAAoB,GAAG,cAAc,CAAC;AAC5C,MAAM,yBAAyB,GAC7B,
|
|
1
|
+
{"version":3,"file":"codex-plan-compatibility.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-plan-compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type CodexReasoningEffort = 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
|
|
1
|
+
export type CodexReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
|
|
2
2
|
export type CodexServiceTier = 'fast';
|
|
3
3
|
export interface CodexReasoningModelMap {
|
|
4
4
|
opusModel?: string;
|
|
@@ -24,6 +24,16 @@ export interface CodexReasoningProxyConfig {
|
|
|
24
24
|
/** When true, skip reasoning effort injection entirely (thinking mode: off) */
|
|
25
25
|
disableEffort?: boolean;
|
|
26
26
|
}
|
|
27
|
+
export declare const EFFORT_RANK: Record<CodexReasoningEffort, number>;
|
|
28
|
+
/** All valid codex effort levels in rank order */
|
|
29
|
+
export declare const EFFORT_BY_RANK: CodexReasoningEffort[];
|
|
30
|
+
/**
|
|
31
|
+
* Normalize codex effort for a specific model based on its catalog capabilities.
|
|
32
|
+
* - Unsupported lower efforts (e.g. `none` or `minimal` on `gpt-6.1-sol`) clamp UP to lowest supported (`low`).
|
|
33
|
+
* - Unsupported higher efforts (e.g. `max` on `gpt-5.4`) clamp DOWN to maxLevel (`xhigh`).
|
|
34
|
+
* - Supported efforts (e.g. `none` on `gpt-6-sol` / `gpt-6-luna`) remain unchanged.
|
|
35
|
+
*/
|
|
36
|
+
export declare function normalizeCodexEffortForModel(model: string, effort: CodexReasoningEffort): CodexReasoningEffort;
|
|
27
37
|
export declare function buildCodexModelEffortMap(models: CodexReasoningModelMap, defaultEffort?: CodexReasoningEffort): Map<string, CodexReasoningEffort>;
|
|
28
38
|
export declare function getEffortForModel(model: string | null, modelEffort: Map<string, CodexReasoningEffort>, defaultEffort: CodexReasoningEffort): CodexReasoningEffort;
|
|
29
39
|
export declare function injectReasoningEffortIntoBody(body: unknown, effort: CodexReasoningEffort): unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-reasoning-proxy.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-reasoning-proxy.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-reasoning-proxy.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-reasoning-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.CodexReasoningProxy = exports.injectCodexRequestTuningIntoBody = exports.injectReasoningEffortIntoBody = exports.getEffortForModel = exports.buildCodexModelEffortMap = void 0;
|
|
26
|
+
exports.CodexReasoningProxy = exports.injectCodexRequestTuningIntoBody = exports.injectReasoningEffortIntoBody = exports.getEffortForModel = exports.buildCodexModelEffortMap = exports.normalizeCodexEffortForModel = exports.EFFORT_BY_RANK = exports.EFFORT_RANK = void 0;
|
|
27
27
|
const http = __importStar(require("http"));
|
|
28
28
|
const https = __importStar(require("https"));
|
|
29
29
|
const url_1 = require("url");
|
|
@@ -31,7 +31,7 @@ const codex_plan_compatibility_1 = require("./codex-plan-compatibility");
|
|
|
31
31
|
const model_catalog_1 = require("../model-catalog");
|
|
32
32
|
const upstream_response_timeout_1 = require("../proxy/upstream-response-timeout");
|
|
33
33
|
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
|
|
34
|
-
const CODEX_TUNING_SUFFIX_TOKEN_REGEX = /-(minimal|low|medium|high|xhigh|fast)$/i;
|
|
34
|
+
const CODEX_TUNING_SUFFIX_TOKEN_REGEX = /-(none|minimal|low|medium|high|xhigh|max|fast)$/i;
|
|
35
35
|
const CODEX_SERVICE_TIER_REQUEST_VALUE = {
|
|
36
36
|
fast: 'priority',
|
|
37
37
|
};
|
|
@@ -75,41 +75,79 @@ function parseModelTuningSuffix(model) {
|
|
|
75
75
|
function isKnownCodexModelId(model, modelEffort) {
|
|
76
76
|
if (modelEffort.has(model))
|
|
77
77
|
return true;
|
|
78
|
-
if (EFFORT_BY_RANK.some((effort) => modelEffort.has(`${model}-${effort}`))) {
|
|
78
|
+
if (exports.EFFORT_BY_RANK.some((effort) => modelEffort.has(`${model}-${effort}`))) {
|
|
79
79
|
return true;
|
|
80
80
|
}
|
|
81
81
|
return (0, model_catalog_1.getModelMaxLevel)('codex', model) !== undefined;
|
|
82
82
|
}
|
|
83
|
-
|
|
83
|
+
exports.EFFORT_RANK = {
|
|
84
|
+
none: 0,
|
|
84
85
|
minimal: 1,
|
|
85
86
|
low: 2,
|
|
86
87
|
medium: 3,
|
|
87
88
|
high: 4,
|
|
88
89
|
xhigh: 5,
|
|
90
|
+
max: 6,
|
|
89
91
|
};
|
|
90
92
|
/** All valid codex effort levels in rank order */
|
|
91
|
-
|
|
93
|
+
exports.EFFORT_BY_RANK = [
|
|
94
|
+
'none',
|
|
95
|
+
'minimal',
|
|
96
|
+
'low',
|
|
97
|
+
'medium',
|
|
98
|
+
'high',
|
|
99
|
+
'xhigh',
|
|
100
|
+
'max',
|
|
101
|
+
];
|
|
92
102
|
function minEffort(a, b) {
|
|
93
|
-
return EFFORT_RANK[a] <= EFFORT_RANK[b] ? a : b;
|
|
103
|
+
return exports.EFFORT_RANK[a] <= exports.EFFORT_RANK[b] ? a : b;
|
|
94
104
|
}
|
|
95
105
|
/**
|
|
96
|
-
*
|
|
97
|
-
*
|
|
106
|
+
* Normalize codex effort for a specific model based on its catalog capabilities.
|
|
107
|
+
* - Unsupported lower efforts (e.g. `none` or `minimal` on `gpt-6.1-sol`) clamp UP to lowest supported (`low`).
|
|
108
|
+
* - Unsupported higher efforts (e.g. `max` on `gpt-5.4`) clamp DOWN to maxLevel (`xhigh`).
|
|
109
|
+
* - Supported efforts (e.g. `none` on `gpt-6-sol` / `gpt-6-luna`) remain unchanged.
|
|
98
110
|
*/
|
|
99
|
-
function
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
111
|
+
function normalizeCodexEffortForModel(model, effort) {
|
|
112
|
+
const thinking = (0, model_catalog_1.getModelThinkingSupport)('codex', model);
|
|
113
|
+
const levels = thinking?.levels ?? [];
|
|
114
|
+
const normalizedModel = model.trim().toLowerCase();
|
|
115
|
+
if (normalizedModel === 'gpt-6.1-sol') {
|
|
116
|
+
if (effort === 'none' || effort === 'minimal') {
|
|
117
|
+
return 'low';
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
else if (normalizedModel === 'gpt-6-sol' || normalizedModel === 'gpt-6-luna') {
|
|
121
|
+
if (effort === 'none') {
|
|
122
|
+
return 'none';
|
|
123
|
+
}
|
|
124
|
+
if (effort === 'minimal') {
|
|
125
|
+
return 'low';
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
// Cap at model maxLevel if defined
|
|
129
|
+
const maxLevel = thinking?.maxLevel ?? (0, model_catalog_1.getModelMaxLevel)('codex', model);
|
|
130
|
+
if (maxLevel) {
|
|
131
|
+
const maxEffort = exports.EFFORT_BY_RANK.find((e) => e === maxLevel);
|
|
132
|
+
if (maxEffort && exports.EFFORT_RANK[effort] > exports.EFFORT_RANK[maxEffort]) {
|
|
133
|
+
return maxEffort;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
// If the model explicitly supports this effort, return it
|
|
137
|
+
if (levels.includes(effort) || (effort === 'none' && thinking?.zeroAllowed)) {
|
|
106
138
|
return effort;
|
|
107
|
-
|
|
108
|
-
if
|
|
109
|
-
|
|
139
|
+
}
|
|
140
|
+
// For non-GPT-6 models, if minimal was requested, minimal is allowed for legacy models
|
|
141
|
+
if (effort === 'minimal') {
|
|
142
|
+
return 'minimal';
|
|
143
|
+
}
|
|
144
|
+
// If none was requested for a model that doesn't allow zero, clamp up to lowest supported
|
|
145
|
+
if (effort === 'none' && !thinking?.zeroAllowed) {
|
|
146
|
+
return levels[0] ?? 'low';
|
|
110
147
|
}
|
|
111
148
|
return effort;
|
|
112
149
|
}
|
|
150
|
+
exports.normalizeCodexEffortForModel = normalizeCodexEffortForModel;
|
|
113
151
|
function buildCodexModelEffortMap(models, defaultEffort = 'medium') {
|
|
114
152
|
const map = new Map();
|
|
115
153
|
const upsertMin = (model, effort) => {
|
|
@@ -137,7 +175,7 @@ function getEffortForModel(model, modelEffort, defaultEffort) {
|
|
|
137
175
|
const normalizedModel = stripExtendedContextSuffix(model);
|
|
138
176
|
const effort = modelEffort.get(normalizedModel) ?? defaultEffort;
|
|
139
177
|
// Apply model-specific cap from catalog
|
|
140
|
-
return
|
|
178
|
+
return normalizeCodexEffortForModel(normalizedModel, effort);
|
|
141
179
|
}
|
|
142
180
|
exports.getEffortForModel = getEffortForModel;
|
|
143
181
|
function injectReasoningEffortIntoBody(body, effort) {
|
|
@@ -170,11 +208,13 @@ class CodexReasoningProxy {
|
|
|
170
208
|
this.sessionFallbackByModel = new Map();
|
|
171
209
|
this.recent = [];
|
|
172
210
|
this.counts = {
|
|
211
|
+
none: 0,
|
|
173
212
|
minimal: 0,
|
|
174
213
|
low: 0,
|
|
175
214
|
medium: 0,
|
|
176
215
|
high: 0,
|
|
177
216
|
xhigh: 0,
|
|
217
|
+
max: 0,
|
|
178
218
|
};
|
|
179
219
|
this.config = {
|
|
180
220
|
upstreamBaseUrl: config.upstreamBaseUrl,
|
|
@@ -384,7 +424,7 @@ class CodexReasoningProxy {
|
|
|
384
424
|
const requestedEffort = suffixParsed?.effort ??
|
|
385
425
|
getEffortForModel(normalizedRequestModel, this.modelEffort, this.config.defaultEffort);
|
|
386
426
|
const effort = !this.config.disableEffort && upstreamModel
|
|
387
|
-
?
|
|
427
|
+
? normalizeCodexEffortForModel(upstreamModel, requestedEffort)
|
|
388
428
|
: !this.config.disableEffort
|
|
389
429
|
? requestedEffort
|
|
390
430
|
: null;
|
|
@@ -604,7 +644,7 @@ class CodexReasoningProxy {
|
|
|
604
644
|
: null;
|
|
605
645
|
if (unsupportedError && fallbackModel && context.requestedModel) {
|
|
606
646
|
const retryEffort = !this.config.disableEffort && context.effort
|
|
607
|
-
?
|
|
647
|
+
? normalizeCodexEffortForModel(fallbackModel, context.effort)
|
|
608
648
|
: null;
|
|
609
649
|
const retryBody = this.buildForwardBody(body, fallbackModel, {
|
|
610
650
|
effort: retryEffort,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-reasoning-proxy.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-reasoning-proxy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-reasoning-proxy.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-reasoning-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ import type { CLIProxyProvider } from '../types';
|
|
|
10
10
|
/** Env vars that carry model identifiers. */
|
|
11
11
|
export declare const MODEL_ENV_VAR_KEYS: readonly ["ANTHROPIC_MODEL", "ANTHROPIC_DEFAULT_OPUS_MODEL", "ANTHROPIC_DEFAULT_SONNET_MODEL", "ANTHROPIC_DEFAULT_HAIKU_MODEL", "ANTHROPIC_DEFAULT_FABLE_MODEL"];
|
|
12
12
|
type ProviderLike = CLIProxyProvider | string | null | undefined;
|
|
13
|
-
export type CodexModelTuningEffort = 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
|
|
13
|
+
export type CodexModelTuningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
|
|
14
14
|
export type CodexModelServiceTier = 'fast';
|
|
15
15
|
export interface CodexModelTuningAlias {
|
|
16
16
|
baseModel: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-id-normalizer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAGjD,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB,kKAA2B,CAAC;AAE3D,KAAK,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAkCjE,MAAM,MAAM,sBAAsB,
|
|
1
|
+
{"version":3,"file":"model-id-normalizer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAGjD,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB,kKAA2B,CAAC;AAE3D,KAAK,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAkCjE,MAAM,MAAM,sBAAsB,GAC9B,MAAM,GACN,SAAS,GACT,KAAK,GACL,QAAQ,GACR,MAAM,GACN,OAAO,GACP,KAAK,CAAC;AACV,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAC3C;AAkDD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,GAAG,IAAI,CAetF;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3E;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAIrE;AAED,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAG/D;AAED,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAG/D;AAED,0FAA0F;AAC1F,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK5D;AAED,4EAA4E;AAC5E,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAatE;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQtE;AAED,oEAAoE;AACpE,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMrE;AAED;;;GAGG;AACH,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED;;;GAGG;AACH,wBAAgB,0CAA0C,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;GAEG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,YAAY,GACrB,MAAM,GAAG,IAAI,CAKf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAWzF;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAG5F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,CAWxF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,QAAQ,EAAE,YAAY,EACtB,IAAI,GAAE,SAAS,MAAM,EAAuB,GAC3C,MAAM,CAAC,UAAU,CAenB"}
|
|
@@ -18,7 +18,7 @@ const DENIED_ANTIGRAVITY_MODEL_REGEX = /claude-(?:opus|sonnet)-4(?:[.-])5(?:-thi
|
|
|
18
18
|
const DENIED_ANTIGRAVITY_OPUS_45_REGEX = /claude-opus-4(?:[.-])5(?:-thinking)?(?=(?:$|[^a-z0-9]))/gi;
|
|
19
19
|
const DENIED_ANTIGRAVITY_SONNET_45_REGEX = /claude-sonnet-4(?:[.-])5(?:-thinking)?(?=(?:$|[^a-z0-9]))/gi;
|
|
20
20
|
const CANONICAL_ANTIGRAVITY_OPUS_46_MODEL = 'claude-opus-4-6-thinking';
|
|
21
|
-
const CODEX_TUNING_SUFFIX_TOKEN_REGEX = /-(minimal|low|medium|high|xhigh|fast)$/i;
|
|
21
|
+
const CODEX_TUNING_SUFFIX_TOKEN_REGEX = /-(none|minimal|low|medium|high|xhigh|max|fast)$/i;
|
|
22
22
|
const CODEX_LEGACY_MODEL_ALIASES = Object.freeze({
|
|
23
23
|
'gpt-5-codex': 'gpt-5.4',
|
|
24
24
|
'gpt-5-codex-mini': 'gpt-5.4-mini',
|
|
@@ -144,6 +144,10 @@ exports.stripCodexEffortSuffix = stripCodexEffortSuffix;
|
|
|
144
144
|
function normalizeCodexLegacyModelAliases(model) {
|
|
145
145
|
const trimmed = trimModelId(model);
|
|
146
146
|
const { baseModel, suffix } = splitBaseModelAndSuffix(trimmed);
|
|
147
|
+
const exactReplacement = CODEX_LEGACY_MODEL_ALIASES[baseModel.trim().toLowerCase()];
|
|
148
|
+
if (exactReplacement) {
|
|
149
|
+
return `${exactReplacement}${suffix}`;
|
|
150
|
+
}
|
|
147
151
|
const { baseModel: baseWithoutEffort, suffix: tuningSuffix } = splitCodexTuningSuffix(baseModel);
|
|
148
152
|
const replacement = CODEX_LEGACY_MODEL_ALIASES[baseWithoutEffort.trim().toLowerCase()];
|
|
149
153
|
if (!replacement) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-id-normalizer.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,gFAA+E;AAE/E,6CAA6C;AAChC,QAAA,kBAAkB,GAAG,iDAAwB,CAAC;AAI3D,MAAM,2BAA2B,GAAG,+DAA+D,CAAC;AACpG,MAAM,4BAA4B,GAChC,wEAAwE,CAAC;AAC3E,MAAM,+CAA+C,GACnD,yDAAyD,CAAC;AAC5D,MAAM,qCAAqC,GAAG,mBAAmB,CAAC;AAClE,MAAM,8BAA8B,GAClC,qEAAqE,CAAC;AACxE,MAAM,gCAAgC,GACpC,2DAA2D,CAAC;AAC9D,MAAM,kCAAkC,GACtC,6DAA6D,CAAC;AAChE,MAAM,mCAAmC,GAAG,0BAA0B,CAAC;AACvE,MAAM,+BAA+B,GAAG,
|
|
1
|
+
{"version":3,"file":"model-id-normalizer.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/model-id-normalizer.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();
|