Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 恢复默认时清掉该模型在所有来源的预设副本
Zhang Yunjin894b0b9cb5e3
diff --git a/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts b/apps/desktop/src/renderer/__tests__/providerModelMemory.test.tsindex 964744395d..f33c1c3244 100644--- a/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts+++ b/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts@@ -826,6 +826,31 @@ describe('providerModelMemory —— clear:恢复推荐删键(不写默认快照).toBeUndefined();});+ it('clearEffort 之后,别的来源留下的副本不会把旧值回填回权威槽', async () => {+ const m = await loadModule();+ // 同一模型在来源 A、B 各留一份预设(用户先后在两个来源上调过它)。+ m.setProviderModelChoice('claude-code', 'anthropic', 'claude-opus-4-8', 'low');+ m.setProviderModelChoice('claude-code', 'xd', 'claude-opus-4-8', 'high');+ // 从 A 点「恢复默认」= 删记忆键(跟随当前版本的目录默认)。+ m.clearProviderModelEffort('claude-code', 'anthropic', 'claude-opus-4-8');+ // B 的来源副本必须一起删:backfillGlobalPresets 只补空缺不覆盖,但只要 B 的副本还在,+ // 下一次 readMap 就会把它填回刚清空的权威槽 —— 用户的「恢复默认」被悄悄撤销。+ const persisted = JSON.parse(memStorage.getItem(m.__STORAGE_KEY) ?? '{}') as Record<+ string,+ { effortByModel: Record<string, string> }+ >;+ expect(persisted['claude-code:*']?.effortByModel['claude-opus-4-8']).toBeUndefined();+ expect(persisted['claude-code:anthropic']?.effortByModel['claude-opus-4-8']).toBeUndefined();+ expect(persisted['claude-code:xd']?.effortByModel['claude-opus-4-8']).toBeUndefined();+ // 重启后(重新走 readMap 回填)仍然没有记录 ⇒ 跟随目录默认。+ vi.resetModules();+ const m2 = await loadModule();+ expect(+ m2.getProviderModelEffort('claude-code', 'xd', 'claude-opus-4-8'),+ ).toBeUndefined();+ expect(m2.snapshotForSeed()['claude-code:*']?.effortByModel['claude-opus-4-8']).toBeUndefined();+ });+it('clearFast 同理;删的是键而不是写一份显式 false', async () => {const m = await loadModule();m.setProviderModelFast('codex', 'xd', 'gpt-5.5', true);diff --git a/apps/desktop/src/renderer/state/providerModelMemory.ts b/apps/desktop/src/renderer/state/providerModelMemory.tsindex 13f5e1be4f..0b3a3a95aa 100644--- a/apps/desktop/src/renderer/state/providerModelMemory.ts+++ b/apps/desktop/src/renderer/state/providerModelMemory.ts@@ -439,9 +439,21 @@ function applyProviderMemoryOp(const presetKey = presetKeyOf(op.agent);const nextProvider = withoutModelKey(provider, field, op.model);const nextPreset = withoutModelKey(map[presetKey], field, op.model);- if (!nextProvider && !nextPreset) return map;+ // 清除是**全局**语义(「没有该键 ⇒ 跟随当前版本的目录默认」),所以同一个模型在**所有**+ // 来源槽里的副本都要删。只删当前来源的话,别的来源那份会被 backfillGlobalPresets+ // 补回刚清空的权威槽 —— 用户的「恢复默认」被悄悄撤销(且不需要新旧版本混跑)。+ const cleared: Record<string, ProviderMemory> = {};+ for (const [key, slot] of Object.entries(map)) {+ if (key === presetKey) continue;+ if (agentOfSlotKey(key) !== op.agent) continue;+ const nextSlot = withoutModelKey(slot, field, op.model);+ if (nextSlot) cleared[key] = nextSlot;+ }+ const clearedAny = Object.keys(cleared).length > 0;+ if (!nextProvider && !nextPreset && !clearedAny) return map;return {...map,+ ...cleared,...(nextProvider ? { [providerKey]: nextProvider } : {}),...(nextPreset ? { [presetKey]: nextPreset } : {}),};