Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): 自定义供应商的 openai-codex 模型不吃网关 key 置灰
kl354912306d08
diff --git a/apps/mobile/src/__tests__/modelPickerRows.test.ts b/apps/mobile/src/__tests__/modelPickerRows.test.tsindex 465233ff42..6276945514 100644--- a/apps/mobile/src/__tests__/modelPickerRows.test.ts+++ b/apps/mobile/src/__tests__/modelPickerRows.test.ts@@ -390,5 +390,8 @@ describe('budgetRowDisabled(折扣版置灰三态)', () => {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);+ expect(budgetRowDisabled('openai-codex/gpt-6.1-sol', 'absent', { source: 'builtin' })).toBe(true);+ expect(budgetRowDisabled('openai-codex/gpt-6.1-sol', 'absent', { source: 'user' })).toBe(false);+ expect(budgetRowDisabled('codex/gpt-5.5', 'absent', { source: 'organization' })).toBe(false);});});diff --git a/apps/mobile/src/session/MobileModelPickerList.ios.tsx b/apps/mobile/src/session/MobileModelPickerList.ios.tsxindex 6d50f565d3..52eb92611c 100644--- a/apps/mobile/src/session/MobileModelPickerList.ios.tsx+++ b/apps/mobile/src/session/MobileModelPickerList.ios.tsx@@ -44,6 +44,7 @@ export function MobileModelPickerList(p: MobileModelPickerListProps) {const blocked = budgetRowDisabled(row.model.id,p.apiKeyStatus ?? "unknown",+ row.provider,);const fastEditable =!!p.agentKind &&diff --git a/apps/mobile/src/session/MobileModelPickerList.tsx b/apps/mobile/src/session/MobileModelPickerList.tsxindex a749ab7664..c12ec9a5a2 100644--- a/apps/mobile/src/session/MobileModelPickerList.tsx+++ b/apps/mobile/src/session/MobileModelPickerList.tsx@@ -232,7 +232,7 @@ export function MobileModelPickerList({const selected = row.model.id === activeModelId && row.provider.id === activeSourceId;// 对齐桌面 ModelSelector:订阅制来源(Claude.ai / ChatGPT 等)的模型带「订阅」。const isSubscription = row.provider.access?.kind === 'subscription';- const rowDisabled = budgetRowDisabled(row.model.id, apiKeyStatus);+ const rowDisabled = budgetRowDisabled(row.model.id, apiKeyStatus, row.provider);const fastEditable =configEnabled &&rowFastEditable({diff --git a/apps/mobile/src/session/UnifiedModelPickerSheet.tsx b/apps/mobile/src/session/UnifiedModelPickerSheet.tsxindex 435643c90a..ec0cbd5bd1 100644--- a/apps/mobile/src/session/UnifiedModelPickerSheet.tsx+++ b/apps/mobile/src/session/UnifiedModelPickerSheet.tsx@@ -376,7 +376,11 @@ export function UnifiedModelPickerSheet(selected: !favorite && selected,disabled:!caps[config.agent] ||- budgetRowDisabled(config.modelId, p.apiKeyStatus ?? "unknown"),+ budgetRowDisabled(+ config.modelId,+ p.apiKeyStatus ?? "unknown",+ p.providers.find((item) => item.id === entry.providerId),+ ),subtitle: describe(entry, config),effortLabel: effortText(config),costMarks: mobileCostMarks(diff --git a/apps/mobile/src/session/modelPickerRows.ts b/apps/mobile/src/session/modelPickerRows.tsindex 1fd615f74f..c7729bb6ef 100644--- a/apps/mobile/src/session/modelPickerRows.ts+++ b/apps/mobile/src/session/modelPickerRows.ts@@ -7,6 +7,7 @@* 这里可 node 单测。*/import { isCodexGatewayWireModel } from '@cindy/model-providers/classification';+import { isCustomRoutedProvider } from '@cindy/model-providers/provider-identity';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';@@ -345,9 +346,15 @@ export function rowFastOn(args: {/*** budget 档置灰判定(桌面 budgetDisabledOf 同口径,key 判定换成被控端 presence 探测):- * `openai-codex/` 或 `codex/` 前缀 且 被控端明确无 key 才置灰;'unknown'(旧被控端 / 拉取失败)不置灰,- * 宁可放行到被控端请求期报错也不误伤。+ * `openai-codex/` 或 `codex/` 前缀且被控端明确无 key 才置灰。自定义/组织供应商目录里的+ * 同前缀模型走该供应商自己的路由,不吃 Cindy 网关 key gate。没传 provider 时保持原前缀判定。+ * 'unknown'(旧被控端 / 拉取失败)不置灰,宁可放行到被控端请求期报错也不误伤。*/-export function budgetRowDisabled(modelId: string, keyStatus: DeviceApiKeyStatus): boolean {+export function budgetRowDisabled(+ modelId: string,+ keyStatus: DeviceApiKeyStatus,+ provider?: Pick<ProviderView, 'source'> | null,+): boolean {+ if (isCustomRoutedProvider(provider)) return false;return isCodexGatewayWireModel(modelId) && keyStatus === 'absent';}