Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(models): preserve account-scoped Codex ultrafast discovery
Chris9fa5a49c8b13
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexModelDiscovery.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexModelDiscovery.test.tsindex be3c1875df..a015090693 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexModelDiscovery.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexModelDiscovery.test.ts@@ -95,6 +95,16 @@ const SAMPLE = {const OAUTH_AUTH = JSON.stringify({ tokens: { access_token: 'oauth-token' } });describe('mapCodexModelsToCatalog', () => {+ it.each([+ { service_tiers: [{ id: 'priority' }, { id: 'ultrafast' }] },+ { additional_speed_tiers: ['fast', 'ultrafast'] },+ ])('reads both native cache speed declarations: %j', fields => {+ const [model] = mapCodexModelsToCatalog({ models: [{ slug: 'gpt-6.1-sol',+ visibility: 'list', supported_in_api: true, ...fields }] });+ expect(model).toMatchObject({ supportsFastMode: true, supportsUltrafastMode: true });+ expect(model.discoveredMetadata?.supportsFastMode).toBe(true);+ });+it('retains native maximum and explicit image capability separately from defaults', () => {const [model] = mapCodexModelsToCatalog({models: [diff --git a/apps/desktop/src/main/maker-host/__tests__/custom-provider-store.test.ts b/apps/desktop/src/main/maker-host/__tests__/custom-provider-store.test.tsindex 745121221f..7ee3201519 100644--- a/apps/desktop/src/main/maker-host/__tests__/custom-provider-store.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/custom-provider-store.test.ts@@ -19,7 +19,9 @@ import {updateCustomProviderIfUnchanged,validateCustomProviderConfig,} from '../custom-provider-store.js';-import type { CustomProviderConfig } from '@cindy/model-providers';+import { buildUserProvider, mergeDiscoveredRuntimeModels, parseModelsListResponse,+ type CustomProviderConfig } from '@cindy/model-providers';+import { mapCodexAppServerModelsToCatalog } from '../codex-model-discovery.js';const CREATE_SQL = `CREATE TABLE custom_providers (@@ -76,6 +78,52 @@ afterEach(() => {});describe('custom provider updates through the runtime database proxy', () => {+ // Regression: account model/list -> storage normalization -> reload used to drop+ // Ultrafast. Exercise real CRUD/CAS and catalog projection, including revocation.+ it('persists native account speed discovery without granting another account or engine access', async () => {+ mountDb();+ const native: CustomProviderConfig = { id: 'openai-one', name: 'Account one',+ auth: { method: 'oauth', native: 'codex' }, runtimes: { codex: {+ baseUrl: 'https://chatgpt.com/backend-api/codex', wireProtocol: 'openai-responses',+ models: [{ id: 'gpt-6.1-sol', name: 'GPT-6.1 Sol' }],+ } } };+ await createCustomProvider(native);+ await createCustomProvider({ ...native, id: 'openai-two', name: 'Account two' });+ const before = (await getCustomProvider(native.id))!;+ const models = mergeDiscoveredRuntimeModels([], mapCodexAppServerModelsToCatalog([{+ id: 'gpt-6.1-sol', model: 'gpt-6.1-sol', displayName: 'GPT-6.1 Sol',+ description: '', hidden: false, supportedReasoningEfforts: [],+ defaultReasoningEffort: 'medium', isDefault: true, inputModalities: ['text'],+ additionalSpeedTiers: ['fast', 'ultrafast'], serviceTiers: [],+ }]));+ const next = { ...before, runtimes: { codex: { ...before.runtimes.codex!, models } } };+ expect(validateCustomProviderConfig(next).ok).toBe(true);+ expect(await updateCustomProviderIfUnchanged(native.id, before, next)).toBe(true);+ const restored = (await getCustomProvider(native.id))!;+ expect(restored.runtimes.codex!.models[0].supportsUltrafastMode).toBe(true);+ expect(buildUserProvider(restored).models.codex![0].supportsUltrafastMode).toBe(true);+ expect(buildUserProvider((await getCustomProvider('openai-two'))!).models.codex![0].supportsUltrafastMode).toBe(false);+ for (const agent of ['codex', 'claude-code', 'pi'] as const) {+ expect(buildUserProvider({ id: 'api', name: 'API', runtimes: {+ [agent]: { baseUrl: 'https://example.test/v1', models: restored.runtimes.codex!.models },+ } }).models[agent]![0].supportsUltrafastMode).not.toBe(true);+ }+ // A real refresh without the entitlement must replace the saved true. The+ // descriptive name/effort metadata may still use the existing sparse merge.+ for (const fields of [{ service_tiers: [{ id: 'priority' }] }, {}]) {+ await updateCustomProvider(native.id, restored);+ const current = (await getCustomProvider(native.id))!;+ const refreshed = mergeDiscoveredRuntimeModels(current.runtimes.codex!.models,+ parseModelsListResponse({ models: [{ slug: 'gpt-6.1-sol', ...fields }] })!);+ await updateCustomProviderIfUnchanged(native.id, current,+ { ...current, runtimes: { codex: { ...current.runtimes.codex!, models: refreshed } } });+ expect(buildUserProvider((await getCustomProvider(native.id))!).models.codex![0].supportsUltrafastMode).toBe(false);+ }+ expect(validateCustomProviderConfig({ ...next, runtimes: { codex: {+ ...next.runtimes.codex, models: [{ ...models[0], supportsUltrafastMode: 'true' }],+ } } }).ok).toBe(false);+ });+it('reports an applied model update and rejects a stale snapshot', async () => {const worker = await createDbClient({ useInlineWorker: true });try {diff --git a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.tsindex 1db8af600b..8e8295db73 100644--- a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts@@ -1,5 +1,5 @@import { afterEach, describe, expect, it } from 'vitest';-import { BUNDLED_CATALOG, buildUserProvider, type CatalogModel } from '@cindy/model-providers';+import { BUNDLED_CATALOG, buildUserProvider, resolveAgentCapability, type CatalogModel } from '@cindy/model-providers';import {clearDiscoveredProviderModels, getActiveCatalog, setActiveCatalog, setCustomProviders,setDiscoveredCodexModels, setDiscoveredProviderModels,@@ -47,6 +47,26 @@ afterEach(() => {});describe('OpenAI account catalog identity', () => {+ it('keeps saved Ultrafast scoped through active catalog and desktop/mobile capability projection', () => {+ setActiveCatalog(BUNDLED_CATALOG);+ seedBuiltinAccount('gpt-6.1-sol');+ for (const supportsUltrafastMode of [true, false]) {+ setCustomProviderConfigs([{ id: accountId, name: 'Account',+ auth: { method: 'oauth', native: 'codex' }, runtimes: { codex: {+ baseUrl: 'https://chatgpt.com/backend-api/codex', wireProtocol: 'openai-responses',+ models: [{ id: 'gpt-6.1-sol', name: 'GPT-6.1 Sol', supportsUltrafastMode,+ discoveredMetadata: { supportsFastMode: true } }],+ } } }]);+ const providers = getActiveCatalog().providers.map(p => ({ ...p, connected: true }));+ expect(resolveAgentCapability(providers, accountId, 'gpt-6.1-sol', 'codex'))+ .toMatchObject({ supportsFastMode: true, supportsUltrafastMode });+ for (const agent of ['claude-code', 'pi'] as const) {+ expect(resolveAgentCapability(providers, accountId, 'gpt-6.1-sol', agent)?.supportsUltrafastMode).not.toBe(true);+ }+ expect(resolveAgentCapability(providers, 'openai', 'gpt-6.1-sol', 'codex')?.supportsUltrafastMode).not.toBe(true);+ }+ });+it.each(['before', 'after', 'configs'] as const)('keeps one subscription image capability across public catalog revisions (account: %s)', (order) => {const config = {id: accountId, name: 'OpenAI', auth: { method: 'oauth' as const, native: 'codex' as const },diff --git a/apps/desktop/src/main/maker-host/codex-model-discovery.ts b/apps/desktop/src/main/maker-host/codex-model-discovery.tsindex 1736759297..8bd37a870d 100644--- a/apps/desktop/src/main/maker-host/codex-model-discovery.ts+++ b/apps/desktop/src/main/maker-host/codex-model-discovery.ts@@ -36,14 +36,7 @@ interface CodexModelRaw {priority?: unknown;/** [{id:'priority', name:'Fast', ...}] —— 含 priority 即支持 Fast(bridge 映射 service_tier)。 */service_tiers?: unknown;-}--/** service_tiers 里是否声明了 priority(=Fast)档。 */-function hasPriorityTier(tiers: unknown): boolean {- return (- Array.isArray(tiers) &&- tiers.some((t) => t && typeof t === 'object' && ['priority', 'fast'].includes((t as { id?: string }).id ?? ''))- );+ additional_speed_tiers?: unknown;}/**@@ -116,6 +109,12 @@ export function mapCodexModelsToCatalog(raw: unknown): CatalogModel[] {: undefined;const priority =typeof m.priority === 'number' && Number.isFinite(m.priority) ? m.priority : 50;+ const speedTiers = [+ ...(Array.isArray(m.service_tiers) ? m.service_tiers.map(tier => tier?.id) : []),+ ...(Array.isArray(m.additional_speed_tiers) ? m.additional_speed_tiers : []),+ ];+ const supportsFastMode = Array.isArray(m.service_tiers) || Array.isArray(m.additional_speed_tiers)+ ? speedTiers.some(tier => tier === 'priority' || tier === 'fast') : undefined;const model: CatalogModel = {id: slug,@@ -127,9 +126,7 @@ export function mapCodexModelsToCatalog(raw: unknown): CatalogModel[] {inputModalities !== undefined ? inputModalities.includes('image') : undefined,efforts: Array.isArray(m.supported_reasoning_levels) ? efforts : undefined,defaultEffort: m.default_reasoning_level,- supportsFastMode: Array.isArray(m.service_tiers)- ? hasPriorityTier(m.service_tiers)- : undefined,+ supportsFastMode,}),name: displayName,group: 'gpt',@@ -148,9 +145,8 @@ export function mapCodexModelsToCatalog(raw: unknown): CatalogModel[] {defaultEnabled: true,};if (efforts.includes('xhigh')) model.effortDisplayNames = { xhigh: 'Extra High' };- if (Array.isArray(m.service_tiers)) model.supportsFastMode = hasPriorityTier(m.service_tiers);- model.supportsUltrafastMode = Array.isArray(m.service_tiers) &&- m.service_tiers.some(t => t && typeof t === 'object' && t.id === 'ultrafast');+ if (supportsFastMode !== undefined) model.supportsFastMode = supportsFastMode;+ model.supportsUltrafastMode = speedTiers.includes('ultrafast');out.push(model);}return out;diff --git a/apps/desktop/src/main/maker-host/custom-provider-store.ts b/apps/desktop/src/main/maker-host/custom-provider-store.tsindex 303898a7ca..f2e020a90e 100644--- a/apps/desktop/src/main/maker-host/custom-provider-store.ts+++ b/apps/desktop/src/main/maker-host/custom-provider-store.ts@@ -257,6 +257,8 @@ function validateRuntime(agent: string, rt: unknown): ValidationResult {)) return invalid(`runtime '${agent}' discoveredCost invalid`);if (mm.discoveredMetadata !== undefined && !validModelMetadata(mm.discoveredMetadata))return invalid(`runtime '${agent}' discoveredMetadata invalid`);+ if (mm.supportsUltrafastMode !== undefined && typeof mm.supportsUltrafastMode !== 'boolean')+ return invalid(`runtime '${agent}' model.supportsUltrafastMode must be a boolean`);if (mm.contextWindow !== undefined &&(typeof mm.contextWindow !== 'number' ||@@ -595,6 +597,8 @@ function normalizeRuntime(name: m.name.trim(),...pickModelMetadata({ ...m, name: m.name.trim() }),...(m.discoveredMetadata ? { discoveredMetadata: m.discoveredMetadata } : {}),+ ...(typeof m.supportsUltrafastMode === 'boolean'+ ? { supportsUltrafastMode: m.supportsUltrafastMode } : {}),...(m.discoveredCost ? { discoveredCost: m.discoveredCost } : {}),...(m.nameExplicit === true ? { nameExplicit: true } : {}),...(m.api ? { api: m.api } : {}),@@ -827,6 +831,8 @@ function parseRuntimes(raw: string): Partial<Record<AgentKind, CustomProviderRun...(validModelMetadata(m.discoveredMetadata)? { discoveredMetadata: m.discoveredMetadata }: {}),+ ...(typeof m.supportsUltrafastMode === 'boolean'+ ? { supportsUltrafastMode: m.supportsUltrafastMode } : {}),...(m.nameExplicit === true ? { nameExplicit: true } : {}),...(typeof m.contextWindow === 'number' &&Number.isFinite(m.contextWindow) &&diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.tsindex b1293a3bc0..7a13db07ea 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -1801,6 +1801,7 @@ export function getMaker(): Maker {if (!previous?.runtimes.codex || previous.auth?.native !== 'codex') return;const next = { ...previous, runtimes: { codex: { ...previous.runtimes.codex,models: mapped.map((model) => ({ id: model.id, name: model.name,+ supportsUltrafastMode: model.supportsUltrafastMode === true,...(model.contextWindowVerified ? { contextWindow: model.contextWindow } : {}),discoveredMetadata: model.discoveredMetadata,})),diff --git a/docs/product-rules/model-metadata-precedence.md b/docs/product-rules/model-metadata-precedence.mdindex 673b44c320..db8ac549a8 100644--- a/docs/product-rules/model-metadata-precedence.md+++ b/docs/product-rules/model-metadata-precedence.md@@ -101,6 +101,13 @@ Pi 明确声明的 `reasoningDefaultEffort` 属于 Harness 默认例外,高于### 多连接的身份与隔离+Codex 超快是账号发现能力:`service_tiers` / `additional_speed_tiers`(live 清单为+`serviceTiers` / `additionalSpeedTiers`)明确声明后,按连接保存 `supportsUltrafastMode`,+不进入可继承的 `ModelMetadata`,不按套餐名、型号或公共目录授予。+保存、重读和目录投影须保留该值;成功刷新该型号不再声明超快时清除旧资格。+仅原生 Codex 账号的 Codex 入口可用,API 同名模型及其它引擎不继承。+回归见 `custom-provider-store.test.ts` 与 `modelDiscoveryChannels.test.ts`。+同一种供应商可以有多个账号或 API 连接。沿用 `providerId` 标识连接实例,`model` 标识该连接下的上游模型,`agentKind` 标识执行 Harness;调用目标由三者共同确定。供应商与模型的显示名可以重复,也可以改名,不用于路由、凭证查找或持久化关联。diff --git a/packages/model-providers/src/__tests__/modelDiscoveryChannels.test.ts b/packages/model-providers/src/__tests__/modelDiscoveryChannels.test.tsindex 85c2dd8066..90031b9494 100644--- a/packages/model-providers/src/__tests__/modelDiscoveryChannels.test.ts+++ b/packages/model-providers/src/__tests__/modelDiscoveryChannels.test.ts@@ -5,6 +5,20 @@ import { buildUserProvider } from '../user-provider.js';import { BUNDLED_CATALOG } from '../catalog.js';describe('shared provider discovery', () => {+ it.each([+ { service_tiers: [{ id: 'priority' }, { id: 'ultrafast' }] },+ { additional_speed_tiers: ['fast', 'ultrafast'] },+ ])('keeps account speed tiers through discovery and JSON save: %j', fields => {+ const models = JSON.parse(JSON.stringify(mergeDiscoveredRuntimeModels([],+ parseModelsListResponse({ models: [{ slug: 'gpt-6.1-sol', ...fields }] })!)));+ const provider = buildUserProvider({ id: 'openai-one', name: 'Account',+ auth: { method: 'oauth', native: 'codex' }, runtimes: { codex: {+ baseUrl: 'https://chatgpt.com/backend-api/codex', wireProtocol: 'openai-responses', models,+ } } }, { modelRegistry: BUNDLED_CATALOG.modelRegistry });+ expect(provider.models.codex![0]).toMatchObject({ supportsFastMode: true, supportsUltrafastMode: true });+ expect(models[0].discoveredMetadata).not.toHaveProperty('supportsUltrafastMode');+ });+it.each([{ contextWindow: 128000, contextWindowMax: 64000 },{ context_window: 128000, contextWindowMax: 64000 },diff --git a/packages/model-providers/src/modelDiscovery.ts b/packages/model-providers/src/modelDiscovery.tsindex 4af7615cb4..711f37dc3c 100644--- a/packages/model-providers/src/modelDiscovery.ts+++ b/packages/model-providers/src/modelDiscovery.ts@@ -151,6 +151,11 @@ export function parseModelsListResponse(const inputModalities = (modalities as { input?: unknown } | undefined)?.input ?? record.input_modalities;const contextWindowMax = pickModelMetadata({ contextWindowMax: record.max_context_window ?? record.contextWindowMax }).contextWindowMax;const serviceTiers = record.service_tiers;+ const additionalSpeedTiers = record.additional_speed_tiers;+ const declaredSpeedTiers = [+ ...(Array.isArray(serviceTiers) ? serviceTiers.map(tier => tier?.id) : []),+ ...(Array.isArray(additionalSpeedTiers) ? additionalSpeedTiers : []),+ ];const isVercel = sourceUrl !== undefined && (() => {try { const url = new URL(sourceUrl); return url.origin === 'https://ai-gateway.vercel.sh'&& url.pathname.replace(/\/+$/, '') === '/v1/models'; } catch { return false; }@@ -211,7 +216,9 @@ export function parseModelsListResponse(supportsFastMode: record.supports_fast_mode ?? record.supportsServiceTier ??(Array.isArray(serviceTiers) && serviceTiers.every(tier =>tier && typeof tier === 'object' && typeof tier.id === 'string')- ? serviceTiers.some(tier => tier.id === 'priority') : undefined),+ ? declaredSpeedTiers.some(tier => tier === 'priority' || tier === 'fast')+ : Array.isArray(additionalSpeedTiers)+ ? additionalSpeedTiers.includes('fast') : undefined),supportsImageInput:record.supports_image_input ?? info.supports_vision ?? capabilities.vision ??(Array.isArray(inputModalities) && inputModalities.every(value => typeof value === 'string')@@ -252,6 +259,8 @@ export function parseModelsListResponse();out.push({id,+ ...(Array.isArray(serviceTiers) || Array.isArray(additionalSpeedTiers)+ ? { supportsUltrafastMode: declaredSpeedTiers.includes('ultrafast') } : {}),discoveredMetadata,...(Object.keys(discoveredCost).length ? { discoveredCost } : {}),name,diff --git a/packages/model-providers/src/modelMetadataLayers.ts b/packages/model-providers/src/modelMetadataLayers.tsindex 978d4a7c84..ac50047a4e 100644--- a/packages/model-providers/src/modelMetadataLayers.ts+++ b/packages/model-providers/src/modelMetadataLayers.ts@@ -471,6 +471,8 @@ export function applyModelMetadata(export interface DiscoveredModel {id: string;name: string;+ /** Account entitlement, never inherited as public model metadata. */+ supportsUltrafastMode?: boolean;contextWindow?: number;discoveredCost?: import("./types.js").ModelCost;discoveredMetadata?: ModelMetadata;@@ -488,6 +490,11 @@ export function mergeDiscoveredRuntimeModels(if (!model.id || !model.name || seen.has(model.id)) continue;seen.add(model.id);const index = models.findIndex((m) => m.id === model.id);+ // Unlike descriptive metadata, a refreshed account entitlement must not stick+ // when the latest response no longer declares it.+ const accountCapabilities = model.supportsUltrafastMode !== undefined ||+ (index >= 0 && models[index].supportsUltrafastMode !== undefined)+ ? { supportsUltrafastMode: model.supportsUltrafastMode === true } : {};const discoveredMetadata = mergeModelMetadata(index >= 0 ? models[index].discoveredMetadata : undefined,pickModelMetadata(model.discoveredMetadata ?? model),@@ -503,6 +510,7 @@ export function mergeDiscoveredRuntimeModels(added.push({id: model.id,name: model.name,+ ...accountCapabilities,discoveredMetadata,...(model.discoveredCost ? { discoveredCost: model.discoveredCost } : {}),...(hideNew ? { defaultEnabled: false } : {}),@@ -510,6 +518,7 @@ export function mergeDiscoveredRuntimeModels(elsemodels[index] = {...models[index],+ ...accountCapabilities,...(!models[index].discoveredMetadata ? { nameExplicit: true } : {}),discoveredMetadata,...(model.discoveredCost ? { discoveredCost: model.discoveredCost } : {}),diff --git a/packages/model-providers/src/types.ts b/packages/model-providers/src/types.tsindex 9cf5e9f05a..ad13442593 100644--- a/packages/model-providers/src/types.ts+++ b/packages/model-providers/src/types.ts@@ -629,6 +629,8 @@ export interface Provider {* 并随用户配置持久化,避免已知长上下文模型被错误降级。*/export interface ProviderRuntimeModelConfig extends ModelMetadata {+ /** Current account discovery only; deliberately excluded from inheritable ModelMetadata. */+ supportsUltrafastMode?: boolean;discoveredMetadata?: ModelMetadata;discoveredCost?: ModelCost;nameExplicit?: boolean;diff --git a/packages/model-providers/src/user-provider.ts b/packages/model-providers/src/user-provider.tsindex ffa8b56301..3ff85edbaa 100644--- a/packages/model-providers/src/user-provider.ts+++ b/packages/model-providers/src/user-provider.ts@@ -640,6 +640,10 @@ export function buildUserProvider(return {...(imported?.cost ? { cost: imported.cost } : {}),...projected,+ // Only this native account's latest discovery grants Ultrafast. Public+ // defaults, same-name API connections and other engines cannot inherit it.+ ...(nativeCodex && agent === 'codex'+ ? { supportsUltrafastMode: storedModel.supportsUltrafastMode === true } : {}),...(nativeApi !== undefined ? { nativeApi } : {}),// Projection is not a user edit. Save only the original configuration.userModelConfig: structuredClone(storedModel),