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(models): 订阅模型清单只显示供应商实际返回的型号 (#5145)

Dash4a2bed4edb84
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.ts
index 3e80c0d3d7..05a01d3e0e 100644
--- a/apps/desktop/src/main/bootstrap-electron.ts
+++ b/apps/desktop/src/main/bootstrap-electron.ts
@@ -693,6 +693,8 @@ import { setClaudeSupportedModelsListener } from '@cindy/maker-core';
import {
noteAnthropicSdkSupportedModels,
clearAnthropicDiscoveredModels,
+ requestAnthropicModelProbe,
+ syncAnthropicModelsWithClaudeLogin,
} from './maker-host/model-discovery/anthropic.js';
import {
clearXaiDiscoveredModels,
@@ -5089,10 +5091,9 @@ const registerIpcHandlers = () => {
onClaudeCliLoginStatusChange((status) => {
void broadcastClaudeAuthStateChanged();
syncClaudeSubscriptionUsageForAuthChange();
- if (!status.loggedIn) {
- resetProviderModelAutoRefreshCooldowns('anthropic');
- void clearAnthropicDiscoveredModels().catch(() => undefined);
- }
+ if (!status.loggedIn) resetProviderModelAutoRefreshCooldowns('anthropic');
+ // 登出清空清单;登录(含在终端里登录)后主动读一次;直接换号先清旧账号再读。
+ syncAnthropicModelsWithClaudeLogin(status);
});
// 启动时后台读一次(不阻塞):已连接的用户由 provider 目录加载等这次结果;
// 从未连接的用户据此自动沿用本机登录。明确断开过的用户不再读。
@@ -5123,6 +5124,8 @@ const registerIpcHandlers = () => {
resetProviderModelAutoRefreshCooldowns('anthropic');
// Binding is the commit point; auxiliary refresh must not prolong the cancellable login.
connectClaudeNativeLogin();
+ // CLI 登录态变化的监听先于绑定触发,那次探测会因尚未绑定而跳过;绑定后再请求一次。
+ requestAnthropicModelProbe();
void broadcastClaudeAuthStateChanged();
syncClaudeSubscriptionUsageForAuthChange();
return { ok: true, authorized: hasClaudeNativeLogin() };
diff --git a/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts b/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts
index c363b390e0..7bdde76d65 100644
--- a/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts
@@ -48,8 +48,8 @@ const fake = (id: string, sortOrder = 16.999): CatalogModel => ({
/**
* 去 registry 的 bundled 目录:本文件多数用例只验 discovery/投影**机制**,用
- * registry-free 基线隔离——registry 实体化/overlay 层(2026-08-02 模型平面收敛,
- * registry presence 可独立长实体、显式字段压过 discovery)由 modelPlane.test.ts 专测。
+ * registry-free 基线隔离——registry overlay 层(显式字段压过 discovery;2026-09-27 起
+ * 只作用于供应商返回的型号,不再补入账号没返回的型号)由 modelPlane.test.ts 专测。
*/
function bundledWithoutRegistry(): Catalog {
const catalog = JSON.parse(JSON.stringify(BUNDLED_CATALOG)) as Catalog;
@@ -448,16 +448,17 @@ describe('active-catalog discovered augment', () => {
});
});
- it('xAI discovery augments public declarations and projects canonical ids per harness', () => {
+ it('xAI discovery snapshot defines Claude/Codex membership, keeps Pi independent and projects canonical ids per harness', () => {
setActiveCatalog(BUNDLED_CATALOG);
setXaiDiscoveredModels([{ id: 'xai/grok-4.5' }, { id: 'xai/grok-4.6' }]);
const xai = getActiveCatalog().providers.find((provider) => provider.id === 'xai');
- expect(xai?.models['claude-code']?.map((model) => model.id)).toEqual(
- expect.arrayContaining(['xai/grok-4.5', 'xai/grok-4.6']),
- );
- expect(xai?.models.codex?.map((model) => model.id)).toEqual(
- expect.arrayContaining(['xai/grok-4.5', 'xai/grok-4.6']),
- );
+ // 非空账号快照即 Claude/Codex 成员:Registry 只给返回的型号补资料,不补 grok-4.7 等。
+ expect(xai?.models['claude-code']?.map((model) => model.id)).toEqual([
+ 'xai/grok-4.5',
+ 'xai/grok-4.6',
+ ]);
+ expect(xai?.models.codex?.map((model) => model.id)).toEqual(['xai/grok-4.5', 'xai/grok-4.6']);
+ // Pi 名单逻辑不变:随包 Pi 声明 + 账号新型号。
expect(xai?.models.pi?.map((model) => model.id)).toEqual([
'grok-4.3',
'grok-4.5',
@@ -465,13 +466,10 @@ describe('active-catalog discovered augment', () => {
'grok-4.7',
'grok-build-0.1',
]);
- for (const agent of ['claude-code', 'codex', 'pi'] as const) {
- const id = agent === 'pi' ? 'grok-4.7' : 'xai/grok-4.7';
- expect(xai?.models[agent]?.find((model) => model.id === id)).toMatchObject({
- efforts: ['low', 'medium', 'high', 'xhigh'],
- defaultEffort: 'high',
- });
- }
+ expect(xai?.models.pi?.find((model) => model.id === 'grok-4.7')).toMatchObject({
+ efforts: ['low', 'medium', 'high', 'xhigh'],
+ defaultEffort: 'high',
+ });
expect(xai?.models.pi?.find((model) => model.id === 'grok-4.6')).toMatchObject({
contextWindow: 500_000,
supportsImageInput: true,
@@ -622,10 +620,16 @@ describe('active-catalog discovered augment', () => {
});
});
- it('empty xAI discovery cannot erase server-declared models', () => {
+ it('empty xAI discovery is treated as no snapshot and cannot erase server-declared models', () => {
setActiveCatalog(BUNDLED_CATALOG);
+ setXaiDiscoveredModels(null);
+ const withoutSnapshot = getActiveCatalog().providers.find((provider) => provider.id === 'xai');
setXaiDiscoveredModels([]);
const xai = getActiveCatalog().providers.find((provider) => provider.id === 'xai');
+ // 成功但为空的快照与「尚无快照」同路:静态兼容成员 + Registry 实体化,不是权威空清单。
+ for (const agent of ['claude-code', 'codex', 'pi'] as const) {
+ expect(xai?.models[agent]).toEqual(withoutSnapshot?.models[agent]);
+ }
for (const agent of ['claude-code', 'codex'] as const) {
expect(xai?.models[agent]?.map((model) => model.id)).toContain('xai/grok-4.6');
}
@@ -645,6 +649,27 @@ describe('active-catalog discovered augment', () => {
}
});
+ it('非空 xAI 账号快照只含 grok-4.7 时 Registry 独有的 Grok 型号不补入', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ setXaiDiscoveredModels(null);
+ const staticIds = getActiveCatalog()
+ .providers.find((provider) => provider.id === 'xai')
+ ?.models.codex?.map((model) => model.id);
+ // 前提:无快照时静态/Registry 路径确实有别的 Grok 型号。
+ expect(staticIds).toEqual(expect.arrayContaining(['xai/grok-4.7', 'xai/grok-4.6']));
+
+ setXaiDiscoveredModels([{ id: 'xai/grok-4.7' }]);
+ const xai = getActiveCatalog().providers.find((provider) => provider.id === 'xai');
+ for (const agent of ['claude-code', 'codex'] as const) {
+ expect(xai?.models[agent]?.map((model) => model.id)).toEqual(['xai/grok-4.7']);
+ // Registry 仍为返回的型号补资料。
+ expect(xai?.models[agent]?.[0]).toMatchObject({
+ efforts: ['low', 'medium', 'high', 'xhigh'],
+ defaultEffort: 'high',
+ });
+ }
+ });
+
it('xAI 媒体发现按官方存在性收敛,实报资料覆盖目录默认', () => {
setActiveCatalog(BUNDLED_CATALOG);
setDiscoveredProviderMediaModels('xai', {
@@ -813,6 +838,28 @@ describe('active-catalog discovered augment', () => {
expect(openaiIds('codex')).toEqual([]);
expect(openaiIds('claude-code')).toEqual([]);
});
+
+ it('随包 Registry + 空账号清单 → Codex root 与 chatgpt bridge 都为空(Registry 不补型号)', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ setDiscoveredCodexModels([]);
+ expect(openaiIds('codex')).toEqual([]);
+ expect(openaiIds('claude-code')).toEqual([]);
+ });
+
+ it('消费端变体 chatgpt/gpt-5.6-sol[1m] 只在账号返回上游 gpt-5.6-sol 时出现', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ setDiscoveredCodexModels([fake('gpt-5.6-sol', 1), fake('gpt-5.5', 2)]);
+ expect(openaiIds('codex')).toEqual(['gpt-5.6-sol', 'gpt-5.5']);
+ expect(openaiIds('claude-code')).toEqual(
+ expect.arrayContaining(['chatgpt/gpt-5.6-sol', 'chatgpt/gpt-5.6-sol[1m]']),
+ );
+ // 变体不进 canonical Codex root。
+ expect(openaiIds('codex')).not.toContain('gpt-5.6-sol[1m]');
+
+ setDiscoveredCodexModels([fake('gpt-5.5', 2)]);
+ expect(openaiIds('codex')).toEqual(['gpt-5.5']);
+ expect(openaiIds('claude-code')).toEqual(['chatgpt/gpt-5.5']);
+ });
});
/** anthropic 发现条目 fixture(模拟订阅通道返回的家族级命名 + 捕获序 sortOrder)。 */
@@ -848,7 +895,7 @@ describe('anthropic 发现条目的 modelRegistry 元数据基线', () => {
setAnthropicDiscoveredModels([]);
});
- it('供应商显式名称优先,缺项继承公共名称;顺序以账号为准,仅目录有的接在后面', () => {
+ it('供应商显式名称优先,缺项继承公共名称;顺序以账号为准,目录独有的型号不补入', () => {
setActiveCatalog(BUNDLED_CATALOG);
setAnthropicDiscoveredModels([
anthro('claude-opus-5', 'Claude Opus 5', 0),
@@ -873,17 +920,15 @@ describe('anthropic 发现条目的 modelRegistry 元数据基线', () => {
['claude-opus-4-5', 'Claude Opus 4.5'],
['claude-haiku-4-5', 'Claude Haiku 4.5'],
['claude-sonnet-4-5', 'Claude Sonnet 4.5'],
- ['claude-opus-5-5', 'Opus 5.5'],
- ['claude-fable-5-1', 'Fable 5.1'],
- ['claude-mythos-5', 'Mythos 5'],
]);
- expect(anthropicList().map((m) => m.sortOrder)).toEqual([...Array(13).keys()]);
+ // Registry 独有的 claude-opus-5-5 / claude-fable-5-1 / claude-mythos-5 账号没返回,不出现。
+ expect(anthropicList().map((m) => m.sortOrder)).toEqual([...Array(10).keys()]);
expect(
anthropicList('claude-code')
.filter((model) => model.defaultEnabled !== false)
.map((model) => model.id)
.sort(),
- ).toEqual(['claude-fable-5-1', 'claude-haiku-4-5', 'claude-mythos-5', 'claude-opus-5-5', 'claude-sonnet-5']);
+ ).toEqual(['claude-haiku-4-5', 'claude-sonnet-5']);
// Claude 订阅只供 Claude Code:不投影 Codex bridge,也不给 Pi。
expect(anthropicList('codex')).toEqual([]);
expect(anthropicList('pi')).toEqual([]);
@@ -948,6 +993,18 @@ describe('anthropic 发现条目的 modelRegistry 元数据基线', () => {
expect(anthropicList().find((m) => m.id === 'claude-sonnet-4-5')?.defaultEnabled).toBe(false);
});
+ it('随包 Registry 下 SDK 只返回 claude-fable-5-1 时清单只有它;未发现时为空', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ setAnthropicDiscoveredModels([]);
+ expect(anthropicList()).toEqual([]);
+
+ setAnthropicDiscoveredModels([anthro('claude-fable-5-1', 'Claude Fable 5.1', 0)]);
+ // Registry 登记的 claude-fable-5 / claude-mythos-5 等账号没返回,不补入。
+ expect(anthropicList().map((m) => m.id)).toEqual(['claude-fable-5-1']);
+ expect(anthropicList('codex')).toEqual([]);
+ expect(anthropicList('pi')).toEqual([]);
+ });
+
it('registry 显式字段压过 discovery(2026-08-02 优先级收敛);未登记条目保留上游原值', () => {
setActiveCatalog(
withAnthropicRegistry([
diff --git a/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts b/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts
index 92388047e8..059c389a90 100644
--- a/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts
@@ -43,6 +43,9 @@ import {
clearAnthropicDiscoveredModels,
resetAnthropicDiscoveryForTest,
waitForAnthropicDiscoveryIdleForTest,
+ refreshAnthropicModelsFromProbe,
+ setAnthropicModelProbe,
+ syncAnthropicModelsWithClaudeLogin,
} from '../model-discovery/anthropic.js';
import {
getActiveCatalog,
@@ -266,6 +269,78 @@ describe('mapAnthropicSdkModels', () => {
expect(out[0].model.name).toBe('Sonnet 5'); // dated 先出现,first-wins
});
+ it('SDK 系列简称按说明里的版本解析为目录已登记的具体 id,名称取目录', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ const out = mapAnthropicSdkModels([
+ { value: 'default', displayName: 'Default (recommended)', description: 'Opus 5.5 with 1M context · Most capable' },
+ // Claude Code 2.1.280 实报形态:简称可带 [1m],显式 id 的 displayName 只有系列名。
+ { value: 'opus[1m]', displayName: 'Opus (1M context)', description: 'Opus 5.5 with 1M context · Best for everyday, complex tasks' },
+ { value: 'claude-fable-5-1[1m]', displayName: 'Fable', description: 'Fable 5.1 · Most capable for your hardest and longest-running tasks' },
+ { value: 'sonnet', displayName: 'Sonnet', description: 'Sonnet 5 · Efficient for routine tasks' },
+ { value: 'haiku', displayName: 'Haiku', description: 'Haiku 4.5 · Fastest for quick answers' },
+ { value: 'claude-opus-4-5', displayName: 'Opus 4.5', description: 'Newer version available' },
+ ]);
+ expect(out.map(({ model }) => [model.id, model.name])).toEqual([
+ ['claude-opus-5-5', 'Opus 5.5'],
+ ['claude-fable-5-1', 'Fable 5.1'],
+ ['claude-sonnet-5', 'Sonnet 5'],
+ ['claude-haiku-4-5', 'Haiku 4.5'],
+ ['claude-opus-4-5', 'Opus 4.5'],
+ ]);
+ // 只有系列名的 displayName 不是供应商对具体型号的命名,不进入实报资料。
+ expect(out[0]!.model.discoveredMetadata?.name).toBeUndefined();
+ expect(out[1]!.model.discoveredMetadata?.name).toBeUndefined();
+ expect(out[4]!.model.discoveredMetadata?.name).toBe('Opus 4.5');
+ });
+
+ it('目录未登记的新版本照样显示,id 与名称按说明里的版本生成(Fable 5.2 不被显示成 5.1)', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ const out = mapAnthropicSdkModels([
+ // 简称指向目录还不认识的 5.2:按说明生成 claude-fable-5-2,不映射到已登记的 5.1。
+ { value: 'fable', displayName: 'Fable', description: 'Fable 5.2 · Newest' },
+ { value: 'claude-fable-5-1', displayName: 'Fable', description: 'Fable 5.1 · Previous' },
+ ]);
+ expect(out.map(({ model }) => [model.id, model.name])).toEqual([
+ ['claude-fable-5-2', 'Fable 5.2'],
+ ['claude-fable-5-1', 'Fable 5.1'],
+ ]);
+ // 目录未知:资料用未知模型默认值,窗口不标记为已核实。
+ expect(out[0]!.model.contextWindowVerified).toBeUndefined();
+
+ // 显式 id 形态同理,名称按 id 推导,不取目录里 5.1 的名称。
+ const explicit = mapAnthropicSdkModels([
+ { value: 'claude-fable-5-2[1m]', displayName: 'Fable', description: 'Fable 5.2 · Newest' },
+ ]);
+ expect(explicit.map(({ model }) => [model.id, model.name])).toEqual([
+ ['claude-fable-5-2', 'Fable 5.2'],
+ ]);
+ });
+
+ it('名称里只有上下文长度(1M)时不当作版本号,改用目录名称或按 id 推导', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ const out = mapAnthropicSdkModels([
+ // 没有排在前面的 default 条目时,opus[1m] 是该型号的首个条目。
+ { value: 'opus[1m]', displayName: 'Opus (1M context)', description: 'Opus 5.5 with 1M context · Best' },
+ { value: 'sonnet[1m]', displayName: 'Sonnet (1M context)', description: 'Sonnet 5.6 with 1M context · New' },
+ ]);
+ expect(out.map(({ model }) => [model.id, model.name])).toEqual([
+ ['claude-opus-5-5', 'Opus 5.5'],
+ ['claude-sonnet-5-6', 'Sonnet 5.6'],
+ ]);
+ expect(out.every(({ model }) => model.discoveredMetadata?.name === undefined)).toBe(true);
+ });
+
+ it('简称与说明的系列不符、版本多于两段或缺说明时放弃,不猜', () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ const out = mapAnthropicSdkModels([
+ { value: 'opus', displayName: 'Opus', description: 'Sonnet 5 · Best for everyday tasks' },
+ { value: 'sonnet', displayName: 'Sonnet', description: 'Sonnet 5.0.1 · Patch' },
+ { value: 'haiku', displayName: 'Haiku' },
+ { value: 'opusplan', displayName: 'Opus Plan', description: 'Opus 5.5 in plan mode' },
+ ]);
+ expect(out).toEqual([]);
+ });
+
it('[1m] 长上下文后缀归一并去重(顶栏误报「已断开」回归):目录基线按裸 id 命中', () => {
const out = mapAnthropicSdkModels([
{ value: 'claude-fable-5[1m]', displayName: 'Fable 5' },
@@ -331,6 +406,105 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =
await fsp.rm(TEST_USER_DATA, { recursive: true, force: true });
});
+ it('主动探测按发起时的授权世代生效:探测期间换号,旧账号的迟到清单不写入', async () => {
+ setAnthropicModelProbe(async (onModels) => {
+ onModels([{ value: 'claude-opus-4-8', displayName: 'Opus 4.8' }]);
+ return true;
+ });
+ await expect(refreshAnthropicModelsFromProbe()).resolves.toBe(true);
+ expect(anthropicIds()).toEqual(['claude-opus-4-8']);
+
+ setAnthropicModelProbe(async (onModels) => {
+ // 探测在途时发生登出 / 换号(授权边界收口让世代自增)。
+ await clearAnthropicDiscoveredModels();
+ onModels([{ value: 'claude-opus-4-8', displayName: 'Account A Opus 4.8' }]);
+ return true;
+ });
+ await expect(refreshAnthropicModelsFromProbe()).resolves.toBe(false);
+ await waitForAnthropicDiscoveryIdleForTest();
+ expect(anthropicIds()).toEqual([]);
+ const cache = path.join(TEST_USER_DATA, 'model-discovery', 'anthropic-models.json');
+ await expect(fsp.access(cache)).rejects.toMatchObject({ code: 'ENOENT' });
+ setAnthropicModelProbe(null);
+ });
+
+ it('探测被注销(maker 重置)后,旧探测的迟到结果不生效,新探测也不复用它', async () => {
+ let deliverOld!: () => void;
+ setAnthropicModelProbe(
+ (onModels) =>
+ new Promise<boolean>((resolve) => {
+ deliverOld = () => {
+ onModels([{ value: 'claude-opus-4-8', displayName: 'Opus 4.8' }]);
+ resolve(true);
+ };
+ }),
+ );
+ const oldFlight = refreshAnthropicModelsFromProbe();
+ setAnthropicModelProbe(null);
+ await expect(refreshAnthropicModelsFromProbe()).resolves.toBe(false);
+
+ const freshProbe = vi.fn(async (onModels: (models: unknown[]) => void) => {
+ onModels([{ value: 'claude-sonnet-4-5', displayName: 'Sonnet 4.5' }]);
+ return true;
+ });
+ setAnthropicModelProbe(freshProbe);
+ await expect(refreshAnthropicModelsFromProbe()).resolves.toBe(true);
+ expect(freshProbe).toHaveBeenCalledTimes(1);
+
+ deliverOld();
+ await expect(oldFlight).resolves.toBe(false);
+ expect(anthropicIds()).toEqual(['claude-sonnet-4-5']);
+ setAnthropicModelProbe(null);
+ });
+
+ it('终端里直接换号(不经登出):先清旧账号清单与在途探测,再为新账号读取', async () => {
+ // 生产中同一个 maker 的探测函数在换号前后不变,作废只能靠授权世代。
+ let deliverA!: () => void;
+ const probe = vi.fn<(onModels: (models: unknown[]) => void) => Promise<boolean>>();
+ probe.mockImplementationOnce(
+ (onModels) =>
+ new Promise<boolean>((resolve) => {
+ deliverA = () => {
+ onModels([{ value: 'claude-opus-4-8', displayName: 'Account A Opus 4.8' }]);
+ resolve(true);
+ };
+ }),
+ );
+ probe.mockImplementationOnce(async (onModels) => {
+ onModels([{ value: 'claude-sonnet-4-5', displayName: 'Sonnet 4.5' }]);
+ return true;
+ });
+ setAnthropicModelProbe(probe);
+
+ syncAnthropicModelsWithClaudeLogin({ loggedIn: true, email: '[email protected]' });
+ await vi.waitFor(() => expect(probe).toHaveBeenCalledTimes(1));
+ // B 的请求不能复用 A 的在途探测。
+ syncAnthropicModelsWithClaudeLogin({ loggedIn: true, email: '[email protected]' });
+ await vi.waitFor(() => expect(probe).toHaveBeenCalledTimes(2));
+ await vi.waitFor(() => expect(anthropicIds()).toEqual(['claude-sonnet-4-5']));
+
+ // A 的迟到结果被丢弃。
+ deliverA();
+ await waitForAnthropicDiscoveryIdleForTest();
+ expect(anthropicIds()).toEqual(['claude-sonnet-4-5']);
+ setAnthropicModelProbe(null);
+ });
+
+ it('同一账号的重复登录态变化不清空清单', async () => {
+ const probe = vi.fn(async (onModels: (models: unknown[]) => void) => {
+ onModels([{ value: 'claude-sonnet-4-5', displayName: 'Sonnet 4.5' }]);
+ return true;
+ });
+ setAnthropicModelProbe(probe);
+ syncAnthropicModelsWithClaudeLogin({ loggedIn: true, email: '[email protected]' });
+ await vi.waitFor(() => expect(anthropicIds()).toEqual(['claude-sonnet-4-5']));
+ probe.mockImplementationOnce(() => new Promise<boolean>(() => {}));
+ syncAnthropicModelsWithClaudeLogin({ loggedIn: true, email: '[email protected]' });
+ await waitForAnthropicDiscoveryIdleForTest();
+ expect(anthropicIds()).toEqual(['claude-sonnet-4-5']);
+ setAnthropicModelProbe(null);
+ });
+
it('未登录 Claude.ai 时不注入(登出击穿 / 纯网关用户长清单,review P1 回归)', () => {
authState.loggedIn = false;
noteAnthropicSdkSupportedModels([
@@ -391,6 +565,35 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =
});
});
+ it('旧版缓存里只有系列名的型号名称在恢复时改用目录名称', async () => {
+ setActiveCatalog(BUNDLED_CATALOG);
+ const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');
+ await fsp.mkdir(cacheDir, { recursive: true });
+ await fsp.writeFile(
+ path.join(cacheDir, 'anthropic-models.json'),
+ JSON.stringify({
+ fetchedAt: '2026-09-26T10:58:52.989Z',
+ models: [
+ {
+ id: 'claude-fable-5-1',
+ discoveredMetadata: { name: 'Fable', description: 'Fable 5.1 · Most capable' },
+ name: 'Fable',
+ group: 'anthropic',
+ contextWindow: 1_000_000,
+ efforts: ['low', 'medium', 'high', 'xhigh', 'max'],
+ defaultEffort: 'high',
+ supportsFastMode: false,
+ status: 'active',
+ },
+ ],
+ }),
+ 'utf-8',
+ );
+
+ await loadAnthropicModelsFromDiskCache();
+ expect(anthropicModel('claude-fable-5-1')?.name).toBe('Fable 5.1');
+ });
+
it('未连接本机 Claude Code 登录时不加载残留磁盘缓存', async () => {
const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');
await fsp.mkdir(cacheDir, { recursive: true });
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 8b9e2c5fd5..9ce5f6e0d1 100644
--- a/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/bundledCatalogIntegrity.test.ts
@@ -1,6 +1,12 @@
import { afterEach, describe, expect, it } from 'vitest';
-import { BUNDLED_CATALOG, type Catalog } from '@cindy/model-providers';
-import { getActiveCatalog, setActiveCatalog, setDiscoveredCodexModels, setXdGatewayModels } from '../active-catalog.js';
+import { BUNDLED_CATALOG, type Catalog, type CatalogModel } from '@cindy/model-providers';
+import {
+ getActiveCatalog,
+ setActiveCatalog,
+ setAnthropicDiscoveredModels,
+ setDiscoveredCodexModels,
+ setXdGatewayModels,
+} from '../active-catalog.js';
import { filterLegacyGptContextProfiles } from '../legacy-context-profiles.js';
import { deriveAvailableModels } from '../catalog-to-descriptors.js';
@@ -9,13 +15,45 @@ import { deriveAvailableModels } from '../catalog-to-descriptors.js';
// source fields are not required blindly: unknown is distinct from false/zero.
afterEach(() => {
setDiscoveredCodexModels([]);
+ setAnthropicDiscoveredModels([]);
setXdGatewayModels([]);
setActiveCatalog(BUNDLED_CATALOG);
});
+/**
+ * OpenAI 订阅成员只来自账号清单(Registry 不补型号)。模拟 app-server model/list 只报
+ * 成员、不报窗口/档位的形态:discoveredMetadata 为空,资料全部由 Registry 决定。
+ */
+function seedCodexAccount(...ids: string[]): void {
+ setDiscoveredCodexModels(ids.map((id): CatalogModel => ({
+ id, name: id, group: 'gpt', contextWindow: 272_000, efforts: [], defaultEffort: null,
+ discoveredMetadata: {},
+ })));
+}
+
describe('bundled model settings integrity', () => {
it('keeps every projected model structurally usable with a supported default', () => {
setActiveCatalog(BUNDLED_CATALOG);
+ // 订阅成员只来自账号清单;让账号返回 Registry 登记的全部订阅型号,覆盖每条 overlay。
+ const routeIds = (providerId: string, agent: 'codex' | 'claude-code') => [
+ ...new Set(
+ (BUNDLED_CATALOG.modelRegistry?.models ?? []).flatMap((entry) =>
+ entry.status === 'retired' || (entry.mode !== undefined && entry.mode !== 'chat')
+ ? []
+ : entry.routes
+ .filter((route) => route.providerId === providerId && route.agents.includes(agent))
+ .map((route) => route.modelId),
+ ),
+ ),
+ ];
+ const codexIds = routeIds('openai', 'codex');
+ const anthropicIds = routeIds('anthropic', 'claude-code');
+ expect(codexIds.length).toBeGreaterThan(0);
+ expect(anthropicIds.length).toBeGreaterThan(0);
+ seedCodexAccount(...codexIds);
+ setAnthropicDiscoveredModels(anthropicIds.map((id): CatalogModel => ({
+ id, name: id, contextWindow: 200_000, efforts: [], defaultEffort: null, discoveredMetadata: {},
+ })));
const catalog = getActiveCatalog();
let checked = 0;
for (const provider of catalog.providers) {
@@ -99,6 +137,8 @@ it('keeps Gateway restrictions, unknown tiers and discounted prices independent
it('removes GPT window presets from new choices while preserving runtime history and custom providers', () => {
setActiveCatalog(BUNDLED_CATALOG);
+ // [1m] 消费端变体只跟随账号返回的上游型号出现。
+ seedCodexAccount('gpt-5.6-sol');
const runtime = getActiveCatalog();
const openai = runtime.providers.find((p) => p.id === 'openai')!;
const legacy = openai.models['claude-code']!.find((m) => m.id.endsWith('[1m]'))!;
@@ -120,7 +160,8 @@ it('removes GPT window presets from new choices while preserving runtime history
it('keeps ordinary GPT defaults at 272K while exposing the catalog capacity without a native cache', () => {
setActiveCatalog(BUNDLED_CATALOG);
- setDiscoveredCodexModels([]);
+ // 账号清单只报成员(无 native models_cache 的窗口),窗口资料由 Registry 补。
+ seedCodexAccount('gpt-6-astra', 'gpt-5.6-sol', 'gpt-5.6-terra', 'gpt-5.6-luna');
const provider = getActiveCatalog().providers.find((p) => p.id === 'openai')!;
for (const id of ['gpt-6-astra', 'gpt-5.6-sol', 'gpt-5.6-terra', 'gpt-5.6-luna']) {
for (const agent of ['codex', 'claude-code'] as const) {
diff --git a/apps/desktop/src/main/maker-host/__tests__/modelEffortInheritance.test.ts b/apps/desktop/src/main/maker-host/__tests__/modelEffortInheritance.test.ts
index 25c1f5f0c7..20be72c182 100644
--- a/apps/desktop/src/main/maker-host/__tests__/modelEffortInheritance.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/modelEffortInheritance.test.ts
@@ -33,6 +33,12 @@ describe('model effort inheritance through the execution catalog', () => {
}];
}
setActiveCatalog(catalog);
+ // Codex/Claude membership comes only from the account list; it reports the
+ // model without capability metadata, so shared defaults decide the tiers.
+ setDiscoveredCodexModels([{
+ id: 'gpt-5.6-sol', name: 'gpt-5.6-sol', contextWindow: 272_000,
+ efforts: [], defaultEffort: null, discoveredMetadata: {},
+ }]);
const models = openAiModels();
for (const agent of ['claude-code', 'codex', 'pi'] as const) {
const model = models[agent]!.find(m => m.id === (agent === 'codex' ? 'gpt-5.6-sol' : 'chatgpt/gpt-5.6-sol'))!;
diff --git a/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts b/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts
index 2e62ce9644..07d76065c7 100644
--- a/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts
@@ -1,6 +1,8 @@
/**
* modelPlane.test.ts —— 模型平面收敛(2026-08-02)的 invariant 矩阵:
- * registry presence 实体化 / 生命周期(retired tombstone + keepSelected 豁免)/
+ * registry 对账号返回型号的 overlay(2026-09-27 起成员只来自供应商清单,registry 不补
+ * 账号没返回的型号;xAI 尚无账号快照的静态兼容路径除外)/ 生命周期(retired tombstone +
+ * keepSelected 豁免)/
* 表驱动投影(bridge membership 门控、Pi 独立目录)/ 本地 override(local 永远
* 最高、addition 复活 retired、perAgent 单点修、dormant patch)/ XD 不可伪造。
* 全部走真实 active-catalog computeMerged 管线,不 mock 合并逻辑。
@@ -105,6 +107,24 @@ function overridesOf(raw: unknown): ModelCatalogOverrides {
return sanitizeModelCatalogOverrides(raw).overrides;
}
+/** 账号发现只证明成员存在;资料字段取最小值,由 Registry overlay 决定展示资料。 */
+function accountModel(id: string, overrides: Partial<CatalogModel> = {}): CatalogModel {
+ return { id, name: id, contextWindow: 1, efforts: [], defaultEffort: null, ...overrides };
+}
+
+/** 模拟本机 Codex 账号清单只返回这些型号。 */
+function seedCodexAccount(...ids: string[]): void {
+ setDiscoveredCodexModels(ids.map((id) => accountModel(id)));
+}
+
+/**
+ * 随包 v4 Registry 按 discoveredMetadata 区分账号实报字段;这里只报成员(与 app-server
+ * model/list 未给出档位/窗口时同形),资料全部由 Registry 决定。
+ */
+function seedBundledCodexAccount(...ids: string[]): void {
+ setDiscoveredCodexModels(ids.map((id) => accountModel(id, { discoveredMetadata: {} })));
+}
+
afterEach(() => {
setActiveCatalog(BUNDLED_CATALOG);
setDiscoveredCodexModels([]);
@@ -114,7 +134,7 @@ afterEach(() => {
setLocalCatalogOverrides(EMPTY_MODEL_CATALOG_OVERRIDES);
});
-describe('registry presence 实体化', () => {
+describe('registry overlay 只作用于账号返回的型号(xAI 无账号快照时走静态兼容)', () => {
it('inherits defaults per harness and refreshes public defaults for Pi', () => {
for (const effort of ['medium', 'high'] as const) {
const catalog = structuredClone(BUNDLED_CATALOG);
@@ -128,6 +148,7 @@ describe('registry presence 实体化', () => {
'claude-code': { ...terra.perAgent?.['claude-code'], defaultEffort: 'low' },
};
setActiveCatalog(catalog);
+ seedBundledCodexAccount('gpt-5.6-terra');
for (const agent of ['codex', 'claude-code', 'pi'] as const) {
const id = agent === 'codex' ? 'gpt-5.6-terra' : 'chatgpt/gpt-5.6-terra';
expect(models('openai', agent).find((m) => m.id === id)?.defaultEffort).toBe(
@@ -156,8 +177,14 @@ describe('registry presence 实体化', () => {
expect(models('xai', 'pi')).toEqual([]);
});
- it('远端 Registry 宣告 GPT-6 只进入 Codex/Claude,不会自动加入 Pi', () => {
+ it('远端 Registry 宣告 GPT-6 不会自行加入任何 Harness;账号返回后 Codex/Claude 取 Registry 资料', () => {
setActiveCatalog(baseCatalog([gpt6Entry()]));
+ // 账号没返回:Registry 声明不造成员,Codex/Claude/Pi 都没有。
+ expect(models('openai', 'codex').map((m) => m.id)).not.toContain('gpt-6');
+ expect(models('openai', 'claude-code').map((m) => m.id)).not.toContain('chatgpt/gpt-6');
+ expect(models('openai', 'pi').map((m) => m.id)).not.toContain('chatgpt/gpt-6');
+
+ seedCodexAccount('gpt-6');
const codex = models('openai', 'codex').find((m) => m.id === 'gpt-6');
expect(codex).toMatchObject({
name: 'GPT-6',
@@ -170,20 +197,22 @@ describe('registry presence 实体化', () => {
status: 'active',
});
expect(models('openai', 'claude-code').map((m) => m.id)).toContain('chatgpt/gpt-6');
- expect(models('openai', 'pi').map((m) => m.id)).not.toContain('chatgpt/gpt-6');
});
it('公共 Registry 的 newSessionDefault 不进入 CatalogModel;默认只信区域门控后的 /models', () => {
setActiveCatalog(baseCatalog([gpt6Entry({ newSessionDefault: ['claude-code', 'codex'] })], 2));
+ seedCodexAccount('gpt-6');
const codex = models('openai', 'codex').find((m) => m.id === 'gpt-6');
const claude = models('openai', 'claude-code').find((m) => m.id === 'chatgpt/gpt-6');
+ // Pi 成员来自账号发现(不是 Registry),同样不能带上公共 newSessionDefault。
const pi = models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6');
expect(codex).toBeDefined();
expect(claude).toBeDefined();
- expect(pi).toBeUndefined();
+ expect(pi).toBeDefined();
expect('newSessionDefault' in codex!).toBe(false);
expect('newSessionDefault' in claude!).toBe(false);
+ expect('newSessionDefault' in pi!).toBe(false);
});
it('bridge 在投影后应用目标端 perAgent 的 effort 能力', () => {
@@ -204,6 +233,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')).toMatchObject({
contextWindow: 272_000,
efforts: ['low', 'medium', 'high'],
@@ -215,17 +245,20 @@ describe('registry presence 实体化', () => {
efforts: ['low', 'medium'],
defaultEffort: 'medium',
});
- expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')).toBeUndefined();
+ // Pi 的成员来自账号发现,Codex/Claude 的 perAgent 能力不投影到 Pi。
+ const accountPi = { contextWindow: 1, efforts: [], defaultEffort: null };
+ expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')).toMatchObject(accountPi);
setLocalCatalogOverrides(
overridesOf({ patches: { 'openai:gpt-6': { base: { contextWindow: 123_000 } } } }),
);
expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')?.contextWindow).toBe(123_000);
- expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')).toBeUndefined();
+ expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')).toMatchObject(accountPi);
});
it('bundled GPT-5.4 Mini preserves Claude Fast=false without a Claude default override', () => {
setActiveCatalog(BUNDLED_CATALOG);
+ seedBundledCodexAccount('gpt-5.4-mini');
expect(models('openai', 'codex').find((m) => m.id === 'gpt-5.4-mini')).toMatchObject({
supportsFastMode: true,
defaultEffort: 'medium',
@@ -262,6 +295,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'claude-code').find((m) => m.id === 'chatgpt/gpt-6')).toMatchObject({
contextWindow: 123_000,
supportsFastMode: false,
@@ -277,7 +311,7 @@ describe('registry presence 实体化', () => {
},
);
- it('missing defaults retain declared roots and aliases using supported medium intent', () => {
+ it('missing defaults retain returned roots and aliases using supported medium intent', () => {
setActiveCatalog(
baseCatalog([
gpt6Entry({ defaultEffort: undefined }),
@@ -288,6 +322,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex')).toMatchObject([{ id: 'gpt-6', defaultEffort: 'medium' }]);
expect(models('openai', 'claude-code')).toMatchObject([
{ id: 'chatgpt/gpt-6', defaultEffort: 'medium' },
@@ -305,6 +340,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'claude-code').find((m) => m.id === 'chatgpt/gpt-6')).toMatchObject({
efforts: ['low', 'medium', 'high', 'xhigh', 'max', 'ultra'],
defaultEffort: 'ultra',
@@ -323,6 +359,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex').filter((m) => m.id.startsWith('gpt-6'))).toMatchObject([
{ id: 'gpt-6', contextWindow: 272_000 },
@@ -339,9 +376,12 @@ describe('registry presence 实体化', () => {
contextWindow: 272_000,
},
]);
- expect(
- models('openai', 'pi').some((m) => ['chatgpt/gpt-6', 'chatgpt/gpt-6[1m]'].includes(m.id)),
- ).toBe(false);
+ // 长上下文变体只属于 Claude;Pi 只有账号发现带来的 chatgpt/gpt-6 本体。
+ expect(models('openai', 'pi').some((m) => m.id === 'chatgpt/gpt-6[1m]')).toBe(false);
+ expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')).toMatchObject({
+ name: 'gpt-6',
+ contextWindow: 1,
+ });
setLocalCatalogOverrides(
overridesOf({
patches: { 'openai:gpt-6[1m]': { base: { contextWindow: 900_000 } } },
@@ -385,7 +425,7 @@ describe('registry presence 实体化', () => {
expect(models('openai', 'codex')).toEqual([]);
});
- it('missing effort metadata retains declared models without inventing a level', () => {
+ it('missing effort metadata retains returned models without inventing a level', () => {
setActiveCatalog(
baseCatalog([
gpt6Entry({ efforts: undefined, defaultEffort: undefined }),
@@ -395,6 +435,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6', 'gpt-6-mini');
for (const agent of ['codex', 'claude-code'] as const) {
const id = agent === 'codex' ? 'gpt-6' : 'chatgpt/gpt-6';
expect(models('openai', agent).find(m => m.id === id))
@@ -427,7 +468,21 @@ describe('registry presence 实体化', () => {
}),
]),
);
- expect(models('openai', 'codex').map((m) => m.id)).toEqual(['gpt-6-mini']);
+ setDiscoveredCodexModels([
+ accountModel('gpt-6', { efforts: ['low', 'high'], defaultEffort: 'high' }),
+ accountModel('gpt-6-mini'),
+ ]);
+ // 账号返回的 gpt-6 仍在,但非法 entry 整条隔离:不带任何 Registry 资料,
+ // 档位保持账号返回值,不被过滤成固定档。
+ expect(models('openai', 'codex').map((m) => m.id)).toEqual(['gpt-6', 'gpt-6-mini']);
+ expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')).toMatchObject({
+ name: 'gpt-6',
+ contextWindow: 1,
+ efforts: ['low', 'high'],
+ defaultEffort: 'high',
+ });
+ expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')?.maxOutput).toBeUndefined();
+ expect(models('openai', 'codex').find((m) => m.id === 'gpt-6-mini')?.name).toBe('GPT-6');
expect(getModelPlaneWarnings()).toEqual(
expect.arrayContaining([
expect.objectContaining({
@@ -447,6 +502,7 @@ describe('registry presence 实体化', () => {
gpt6Entry({ id: 'openai/duplicate', name: 'Duplicate Registry Entry' }),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex').filter((m) => m.id === 'gpt-6')).toHaveLength(1);
expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')?.name).toBe('GPT-6');
expect(getModelPlaneWarnings()).toMatchObject([
@@ -454,7 +510,7 @@ describe('registry presence 实体化', () => {
]);
});
- it('preview→alpha;deprecated 实体化但强制默认隐藏', () => {
+ it('preview→alpha;账号返回的 deprecated 型号强制默认隐藏', () => {
setActiveCatalog(
baseCatalog([
gpt6Entry({ status: 'preview' }),
@@ -466,6 +522,7 @@ describe('registry presence 实体化', () => {
}),
]),
);
+ seedCodexAccount('gpt-6', 'gpt-5-legacy');
expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')?.status).toBe('alpha');
expect(models('openai', 'codex').find((m) => m.id === 'gpt-5-legacy')).toMatchObject({
status: 'deprecated',
@@ -479,9 +536,11 @@ describe('registry presence 实体化', () => {
gpt6Entry({ routes: [{ providerId: 'openai', modelId: 'gpt-6', agents: ['codex'] }] }),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex').map((m) => m.id)).toContain('gpt-6');
expect(models('openai', 'claude-code').map((m) => m.id)).not.toContain('chatgpt/gpt-6');
- expect(models('openai', 'pi').map((m) => m.id)).not.toContain('chatgpt/gpt-6');
+ // Registry 的 bridge 门控不裁剪 Pi:Pi 仍有账号发现带来的成员。
+ expect(models('openai', 'pi').map((m) => m.id)).toContain('chatgpt/gpt-6');
});
it('status 缺失只做 metadata overlay,不能用 membership 缩减 discovery 投影', () => {
@@ -534,7 +593,14 @@ describe('registry presence 实体化', () => {
} as RegistryEntry,
]),
);
+ setAnthropicDiscoveredModels([accountModel('claude-next')]);
expect(models('anthropic', 'claude-code').map((m) => m.id)).toEqual(['claude-next']);
+ expect(models('anthropic', 'claude-code')[0]).toMatchObject({
+ name: 'Claude Next',
+ efforts: ['low', 'high'],
+ defaultEffort: 'high',
+ supportsFastMode: true,
+ });
expect(models('anthropic', 'codex')).toEqual([]);
expect(models('anthropic', 'pi')).toEqual(
withNativeMetadata(
@@ -572,6 +638,7 @@ describe('registry presence 实体化', () => {
} as RegistryEntry,
]),
);
+ setAnthropicDiscoveredModels([accountModel('claude-next')]);
expect(models('anthropic', 'claude-code').map((m) => m.id)).toContain('claude-next');
expect(models('anthropic', 'codex')).toEqual([]);
});
@@ -813,6 +880,7 @@ describe('本地 override(local 永远最高)', () => {
it('本地 perAgent 也在 bridge 目标端生效,且不能写展示/status 字段', () => {
setActiveCatalog(baseCatalog([gpt6Entry()]));
+ seedCodexAccount('gpt-6');
setLocalCatalogOverrides(
overridesOf({
patches: {
@@ -1049,15 +1117,24 @@ describe('本地 override(local 永远最高)', () => {
describe('cross-harness defaults', () => {
it('keeps discovered native/Pi models enabled and makes the Claude Code bridge opt-in', () => {
setActiveCatalog(baseCatalog([gpt6Entry({ defaultEnabled: true })]));
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')?.defaultEnabled).toBe(true);
expect(
models('openai', 'claude-code').find((m) => m.id === 'chatgpt/gpt-6')?.defaultEnabled,
).toBe(false);
- expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')).toBeUndefined();
- expect(models('openai', 'pi')).toEqual(
- withNativeMetadata(
- 'openai',
- BUNDLED_CATALOG.providers.find((p) => p.id === 'openai')?.models.pi,
+ // Pi 的账号发现成员保持启用并排在账号位置;其余 Pi 名单仍是随包原生名单
+ // (sortOrder 按账号顺序整体重排,不参与比较)。
+ const withoutOrder = (list: readonly CatalogModel[] = []) =>
+ list.map(({ sortOrder: _sortOrder, ...model }) => model);
+ const pi = models('openai', 'pi');
+ expect(pi[0]).toMatchObject({ id: 'chatgpt/gpt-6' });
+ expect(pi[0]?.defaultEnabled).not.toBe(false);
+ expect(withoutOrder(pi.slice(1))).toEqual(
+ withoutOrder(
+ withNativeMetadata(
+ 'openai',
+ BUNDLED_CATALOG.providers.find((p) => p.id === 'openai')?.models.pi,
+ ),
),
);
setActiveCatalog(
@@ -1077,6 +1154,7 @@ it('preserves the upstream maximum separately from per-harness recommended windo
gpt6Entry({ contextWindow: 1_050_000, perAgent: { codex: { contextWindow: 272_000 } } }),
]),
);
+ seedCodexAccount('gpt-6');
expect(models('openai', 'codex').find((m) => m.id === 'gpt-6')).toMatchObject({
contextWindow: 272_000,
contextWindowMax: 1_050_000,
@@ -1199,7 +1277,7 @@ describe('订阅模型顺序以账号为准', () => {
...(sortOrder !== undefined ? { sortOrder } : {}),
});
- it('Registry 缺条目或缺 sortOrder 的账号模型仍按账号位置排,仅目录有的接在后面', () => {
+ it('Registry 缺条目或缺 sortOrder 的账号模型仍按账号位置排,仅目录有的不补入', () => {
setActiveCatalog(
baseCatalog([
gpt6Entry({ sortOrder: 1 }),
@@ -1213,10 +1291,10 @@ describe('订阅模型顺序以账号为准', () => {
);
// 账号顺序:priority 小的在前;gpt-new 在 Registry 里没有条目。
setDiscoveredCodexModels([discovered('gpt-6', 2), discovered('gpt-new', 1)]);
+ // gpt-catalog-only 只在 Registry 里:账号没返回就不出现。
expect(models('openai', 'codex').map((model) => [model.id, model.sortOrder])).toEqual([
['gpt-new', 0],
['gpt-6', 1],
- ['gpt-catalog-only', 2],
]);
// Claude Code bridge 与 Codex root 同序。
expect(models('openai', 'claude-code').map((model) => model.id)).toEqual([
@@ -1225,7 +1303,7 @@ describe('订阅模型顺序以账号为准', () => {
]);
});
- it('账号清单为空时用 Registry sortOrder 兜底', () => {
+ it('账号清单为空时 Registry 不兜底补任何型号', () => {
setActiveCatalog(
baseCatalog([
gpt6Entry({ sortOrder: 5 }),
@@ -1238,7 +1316,8 @@ describe('订阅模型顺序以账号为准', () => {
]),
);
setDiscoveredCodexModels([]);
- expect(models('openai', 'codex').map((model) => model.id)).toEqual(['gpt-first', 'gpt-6']);
+ expect(models('openai', 'codex')).toEqual([]);
+ expect(models('openai', 'claude-code')).toEqual([]);
});
it('Anthropic 按账号返回顺序排,不被 Registry sortOrder 改写', () => {
diff --git a/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts b/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts
index 821e72dd77..bcde7806fd 100644
--- a/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts
@@ -26,6 +26,9 @@ const h = vi.hoisted(() => ({
loadXaiDiskCache: vi.fn(async () => false),
refreshXaiMediaModels: vi.fn(async () => true),
loadAnthropicDiskCache: vi.fn(async () => {}),
+ requestAnthropicModelProbe: vi.fn(),
+ hasAnthropicModels: true,
+ refreshAnthropicModelsFromProbe: vi.fn(async () => true),
codexLoginWithSideEffects: vi.fn(async () => false),
codexLoginReadOnly: vi.fn(() => false),
readClaudeStatus: vi.fn(),
@@ -81,6 +84,9 @@ vi.mock('../grok-oauth-login.js', () => ({
vi.mock('../model-discovery/anthropic.js', () => ({
loadAnthropicModelsFromDiskCache: h.loadAnthropicDiskCache,
+ requestAnthropicModelProbe: h.requestAnthropicModelProbe,
+ hasAnthropicDiscoveredModels: () => h.hasAnthropicModels,
+ refreshAnthropicModelsFromProbe: h.refreshAnthropicModelsFromProbe,
}));
vi.mock('../model-discovery/xai.js', () => ({
clearXaiDiscoveredModels: vi.fn(),
@@ -177,6 +183,9 @@ beforeEach(() => {
h.loadXaiDiskCache.mockClear();
h.refreshXaiMediaModels.mockClear();
h.loadAnthropicDiskCache.mockClear();
+ h.requestAnthropicModelProbe.mockClear();
+ h.hasAnthropicModels = true;
+ h.refreshAnthropicModelsFromProbe.mockClear();
h.codexLoginWithSideEffects.mockClear();
h.codexLoginReadOnly.mockClear();
h.readClaudeStatus.mockClear();
@@ -245,10 +254,13 @@ describe('native provider connection claim on read', () => {
expect(getNativeProviderAuthSource('anthropic')).toBe('native-harness-inherited');
// 启动期那次磁盘清单加载因未绑定而早退了,绑定刚建立时必须补一次(PR #548 review)。
await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));
+ // 成员只来自 SDK 清单:补载缓存后还要主动读一次最新清单(新账号可能没有缓存)。
+ await vi.waitFor(() => expect(h.requestAnthropicModelProbe).toHaveBeenCalledTimes(1));
// 已绑定后不再重复认领,也不再重复加载。
await connectedMap();
expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1);
+ expect(h.requestAnthropicModelProbe).toHaveBeenCalledTimes(1);
});
it('首次认领要等磁盘清单补载完成后再返回本次 provider 快照', async () => {
@@ -294,6 +306,49 @@ describe('native provider connection claim on read', () => {
).toEqual([cachedModel]);
});
+ it('首次认领且没有缓存时,waitForDiscovery 要等主动读取清单完成再返回', async () => {
+ h.hasAnthropicModels = false;
+ const anthropic = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'anthropic')!;
+ const modelSeed = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'xd')!.models[
+ 'claude-code'
+ ]![0]!;
+ const probedModel = { ...modelSeed, id: 'claude-probed', name: 'Claude Probed' };
+ let releaseProbe!: () => void;
+ h.refreshAnthropicModelsFromProbe.mockImplementationOnce(
+ () =>
+ new Promise<boolean>((resolve) => {
+ releaseProbe = () => {
+ h.catalog = {
+ ...BUNDLED_CATALOG,
+ providers: BUNDLED_CATALOG.providers.map((provider) =>
+ provider.id === anthropic.id
+ ? { ...provider, models: { ...provider.models, 'claude-code': [probedModel] } }
+ : provider,
+ ),
+ };
+ resolve(true);
+ };
+ }),
+ );
+
+ let settled = false;
+ const providersPromise = listProviders(true, true).then((providers) => {
+ settled = true;
+ return providers;
+ });
+
+ await vi.waitFor(() => expect(h.refreshAnthropicModelsFromProbe).toHaveBeenCalledTimes(1));
+ const settledBeforeProbe = settled;
+ releaseProbe();
+
+ const providers = await providersPromise;
+ expect(settledBeforeProbe).toBe(false);
+ expect(h.requestAnthropicModelProbe).not.toHaveBeenCalled();
+ expect(
+ providers.find((provider) => provider.id === 'anthropic')?.models['claude-code'],
+ ).toEqual([probedModel]);
+ });
+
it('普通可信 provider read 不等待首次磁盘清单补载,先返回 connected', async () => {
let releaseCache!: () => void;
h.loadAnthropicDiskCache.mockImplementationOnce(
diff --git a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts
index d46cd573b7..d660d7bfdc 100644
--- a/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/openAiAccountCatalogParity.test.ts
@@ -1,7 +1,8 @@
import { afterEach, describe, expect, it } from 'vitest';
import { BUNDLED_CATALOG, buildUserProvider, type CatalogModel } from '@cindy/model-providers';
import {
- getActiveCatalog, setActiveCatalog, setCustomProviders, setDiscoveredCodexModels,
+ clearDiscoveredProviderModels, getActiveCatalog, setActiveCatalog, setCustomProviders,
+ setDiscoveredCodexModels, setDiscoveredProviderModels,
setLocalCatalogOverrides, setCustomProviderConfigs, setDiscoveredProviderMediaModels,
setOpenAiImagesApiKeyConfigured,
} from '../active-catalog.js';
@@ -16,6 +17,20 @@ function account() {
} },
}, { modelRegistry: BUNDLED_CATALOG.modelRegistry });
}
+/**
+ * OpenAI 订阅成员只来自账号清单(Registry 不补型号)。这里的清单只报成员、
+ * discoveredMetadata 为空,资料由 Registry 决定。
+ */
+function accountListModels(ids: readonly string[]): CatalogModel[] {
+ return ids.map((id): CatalogModel => ({
+ id, name: id, group: 'gpt', contextWindow: 272000, efforts: [], defaultEffort: null,
+ discoveredMetadata: {},
+ }));
+}
+/** 内置 openai 连接的本机 Codex 账号清单。 */
+function seedBuiltinAccount(...ids: string[]): void {
+ setDiscoveredCodexModels(accountListModels(ids));
+}
function entry(providerId: string, agent: 'codex' | 'claude-code' | 'pi', id: string) {
return getActiveCatalog().providers.find(p => p.id === providerId)!.models[agent]!.find(m => m.id === id)!;
}
@@ -24,6 +39,7 @@ afterEach(() => {
setOpenAiImagesApiKeyConfigured(false);
setCustomProviders([]);
setDiscoveredCodexModels([]);
+ clearDiscoveredProviderModels();
setDiscoveredProviderMediaModels('openai', null);
setDiscoveredProviderMediaModels(accountId, null);
setLocalCatalogOverrides(EMPTY_MODEL_CATALOG_OVERRIDES);
@@ -153,7 +169,10 @@ describe('OpenAI account catalog identity', () => {
provider.models.pi = slugs.map(slug => ({ id: `chatgpt/${slug}`, name: slug,
contextWindow: 400000, efforts: [], defaultEffort: null, piApi: 'openai-responses' }));
setActiveCatalog(catalog, { authorityCatalog: catalog });
+ // 两个连接的账号发现都返回 Pro/Cyber(Registry 不再替账号补型号)。
+ seedBuiltinAccount(...slugs);
setCustomProviders([account()]);
+ setDiscoveredProviderModels(accountId, 'codex', accountListModels(slugs));
for (const providerId of ['openai', accountId]) {
for (const agent of ['codex', 'claude-code', 'pi'] as const) {
for (const slug of slugs) {
@@ -199,7 +218,7 @@ describe('OpenAI account catalog identity', () => {
expect(entry('api-independent', 'codex', 'gpt-local-fixture')).toBeUndefined();
expect(getActiveCatalog().providers.some(p => p.id === 'not-added-yet')).toBe(false);
});
- it('projects public Codex/Claude membership and explicit server Pi entries to every account', () => {
+ it('projects the same account Codex/Claude membership and explicit server Pi entries to every account', () => {
const catalog = structuredClone(BUNDLED_CATALOG);
const remotePi: CatalogModel = {
id: 'chatgpt/gpt-parity-fixture', name: 'Server Pi fixture', group: 'gpt',
@@ -207,7 +226,10 @@ describe('OpenAI account catalog identity', () => {
};
catalog.providers.find(p => p.id === 'openai')!.models.pi = [remotePi];
setActiveCatalog(catalog, { authorityCatalog: catalog });
+ // 两个连接的账号返回同一清单(同一份发现证据)时,三个 Harness 的投影逐项一致。
+ seedBuiltinAccount('gpt-5.6-luna');
setCustomProviders([account()]);
+ setDiscoveredProviderModels(accountId, 'codex', accountListModels(['gpt-5.6-luna']));
const providers = getActiveCatalog().providers;
const original = providers.find(p => p.id === 'openai')!;
const second = providers.find(p => p.id === accountId)!;
@@ -216,6 +238,7 @@ describe('OpenAI account catalog identity', () => {
expect([...ids].sort()).toEqual(original.models[agent]!.map(m => m.id).sort());
expect(new Set(ids).size).toBe(ids.length);
}
+ expect(second.models.codex!.map(m => m.id)).toEqual(['gpt-5.6-luna']);
expect(entry(accountId, 'pi', remotePi.id)).toMatchObject(remotePi);
expect(second.id).not.toBe(original.id);
expect(second.auth).toEqual({ method: 'oauth', native: 'codex' });
@@ -223,6 +246,7 @@ describe('OpenAI account catalog identity', () => {
it('keeps connection-specific local metadata patches separate through catalog refresh', () => {
setActiveCatalog(BUNDLED_CATALOG);
+ seedBuiltinAccount('gpt-5.6-luna');
setCustomProviders([account()]);
setLocalCatalogOverrides(sanitizeModelCatalogOverrides({ patches: {
'openai:gpt-5.6-luna': { base: { contextWindow: 111111 } },
@@ -243,6 +267,7 @@ describe('OpenAI account catalog identity', () => {
const configured = account();
const model = configured.models.codex![0]!;
model.userModelConfig = { ...model.userModelConfig!, contextWindow };
+ seedBuiltinAccount('gpt-5.6-luna');
setCustomProviders([configured]);
expect(entry(accountId, 'codex', 'gpt-5.6-luna').contextWindow).toBe(contextWindow);
expect(entry(accountId, 'claude-code', 'chatgpt/gpt-5.6-luna').contextWindow).toBe(contextWindow);
@@ -265,6 +290,8 @@ it('applies server Pi replacement, removal and missing-field fallback equally to
}
openai.models.pi = [];
setActiveCatalog(structuredClone(catalog), { authorityCatalog: structuredClone(catalog) });
+ // 内置连接的 Codex 成员只来自账号清单;账号发现也不能复活显式清空的 Pi。
+ seedBuiltinAccount('gpt-5.6-luna');
for (const providerId of ['openai', accountId]) {
expect(getActiveCatalog().providers.find(p => p.id === providerId)!.models.pi).toEqual([]);
expect(getActiveCatalog().providers.find(p => p.id === providerId)!.models.codex?.length).toBeGreaterThan(0);
@@ -283,6 +310,7 @@ it('legacy Pi defaults cannot override Registry definitions or per-account user
openai.models.pi = [{ id: 'chatgpt/gpt-5.6-luna', name: 'Remote Luna', contextWindow: 123456,
efforts: ['low'], defaultEffort: 'low', piApi: 'openai-responses' }];
setActiveCatalog(catalog, { authorityCatalog: catalog });
+ seedBuiltinAccount('gpt-5.6-luna');
setCustomProviders([account()]);
setLocalCatalogOverrides(sanitizeModelCatalogOverrides({ patches: {
[`${accountId}:chatgpt/gpt-5.6-luna`]: { perAgent: { pi: { contextWindow: 234567 } } },
diff --git a/apps/desktop/src/main/maker-host/__tests__/serverCatalogNativeCompatibility.test.ts b/apps/desktop/src/main/maker-host/__tests__/serverCatalogNativeCompatibility.test.ts
index 7a94c46c36..2ad3df84d3 100644
--- a/apps/desktop/src/main/maker-host/__tests__/serverCatalogNativeCompatibility.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/serverCatalogNativeCompatibility.test.ts
@@ -6,7 +6,12 @@ import {
parseCatalog,
type Catalog,
} from '@cindy/model-providers';
-import { getActiveCatalog, setActiveCatalog, setXdGatewayModels } from '../active-catalog.js';
+import {
+ getActiveCatalog,
+ setActiveCatalog,
+ setDiscoveredCodexModels,
+ setXdGatewayModels,
+} from '../active-catalog.js';
import { deriveAvailableModels } from '../catalog-to-descriptors.js';
// Contract fixture extracted from cindy-server#581 providers.json at df0c1bd5b07e.
@@ -59,7 +64,15 @@ function accept(incoming: Catalog) {
setActiveCatalog(mergeWithBundled(incoming), { authorityCatalog: incoming });
}
+/** OpenAI 订阅成员只来自账号清单;Server Registry 只为账号返回的型号补资料。 */
+function seedCodexAccount(...ids: string[]): void {
+ setDiscoveredCodexModels(
+ ids.map((id) => ({ id, name: id, contextWindow: 272000, efforts: [], defaultEffort: null })),
+ );
+}
+
afterEach(() => {
+ setDiscoveredCodexModels([]);
setXdGatewayModels([]);
setActiveCatalog(BUNDLED_CATALOG);
});
@@ -67,6 +80,7 @@ afterEach(() => {
describe('Server catalog updates with independent Cindy native protocols', () => {
it('preserves each harness effort contract and local native metadata through an older schema', () => {
accept(serverCatalog());
+ seedCodexAccount('gpt-6-astra');
const active = getActiveCatalog();
const openai = active.providers.find((provider) => provider.id === 'openai')!;
for (const agent of ['claude-code', 'codex', 'pi'] as const) {
@@ -96,6 +110,7 @@ describe('Server catalog updates with independent Cindy native protocols', () =>
const incoming = serverCatalog();
incoming.modelRegistry!.models[0].contextWindow = 300000;
accept(incoming);
+ seedCodexAccount('gpt-6-astra');
const openai = getActiveCatalog().providers.find((provider) => provider.id === 'openai')!;
expect(openai.models.codex!.find((model) => model.id === 'gpt-6-astra')?.contextWindowMax).toBe(
300000,
diff --git a/apps/desktop/src/main/maker-host/active-catalog.ts b/apps/desktop/src/main/maker-host/active-catalog.ts
index bafc2b1c19..78244e3b27 100644
--- a/apps/desktop/src/main/maker-host/active-catalog.ts
+++ b/apps/desktop/src/main/maker-host/active-catalog.ts
@@ -255,11 +255,9 @@ let xdCodexAnthropicBridgeModelIds = new Set<string>();
/**
* Anthropic(Claude.ai 订阅)的**发现清单**:由 host 的 anthropic 发现流程注入
- * (登录时 HTTP `/v1/models` + 会话 init 时 SDK supportedModels 捕获,见
- * maker-host/model-discovery/anthropic.ts)。2026-08-02 起 discovery 是「已验证
- * 可用性」证据层,不再独占存在性:registry 显式实体化条目(policy 门禁见
- * model-plane/modelPlanePolicy.ts)即使未被发现也进目录——presence 与
- * entitlement 分离,选不选得中由连接态与运行期共同决定。
+ * (会话 init 与主动探测的 SDK supportedModels,见 maker-host/model-discovery/anthropic.ts)。
+ * 它是 anthropic root 成员的唯一来源:registry 只给其中的型号补资料、标 retired,
+ * 不补入 SDK 没返回的型号(2026-09-27 起)。
*/
let anthropicModels: CatalogModel[] = [];
@@ -772,6 +770,14 @@ export interface CindyModelEffortBaseline {
defaultEffort: Effort | null;
}
+/**
+ * 返回目录为该 Anthropic 订阅型号登记的名称(按精确 route modelId 命中);未登记返回 null。
+ * 只供动态发现把 SDK 的系列简称解析为具体型号、并为其取显示名;不授予存在性。
+ */
+export function getCindyAnthropicModelName(modelId: string): string | null {
+ return buildEffectiveRegistryMetaIndex().get(modelId)?.name ?? null;
+}
+
/** 返回当前目录的已知上下文窗口;只供动态发现缺少上游明确值时兜底。 */
export function getCindyModelContextWindow(modelId: string): number | null {
return buildEffectiveRegistryMetaIndex().get(modelId)?.contextWindow ?? null;
@@ -863,12 +869,13 @@ function assembleRoot(
agent: RootAgentKind,
models: readonly CatalogModel[],
plan: ModelPlaneRegistryPlan,
+ materializeRegistry: boolean,
preserveDeclarationOrder = false,
connectionId = providerId,
accountModels: readonly CatalogModel[] = [],
): CatalogModel[] {
const rootPlan = plan.roots.get(rootPlanKey(providerId, agent));
- let out = applyRootRegistryPlan(models, rootPlan);
+ let out = applyRootRegistryPlan(models, rootPlan, materializeRegistry);
// The subscription Registry historically stores a working default in
// contextWindow. Codex's separate native maximum must survive that overlay.
// Apply before user overrides so full local additions still win as a unit.
@@ -1290,8 +1297,8 @@ function computeMerged(): Catalog {
// 每个 allowlist 供应商:registry presence 实体化/overlay + retired 标记 → 本地
// override(local 永远最高)→ wire bridge 从最终 root 统一重算;Pi 不参与。
// 优先级:local addition/patch > registry 显式字段 > discovery 显式值 > 静态兜底。
- // 注:anthropic 的 discovery 快照非空时整表以它为基线(登录态权威);registry
- // 实体化条目在未登录时也保持 presence——能否选中由连接态门控,presence ≠ entitlement。
+ // 成员只来自供应商返回的清单:registry 只给已返回的型号补资料、标 retired,不补
+ // 账号没返回的型号(2026-09-27 起;xAI 尚无账号快照时的静态兼容路径除外)。
providers = providers.map((p) => {
if (isOpenAiSubscriptionProvider(p)) {
// 独立 ChatGPT 账号把 app-server 清单按返回顺序写进自己的配置(无 sortOrder),
@@ -1303,8 +1310,10 @@ function computeMerged(): Catalog {
: discoveredAccountCodex.length > 0 || p.auth.native !== 'codex'
? discoveredAccountCodex
: (p.models.codex ?? []);
+ // 成员只来自账号清单(本机 Codex 的 models_cache / app-server model/list,独立账号
+ // 写入自身配置);registry 不补账号没返回的型号。
const root = assembleRoot(
- 'openai', 'codex', p.models.codex ?? [], plan, false, p.id, accountCodex,
+ 'openai', 'codex', p.models.codex ?? [], plan, false, false, p.id, accountCodex,
);
const withRoot: Provider = { ...p, models: { ...p.models, codex: root } };
const remoteExcluded =
@@ -1340,8 +1349,11 @@ function computeMerged(): Catalog {
agent: 'claude-code',
models: CatalogModel[],
): CatalogModel[] => {
- const additions = (plan.consumerAdditions.get(consumerPlanKey('openai', agent)) ?? []).map(
- (model) =>
+ // 消费端变体(如 [1m])只跟随账号已返回的上游型号出现。
+ const rootIds = new Set(root.map((model) => model.id));
+ const additions = (plan.consumerAdditions.get(consumerPlanKey('openai', agent)) ?? [])
+ .filter(({ upstreamModelId }) => rootIds.has(upstreamModelId))
+ .map(({ model }) =>
toChatgptBridgeModel(
applyLocalConsumerOverrides(
p.id,
@@ -1379,12 +1391,17 @@ function computeMerged(): Catalog {
// Claude 订阅只供 Claude Code(内置 CLI 用它自己的登录),不向 Codex / Pi 投影。
const accountModels = p.id === 'anthropic' ? anthropicModels : [];
const seed = accountModels.length > 0 ? accountModels : (p.models['claude-code'] ?? []);
- const root = assembleRoot('anthropic', 'claude-code', seed, plan, false, p.id, accountModels);
+ // 成员只来自 Claude Code SDK 返回的清单;registry 不补 SDK 没返回的型号。
+ const root = assembleRoot(
+ 'anthropic', 'claude-code', seed, plan, false, false, p.id, accountModels,
+ );
return { ...p, models: { 'claude-code': root } };
}
if (providerCatalogId(p) === 'xai') {
const discovered = p.id === 'xai' ? xaiDiscoveredModels : xaiAccountModels.get(p.id) ?? null;
- const useAccountMembership = discovered !== null;
+ // 成功但为空的快照不当作成员清单(与 Anthropic 丢弃空 SDK 结果同口径):更可能是上游
+ // 格式或账号状态异常,按尚无快照走静态兼容路径,不把整个 xAI 清单清空。
+ const useAccountMembership = discovered !== null && discovered.length > 0;
const accountModels = discovered ?? [];
// The bundled-only fallback uses the packaged Claude/Codex list as its own membership seed.
// A loaded server Catalog keeps its legacy static membership for old server compatibility;
@@ -1400,8 +1417,15 @@ function computeMerged(): Catalog {
const codexSeed = authoritativeMembers
? materializeXaiAccountModels(p, 'codex', authoritativeMembers)
: (p.models.codex ?? []);
- const claudeRoot = assembleRoot('xai', 'claude-code', claudeSeed, plan, true, p.id);
- const codexRoot = assembleRoot('xai', 'codex', codexSeed, plan, true, p.id);
+ // 有账号快照时成员以它为准;只有尚无快照(未绑定账号发现)时才沿用静态声明 +
+ // registry 实体化的兼容路径。
+ const materializeXaiRegistry = !useAccountMembership;
+ const claudeRoot = assembleRoot(
+ 'xai', 'claude-code', claudeSeed, plan, materializeXaiRegistry, true, p.id,
+ );
+ const codexRoot = assembleRoot(
+ 'xai', 'codex', codexSeed, plan, materializeXaiRegistry, true, p.id,
+ );
const claudeAccountRoot = useAccountMembership
? preserveNonGrok46DiscoveryEfforts(claudeRoot, accountModels)
: claudeRoot;
diff --git a/apps/desktop/src/main/maker-host/createDesktopProviderService.ts b/apps/desktop/src/main/maker-host/createDesktopProviderService.ts
index 829484183a..4d2623da4b 100644
--- a/apps/desktop/src/main/maker-host/createDesktopProviderService.ts
+++ b/apps/desktop/src/main/maker-host/createDesktopProviderService.ts
@@ -68,7 +68,12 @@ import {
readCodexDiscoveredModels,
readCodexDiscoveredModelsForAuthRefresh,
} from './codex-model-discovery.js';
-import { loadAnthropicModelsFromDiskCache } from './model-discovery/anthropic.js';
+import {
+ hasAnthropicDiscoveredModels,
+ loadAnthropicModelsFromDiskCache,
+ refreshAnthropicModelsFromProbe,
+ requestAnthropicModelProbe,
+} from './model-discovery/anthropic.js';
import {
clearXaiDiscoveredModels,
loadXaiModelsFromDiskCache,
@@ -926,8 +931,12 @@ function refreshAnthropicCatalogAfterClaim(): Promise<void> {
const flight = (async () => {
// 启动期的磁盘清单加载可能因尚未绑定而早退,认领后补一次;失败保留已有目录,
- // 不把连接态读取整条打穿。之后由会话 init 的 SDK 捕获刷新(Cindy 不带订阅凭证拉清单)。
+ // 不把连接态读取整条打穿。成员只来自 SDK 清单:有缓存时后台刷新即可;没有缓存时
+ // 要等主动读取完成,否则 waitForDiscovery 的调用方(Orca 路由、定时任务解析)会拿到
+ // 空目录。读取失败同样不打穿连接态读取。
await loadAnthropicModelsFromDiskCache().catch(() => undefined);
+ if (hasAnthropicDiscoveredModels()) requestAnthropicModelProbe();
+ else await refreshAnthropicModelsFromProbe().catch(() => false);
})();
anthropicClaimDiscoveryInflight = flight;
const clear = () => {
@@ -1013,7 +1022,7 @@ export function getDesktopProviderService(options: { allowSideEffects?: boolean
hasClaudeNativeLoginUnbound,
() => {
// 启动期的 loadAnthropicModelsFromDiskCache 因当时未绑定而早退了:认领成功时
- // 把上次成功的清单摆出来,否则只剩 Registry presence(PR #548 review)。
+ // 把上次成功的清单摆出来并主动读一次最新清单(PR #548 review)。
return refreshAnthropicCatalogAfterClaim();
},
waitForDiscovery === true,
diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.ts
index f09e4a9f0f..3b65eb1db1 100644
--- a/apps/desktop/src/main/maker-host/index.ts
+++ b/apps/desktop/src/main/maker-host/index.ts
@@ -192,7 +192,11 @@ import {
refreshDiscoveredCodexModels,
setNativeProviderClaimListener,
} from './createDesktopProviderService.js';
-import { clearAnthropicDiscoveredModels } from './model-discovery/anthropic.js';
+import {
+ clearAnthropicDiscoveredModels,
+ requestAnthropicModelProbe,
+ setAnthropicModelProbe,
+} from './model-discovery/anthropic.js';
import {
buildDesktopClaudeRuntimeConfig,
desktopCodexRuntimeConfig,
@@ -2835,6 +2839,12 @@ export function getMaker(): Maker {
log: desktopMakerLogger,
});
void _codexModelBackfill.request();
+ // Anthropic 清单只来自 Claude Code SDK:maker 就绪后主动读一次,不等用户先跑任务
+ // (旧缓存也可能缺少 SDK 只以简称返回的当前型号)。登录 / 认领后由对应收口再次请求。
+ setAnthropicModelProbe((onSupportedModels) =>
+ makerRef.refreshAgentLocalModels('claude-code', { onSupportedModels }),
+ );
+ requestAnthropicModelProbe();
}
return _maker;
}
@@ -2961,6 +2971,8 @@ export function resetMaker(): void {
// coordinator 闭包捕获了刚作废的那个 maker —— 不清掉的话,换账号窗口期内到达的 auth
// 事件会拿旧实例去拉模型清单(串号)。下次 getMaker() 会带着干净记账重建它。
_codexModelBackfill = null;
+ // Anthropic 清单探测同样捕获了旧 maker:注销后,旧实例的在途结果也不再生效。
+ setAnthropicModelProbe(null);
_initialCustomMcpRefresh = undefined;
setVisionBridgeController(null);
_visionBridgeInstance?.dispose();
diff --git a/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts b/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts
index a57bc7d5f6..27e16f65b4 100644
--- a/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts
+++ b/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts
@@ -3,10 +3,12 @@ import { pickModelMetadata } from '@cindy/model-providers';
* model-discovery/anthropic —— Anthropic(Claude.ai 订阅)模型清单的动态发现。
* ---------------------------------------------------------------------------
* 2026-07-19 模型列表统一重构:anthropic 供应商的清单**唯一来源是动态发现**,
- * 产品目录静态段已退役(bundled 恒为空;Registry presence 仍会实体化已知型号)。
+ * 产品目录静态段已退役(bundled 恒为空);2026-09-27 起 Registry 也不再补入 SDK
+ * 没返回的型号,只给返回的型号补资料。
*
- * **SDK `supportedModels()`**(每次 claude-code 会话 init 后捕获,经
- * maker-core setClaudeSupportedModelsListener):effort 档 / fastMode 是 SDK 明说的,
+ * **SDK `supportedModels()`**(claude-code 会话 init 后捕获;maker 就绪、登录 / 认领后
+ * 与手动刷新时由 requestAnthropicModelProbe 主动读取,两者经 maker-core
+ * setClaudeSupportedModelsListener 汇入同一入口):effort 档 / fastMode 是 SDK 明说的,
* 逐字段可信。上一次成功结果持久化为磁盘缓存,启动即恢复。
*
* Claude 订阅凭证只在内置 Claude Code CLI 里(claude-native-cli),Cindy 不带它
@@ -49,6 +51,7 @@ import type { CatalogModel, Effort } from '@cindy/model-providers';
import { createLogger } from '../../logger.js';
import {
getActiveCatalog,
+ getCindyAnthropicModelName,
getCindyModelContextWindow,
getCindyModelEffortBaseline,
setAnthropicDiscoveredModels,
@@ -109,6 +112,77 @@ function normalizeModelId(raw: string): string {
return raw.replace(/\[[^\]]*\]$/, '').replace(/-20\d{6}$/, '');
}
+/** 已记录过的目录未登记 / 无法解析的 SDK 简称条目,避免每个会话 init 重复打日志。 */
+const unresolvedAliasLogged = new Set<string>();
+
+/**
+ * SDK 条目 → 目录模型 id;无法确定时返回 null(该条目不进清单)。
+ *
+ * 显式 `claude-*` id 原样归一化。SDK 对每个系列的当前型号常只报简称
+ * (`default` / `opus` / `sonnet` …),具体版本只写在 description 开头
+ * (如 "Opus 5.5 · …" / "Opus 4.7 with 1M context · …")。简称按说明里的系列与版本
+ * 拼出 `claude-<系列>-<主>-<次>`(Anthropic 的 id 规则)。目录尚未登记的新版本
+ * (如 Fable 5.2)照样按说明生成 id 并显示,资料用未知模型的默认值,绝不映射到相邻旧版本。
+ * 只有无法从说明确定版本时才放弃:简称与说明的系列不一致(opus 却写 Sonnet)、
+ * 版本号多于两段或说明缺失。
+ */
+function resolveSdkModelId(value: string, description: unknown): string | null {
+ const normalized = normalizeModelId(value);
+ if (normalized.startsWith('claude')) return normalized;
+ const alias = normalized.toLowerCase();
+ const match =
+ typeof description === 'string'
+ ? /^(?:Claude\s+)?([A-Za-z]+)\s+(\d+)(?:\.(\d+))?(?![\w.])/.exec(description.trim())
+ : null;
+ const family = match?.[1]?.toLowerCase();
+ const id =
+ match && family && (alias === 'default' || alias === family)
+ ? `claude-${family}-${match[2]}${match[3] !== undefined ? `-${match[3]}` : ''}`
+ : null;
+ const known = id !== null && getCindyAnthropicModelName(id) !== null;
+ if (known) return id;
+ const logKey = `${value}\u0000${String(description)}`;
+ if (!unresolvedAliasLogged.has(logKey)) {
+ unresolvedAliasLogged.add(logKey);
+ log.info(
+ id
+ ? 'anthropic SDK model alias resolved to a model not yet in the catalog'
+ : 'anthropic SDK model alias has no parsable version; skipped',
+ { value, candidate: id },
+ );
+ }
+ return id;
+}
+
+/** claude-fable-5-1 → { family: 'fable', version: '5.1' };不符合 `claude-<系列>-<主>[-<次>]` 时返回 null。 */
+function parseClaudeModelId(id: string): { family: string; version: string } | null {
+ const match = /^claude-([a-z]+)-(\d+)(?:-(\d{1,2}))?$/.exec(id);
+ if (!match) return null;
+ return {
+ family: match[1]!,
+ version: match[3] !== undefined ? `${match[2]}.${match[3]}` : match[2]!,
+ };
+}
+
+/**
+ * SDK displayName 能否作为该型号的名称:必须写出与 id 相同的版本号。SDK 对系列当前型号常只
+ * 给系列名("Fable")、简称条目给 "Default (recommended)" / "Opus (1M context)"——这些
+ * 不能区分同系列型号("1M" 里的数字是上下文长度,不是版本)。id 读不出版本时不采用。
+ */
+function displayNameMatchesModelId(name: string, id: string): boolean {
+ const parsed = parseClaudeModelId(id);
+ if (!parsed) return false;
+ const escaped = parsed.version.replace('.', '\\.');
+ return new RegExp(`(^|[^\\d.])${escaped}($|[^\\d.])`).test(name);
+}
+
+/** claude-fable-5-1 → "Fable 5.1";不符合 `claude-<系列>-<主>[-<次>]` 时返回 null。 */
+function labelFromClaudeModelId(id: string): string | null {
+ const parsed = parseClaudeModelId(id);
+ if (!parsed) return null;
+ return `${parsed.family[0]!.toUpperCase()}${parsed.family.slice(1)} ${parsed.version}`;
+}
+
/**
* contextWindow 规则:缓存恢复的精确值 > 目录已知值 > 未知模型启发式(默认 1M,Haiku 200k)。
*
@@ -175,8 +249,11 @@ function fallbackEffortBaseline(id: string): { efforts: Effort[]; defaultEffort:
}
/**
- * SDK `supportedModels()` 条目 → 映射结果。纯函数。
- * 只收 `claude` 开头的显式版本 id(规则 10:禁止 opus/sonnet 裸别名进目录)。
+ * SDK `supportedModels()` 条目 → 映射结果。只读目录,无副作用(除一次性日志)。
+ * 目录只收显式版本 id(规则 10:禁止 opus/sonnet 裸别名进目录):SDK 简称条目经
+ * resolveSdkModelId 按说明里的版本解析为具体 id,确定不了版本才跳过。这份清单是 Anthropic
+ * 成员的唯一来源,目录不再补入 SDK 没返回的型号。
+ * 名称:SDK 的 displayName 写出与 id 相同的版本号才采用;否则用目录名称,目录未登记则按 id 推导。
* ModelInfo 的能力字段全部 optional:字段在场时 SDK 是能力权威(supportsEffort=false =
* 不可调);**字段缺席 = 该字段未知**,按 modelRegistry 基线 / 确定性默认合成,
* 合并时保留该字段已精化的旧值——不能把「CLI 没填」解读成「不支持」而抹掉档位。
@@ -196,9 +273,13 @@ export function mapAnthropicSdkModels(raw: unknown): SdkMappedModel[] {
supportsFastMode?: unknown;
};
if (typeof e.value !== 'string' || e.value.length === 0) continue;
- const id = normalizeModelId(e.value);
- if (!id.startsWith('claude') || seen.has(id)) continue;
+ const id = resolveSdkModelId(e.value, e.description);
+ if (!id || seen.has(id)) continue;
seen.add(id);
+ const reportedName =
+ typeof e.displayName === 'string' && displayNameMatchesModelId(e.displayName, id)
+ ? e.displayName
+ : undefined;
const hasEffortInfo = e.supportsEffort !== undefined || e.supportedEffortLevels !== undefined;
const hasFastModeInfo = e.supportsFastMode !== undefined;
const fallback = fallbackEffortBaseline(id);
@@ -228,13 +309,13 @@ export function mapAnthropicSdkModels(raw: unknown): SdkMappedModel[] {
model: {
id,
discoveredMetadata: pickModelMetadata({
- name: e.displayName,
+ name: reportedName,
description: e.description,
efforts:
e.supportsEffort === false ? [] : (toEfforts(e.supportedEffortLevels) ?? undefined),
supportsFastMode: e.supportsFastMode,
}),
- name: typeof e.displayName === 'string' && e.displayName.length > 0 ? e.displayName : id,
+ name: reportedName ?? getCindyAnthropicModelName(id) ?? labelFromClaudeModelId(id) ?? id,
group: 'anthropic',
sortOrder: out.length,
...(typeof e.description === 'string' && e.description.length > 0
@@ -465,10 +546,23 @@ export async function loadAnthropicModelsFromDiskCache(): Promise<void> {
// 里(命中目录的窗口不进那张表)时,会得到一个「已核实」的猜测值 —— 例如 Haiku 残留
// 200K 而运行期真实 1M,反倒把上报值压小。这也是上面那条刷新不变量的要求。
const { contextWindowVerified: _staleProvenance, ...rest } = model;
+ // 旧版缓存会把 SDK 的系列名("Fable")当型号名落盘;按当前口径丢弃不含版本号的名称。
+ const cachedName = model.discoveredMetadata?.name;
+ const staleName =
+ cachedName !== undefined && !displayNameMatchesModelId(cachedName, model.id);
+ const { name: _staleName, ...cachedMetadata } = model.discoveredMetadata ?? {};
return {
...rest,
+ ...(staleName || !displayNameMatchesModelId(model.name, model.id)
+ ? {
+ name:
+ getCindyAnthropicModelName(model.id) ??
+ labelFromClaudeModelId(model.id) ??
+ model.id,
+ }
+ : {}),
discoveredMetadata:
- model.discoveredMetadata ??
+ (model.discoveredMetadata && (staleName ? cachedMetadata : model.discoveredMetadata)) ??
pickModelMetadata({
contextWindow: explicitWindows.get(model.id),
efforts: restoredExplicitEffortIds.has(model.id) ? model.efforts : undefined,
@@ -499,9 +593,11 @@ export async function loadAnthropicModelsFromDiskCache(): Promise<void> {
* 未登录 Claude.ai 时不得注入(否则登出被击穿 / 纯网关用户长出 anthropic 清单)。
* 按 id 合并:条目带能力信息则覆盖,否则保留已精化条目;缓存恢复的精确窗口不回退。
*/
-export function noteAnthropicSdkSupportedModels(raw: unknown): void {
- if (!hasClaudeNativeLogin()) return;
- const generation = authGeneration;
+export function noteAnthropicSdkSupportedModels(
+ raw: unknown,
+ generation: number = authGeneration,
+): void {
+ if (!hasClaudeNativeLogin() || generation !== authGeneration) return;
const mapped = mapAnthropicSdkModels(raw);
if (mapped.length === 0) return;
const mappedWithWindows = mapped.map(({ model, hasEffortInfo, hasFastModeInfo }) => {
@@ -594,6 +690,96 @@ export function noteAnthropicSdkSupportedModels(raw: unknown): void {
);
}
+/**
+ * 主动清单探测(生产 = maker.refreshAgentLocalModels('claude-code', { onSupportedModels })),
+ * maker 就绪后注入。结果只交给传入的回调,不经全局捕获监听器。
+ */
+type AnthropicModelProbe = (onModels: (models: unknown[]) => void) => Promise<boolean>;
+let modelProbe: AnthropicModelProbe | null = null;
+/** 同一授权世代内的在途探测;换代后不复用旧世代的探测。 */
+let probeInflight: { generation: number; promise: Promise<boolean> } | null = null;
+
+/** 注入 / 注销探测(maker 重建或重置时);换掉后旧探测的在途结果不再生效、也不再被复用。 */
+export function setAnthropicModelProbe(probe: AnthropicModelProbe | null): void {
+ modelProbe = probe;
+ probeInflight = null;
+}
+
+/**
+ * 主动读取一次清单并生效(启动、登录 / 认领后、手动刷新):清单只来自 SDK,没有这一步时
+ * 新登录或没有缓存的用户要等跑过一次 Claude Code 任务才看得到模型。
+ * 结果按**发起时**的授权世代走 noteAnthropicSdkSupportedModels:探测期间登出 / 换号
+ * (clearAnthropicDiscoveredModels 让世代自增)或 maker 被重置(探测被注销 / 替换)时,
+ * 迟到结果不写入清单与缓存。
+ * 返回本次是否拿到了属于当前世代的清单;未登录或 maker 未就绪时返回 false。
+ */
+export function refreshAnthropicModelsFromProbe(): Promise<boolean> {
+ const probe = modelProbe;
+ if (!probe || !hasClaudeNativeLogin()) return Promise.resolve(false);
+ const generation = authGeneration;
+ if (probeInflight?.generation === generation) return probeInflight.promise;
+ const isCurrent = () => modelProbe === probe && generation === authGeneration;
+ const promise = probe((models) => {
+ if (isCurrent()) noteAnthropicSdkSupportedModels(models, generation);
+ })
+ .then((delivered) => delivered && isCurrent())
+ .finally(() => {
+ if (probeInflight?.promise === promise) probeInflight = null;
+ });
+ probeInflight = { generation, promise };
+ return promise;
+}
+
+/** 当前是否已有可用的 Anthropic 清单(磁盘缓存恢复或 SDK 捕获)。 */
+export function hasAnthropicDiscoveredModels(): boolean {
+ return lastApplied.length > 0;
+}
+
+/** 最近一次看到的已登录 Claude 账号(CLI 报告的 email),用于识别不经登出的直接换号。 */
+let lastClaudeLoginEmail: string | undefined;
+
+/**
+ * 按 CLI 登录态变化同步 Anthropic 清单(bootstrap 的登录态监听调用)。
+ * - 登出:清空清单与缓存(世代自增,作废在途探测);
+ * - 已登录但账号变了(终端里 A → B,中间没有登出):按换号处理,先清空旧账号的清单、
+ * 缓存与在途探测,再为新账号读取;
+ * - 其它登录变化:请求一次主动读取(未绑定 Cindy 使用许可时内部跳过)。
+ */
+export function syncAnthropicModelsWithClaudeLogin(status: {
+ loggedIn: boolean;
+ email?: string;
+}): void {
+ if (!status.loggedIn) {
+ lastClaudeLoginEmail = undefined;
+ void clearAnthropicDiscoveredModels().catch(() => undefined);
+ return;
+ }
+ const switched =
+ lastClaudeLoginEmail !== undefined &&
+ status.email !== undefined &&
+ status.email !== lastClaudeLoginEmail;
+ if (status.email !== undefined) lastClaudeLoginEmail = status.email;
+ if (!switched) {
+ requestAnthropicModelProbe();
+ return;
+ }
+ void clearAnthropicDiscoveredModels()
+ .catch(() => undefined)
+ .then(() => requestAnthropicModelProbe());
+}
+
+/** 后台请求一次主动探测;失败只记日志。 */
+export function requestAnthropicModelProbe(): void {
+ void refreshAnthropicModelsFromProbe().then(
+ (applied) => {
+ if (!applied) log.info('anthropic model probe returned no current model list');
+ },
+ (err: unknown) => {
+ log.warn('anthropic model probe failed', { error: String(err) });
+ },
+ );
+}
+
/**
* 授权边界收口(登出 / 直接换号共用):清空清单 + 删磁盘缓存 + 作废在途发现。
* 删除与持久化走同一队列,所以函数 resolve 后旧世代缓存不可能重新出现。
@@ -618,6 +804,8 @@ export function waitForAnthropicDiscoveryIdleForTest(): Promise<void> {
/** 仅测试:重置模块态。 */
export function resetAnthropicDiscoveryForTest(): void {
lastApplied = [];
+ probeInflight = null;
+ lastClaudeLoginEmail = undefined;
explicitWindows.clear();
explicitEffortModelIds.clear();
explicitFastModeModelIds.clear();
diff --git a/apps/desktop/src/main/maker-host/model-plane/modelPlanePolicy.ts b/apps/desktop/src/main/maker-host/model-plane/modelPlanePolicy.ts
index 734d2790d6..7d5d807c6e 100644
--- a/apps/desktop/src/main/maker-host/model-plane/modelPlanePolicy.ts
+++ b/apps/desktop/src/main/maker-host/model-plane/modelPlanePolicy.ts
@@ -12,6 +12,10 @@ import { expandedRegistryEntries, providerMediaField } from '@cindy/model-provid
* - transforms:投影期的 ID/能力变换(chatgpt/ 前缀、effort 封顶、fast=false),
* 硬约束最后收口。共享变换与拓扑都集中在本模块,目录装配和续跑描述符不得各写一套。
*
+ * 2026-09-27 起 root 的**成员只来自供应商返回的清单**:registry 对已返回的型号提供资料
+ * overlay 与 retired 标记,不再补入账号没返回的型号(见 applyRootRegistryPlan 的
+ * materialize)。唯一例外是 xAI 尚无账号快照、只能靠静态声明的兼容路径。
+ *
* Pi 不在 wire enum(protocol MODEL_ACCESS_AGENTS 只有 claude-code/codex),也不从这两个
* harness 复制。本模块仅承担旧 Registry 根/桥接投影。Pi 消费 Server 的显式 models.pi,缺字段才
* 使用随包兜底;三个 Harness 的元数据仍经共同合并层处理。
@@ -124,6 +128,12 @@ export function toChatgptBridgeModel(model: CatalogModel): CatalogModel {
return { ...model, id: `${CHATGPT_MODEL_PREFIX}${model.id}` };
}
+/** 同一上游型号的消费端变体;upstreamModelId 是它在 canonical root 中的官方 id。 */
+export interface ConsumerAddition {
+ model: CatalogModel;
+ upstreamModelId: string;
+}
+
/** 单 root 的 registry 消费计划:先算好,合并期零决策。 */
export interface RootRegistryPlan {
/** 已存在条目(按 model id)的 registry 显式字段 overlay(registry > discovery)。 */
@@ -155,8 +165,9 @@ export interface ModelPlaneRegistryPlan {
* 这类条目用不同 canonical entry id 表达独立选择,但 route.modelId 仍保持厂商官方
* model id。旧客户端会因没有 canonical root 而安全忽略;理解该语义的新客户端只在
* route 明确授权的 bridge 中物化,不污染 canonical root(尤其不改 Codex)。
+ * 变体只在其上游 modelId 已由账号返回(存在于 canonical root)时物化。
*/
- consumerAdditions: Map<string, CatalogModel[]>;
+ consumerAdditions: Map<string, ConsumerAddition[]>;
warnings: ModelPlaneWarning[];
}
@@ -321,7 +332,7 @@ export function planRegistryRoots(registry: ModelRegistry | undefined): ModelPla
}
const key = consumerPlanKey(route.providerId, 'claude-code');
const additions = plan.consumerAdditions.get(key) ?? [];
- additions.push(materialized);
+ additions.push({ model: materialized, upstreamModelId: route.modelId });
plan.consumerAdditions.set(key, additions);
continue;
}
@@ -547,13 +558,17 @@ function toMaterializedModel(
}
/**
- * 把 root 计划应用到清单:overlay 已存在条目(registry > discovery),追加实体化
- * 新条目,并给 discovery 回补的 retired 同名条目打 'retired' 标记(local addition
- * 的复活豁免由 localCatalogOverrides 在其后处理)。返回新数组,输入不变。
+ * 把 root 计划应用到清单:overlay 已存在条目(registry > discovery),并给 discovery
+ * 回补的 retired 同名条目打 'retired' 标记(local addition 的复活豁免由
+ * localCatalogOverrides 在其后处理)。返回新数组,输入不变。
+ *
+ * `materialize` 决定是否追加账号没返回的 registry 实体。供应商清单是成员的唯一来源:
+ * OpenAI / Anthropic 订阅恒为 false;xAI 只在尚无账号快照、只能靠静态声明时为 true。
*/
export function applyRootRegistryPlan(
models: readonly CatalogModel[],
rootPlan: RootRegistryPlan | undefined,
+ materialize: boolean,
): CatalogModel[] {
if (!rootPlan) return [...models];
const existingIds = new Set(models.map((m) => m.id));
@@ -562,6 +577,7 @@ export function applyRootRegistryPlan(
const overlaid = overlay ? applyExistingRegistryOverlay(m, overlay) : m;
return rootPlan.retired.has(m.id) ? { ...overlaid, status: 'retired' as const } : overlaid;
});
+ if (!materialize) return out;
for (const addition of rootPlan.additions) {
if (existingIds.has(addition.id)) continue; // 已有条目走 overlay,不重复追加。
out.push(addition);
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 6469ec43f8..f3a293f77f 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -885,6 +885,7 @@ import {
readModelContextLimit,
writeModelContextLimitsWithRefresh,
} from '../maker-host/model-context-limit-store.js';
+import { refreshAnthropicModelsFromProbe } from '../maker-host/model-discovery/anthropic.js';
import { refreshOpenAiMediaModels } from '../maker-host/model-discovery/openai-media.js';
import { refreshXaiMediaModels } from '../maker-host/model-discovery/xai-media.js';
import { testProviderConnection } from '../maker-host/provider-diagnostics.js';
@@ -5652,9 +5653,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
refreshProvider: (providerId) =>
refreshBuiltinProviderModels(providerId, {
refreshXd: options.refreshXdGatewayModels,
- // Claude 订阅清单只由 Claude Code 会话 init 的 SDK 捕获刷新(Cindy 不带订阅凭证
- // 请求 Anthropic),这里没有可主动拉取的通道。
- refreshAnthropic: async () => true,
+ // Claude 订阅清单来自 Claude Code SDK:用本机 CLI 的登录读一次 supportedModels
+ // (Cindy 不带订阅凭证请求 Anthropic,也不发送消息)。
+ refreshAnthropic: refreshAnthropicModelsFromProbe,
refreshOpenAi: () =>
maker.refreshAgentLocalModels('codex', { credentialMode: 'oauth-bearer' }),
refreshOpenAiMedia: refreshOpenAiMediaModels,
diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.md
index 7715adc841..de8ea16a36 100644
--- a/docs/dev-rules/model-catalog-maintenance.md
+++ b/docs/dev-rules/model-catalog-maintenance.md
@@ -73,14 +73,23 @@ Pi 走 `providers[].models.pi`(用户补丁 perAgent.pi 另属合法 schema)
详细字段及成员空值规则以 [模型资料优先级](../product-rules/model-metadata-precedence.md) 为唯一正本。
<a id="ordering"></a>
-## 模型排序:账号优先,目录兜底
+## 模型排序与成员:以账号为准
-OpenAI(Codex 订阅)与 Anthropic(Claude 订阅)的 root 有账号模型清单时,`sortOrder` 以账号
+OpenAI(Codex 订阅)与 Anthropic(Claude 订阅)的 root **成员只来自账号清单**:Registry 只给
+已返回的型号补资料、标退役,不补入账号没返回的型号;没有账号清单时名单为空。`sortOrder` 以账号
返回顺序为准:Codex 取 `models_cache.json` 的 `priority` 或 app-server `model/list` 的返回位置,
-Claude 取 SDK `supportedModels()` 的返回位置。只在 Registry 里有、账号没返回的模型按 Registry
-`sortOrder` 接在其后。装配时重写为连续 `sortOrder`,选择器、设置页、新对话默认与 Claude Code
+Claude 取 SDK `supportedModels()` 的返回位置。用户本地 addition 按 Registry / 本地 `sortOrder`
+接在其后。装配时重写为连续 `sortOrder`,选择器、设置页、新对话默认与 Claude Code
bridge 共用这一顺序;OpenAI 订阅的 Pi 清单成员与能力仍来自 Pi 目录,但同样按账号顺序排列,
-并沿用 Registry 条目的 `defaultEnabled: false`;用户本地 `sortOrder` patch 仍最高。拿不到账号清单时才用 Registry `sortOrder`。
+并沿用 Registry 条目的 `defaultEnabled: false`;用户本地 `sortOrder` patch 仍最高。
+
+Claude 订阅没有 HTTP 清单接口,清单来自内置 Claude Code 的 SDK `supportedModels()`:会话启动时
+捕获;此外 maker 就绪、登录/认领 Claude 登录以及手动刷新时,用本机 CLI 起一个空闲 Query 只读
+清单(不发消息、不产生模型调用)。SDK 对每个系列的当前型号常只给简称(`opus` / `sonnet` /
+`default`)并把版本写在说明里(如 “Opus 5.5 · …”);简称按说明拼出 `claude-<系列>-<主>-<次>`。
+Registry 尚未登记的新版本照样显示(资料用未知模型默认值,并记日志提示补登记),**绝不映射到
+相邻旧版本**;说明里读不出版本时才跳过。SDK 的 displayName 只有系列名(如 “Fable”)时不作为
+型号名称,改用 Registry 名称,Registry 未登记则按 ID 推导(`claude-fable-5-2` → “Fable 5.2”)。
xAI 保留 Registry 声明顺序,XD 以 Gateway `/models` 为准,均不受此规则影响。
第三方 API key 连接(MiMo、Kimi Code 等预设及自定义端点)没有 sortOrder,按连接配置里的
顺序排:首次添加用接口返回的顺序;之后刷新发现的新型号排在已有型号之前(保持接口返回的
diff --git a/docs/product-rules/model-metadata-precedence.md b/docs/product-rules/model-metadata-precedence.md
index f2f5881b13..c7156acd73 100644
--- a/docs/product-rules/model-metadata-precedence.md
+++ b/docs/product-rules/model-metadata-precedence.md
@@ -110,11 +110,13 @@ OpenAI 本机 Codex 登录与独立授权账号共享 OpenAI 公共目录及桥
`providerCatalogId` 仅用于公共定义查找。凭证、发现快照、限额、具体连接的价格及窗口覆盖、
收藏与可见性继续使用连接实例 ID。三个 Harness 的公共模型资料与接入声明由服务器目录维护;
客户端原生目录只补旧快照缺失字段及运行时兼容细节,不能作为第二份公共模型白名单。
-对使用 Registry 补存在性或 additions-only 的发现路径,未返回某个模型不等于禁止。不能把此结论推广到权威成员快照;按下面的来源表判定。
+订阅供应商的模型名单以供应商实际返回为准:Registry 只为已返回的型号补资料、标退役,
+不补入供应商没返回的型号(2026-09-27 起)。additions-only 的发现路径未返回某个模型不等于删除;按下面的来源表判定。
现有协议保留两种兼容表示:Codex/Claude Code 的 Registry 根与桥接声明,及
`providers[].models.pi` 的逐 Harness 声明。旧 Registry 的 agents 枚举不能直接加入 Pi;
-顶层 Codex/Claude Code 空数组仍由 Registry 实体化,不能解释成关闭。
+OpenAI / Anthropic 订阅的 Codex/Claude Code 根只由账号清单决定成员,Registry 条目的
+`status` 不再使其凭空出现。
Pi 显式列表提供公共成员(包括空数组与退役条目);缺字段才使用随包兜底。订阅账号
发现的新型号同样进入 Pi,沿已有订阅传输执行,不要求先登记到 Pi SDK。显式空 Pi 列表
仍关闭该公共入口,退役条目不由发现复活。Codex/Claude SDK 的发现只补 Pi 缺少的型号,
@@ -155,9 +157,9 @@ Pi 已识别的 OpenAI 订阅连接之间可复用同一运行时:每个账号
| 来源/字段 | 缺失或尚无有效发现 | 明确空数组或未返回型号 |
| --- | --- | --- |
-| OpenAI / Anthropic 订阅的 Registry 根与发现补全 | 按对应静态/Registry 路径保留存在性,连接态另判 | 发现未返回不单独构成否定;不能用顶层 Codex/Claude 空数组禁用 Registry 实体化条目 |
+| OpenAI / Anthropic 订阅根 | 尚无账号清单时名单为空(未登录、或登录后主动读取尚未完成) | 成员只取账号返回的型号;Registry 只补资料、标退役,不补入未返回的型号。Claude SDK 以系列简称返回的当前型号,按说明里的版本生成精确 ID(Registry 未登记也显示),读不出版本才不显示 |
| 通用 OAuth additions-only、自定义连接刷新 | 保留已有配置 | 只新增/更新,不因本次未返回而删除已有成员 |
-| xAI 订阅账号权威发现 | null 表示尚无成功账号快照,走既有静态兼容路径 | 成功空数组也是账号成员快照;不能套 additions-only 规则。Pi 同时使用该账号发现及公共声明 |
+| xAI 订阅账号权威发现 | null 或空数组表示尚无可用账号快照,走既有静态声明 + Registry 兼容路径(未绑定账号发现时唯一的名单来源) | 非空快照即账号成员,Registry 不再补入未返回的型号;不能套 additions-only 规则。Pi 同时使用该账号发现及公共声明 |
| `providers[].models.pi` | 字段缺失才使用随包声明 | 显式 [] 不回填;非空声明允许账号发现补新型号,退役项不复活 |
| 内置非 Gateway 的媒体数组 | 字段缺失、允许 Registry 派生时才由媒体 routes 补成员 | 显式 [] 不由 Registry 或发现结果复活;非空列表不由 Registry 增补成员,后续账号发现按下一行处理 |
| 已接入的图片/视频账号发现 | 没有发现快照时用静态/远端声明 | 成功快照限定该发现路径的成员,不能绕过目录显式禁用;不推广为全部音频或自定义刷新规则 |
diff --git a/packages/maker-core/src/agents/base-agent.ts b/packages/maker-core/src/agents/base-agent.ts
index 986fd342b1..88abcfa89d 100644
--- a/packages/maker-core/src/agents/base-agent.ts
+++ b/packages/maker-core/src/agents/base-agent.ts
@@ -489,6 +489,11 @@ export interface RefreshLocalModelsOptions {
* session hosts never need a credential-mode switch.
*/
credentialMode?: AgentCredentialMode;
+ /**
+ * Claude Code:把本次读到的 SDK `supportedModels()` 原样交给调用方,而不是全局
+ * 捕获监听器,让调用方按发起时的登录代际决定是否采用。
+ */
+ onSupportedModels?: (models: unknown[]) => void;
}
export interface ClaudeSubagentTaskRegistration {
diff --git a/packages/maker-core/src/agents/claude-code/__tests__/supported-models-probe.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/supported-models-probe.test.ts
new file mode 100644
index 0000000000..54cc79f2a3
--- /dev/null
+++ b/packages/maker-core/src/agents/claude-code/__tests__/supported-models-probe.test.ts
@@ -0,0 +1,151 @@
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import type { AgentDeps } from '../../base-agent.js';
+import type { AuthAdapter } from '../../../interfaces/auth-adapter.js';
+import type { Logger } from '../../../interfaces/logger.js';
+
+const sdkMock = vi.hoisted(() => ({
+ forkSession: vi.fn(),
+ query: vi.fn(),
+}));
+
+vi.mock('@anthropic-ai/claude-agent-sdk', () => ({
+ forkSession: sdkMock.forkSession,
+ query: sdkMock.query,
+}));
+
+import { ClaudeCodeAgent, setClaudeSupportedModelsListener } from '../index.js';
+
+function createNoopLogger(): Logger {
+ const logger: Logger = {
+ trace() {},
+ debug() {},
+ info() {},
+ warn() {},
+ error() {},
+ fatal() {},
+ child() {
+ return logger;
+ },
+ };
+ return logger;
+}
+
+function createAgent(authenticated: boolean): { agent: ClaudeCodeAgent; getState: ReturnType<typeof vi.fn> } {
+ const getState = vi.fn(async () => (authenticated ? { authenticated: true } : { authenticated: false }));
+ const auth: AuthAdapter = {
+ getState,
+ async triggerLogin() {
+ return { authenticated: true };
+ },
+ async logout() {},
+ async getAuthEnv() {
+ return {};
+ },
+ };
+ const deps: AgentDeps = {
+ auth,
+ runtimeConfig: {},
+ binaryPath: process.execPath,
+ logger: createNoopLogger(),
+ };
+ return { agent: new ClaudeCodeAgent(deps), getState };
+}
+
+function fakeQuery(supportedModels: () => Promise<unknown[]>) {
+ return { supportedModels: vi.fn(supportedModels), close: vi.fn() };
+}
+
+afterEach(() => {
+ setClaudeSupportedModelsListener(null);
+ sdkMock.query.mockReset();
+});
+
+describe('ClaudeCodeAgent.refreshLocalModels(主动读取订阅模型清单)', () => {
+ it('用订阅登录起空闲 Query 只读 supportedModels,交给 host 后关闭,不发送任何消息', async () => {
+ const listener = vi.fn();
+ setClaudeSupportedModelsListener(listener);
+ const models = [{ value: 'claude-fable-5-1', displayName: 'Fable' }];
+ const q = fakeQuery(async () => models);
+ sdkMock.query.mockReturnValue(q);
+ const { agent, getState } = createAgent(true);
+
+ await expect(agent.refreshLocalModels()).resolves.toBe(true);
+
+ expect(getState).toHaveBeenCalledWith({ credentialMode: 'oauth-bearer' });
+ expect(listener).toHaveBeenCalledWith(models);
+ expect(q.close).toHaveBeenCalledTimes(1);
+ const [{ prompt, options }] = sdkMock.query.mock.calls[0] as [
+ { prompt: AsyncIterable<unknown>; options: Record<string, unknown> },
+ ];
+ expect(options.pathToClaudeCodeExecutable).toBe(process.execPath);
+ // 输入队列在探测结束时关闭且从未写入:没有任何用户消息发往模型。
+ const received: unknown[] = [];
+ for await (const item of prompt) received.push(item);
+ expect(received).toEqual([]);
+ });
+
+ it('未登录订阅或 host 未接监听器时不起 CLI', async () => {
+ const { agent: unauthed } = createAgent(false);
+ setClaudeSupportedModelsListener(vi.fn());
+ await expect(unauthed.refreshLocalModels()).resolves.toBe(false);
+
+ setClaudeSupportedModelsListener(null);
+ const { agent: noListener } = createAgent(true);
+ await expect(noListener.refreshLocalModels()).resolves.toBe(false);
+
+ expect(sdkMock.query).not.toHaveBeenCalled();
+ });
+
+ it('调用方传入 onSupportedModels 时结果只交给它,不经全局监听器', async () => {
+ const listener = vi.fn();
+ setClaudeSupportedModelsListener(listener);
+ const models = [{ value: 'sonnet', displayName: 'Sonnet' }];
+ sdkMock.query.mockReturnValue(fakeQuery(async () => models));
+ const { agent } = createAgent(true);
+ const onSupportedModels = vi.fn();
+
+ await expect(agent.refreshLocalModels({ onSupportedModels })).resolves.toBe(true);
+ expect(onSupportedModels).toHaveBeenCalledWith(models);
+ expect(listener).not.toHaveBeenCalled();
+ });
+
+ it('在新建的空目录里启动,结束后删除该目录', async () => {
+ setClaudeSupportedModelsListener(vi.fn());
+ sdkMock.query.mockReturnValue(fakeQuery(async () => []));
+ const { agent } = createAgent(true);
+
+ await agent.refreshLocalModels();
+ const [{ options }] = sdkMock.query.mock.calls[0] as [{ options: { cwd: string } }];
+ expect(path.dirname(options.cwd)).toBe(path.resolve(os.tmpdir()));
+ expect(path.basename(options.cwd)).toMatch(/^cindy-claude-models-/);
+ await expect(fs.access(options.cwd)).rejects.toMatchObject({ code: 'ENOENT' });
+ });
+
+ it('启动阶段失败(读取登录态出错)返回 false 而不是抛错', async () => {
+ setClaudeSupportedModelsListener(vi.fn());
+ const { agent, getState } = createAgent(true);
+ getState.mockRejectedValueOnce(new Error('keychain unavailable'));
+
+ await expect(agent.refreshLocalModels()).resolves.toBe(false);
+ expect(sdkMock.query).not.toHaveBeenCalled();
+ });
+
+ it('读取失败返回 false 并仍关闭 Query', async () => {
+ const listener = vi.fn();
+ setClaudeSupportedModelsListener(listener);
+ const q = fakeQuery(async () => {
+ throw new Error('cli exited');
+ });
+ sdkMock.query.mockReturnValue(q);
+ const { agent } = createAgent(true);
+
+ await expect(agent.refreshLocalModels()).resolves.toBe(false);
+ expect(listener).not.toHaveBeenCalled();
+ expect(q.close).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/packages/maker-core/src/agents/claude-code/index.ts b/packages/maker-core/src/agents/claude-code/index.ts
index 614582c52e..04968d37b0 100644
--- a/packages/maker-core/src/agents/claude-code/index.ts
+++ b/packages/maker-core/src/agents/claude-code/index.ts
@@ -67,6 +67,7 @@ import {
type AgentDeps,
type StartSessionOptions,
type OneShotOptions,
+ type RefreshLocalModelsOptions,
type SendOptions,
type TurnPermissionPolicy,
} from '../base-agent.js';
@@ -822,6 +823,9 @@ const CLAUDE_EFFORTS: EffortDescriptor[] = [
*/
let supportedModelsListener: ((models: unknown[]) => void) | null = null;
+/** 主动清单探测(ClaudeCodeAgent.refreshLocalModels)的上限:CLI 冷启动通常几秒内应答。 */
+const SUPPORTED_MODELS_PROBE_TIMEOUT_MS = 30_000;
+
/** host 注入 SDK supportedModels 捕获回调;传 null 解除。 */
export function setClaudeSupportedModelsListener(
listener: ((models: unknown[]) => void) | null,
@@ -1005,6 +1009,77 @@ export class ClaudeCodeAgent extends BaseAgent {
return CLAUDE_CODE_AGENT_COMMANDS;
}
+ /**
+ * 主动读取 Claude 订阅的模型清单:用本机 CLI 自己的登录起一个空闲 Query,只调
+ * SDK `supportedModels()`,不发送任何消息、不产生模型调用,读完立即关闭。
+ * 结果交给调用方的 onSupportedModels(host 据此核对发起时的登录代际);未提供时经
+ * setClaudeSupportedModelsListener 交给 host,与会话 init 捕获同一入口。
+ * 未登录订阅、无接收方、项目设置被改写或探测任一阶段失败时返回 false,不抛错。
+ */
+ override async refreshLocalModels(options?: RefreshLocalModelsOptions): Promise<boolean> {
+ const deliver = options?.onSupportedModels ?? supportedModelsListener;
+ if (!deliver) return false;
+ const log = this.deps.logger.child('claude-code/supportedModels');
+ let probeDir: string | null = null;
+ let q: Query | null = null;
+ let timer: ReturnType<typeof setTimeout> | undefined;
+ const abortController = new AbortController();
+ const idleInput = createAsyncQueue<never>();
+ try {
+ // oauth-bearer 形态下 auth adapter 只按本机 Claude Code 订阅登录作答。
+ const authState = await this.deps.auth.getState({ credentialMode: 'oauth-bearer' });
+ if (!authState.authenticated) return false;
+ // 独立的新建空目录:不继承共享临时目录里可能存在的项目级设置;仍按订阅会话同一
+ // 规则检查,能改写上游 / 鉴权 / TLS 的设置一律拒绝。
+ probeDir = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-claude-models-'));
+ const override = await findWorkspaceSettingsOverride(probeDir);
+ if (override) {
+ log.warn('probe skipped', { reason: workspaceSettingsOverrideMessage(override) });
+ return false;
+ }
+ const env = await buildClaudeEnv(this.deps.auth, this.deps.runtimeConfig, {
+ credentialMode: 'oauth-bearer',
+ nativeCliAuth: true,
+ subagentModel: null,
+ });
+ q = sdkQuery({
+ prompt: idleInput as unknown as Parameters<typeof sdkQuery>[0]['prompt'],
+ options: {
+ abortController,
+ cwd: probeDir,
+ pathToClaudeCodeExecutable: this.deps.binaryPath,
+ env,
+ },
+ });
+ const query = q;
+ const models = await Promise.race([
+ query.supportedModels(),
+ new Promise<never>((_, reject) => {
+ timer = setTimeout(
+ () => reject(new Error('supportedModels probe timed out')),
+ SUPPORTED_MODELS_PROBE_TIMEOUT_MS,
+ );
+ }),
+ ]);
+ if (!Array.isArray(models)) return false;
+ deliver(models);
+ return true;
+ } catch (error) {
+ log.warn('probe failed', { error: String(error) });
+ return false;
+ } finally {
+ if (timer) clearTimeout(timer);
+ idleInput.end();
+ try {
+ q?.close();
+ } catch {
+ /* 探测进程已退出 */
+ }
+ abortController.abort();
+ if (probeDir) await fs.rm(probeDir, { recursive: true, force: true }).catch(() => undefined);
+ }
+ }
+
/**
* Skill 扫描 —— 走 scanClaudeSlashCommands (扫 ~/.claude/{commands,skills}),
* 包装成新的 AgentSkillCommand 形状(kind='agent-skill')。