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(model-default): reject stale partner Auto catalogs after account changes

fmfsaisai80caeb747d10
diff --git a/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts b/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts
index 7b6c37312a..4962bd1504 100644
--- a/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/botModelChainSettingsStore.test.ts
@@ -14,8 +14,11 @@ import {
writeBotModelChainSettings,
} from '../bot-model-chain-settings-store';
+const providerService = vi.hoisted(() => ({
+ listProviders: vi.fn<() => Promise<ProviderView[]>>(),
+}));
vi.mock('../createDesktopProviderService.js', () => ({
- getDesktopProviderService: () => ({ listProviders: async () => [] }),
+ getDesktopProviderService: () => providerService,
}));
vi.mock('../index.js', () => ({ getMakerIfReady: () => ({ listAvailableAgents: () => ['claude-code', 'codex', 'pi'] }) }));
@@ -30,6 +33,7 @@ vi.mock('../../appSessionState.js', () => ({
import { setModelVisibilityMirror } from '../model-visibility-mirror';
import { setNewMakerDraftCache } from '../newMakerDefaultsCache';
beforeEach(() => {
+ providerService.listProviders.mockReset().mockResolvedValue([]);
setModelVisibilityMirror({}, { fallback: true });
setNewMakerDraftCache({ selectedRoute: { harness: 'codex', providerId: 'openai', model: 'gpt-5.6-sol', effort: 'medium', fastMode: false }, lastByVendor: {}, effortByModel: {}, fastModeByModel: {} }, owner.key);
});
@@ -273,6 +277,48 @@ describe('bot model chain settings store', () => {
expect(config.modelChainOverride[0].providerId).toBe('org-pool');
});
+ // unit: #6355 / discussion_r4316083415。已有用例只传同步目录,未覆盖读目录时切账号。
+ // 真实读取入口必须拒绝旧账号的结果;deferred 精确控制退出/切账号,不做真实等待。
+ it.each([
+ ['owner-b:2', false],
+ ['signed-out:2', false],
+ ['owner-b:2', true],
+ ] as const)(
+ '读取 Auto 目录时 owner 变成 %s(读取失败=%s)就拒绝旧结果',
+ async (nextOwner, fails) => {
+ owner.key = 'owner-a:1';
+ let finish!: (providers: ProviderView[]) => void;
+ let fail!: (error: Error) => void;
+ providerService.listProviders.mockReturnValueOnce(
+ new Promise((resolve, reject) => {
+ finish = resolve;
+ fail = reject;
+ }),
+ );
+ const config = { modelChainOverride: [route('org-pool')] };
+ const pending = readEffectiveBotModelChain(config);
+ const rejected = expect(pending).rejects.toThrow('Bot model chain owner changed');
+ owner.key = nextOwner;
+ if (fails) fail(new Error('catalog unavailable'));
+ else finish(providers);
+ await rejected;
+ expect(config.modelChainOverride).toEqual([route('org-pool')]);
+ // 下一次读取在新账号下独立解析,不复用刚丢弃的目录。
+ providerService.listProviders.mockResolvedValueOnce([
+ view('xd', 'builtin', ['auto']),
+ view('org-pool', 'organization', [AUTO]),
+ ]);
+ expect(await readEffectiveBotModelChain(config)).toEqual([route('org-pool')]);
+ },
+ );
+
+ it('账号没变且目录读取失败时保留原链,交给既有路由校验', async () => {
+ providerService.listProviders.mockRejectedValueOnce(new Error('catalog unavailable'));
+ expect(await readEffectiveBotModelChain({ modelChainOverride: [route('org-pool')] })).toEqual(
+ [route('org-pool')],
+ );
+ });
+
it('用户自定义的伙伴默认同样跟随;没挪动、预设 auto 与普通模型原样', async () => {
const rootPath = await testRoot();
await writeBotModelChainSettings([route('org-pool'), route('xd', 'auto')], { rootPath });
diff --git a/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts b/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts
index 534a2bd96d..878b56f244 100644
--- a/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts
+++ b/apps/desktop/src/main/maker-host/bot-model-chain-settings-store.ts
@@ -166,14 +166,17 @@ async function followMovedCindyAuto(
return chain;
let views = providers;
if (!views) {
+ const owner = activeOwnerScopeKey();
try {
- views = await readConnectedProviders(activeOwnerScopeKey());
+ views = await readConnectedProviders(owner);
} catch (error) {
+ if (activeOwnerScopeKey() !== owner) throw new Error('Bot model chain owner changed');
log.warn('Bot model chain Auto follow skipped: providers unavailable', {
error: error instanceof Error ? error.message : String(error),
});
return chain;
}
+ if (activeOwnerScopeKey() !== owner) throw new Error('Bot model chain owner changed');
}
const catalog = views;
return chain.map((route) => {
diff --git a/docs/dev-rules/model-catalog-maintenance.md b/docs/dev-rules/model-catalog-maintenance.md
index b495037b8b..50c12951d0 100644
--- a/docs/dev-rules/model-catalog-maintenance.md
+++ b/docs/dev-rules/model-catalog-maintenance.md
@@ -173,6 +173,8 @@ Pi 的空来源代表 Cindy AI,先按该身份尝试组 Auto 跟随,再走
存下来的「来源 + Auto」(伙伴自己的模型链与用户自定义的伙伴默认、IM 渠道默认路由)在使用时套用
同一规则(`movedCindyAutoSourceId`,Pi 的 null 来源即 Cindy AI),不改写保存的配置;IM 跟随渠道
默认时把 Auto 的新旧位置视为同一路由,避免跟过去后被误判成用户单独改过。
+伙伴异步读取 Auto 目录后必须复核当前账号;读取期间退出或切换账号时拒绝旧结果,
+包括目录读取失败的回退分支。同账号的目录读取失败仍保留原链,交给既有路由校验。
设置页管理列表组内与选择器同序:组内每项都带 `sortOrder` 时按它排;只要有一项缺失,退回
按系列名 A–Z、同系列版本号降序,避免局部权重把新型号压到旧策展位置之后。