Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 远程电脑选项目后 worktree 勾选被重置,会话落在默认分支
ricky060335b02c5daad2
diff --git a/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts b/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.tsindex 78994b6776..0effbb937c 100644--- a/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts+++ b/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts@@ -299,12 +299,11 @@ describe('Shared create project picker', () => {expect(toggleHandler.indexOf('setWtEnabled(enabled)')).toBeGreaterThan(toggleHandler.indexOf("'maker:apply-new-maker-worktree-pref'"),);+ // 镜像与切设备重置共用一个按帧判定的落点(行为见 deviceLinkDraftDefaults.test.ts)。expect(newMakerDraftRouteSource).toContain(- "if (typeof remotePreference === 'boolean') setWtEnabled(remotePreference);",- );- expect(newMakerDraftRouteSource).toContain(- 'if (isDeviceLinkDraft) setWtEnabled(false);',+ 'const next = resolveDeviceLinkWorktreeEnabled(previous, frame);',);+ expect(newMakerDraftRouteSource).toContain('if (next !== null) setWtEnabled(next);');expect(newMakerDraftRouteSource).toContain('wt.enabled && wt.baseRepo');const sendGuardStart = newMakerDraftRouteSource.indexOf('&& selectedWorktree.confirmedIneligible !== true',diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsxindex e071bc87db..1bff2334cd 100644--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx@@ -302,7 +302,9 @@ import {import { isSubscriptionDirectModel } from '../../../shared/subscriptionModels';import {resolveDeviceLinkDraftDefaults,+ resolveDeviceLinkWorktreeEnabled,type DeviceLinkDraftSelection,+ type DeviceLinkWorktreeEnabledFrame,type RemoteDraftDefaults,} from './deviceLinkDraftDefaults';import { recallAgentDeviceSelection, rememberAgentDeviceSelection } from './agentDeviceDraftMemory';@@ -1648,20 +1650,24 @@ export function NewMakerDraftRoute() {// 记忆——不做 baseRepo/资格点亮门槛、没有任何自动开关。环境合格性只影响// checkbox 禁用态;用户已勾选且当前项目尚不能创建 worktree 时,handleSend// 必须保留草稿并提示,不能静默创建普通 session,也不能改写用户记忆。+ // 切设备的重置与镜像必须在同一个 effect 里按帧判定(resolveDeviceLinkWorktreeEnabled):+ // 设备域浏览器会在切设备的同一批更新里直接 seed 新设备快照,分成两个 effect 时+ // 后执行的重置会把刚镜像的 true 压回 false,之后再无快照变化能恢复。+ const wtEnabledFrameRef = useRef<DeviceLinkWorktreeEnabledFrame | null>(null);useEffect(() => {+ const previous = wtEnabledFrameRef.current;+ const frame: DeviceLinkWorktreeEnabledFrame = {+ deviceId: effectiveDeviceLinkDeviceId ?? null,+ remoteDraftState,+ };+ wtEnabledFrameRef.current = frame;if (!isDeviceLinkDraft) {setWtEnabled(draft.worktreeEnabled);return;}- if (remoteDraftState.status !== 'ready') return;- const remotePreference = remoteDraftState.value?.worktreeEnabled;- if (typeof remotePreference === 'boolean') setWtEnabled(remotePreference);- }, [isDeviceLinkDraft, draft.worktreeEnabled, remoteDraftState]);- // 放在同步 effect 后面:切设备的首帧 remoteDraftState 可能仍属于上一台设备,- // 先处理旧快照再重置,保证它不能把新设备的默认 false 覆盖回去。- useEffect(() => {- if (isDeviceLinkDraft) setWtEnabled(false);- }, [isDeviceLinkDraft, effectiveDeviceLinkDeviceId]);+ const next = resolveDeviceLinkWorktreeEnabled(previous, frame);+ if (next !== null) setWtEnabled(next);+ }, [isDeviceLinkDraft, effectiveDeviceLinkDeviceId, draft.worktreeEnabled, remoteDraftState]);// A device-link checkbox write remains a create gate until the controlled// endpoint's defaults mirror confirms the requested boolean. A mismatchingdiff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.tsindex 9f7a85c9a7..6801ac68a5 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.ts+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/deviceLinkDraftDefaults.test.ts@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest';import {resolveDeviceLinkDraftDefaults,+ resolveDeviceLinkWorktreeEnabled,shouldReseedDeviceLinkDraftDefaults,} from '../deviceLinkDraftDefaults';import type { AgentCapabilities } from '@/hooks/useAgentCapabilities';@@ -518,6 +519,25 @@ describe('shouldReseedDeviceLinkDraftDefaults', () => {});});+// 回归:在远程电脑上选项目(设备域浏览器)时,新设备快照与切设备同批到达,旧实现的+// 「先镜像、后重置」两段 effect 把被控端已勾选的 worktree 压回未勾选,会话于是不建+// worktree、落在被控端仓库当前(默认)分支上,用户选的源分支被静默忽略。+describe('resolveDeviceLinkWorktreeEnabled', () => {+ const ready = (worktreeEnabled?: boolean) => ({+ status: 'ready' as const,+ value: worktreeEnabled === undefined ? {} : { worktreeEnabled },+ });+ const deviceA = { deviceId: 'device-a', remoteDraftState: ready(false) };++ it.each([+ ['切设备且同批带来新设备快照 → 采用被控端勾选记忆', deviceA, { deviceId: 'device-b', remoteDraftState: ready(true) }, true],+ ['切设备但快照仍是上一台那份 → 回到未勾选,不串台', deviceA, { deviceId: 'device-b', remoteDraftState: deviceA.remoteDraftState }, false],+ ['同设备快照缺字段 → 保持当前显示', deviceA, { deviceId: 'device-a', remoteDraftState: ready() }, null],+ ] as const)('%s', (_name, previous, current, expected) => {+ expect(resolveDeviceLinkWorktreeEnabled(previous, current)).toBe(expected);+ });+});+describe('capabilities refresh clamp contract', () => {it('保留仍合法的控制端选择,但会夹紧已失效的模型与运行参数', () => {const refreshed = caps();diff --git a/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.ts b/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.tsindex 44e6519ba4..22f2f8ba50 100644--- a/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.ts+++ b/apps/desktop/src/renderer/features/cc-agent/deviceLinkDraftDefaults.ts@@ -85,6 +85,43 @@ export function shouldReseedDeviceLinkDraftDefaults(input: {);}+/** worktree 勾选镜像的一帧输入:当前草稿目标设备 + 当时的远端草稿快照(按引用比较)。 */+export interface DeviceLinkWorktreeEnabledFrame {+ deviceId: string | null;+ remoteDraftState: {+ status: 'idle' | 'loading' | 'ready' | 'error';+ value: Pick<RemoteDraftDefaults, 'worktreeEnabled'> | null;+ };+}++/**+ * device-link 草稿的 worktree 勾选 = 被控端勾选记忆的镜像。返回要写入的勾选值,+ * null = 保持当前显示不变。+ *+ * - 切设备:先回到默认未勾选;若这一帧的快照对象仍是上一帧那份(属于上一台设备),+ * 不得用它播种新设备,等新设备自己的快照到达。+ * - 切设备时同一批更新里就带来了新设备快照(设备域浏览器 inline 拉取后直接 seed,+ * 且会跳过 hook 的再次拉取):必须立刻采用,否则此后再无快照变化能把勾选恢复,+ * 被控端已勾选 worktree 却静默按普通会话建在默认分支上。+ * - 同设备:快照 ready 且带明确 boolean 才采用;缺字段 / 拉取中保留最后镜像。+ */+export function resolveDeviceLinkWorktreeEnabled(+ previous: DeviceLinkWorktreeEnabledFrame | null,+ current: DeviceLinkWorktreeEnabledFrame,+): boolean | null {+ const deviceChanged = !previous || previous.deviceId !== current.deviceId;+ const snapshotFromPreviousDevice =+ deviceChanged && previous?.remoteDraftState === current.remoteDraftState;+ const remotePreference =+ current.remoteDraftState.status === 'ready'+ ? current.remoteDraftState.value?.worktreeEnabled+ : undefined;+ if (!snapshotFromPreviousDevice && typeof remotePreference === 'boolean') {+ return remotePreference;+ }+ return deviceChanged ? false : null;+}+/*** 把被控端草稿值(或 null=回落)按被控端 capabilities 校准成可 seed 的选择。* - model:要解析的模型 = targetModel(用户在草稿里切模型)优先,否则 remoteDraft.model(初始 seed);