fix(cliproxy): normalize codex model and provider routing

This commit is contained in:
Tam Nhu Tran
2026-02-18 21:27:58 +07:00
parent e6469d1b00
commit ecc4a3fe58
5 changed files with 292 additions and 11 deletions
+24 -9
View File
@@ -27,6 +27,12 @@ export interface CodexReasoningProxyConfig {
stripPathPrefix?: string;
}
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
function stripExtendedContextSuffix(model: string): string {
return model.replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '').trim();
}
function isNonEmptyString(value: unknown): value is string {
return typeof value === 'string' && value.trim().length > 0;
}
@@ -38,10 +44,11 @@ function isRecord(value: unknown): value is Record<string, unknown> {
function parseModelEffortSuffix(
model: string
): { upstreamModel: string; effort: CodexReasoningEffort } | null {
const match = model.match(/^(.*)-(xhigh|high|medium)$/);
const normalizedModel = stripExtendedContextSuffix(model);
const match = normalizedModel.match(/^(.*)-(xhigh|high|medium)$/i);
if (!match) return null;
const upstreamModel = match[1]?.trim();
const effort = match[2] as CodexReasoningEffort;
const effort = match[2]?.toLowerCase() as CodexReasoningEffort;
if (!upstreamModel) return null;
return { upstreamModel, effort };
}
@@ -86,8 +93,10 @@ export function buildCodexModelEffortMap(
const upsertMin = (model: string | undefined, effort: CodexReasoningEffort) => {
if (!isNonEmptyString(model)) return;
const existing = map.get(model);
map.set(model, existing ? minEffort(existing, effort) : effort);
const normalizedModel = stripExtendedContextSuffix(model);
if (!normalizedModel) return;
const existing = map.get(normalizedModel);
map.set(normalizedModel, existing ? minEffort(existing, effort) : effort);
};
upsertMin(models.defaultModel, 'xhigh');
@@ -108,9 +117,10 @@ export function getEffortForModel(
defaultEffort: CodexReasoningEffort
): CodexReasoningEffort {
if (!model) return defaultEffort;
const effort = modelEffort.get(model) ?? defaultEffort;
const normalizedModel = stripExtendedContextSuffix(model);
const effort = modelEffort.get(normalizedModel) ?? defaultEffort;
// Apply model-specific cap from catalog
return capEffortAtModelMax(model, effort);
return capEffortAtModelMax(normalizedModel, effort);
}
export function injectReasoningEffortIntoBody(
@@ -316,17 +326,22 @@ export class CodexReasoningProxy {
const originalModel =
isRecord(parsed) && typeof parsed.model === 'string' ? parsed.model : null;
const normalizedRequestModel = originalModel
? stripExtendedContextSuffix(originalModel)
: null;
// Support "model aliases" like `gpt-5.2-codex-xhigh` by translating to:
// - upstream model: `gpt-5.2-codex`
// - reasoning.effort: `xhigh`
//
// This allows tier→effort mapping without inventing upstream model IDs.
const suffixParsed = originalModel ? parseModelEffortSuffix(originalModel) : null;
const upstreamModel = suffixParsed?.upstreamModel ?? originalModel;
const suffixParsed = normalizedRequestModel
? parseModelEffortSuffix(normalizedRequestModel)
: null;
const upstreamModel = suffixParsed?.upstreamModel ?? normalizedRequestModel;
const effort =
suffixParsed?.effort ??
getEffortForModel(originalModel, this.modelEffort, this.config.defaultEffort);
getEffortForModel(normalizedRequestModel, this.modelEffort, this.config.defaultEffort);
const withUpstreamModel =
upstreamModel && isRecord(parsed) ? { ...parsed, model: upstreamModel } : parsed;
+46
View File
@@ -164,9 +164,55 @@ function ensureRequiredEnvVars(
result.ANTHROPIC_AUTH_TOKEN = defaults.ANTHROPIC_AUTH_TOKEN;
}
// Normalize local CLIProxy root/wrong-provider URLs to provider-pinned endpoint.
// This prevents model-routed "unknown provider" failures for codex effort aliases.
if (result.ANTHROPIC_BASE_URL?.trim()) {
result.ANTHROPIC_BASE_URL = normalizeLocalProviderBaseUrl(
result.ANTHROPIC_BASE_URL,
provider,
validPort
);
}
return result;
}
/** Localhost hostnames used for local CLIProxy endpoints */
const LOCALHOST_NAMES = new Set(['127.0.0.1', 'localhost', '0.0.0.0']);
/**
* Normalize local CLIProxy endpoint to the expected provider route.
* Only rewrites localhost URLs that target the active local port.
*/
function normalizeLocalProviderBaseUrl(
baseUrl: string,
provider: CLIProxyProvider,
port: number
): string {
try {
const parsed = new URL(baseUrl);
if (!['http:', 'https:'].includes(parsed.protocol)) return baseUrl;
if (!LOCALHOST_NAMES.has(parsed.hostname.toLowerCase())) return baseUrl;
const effectivePort = parsed.port
? Number.parseInt(parsed.port, 10)
: parsed.protocol === 'https:'
? 443
: 80;
if (!Number.isFinite(effectivePort) || effectivePort !== port) return baseUrl;
const expectedPath = `/api/provider/${provider}`;
if (parsed.pathname === expectedPath && !parsed.search && !parsed.hash) return baseUrl;
parsed.pathname = expectedPath;
parsed.search = '';
parsed.hash = '';
return parsed.toString();
} catch {
return baseUrl;
}
}
/**
* Rewrite localhost URLs to remote server URLs.
* Handles various localhost patterns: 127.0.0.1, localhost, 0.0.0.0