Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(codex): openai-codex 前缀走远程压缩 v2

kl3bf608429956
diff --git a/apps/desktop/src/main/im/shared/authCheck.ts b/apps/desktop/src/main/im/shared/authCheck.ts
index 112c5f3be3..5caffb1ac6 100644
--- a/apps/desktop/src/main/im/shared/authCheck.ts
+++ b/apps/desktop/src/main/im/shared/authCheck.ts
@@ -2,6 +2,7 @@ import {
chatEligibleSourcesForModel,
getModel,
isAgentSelectableModel,
+ isCodexGatewayWireModel,
nativeDefaultSourceId,
type ProviderView,
} from '@cindy/model-providers';
@@ -205,7 +206,7 @@ async function fallbackAuthCheckForImRoute(
}
if (hasGatewayKey) return { ok: true, missing: null };
}
- if (row.agentKind === 'codex' && row.model.startsWith('codex/')) {
+ if (row.agentKind === 'codex' && isCodexGatewayWireModel(row.model)) {
return hasGatewayKey ? { ok: true, missing: null } : { ok: false, missing: 'gateway-key' };
}
try {
diff --git a/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts b/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
index 9ce5f6e0d1..360e499b64 100644
--- a/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
@@ -86,7 +86,7 @@ describe('bundled model settings integrity', () => {
});
it.each(['gpt-6-astra', 'gpt-5.6-sol', 'gpt-5.6-terra', 'gpt-5.6-luna'].flatMap(
- (model) => [`openai/${model}`, `codex/${model}`, model],
+ (model) => [`openai/${model}`, `openai-codex/${model}`, `codex/${model}`, model],
))(
'shows known tiers for Gateway %s without opening them', (id) => {
setActiveCatalog(BUNDLED_CATALOG);
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
index 18b0d6cda6..f52aa51128 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
@@ -655,6 +655,8 @@ describe('decideCodexRoute', () => {
const { decideCodexRoute } = await import('../codex-proxy-host.js');
expect(decideCodexRoute({ model: 'codex/gpt-5.5', authInjection: 'oauth-bearer', gatewayKey: 'gw' }))
.toEqual({ headerOverride: { authorization: 'Bearer gw' } });
+ expect(decideCodexRoute({ model: 'openai-codex/gpt-6.1-sol', authInjection: 'oauth-bearer', gatewayKey: 'gw' }))
+ .toEqual({ headerOverride: { authorization: 'Bearer gw' } });
});
it('oauth-bearer + 普通模型 → override 到 ChatGPT, 不换 header(订阅默认)', async () => {
diff --git a/apps/desktop/src/main/maker-host/__tests__/piResponsesVerbosity.test.ts b/apps/desktop/src/main/maker-host/__tests__/piResponsesVerbosity.test.ts
index a62e27d0ba..83a70124c4 100644
--- a/apps/desktop/src/main/maker-host/__tests__/piResponsesVerbosity.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/piResponsesVerbosity.test.ts
@@ -35,6 +35,11 @@ describe('Pi Responses verbosity transform', () => {
input: [],
text: { verbosity: 'low' },
});
+ expect(transform({ model: 'openai-codex/gpt-5.6-sol', input: [] }, CTX)).toEqual({
+ model: 'openai-codex/gpt-5.6-sol',
+ input: [],
+ text: { verbosity: 'low' },
+ });
expect(resolveProvider).toHaveBeenCalledWith('session-1', 'token-1');
});
diff --git a/apps/desktop/src/main/maker-host/active-catalog.ts b/apps/desktop/src/main/maker-host/active-catalog.ts
index 76804e132d..06402f70b4 100644
--- a/apps/desktop/src/main/maker-host/active-catalog.ts
+++ b/apps/desktop/src/main/maker-host/active-catalog.ts
@@ -2,6 +2,7 @@ import {
projectProviderMediaModels,
isCustomRoutedProvider,
isOrganizationManagedProvider,
+ stripCodexGatewayWirePrefix,
} from '@cindy/model-providers';
import {
applyExistingModelLocalPatch,
@@ -522,9 +523,9 @@ function deriveXdCodexAnthropicBridgeModelIds(models: XdGatewayModelInfo[]): Set
/** 当前 XD 模型是否由客户端投影给 Codex、并应走 Anthropic Messages bridge。 */
export function isXdCodexAnthropicBridgeModel(modelId: string): boolean {
// Codex 会把 1M 上下文选择编码成 wire model 后缀;目录身份仍是原始 model id。
- // wire model 还可能带 `codex/` 前缀(视觉桥按模型前缀选面时传给路由判定的形态);
+ // wire model 还可能带 `openai-codex/` / `codex/` 前缀(视觉桥按模型前缀选面时传给路由判定的形态);
// 剥到目录身份再查,否则投影特例不命中、误走 Responses 面。
- const normalized = modelId.replace(/\[1m\]$/, '').replace(/^codex\//, '');
+ const normalized = stripCodexGatewayWirePrefix(modelId.replace(/\[1m\]$/, ''));
return xdCodexAnthropicBridgeModelIds.has(normalized);
}
@@ -1516,11 +1517,12 @@ function computeMerged(): Catalog {
// Resolve without an agent: each harness adapts the same model-level intent.
const registryEntry = findModelRegistryRoute(b.modelRegistry, 'xd', gm.id)?.entry;
// Registry describes the model; Gateway controls which tiers this route opens.
- // Gateway's GPT discount routes use codex/<model> (or the bare GPT ID).
+ // Gateway's GPT discount routes use openai-codex/<model>, codex/<model>, or the bare GPT ID.
// Resolve their exact OpenAI model identity for display only. Do not inherit
// subscription perAgent tiers, route availability, prices or request IDs.
- const standardId = /^(?:codex\/)?gpt-[^/]+$/.test(gm.id)
- ? `openai/${gm.id.replace(/^codex\//, '')}`
+ const bareGatewayGptId = stripCodexGatewayWirePrefix(gm.id);
+ const standardId = /^gpt-[^/]+$/.test(bareGatewayGptId)
+ ? `openai/${bareGatewayGptId}`
: gm.id;
const standardEntry =
b.modelRegistry?.models.find((entry) => entry.id === standardId) ?? registryEntry;
@@ -1896,7 +1898,7 @@ function computeMerged(): Catalog {
// identifies a vendor, and arbitrary private namespaces remain excluded.
const openAiModel = identity !== undefined
? identity.startsWith('openai/')
- : /^(?:(?:codex|openai|chatgpt)\/)?(?:gpt-|codex-|o\d+(?:[.-]|$))/.test(model.id);
+ : /^(?:(?:openai-codex|codex|openai|chatgpt)\/)?(?:gpt-|codex-|o\d+(?:[.-]|$))/.test(model.id);
if (!openAiModel || model.userModelConfig?.contextWindow !== undefined ||
(identity && localOverrides.baseModels?.[identity]?.contextWindow !== undefined) ||
hasLocalContextWindowOverride(localOverrides, provider.id, rootId,
diff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
index dee490a500..ced5e19469 100644
--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts
+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
@@ -9,8 +9,10 @@ import {
} from '@cindy/responses-chat-bridge';
import {
isCustomRoutedProvider,
+ isCodexGatewayWireModel,
providerCatalogId,
providerModelRecord,
+ stripCodexGatewayWirePrefix,
type CatalogModel,
type Effort,
type Provider,
@@ -529,11 +531,11 @@ function providerContextForRequest(
}
/**
- * 网关折扣命名空间判定:`codex/` 是 Gateway wire model 的档位标识,请求必须送往
- * 网关换 key,且转发时原样保留。它不是 Codex 运行时 slug,也不参与 spawn_agent。
+ * 网关折扣命名空间判定:`openai-codex/` 与 `codex/` 都是 Gateway wire model 的档位标识,
+ * 请求必须送往网关换 key,且转发时原样保留。它不是 Codex 运行时 slug,也不参与 spawn_agent。
*/
function gatewayProviderIdForRewrittenModel(model: string): string | null {
- return model.startsWith('codex/') && model.length > 'codex/'.length ? 'xd' : null;
+ return isCodexGatewayWireModel(model) ? 'xd' : null;
}
/** Applies the locked Subagent effort while preserving unrelated reasoning fields. */
@@ -882,7 +884,7 @@ function createGatewayNativeWebSearchTransform(frozenAuthInjection?: CodexProxyA
const routeProviderId = providerContext.providerId
?? inferProviderIdForModel(model, 'codex')
?? rewrittenGatewayProviderId;
- const gatewayModel = model.startsWith('codex/') ? model.slice('codex/'.length) : model;
+ const gatewayModel = stripCodexGatewayWirePrefix(model);
if (!/^gpt-5\.6(?:$|[-.])/.test(gatewayModel)) return null;
// Match the effective auth context used by this proxy's routing transform. Another
diff --git a/apps/desktop/src/main/maker-host/model-context-settings.ts b/apps/desktop/src/main/maker-host/model-context-settings.ts
index f2cd37ba35..32d2a0d433 100644
--- a/apps/desktop/src/main/maker-host/model-context-settings.ts
+++ b/apps/desktop/src/main/maker-host/model-context-settings.ts
@@ -1,4 +1,4 @@
-import type { AgentKind, Catalog, Effort } from '@cindy/model-providers';
+import { isCodexGatewayWireModel, type AgentKind, type Catalog, type Effort } from '@cindy/model-providers';
import { desktopCodexAuthAdapter, readClaudeApiKey } from './auth-adapters.js';
import { hasClaudeNativeLogin } from './claude-native-auth.js';
@@ -22,7 +22,7 @@ export function resolveDesktopModelContextProviderId(
? gatewayDefaultRouteDecision(agent, readClaudeApiKey()) ? 'xd'
: hasClaudeNativeLogin() ? 'anthropic' : null
: agent === 'codex'
- ? modelId.startsWith('codex/') ? 'xd'
+ ? isCodexGatewayWireModel(modelId) ? 'xd'
: desktopCodexAuthAdapter.hasCodexOAuthLoginReadOnly() ? 'openai' : 'xd'
: null;
return resolveModelContextProviderId(catalog, agent, providerId, modelId, defaultSource);
diff --git a/apps/desktop/src/main/maker-host/pi-gateway-model-catalog.ts b/apps/desktop/src/main/maker-host/pi-gateway-model-catalog.ts
index 2db4f764bb..8592acd669 100644
--- a/apps/desktop/src/main/maker-host/pi-gateway-model-catalog.ts
+++ b/apps/desktop/src/main/maker-host/pi-gateway-model-catalog.ts
@@ -136,8 +136,10 @@ const gatewayCatalogIdentityOverrides = new Map<string, { provider: string; mode
'gpt-6-astra',
].flatMap((id) => [
[id, { provider: 'openai', modelId: id }] as const,
+ [`openai-codex/${id}`, { provider: 'openai', modelId: id }] as const,
[`codex/${id}`, { provider: 'openai', modelId: id }] as const,
]),
+ ['openai-codex/gpt-5.5:auto', { provider: 'openai', modelId: 'gpt-5.5' }],
['codex/gpt-5.5:auto', { provider: 'openai', modelId: 'gpt-5.5' }],
...['deepseek-v4-flash', 'deepseek-v4-flash-vision-exp', 'deepseek-v4-pro'].map(
(id) => [`deepseek/${id}`, { provider: 'deepseek', modelId: id }] as const,
diff --git a/apps/desktop/src/main/maker-host/pi-responses-verbosity.ts b/apps/desktop/src/main/maker-host/pi-responses-verbosity.ts
index 928a4785a1..a912bffb26 100644
--- a/apps/desktop/src/main/maker-host/pi-responses-verbosity.ts
+++ b/apps/desktop/src/main/maker-host/pi-responses-verbosity.ts
@@ -8,7 +8,7 @@ import type {
const PI_SESSION_ID_HEADER = 'x-cindy-pi-session-id';
const PI_SESSION_TOKEN_HEADER = 'x-cindy-pi-session-token';
-const CODEX_GPT5_MODEL_RE = /^codex\/gpt-5(?:[.\-]|$)/;
+const CODEX_GPT5_MODEL_RE = /^(?:openai-codex|codex)\/gpt-5(?:[.\-]|$)/;
const RESPONSES_PATH_RE = /(?:^|\/)responses(?:\?|$)/;
type TextVerbosity = 'low' | 'medium' | 'high';
diff --git a/apps/desktop/src/main/maker-host/provider-route.ts b/apps/desktop/src/main/maker-host/provider-route.ts
index 24d60cfada..274e607e5f 100644
--- a/apps/desktop/src/main/maker-host/provider-route.ts
+++ b/apps/desktop/src/main/maker-host/provider-route.ts
@@ -23,9 +23,11 @@ import {
actualSourceIdForModel,
chatEligibleSourcesForModel,
isExclusiveXaiModelId,
+ isCodexGatewayWireModel,
resolvePiModelRoute,
runtimeCustomProviderId,
storedCustomProviderId,
+ stripCodexGatewayWirePrefix,
XAI_MODEL_PREFIX,
type AgentKind,
type Provider,
@@ -1216,12 +1218,12 @@ export function isHostInjectedAuthSession(sessionId: string, agent: AgentKind):
/** 按模型选视觉后端的 agent 面:模型前缀显式指面,否则按 provider.models 归属,最后回退。 */
function pickVisionAgent(provider: Provider, modelId: string): AgentKind | null {
// XD 投影给 Codex 的模型本质是 Claude-wire(仅 claude-code 面、无 codex 原生),
- // `codex/` 只是路由前缀:即使带 `codex/` 前缀也必须走 claude-code 面 / Messages,
+ // `openai-codex/` / `codex/` 只是路由前缀:即使带这些前缀也必须走 claude-code 面 / Messages,
// 否则误走 Responses 被上游拒(rebase 后 pickVisionAgent 先按前缀选 codex 面)。
if (provider.id === 'xd' && isXdCodexAnthropicBridgeModel(modelId)) {
if (provider.routing['claude-code']) return 'claude-code';
}
- if (modelId.startsWith('codex/') && provider.routing.codex) return 'codex';
+ if (isCodexGatewayWireModel(modelId) && provider.routing.codex) return 'codex';
if (
(modelId.startsWith('claude-') || modelId.startsWith('anthropic/')) &&
provider.routing['claude-code']
@@ -1270,7 +1272,7 @@ export function resolveVisionBackendRoute(
if (isProviderRouteMutationInProgress(providerId)) return null;
const provider = getActiveCatalog().providers.find((p) => p.id === providerId);
if (!provider) return null;
- // 按模型选 agent 面:模型前缀显式指面(codex/ → codex;claude- / anthropic/ → claude-code),
+ // 按模型选 agent 面:模型前缀显式指面(openai-codex/、codex/ → codex;claude- / anthropic/ → claude-code),
// 否则按 provider.models 归属,最后回退第一个声明 routing 的 agent。对齐视觉桥旧 pickAgent。
const agent = pickVisionAgent(provider, modelId);
if (!agent) return null;
@@ -1279,11 +1281,11 @@ export function resolveVisionBackendRoute(
const catalogPresetId = providerRuntimeCatalogPresetId(provider, agent);
// 转发上游前还原 model id(对齐 rewriteModelIdForProvider)。
- // XD 投影给 Codex 的模型走 Claude Messages 面时,`codex/` 是路由前缀不是后端真实模型名,
+ // XD 投影给 Codex 的模型走 Claude Messages 面时,折扣前缀不是后端真实模型名,
// 必须剥掉(否则上游 /v1/messages 收到 model:'codex/...' 404)。剥到目录裸 id。
let model = modelId;
if (provider.id === 'xd' && isXdCodexAnthropicBridgeModel(modelId)) {
- model = modelId.replace(/^codex\//, '').replace(/\[1m\]$/, '');
+ model = stripCodexGatewayWirePrefix(modelId).replace(/\[1m\]$/, '');
}
const stripPrefix = routing.modelIdRewrite?.stripPrefix;
if (stripPrefix && model.startsWith(stripPrefix)) {
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index e6b8ade7be..659440a5fd 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -1,5 +1,5 @@
import type { AgentKind } from '@cindy/maker-core';
-import type { AuthStrategy } from '@cindy/model-providers';
+import { isCodexGatewayWireModel, type AuthStrategy } from '@cindy/model-providers';
import path from 'node:path';
import { isCredentialModeSwitchBusyError } from '../maker-host/codex-credential-switch.js';
@@ -553,11 +553,11 @@ function resolveWorkerConfig(params: {
}
export function budgetModelRequiresApiKey(agent: AgentKind, model: string, hasApiKey: boolean): boolean {
- return agent === 'codex' && model.startsWith('codex/') && !hasApiKey;
+ return agent === 'codex' && isCodexGatewayWireModel(model) && !hasApiKey;
}
export function budgetModelRequiresApiKeyMessage(model: string): string {
- return `模型 "${model}"(codex/ 路由)需要先在设置里连接 Cindy AI 才能使用。`;
+ return `模型 "${model}"(openai-codex/ 或 codex/ 路由)需要先在设置里连接 Cindy AI 才能使用。`;
}
/** agent 的人类可读名,用于 preflight 失败信息。 */
diff --git a/apps/desktop/src/main/maker-ipc/sessionCodexTurnUsage.ts b/apps/desktop/src/main/maker-ipc/sessionCodexTurnUsage.ts
index c7140f5e72..865b7bd1ea 100644
--- a/apps/desktop/src/main/maker-ipc/sessionCodexTurnUsage.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionCodexTurnUsage.ts
@@ -26,6 +26,7 @@ import {
sumTurnUsageSegments,
} from '../usage/turnCostCalculator.js';
import { isExclusiveXaiModelId } from '../../shared/subscriptionModels.js';
+import { isCodexGatewayWireModel } from '@cindy/model-providers';
import { type RegionalMoney } from '../../shared/regionalMoney.js';
import { currentLedgerCurrency } from '../usage/ledgerCurrency.js';
import { triggerClaudeSubscriptionUsageRefresh, triggerXaiSubscriptionUsageRefresh } from './usage.js';
@@ -114,7 +115,7 @@ export function recordSessionCodexTurnUsage(
}
const isCodexBudgetRoute =
(sessionProvider == null || sessionProvider === 'xd') &&
- pricingModel.startsWith('codex/');
+ isCodexGatewayWireModel(pricingModel);
const isCodexXaiProviderRoute =
(sessionProvider == null || sessionProvider === 'xai') &&
isExclusiveXaiModelId(pricingModel);
@@ -278,7 +279,7 @@ export function recordSessionCodexTurnUsage(
!isCustomProviderRoute &&
!isExclusiveXaiModelId(model) &&
(codexAuthInjection === 'env-key' ||
- model.startsWith('codex/') ||
+ isCodexGatewayWireModel(model) ||
(sessionProvider === 'xd' && hasGatewayKey))
) {
void triggerClaudeAccountUsageRefresh();
diff --git a/apps/desktop/src/main/vision-bridge/vision-channel.ts b/apps/desktop/src/main/vision-bridge/vision-channel.ts
index 9802d2be4f..d2185e8c3d 100644
--- a/apps/desktop/src/main/vision-bridge/vision-channel.ts
+++ b/apps/desktop/src/main/vision-bridge/vision-channel.ts
@@ -18,7 +18,7 @@
*/
import fs from 'node:fs/promises';
-import { resolvePiModelWireProtocol, type AgentKind, type Provider } from '@cindy/model-providers';
+import { isCodexGatewayWireModel, resolvePiModelWireProtocol, type AgentKind, type Provider } from '@cindy/model-providers';
import { withOpenCodeGoSessionHeader } from '../maker-host/opencode-go-session.js';
import { providerRuntimeCatalogPresetId } from '../maker-host/provider-route.js';
@@ -165,13 +165,13 @@ async function toDataUrl(imagePath: string): Promise<string> {
/**
* 选该 provider 用于视觉的 agent 面。跟 agent 路由一致:先按模型 id 前缀判定面
- * (`codex/` → codex 面、`claude-`/`anthropic/` → claude-code 面),再按 provider.models
+ * (`openai-codex/`、`codex/` → codex 面、`claude-`/`anthropic/` → claude-code 面),再按 provider.models
* 里模型归属,最后回退到第一个声明 routing 的 agent。避免「模型是 codex 面却走了
* claude-code 的 routing」导致协议/端点不匹配。
*/
function pickAgent(provider: Provider, modelId: string): AgentKind | null {
- // 模型前缀显式指面(对齐 codex-proxy 的 `model.startsWith('codex/')` 判定)。
- if (modelId.startsWith('codex/') && provider.routing.codex) return 'codex';
+ // 模型前缀显式指面(对齐 codex-proxy 的折扣 wire 前缀判定)。
+ if (isCodexGatewayWireModel(modelId) && provider.routing.codex) return 'codex';
if (
(modelId.startsWith('claude-') || modelId.startsWith('anthropic/')) &&
provider.routing['claude-code']
diff --git a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts
index d6c9f0ab9e..17d73a7a2d 100644
--- a/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteWorkerCreationContext.test.ts
@@ -73,7 +73,7 @@ describe('remote Orca Worker creation context', () => {
expect(selector).toContain('if (!deviceId) {');
expect(selector).toContain('if (subscriptionDirectDisabledReason(id)) return true;');
expect(selector).toContain("if (isCustomRoutedProvider(provider)) return false;");
- expect(selector).toContain("return id.startsWith('codex/') && !hasSavedKey;");
+ expect(selector).toContain('return isCodexGatewayWireModel(id) && !hasSavedKey;');
expect(selector).toContain("if (remoteModelListStatus !== 'ready') return true;");
expect(selector).toContain(
'if (remoteProviders.error) return remoteProviders.unsupported ? false : true;',
diff --git a/apps/desktop/src/renderer/__tests__/todaySpendChip.test.ts b/apps/desktop/src/renderer/__tests__/todaySpendChip.test.ts
index 098f9d05d9..28acbfb94e 100644
--- a/apps/desktop/src/renderer/__tests__/todaySpendChip.test.ts
+++ b/apps/desktop/src/renderer/__tests__/todaySpendChip.test.ts
@@ -44,7 +44,7 @@ describe('TodaySpendChip dashboard routing', () => {
});
it('treats codex/ budget models + explicit XD selection as API usage on an oauth-bearer spawn', () => {
- expect(compact(source)).toContain(compact("modelId.startsWith('codex/')"));
+ expect(compact(source)).toContain(compact('isCodexGatewayWireModel(modelId)'));
expect(compact(source)).toContain(compact("codexAuthInjection === 'oauth-bearer'"));
expect(compact(source)).toContain(compact("vendorKey === 'codex' && !isCodexXaiProvider"));
expect(compact(source)).toContain(compact('isRemoteCodexSession ||'));
diff --git a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx
index ec2557016a..61a870ae0c 100644
--- a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx
+++ b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx
@@ -1,4 +1,4 @@
-import { isOpenAiSubscriptionProvider } from '@cindy/model-providers';
+import { isCodexGatewayWireModel, isOpenAiSubscriptionProvider } from '@cindy/model-providers';
import { useProviders } from '@/hooks/useProviders';
/**
* ErrorBanner — 错误横幅 + Retry / Cancel
@@ -236,7 +236,7 @@ export function ErrorBanner({
const hasImplicitOpenAiProvider =
normalizedProviderId === null &&
codexAuthInjection !== 'provider-oauth' &&
- !modelId?.startsWith('codex/') &&
+ !isCodexGatewayWireModel(modelId) &&
!modelId?.startsWith('xai/');
const isCodexOpenAiSource =
agentKind === 'codex' && (hasExplicitOpenAiProvider || hasImplicitOpenAiProvider);
diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
index 4f045e668e..af046a1771 100644
--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx
@@ -127,6 +127,7 @@ import {
nativeDefaultSourceId,
getModel,
isCustomRoutedProvider,
+ isCodexGatewayWireModel,
modelSupportsFastMode,
providerOffersModel,
resolveModelIconKind,
@@ -1835,12 +1836,12 @@ function ModelSelectorContentView({
const modelDisabledOf = (provider: ProviderView | null, id: string, rowAgent?: AgentKind): boolean => {
if (!deviceId) {
if (subscriptionDirectDisabledReason(id)) return true;
- // codex/ 的本机 key gate 只属于 XD 网关折扣路由。自定义(user)供应商目录里的
+ // openai-codex/ 与 codex/ 的本机 key gate 只属于 XD 网关折扣路由。自定义(user)供应商目录里的
// 同前缀模型由该供应商自身配置路由(codex-proxy-host 按会话显式供应商解析,
// 不按前缀落网关),不依赖 Cindy 登录/网关 key(#1568)。flat 列表(provider
// 为 null,无供应商概念)与内置来源保持原前缀判定。
if (isCustomRoutedProvider(provider)) return false;
- return id.startsWith('codex/') && !hasSavedKey;
+ return isCodexGatewayWireModel(id) && !hasSavedKey;
}
if (remoteModelListStatus !== 'ready') return true;
if (remoteProviders.error) return remoteProviders.unsupported ? false : true;
@@ -4104,7 +4105,7 @@ export function ModelSelector({
// 多实例同屏(IM 目录偏好)时前置「字段名 · 行别名」,读屏才能区分行与行。
const accessibleLabel = pendingSelectionTitle ? triggerTitle : withAgentDeviceLabel(baseAriaLabel);
const ariaLabel = ariaContext ? `${ariaContext}:${accessibleLabel}` : accessibleLabel;
- const isBudget = modelId.startsWith('codex/');
+ const isBudget = isCodexGatewayWireModel(modelId);
const isFieldTrigger = triggerVariant === 'field';
const isCreateAgentVariant = visualVariant === 'create-agent';
// compact 是 composer 容器宽度状态,不是 create-agent 的视觉私有状态。
diff --git a/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx b/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
index 1469004d29..d232dbd69e 100644
--- a/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
+++ b/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
@@ -714,7 +714,7 @@ export function ModelAdvancedDrawer({
{conversational && (
<Section
title={t('settings.providers.models.advanced.contextLimit')}
- hint={t(supportsMillionContext ? 'settings.providers.models.advanced.contextLimitLocalMillionHint' : /^(?:(?:codex|openai|chatgpt)\/)?gpt-/.test(primaryModel.id) && provider.source !== 'user' && ['openai', 'xd'].includes(provider.id)
+ hint={t(supportsMillionContext ? 'settings.providers.models.advanced.contextLimitLocalMillionHint' : /^(?:(?:openai-codex|codex|openai|chatgpt)\/)?gpt-/.test(primaryModel.id) && provider.source !== 'user' && ['openai', 'xd'].includes(provider.id)
? 'settings.providers.models.advanced.contextLimitGptHint'
: 'settings.providers.models.advanced.contextLimitHint')}
>
diff --git a/apps/desktop/src/renderer/components/status/TodaySpendChip.tsx b/apps/desktop/src/renderer/components/status/TodaySpendChip.tsx
index 40b5448e7a..4ec676cd23 100644
--- a/apps/desktop/src/renderer/components/status/TodaySpendChip.tsx
+++ b/apps/desktop/src/renderer/components/status/TodaySpendChip.tsx
@@ -3,7 +3,7 @@ import {
formatCompactTimeUntilReset,
WEEKLY_WINDOW_MINUTES,
} from '@/lib/compactQuotaCountdown';
-import { isOpenAiSubscriptionProvider } from '@cindy/model-providers';
+import { isCodexGatewayWireModel, isOpenAiSubscriptionProvider } from '@cindy/model-providers';
import { useDeviceProviders } from '@/hooks/useDeviceProviders';
import { useProviders } from '@/hooks/useProviders';
/**
@@ -855,7 +855,7 @@ export function TodaySpendChip({
(isXaiAccount || (providerId == null && isXaiPrefixedModel));
const isSubscriptionBridge = isChatgptBridge || isXaiBridge;
const isRemoteCodexSession = vendorKey === 'codex' && Boolean(remoteHostId);
- const isCodexBudgetModel = typeof modelId === 'string' && modelId.startsWith('codex/');
+ const isCodexBudgetModel = typeof modelId === 'string' && isCodexGatewayWireModel(modelId);
const isCodexGatewayBudgetModel =
isCodexBudgetModel && (providerId == null || providerId === 'xd');
const isCodexXaiProvider =
diff --git a/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx b/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx
index 174bc2ee4b..d5414cdea1 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/ScheduleChips.tsx
@@ -20,6 +20,7 @@ import { useModelDiscoveryPending } from '@/components/new-chat/useModelDiscover
import {
effectiveSourceIdForModel,
getModel,
+ isCodexGatewayWireModel,
} from '@cindy/model-providers';
import * as sessionService from '@/lib/sessionService';
import type { Session } from '@/lib/ccAgent.types';
@@ -1110,7 +1111,7 @@ export function ModelEffortChip({
);
const pickerAgents = useModelPickerAgents(agentKind);
const caps = useAgentCapabilities(agentKind);
- // 触发器(trigger)展示用:仍按 codex/ 折扣模型的 XD 网关来源可见性过滤,算出当前
+ // 触发器(trigger)展示用:仍按 openai-codex/ 与 codex/ 折扣模型的 XD 网关来源可见性过滤,算出当前
// 选中模型名。下拉内容本体改用聊天的 ModelSelectorContent(它内部按来源/api-key 自行
// 过滤 + 分组),这里只为 trigger 文案保留最小化 model 解析。
const { providers } = useProviders();
@@ -1119,7 +1120,7 @@ export function ModelEffortChip({
const models = useMemo(
() =>
(availableModels ?? []).filter(
- (m) => agentKind !== 'codex' || xdConnected || !m.id.startsWith('codex/'),
+ (m) => agentKind !== 'codex' || xdConnected || !isCodexGatewayWireModel(m.id),
),
[availableModels, agentKind, xdConnected],
);
diff --git a/apps/desktop/src/renderer/lib/__tests__/modelShortLabel.test.ts b/apps/desktop/src/renderer/lib/__tests__/modelShortLabel.test.ts
index 8e143382eb..0700537c68 100644
--- a/apps/desktop/src/renderer/lib/__tests__/modelShortLabel.test.ts
+++ b/apps/desktop/src/renderer/lib/__tests__/modelShortLabel.test.ts
@@ -27,6 +27,7 @@ describe('formatModelShortLabel', () => {
['gpt-5.5', 'GPT-5.5'],
['gpt-5.4-mini', 'GPT-5.4 Mini'],
['codex/gpt-5.5', 'GPT-5.5'],
+ ['openai-codex/gpt-5.5', 'GPT-5.5'],
// 未知 / 未来模型:Title Case 兜底,永不抛错
['some-future-model', 'Some Future Model'],
['', ''],
diff --git a/apps/desktop/src/renderer/lib/modelShortLabel.ts b/apps/desktop/src/renderer/lib/modelShortLabel.ts
index 0c78d7e940..f217419dac 100644
--- a/apps/desktop/src/renderer/lib/modelShortLabel.ts
+++ b/apps/desktop/src/renderer/lib/modelShortLabel.ts
@@ -13,6 +13,8 @@
* 品牌名不翻译(规则 18):'Haiku 4.5' / 'Opus 4.8' / 'GPT-5.5' 跨语言一致。
*/
+import { stripCodexGatewayWirePrefix } from '@cindy/model-providers';
+
/** 首字母大写(仅处理 ASCII 单词,够用)。 */
function cap(s: string): string {
return s.length === 0 ? s : s[0].toUpperCase() + s.slice(1).toLowerCase();
@@ -55,8 +57,8 @@ export function formatModelShortLabel(modelId: string | undefined | null): strin
id = id.replace(/\[1m\]$/i, '');
// 2) 去尾部 dated 后缀(如 -20251001)
id = id.replace(/-\d{8}$/, '');
- // 3) 去已知 vendor/route 前缀(Bedrock/Vertex route、折扣版 codex/ 前缀)
- id = id.replace(/^us\.anthropic\./i, '').replace(/^anthropic\./i, '').replace(/^codex\//i, '');
+ // 3) 去已知 vendor/route 前缀(Bedrock/Vertex route、折扣版 openai-codex/ 与 codex/ 前缀)
+ id = stripCodexGatewayWirePrefix(id.replace(/^us\.anthropic\./i, '').replace(/^anthropic\./i, ''));
// 4) Claude <family>-<major>(-<minor>)? → 'Family major.minor' / 'Family major'
// 家族用通用词字符匹配,覆盖 opus/sonnet/haiku/fable 及未来新族(如 nova);
diff --git a/apps/desktop/src/renderer/lib/usageFormat.ts b/apps/desktop/src/renderer/lib/usageFormat.ts
index d09ecf861a..a41eb2b2b6 100644
--- a/apps/desktop/src/renderer/lib/usageFormat.ts
+++ b/apps/desktop/src/renderer/lib/usageFormat.ts
@@ -5,6 +5,7 @@
*/
import { formatCompactTokens } from '@cindy/maker-shared/usage-format';
+import { stripCodexGatewayWirePrefix } from '@cindy/model-providers';
import type { RegionalMoney } from '../../shared/regionalMoney';
@@ -73,18 +74,17 @@ export function formatTurnCostMoney(money: RegionalMoney): string {
/**
* 把 SDK / 网关 model id 收成简短可读标签, 供 tooltip「按模型成本明细」展示。
- * 依次剥掉 SDK 路由后缀 `[..]`、尾部日期 `-YYYYMMDD`、`codex/` 预算前缀, 再美化家族名。
+ * 依次剥掉 SDK 路由后缀 `[..]`、尾部日期 `-YYYYMMDD`、`openai-codex/` / `codex/` 预算前缀, 再美化家族名。
* 认不出的安全回退原始 id (绝不返回空串)。
* 'claude-opus-4-8[1m]' → 'Opus 4.8'
* 'claude-haiku-4-5-20251001' → 'Haiku 4.5'
- * 'gpt-5.5' / 'codex/gpt-5.5' → 'GPT-5.5'
+ * 'gpt-5.5' / 'codex/gpt-5.5' / 'openai-codex/gpt-5.5' → 'GPT-5.5'
*/
export function formatModelShort(id: string): string {
if (typeof id !== 'string' || !id.trim()) return id;
- const s = id.trim()
+ const s = stripCodexGatewayWirePrefix(id.trim()
.replace(/\[[^\]]*\]\s*$/, '') // 去 [1m] 等 SDK 路由后缀
- .replace(/-\d{6,8}$/, '') // 去尾部日期 -YYYYMMDD / -YYMMDD
- .replace(/^codex\//, ''); // 去预算路由前缀
+ .replace(/-\d{6,8}$/, '')); // 去尾部日期 -YYYYMMDD / -YYMMDD
const claude = s.match(/^claude-(opus|sonnet|haiku)-(\d+)-(\d+)$/i);
if (claude) {
const family = claude[1][0].toUpperCase() + claude[1].slice(1).toLowerCase();
diff --git a/apps/desktop/src/shared/modelMismatch.ts b/apps/desktop/src/shared/modelMismatch.ts
index 3cd7dd868d..3ee60ca442 100644
--- a/apps/desktop/src/shared/modelMismatch.ts
+++ b/apps/desktop/src/shared/modelMismatch.ts
@@ -17,6 +17,8 @@
* 去 vendor 路由前缀、点横等价、去 claude- 前缀,大小写不敏感。
*/
+import { stripCodexGatewayWirePrefix } from '@cindy/model-providers';
+
/** 判定结果:selected / actual 均为原始 raw id(展示层再折算短标签)。 */
export interface ModelMismatchInfo {
/** 用户为该会话所选的模型 raw id(turn start 时快照)。 */
@@ -45,7 +47,9 @@ export function canonicalModelFamilyKey(modelId: string | null | undefined): str
if (!id) return '';
id = id.replace(/\[[^\]]*\]\s*$/, '').trim();
id = id.replace(/-\d{8}$/, '').replace(/-latest$/, '');
- id = id.replace(/^us\.anthropic\./, '').replace(/^eu\.anthropic\./, '').replace(/^anthropic\./, '').replace(/^codex\//, '');
+ id = stripCodexGatewayWirePrefix(
+ id.replace(/^us\.anthropic\./, '').replace(/^eu\.anthropic\./, '').replace(/^anthropic\./, ''),
+ );
id = id.replace(/\./g, '-');
id = id.replace(/^claude-/, '');
return id;
diff --git a/apps/mobile/src/__tests__/modelPickerRows.test.ts b/apps/mobile/src/__tests__/modelPickerRows.test.ts
index 9892ba08d1..465233ff42 100644
--- a/apps/mobile/src/__tests__/modelPickerRows.test.ts
+++ b/apps/mobile/src/__tests__/modelPickerRows.test.ts
@@ -383,8 +383,10 @@ describe('rowFastEditable / rowFastOn(严格 per-(供应商, 模型))', () => {
});
describe('budgetRowDisabled(折扣版置灰三态)', () => {
- it("只有 codex/ 前缀且被控端明确 absent 才置灰;unknown 不误伤", () => {
+ it("只有折扣前缀且被控端明确 absent 才置灰;unknown 不误伤", () => {
expect(budgetRowDisabled('codex/gpt-5.5', 'absent')).toBe(true);
+ expect(budgetRowDisabled('openai-codex/gpt-6.1-sol', 'absent')).toBe(true);
+ expect(budgetRowDisabled('openai-codex/gpt-6.1-sol', 'present')).toBe(false);
expect(budgetRowDisabled('codex/gpt-5.5', 'present')).toBe(false);
expect(budgetRowDisabled('codex/gpt-5.5', 'unknown')).toBe(false);
expect(budgetRowDisabled('gpt-5.5', 'absent')).toBe(false);
diff --git a/apps/mobile/src/session/messageActions.ts b/apps/mobile/src/session/messageActions.ts
index 5e0260476c..4267d59db2 100644
--- a/apps/mobile/src/session/messageActions.ts
+++ b/apps/mobile/src/session/messageActions.ts
@@ -2,6 +2,7 @@ import type { NormalizedRemoteMessage } from '@/session/messageNormalize';
import { stripChatQuoteMarkerLines } from '@cindy/maker-shared/chat-quotes';
import { projectSlashCommandsInText } from '@cindy/maker-shared/composer-palette';
import { formatCompactTokens } from '@cindy/maker-shared/usage-format';
+import { stripCodexGatewayWirePrefix } from '@cindy/model-providers';
import { i18n } from '@/i18n';
import {
remoteMoneySymbol,
@@ -173,7 +174,7 @@ export function formatModelShortLabel(modelId: string | undefined | null): strin
if (!id) return '';
id = id.replace(/\[1m\]$/i, '');
id = id.replace(/-\d{8}$/, '');
- id = id.replace(/^us\.anthropic\./i, '').replace(/^anthropic\./i, '').replace(/^codex\//i, '');
+ id = stripCodexGatewayWirePrefix(id.replace(/^us\.anthropic\./i, '').replace(/^anthropic\./i, ''));
const claude = /^claude-([a-z]+)-(\d+)(?:-(\d+))?$/i.exec(id);
if (claude) {
const family = claude[1][0].toUpperCase() + claude[1].slice(1).toLowerCase();
diff --git a/apps/mobile/src/session/modelPickerRows.ts b/apps/mobile/src/session/modelPickerRows.ts
index 619f75cca2..1fd615f74f 100644
--- a/apps/mobile/src/session/modelPickerRows.ts
+++ b/apps/mobile/src/session/modelPickerRows.ts
@@ -6,6 +6,7 @@
* (mobile i18n 化后由 models.json catalog 供文案,在使用点求值 i18n.t)。组件只做渲染,
* 这里可 node 单测。
*/
+import { isCodexGatewayWireModel } from '@cindy/model-providers/classification';
import { getModel, modelSupportsFastMode, type ProviderView } from '@cindy/model-providers/registry';
import type { SectionModel } from '@cindy/model-providers/sections';
import type { AgentKind } from '@cindy/model-providers/types';
@@ -344,9 +345,9 @@ export function rowFastOn(args: {
/**
* budget 档置灰判定(桌面 budgetDisabledOf 同口径,key 判定换成被控端 presence 探测):
- * `codex/` 前缀 且 被控端明确无 key 才置灰;'unknown'(旧被控端 / 拉取失败)不置灰,
+ * `openai-codex/` 或 `codex/` 前缀 且 被控端明确无 key 才置灰;'unknown'(旧被控端 / 拉取失败)不置灰,
* 宁可放行到被控端请求期报错也不误伤。
*/
export function budgetRowDisabled(modelId: string, keyStatus: DeviceApiKeyStatus): boolean {
- return modelId.startsWith('codex/') && keyStatus === 'absent';
+ return isCodexGatewayWireModel(modelId) && keyStatus === 'absent';
}
diff --git a/apps/mobile/src/session/readSessionMenuAccountUsage.ts b/apps/mobile/src/session/readSessionMenuAccountUsage.ts
index 2005bb95c1..4b28231566 100644
--- a/apps/mobile/src/session/readSessionMenuAccountUsage.ts
+++ b/apps/mobile/src/session/readSessionMenuAccountUsage.ts
@@ -1,4 +1,5 @@
import { selectCodexUsageForModel } from "@cindy/maker-shared/codex-usage-buckets";
+import { isCodexGatewayWireModel } from "@cindy/model-providers/classification";
import { formatRemoteError } from "@cindy/maker-shared/device-link-contract";
import {
isXaiWeeklyUsageCurrent,
@@ -191,7 +192,7 @@ export async function readSessionMenuAccountUsage(
const gateway =
provider === "xd" ||
(provider === null &&
- ((session.agentKind === "codex" && model.startsWith("codex/")) ||
+ ((session.agentKind === "codex" && isCodexGatewayWireModel(model)) ||
claudeRoute === "gateway"));
if (gateway) {
const payload = record(await reader.getAccountUsage("claude-code"));
diff --git a/apps/mobile/src/session/sessionControls.ts b/apps/mobile/src/session/sessionControls.ts
index 530d1e5915..65b537422e 100644
--- a/apps/mobile/src/session/sessionControls.ts
+++ b/apps/mobile/src/session/sessionControls.ts
@@ -1,4 +1,5 @@
import { isOpenAiSubscriptionProvider } from '@cindy/model-providers/provider-identity';
+import { isCodexGatewayWireModel } from '@cindy/model-providers/classification';
import type { Provider } from '@cindy/model-providers/types';
export type OpenAiAccountProvider = Pick<Provider, 'id' | 'auth'>;
export function isSessionOpenAiAccount(providerId: string | null | undefined, provider?: OpenAiAccountProvider): boolean {
@@ -22,7 +23,7 @@ export function canUseLocalCodexRateLimitControl(
const providerId = session.providerId?.trim() ?? '';
const model = session.model.trim();
return (providerId === '' || isSessionOpenAiAccount(providerId, provider))
- && !model.startsWith('codex/')
+ && !isCodexGatewayWireModel(model)
&& !model.startsWith('chatgpt/')
&& !model.startsWith('xai/');
}
diff --git a/docs/product-rules/model-selector-unified.md b/docs/product-rules/model-selector-unified.md
index 0c12be607f..9acb819b27 100644
--- a/docs/product-rules/model-selector-unified.md
+++ b/docs/product-rules/model-selector-unified.md
@@ -207,11 +207,11 @@
## 4. 特殊情况检查表(实现与 review 逐条过)
-**目录/来源**
+- **目录/来源**
- 同名模型多来源:一切能力(Fast/ctx/efforts/推荐)先解析生效来源再查,禁止读拍平列表;`actualSourceIdForModel`(会话内,含停用) vs `effectiveSourceIdForModel`(草稿)双口径保留。
- XD 网关独占存在性:不从 Registry 给 XD 补条目;`/models` 空则空。
- bridge 条目 id 带前缀(`chatgpt/`,anthropic→codex 强制 `supportsFastMode:false`):按 id 查推荐/能力时先归一。
-- `[1m]` 后缀 / `codex/` 前缀归一;`status:'retired'` 的 keepSelected 豁免(运行中会话仍显示)。
+- `[1m]` 后缀 / `openai-codex/` 与 `codex/` 前缀归一;`status:'retired'` 的 keepSelected 豁免(运行中会话仍显示)。
- user provider:默认 ctx 200K 不带 verified 标;Pi effort 交集塌陷;`custom:<id>` 分组;`'cindy'` 复合路由排除 user provider。
- 立省/订阅徽标:`group==='gpt-budget'`+前缀兜底;订阅走 provider.access(flat 模式 sourceAccess);`visibleModelUnion` 返回值含 3 个隐藏字段,禁止整对象过 wire/持久化。
diff --git a/packages/lizi-mcps/src/xdt-helper/create_worker.ts b/packages/lizi-mcps/src/xdt-helper/create_worker.ts
index 5d44695789..a88f954001 100644
--- a/packages/lizi-mcps/src/xdt-helper/create_worker.ts
+++ b/packages/lizi-mcps/src/xdt-helper/create_worker.ts
@@ -143,7 +143,7 @@ const DESCRIPTION = [
'- 同 label 的另一个 Worker 正在创建 → 返 WORKER_CREATION_IN_PROGRESS',
'- 当前 lead session 不存在或没有 active team → 返 NOT_FOUND',
'- role / label / model 等参数不合法 → 返 INVALID_PARAMS',
- '- 选了 tier=budget (codex/ 前缀模型) 但当前 Codex 不在 API key 模式 → 返 BUDGET_MODEL_REQUIRES_API_MODE: 应如实告知用户「该模型需切换到 API key 模式才能使用」, 不要擅自改用官方版顶替 (除非用户明确同意)。',
+ '- 选了 tier=budget (openai-codex/ 或 codex/ 前缀模型) 但当前 Codex 不在 API key 模式 → 返 BUDGET_MODEL_REQUIRES_API_MODE: 应如实告知用户「该模型需切换到 API key 模式才能使用」, 不要擅自改用官方版顶替 (除非用户明确同意)。',
'- 该 agent 没有任何已连接的模型供应商 (provider) → 返 NO_PROVIDER_FOR_AGENT: 应如实把 message 转告用户 (去「设置 → 模型供应商」连接一个支持该 agent 的供应商), 或按 message 建议改用「已连接供应商的另一个 agent」创建 worker; 不要反复重试同一 agent。',
'- Worker 解析出的精确 provider + model 路由当前不可用 → 返 PROVIDER_ROUTE_UNAVAILABLE: 应如实把 message 转告用户并调整模型或供应商; 不要按“完全没有供应商”处理,也不要反复重试同一路由。',
].join('\n');
diff --git a/packages/lizi-mcps/src/xdt-helper/list_available_models.ts b/packages/lizi-mcps/src/xdt-helper/list_available_models.ts
index 06157dddcf..6a6aae1460 100644
--- a/packages/lizi-mcps/src/xdt-helper/list_available_models.ts
+++ b/packages/lizi-mcps/src/xdt-helper/list_available_models.ts
@@ -19,7 +19,7 @@ export interface ModelDescriptor {
defaultProviderId?: string | null;
}
-/** tier: 'budget' = codex/ 前缀的 gateway 折扣路由, 'standard' = 官方原版。仅出现在返回值, 供 agent 精准选型。 */
+/** tier: 'budget' = openai-codex/ 或 codex/ 前缀的 gateway 折扣路由, 'standard' = 官方原版。仅出现在返回值, 供 agent 精准选型。 */
type ModelTier = 'budget' | 'standard';
interface TaggedModel {
@@ -33,18 +33,26 @@ interface TaggedModel {
/**
* 给每个 model 打 tier 标记。
*
- * tier='budget'(gateway 折扣 codex 路由) 的唯一判定依据是 model id 的 `codex/` 前缀 ——
- * 与 renderer ModelSelector.categorize() 的归类规则保持一致 (codex/* → 折扣分组),
+ * tier='budget'(gateway 折扣路由) 的判定依据是 model id 的 `openai-codex/` 或 `codex/` 前缀 ——
+ * 与 `@cindy/model-providers` 的 `CODEX_GATEWAY_WIRE_PREFIXES` 保持一致,
* 也与 host CODEX_BUDGET_MODELS 的 id 命名约定一致。据此打 tier 后, agent 不必再从
* label / description 里语义推断, 直接按 tier 精准匹配用户指定的档位。
* label (= host displayName, 同时是 UI 下拉展示名) 不受影响, 保持干净。
*/
+function isBudgetWireModel(modelId: string): boolean {
+ const id = modelId.trim().toLowerCase();
+ return (
+ (id.startsWith('openai-codex/') && id.length > 'openai-codex/'.length) ||
+ (id.startsWith('codex/') && id.length > 'codex/'.length)
+ );
+}
+
function tagTier(models: ModelDescriptor[] | undefined): TaggedModel[] | undefined {
if (!models) return undefined;
return models.map((m) => ({
id: m.id,
label: m.label,
- tier: m.id.startsWith('codex/') ? 'budget' : 'standard',
+ tier: isBudgetWireModel(m.id) ? 'budget' : 'standard',
...(m.providers
? {
providers: m.providers.map((provider) => ({
@@ -87,7 +95,7 @@ const DESCRIPTION = [
'- default_provider_id: 未显式选择来源时 host 当前解析出的默认来源;providers 只有一项时直接使用该项。',
'',
'tier 字段 (用于精准选型, 不要靠 label 推断):',
- "- tier='budget': codex/ 前缀的 gateway 折扣路由 (如 codex/gpt-5.5)",
+ "- tier='budget': openai-codex/ 或 codex/ 前缀的 gateway 折扣路由 (如 openai-codex/gpt-5.5、codex/gpt-5.5)",
"- tier='standard': 官方原版 (如 gpt-5.5)",
'选型规则: 用户明确要求折扣路由 → 选 tier=budget 的模型; 说「官方 / 原版 / 普通版」→ 选 tier=standard。',
'默认规则: 用户只报模型名 (如 "gpt-5.5") 时, 一律默认 tier=standard (官方原版); 只有用户明确要求折扣路由才允许选 tier=budget。',
diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.ts
index 0ddaeb2854..65b585ee84 100644
--- a/packages/maker-core/src/agents/codex/index.test.ts
+++ b/packages/maker-core/src/agents/codex/index.test.ts
@@ -5601,6 +5601,20 @@ describe('CodexAgent.startSession developerInstructions', () => {
expect(implicitGatewayParams.modelProvider).toBe('cindy_codex');
await implicitGatewayHandle.close();
+ // openai-codex/* 与 codex/* 一样走 Cindy 远程压缩。
+ host.request.mock.calls.length = 0;
+ const openAiCodexHandle = await agent.startSession({
+ sessionId: 'session-openai-codex',
+ model: 'openai-codex/gpt-6.1-sol',
+ providerId: 'xd',
+ workingDir: '/repo',
+ });
+ const openAiCodexParams = host.request.mock.calls.find(
+ ([method]) => method === Method.ThreadStart,
+ )?.[1] as { modelProvider?: string };
+ expect(openAiCodexParams.modelProvider).toBe('cindy_codex');
+ await openAiCodexHandle.close();
+
// Cindy Provider 的非 codex/* 模型不误开远程压缩。
host.request.mock.calls.length = 0;
const plainGatewayHandle = await agent.startSession({
diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.ts
index 4a074edd2d..756700735d 100644
--- a/packages/maker-core/src/agents/codex/index.ts
+++ b/packages/maker-core/src/agents/codex/index.ts
@@ -6641,7 +6641,7 @@ assertRouteCurrent();
const hostUsesCodexProxy = host.isCodexProxyActive();
// Codex 只按 model provider 的 name="OpenAI" 判断远程压缩能力。Cindy 先按
- // 产品来源 + codex/* 模型做语义路由,再选择同一 app-server 内固定 HTTP 的 identity。
+ // 产品来源 + openai-codex/* / codex/* 模型做语义路由,再选择同一 app-server 内固定 HTTP 的 identity。
const cindyProviderRemoteCompactionRequested = isCindyProviderCodexRemoteCompactionRoute({
providerId: mutableProviderId,
model: mutableModel,
diff --git a/packages/maker-core/src/agents/credential-mode.test.ts b/packages/maker-core/src/agents/credential-mode.test.ts
index 29e3a559d8..31dd281b80 100644
--- a/packages/maker-core/src/agents/credential-mode.test.ts
+++ b/packages/maker-core/src/agents/credential-mode.test.ts
@@ -14,13 +14,19 @@ describe('isCindyProviderCodexRemoteCompactionRoute', () => {
providerId,
model: 'codex/gpt-5.6-sol',
})).toBe(true);
+ expect(isCindyProviderCodexRemoteCompactionRoute({
+ providerId,
+ model: 'openai-codex/gpt-6.1-sol',
+ })).toBe(true);
});
it.each([
{ providerId: 'xd', model: 'gpt-5.6-sol' },
{ providerId: 'openai', model: 'codex/gpt-5.6-sol' },
+ { providerId: 'openai', model: 'openai-codex/gpt-6.1-sol' },
{ providerId: 'xai', model: 'codex/gpt-5.6-sol' },
{ providerId: 'xd', model: 'codex/' },
+ { providerId: 'xd', model: 'openai-codex/' },
])('rejects non-Cindy-Codex route $providerId/$model', (input) => {
expect(isCindyProviderCodexRemoteCompactionRoute(input)).toBe(false);
});
@@ -78,6 +84,10 @@ describe('resolveAgentCredentialMode', () => {
agentKind: 'codex',
model: 'codex/gpt-5.5',
})).toBe('gateway-key');
+ expect(resolveAgentCredentialMode({
+ agentKind: 'codex',
+ model: 'openai-codex/gpt-6.1-sol',
+ })).toBe('gateway-key');
expect(resolveAgentCredentialMode({
agentKind: 'codex',
model: 'xai/grok-4.3',
diff --git a/packages/maker-core/src/agents/credential-mode.ts b/packages/maker-core/src/agents/credential-mode.ts
index 43a0f7943e..d2e59fa813 100644
--- a/packages/maker-core/src/agents/credential-mode.ts
+++ b/packages/maker-core/src/agents/credential-mode.ts
@@ -1,5 +1,6 @@
import type { AgentKind } from '../types/common.js';
import type { AgentCredentialMode } from '../interfaces/auth-adapter.js';
+import { isCodexGatewayWireModel } from '@cindy/model-providers/classification';
export interface ResolveAgentCredentialModeOptions {
agentKind: AgentKind;
@@ -7,17 +8,15 @@ export interface ResolveAgentCredentialModeOptions {
model?: string | null;
}
-/** Cindy Provider 中由 Codex Responses 上游实现远程压缩的模型路由。 */
+/** Cindy Provider 中由 Codex Responses 上游实现远程压缩的模型路由。`openai-codex/` 与 `codex/` 都算。 */
export function isCindyProviderCodexRemoteCompactionRoute(input: {
providerId: string | null | undefined;
model: string | null | undefined;
}): boolean {
const providerId = input.providerId?.trim() || null;
- const model = input.model?.trim() ?? '';
return (
(providerId === null || providerId === 'xd') &&
- model.startsWith('codex/') &&
- model.length > 'codex/'.length
+ isCodexGatewayWireModel(input.model)
);
}
@@ -41,7 +40,7 @@ export function resolveAgentCredentialMode(
if (providerId) return 'provider-oauth';
const model = options.model?.trim() ?? '';
- if (model.startsWith('codex/')) return 'gateway-key';
+ if (isCodexGatewayWireModel(model)) return 'gateway-key';
if (model.startsWith('chatgpt/') || model.startsWith('xai/')) return 'provider-oauth';
return undefined;
}
diff --git a/packages/maker-shared/src/__tests__/agentCapabilities.test.ts b/packages/maker-shared/src/__tests__/agentCapabilities.test.ts
index 288b67e282..6c620e13ae 100644
--- a/packages/maker-shared/src/__tests__/agentCapabilities.test.ts
+++ b/packages/maker-shared/src/__tests__/agentCapabilities.test.ts
@@ -321,6 +321,7 @@ describe('agent capabilities shared model', () => {
// 而这个分类名会原样出现在切换确认框的标题与说明里。
expect(categorizeMobileModel('codex/gpt-5.5')).toBe('gpt-budget');
expect(categorizeMobileModel('codex/gpt-5.6-sol')).toBe('gpt-budget');
+ expect(categorizeMobileModel('openai-codex/gpt-6.1-sol')).toBe('gpt-budget');
expect(categorizeMobileModel('gpt-5.5')).toBe('gpt');
// 目录下发的 id 带命名空间,尾段也要认,否则整批模型掉进兜底分类。
expect(categorizeMobileModel('anthropic/claude-opus-5')).toBe('anthropic');
diff --git a/packages/maker-shared/src/agentCapabilities.ts b/packages/maker-shared/src/agentCapabilities.ts
index 619856a2a0..3fd7a1510f 100644
--- a/packages/maker-shared/src/agentCapabilities.ts
+++ b/packages/maker-shared/src/agentCapabilities.ts
@@ -285,9 +285,12 @@ export function categorizeMobileModel(id: string): MobileModelCategory {
// 本来就带命名空间,只认裸 id 会让整批模型掉进兜底分类。
const tail = lower.slice(lower.lastIndexOf('/') + 1);
if (lower.startsWith('claude-') || tail.startsWith('claude-')) return 'anthropic';
- // 折扣路由必须判在 gpt 之前:`codex/gpt-5.5` 的尾段就是 `gpt-5.5`,顺序反了会被认成
- // 'gpt',于是切换确认框把「GPT 折扣」模型读成「GPT」。桌面 categorize 同一处理。
- if (lower.startsWith('codex/')) return 'gpt-budget';
+ // 折扣路由必须判在 gpt 之前:`openai-codex/gpt-*` 与 `codex/gpt-5.5` 的尾段都是 gpt-*,
+ // 顺序反了会被认成 'gpt'。与桌面 `CODEX_GATEWAY_WIRE_PREFIXES` 保持同一组前缀。
+ if (
+ (lower.startsWith('openai-codex/') && lower.length > 'openai-codex/'.length) ||
+ (lower.startsWith('codex/') && lower.length > 'codex/'.length)
+ ) return 'gpt-budget';
if (lower.startsWith('gpt-') || tail.startsWith('gpt-')) return 'gpt';
if (lower.startsWith('gemini-') || tail.startsWith('gemini-')) return 'google';
return 'ungrouped';
diff --git a/packages/model-providers/catalog/model-registry.json b/packages/model-providers/catalog/model-registry.json
index 0212b9c057..5a770b4d64 100644
--- a/packages/model-providers/catalog/model-registry.json
+++ b/packages/model-providers/catalog/model-registry.json
@@ -2484,6 +2484,11 @@
"modelIdPrefix": "codex/gpt-",
"nativeApi": "openai-responses"
},
+ {
+ "providerId": "xd",
+ "modelIdPrefix": "openai-codex/gpt-",
+ "nativeApi": "openai-responses"
+ },
{
"providerId": "xd",
"modelIdPrefix": "openai/gpt-",
diff --git a/packages/model-providers/src/__tests__/classification.test.ts b/packages/model-providers/src/__tests__/classification.test.ts
index 2490a06e7c..7c7ab20ccd 100644
--- a/packages/model-providers/src/__tests__/classification.test.ts
+++ b/packages/model-providers/src/__tests__/classification.test.ts
@@ -287,6 +287,7 @@ describe('categorize', () => {
// 折扣路由不能被"认尾段"的 gpt 规则抢走:codex/gpt-5.4 的尾段就是 gpt-5.4。
expect(categorize('codex/gpt-5.4')).toBe('gpt-budget');
expect(categorize('codex/gpt-5.6-sol')).toBe('gpt-budget');
+ expect(categorize('openai-codex/gpt-6.1-sol')).toBe('gpt-budget');
// xd/codex-gpt-* 的尾段是 codex-gpt-*,不以 gpt- 开头,同样不落 gpt 组。
expect(categorize('xd/codex-gpt-5.5')).not.toBe('gpt');
expect(groupOf({ id: 'xd/codex-gpt-5.5', group: 'gpt-budget' })).toBe('gpt-budget');
@@ -525,6 +526,7 @@ describe('isBudgetModel — 目录 group 优先,codex/ 前缀兜底', () => {
});
it('无 group 时按前缀(网关旧数据)', () => {
expect(isBudgetModel({ id: 'codex/gpt-5.5' })).toBe(true);
+ expect(isBudgetModel({ id: 'openai-codex/gpt-6.1-sol' })).toBe(true);
expect(isBudgetModel({ id: 'gpt-5.5' })).toBe(false);
});
// 与 groupOf 同一「数据优先」契约(2026-07 Greptile review):目录显式给出合法的
diff --git a/packages/model-providers/src/__tests__/modelNativeApi.test.ts b/packages/model-providers/src/__tests__/modelNativeApi.test.ts
index e9db50a4db..e602df1029 100644
--- a/packages/model-providers/src/__tests__/modelNativeApi.test.ts
+++ b/packages/model-providers/src/__tests__/modelNativeApi.test.ts
@@ -119,6 +119,8 @@ describe("canonical model APIs in registry v3", () => {
["meta/muse-spark-99", "openai-responses"],
["x-ai/grok-99", "openai-responses"],
["minimax/MiniMax-M99", "anthropic-messages"],
+ ["openai-codex/gpt-99", "openai-responses"],
+ ["codex/gpt-99", "openai-responses"],
])(
"declares the native API of future family member %s locally",
(id, api) => {
diff --git a/packages/model-providers/src/__tests__/visionCapability.test.ts b/packages/model-providers/src/__tests__/visionCapability.test.ts
index 23603e0df6..bb107e8f4c 100644
--- a/packages/model-providers/src/__tests__/visionCapability.test.ts
+++ b/packages/model-providers/src/__tests__/visionCapability.test.ts
@@ -21,6 +21,7 @@ describe('normalizeVisionModelId', () => {
it('strips codex/ prefix', () => {
expect(normalizeVisionModelId('codex/gpt-5.5')).toBe('gpt-5.5');
+ expect(normalizeVisionModelId('openai-codex/gpt-6.1-sol')).toBe('gpt-6.1-sol');
});
});
diff --git a/packages/model-providers/src/classification.ts b/packages/model-providers/src/classification.ts
index 7711238dfa..f5d625570a 100644
--- a/packages/model-providers/src/classification.ts
+++ b/packages/model-providers/src/classification.ts
@@ -26,6 +26,28 @@ export const SUBSCRIPTION_DIRECT_MODEL_PREFIXES = [
XAI_MODEL_PREFIX,
] as const;
+/**
+ * XD 网关折扣 GPT 的 wire 前缀。`openai-codex/` 与历史 `codex/` 是同一类路由:
+ * Codex 远程压缩 v2、网关换 key 和预算分组都认它们。较长的前缀必须排在前面。
+ */
+export const CODEX_GATEWAY_WIRE_PREFIXES = ['openai-codex/', 'codex/'] as const;
+
+export function isCodexGatewayWireModel(model: string | null | undefined): boolean {
+ const id = model?.trim().toLowerCase() ?? '';
+ return CODEX_GATEWAY_WIRE_PREFIXES.some(
+ (prefix) => id.startsWith(prefix) && id.length > prefix.length,
+ );
+}
+
+export function stripCodexGatewayWirePrefix(model: string): string {
+ const id = model.trim();
+ const lower = id.toLowerCase();
+ const prefix = CODEX_GATEWAY_WIRE_PREFIXES.find(
+ (candidate) => lower.startsWith(candidate) && lower.length > candidate.length,
+ );
+ return prefix ? id.slice(prefix.length) : model;
+}
+
/**
* model id 是否为「订阅直连」(bridge)模型。传归一化后或原始 id 均可(只看前缀)。
* 签名与 apps/desktop/src/shared/subscriptionModels.ts 的历史实现逐字一致(下沉收口)。
@@ -184,7 +206,8 @@ function stripNamespace(id: string): string {
return idx === -1 ? id : id.slice(idx + 1);
}
-// 按 model.id 前缀粗分类: claude-* → Anthropic, gpt-* → GPT, codex/* → 骨折GPT (gateway 低价路由),
+// 按 model.id 前缀粗分类: claude-* → Anthropic, gpt-* → GPT,
+// openai-codex/* 与 codex/* → 骨折GPT (gateway 低价路由),
// gemini-* → Google, 认不出厂商的 → `ungrouped`(「未分组」)。
// **`china` 不在这里**:「中国」只认目录显式下发的 `group:'china'`(见 groupOf)。这里不做
// 国产厂商的 id 猜测 —— 产地是 id 猜不出来的属性,猜错就是把别家模型标成「中国」;宁可落
@@ -282,7 +305,7 @@ export function categorize(rawId: string): ModelCategory {
// 折扣路由必须判在 gpt 之前:`codex/gpt-5.4` 去掉命名空间就是 `gpt-5.4`,下面那条
// 认尾段的 gpt 规则会把它抢成 gpt 组,徽章与分组随之自相矛盾(2026-08 加尾段匹配时
// 被 categorize 的既有用例当场抓到)。
- if (id.startsWith('codex/')) return 'gpt-budget';
+ if (isCodexGatewayWireModel(id)) return 'gpt-budget';
// `xd/codex-gpt-5.5` 这类 id 去命名空间后是 `codex-gpt-5.5`,不以 `gpt-` 开头,同样不会
// 被这条抢走(它的折扣归属由目录 group 决定,见 isBudgetModel)。
if (
@@ -449,11 +472,11 @@ export function groupModelsForDisplay<T extends DisplayModel>(
* 骨折版(网关 85% off 低价路由)判定 —— 与 groupOf 同一「数据优先」契约:目录带**合法**
* `group` 时徽章完全跟 group 走(显式非 budget 分组不再被 `codex/` 前缀 override,否则会
* 出现「显示 budget 徽章却归入非 budget 分组」的自相矛盾,2026-07 Greptile review);
- * group 缺失/未知时才用前缀兜底(网关旧数据可能没标 group)。替代 4 处独立的前缀判断。
+ * group 缺失/未知时才用 `openai-codex/` / `codex/` 前缀兜底(网关旧数据可能没标 group)。
*/
export function isBudgetModel(model: { id: string; group?: string }): boolean {
if (model.group && KNOWN_CATEGORIES.has(model.group)) return model.group === 'gpt-budget';
- return model.id.startsWith('codex/');
+ return isCodexGatewayWireModel(model.id);
}
/** 一行模型的来源徽章语义(渲染层只管画,不再自判)。 */
diff --git a/packages/model-providers/src/index.ts b/packages/model-providers/src/index.ts
index f5bec0fa7c..79177f79bc 100644
--- a/packages/model-providers/src/index.ts
+++ b/packages/model-providers/src/index.ts
@@ -218,6 +218,9 @@ export {
CHATGPT_MODEL_PREFIX,
XAI_MODEL_PREFIX,
SUBSCRIPTION_DIRECT_MODEL_PREFIXES,
+ CODEX_GATEWAY_WIRE_PREFIXES,
+ isCodexGatewayWireModel,
+ stripCodexGatewayWirePrefix,
isSubscriptionDirectModel,
isExclusiveXaiModelId,
exclusiveXaiCatalogModelId,
diff --git a/packages/model-providers/src/visionCapability.ts b/packages/model-providers/src/visionCapability.ts
index 9507d16256..d586531320 100644
--- a/packages/model-providers/src/visionCapability.ts
+++ b/packages/model-providers/src/visionCapability.ts
@@ -11,10 +11,12 @@
* - unknown:名单外 —— 不确定,按保守处理(视觉桥配置 UI 默认不勾选,允许用户手动勾)。
*
* 归一化:runtime 的 body.model 形态多样 —— `deepseek/deepseek-v4-flash`、裸
- * `deepseek-v4-flash`、带 `[1m]` 后缀、`codex/` 前缀等。判定统一剥掉后缀/前缀再匹配,
+ * `deepseek-v4-flash`、带 `[1m]` 后缀、`openai-codex/` / `codex/` 前缀等。判定统一剥掉后缀/前缀再匹配,
* 保证「目录 id」与「请求体 model」都能命中同一名单。
*/
+import { stripCodexGatewayWirePrefix } from './classification.js';
+
export type VisionCapability = 'vision' | 'no-vision' | 'unknown';
/** 已知支持图片输入的多模态模型 id 前缀(保守名单)。
@@ -49,16 +51,15 @@ const NO_VISION_ID_PREFIXES: readonly string[] = [
];
/**
- * 剥掉请求体 model 的归一化噪声:`[1m]` 窗口后缀、`codex/` 等前缀、provider 命名空间。
+ * 剥掉请求体 model 的归一化噪声:`[1m]` 窗口后缀、`openai-codex/` / `codex/` 前缀、provider 命名空间。
* 返回与目录前缀可匹配的规范化 id。
*/
export function normalizeVisionModelId(model: string): string {
let id = model.trim();
// `[1m]` / `[32k]` 上下文窗口后缀(claude-code SDK 按目录 1M 窗口追加)。
id = id.replace(/\[\d+[km]?\]$/i, '');
- // 前缀剥到「provider/家族名」粒度,保留命名空间(如 deepseek/、anthropic/)。
- // codex 命名空间模型(codex/gpt-5.5)是 Responses 路线,视觉能力与 gpt-5.5 一致。
- if (id.startsWith('codex/')) id = id.slice('codex/'.length);
+ // 折扣命名空间(openai-codex/gpt-5.5、codex/gpt-5.5)是 Responses 路线,视觉能力与裸 gpt id 一致。
+ id = stripCodexGatewayWirePrefix(id);
return id;
}