Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(models): restore account-discovered models for Pi (#5865)
Chris Zhang74f6dd884491
diff --git a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.tsindex d660d7bfdc..1db8af600b 100644--- a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts@@ -185,6 +185,67 @@ describe('OpenAI account catalog identity', () => {}});+ it.each(['gpt-6.1-sol', 'gpt-future-account-model'])('restores %s into Pi without public or binary model membership', (id) => {+ setActiveCatalog(BUNDLED_CATALOG);+ setCustomProviderConfigs([{+ id: accountId, name: 'Restored account', auth: { method: 'oauth', native: 'codex' },+ runtimes: { codex: { baseUrl: 'https://chatgpt.com/backend-api/codex', models: [{+ id, name: id,+ discoveredMetadata: { efforts: ['low', 'high', 'max', 'ultra'], defaultEffort: 'ultra' },+ }] } },+ }]);+ for (let refresh = 0; refresh < 2; refresh++) {+ const pi = entry(accountId, 'pi', `chatgpt/${id}`);+ expect(pi).toMatchObject({ piApi: 'openai-responses' });+ expect(pi.efforts).toContain('high');+ expect(pi.efforts).not.toContain('ultra');+ expect(pi.defaultEffort).not.toBe('ultra');+ expect(entry('openai', 'pi', `chatgpt/${id}`)).toBeUndefined();+ setActiveCatalog(structuredClone(BUNDLED_CATALOG));+ }+ // A new account snapshot replaces restored membership, without leaking to other accounts.+ setDiscoveredProviderModels(accountId, 'codex', accountListModels(['gpt-next-account-model']));+ expect(entry(accountId, 'pi', `chatgpt/${id}`)).toBeUndefined();+ expect(entry(accountId, 'pi', 'chatgpt/gpt-next-account-model')).toBeDefined();+ });++ it('does not reapply restored Codex-only effort settings as Pi user settings', () => {+ setActiveCatalog(BUNDLED_CATALOG);+ setCustomProviderConfigs([{+ id: accountId, name: 'Restored account', auth: { method: 'oauth', native: 'codex' },+ runtimes: { codex: { baseUrl: 'https://chatgpt.com/backend-api/codex', models: [{+ id: 'gpt-6.1-sol', name: 'GPT-6.1 Sol',+ reasoning: true, reasoningEfforts: ['low', 'high'], reasoningDefaultEffort: 'high',+ }] } },+ }]);+ expect(entry(accountId, 'codex', 'gpt-6.1-sol').defaultEffort).toBe('high');+ const pi = entry(accountId, 'pi', 'chatgpt/gpt-6.1-sol');+ expect(pi.efforts).not.toContain('ultra');+ expect(pi.defaultEffort).toBe('medium');+ expect(pi.userModelConfig).toBeUndefined();+ });++ it('keeps retired restored models out of Pi and does not borrow subscription routes for API connections', () => {+ const catalog = structuredClone(BUNDLED_CATALOG);+ catalog.modelRegistry!.models.find(model => model.id === 'openai/gpt-6.1-sol')!.status = 'retired';+ setActiveCatalog(catalog, { authorityCatalog: catalog });+ setCustomProviderConfigs([+ { id: accountId, name: 'Subscription', auth: { method: 'oauth', native: 'codex' },+ runtimes: { codex: { baseUrl: 'https://chatgpt.com/backend-api/codex',+ models: [{ id: 'gpt-6.1-sol', name: 'Retired' }],+ } } },+ { id: 'api-independent', name: 'API connection', auth: { method: 'apiKey' },+ runtimes: { codex: { baseUrl: 'https://api.example/v1', wireProtocol: 'openai-responses',+ models: [{ id: 'gpt-future-account-model', name: 'API model' }],+ } } },+ ]);+ expect(entry(accountId, 'pi', 'chatgpt/gpt-6.1-sol')).toBeUndefined();+ const api = getActiveCatalog().providers.find(p => p.id === 'api-independent')!;+ expect(api.models.codex?.some(m => m.id === 'gpt-future-account-model')).toBe(true);+ expect(api.models.pi).toBeUndefined();+ expect(api.routing.pi).toBeUndefined();+ });+it('does not use an addition incomplete for the actual root to revive a retired model', () => {const { overrides } = sanitizeModelCatalogOverrides({ additions: {[`${accountId}:gpt-incomplete`]: {@@ -286,7 +347,9 @@ it('applies server Pi replacement, removal and missing-field fallback equally tosetActiveCatalog(catalog, { authorityCatalog: catalog });for (const providerId of ['openai', accountId]) {expect(getActiveCatalog().providers.find(p => p.id === providerId)!.models.pi?.map(m => m.id))- .toEqual(['chatgpt/gpt-server-new']);+ .toEqual(providerId === accountId+ ? ['chatgpt/gpt-5.6-luna', 'chatgpt/gpt-server-new']+ : ['chatgpt/gpt-server-new']);}openai.models.pi = [];setActiveCatalog(structuredClone(catalog), { authorityCatalog: structuredClone(catalog) });diff --git a/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.ts b/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.tsindex 3d6d23e40e..1ac5163a8b 100644--- a/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.ts@@ -52,7 +52,7 @@ import {pruneAnthropicCompatForGateway,type PiBundledModelInfo,} from '../pi-host.js';-import { getActiveCatalog, setActiveCatalog, setDiscoveredCodexModels, setXdGatewayModels, setXaiDiscoveredModels, setLocalCatalogOverrides } from '../active-catalog.js';+import { getActiveCatalog, setActiveCatalog, setCustomProviderConfigs, setCustomProviders, setDiscoveredCodexModels, setXdGatewayModels, setXaiDiscoveredModels, setLocalCatalogOverrides } from '../active-catalog.js';import { EMPTY_MODEL_CATALOG_OVERRIDES, sanitizeModelCatalogOverrides } from '../model-plane/localCatalogOverrides.js';import { deriveAvailableModels } from '../catalog-to-descriptors.js';@@ -152,6 +152,50 @@ const piBundledModel = (...over,});+it.each(['absent', 'compatible', 'other-api'] as const)(+ 'carries a restored account model into the subscription serializer (native entry: %s)',+ (nativeEntry) => {+ const id = 'gpt-future-account-fixture';+ const providerId = 'openai-restored';+ setActiveCatalog(BUNDLED_CATALOG);+ setCustomProviderConfigs([{+ id: providerId, name: 'Restored account', auth: { method: 'oauth', native: 'codex' },+ runtimes: { codex: { baseUrl: 'https://chatgpt.com/backend-api/codex', models: [{+ id, name: id, discoveredMetadata: {+ efforts: ['low', 'high', 'ultra'], defaultEffort: 'ultra',+ contextWindow: 272000, maxOutputTokens: 16000, supportsImageInput: false,+ },+ }] } },+ }]);+ try {+ const native = piBundledModel(id,+ nativeEntry === 'compatible' ? 'openai-codex-responses' : 'openai-completions', {+ thinkingLevelMap: { low: 'medium' }, compat: { supportsStrictTools: true },+ });+ const probe = new Map([['openai-codex', new Map(nativeEntry === 'absent' ? [] : [[id, native]])]]);+ const catalog = getActiveCatalog();+ expect(deriveAvailableModels(catalog, 'pi').some(model => model.id === `chatgpt/${id}`)).toBe(true);+ const result = buildPiSubscriptionNativeProviders(catalog, 'http://127.0.0.1:4567', probe);+ const provider = result.providers.find(p => p.sourceProviderId === providerId)!;+ expect(provider).toMatchObject({+ id: `openai-codex-${providerId}`, api: 'openai-codex-responses', inheritModels: false,+ headers: { 'x-cindy-pi-provider-id': providerId },+ });+ const model = provider.models.find(m => m.id === `chatgpt/${id}`)!;+ expect(model).toMatchObject({+ wireId: id, api: 'openai-codex-responses', input: ['text'], maxTokens: 16000,+ thinkingLevelMap: { low: nativeEntry === 'compatible' ? 'medium' : 'low', high: 'high', max: null },+ });+ expect(model.thinkingLevelMap).not.toHaveProperty('ultra');+ expect(model.compat).toEqual(nativeEntry === 'compatible' ? native.compat : undefined);+ expect(result.providers.find(p => p.sourceProviderId === 'openai')?.models.some(m => m.wireId === id)).toBe(false);+ } finally {+ setCustomProviders([]);+ setActiveCatalog(BUNDLED_CATALOG);+ }+ },+);+afterEach(() => {setActiveCatalog(BUNDLED_CATALOG);setDiscoveredCodexModels([]);diff --git a/apps/desktop/src/main/maker-host/active-catalog.ts b/apps/desktop/src/main/maker-host/active-catalog.tsindex 06402f70b4..5fe622e6d8 100644--- a/apps/desktop/src/main/maker-host/active-catalog.ts+++ b/apps/desktop/src/main/maker-host/active-catalog.ts@@ -1094,11 +1094,16 @@ function declaredPiModels(providerId: string, discovered: readonly CatalogModel[// A sibling Harness discovers membership, not Pi-specific thinking tiers.// Keep portable tiers as a fallback for unknown models; known models inherit// the Registry, and Codex-only labels cannot become Pi capabilities.- const { efforts: _efforts, defaultEffort: _defaultEffort, ...metadata } =- model.discoveredMetadata ?? catalogModelMetadata(model);+ const metadata = { ...(model.discoveredMetadata ?? catalogModelMetadata(model)) };+ delete metadata.efforts;+ delete metadata.defaultEffort;+ // Stored Codex runtime settings are not Pi user overrides. Reapplying them+ // after projection would replace Pi's resolved tiers and defaults.+ const discoveredModel = { ...model };+ delete discoveredModel.userModelConfig;const efforts = model.efforts.filter(effort => PI_REASONING_EFFORTS.some(level => level === effort));byId.set(id, {- ...model, id, piApi, efforts,+ ...discoveredModel, id, piApi, efforts,defaultEffort: efforts.length === 0 ? null: (clampEffortToSupported(model.defaultEffort, efforts) as Effort | null),discoveredMetadata: metadata,@@ -1380,8 +1385,9 @@ function computeMerged(): Catalog {projected.models['claude-code'] ?? [],),pi: alignOpenAiPiWithAccount(- declaredPiModels('openai', p.id === 'openai'- ? discoveredCodex : discoveredByProvider.get(p.id)?.codex ?? []),+ // Restored native accounts keep their discovered members in models.codex.+ // Use the same account snapshot as the root, before Codex-only overlays.+ declaredPiModels('openai', accountCodex),accountCodex,(base ?? BUNDLED_CATALOG).modelRegistry,),diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.mdindex 0a233f533d..698532e91a 100644--- a/docs/dev-rules/model-catalog-maintenance.md+++ b/docs/dev-rules/model-catalog-maintenance.md@@ -80,8 +80,9 @@ OpenAI(Codex 订阅)与 Anthropic(Claude 订阅)的 root **成员只来返回顺序为准:Codex 取 `models_cache.json` 的 `priority` 或 app-server `model/list` 的返回位置,Claude 取 SDK `supportedModels()` 的返回位置。用户本地 addition 按 Registry / 本地 `sortOrder`接在其后。装配时重写为连续 `sortOrder`,选择器、设置页、新对话默认与 Claude Code-bridge 共用这一顺序;OpenAI 订阅的 Pi 清单成员与能力仍来自 Pi 目录,但同样按账号顺序排列,-并沿用 Registry 条目的 `defaultEnabled: false`;用户本地 `sortOrder` patch 仍最高。+bridge 共用这一顺序;OpenAI 订阅的 Pi 以公共 Pi 目录为基础,按同一账号的当前发现/恢复+清单补入新型号并排序,能力按 Pi 协议适配,沿用 Registry 条目的 `defaultEnabled: false`;+用户本地 `sortOrder` patch 仍最高。Claude 订阅没有 HTTP 清单接口,清单来自内置 Claude Code 的 SDK `supportedModels()`:会话启动时捕获;此外 maker 就绪、登录/认领 Claude 登录以及手动刷新时,用本机 CLI 起一个空闲 Query 只读diff --git a/docs/product-rules/model-metadata-precedence.md b/docs/product-rules/model-metadata-precedence.mdindex 3eb7955f6a..dec734e3fb 100644--- a/docs/product-rules/model-metadata-precedence.md+++ b/docs/product-rules/model-metadata-precedence.md@@ -124,6 +124,13 @@ Pi 显式列表提供公共成员(包括空数组与退役条目);缺字服务器声明的新模型不要求先出现在 Pi SDK 名单中;有明确原生协议即可构造 models.json。OpenAI 订阅仍使用专用 Codex Responses 认证传输。+独立 OpenAI 账号恢复后,Pi 与 Codex 根使用同一份账号成员快照:优先当前发现结果,+尚无结果时复用该账号已保存的 Codex 清单。这里只补成员和可移植资料,不把 Codex+运行时的用户配置当成 Pi 覆盖;思考档位按 Pi 支持的档位及公共资料解析,Pi 专属+用户覆盖仍走原有路径。原生 SDK 清单只提供同 API 的序列化细节,新型号不因缺少+SDK 条目被隐藏;普通 API-key/自定义连接继续按自己的模型 API 和路由适配,+不借用订阅认证。回归见 `openAiAccountCatalogParity.test.ts`、`piNativeProviders.test.ts`。+旧顶层 Pi 条目的静态资料是旧格式兜底,不能标为账号 discovery;Registry 的公共定义/显式条目/路由/perAgent 继续覆盖旧默认,账号实报与用户覆盖另行优先。已解析的名称、窗口、输出上限、档位、输入能力和价格必须进入实际运行配置。