@kaitranntt/ccs 7.51.0-dev.1 → 7.51.0-dev.11
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 +16 -0
- package/dist/api/services/profile-writer.d.ts.map +1 -1
- package/dist/api/services/profile-writer.js +33 -0
- package/dist/api/services/profile-writer.js.map +1 -1
- package/dist/auth/profile-continuity-inheritance.d.ts +20 -0
- package/dist/auth/profile-continuity-inheritance.d.ts.map +1 -0
- package/dist/auth/profile-continuity-inheritance.js +139 -0
- package/dist/auth/profile-continuity-inheritance.js.map +1 -0
- package/dist/ccs.js +39 -3
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/catalog-cache.d.ts.map +1 -1
- package/dist/cliproxy/catalog-cache.js +10 -3
- package/dist/cliproxy/catalog-cache.js.map +1 -1
- package/dist/cliproxy/composite-validator.d.ts.map +1 -1
- package/dist/cliproxy/composite-validator.js +9 -0
- package/dist/cliproxy/composite-validator.js.map +1 -1
- package/dist/cliproxy/config/env-builder.d.ts.map +1 -1
- package/dist/cliproxy/config/env-builder.js +74 -16
- package/dist/cliproxy/config/env-builder.js.map +1 -1
- package/dist/cliproxy/config/generator.d.ts +3 -1
- package/dist/cliproxy/config/generator.d.ts.map +1 -1
- package/dist/cliproxy/config/generator.js +17 -6
- package/dist/cliproxy/config/generator.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.d.ts +2 -0
- package/dist/cliproxy/executor/env-resolver.d.ts.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +2 -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 +15 -0
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +11 -39
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/model-config.d.ts.map +1 -1
- package/dist/cliproxy/model-config.js +12 -11
- package/dist/cliproxy/model-config.js.map +1 -1
- package/dist/cliproxy/model-id-normalizer.d.ts +37 -2
- package/dist/cliproxy/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/model-id-normalizer.js +132 -7
- package/dist/cliproxy/model-id-normalizer.js.map +1 -1
- package/dist/cliproxy/services/variant-service.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-service.js +22 -6
- package/dist/cliproxy/services/variant-service.js.map +1 -1
- package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-settings.js +5 -3
- package/dist/cliproxy/services/variant-settings.js.map +1 -1
- package/dist/cliproxy/stats-fetcher.d.ts +41 -0
- package/dist/cliproxy/stats-fetcher.d.ts.map +1 -1
- package/dist/cliproxy/stats-fetcher.js +32 -1
- package/dist/cliproxy/stats-fetcher.js.map +1 -1
- package/dist/cliproxy/tool-sanitization-proxy.d.ts.map +1 -1
- package/dist/cliproxy/tool-sanitization-proxy.js +6 -0
- package/dist/cliproxy/tool-sanitization-proxy.js.map +1 -1
- package/dist/cliproxy/types.d.ts +2 -0
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/commands/config-command.js +2 -2
- package/dist/commands/config-command.js.map +1 -1
- package/dist/commands/help-command.d.ts.map +1 -1
- package/dist/commands/help-command.js +4 -0
- package/dist/commands/help-command.js.map +1 -1
- package/dist/config/unified-config-loader.d.ts +5 -0
- package/dist/config/unified-config-loader.d.ts.map +1 -1
- package/dist/config/unified-config-loader.js +62 -1
- package/dist/config/unified-config-loader.js.map +1 -1
- package/dist/config/unified-config-types.d.ts +10 -0
- package/dist/config/unified-config-types.d.ts.map +1 -1
- package/dist/config/unified-config-types.js.map +1 -1
- package/dist/copilot/copilot-executor.d.ts +2 -2
- package/dist/copilot/copilot-executor.d.ts.map +1 -1
- package/dist/copilot/copilot-executor.js +4 -3
- package/dist/copilot/copilot-executor.js.map +1 -1
- package/dist/types/config.d.ts +2 -0
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/config.js.map +1 -1
- package/dist/ui/assets/accounts-C461-bYH.js +1 -0
- package/dist/ui/assets/{alert-dialog-B_Bdo2ou.js → alert-dialog-DpjPV6hi.js} +1 -1
- package/dist/ui/assets/api-DjGF8-45.js +1 -0
- package/dist/ui/assets/auth-section-a4QIr8Cu.js +1 -0
- package/dist/ui/assets/backups-section-JcABaxvV.js +1 -0
- package/dist/ui/assets/{checkbox-D19h9xqD.js → checkbox-DCwR0qqq.js} +1 -1
- package/dist/ui/assets/cliproxy-CvT_CrEG.js +3 -0
- package/dist/ui/assets/cliproxy-control-panel-DwnkIgNd.js +1 -0
- package/dist/ui/assets/{confirm-dialog-7-N-o1DD.js → confirm-dialog-DY2Ziz3R.js} +1 -1
- package/dist/ui/assets/copilot-4Z8LP3vC.js +3 -0
- package/dist/ui/assets/cursor-DGcuUa4B.js +1 -0
- package/dist/ui/assets/droid-C5Rebf4T.js +2 -0
- package/dist/ui/assets/globalenv-section-C8zXrVbd.js +1 -0
- package/dist/ui/assets/health-B82MeRXO.js +1 -0
- package/dist/ui/assets/{icons-DrewC9c3.js → icons-kPbuhVdj.js} +1 -1
- package/dist/ui/assets/index-BIAXf19X.js +1 -0
- package/dist/ui/assets/index-CsbQfRnG.js +47 -0
- package/dist/ui/assets/index-D09dhWOP.js +1 -0
- package/dist/ui/assets/index-vh-9Yvr6.js +1 -0
- package/dist/ui/assets/index-z8fzygJg.js +1 -0
- package/dist/ui/assets/proxy-status-widget-K1IwJ8u6.js +1 -0
- package/dist/ui/assets/{radix-ui-C1Gpgz6I.js → radix-ui-BR1vy4kf.js} +3 -3
- package/dist/ui/assets/{separator-51ocJFnp.js → separator-BBQkLglZ.js} +1 -1
- package/dist/ui/assets/shared-bTrmCnMf.js +8 -0
- package/dist/ui/assets/{switch-B3t2TDvW.js → switch-D9kCIDCe.js} +1 -1
- package/dist/ui/assets/{tanstack-DDJIhNJd.js → tanstack-e99Cjjy2.js} +1 -1
- package/dist/ui/assets/updates-CIkkbMYB.js +1 -0
- package/dist/ui/index.html +4 -4
- package/dist/web-server/index.d.ts.map +1 -1
- package/dist/web-server/index.js +2 -0
- package/dist/web-server/index.js.map +1 -1
- package/dist/web-server/model-pricing.d.ts.map +1 -1
- package/dist/web-server/model-pricing.js +50 -1
- package/dist/web-server/model-pricing.js.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js +27 -3
- package/dist/web-server/routes/cliproxy-stats-routes.js.map +1 -1
- package/dist/web-server/routes/profile-routes.d.ts.map +1 -1
- package/dist/web-server/routes/profile-routes.js +7 -2
- package/dist/web-server/routes/profile-routes.js.map +1 -1
- package/dist/web-server/routes/route-helpers.d.ts.map +1 -1
- package/dist/web-server/routes/route-helpers.js +106 -14
- package/dist/web-server/routes/route-helpers.js.map +1 -1
- package/dist/web-server/routes/settings-routes.d.ts.map +1 -1
- package/dist/web-server/routes/settings-routes.js +137 -28
- package/dist/web-server/routes/settings-routes.js.map +1 -1
- package/dist/web-server/usage/aggregator.d.ts +9 -0
- package/dist/web-server/usage/aggregator.d.ts.map +1 -1
- package/dist/web-server/usage/aggregator.js +63 -7
- package/dist/web-server/usage/aggregator.js.map +1 -1
- package/dist/web-server/usage/cliproxy-usage-syncer.d.ts +34 -0
- package/dist/web-server/usage/cliproxy-usage-syncer.d.ts.map +1 -0
- package/dist/web-server/usage/cliproxy-usage-syncer.js +155 -0
- package/dist/web-server/usage/cliproxy-usage-syncer.js.map +1 -0
- package/dist/web-server/usage/cliproxy-usage-transformer.d.ts +26 -0
- package/dist/web-server/usage/cliproxy-usage-transformer.d.ts.map +1 -0
- package/dist/web-server/usage/cliproxy-usage-transformer.js +141 -0
- package/dist/web-server/usage/cliproxy-usage-transformer.js.map +1 -0
- package/dist/web-server/usage/disk-cache.d.ts.map +1 -1
- package/dist/web-server/usage/disk-cache.js +2 -1
- package/dist/web-server/usage/disk-cache.js.map +1 -1
- package/dist/web-server/usage/handlers.d.ts +1 -1
- package/dist/web-server/usage/handlers.d.ts.map +1 -1
- package/dist/web-server/usage/handlers.js +8 -3
- package/dist/web-server/usage/handlers.js.map +1 -1
- package/package.json +1 -1
- package/dist/ui/assets/accounts-p8Gb9myI.js +0 -1
- package/dist/ui/assets/api-Bw82I4NV.js +0 -1
- package/dist/ui/assets/auth-section-CswwM0bu.js +0 -1
- package/dist/ui/assets/backups-section-6slvPh7p.js +0 -1
- package/dist/ui/assets/cliproxy-BxWh_a8E.js +0 -3
- package/dist/ui/assets/cliproxy-control-panel-BEaTM1tV.js +0 -1
- package/dist/ui/assets/copilot-C2ADI_mS.js +0 -3
- package/dist/ui/assets/cursor-BzUnxDMC.js +0 -1
- package/dist/ui/assets/droid-BOC3J2_I.js +0 -2
- package/dist/ui/assets/globalenv-section-Caco9nNS.js +0 -1
- package/dist/ui/assets/health-Cn_YNAry.js +0 -1
- package/dist/ui/assets/index-0LBl1v7D.js +0 -1
- package/dist/ui/assets/index-B_ON5mBa.js +0 -1
- package/dist/ui/assets/index-CVKOwyBR.js +0 -1
- package/dist/ui/assets/index-CnAQ8t2b.js +0 -1
- package/dist/ui/assets/index-DNFjYwGe.js +0 -47
- package/dist/ui/assets/proxy-status-widget-B31OXK00.js +0 -1
- package/dist/ui/assets/shared-k-J_KXcM.js +0 -8
- package/dist/ui/assets/updates-CYChhYqV.js +0 -1
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* model version formats (e.g., 4.6 vs 4-6).
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.normalizeModelEnvVarsForProvider = exports.normalizeModelIdForRouting = exports.normalizeModelIdForProvider = exports.normalizeClaudeDottedThinkingMajorMinor = exports.normalizeClaudeDottedMajorMinor = exports.isAntigravityProvider = exports.extractProviderFromPathname = exports.MODEL_ENV_VAR_KEYS = void 0;
|
|
9
|
+
exports.normalizeModelEnvVarsForProvider = exports.normalizeModelIdForRouting = exports.canonicalizeModelIdForProvider = exports.normalizeModelIdForProvider = exports.getDeniedModelIdReasonForProvider = exports.isDeniedAntigravityModelId = exports.migrateDeniedAntigravityModelAliases = exports.normalizeDeprecatedAntigravityModelAliases = exports.normalizeClaudeDottedThinkingMajorMinor = exports.normalizeClaudeDottedMajorMinor = exports.normalizeIFlowLegacyModelAliases = exports.stripCodexEffortSuffix = exports.isIFlowProvider = exports.isCodexProvider = exports.isAntigravityProvider = exports.extractProviderFromPathname = exports.MODEL_ENV_VAR_KEYS = void 0;
|
|
10
10
|
/** Env vars that carry model identifiers. */
|
|
11
11
|
exports.MODEL_ENV_VAR_KEYS = [
|
|
12
12
|
'ANTHROPIC_MODEL',
|
|
@@ -16,6 +16,36 @@ exports.MODEL_ENV_VAR_KEYS = [
|
|
|
16
16
|
];
|
|
17
17
|
const CLAUDE_DOTTED_VERSION_REGEX = /claude-(sonnet|opus|haiku)-(\d+)\.(\d+)(?=(?:$|-|\[|\(|\/))/gi;
|
|
18
18
|
const CLAUDE_DOTTED_THINKING_REGEX = /claude-(sonnet|opus|haiku)-(\d+)\.(\d+)-thinking(?=(?:$|-|\[|\(|\/))/gi;
|
|
19
|
+
const DEPRECATED_ANTIGRAVITY_SONNET_46_THINKING_REGEX = /claude-sonnet-4(?:[.-])6-thinking(?=(?:$|-|\[|\(|\/))/gi;
|
|
20
|
+
const CANONICAL_ANTIGRAVITY_SONNET_46_MODEL = 'claude-sonnet-4-6';
|
|
21
|
+
const DENIED_ANTIGRAVITY_MODEL_REGEX = /claude-(?:opus|sonnet)-4(?:[.-])5(?:-thinking)?(?=(?:$|[^a-z0-9]))/i;
|
|
22
|
+
const DENIED_ANTIGRAVITY_OPUS_45_REGEX = /claude-opus-4(?:[.-])5(?:-thinking)?(?=(?:$|[^a-z0-9]))/gi;
|
|
23
|
+
const DENIED_ANTIGRAVITY_SONNET_45_REGEX = /claude-sonnet-4(?:[.-])5(?:-thinking)?(?=(?:$|[^a-z0-9]))/gi;
|
|
24
|
+
const CANONICAL_ANTIGRAVITY_OPUS_46_MODEL = 'claude-opus-4-6-thinking';
|
|
25
|
+
const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
|
|
26
|
+
const IFLOW_LEGACY_MODEL_ALIASES = Object.freeze({
|
|
27
|
+
'iflow-default': 'qwen3-coder-plus',
|
|
28
|
+
'kimi-k2.5': 'kimi-k2',
|
|
29
|
+
'deepseek-v3.2-chat': 'deepseek-v3.2',
|
|
30
|
+
'glm-4.7': 'glm-4.6',
|
|
31
|
+
'minimax-m2.5': 'qwen3-coder-plus',
|
|
32
|
+
});
|
|
33
|
+
function trimModelId(model) {
|
|
34
|
+
return model.trim();
|
|
35
|
+
}
|
|
36
|
+
function splitBaseModelAndSuffix(model) {
|
|
37
|
+
const openParenIndex = model.indexOf('(');
|
|
38
|
+
const openBracketIndex = model.indexOf('[');
|
|
39
|
+
const suffixIndexCandidates = [openParenIndex, openBracketIndex].filter((index) => index >= 0);
|
|
40
|
+
if (suffixIndexCandidates.length === 0) {
|
|
41
|
+
return { baseModel: model, suffix: '' };
|
|
42
|
+
}
|
|
43
|
+
const suffixStart = Math.min(...suffixIndexCandidates);
|
|
44
|
+
return {
|
|
45
|
+
baseModel: model.slice(0, suffixStart),
|
|
46
|
+
suffix: model.slice(suffixStart),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
19
49
|
/**
|
|
20
50
|
* Extract provider segment from `/api/provider/{provider}` request paths.
|
|
21
51
|
*
|
|
@@ -38,6 +68,39 @@ function isAntigravityProvider(provider) {
|
|
|
38
68
|
return normalized === 'agy' || normalized === 'antigravity';
|
|
39
69
|
}
|
|
40
70
|
exports.isAntigravityProvider = isAntigravityProvider;
|
|
71
|
+
/** Whether provider maps to Codex model canonicalization rules. */
|
|
72
|
+
function isCodexProvider(provider) {
|
|
73
|
+
if (typeof provider !== 'string')
|
|
74
|
+
return false;
|
|
75
|
+
return provider.trim().toLowerCase() === 'codex';
|
|
76
|
+
}
|
|
77
|
+
exports.isCodexProvider = isCodexProvider;
|
|
78
|
+
/** Whether provider maps to iFlow model alias canonicalization rules. */
|
|
79
|
+
function isIFlowProvider(provider) {
|
|
80
|
+
if (typeof provider !== 'string')
|
|
81
|
+
return false;
|
|
82
|
+
return provider.trim().toLowerCase() === 'iflow';
|
|
83
|
+
}
|
|
84
|
+
exports.isIFlowProvider = isIFlowProvider;
|
|
85
|
+
/** Normalize Codex effort-suffixed IDs to canonical IDs. */
|
|
86
|
+
function stripCodexEffortSuffix(model) {
|
|
87
|
+
return model.replace(CODEX_EFFORT_SUFFIX_REGEX, '');
|
|
88
|
+
}
|
|
89
|
+
exports.stripCodexEffortSuffix = stripCodexEffortSuffix;
|
|
90
|
+
/**
|
|
91
|
+
* Normalize known legacy iFlow model aliases to current upstream model IDs.
|
|
92
|
+
* Preserves suffixes such as (budget) and [1m].
|
|
93
|
+
*/
|
|
94
|
+
function normalizeIFlowLegacyModelAliases(model) {
|
|
95
|
+
const trimmed = trimModelId(model);
|
|
96
|
+
const { baseModel, suffix } = splitBaseModelAndSuffix(trimmed);
|
|
97
|
+
const replacement = IFLOW_LEGACY_MODEL_ALIASES[baseModel.trim().toLowerCase()];
|
|
98
|
+
if (!replacement) {
|
|
99
|
+
return trimmed;
|
|
100
|
+
}
|
|
101
|
+
return `${replacement}${suffix}`;
|
|
102
|
+
}
|
|
103
|
+
exports.normalizeIFlowLegacyModelAliases = normalizeIFlowLegacyModelAliases;
|
|
41
104
|
/** Normalize Claude dotted major.minor IDs to hyphenated format. */
|
|
42
105
|
function normalizeClaudeDottedMajorMinor(model) {
|
|
43
106
|
return model.replace(CLAUDE_DOTTED_VERSION_REGEX, (_match, family, major, minor) => `claude-${family.toLowerCase()}-${major}-${minor}`);
|
|
@@ -51,6 +114,44 @@ function normalizeClaudeDottedThinkingMajorMinor(model) {
|
|
|
51
114
|
return model.replace(CLAUDE_DOTTED_THINKING_REGEX, (_match, family, major, minor) => `claude-${family.toLowerCase()}-${major}-${minor}-thinking`);
|
|
52
115
|
}
|
|
53
116
|
exports.normalizeClaudeDottedThinkingMajorMinor = normalizeClaudeDottedThinkingMajorMinor;
|
|
117
|
+
/**
|
|
118
|
+
* Antigravity no longer exposes `claude-sonnet-4-6-thinking`.
|
|
119
|
+
* Canonicalize legacy aliases to `claude-sonnet-4-6` while preserving suffixes.
|
|
120
|
+
*/
|
|
121
|
+
function normalizeDeprecatedAntigravityModelAliases(model) {
|
|
122
|
+
return model.replace(DEPRECATED_ANTIGRAVITY_SONNET_46_THINKING_REGEX, CANONICAL_ANTIGRAVITY_SONNET_46_MODEL);
|
|
123
|
+
}
|
|
124
|
+
exports.normalizeDeprecatedAntigravityModelAliases = normalizeDeprecatedAntigravityModelAliases;
|
|
125
|
+
/**
|
|
126
|
+
* Migrate denylisted Antigravity Claude 4.5 aliases to supported Claude 4.6 IDs.
|
|
127
|
+
* This is intended for repairing stale local settings at runtime.
|
|
128
|
+
*/
|
|
129
|
+
function migrateDeniedAntigravityModelAliases(model) {
|
|
130
|
+
const normalized = normalizeClaudeDottedMajorMinor(trimModelId(model));
|
|
131
|
+
return normalized
|
|
132
|
+
.replace(DENIED_ANTIGRAVITY_OPUS_45_REGEX, CANONICAL_ANTIGRAVITY_OPUS_46_MODEL)
|
|
133
|
+
.replace(DENIED_ANTIGRAVITY_SONNET_45_REGEX, CANONICAL_ANTIGRAVITY_SONNET_46_MODEL);
|
|
134
|
+
}
|
|
135
|
+
exports.migrateDeniedAntigravityModelAliases = migrateDeniedAntigravityModelAliases;
|
|
136
|
+
/**
|
|
137
|
+
* Deprecated Antigravity models that are denylisted and should not be used.
|
|
138
|
+
*/
|
|
139
|
+
function isDeniedAntigravityModelId(model) {
|
|
140
|
+
return DENIED_ANTIGRAVITY_MODEL_REGEX.test(trimModelId(model));
|
|
141
|
+
}
|
|
142
|
+
exports.isDeniedAntigravityModelId = isDeniedAntigravityModelId;
|
|
143
|
+
/**
|
|
144
|
+
* Returns deny reason when model ID is blocked for the given provider.
|
|
145
|
+
*/
|
|
146
|
+
function getDeniedModelIdReasonForProvider(model, provider) {
|
|
147
|
+
if (!isAntigravityProvider(provider))
|
|
148
|
+
return null;
|
|
149
|
+
const normalized = normalizeClaudeDottedMajorMinor(trimModelId(model));
|
|
150
|
+
if (!isDeniedAntigravityModelId(normalized))
|
|
151
|
+
return null;
|
|
152
|
+
return 'Antigravity denylist: Claude Opus 4.5 and Claude Sonnet 4.5 are deprecated.';
|
|
153
|
+
}
|
|
154
|
+
exports.getDeniedModelIdReasonForProvider = getDeniedModelIdReasonForProvider;
|
|
54
155
|
/**
|
|
55
156
|
* Normalize model ID for a specific provider.
|
|
56
157
|
* Antigravity requires hyphenated Claude major.minor model IDs.
|
|
@@ -64,11 +165,29 @@ exports.normalizeClaudeDottedThinkingMajorMinor = normalizeClaudeDottedThinkingM
|
|
|
64
165
|
* // => 'claude-opus-4.6-thinking'
|
|
65
166
|
*/
|
|
66
167
|
function normalizeModelIdForProvider(model, provider) {
|
|
168
|
+
const trimmedModel = trimModelId(model);
|
|
169
|
+
if (isIFlowProvider(provider)) {
|
|
170
|
+
return normalizeIFlowLegacyModelAliases(trimmedModel);
|
|
171
|
+
}
|
|
67
172
|
if (!isAntigravityProvider(provider))
|
|
68
|
-
return
|
|
69
|
-
|
|
173
|
+
return trimmedModel;
|
|
174
|
+
const normalizedDottedVersion = normalizeClaudeDottedMajorMinor(trimmedModel);
|
|
175
|
+
return normalizeDeprecatedAntigravityModelAliases(normalizedDottedVersion);
|
|
70
176
|
}
|
|
71
177
|
exports.normalizeModelIdForProvider = normalizeModelIdForProvider;
|
|
178
|
+
/**
|
|
179
|
+
* Canonicalize model ID for provider-specific compatibility.
|
|
180
|
+
* - Codex: strip effort suffixes.
|
|
181
|
+
* - Antigravity: normalize dotted/historical aliases.
|
|
182
|
+
*/
|
|
183
|
+
function canonicalizeModelIdForProvider(model, provider) {
|
|
184
|
+
const trimmedModel = trimModelId(model);
|
|
185
|
+
const withoutCodexSuffix = isCodexProvider(provider)
|
|
186
|
+
? stripCodexEffortSuffix(trimmedModel)
|
|
187
|
+
: trimmedModel;
|
|
188
|
+
return normalizeModelIdForProvider(withoutCodexSuffix, provider);
|
|
189
|
+
}
|
|
190
|
+
exports.canonicalizeModelIdForProvider = canonicalizeModelIdForProvider;
|
|
72
191
|
/**
|
|
73
192
|
* Normalize model ID for request routing.
|
|
74
193
|
* - Antigravity routes: normalize all dotted Claude major.minor forms.
|
|
@@ -77,17 +196,23 @@ exports.normalizeModelIdForProvider = normalizeModelIdForProvider;
|
|
|
77
196
|
*
|
|
78
197
|
* @example
|
|
79
198
|
* normalizeModelIdForRouting('claude-sonnet-4.6-thinking', null)
|
|
80
|
-
* // => 'claude-sonnet-4-6
|
|
199
|
+
* // => 'claude-sonnet-4-6'
|
|
81
200
|
*
|
|
82
201
|
* @example
|
|
83
202
|
* normalizeModelIdForRouting('claude-sonnet-4.6', null)
|
|
84
203
|
* // => 'claude-sonnet-4.6'
|
|
85
204
|
*/
|
|
86
205
|
function normalizeModelIdForRouting(model, provider) {
|
|
206
|
+
const trimmedModel = trimModelId(model);
|
|
87
207
|
if (isAntigravityProvider(provider)) {
|
|
88
|
-
return
|
|
208
|
+
return normalizeModelIdForProvider(trimmedModel, provider);
|
|
209
|
+
}
|
|
210
|
+
// Explicit provider routes still apply provider-specific canonicalization.
|
|
211
|
+
if (typeof provider === 'string' && provider.trim().length > 0) {
|
|
212
|
+
return normalizeModelIdForProvider(trimmedModel, provider);
|
|
89
213
|
}
|
|
90
|
-
|
|
214
|
+
const normalizedThinking = normalizeClaudeDottedThinkingMajorMinor(trimmedModel);
|
|
215
|
+
return normalizeDeprecatedAntigravityModelAliases(normalizedThinking);
|
|
91
216
|
}
|
|
92
217
|
exports.normalizeModelIdForRouting = normalizeModelIdForRouting;
|
|
93
218
|
/**
|
|
@@ -99,7 +224,7 @@ exports.normalizeModelIdForRouting = normalizeModelIdForRouting;
|
|
|
99
224
|
* { ANTHROPIC_MODEL: 'claude-sonnet-4.6-thinking' },
|
|
100
225
|
* 'agy'
|
|
101
226
|
* )
|
|
102
|
-
* // => { ANTHROPIC_MODEL: 'claude-sonnet-4-6
|
|
227
|
+
* // => { ANTHROPIC_MODEL: 'claude-sonnet-4-6' }
|
|
103
228
|
*/
|
|
104
229
|
function normalizeModelEnvVarsForProvider(envVars, provider, keys = exports.MODEL_ENV_VAR_KEYS) {
|
|
105
230
|
let nextEnv = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-id-normalizer.js","sourceRoot":"","sources":["../../src/cliproxy/model-id-normalizer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,6CAA6C;AAChC,QAAA,kBAAkB,GAAG;IAChC,iBAAiB;IACjB,8BAA8B;IAC9B,gCAAgC;IAChC,+BAA+B;CACvB,CAAC;AAIX,MAAM,2BAA2B,GAAG,+DAA+D,CAAC;AACpG,MAAM,4BAA4B,GAChC,wEAAwE,CAAC;
|
|
1
|
+
{"version":3,"file":"model-id-normalizer.js","sourceRoot":"","sources":["../../src/cliproxy/model-id-normalizer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,6CAA6C;AAChC,QAAA,kBAAkB,GAAG;IAChC,iBAAiB;IACjB,8BAA8B;IAC9B,gCAAgC;IAChC,+BAA+B;CACvB,CAAC;AAIX,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,yBAAyB,GAAG,wBAAwB,CAAC;AAC3D,MAAM,0BAA0B,GAAqC,MAAM,CAAC,MAAM,CAAC;IACjF,eAAe,EAAE,kBAAkB;IACnC,WAAW,EAAE,SAAS;IACtB,oBAAoB,EAAE,eAAe;IACrC,SAAS,EAAE,SAAS;IACpB,cAAc,EAAE,kBAAkB;CACnC,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAa;IAC5C,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,qBAAqB,GAAG,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAE/F,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IACvD,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC;QACtC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC;KACjC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,2BAA2B,CAAC,QAAgB;IAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AAChC,CAAC;AAJD,kEAIC;AAED,uEAAuE;AACvE,SAAgB,qBAAqB,CAAC,QAAsB;IAC1D,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/C,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACjD,OAAO,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,aAAa,CAAC;AAC9D,CAAC;AAJD,sDAIC;AAED,mEAAmE;AACnE,SAAgB,eAAe,CAAC,QAAsB;IACpD,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;AACnD,CAAC;AAHD,0CAGC;AAED,yEAAyE;AACzE,SAAgB,eAAe,CAAC,QAAsB;IACpD,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC;AACnD,CAAC;AAHD,0CAGC;AAED,4DAA4D;AAC5D,SAAgB,sBAAsB,CAAC,KAAa;IAClD,OAAO,KAAK,CAAC,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;AACtD,CAAC;AAFD,wDAEC;AAED;;;GAGG;AACH,SAAgB,gCAAgC,CAAC,KAAa;IAC5D,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,WAAW,GAAG,0BAA0B,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;AACnC,CAAC;AARD,4EAQC;AAED,oEAAoE;AACpE,SAAgB,+BAA+B,CAAC,KAAa;IAC3D,OAAO,KAAK,CAAC,OAAO,CAClB,2BAA2B,EAC3B,CAAC,MAAc,EAAE,MAAc,EAAE,KAAa,EAAE,KAAa,EAAE,EAAE,CAC/D,UAAU,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,IAAI,KAAK,EAAE,CACrD,CAAC;AACJ,CAAC;AAND,0EAMC;AAED;;;GAGG;AACH,SAAgB,uCAAuC,CAAC,KAAa;IACnE,OAAO,KAAK,CAAC,OAAO,CAClB,4BAA4B,EAC5B,CAAC,MAAc,EAAE,MAAc,EAAE,KAAa,EAAE,KAAa,EAAE,EAAE,CAC/D,UAAU,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,IAAI,KAAK,WAAW,CAC9D,CAAC;AACJ,CAAC;AAND,0FAMC;AAED;;;GAGG;AACH,SAAgB,0CAA0C,CAAC,KAAa;IACtE,OAAO,KAAK,CAAC,OAAO,CAClB,+CAA+C,EAC/C,qCAAqC,CACtC,CAAC;AACJ,CAAC;AALD,gGAKC;AAED;;;GAGG;AACH,SAAgB,oCAAoC,CAAC,KAAa;IAChE,MAAM,UAAU,GAAG,+BAA+B,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,OAAO,UAAU;SACd,OAAO,CAAC,gCAAgC,EAAE,mCAAmC,CAAC;SAC9E,OAAO,CAAC,kCAAkC,EAAE,qCAAqC,CAAC,CAAC;AACxF,CAAC;AALD,oFAKC;AAED;;GAEG;AACH,SAAgB,0BAA0B,CAAC,KAAa;IACtD,OAAO,8BAA8B,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,gEAEC;AAED;;GAEG;AACH,SAAgB,iCAAiC,CAC/C,KAAa,EACb,QAAsB;IAEtB,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,MAAM,UAAU,GAAG,+BAA+B,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACzD,OAAO,6EAA6E,CAAC;AACvF,CAAC;AARD,8EAQC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,2BAA2B,CAAC,KAAa,EAAE,QAAsB;IAC/E,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,OAAO,gCAAgC,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;QAAE,OAAO,YAAY,CAAC;IAC1D,MAAM,uBAAuB,GAAG,+BAA+B,CAAC,YAAY,CAAC,CAAC;IAC9E,OAAO,0CAA0C,CAAC,uBAAuB,CAAC,CAAC;AAC7E,CAAC;AARD,kEAQC;AAED;;;;GAIG;AACH,SAAgB,8BAA8B,CAAC,KAAa,EAAE,QAAsB;IAClF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,kBAAkB,GAAG,eAAe,CAAC,QAAQ,CAAC;QAClD,CAAC,CAAC,sBAAsB,CAAC,YAAY,CAAC;QACtC,CAAC,CAAC,YAAY,CAAC;IACjB,OAAO,2BAA2B,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;AACnE,CAAC;AAND,wEAMC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,0BAA0B,CAAC,KAAa,EAAE,QAAsB;IAC9E,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpC,OAAO,2BAA2B,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IACD,2EAA2E;IAC3E,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/D,OAAO,2BAA2B,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,kBAAkB,GAAG,uCAAuC,CAAC,YAAY,CAAC,CAAC;IACjF,OAAO,0CAA0C,CAAC,kBAAkB,CAAC,CAAC;AACxE,CAAC;AAXD,gEAWC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,gCAAgC,CAC9C,OAA0B,EAC1B,QAAsB,EACtB,OAA0B,0BAAkB;IAE5C,IAAI,OAAO,GAA6B,IAAI,CAAC;IAE7C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAErE,MAAM,eAAe,GAAG,2BAA2B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrE,IAAI,eAAe,KAAK,KAAK;YAAE,SAAS;QAExC,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;IACjC,CAAC;IAED,OAAO,OAAO,IAAI,OAAO,CAAC;AAC5B,CAAC;AAnBD,4EAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAA0B,MAAM,mCAAmC,CAAC;AAChG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"variant-service.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-service.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAA0B,MAAM,mCAAmC,CAAC;AAChG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAuB/D,OAAO,EACL,aAAa,EASd,MAAM,0BAA0B,CAAC;AAGlC,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,mCAAmC;AACnC,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiB/D;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,GAAG,IAAI,CAUpF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAE5D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,GAAE,UAAqB,GAC5B,sBAAsB,CAoDxB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CA+ClE;AAED,iCAAiC;AACjC,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,GAAG,sBAAsB,CAkHjG;AAED,yCAAyC;AACzC,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzC,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,EAAE;QACL,IAAI,EAAE,mBAAmB,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAC5B,KAAK,EAAE,mBAAmB,CAAC;KAC5B,CAAC;CACH;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,6BAA6B,GACrC,sBAAsB,CA2DxB;AAED,2CAA2C;AAC3C,MAAM,WAAW,6BAA6B;IAC5C,WAAW,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC1C,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,QAAQ,GAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,6BAA6B,GACrC,sBAAsB,CAoFxB"}
|
|
@@ -42,6 +42,7 @@ const session_tracker_1 = require("../session-tracker");
|
|
|
42
42
|
const ui_1 = require("../../utils/ui");
|
|
43
43
|
const config_manager_1 = require("../../utils/config-manager");
|
|
44
44
|
const composite_validator_1 = require("../composite-validator");
|
|
45
|
+
const model_id_normalizer_1 = require("../model-id-normalizer");
|
|
45
46
|
const variant_settings_1 = require("./variant-settings");
|
|
46
47
|
const variant_config_adapter_1 = require("./variant-config-adapter");
|
|
47
48
|
/**
|
|
@@ -100,6 +101,11 @@ exports.listVariants = listVariants;
|
|
|
100
101
|
*/
|
|
101
102
|
function createVariant(name, provider, model, account, target = 'claude') {
|
|
102
103
|
try {
|
|
104
|
+
const canonicalModel = (0, model_id_normalizer_1.canonicalizeModelIdForProvider)(model, provider);
|
|
105
|
+
const deniedModelReason = (0, model_id_normalizer_1.getDeniedModelIdReasonForProvider)(canonicalModel, provider);
|
|
106
|
+
if (deniedModelReason) {
|
|
107
|
+
return { success: false, error: deniedModelReason };
|
|
108
|
+
}
|
|
103
109
|
// Validate provider/backend compatibility (block kiro/ghcp on original backend)
|
|
104
110
|
const backendError = validateProviderBackend(provider);
|
|
105
111
|
if (backendError) {
|
|
@@ -109,17 +115,17 @@ function createVariant(name, provider, model, account, target = 'claude') {
|
|
|
109
115
|
const port = (0, variant_config_adapter_1.getNextAvailablePort)();
|
|
110
116
|
let settingsPath;
|
|
111
117
|
if ((0, unified_config_loader_2.isUnifiedMode)()) {
|
|
112
|
-
settingsPath = (0, variant_settings_1.createSettingsFileUnified)(name, provider,
|
|
118
|
+
settingsPath = (0, variant_settings_1.createSettingsFileUnified)(name, provider, canonicalModel, port);
|
|
113
119
|
(0, variant_config_adapter_1.saveVariantUnified)(name, provider, (0, variant_settings_1.getRelativeSettingsPath)(provider, name), account, port, target);
|
|
114
120
|
}
|
|
115
121
|
else {
|
|
116
|
-
settingsPath = (0, variant_settings_1.createSettingsFile)(name, provider,
|
|
122
|
+
settingsPath = (0, variant_settings_1.createSettingsFile)(name, provider, canonicalModel, port);
|
|
117
123
|
(0, variant_config_adapter_1.saveVariantLegacy)(name, provider, `~/.ccs/${path.basename(settingsPath)}`, account, port, target);
|
|
118
124
|
}
|
|
119
125
|
return {
|
|
120
126
|
success: true,
|
|
121
127
|
settingsPath,
|
|
122
|
-
variant: { provider, model, account, port, target },
|
|
128
|
+
variant: { provider, model: canonicalModel, account, port, target },
|
|
123
129
|
};
|
|
124
130
|
}
|
|
125
131
|
catch (error) {
|
|
@@ -197,20 +203,30 @@ function updateVariant(name, updates) {
|
|
|
197
203
|
const existingTarget = existing.target || 'claude';
|
|
198
204
|
const targetChanged = updates.target !== undefined && updates.target !== existingTarget;
|
|
199
205
|
const hasModelUpdate = updates.model !== undefined && updates.model.trim().length > 0;
|
|
206
|
+
const providerForModelUpdate = (updates.provider ?? existing.provider);
|
|
207
|
+
const canonicalModelUpdate = updates.model !== undefined
|
|
208
|
+
? (0, model_id_normalizer_1.canonicalizeModelIdForProvider)(updates.model.trim(), providerForModelUpdate)
|
|
209
|
+
: undefined;
|
|
200
210
|
if (providerChanged && !hasModelUpdate) {
|
|
201
211
|
return {
|
|
202
212
|
success: false,
|
|
203
213
|
error: 'Changing provider requires model update in the same request',
|
|
204
214
|
};
|
|
205
215
|
}
|
|
216
|
+
if (hasModelUpdate) {
|
|
217
|
+
const deniedModelReason = (0, model_id_normalizer_1.getDeniedModelIdReasonForProvider)(canonicalModelUpdate || '', providerForModelUpdate);
|
|
218
|
+
if (deniedModelReason) {
|
|
219
|
+
return { success: false, error: deniedModelReason };
|
|
220
|
+
}
|
|
221
|
+
}
|
|
206
222
|
// Update settings file
|
|
207
223
|
if (existing.settings) {
|
|
208
224
|
const settingsPath = existing.settings.replace(/^~/, os.homedir());
|
|
209
225
|
if (providerChanged) {
|
|
210
|
-
(0, variant_settings_1.updateSettingsProviderAndModel)(settingsPath, updates.provider,
|
|
226
|
+
(0, variant_settings_1.updateSettingsProviderAndModel)(settingsPath, updates.provider, canonicalModelUpdate || '', existing.port);
|
|
211
227
|
}
|
|
212
228
|
else if (updates.model !== undefined) {
|
|
213
|
-
(0, variant_settings_1.updateSettingsModel)(settingsPath,
|
|
229
|
+
(0, variant_settings_1.updateSettingsModel)(settingsPath, canonicalModelUpdate || '', existing.provider);
|
|
214
230
|
}
|
|
215
231
|
}
|
|
216
232
|
// Update config entry if provider/account/target changed
|
|
@@ -236,7 +252,7 @@ function updateVariant(name, updates) {
|
|
|
236
252
|
success: true,
|
|
237
253
|
variant: {
|
|
238
254
|
provider: updates.provider ?? existing.provider,
|
|
239
|
-
model:
|
|
255
|
+
model: canonicalModelUpdate || existing.model,
|
|
240
256
|
account: updates.account !== undefined ? updates.account : existing.account,
|
|
241
257
|
port: existing.port,
|
|
242
258
|
settings: existing.settings,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variant-service.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"variant-service.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-service.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;AAkFxE;;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"}
|
|
@@ -40,11 +40,13 @@ const profile_hook_injector_1 = require("../../utils/websearch/profile-hook-inje
|
|
|
40
40
|
const image_analyzer_profile_hook_injector_1 = require("../../utils/hooks/image-analyzer-profile-hook-injector");
|
|
41
41
|
const auth_token_manager_1 = require("../auth-token-manager");
|
|
42
42
|
const ui_1 = require("../../utils/ui");
|
|
43
|
+
const model_id_normalizer_1 = require("../model-id-normalizer");
|
|
43
44
|
const CODEX_EFFORT_SUFFIX_REGEX = /-(xhigh|high|medium)$/i;
|
|
44
45
|
function canonicalizeModelForProvider(provider, model) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
const withoutCodexSuffix = provider === 'codex' ? model.replace(CODEX_EFFORT_SUFFIX_REGEX, '') : model;
|
|
47
|
+
if (!provider)
|
|
48
|
+
return withoutCodexSuffix;
|
|
49
|
+
return (0, model_id_normalizer_1.normalizeModelIdForProvider)(withoutCodexSuffix, provider);
|
|
48
50
|
}
|
|
49
51
|
/**
|
|
50
52
|
* Build settings env object for a variant
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"variant-settings.js","sourceRoot":"","sources":["../../../src/cliproxy/services/variant-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,12 +44,52 @@ export interface CliproxyStats {
|
|
|
44
44
|
/** Timestamp of stats collection */
|
|
45
45
|
collectedAt: string;
|
|
46
46
|
}
|
|
47
|
+
/** Request detail from CLIProxyAPI */
|
|
48
|
+
export interface CliproxyRequestDetail {
|
|
49
|
+
timestamp: string;
|
|
50
|
+
source: string;
|
|
51
|
+
auth_index: number;
|
|
52
|
+
tokens: {
|
|
53
|
+
input_tokens: number;
|
|
54
|
+
output_tokens: number;
|
|
55
|
+
reasoning_tokens: number;
|
|
56
|
+
cached_tokens: number;
|
|
57
|
+
total_tokens: number;
|
|
58
|
+
};
|
|
59
|
+
failed: boolean;
|
|
60
|
+
}
|
|
61
|
+
/** @deprecated Use CliproxyRequestDetail instead */
|
|
62
|
+
type RequestDetail = CliproxyRequestDetail;
|
|
63
|
+
/** Usage API response from CLIProxyAPI /v0/management/usage endpoint */
|
|
64
|
+
export interface CliproxyUsageApiResponse {
|
|
65
|
+
failed_requests?: number;
|
|
66
|
+
usage?: {
|
|
67
|
+
total_requests?: number;
|
|
68
|
+
success_count?: number;
|
|
69
|
+
failure_count?: number;
|
|
70
|
+
total_tokens?: number;
|
|
71
|
+
apis?: Record<string, {
|
|
72
|
+
total_requests?: number;
|
|
73
|
+
total_tokens?: number;
|
|
74
|
+
models?: Record<string, {
|
|
75
|
+
total_requests?: number;
|
|
76
|
+
total_tokens?: number;
|
|
77
|
+
details?: RequestDetail[];
|
|
78
|
+
}>;
|
|
79
|
+
}>;
|
|
80
|
+
};
|
|
81
|
+
}
|
|
47
82
|
/**
|
|
48
83
|
* Fetch usage statistics from CLIProxyAPI management API
|
|
49
84
|
* @param port CLIProxyAPI port (default: 8317)
|
|
50
85
|
* @returns Stats object or null if unavailable
|
|
51
86
|
*/
|
|
52
87
|
export declare function fetchCliproxyStats(port?: number): Promise<CliproxyStats | null>;
|
|
88
|
+
/**
|
|
89
|
+
* Fetch raw usage response from CLIProxyAPI management API
|
|
90
|
+
* Returns the unprocessed API response for transformation by cliproxy-usage-transformer
|
|
91
|
+
*/
|
|
92
|
+
export declare function fetchCliproxyUsageRaw(port?: number): Promise<CliproxyUsageApiResponse | null>;
|
|
53
93
|
/** OpenAI-compatible model object from /v1/models endpoint */
|
|
54
94
|
export interface CliproxyModel {
|
|
55
95
|
id: string;
|
|
@@ -103,4 +143,5 @@ export declare function fetchCliproxyErrorLogContent(name: string, port?: number
|
|
|
103
143
|
* @returns true if proxy is running
|
|
104
144
|
*/
|
|
105
145
|
export declare function isCliproxyRunning(port?: number): Promise<boolean>;
|
|
146
|
+
export {};
|
|
106
147
|
//# sourceMappingURL=stats-fetcher.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-fetcher.d.ts","sourceRoot":"","sources":["../../src/cliproxy/stats-fetcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,mCAAmC;AACnC,MAAM,WAAW,iBAAiB;IAChC,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC5B,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB;IACnB,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,gCAAgC;IAChC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,mCAAmC;IACnC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,kCAAkC;IAClC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAChD,4CAA4C;IAC5C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;CACrB;
|
|
1
|
+
{"version":3,"file":"stats-fetcher.d.ts","sourceRoot":"","sources":["../../src/cliproxy/stats-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* Requires usage-statistics-enabled: true in config.yaml.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.isCliproxyRunning = exports.fetchCliproxyErrorLogContent = exports.fetchCliproxyErrorLogs = exports.fetchCliproxyModels = exports.fetchCliproxyStats = void 0;
|
|
9
|
+
exports.isCliproxyRunning = exports.fetchCliproxyErrorLogContent = exports.fetchCliproxyErrorLogs = exports.fetchCliproxyModels = exports.fetchCliproxyUsageRaw = exports.fetchCliproxyStats = void 0;
|
|
10
10
|
const auth_token_manager_1 = require("./auth-token-manager");
|
|
11
11
|
const proxy_target_resolver_1 = require("./proxy-target-resolver");
|
|
12
12
|
/**
|
|
@@ -111,6 +111,37 @@ async function fetchCliproxyStats(port) {
|
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
exports.fetchCliproxyStats = fetchCliproxyStats;
|
|
114
|
+
/**
|
|
115
|
+
* Fetch raw usage response from CLIProxyAPI management API
|
|
116
|
+
* Returns the unprocessed API response for transformation by cliproxy-usage-transformer
|
|
117
|
+
*/
|
|
118
|
+
async function fetchCliproxyUsageRaw(port) {
|
|
119
|
+
try {
|
|
120
|
+
const controller = new AbortController();
|
|
121
|
+
const timeoutId = setTimeout(() => controller.abort(), 5000);
|
|
122
|
+
const target = (0, proxy_target_resolver_1.getProxyTarget)();
|
|
123
|
+
if (port !== undefined && !target.isRemote) {
|
|
124
|
+
target.port = port;
|
|
125
|
+
}
|
|
126
|
+
const url = (0, proxy_target_resolver_1.buildProxyUrl)(target, '/v0/management/usage');
|
|
127
|
+
const headers = target.isRemote
|
|
128
|
+
? (0, proxy_target_resolver_1.buildManagementHeaders)(target)
|
|
129
|
+
: { Accept: 'application/json', Authorization: `Bearer ${(0, auth_token_manager_1.getEffectiveManagementSecret)()}` };
|
|
130
|
+
const response = await fetch(url, {
|
|
131
|
+
signal: controller.signal,
|
|
132
|
+
headers,
|
|
133
|
+
});
|
|
134
|
+
clearTimeout(timeoutId);
|
|
135
|
+
if (!response.ok) {
|
|
136
|
+
return null;
|
|
137
|
+
}
|
|
138
|
+
return (await response.json());
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
return null;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
exports.fetchCliproxyUsageRaw = fetchCliproxyUsageRaw;
|
|
114
145
|
/**
|
|
115
146
|
* Fetch available models from CLIProxyAPI /v1/models endpoint
|
|
116
147
|
* @param port CLIProxyAPI port (default: 8317)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-fetcher.js","sourceRoot":"","sources":["../../src/cliproxy/stats-fetcher.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6DAAwF;AACxF,mEAKiC;
|
|
1
|
+
{"version":3,"file":"stats-fetcher.js","sourceRoot":"","sources":["../../src/cliproxy/stats-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-sanitization-proxy.d.ts","sourceRoot":"","sources":["../../src/cliproxy/tool-sanitization-proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"tool-sanitization-proxy.d.ts","sourceRoot":"","sources":["../../src/cliproxy/tool-sanitization-proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiBH,MAAM,WAAW,2BAA2B;IAC1C,4BAA4B;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;gBAExB,MAAM,EAAE,2BAA2B;IAW/C;;OAEG;IACH,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACH,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,GAAG;IAMX,OAAO,CAAC,IAAI;IAMZ;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAmB9B;;OAEG;IACH,IAAI,IAAI,IAAI;IAOZ;;OAEG;IACH,OAAO,IAAI,MAAM,GAAG,IAAI;IAIxB,OAAO,CAAC,QAAQ;YAqBF,aAAa;IAqH3B,OAAO,CAAC,mBAAmB;IAmC3B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IA+BlB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsE3B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAiJ5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAsDvB;;;;OAIG;IACH,OAAO,CAAC,2BAA2B;CAiCpC"}
|
|
@@ -198,6 +198,12 @@ class ToolSanitizationProxy {
|
|
|
198
198
|
let modifiedBody = parsed;
|
|
199
199
|
if (isRecord(modifiedBody) && typeof modifiedBody.model === 'string') {
|
|
200
200
|
const providerFromPath = (0, model_id_normalizer_1.extractProviderFromPathname)(fullUpstreamUrl.pathname);
|
|
201
|
+
const deniedReason = (0, model_id_normalizer_1.getDeniedModelIdReasonForProvider)(modifiedBody.model, providerFromPath);
|
|
202
|
+
if (deniedReason) {
|
|
203
|
+
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
204
|
+
res.end(JSON.stringify({ error: deniedReason }));
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
201
207
|
const normalizedModel = (0, model_id_normalizer_1.normalizeModelIdForRouting)(modifiedBody.model, providerFromPath);
|
|
202
208
|
if (normalizedModel !== modifiedBody.model) {
|
|
203
209
|
this.writeLog('warn', `[tool-sanitization-proxy] Model normalized for provider routing (${providerFromPath ?? 'root'}): "${modifiedBody.model}" → "${normalizedModel}"`);
|