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。

fix(codex-proxy): xAI reasoning 能力按具体模型回退 first-party 目录(#4892 review)

ficowange8354b9e34dd
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 8afbe639a1..9d6616b0ec 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
@@ -4538,6 +4538,26 @@ describe('codex proxy host', () => {
}
});
+ it('独立 xAI 账号目录暂未包含当前模型时,按具体模型回退 first-party xai 目录,不误判成不支持 reasoning(#4892 review)', async () => {
+ const { resolveXaiCodexCatalogModel } = await import('../codex-proxy-host.js');
+ const model = (id: string, efforts: string[]) => ({ id, name: id, efforts, defaultEffort: efforts[0] ?? 'medium' });
+ const providers = [
+ { id: 'xai', models: { codex: [model('xai/grok-4.5', ['low', 'medium', 'high']), model('xai/grok-code-fast', [])] } },
+ // 账号级发现快照落后:只含 grok-4.7,没有会话正在用的 grok-4.5。
+ { id: 'grok-third', models: { codex: [model('xai/grok-4.7', ['low', 'medium', 'high', 'xhigh'])] } },
+ ] as never;
+ // 账号命中自己的模型时不回退。
+ expect(resolveXaiCodexCatalogModel(providers, 'grok-third', 'xai/grok-4.7')?.efforts).toHaveLength(4);
+ // 账号 provider 存在但该模型未命中 → 回退 first-party xai 的同名模型(保留 reasoning)。
+ expect(resolveXaiCodexCatalogModel(providers, 'grok-third', 'xai/grok-4.5')?.efforts).toHaveLength(3);
+ // 编码系模型即使回退也仍是 0 档位,不会被误放行。
+ expect(resolveXaiCodexCatalogModel(providers, 'grok-third', 'xai/grok-code-fast')?.efforts).toHaveLength(0);
+ // 两边都没有 → undefined(调用方按不支持 reasoning 处理)。
+ expect(resolveXaiCodexCatalogModel(providers, 'grok-third', 'xai/grok-unknown')).toBeUndefined();
+ // first-party xai 自身不重复回退。
+ expect(resolveXaiCodexCatalogModel(providers, 'xai', 'xai/grok-4.7')).toBeUndefined();
+ });
+
it('请求原本没有 tools 时也补上 x_search(Grok 默认就该能搜 X)', async () => {
const out = (await runXaiTransforms('no-tools', {
model: 'xai/grok-4.5',
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 7d1e02657f..a3d9f44c7b 100644
--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts
+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
@@ -1,7 +1,7 @@
import { createAttachmentRecovery } from './oversized-attachment-recovery.js';
import { clearCodexTextOnlyPolicies, codexTextOnlyRequestGuard, codexTextOnlyWebSocketTransforms, isCodexTextOnly } from './codex-text-only-policy.js';
import { resolveConversationSessionHeaders, withChatBridgeUserAgent, overrideHeadersCaseInsensitive } from '@cindy/responses-chat-bridge';
-import { providerCatalogId, providerModelRecord, type Effort } from '@cindy/model-providers';
+import { providerCatalogId, providerModelRecord, type CatalogModel, type Effort, type Provider } from '@cindy/model-providers';
import { reconcileOutboundReasoningEffort } from './outbound-reasoning-effort.js';
import { createPiProviderFetch, handlePiProviderRequest, invocationModelRecord, nativeBridgeApiKey, readBoundedResponseText, requiresNativeProviderAuth } from './pi-provider-transport.js';
import { normalizeProviderRequest, normalizeMiniMaxResponsesReasoning } from '@cindy/model-compat';
@@ -1634,16 +1634,26 @@ function xaiCompatProviderId(providerId: string | null | undefined): string | nu
return providerCatalogId(provider) === 'xai' ? providerId : null;
}
+/**
+ * 按 xAI 系 provider 解析某个 codex 目录模型:先查该账号 provider,**具体模型**未命中
+ * (账号级发现快照暂未包含它)时回退 first-party `xai`,而不只在 provider 不存在时回退——
+ * 否则通用 Grok 会被误判成不支持 reasoning、现有会话的 reasoning 配置与回放项被剥掉。
+ */
+export function resolveXaiCodexCatalogModel(
+ providers: ReadonlyArray<Pick<Provider, 'id' | 'models'>>,
+ providerId: string,
+ namespacedModel: string,
+): CatalogModel | undefined {
+ const findModel = (id: string) =>
+ (providers.find((provider) => provider.id === id)?.models.codex ?? []).find(
+ (candidate) => candidate.id === namespacedModel,
+ );
+ return findModel(providerId) ?? (providerId === 'xai' ? undefined : findModel('xai'));
+}
+
function supportsXaiReasoning(model: string | null, providerId: string = 'xai'): boolean {
if (!model) return true;
- const providers = getActiveCatalog().providers;
- // 独立 xAI 账号的 codex 目录由 xai 根装配(active-catalog assembleRoot),优先按该账号查,
- // 找不到再回落 first-party `xai`,避免账号目录尚未发现完成时把通用 Grok 误判成不支持 reasoning。
- const xaiProvider =
- providers.find((provider) => provider.id === providerId) ??
- providers.find((provider) => provider.id === 'xai');
- const namespacedModel = `xai/${model}`;
- const catalogModel = (xaiProvider?.models.codex ?? []).find((candidate) => candidate.id === namespacedModel);
+ const catalogModel = resolveXaiCodexCatalogModel(getActiveCatalog().providers, providerId, `xai/${model}`);
return (catalogModel?.efforts.length ?? 0) > 0;
}