Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(pi): 跨引擎重登记继承思考意图并防旧快照抹掉镜像
Zhang Yunjincffe5eb11ac4
diff --git a/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts b/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.tsindex dc941bf496..d9c95f9e3d 100644--- a/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/newMakerDefaultsCache.test.ts@@ -150,6 +150,61 @@ describe('getRemoteNewMakerDefaults (device-link 远程草稿镜像)', () => {expect(getThinkingEnabledFromMemory('pi', 'cindy-local-ollama', 'qwen3.8:27b-mxfp8')).toBe(true);expect(getThinkingEnabledFromMemory('codex', 'openai', 'gpt-5')).toBeUndefined();++ // renderer 随后追上该选择(快照带上同一个值):钉子撤销,不再是压住后续改动。+ setProviderModelMemoryCache({+ 'pi:cindy-local-ollama': {+ effortByModel: { 'qwen3.8:27b-mxfp8': 'high' },+ fastByModel: { 'qwen3.8:27b-mxfp8': true },+ thinkingByModel: { 'qwen3.8:27b-mxfp8': true },+ },+ });+ expect(getThinkingEnabledFromMemory('pi', 'cindy-local-ollama', 'qwen3.8:27b-mxfp8')).toBe(true);+ });++ it('keeps a committed thinking switch across a stale full-snapshot push until the renderer catches up', () => {+ setProviderModelMemoryCache({+ 'pi:cindy-local-ollama': {+ effortByModel: {},+ fastByModel: {},+ thinkingByModel: { 'qwen3.8:27b-mxfp8': true },+ },+ });+ // 跨引擎提交写入 off,而 renderer 的全量快照可能仍基于尚未学习到该选择的状态。+ setThinkingEnabledInMemory('pi', 'cindy-local-ollama', 'qwen3.8:27b-mxfp8', false);++ // 迟到的旧快照不得抹掉刚提交的选择。+ setProviderModelMemoryCache({+ 'pi:cindy-local-ollama': {+ effortByModel: {},+ fastByModel: {},+ thinkingByModel: { 'qwen3.8:27b-mxfp8': true },+ },+ });+ expect(getThinkingEnabledFromMemory('pi', 'cindy-local-ollama', 'qwen3.8:27b-mxfp8')).toBe(false);++ // 快照连该模型的键都还没带上,也不能抹掉。+ setProviderModelMemoryCache({+ 'pi:cindy-local-ollama': { effortByModel: {}, fastByModel: {} },+ });+ expect(getThinkingEnabledFromMemory('pi', 'cindy-local-ollama', 'qwen3.8:27b-mxfp8')).toBe(false);++ // renderer 追上该选择后撤钉:之后 renderer 的新改动重新生效。+ setProviderModelMemoryCache({+ 'pi:cindy-local-ollama': {+ effortByModel: {},+ fastByModel: {},+ thinkingByModel: { 'qwen3.8:27b-mxfp8': false },+ },+ });+ setProviderModelMemoryCache({+ 'pi:cindy-local-ollama': {+ effortByModel: {},+ fastByModel: {},+ thinkingByModel: { 'qwen3.8:27b-mxfp8': true },+ },+ });+ expect(getThinkingEnabledFromMemory('pi', 'cindy-local-ollama', 'qwen3.8:27b-mxfp8')).toBe(true);});it('providerModelMemory 镜像就绪时随返回(device-link 草稿列表行的真实读源)', () => {diff --git a/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts b/apps/desktop/src/main/maker-host/newMakerDefaultsCache.tsindex 61e58637ca..57ed990576 100644--- a/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts+++ b/apps/desktop/src/main/maker-host/newMakerDefaultsCache.ts@@ -128,7 +128,45 @@ export function getWorkerPermissionModeFromCreationPrefs(): OrcaWorkerPermission/** Renderer push handler 调; 整体替换 providerModelMemory 镜像。 */export function setProviderModelMemoryCache(snapshot: ProviderModelMemorySnapshot): void {- providerMemoryCache = snapshot;+ providerMemoryCache = applyPinnedThinkingIntents(snapshot);+}++/**+ * 跨引擎切换提交时写入的思考开关「钉子」:renderer 的全量快照推送可能仍基于尚未+ * 学习到本次选择的状态(远端推送未回流 / 旧快照在途),整体替换会把刚写入的值抹掉。+ * 钉子叠加在每次快照替换之上,直到快照自己带上同一个值(renderer 已追上)才撤掉;+ * 撤掉之后 renderer 就是该值的唯一来源,后续改动不会再被压住。+ */+const pinnedThinkingIntents = new Map<string, Map<string, boolean>>();++function applyPinnedThinkingIntents(+ snapshot: ProviderModelMemorySnapshot,+): ProviderModelMemorySnapshot {+ if (pinnedThinkingIntents.size === 0) return snapshot;+ let next: ProviderModelMemorySnapshot | null = null;+ for (const [key, pinned] of pinnedThinkingIntents) {+ const incoming = snapshot[key]?.thinkingByModel ?? {};+ let merged: Record<string, boolean> | null = null;+ for (const [model, value] of pinned) {+ if (incoming[model] === value) {+ // renderer 已追上该选择:撤钉,之后的改动以 renderer 为准。+ pinned.delete(model);+ continue;+ }+ merged ??= { ...incoming };+ merged[model] = value;+ }+ if (pinned.size === 0) pinnedThinkingIntents.delete(key);+ if (merged) {+ next ??= { ...snapshot };+ next[key] = {+ effortByModel: snapshot[key]?.effortByModel ?? {},+ fastByModel: snapshot[key]?.fastByModel ?? {},+ thinkingByModel: merged,+ };+ }+ }+ return next ?? snapshot;}/**@@ -144,6 +182,9 @@ export function setThinkingEnabledInMemory(): void {if (!providerId || !model) return;const key = `${agentKind}:${providerId}`;+ // 镜像已经带上同一个值:renderer 自己就是该值的来源,不需要钉,钉住只会+ // 压住后来的用户改动。+ if (providerMemoryCache?.[key]?.thinkingByModel?.[model] === enabled) return;const entry = providerMemoryCache?.[key];providerMemoryCache = {...(providerMemoryCache ?? {}),@@ -153,6 +194,9 @@ export function setThinkingEnabledInMemory(thinkingByModel: { ...entry?.thinkingByModel, [model]: enabled },},};+ const pinned = pinnedThinkingIntents.get(key) ?? new Map<string, boolean>();+ pinned.set(model, enabled);+ pinnedThinkingIntents.set(key, pinned);}export interface WorkerDefaultsFromNewMaker {diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.tsindex d36fb1b8f9..adc75412a5 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts@@ -254,6 +254,44 @@ describe('performSessionAgentSwitch', () => {});});+ it('inherits the staged Pi thinking intent when a same-target cross-engine intent is re-registered', async () => {+ const pendingSwitches = createPendingAgentSwitchRegistry();+ const { deps } = makeDeps({+ pendingSwitches,+ getSessionRow: async () => ({ ...makeRow() }),+ });++ await performSessionAgentSwitch(deps, {+ sessionId: 's1',+ targetAgentKind: 'pi',+ model: 'deepseek-v4.1-flash',+ providerId: 'opencode-go',+ thinking: false,+ });+ expect(pendingSwitches.get('s1')?.thinking).toBe(false);++ // 只改档位的重登记(旧调用方/只带 effort)不带思考意图:同一目标必须继承,+ // 否则登记快照被覆盖成 undefined,发送回放时 Pi 新会话会按默认值重新开思考。+ await performSessionAgentSwitch(deps, {+ sessionId: 's1',+ targetAgentKind: 'pi',+ model: 'deepseek-v4.1-flash',+ providerId: 'opencode-go',+ effort: 'high',+ });+ expect(pendingSwitches.get('s1')?.thinking).toBe(false);++ // 改选到别的模型 = 换目标:旧目标的开关不适用,不继承,避免串给新模型。+ await performSessionAgentSwitch(deps, {+ sessionId: 's1',+ targetAgentKind: 'pi',+ model: 'deepseek-v4.2-flash',+ providerId: 'opencode-go',+ effort: 'high',+ });+ expect(pendingSwitches.get('s1')?.thinking).toBeUndefined();+ });+it('keeps the config-staged identity through resume-fallback recovery re-entry', async () => {// 渠道默认触发的跨引擎切换若走 resume 回落恢复, 恢复意图必须保留 configStaged ——// 否则被通用路径消费时当成用户选择打上 manual 墓碑, 任务永久脱离跟随diff --git a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.tsindex f18d1814d4..83daf57005 100644--- a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts+++ b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts@@ -555,8 +555,22 @@ export async function performSessionAgentSwitch(// 意图制:外部调用(非 applyNow)一律只登记意图——空闲/运行中同一语义,// 用户反复改选零成本;renderer 乐观显示意图,真切换在下一条消息发送时刻执行。- // 重复登记 = 覆盖(同一意图的最新表达)。+ // 重复登记 = 覆盖(同一意图的最新表达);但只改档位/Fast 的重登记(旧调用方不带+ // 思考意图)仍指向同一目标时继承旧值——登记快照被覆盖成 undefined 后,发送回放+ // 会丢掉思考开关。目标已换则不继承:旧目标的开关不适用于新目标。if (!params.applyNow && deps.pendingSwitches) {+ const existingIntent = deps.pendingSwitches.get?.(sessionId);+ const sameTarget =+ existingIntent !== undefined &&+ existingIntent.targetAgentKind === targetAgentKind &&+ existingIntent.model === model &&+ (existingIntent.providerId ?? null) === (normalizedProviderId ?? null);+ const thinking =+ typeof params.thinking === 'boolean'+ ? params.thinking+ : sameTarget+ ? existingIntent?.thinking+ : undefined;const intent: PendingAgentSwitchIntent = {...(params.runtimeSource ? { runtimeSource: params.runtimeSource } : {}),...(params.configStaged === true ? { configStaged: true } : {}),@@ -565,7 +579,7 @@ export async function performSessionAgentSwitch(providerId: normalizedProviderId,...(typeof params.effort === 'string' && params.effort ? { effort: params.effort } : {}),...(typeof params.fastMode === 'boolean' ? { fastMode: params.fastMode } : {}),- ...(typeof params.thinking === 'boolean' ? { thinking: params.thinking } : {}),+ ...(typeof thinking === 'boolean' ? { thinking } : {}),};deps.pendingSwitches.set(sessionId, intent);deps.onPendingSwitchChanged?.(sessionId, projectPendingAgentSwitchIntent(intent));