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(desktop): 修正档位权威槽的四处实现缺口(对抗审查)

Zhang Yunjin673ef842c505
diff --git a/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts b/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts
index 8175a5f8e1..b2dc84388b 100644
--- a/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts
@@ -195,7 +195,7 @@ describe('owner-fenced new task and Bot default mirror', () => {
});
});
-it('reads remembered tuning only from the matching owner snapshot, with source/engine and legacy fallbacks', () => {
+it('reads remembered tuning only from the matching owner snapshot, with preset-first and source fallbacks', () => {
const payload = { ownerStamp: { dataOwnerId: 'A', ownerGeneration: 4 }, lastByVendor: {},
effortByModel: { target: 'medium', old: 'low' }, fastModeByModel: { target: true, old: true },
providerModelMemory: {
@@ -204,8 +204,11 @@ it('reads remembered tuning only from the matching owner snapshot, with source/e
'pi:provider': { effortByModel: { target: 'minimal' }, fastByModel: {} },
} };
expect(syncNewMakerDraftCache(payload, payload.ownerStamp, 'A:4', false)).toBe(true);
- expect(getNewMakerModelTuning('A:4', 'codex', 'provider', 'target')).toEqual({ effort: 'low', fastMode: false });
+ // 权威 `${agent}:*` 优先:同一个模型换个来源(provider → other)仍然是同一档,
+ // 不会被 provider 槽的旧副本拽回旧档位(那就是「推理强度自己变低」在 main 侧的形态)。
+ expect(getNewMakerModelTuning('A:4', 'codex', 'provider', 'target')).toEqual({ effort: 'high', fastMode: true });
expect(getNewMakerModelTuning('A:4', 'codex', 'other', 'target')).toEqual({ effort: 'high', fastMode: true });
+ // 该 agent 没有 `*` 槽 → 回落 provider 槽;fast 该槽没记过 → 再回落 newMakerDraft 根表。
expect(getNewMakerModelTuning('A:4', 'pi', 'provider', 'target').effort).toBe('minimal');
expect(getNewMakerModelTuning('A:4', 'codex', 'provider', 'old')).toEqual({ effort: 'low', fastMode: true });
expect(getNewMakerModelTuning('B:4', 'codex', 'provider', 'target')).toEqual({});
diff --git a/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts b/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts
index e7affe3280..9c1c81266a 100644
--- a/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts
+++ b/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts
@@ -267,10 +267,13 @@ export function getNewMakerModelTuning(ownerScope: string, agent: 'claude-code'
providerId: string, model: string): { effort?: string; fastMode?: boolean } {
if (selectedRouteOwner !== ownerScope || !cache) return {};
const memory = cache.providerModelMemory;
+ // 权威 `${agent}:*` 槽优先,来源副本只兜底旧客户端(同 getThinkingEnabledFromMemory 与
+ // renderer getProviderModel*):来源槽优先会让同模型换个来源就回到旧档位 —— 正是
+ // 「推理强度自己变低」那一类缺陷,只是发生在 main 侧的这条读路径上。
+ const preset = memory?.[`${agent}:*`];
const provider = memory?.[`${agent}:${providerId}`];
- const legacy = memory?.[`${agent}:*`];
- const effort = provider?.effortByModel?.[model] ?? legacy?.effortByModel?.[model] ?? cache.effortByModel[model];
- const fastMode = provider?.fastByModel?.[model] ?? legacy?.fastByModel?.[model] ?? cache.fastModeByModel[model];
+ const effort = preset?.effortByModel?.[model] ?? provider?.effortByModel?.[model] ?? cache.effortByModel[model];
+ const fastMode = preset?.fastByModel?.[model] ?? provider?.fastByModel?.[model] ?? cache.fastModeByModel[model];
return { ...(typeof effort === 'string' ? { effort } : {}),
...(typeof fastMode === 'boolean' ? { fastMode } : {}) };
}
diff --git a/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts b/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts
index 70d97689a0..964744395d 100644
--- a/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts
+++ b/apps/desktop/src/renderer/__tests__/providerModelMemory.test.ts
@@ -321,6 +321,36 @@ describe('providerModelMemory store', () => {
expect(persisted['codex:openai']?.fastByModel['gpt-5.6-sol']).toBe(false);
});
+ it('thinking 写盘失败后,另一窗口改了权威槽也必须让旧操作退休', async () => {
+ const m = await loadModule();
+ m.setProviderModelMemoryOwner('owner-a');
+ const ownerAKey = `${m.__STORAGE_KEY}:owner-a`;
+
+ memStorage.setWritesFail(true);
+ m.setProviderModelThinking('pi', 'glm-coding-plan', 'glm-5.3-flash', true);
+
+ memStorage.setWritesFail(false);
+ // 窗口 A 把同一 (agent, model) 的权威槽 thinking 改成 false 并成功落盘。
+ memStorage.setItem(
+ ownerAKey,
+ JSON.stringify({
+ 'pi:*': {
+ lastModel: '',
+ effortByModel: {},
+ fastByModel: {},
+ thinkingByModel: { 'glm-5.3-flash': false },
+ },
+ }),
+ );
+ // 触发一次读取,重放 pending;B 的旧 pending=true 必须退休,不覆盖窗口 A 的选择。
+ m.setProviderModelThinking('claude-code', 'anthropic', 'claude-opus-5', true);
+ const persisted = JSON.parse(memStorage.getItem(ownerAKey) ?? '{}') as Record<
+ string,
+ { thinkingByModel: Record<string, boolean> }
+ >;
+ expect(persisted['pi:*']?.thinkingByModel['glm-5.3-flash']).toBe(false);
+ });
+
it('选模写盘失败后再调 effort,不会丢失独立的 lastModel 意图', async () => {
const m = await loadModule();
m.setProviderModelMemoryOwner('owner-a');
@@ -540,6 +570,28 @@ describe('providerModelMemory v2 —— (agent, model) 全局 effort + provider
expect(fallback.getProviderModelEffort('claude-code', 'xd', 'gpt-5.5')).toBe('xhigh');
});
+ it('历史回填同时补齐 effort / fast / thinking 三个维度(逐个合并,不被链式短路漏掉)', async () => {
+ memStorage.setItem(
+ 'xdt:providerModelMemory:v2',
+ JSON.stringify({
+ 'pi:glm-coding-plan': {
+ lastModel: 'glm-5.3-flash',
+ effortByModel: { 'glm-5.3-flash': 'low' },
+ fastByModel: { 'glm-5.3-flash': true },
+ thinkingByModel: { 'glm-5.3-flash': false },
+ },
+ }),
+ );
+ const m = await loadModule();
+ // 三个维度都必须进权威槽。写成 `merge(a) || merge(b) || merge(c)` 时,effort 一命中
+ // 就短路,fastByModel / thinkingByModel 停在空 —— 与回填要消灭的「跨来源丢档位」同类。
+ expect(m.snapshotForSeed()['pi:*']).toEqual({
+ effortByModel: { 'glm-5.3-flash': 'low' },
+ fastByModel: { 'glm-5.3-flash': true },
+ thinkingByModel: { 'glm-5.3-flash': false },
+ });
+ });
+
it('v2 历史数据(只有来源槽)首次读取即回填权威槽,不丢任何既有预设', async () => {
// 这正是用户机器上的真实形状:`*` 槽从未被写过,偏好全在来源槽里。
memStorage.setItem(
@@ -574,6 +626,33 @@ describe('providerModelMemory v2 —— (agent, model) 全局 effort + provider
expect(persisted['pi:*'].effortByModel['glm-5.3-flash']).toBe('max');
});
+ it('来源槽已是目标值时,权威槽陈旧也要补写(双写不被半短路)', async () => {
+ // 两处分歧:旧客户端只把来源槽写成 low,权威槽停在 medium(回填只补空缺不覆盖,
+ // 这种不一致可以合法共存)。用户再次显式选 low 时必须把权威槽也带过来 ——
+ // 只看来源槽就短路的话,其它来源仍被 medium 拽走。
+ memStorage.setItem(
+ 'xdt:providerModelMemory:v2',
+ JSON.stringify({
+ 'pi:glm-coding-plan': {
+ lastModel: '',
+ effortByModel: { 'glm-5.3-flash': 'low' },
+ fastByModel: {},
+ thinkingByModel: {},
+ },
+ 'pi:*': {
+ lastModel: '',
+ effortByModel: { 'glm-5.3-flash': 'medium' },
+ fastByModel: {},
+ thinkingByModel: {},
+ },
+ }),
+ );
+ const m = await loadModule();
+ m.setProviderModelEffort('pi', 'glm-coding-plan', 'glm-5.3-flash', 'low');
+ expect(m.snapshotForSeed()['pi:*']?.effortByModel['glm-5.3-flash']).toBe('low');
+ expect(m.snapshotForSeed()['pi:glm-coding-plan']?.effortByModel['glm-5.3-flash']).toBe('low');
+ });
+
it('snapshot 同时含权威槽与来源兼容副本', async () => {
const m = await loadModule();
m.setProviderModelEffort('claude-code', 'anthropic', 'claude-opus-4-8', 'xhigh');
diff --git a/apps/desktop/src/renderer/state/providerModelMemory.ts b/apps/desktop/src/renderer/state/providerModelMemory.ts
index 26bdbd834f..13f5e1be4f 100644
--- a/apps/desktop/src/renderer/state/providerModelMemory.ts
+++ b/apps/desktop/src/renderer/state/providerModelMemory.ts
@@ -149,10 +149,12 @@ function backfillGlobalPresets(map: Record<string, ProviderMemory>): Record<stri
const nextEffort: Record<string, Effort> = { ...(existing?.effortByModel ?? {}) };
const nextFast: Record<string, boolean> = { ...(existing?.fastByModel ?? {}) };
const nextThinking: Record<string, boolean> = { ...(existing?.thinkingByModel ?? {}) };
- const touched =
- merge(nextEffort, effort) ||
- merge(nextFast, presetFast.get(presetKey)) ||
- merge(nextThinking, presetThinking.get(presetKey));
+ // 三个维度必须**逐个**合并:写成 `merge(a) || merge(b) || merge(c)` 会因为短路
+ // 在第一个命中后就跳过剩下的 —— 只回填 effort 而漏掉 fast / thinking,与回填本身
+ // 要消灭的「跨来源丢档位」是同一类缺陷。
+ let touched = merge(nextEffort, effort);
+ touched = merge(nextFast, presetFast.get(presetKey)) || touched;
+ touched = merge(nextThinking, presetThinking.get(presetKey)) || touched;
if (!touched) continue;
out[presetKey] = {
lastModel: existing?.lastModel ?? '',
@@ -365,7 +367,14 @@ function applyProviderMemoryOp(
const providerKey = keyOf(op.agent, op.providerId);
const provider = map[providerKey];
if (op.kind === 'set-effort') {
- if (provider?.effortByModel[op.model] === op.effort) return map;
+ // 双写的两个槽都到达目标值才算「无事可做」。只看来源槽会漏写权威槽:两处不同步时
+ // (旧客户端只写来源槽、或回填只补空缺造成的分歧)用户这次显式选择会被短路丢掉。
+ if (
+ provider?.effortByModel[op.model] === op.effort &&
+ map[presetKeyOf(op.agent)]?.effortByModel[op.model] === op.effort
+ ) {
+ return map;
+ }
return {
...map,
[providerKey]: {
@@ -390,7 +399,12 @@ function applyProviderMemoryOp(
};
}
if (op.kind === 'set-fast') {
- if (provider?.fastByModel?.[op.model] === op.enabled) return map;
+ if (
+ provider?.fastByModel?.[op.model] === op.enabled &&
+ map[presetKeyOf(op.agent)]?.fastByModel?.[op.model] === op.enabled
+ ) {
+ return map;
+ }
return {
...map,
[providerKey]: {
@@ -403,7 +417,12 @@ function applyProviderMemoryOp(
};
}
if (op.kind === 'set-thinking') {
- if (provider?.thinkingByModel?.[op.model] === op.enabled) return map;
+ if (
+ provider?.thinkingByModel?.[op.model] === op.enabled &&
+ map[presetKeyOf(op.agent)]?.thinkingByModel?.[op.model] === op.enabled
+ ) {
+ return map;
+ }
return {
...map,
[providerKey]: {
@@ -453,14 +472,16 @@ function captureOpConflictBaseline(
presetValue: undefined,
};
}
+ // 三个模型级维度的写集都是「权威槽 + 来源槽」两处,基线必须两处都取 —— 只取来源槽
+ // 会让权威槽的冲突检查恒通过(两侧都是 undefined),该退休的旧操作不退休。
+ const preset = map[presetKeyOf(op.agent)];
if (opDimension(op) === 'thinking') {
return {
providerValue: provider?.thinkingByModel[op.model],
lastModel: provider?.lastModel ?? '',
- presetValue: undefined,
+ presetValue: preset?.thinkingByModel[op.model],
};
}
- const preset = map[presetKeyOf(op.agent)];
if (opDimension(op) === 'fast') {
return {
providerValue: provider?.fastByModel[op.model],
@@ -475,7 +496,6 @@ function captureOpConflictBaseline(
};
}
-/** 只比较最终 op 真正会写的字段;其它模型/维度变化可安全合并。 */
function matchesOpConflictBaseline(
map: Record<string, ProviderMemory>,
pending: PendingProviderMemoryOp,