@kaitranntt/ccs 7.77.1-dev.7 → 7.77.1-dev.9
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 +2 -1
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js +2 -2
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts +8 -2
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +82 -33
- 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 +28 -11
- 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 +9 -8
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts +2 -0
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +2 -0
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/provider-capabilities.js +1 -1
- package/dist/cliproxy/provider-capabilities.js.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/variant-subcommand.js +44 -12
- package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
- package/dist/commands/command-catalog.js +2 -2
- package/dist/commands/command-catalog.js.map +1 -1
- package/dist/commands/copilot-command.js +3 -1
- package/dist/commands/copilot-command.js.map +1 -1
- package/dist/commands/help-command.js +1 -1
- package/dist/commands/help-command.js.map +1 -1
- package/dist/config/loader/yaml-serializer.d.ts.map +1 -1
- package/dist/config/loader/yaml-serializer.js +4 -3
- package/dist/config/loader/yaml-serializer.js.map +1 -1
- package/dist/config/schemas/copilot-cursor.d.ts +2 -2
- package/dist/config/schemas/copilot-cursor.js +1 -1
- package/dist/config/schemas/unified-config.d.ts +1 -1
- package/dist/config/schemas/unified-config.d.ts.map +1 -1
- package/dist/ui/assets/{accounts-BWciW_nb.js → accounts-DkID6f81.js} +1 -1
- package/dist/ui/assets/{alert-dialog-C-oyVuIB.js → alert-dialog-BM9gIsRp.js} +1 -1
- package/dist/ui/assets/{api-CE6KShct.js → api-0YJdilQb.js} +1 -1
- package/dist/ui/assets/{auth-section-Batq2rqI.js → auth-section-C1ljCo7W.js} +1 -1
- package/dist/ui/assets/{backups-section-C0dn7Ket.js → backups-section-C-iLf1kg.js} +1 -1
- package/dist/ui/assets/{channels-CVJfKJyT.js → channels-DDSqllsQ.js} +1 -1
- package/dist/ui/assets/{checkbox-BWXzxH0e.js → checkbox-5R1YTubE.js} +1 -1
- package/dist/ui/assets/{claude-extension-DH0ltdyv.js → claude-extension-CEGefl3-.js} +1 -1
- package/dist/ui/assets/cliproxy-R4kPUeL-.js +3 -0
- package/dist/ui/assets/{cliproxy-ai-providers-QZCa2DN7.js → cliproxy-ai-providers-DVF3FnXM.js} +1 -1
- package/dist/ui/assets/{cliproxy-control-panel-BT1a2KtK.js → cliproxy-control-panel-CIsKyGK6.js} +1 -1
- package/dist/ui/assets/{codex-DVC-dMzi.js → codex-BiEEUC4Y.js} +1 -1
- package/dist/ui/assets/{confirm-dialog-7py4oJEQ.js → confirm-dialog-BhJV4F_d.js} +1 -1
- package/dist/ui/assets/{copilot-DOe7yu8W.js → copilot-DgRLuQfV.js} +2 -2
- package/dist/ui/assets/{cursor-TaT3xM-m.js → cursor-BuOjfajj.js} +1 -1
- package/dist/ui/assets/{droid-ClF_i2qJ.js → droid-BPiviAW2.js} +1 -1
- package/dist/ui/assets/{globalenv-section-CLjnaW56.js → globalenv-section-DAqbiNI1.js} +1 -1
- package/dist/ui/assets/{health-BUHx35_z.js → health-B_CfF7J0.js} +1 -1
- package/dist/ui/assets/{icons-Ce9So20E.js → icons-DIVjDO-z.js} +1 -1
- package/dist/ui/assets/{index-DCdHT0L4.js → index-BEGD-4HR.js} +1 -1
- package/dist/ui/assets/{index-BIF0Wvld.js → index-BJl0cazY.js} +20 -20
- package/dist/ui/assets/{index-D8l3dEVy.js → index-Bc-AbZRU.js} +1 -1
- package/dist/ui/assets/{index-Cv_ifcCd.js → index-BqR6NZDE.js} +1 -1
- package/dist/ui/assets/{index-BIgntzT5.js → index-Cj4mWFVK.js} +1 -1
- package/dist/ui/assets/{index-DZ9DNmxz.js → index-CzKdWNe5.js} +1 -1
- package/dist/ui/assets/{index-Czt4jG_U.js → index-LJitUhfE.js} +1 -1
- package/dist/ui/assets/{logs-4FBxeZlN.js → logs-Lqv-I3_T.js} +1 -1
- package/dist/ui/assets/{masked-input-BUPGfXYs.js → masked-input-CgCDYXYf.js} +1 -1
- package/dist/ui/assets/{proxy-status-widget-CEVsYzZc.js → proxy-status-widget-Df-4cfdm.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-Bx9NZXKo.js → raw-json-settings-editor-panel-BpXdUisD.js} +1 -1
- package/dist/ui/assets/{searchable-select-CRBVpRX9.js → searchable-select-DCOfw3f0.js} +1 -1
- package/dist/ui/assets/{separator-oLpQ8QTJ.js → separator-Ct6a34bG.js} +1 -1
- package/dist/ui/assets/{shared-CDOZvFvu.js → shared-D-JFc_Cw.js} +1 -1
- package/dist/ui/assets/{table-CvB4g1aV.js → table-DsU2UX-e.js} +1 -1
- package/dist/ui/assets/{updates-FB-3z9nq.js → updates-D-0gOqSU.js} +1 -1
- package/dist/ui/index.html +2 -2
- package/package.json +1 -1
- package/dist/ui/assets/cliproxy-5ZQ4DdWj.js +0 -3
package/README.md
CHANGED
|
@@ -26,7 +26,8 @@ CCS gives you one stable command surface while letting you switch between:
|
|
|
26
26
|
|
|
27
27
|
- multiple runtimes such as Claude Code, Factory Droid, and Codex CLI
|
|
28
28
|
- multiple Claude subscriptions and isolated account contexts
|
|
29
|
-
- OAuth providers like Codex,
|
|
29
|
+
- OAuth providers like Codex, Kiro, Claude, Qwen, Kimi, and more, with legacy
|
|
30
|
+
Copilot compatibility for existing setups
|
|
30
31
|
- API and local-model profiles like GLM, Kimi, OpenRouter, Ollama, llama.cpp,
|
|
31
32
|
Novita, and Alibaba Coding Plan
|
|
32
33
|
|
|
@@ -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;AAkBzD,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,7 +9,7 @@ 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
|
|
12
|
+
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:xhigh|high|medium)(?:-fast)?|-fast(?:-(?:xhigh|high|medium))?)$/i;
|
|
13
13
|
const CODEX_PAREN_SUFFIX_REGEX = /\((xhigh|high|medium)\)$/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()));
|
|
@@ -29,7 +29,7 @@ function normalizeCodexModelId(model) {
|
|
|
29
29
|
.trim()
|
|
30
30
|
.replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '')
|
|
31
31
|
.replace(CODEX_PAREN_SUFFIX_REGEX, '')
|
|
32
|
-
.replace(
|
|
32
|
+
.replace(CODEX_TUNING_SUFFIX_REGEX, '')
|
|
33
33
|
.trim();
|
|
34
34
|
return (0, model_id_normalizer_1.normalizeModelIdForProvider)(stripped, 'codex').trim().toLowerCase();
|
|
35
35
|
}
|
|
@@ -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,
|
|
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,5 @@
|
|
|
1
1
|
export type CodexReasoningEffort = 'medium' | 'high' | 'xhigh';
|
|
2
|
+
export type CodexServiceTier = 'fast';
|
|
2
3
|
export interface CodexReasoningModelMap {
|
|
3
4
|
opusModel?: string;
|
|
4
5
|
sonnetModel?: string;
|
|
@@ -26,6 +27,10 @@ export interface CodexReasoningProxyConfig {
|
|
|
26
27
|
export declare function buildCodexModelEffortMap(models: CodexReasoningModelMap, defaultEffort?: CodexReasoningEffort): Map<string, CodexReasoningEffort>;
|
|
27
28
|
export declare function getEffortForModel(model: string | null, modelEffort: Map<string, CodexReasoningEffort>, defaultEffort: CodexReasoningEffort): CodexReasoningEffort;
|
|
28
29
|
export declare function injectReasoningEffortIntoBody(body: unknown, effort: CodexReasoningEffort): unknown;
|
|
30
|
+
export declare function injectCodexRequestTuningIntoBody(body: unknown, tuning: {
|
|
31
|
+
effort: CodexReasoningEffort | null;
|
|
32
|
+
serviceTier: CodexServiceTier | null;
|
|
33
|
+
}): unknown;
|
|
29
34
|
export declare class CodexReasoningProxy {
|
|
30
35
|
private server;
|
|
31
36
|
private port;
|
|
@@ -40,10 +45,11 @@ export declare class CodexReasoningProxy {
|
|
|
40
45
|
private buildForwardBody;
|
|
41
46
|
private sendBufferedResponse;
|
|
42
47
|
/**
|
|
43
|
-
* Treat trailing "-high/-medium/-xhigh"
|
|
48
|
+
* Treat trailing "-high/-medium/-xhigh" and "-fast" as Codex tuning aliases
|
|
49
|
+
* only for known codex models.
|
|
44
50
|
* Prevents stripping legitimate upstream model IDs that happen to end with those tokens.
|
|
45
51
|
*/
|
|
46
|
-
private
|
|
52
|
+
private parseTuningAlias;
|
|
47
53
|
private log;
|
|
48
54
|
private trace;
|
|
49
55
|
private record;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-reasoning-proxy.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/codex-reasoning-proxy.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,oBAAoB,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":"AAUA,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;AAC/D,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAGtC,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,sBAAsB,CAAC;IACjC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAuGD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,sBAAsB,EAC9B,aAAa,GAAE,oBAA+B,GAC7C,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAqBnC;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,aAAa,EAAE,oBAAoB,GAClC,oBAAoB,CAMtB;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAET;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,OAAO,EACb,MAAM,EAAE;IACN,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACpC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACtC,GACA,OAAO,CAoBT;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAY2C;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IACpE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAOf;IACR,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0E;gBAErF,MAAM,EAAE,yBAAyB;IAe7C,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,oBAAoB;IAU5B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,GAAG;IAMX,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,MAAM;IAqBR,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAkB9B,IAAI,IAAI,IAAI;IAOZ,OAAO,CAAC,QAAQ;YAqBF,aAAa;IA0H3B,OAAO,CAAC,mBAAmB;IAmC3B;;;OAGG;IACH,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,UAAU;IAiClB,OAAO,CAAC,WAAW;CAuGpB"}
|
|
@@ -23,13 +23,17 @@ 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.injectReasoningEffortIntoBody = exports.getEffortForModel = exports.buildCodexModelEffortMap = void 0;
|
|
26
|
+
exports.CodexReasoningProxy = exports.injectCodexRequestTuningIntoBody = exports.injectReasoningEffortIntoBody = exports.getEffortForModel = exports.buildCodexModelEffortMap = void 0;
|
|
27
27
|
const http = __importStar(require("http"));
|
|
28
28
|
const https = __importStar(require("https"));
|
|
29
29
|
const url_1 = require("url");
|
|
30
30
|
const codex_plan_compatibility_1 = require("./codex-plan-compatibility");
|
|
31
31
|
const model_catalog_1 = require("../model-catalog");
|
|
32
32
|
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
|
|
33
|
+
const CODEX_TUNING_SUFFIX_TOKEN_REGEX = /-(xhigh|high|medium|fast)$/i;
|
|
34
|
+
const CODEX_SERVICE_TIER_REQUEST_VALUE = {
|
|
35
|
+
fast: 'priority',
|
|
36
|
+
};
|
|
33
37
|
function stripExtendedContextSuffix(model) {
|
|
34
38
|
return model.replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '').trim();
|
|
35
39
|
}
|
|
@@ -39,16 +43,33 @@ function isNonEmptyString(value) {
|
|
|
39
43
|
function isRecord(value) {
|
|
40
44
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
41
45
|
}
|
|
42
|
-
function
|
|
46
|
+
function parseModelTuningSuffix(model) {
|
|
43
47
|
const normalizedModel = stripExtendedContextSuffix(model);
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
let upstreamModel = normalizedModel;
|
|
49
|
+
let effort = null;
|
|
50
|
+
let serviceTier = null;
|
|
51
|
+
for (let consumed = 0; consumed < 2; consumed += 1) {
|
|
52
|
+
const match = upstreamModel.match(CODEX_TUNING_SUFFIX_TOKEN_REGEX);
|
|
53
|
+
if (!match?.[1])
|
|
54
|
+
break;
|
|
55
|
+
const token = match[1].toLowerCase();
|
|
56
|
+
if (token === 'fast') {
|
|
57
|
+
if (serviceTier)
|
|
58
|
+
break;
|
|
59
|
+
serviceTier = 'fast';
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
if (effort)
|
|
63
|
+
break;
|
|
64
|
+
effort = token;
|
|
65
|
+
}
|
|
66
|
+
upstreamModel = upstreamModel.slice(0, -match[0].length).trim();
|
|
67
|
+
}
|
|
68
|
+
if (!effort && !serviceTier)
|
|
46
69
|
return null;
|
|
47
|
-
const upstreamModel = match[1]?.trim();
|
|
48
|
-
const effort = match[2]?.toLowerCase();
|
|
49
70
|
if (!upstreamModel)
|
|
50
71
|
return null;
|
|
51
|
-
return { upstreamModel, effort };
|
|
72
|
+
return { upstreamModel, effort, serviceTier };
|
|
52
73
|
}
|
|
53
74
|
function isKnownCodexModelId(model, modelEffort) {
|
|
54
75
|
if (modelEffort.has(model))
|
|
@@ -117,20 +138,28 @@ function getEffortForModel(model, modelEffort, defaultEffort) {
|
|
|
117
138
|
}
|
|
118
139
|
exports.getEffortForModel = getEffortForModel;
|
|
119
140
|
function injectReasoningEffortIntoBody(body, effort) {
|
|
141
|
+
return injectCodexRequestTuningIntoBody(body, { effort, serviceTier: null });
|
|
142
|
+
}
|
|
143
|
+
exports.injectReasoningEffortIntoBody = injectReasoningEffortIntoBody;
|
|
144
|
+
function injectCodexRequestTuningIntoBody(body, tuning) {
|
|
120
145
|
if (!isRecord(body))
|
|
121
146
|
return body;
|
|
122
147
|
// OpenAI Responses API knob: reasoning: { effort: "..." }
|
|
123
148
|
// Always override effort (user expectation).
|
|
124
149
|
const existingReasoning = isRecord(body.reasoning) ? body.reasoning : {};
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
reasoning
|
|
150
|
+
const tunedBody = { ...body };
|
|
151
|
+
if (tuning.effort) {
|
|
152
|
+
tunedBody.reasoning = {
|
|
128
153
|
...existingReasoning,
|
|
129
|
-
effort,
|
|
130
|
-
}
|
|
131
|
-
}
|
|
154
|
+
effort: tuning.effort,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
if (tuning.serviceTier) {
|
|
158
|
+
tunedBody.service_tier = CODEX_SERVICE_TIER_REQUEST_VALUE[tuning.serviceTier];
|
|
159
|
+
}
|
|
160
|
+
return tunedBody;
|
|
132
161
|
}
|
|
133
|
-
exports.
|
|
162
|
+
exports.injectCodexRequestTuningIntoBody = injectCodexRequestTuningIntoBody;
|
|
134
163
|
class CodexReasoningProxy {
|
|
135
164
|
constructor(config) {
|
|
136
165
|
this.server = null;
|
|
@@ -163,25 +192,30 @@ class CodexReasoningProxy {
|
|
|
163
192
|
return;
|
|
164
193
|
this.sessionFallbackByModel.set(normalizedRequestedModel, normalizedFallbackModel);
|
|
165
194
|
}
|
|
166
|
-
buildForwardBody(body, upstreamModel,
|
|
195
|
+
buildForwardBody(body, upstreamModel, tuning) {
|
|
167
196
|
const withUpstreamModel = upstreamModel && isRecord(body) ? { ...body, model: upstreamModel } : body;
|
|
168
|
-
|
|
197
|
+
const effort = this.config.disableEffort ? null : tuning.effort;
|
|
198
|
+
if (!effort && !tuning.serviceTier) {
|
|
169
199
|
return withUpstreamModel;
|
|
170
200
|
}
|
|
171
|
-
return
|
|
201
|
+
return injectCodexRequestTuningIntoBody(withUpstreamModel, {
|
|
202
|
+
effort,
|
|
203
|
+
serviceTier: tuning.serviceTier,
|
|
204
|
+
});
|
|
172
205
|
}
|
|
173
206
|
sendBufferedResponse(clientRes, statusCode, headers, responseBody) {
|
|
174
207
|
clientRes.writeHead(statusCode, headers);
|
|
175
208
|
clientRes.end(responseBody);
|
|
176
209
|
}
|
|
177
210
|
/**
|
|
178
|
-
* Treat trailing "-high/-medium/-xhigh"
|
|
211
|
+
* Treat trailing "-high/-medium/-xhigh" and "-fast" as Codex tuning aliases
|
|
212
|
+
* only for known codex models.
|
|
179
213
|
* Prevents stripping legitimate upstream model IDs that happen to end with those tokens.
|
|
180
214
|
*/
|
|
181
|
-
|
|
215
|
+
parseTuningAlias(model) {
|
|
182
216
|
if (!model)
|
|
183
217
|
return null;
|
|
184
|
-
const parsed =
|
|
218
|
+
const parsed = parseModelTuningSuffix(model);
|
|
185
219
|
if (!parsed)
|
|
186
220
|
return null;
|
|
187
221
|
if (!isKnownCodexModelId(parsed.upstreamModel, this.modelEffort)) {
|
|
@@ -218,9 +252,18 @@ class CodexReasoningProxy {
|
|
|
218
252
|
// ignore
|
|
219
253
|
}
|
|
220
254
|
}
|
|
221
|
-
record(model, upstreamModel, effort, path) {
|
|
222
|
-
|
|
223
|
-
|
|
255
|
+
record(model, upstreamModel, effort, serviceTier, path) {
|
|
256
|
+
if (effort) {
|
|
257
|
+
this.counts[effort] += 1;
|
|
258
|
+
}
|
|
259
|
+
this.recent.push({
|
|
260
|
+
at: new Date().toISOString(),
|
|
261
|
+
model,
|
|
262
|
+
upstreamModel,
|
|
263
|
+
effort,
|
|
264
|
+
serviceTier,
|
|
265
|
+
path,
|
|
266
|
+
});
|
|
224
267
|
if (this.recent.length > 50)
|
|
225
268
|
this.recent.shift();
|
|
226
269
|
}
|
|
@@ -319,12 +362,13 @@ class CodexReasoningProxy {
|
|
|
319
362
|
const normalizedRequestModel = originalModel
|
|
320
363
|
? stripExtendedContextSuffix(originalModel)
|
|
321
364
|
: null;
|
|
322
|
-
// Support "model aliases" like `gpt-5.
|
|
323
|
-
// - upstream model: `gpt-5.
|
|
324
|
-
// - reasoning.effort: `
|
|
365
|
+
// Support "model aliases" like `gpt-5.4-high-fast` by translating to:
|
|
366
|
+
// - upstream model: `gpt-5.4`
|
|
367
|
+
// - reasoning.effort: `high`
|
|
368
|
+
// - service_tier: `priority` (Codex request value for fast mode)
|
|
325
369
|
//
|
|
326
|
-
// This allows tier
|
|
327
|
-
const suffixParsed = this.
|
|
370
|
+
// This allows tier/speed mapping without inventing upstream model IDs.
|
|
371
|
+
const suffixParsed = this.parseTuningAlias(normalizedRequestModel);
|
|
328
372
|
const requestedUpstreamModel = suffixParsed?.upstreamModel ?? normalizedRequestModel;
|
|
329
373
|
const rememberedFallback = this.getRememberedFallback(requestedUpstreamModel);
|
|
330
374
|
const upstreamModel = rememberedFallback ?? requestedUpstreamModel;
|
|
@@ -335,10 +379,11 @@ class CodexReasoningProxy {
|
|
|
335
379
|
: !this.config.disableEffort
|
|
336
380
|
? requestedEffort
|
|
337
381
|
: null;
|
|
338
|
-
const
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
this.
|
|
382
|
+
const serviceTier = suffixParsed?.serviceTier ?? null;
|
|
383
|
+
const rewritten = this.buildForwardBody(parsed, upstreamModel, { effort, serviceTier });
|
|
384
|
+
if (effort || serviceTier) {
|
|
385
|
+
this.record(originalModel, upstreamModel, effort, serviceTier, requestPath);
|
|
386
|
+
this.trace(`[${new Date().toISOString()}] model=${originalModel ?? 'null'} upstreamModel=${upstreamModel ?? 'null'} effort=${effort ?? 'null'} serviceTier=${serviceTier ?? 'null'} path=${requestPath}`);
|
|
342
387
|
}
|
|
343
388
|
else {
|
|
344
389
|
this.log(`[disabled] model=${originalModel ?? 'null'} -> passthrough (no reasoning)`);
|
|
@@ -351,6 +396,7 @@ class CodexReasoningProxy {
|
|
|
351
396
|
requestedModel: requestedUpstreamModel,
|
|
352
397
|
attemptedUpstreamModel: upstreamModel,
|
|
353
398
|
effort,
|
|
399
|
+
serviceTier,
|
|
354
400
|
retryCount: 0,
|
|
355
401
|
});
|
|
356
402
|
}
|
|
@@ -478,7 +524,10 @@ class CodexReasoningProxy {
|
|
|
478
524
|
const retryEffort = !this.config.disableEffort && context.effort
|
|
479
525
|
? capEffortAtModelMax(fallbackModel, context.effort)
|
|
480
526
|
: null;
|
|
481
|
-
const retryBody = this.buildForwardBody(body, fallbackModel,
|
|
527
|
+
const retryBody = this.buildForwardBody(body, fallbackModel, {
|
|
528
|
+
effort: retryEffort,
|
|
529
|
+
serviceTier: context.serviceTier,
|
|
530
|
+
});
|
|
482
531
|
this.log(`Upstream rejected model "${context.attemptedUpstreamModel}". Retrying ${context.requestPath} with "${fallbackModel}".`);
|
|
483
532
|
const retryStatusCode = await this.forwardJson(originalReq, clientRes, upstreamUrl, retryBody, {
|
|
484
533
|
...context,
|
|
@@ -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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"}
|
|
@@ -24,7 +24,7 @@ export declare function isAntigravityProvider(provider: ProviderLike): boolean;
|
|
|
24
24
|
export declare function isCodexProvider(provider: ProviderLike): boolean;
|
|
25
25
|
/** Whether provider maps to iFlow model alias canonicalization rules. */
|
|
26
26
|
export declare function isIFlowProvider(provider: ProviderLike): boolean;
|
|
27
|
-
/** Strip Codex effort suffixes while preserving trailing config suffixes. */
|
|
27
|
+
/** Strip Codex effort/service-tier suffixes while preserving trailing config suffixes. */
|
|
28
28
|
export declare function stripCodexEffortSuffix(model: string): string;
|
|
29
29
|
/** Normalize legacy Codex aliases to the current public Codex model IDs. */
|
|
30
30
|
export declare function normalizeCodexLegacyModelAliases(model: string): 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,iIAA2B,CAAC;AAE3D,KAAK,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;
|
|
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,iIAA2B,CAAC;AAE3D,KAAK,YAAY,GAAG,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAkFjE;;;;;;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,CAStE;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
|
|
21
|
+
const CODEX_TUNING_SUFFIX_TOKEN_REGEX = /-(xhigh|high|medium|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',
|
|
@@ -52,14 +52,31 @@ function splitBaseModelAndSuffix(model) {
|
|
|
52
52
|
suffix: model.slice(suffixStart),
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
|
-
function
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
55
|
+
function splitCodexTuningSuffix(model) {
|
|
56
|
+
let baseModel = model;
|
|
57
|
+
let effort = null;
|
|
58
|
+
let serviceTier = null;
|
|
59
|
+
for (let consumed = 0; consumed < 2; consumed += 1) {
|
|
60
|
+
const match = baseModel.match(CODEX_TUNING_SUFFIX_TOKEN_REGEX);
|
|
61
|
+
if (!match?.[1])
|
|
62
|
+
break;
|
|
63
|
+
const token = match[1].toLowerCase();
|
|
64
|
+
if (token === 'fast') {
|
|
65
|
+
if (serviceTier)
|
|
66
|
+
break;
|
|
67
|
+
serviceTier = 'fast';
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
if (effort)
|
|
71
|
+
break;
|
|
72
|
+
effort = token;
|
|
73
|
+
}
|
|
74
|
+
baseModel = baseModel.slice(0, -match[0].length);
|
|
59
75
|
}
|
|
76
|
+
const suffix = [effort, serviceTier].filter(Boolean).join('-');
|
|
60
77
|
return {
|
|
61
|
-
baseModel
|
|
62
|
-
suffix:
|
|
78
|
+
baseModel,
|
|
79
|
+
suffix: suffix ? `-${suffix}` : '',
|
|
63
80
|
};
|
|
64
81
|
}
|
|
65
82
|
/**
|
|
@@ -98,11 +115,11 @@ function isIFlowProvider(provider) {
|
|
|
98
115
|
return provider.trim().toLowerCase() === 'iflow';
|
|
99
116
|
}
|
|
100
117
|
exports.isIFlowProvider = isIFlowProvider;
|
|
101
|
-
/** Strip Codex effort suffixes while preserving trailing config suffixes. */
|
|
118
|
+
/** Strip Codex effort/service-tier suffixes while preserving trailing config suffixes. */
|
|
102
119
|
function stripCodexEffortSuffix(model) {
|
|
103
120
|
const trimmed = trimModelId(model);
|
|
104
121
|
const { baseModel, suffix } = splitBaseModelAndSuffix(trimmed);
|
|
105
|
-
const { baseModel: withoutEffort } =
|
|
122
|
+
const { baseModel: withoutEffort } = splitCodexTuningSuffix(baseModel);
|
|
106
123
|
return `${withoutEffort}${suffix}`;
|
|
107
124
|
}
|
|
108
125
|
exports.stripCodexEffortSuffix = stripCodexEffortSuffix;
|
|
@@ -110,12 +127,12 @@ exports.stripCodexEffortSuffix = stripCodexEffortSuffix;
|
|
|
110
127
|
function normalizeCodexLegacyModelAliases(model) {
|
|
111
128
|
const trimmed = trimModelId(model);
|
|
112
129
|
const { baseModel, suffix } = splitBaseModelAndSuffix(trimmed);
|
|
113
|
-
const { baseModel: baseWithoutEffort, suffix:
|
|
130
|
+
const { baseModel: baseWithoutEffort, suffix: tuningSuffix } = splitCodexTuningSuffix(baseModel);
|
|
114
131
|
const replacement = CODEX_LEGACY_MODEL_ALIASES[baseWithoutEffort.trim().toLowerCase()];
|
|
115
132
|
if (!replacement) {
|
|
116
133
|
return trimmed;
|
|
117
134
|
}
|
|
118
|
-
return `${replacement}${
|
|
135
|
+
return `${replacement}${tuningSuffix}${suffix}`;
|
|
119
136
|
}
|
|
120
137
|
exports.normalizeCodexLegacyModelAliases = normalizeCodexLegacyModelAliases;
|
|
121
138
|
/**
|
|
@@ -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,
|
|
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;AA2CpD;;;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,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,17 +11,20 @@ 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 = /^(medium|high|xhigh)$/i;
|
|
15
|
+
const CODEX_FAST_TUNING_VALUE_REGEX = /^(?:(medium|high|xhigh)-fast|fast-(medium|high|xhigh)|fast)$/i;
|
|
16
|
+
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:xhigh|high|medium)(?:-fast)?|-fast(?:-(?:xhigh|high|medium))?)$/i;
|
|
14
17
|
/**
|
|
15
18
|
* Normalize model ID for provider capability lookup.
|
|
16
|
-
* Codex may carry effort suffixes in
|
|
19
|
+
* Codex may carry effort/service-tier suffixes in legacy "(high)" or current "-high-fast" forms.
|
|
17
20
|
*/
|
|
18
21
|
function normalizeModelForThinkingLookup(model, provider) {
|
|
19
22
|
const withoutExtendedContext = model.replace(/\[1m\]$/i, '').trim();
|
|
20
23
|
const providerNormalized = (0, model_id_normalizer_1.normalizeModelIdForProvider)(withoutExtendedContext, provider);
|
|
21
24
|
if (provider !== 'codex')
|
|
22
25
|
return providerNormalized;
|
|
23
|
-
// New codex suffix
|
|
24
|
-
const codexSuffixMatch = providerNormalized.match(/^(
|
|
26
|
+
// New codex suffix forms: gpt-5.4-high-fast, gpt-5.4-fast-high -> gpt-5.4
|
|
27
|
+
const codexSuffixMatch = providerNormalized.match(/^(.*?)(?:-(?:xhigh|high|medium)(?:-fast)?|-fast(?:-(?:xhigh|high|medium))?)$/i);
|
|
25
28
|
if (codexSuffixMatch?.[1]) {
|
|
26
29
|
return codexSuffixMatch[1].trim();
|
|
27
30
|
}
|
|
@@ -70,8 +73,6 @@ exports.applyThinkingSuffix = applyThinkingSuffix;
|
|
|
70
73
|
* - Codex: model-effort e.g. "gpt-5.3-codex-xhigh"
|
|
71
74
|
*/
|
|
72
75
|
function applyThinkingSuffixForProvider(model, thinkingValue, provider) {
|
|
73
|
-
const codexEffortRegex = /^(medium|high|xhigh)$/i;
|
|
74
|
-
const codexModelSuffixRegex = /-(medium|high|xhigh)$/i;
|
|
75
76
|
const parenthesizedSuffixMatch = model.match(/\(([^)]+)\)$/);
|
|
76
77
|
// Existing parenthesized suffix:
|
|
77
78
|
// - keep as-is for non-codex providers unless the target model now expects
|
|
@@ -80,7 +81,7 @@ function applyThinkingSuffixForProvider(model, thinkingValue, provider) {
|
|
|
80
81
|
if (parenthesizedSuffixMatch) {
|
|
81
82
|
if (provider === 'codex') {
|
|
82
83
|
const normalizedParensValue = parenthesizedSuffixMatch[1]?.trim().toLowerCase() || '';
|
|
83
|
-
if (
|
|
84
|
+
if (CODEX_EFFORT_REGEX.test(normalizedParensValue)) {
|
|
84
85
|
return model.replace(/\([^)]+\)$/, `-${normalizedParensValue}`);
|
|
85
86
|
}
|
|
86
87
|
}
|
|
@@ -94,11 +95,11 @@ function applyThinkingSuffixForProvider(model, thinkingValue, provider) {
|
|
|
94
95
|
return model;
|
|
95
96
|
}
|
|
96
97
|
if (provider === 'codex') {
|
|
97
|
-
if (
|
|
98
|
+
if (CODEX_TUNING_SUFFIX_REGEX.test(model)) {
|
|
98
99
|
return model;
|
|
99
100
|
}
|
|
100
101
|
const normalized = String(thinkingValue).trim().toLowerCase();
|
|
101
|
-
if (
|
|
102
|
+
if (CODEX_EFFORT_REGEX.test(normalized) || CODEX_FAST_TUNING_VALUE_REGEX.test(normalized)) {
|
|
102
103
|
return `${model}-${normalized}`;
|
|
103
104
|
}
|
|
104
105
|
}
|