Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
refactor(desktop): 移动归属只由共享写路径判定,renderer 改按错误契约给提示
Zhang Yunjin956a13bb3a2e
diff --git a/apps/desktop/src/main/localDb/ipc/__tests__/sessionsUpdate.test.ts b/apps/desktop/src/main/localDb/ipc/__tests__/sessionsUpdate.test.tsindex cfa4dbc327..c333d9a776 100644--- a/apps/desktop/src/main/localDb/ipc/__tests__/sessionsUpdate.test.ts+++ b/apps/desktop/src/main/localDb/ipc/__tests__/sessionsUpdate.test.ts@@ -20,6 +20,7 @@ import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } frimport { messages, recentWorkdirs, sessions } from '../../schema';import type { SessionRouteLock } from '../../sessionRouteLock';import { normalizeWorkingDirForStorage } from '../../../../shared/workingDir';+import { isWorktreeMoveBlockedError } from '../../../../shared/worktreeMoveGuardError';type SessionRouteLockMock = SessionRouteLock &MockInstance<(sessionId: string, task: () => Promise<unknown>) => Promise<unknown>>;@@ -1164,8 +1165,13 @@ describe('local-db:sessions:update handler wiring', () => {// MCP 的 move_sessions 等非 IPC 调用方直接走 updateSessionInDb:守卫必须同样生效,// 且让调用方看到「需要 handoff」而不是笼统的移动失败。- await expect(updateSessionInDb('codex-local', { workingDir: '/new/dir' }))- .rejects.toThrow(/worktree handoff is required/i);+ const rejected = await updateSessionInDb('codex-local', { workingDir: '/new/dir' })+ .then(() => null, (err: unknown) => err);+ expect(rejected).toBeInstanceOf(Error);+ expect(rejected).toMatchObject({ code: 'PRECONDITION_FAILED' });+ expect((rejected as Error).message).toMatch(/worktree handoff is required/i);+ // renderer 按共享契约识别这次拒绝(同一常量,两侧不手写漂移)。+ expect(isWorktreeMoveBlockedError(rejected)).toBe(true);expect(h.closeIdleSessionForMove).not.toHaveBeenCalled();expect(h.sqlite!.prepare('SELECT working_dir FROM sessions WHERE id = ?').get('codex-local'))diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.tsindex 9c8fcda2da..77e4916668 100644--- a/apps/desktop/src/main/localDb/ipc/sessions.ts+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts@@ -67,6 +67,10 @@ import {isRetainableProjectSessionSource,} from '../../../shared/sessionSource.js';import { normalizeWorkingDirForStorage, workingDirEquals } from '../../../shared/workingDir.js';+import {+ WORKTREE_MOVE_BLOCKED_CODE,+ WORKTREE_MOVE_BLOCKED_MESSAGE,+} from '../../../shared/worktreeMoveGuardError.js';import { assertRendererSessionSourceAllowed } from './sessionSourceGuard.js';import type { SessionReference } from '../../../shared/sessionReference.js';import * as broadcastTap from '../../device-link/broadcast-tap.js';@@ -1853,10 +1857,9 @@ export async function updateSessionInDb(? managedWorktreeRoot(requestedWorkingDir): null;if (ownedWorktreeRoot && !workingDirEquals(ownedWorktreeRoot, targetWorktreeRoot)) {- throwIpcError(- 'PRECONDITION_FAILED',- 'A worktree session cannot be moved outside its worktree; worktree handoff is required',- );+ // 错误码与文案是跨进程契约:renderer 按它把这次拒绝映射成同一条 toast+ // (shared/worktreeMoveGuardError.ts),两侧共用常量避免文案漂移。+ throwIpcError(WORKTREE_MOVE_BLOCKED_CODE, WORKTREE_MOVE_BLOCKED_MESSAGE);}}const movingLocalNonClaudeSession =diff --git a/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx b/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsxindex 65edeefa4c..a1148f98a7 100644--- a/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx+++ b/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx@@ -13,7 +13,6 @@ import {useWorktreeForSession,} from '@/contexts/WorktreeContext';import { useTaskInfoWorktree } from '@/features/cc-agent/sidebar/sessionWorktreeInfo';-import type { WorktreeMeta } from '@/lib/worktree.types';import { emitRefresh } from '@/lib/sessionsBus';vi.mock('@/lib/logger', () => ({@@ -126,7 +125,7 @@ describe('WorktreeContext recycle refresh', () => {const meta = { sessionId: 'open', path: '/tmp/wt/open' };mocks.worktreeListAll.mockResolvedValue([meta]);mocks.worktreeDetectCwd.mockResolvedValue({ isInsideWorktree: false });- let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;+ let refresh!: (sessionId: string) => Promise<void>;function Actions() {refresh = useRefreshWorktreeForSession();return <><Probe /><ActiveProbe /></>;@@ -161,7 +160,7 @@ describe('WorktreeContext recycle refresh', () => {const meta = { sessionId: 'open', path: '/tmp/wt/open' };mocks.worktreeListAll.mockResolvedValue([meta]);mocks.worktreeDetectCwd.mockResolvedValue({ isInsideWorktree: false });- let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;+ let refresh!: (sessionId: string) => Promise<void>;function Actions() {refresh = useRefreshWorktreeForSession();return <><Probe /><ActiveProbe /></>;@@ -205,7 +204,7 @@ describe('WorktreeContext recycle refresh', () => {mocks.worktreeListAll.mockResolvedValue([meta]);let report!: ReturnType<typeof useReportWorktreeLiveness>;let original!: NonNullable<ReturnType<typeof useWorktreeForSession>>;- let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;+ let refresh!: (sessionId: string) => Promise<void>;function Actions() {report = useReportWorktreeLiveness();original = useWorktreeForSession('open') ?? original;@@ -393,7 +392,7 @@ describe('WorktreeContext recycle refresh', () => {it('refreshes explicit creation, recycling and restoration repeatedly without a full scan', async () => {mocks.worktreeListAll.mockResolvedValue([]);- let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;+ let refresh!: (sessionId: string) => Promise<void>;function Actions() {refresh = useRefreshWorktreeForSession();return <Probe />;diff --git a/apps/desktop/src/renderer/contexts/WorktreeContext.tsx b/apps/desktop/src/renderer/contexts/WorktreeContext.tsxindex 735e054d5a..2b33e2b6c9 100644--- a/apps/desktop/src/renderer/contexts/WorktreeContext.tsx+++ b/apps/desktop/src/renderer/contexts/WorktreeContext.tsx@@ -35,11 +35,8 @@ interface WorktreeContextValue {/** 保留失效目录的登记信息,供打开中的任务在聚焦/恢复时重新探测。 */rawMetas: Record<string, WorktreeMeta>;reportLiveness: (meta: WorktreeMeta, live: boolean) => void;- /**- * 从 main 查询并更新单个 session 的 worktree 缓存,并返回本次查询结果 ——- * 调用方(如移动前的归属复核)可以直接用它判定,不必等缓存重渲染。- */- refreshSession: (sessionId: string) => Promise<WorktreeMeta | null>;+ /** 从 main 查询并更新单个 session 的 worktree 缓存。 */+ refreshSession: (sessionId: string) => Promise<void>;}const WorktreeContext = createContext<WorktreeContextValue | null>(null);@@ -80,9 +77,9 @@ export function WorktreeProvider({ children }: { children: ReactNode }) {}}, []);- const refreshSession = useCallback(async (sessionId: string): Promise<WorktreeMeta | null> => {+ const refreshSession = useCallback(async (sessionId: string) => {const getForSession = window.electronAPI?.worktreeGetForSession;- if (!getForSession) return null;+ if (!getForSession) return;const generation = ++eventGenerationRef.current;sessionEventGenerationsRef.current.set(sessionId, generation);const fullRefreshGenerationAtStart = fullRefreshGenerationRef.current;@@ -91,10 +88,10 @@ export function WorktreeProvider({ children }: { children: ReactNode }) {fullRefreshGenerationRef.current === fullRefreshGenerationAtStart;try {const meta = await getForSession(sessionId);+ if (!isCurrent()) return;const next =meta?.sessionId === sessionId && meta.path ? meta : null;- // 代次已被更新的请求取代时不再回写缓存,但本次查询结果依旧新鲜,照常返回。- if (!isCurrent()) return next;+ if (!isCurrent()) return;setSnapshot((current) => {if (!isCurrent()) return current;const metas = { ...current.metas };@@ -104,10 +101,8 @@ export function WorktreeProvider({ children }: { children: ReactNode }) {invalid.delete(sessionId);return { metas, invalid };});- return next;} catch (err) {log.warn('session refresh failed:', { sessionId, err });- return null;}}, []);@@ -196,16 +191,7 @@ export function useReportWorktreeLiveness(): WorktreeContextValue['reportLivenesreturn useCtx().reportLiveness;}-/**- * store 原样的绑定表(含失效目录)。判「这条任务是否还持有 worktree」用它 ——- * 与 main 的 worktreeStore 同口径:只要还登记着就是持有,目录是否失效是另一- * 个问题(那由徽标的 liveness 口径处理)。- */-export function useRawWorktrees(): Record<string, WorktreeMeta> {- return useCtx().rawMetas;-}-/** 让创建/恢复等明确知道 sessionId 的调用方只刷新对应 worktree。 */-export function useRefreshWorktreeForSession(): (sessionId: string) => Promise<WorktreeMeta | null> {+export function useRefreshWorktreeForSession(): (sessionId: string) => Promise<void> {return useCtx().refreshSession;}diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsxindex 89eebdf671..c94c91c0ae 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx@@ -49,7 +49,6 @@ import { projectDraftSessionTitle } from '@cindy/maker-shared/session-title';import { cn } from '@/lib/utils';import { toast } from '@/lib/toast';import { isDataOwnerPushCurrent } from '@/contexts/dataOwnerGeneration';-import { useRawWorktrees, useRefreshWorktreeForSession } from '@/contexts/WorktreeContext';import { useCCSessions } from '@/hooks/useCCSessions';import { useRecentWorkdirs } from '@/hooks/useRecentWorkdirs';import { refreshPendingAlerts } from '@/hooks/usePendingAlertAttention';@@ -223,7 +222,7 @@ import {} from './lib/sidebarCollapseConfig';import { getSessionListCollapseView } from './lib/sessionListCollapse';import { hasSessionSelectionModifier, type SessionClickModifiers } from './sidebar/SessionItem';-import { crossesWorktreeBoundary, shouldBlockWorktreeMove } from './lib/sessionMoveGuard';+import { sessionMoveFailureFeedback } from '../../../shared/worktreeMoveGuardError';import type { SessionMoveTarget } from './sidebar/sessionMoveTarget';import {DIALOGUE_FILTER_KEY,@@ -829,10 +828,6 @@ function ExpandedView({}: ExpandedProps) {const { t, i18n } = useTranslation();const localPlatform = window.electronAPI.platform;- // worktree 归属取 store 镜像(与 main 的 worktreeStore 同源):回收后仍留历史路径、- // 或存量半移动行的会话,不能靠 cwd 猜归属。- const worktreeBindings = useRawWorktrees();- const refreshWorktreeBinding = useRefreshWorktreeForSession();const { sessions, refreshSessions, patchLocal, effectiveIncludeArchived } = sessionsHook;const {hiddenProjectKeys,@@ -2720,22 +2715,11 @@ function ExpandedView({}// worktree 会话的工作区就是它绑定的 worktree:只改 workingDir 会造成半移动- // (侧栏按新项目归组,聊天框底部路径仍指旧 worktree)。判定放在目标目录确定**之后**:- // browseProject 选同一 worktree 根内的子目录仍然放行,跨根才拦;归属取活绑定- // (worktreeStore 镜像),口径与 Main 的守卫一致;「移到对话」不改目录、不经过这里。- // 缓存判定要拦时再向 main 复核一次,避免拿已被回收的旧绑定误拦。- if (- targetWorkingDir &&- (await shouldBlockWorktreeMove(- worktreeBindings[sessionId]?.path ?? null,- targetWorkingDir,- async () => (await refreshWorktreeBinding(sessionId))?.path ?? null,- ))- ) {- toast.warning(t('ccAgent.sidebar.sessionMenu.moveToProjectWorktreeBlocked'));- return;- }-+ // (侧栏按新项目归组,聊天框底部路径仍指旧 worktree)。判定不在这里做:归属只有+ // 共享写路径一处权威,renderer 的缓存/复核都是异步镜像,任何「先查询再决定」都+ // 会有一条「查询通过后、写入前恰好回收」的窗口,把主进程本会放行的移动挡在请求+ // 之前。这里照常发请求,被守卫拒绝时在下面映射成同一条 toast;「移到对话」不改+ // 目录,不受影响。const oldPatch = {workingDir: session.workingDir,workspaceKind: session.workspaceKind,@@ -2774,13 +2758,12 @@ function ExpandedView({if (expandedProjectKey && wasExpandedProjectCollapsed) {collapse.setCollapsed(expandedProjectKey, true);}- toast.error(- t(- target.kind === 'dialogue'- ? 'ccAgent.sidebar.sessionMenu.moveToDialogueFailed'- : 'ccAgent.sidebar.sessionMenu.moveToProjectFailed',- ),- );+ // 归属守卫在主进程唯一权威地拒绝跨根移动(在关 runtime / 写库 / 转录迁移之前,+ // 不留部分写入);被它拒绝时给产品既定的「暂不支持移出 worktree」说明,其它+ // 失败照旧用通用报错文案。+ const feedback = sessionMoveFailureFeedback(target.kind, err);+ if (feedback.level === 'warning') toast.warning(t(feedback.key));+ else toast.error(t(feedback.key));}},// 同理只依赖用到的三个成员,不要整个 collapse —— useCollapsedProjects 也返回@@ -2791,9 +2774,7 @@ function ExpandedView({collapse.setCollapsed,effectiveRunningSessionIds,patchLocal,- refreshWorktreeBinding,t,- worktreeBindings,],);diff --git a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsxindex 7d9681af31..28ec646ab5 100644--- a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx@@ -76,8 +76,7 @@ import {MENU_SUB_CONTENT_CLASS,} from './sidebar/menuStyles';import { SessionProjectMoveSubmenu } from './sidebar/SessionProjectMoveSubmenu';-import { crossesWorktreeBoundary, shouldBlockWorktreeMove } from './lib/sessionMoveGuard';-import { useRefreshWorktreeForSession, useWorktreeForSession } from '@/contexts/WorktreeContext';+import { sessionMoveFailureFeedback } from '../../../shared/worktreeMoveGuardError';import type { SessionMoveTarget } from './sidebar/sessionMoveTarget';import { SessionShareExportDialog } from './sidebar/SessionShareExportDialog';import { SessionBranchTreeDialog } from './SessionBranchTreeDialog';@@ -152,8 +151,6 @@ export function SessionContentHeader({const { runningSessionIds } = useSessionRunningStatus(session.id);// worktree 归属取 store 镜像(与 main 的 worktreeStore 同源):回收后仍留历史路径、// 或存量半移动行的会话,不能靠 cwd 猜归属。- const worktreeBinding = useWorktreeForSession(session.id, { includeInvalid: true });- const refreshWorktreeBinding = useRefreshWorktreeForSession();const { confirm: confirmDialog } = useConfirmDialog();const { runSessionAction, unarchiveSession } = useSessionLifecycleActions();@@ -360,21 +357,10 @@ export function SessionContentHeader({}// 与 CCAgentSidebarUpper 同款:worktree 会话不能改到它绑定 worktree 之外的目录- // (半移动)。同样放在目标目录确定之后,同一 worktree 根内的目录调整仍放行,- // 归属取活绑定;缓存判定要拦时再向 main 复核一次(回收事件落地有间隙)。- // 「移到对话」不改目录、不经过这里。- if (- targetWorkingDir &&- (await shouldBlockWorktreeMove(- worktreeBinding?.path ?? null,- targetWorkingDir,- async () => (await refreshWorktreeBinding(session.id))?.path ?? null,- ))- ) {- toast.warning(t('ccAgent.sidebar.sessionMenu.moveToProjectWorktreeBlocked'));- return;- }-+ // (半移动)。判定不在这里做:归属只有共享写路径一处权威,renderer 的缓存/复核都是+ // 异步镜像,任何「先查询再决定」都会有「查询通过后、写入前恰好回收」的窗口,把+ // 主进程本会放行的移动挡在请求之前;这里照常发请求,被守卫拒绝时在下面映射成+ // 同一条 toast。「移到对话」不改目录,不受影响。const oldPatch = {workingDir: session.workingDir,workspaceKind: session.workspaceKind,@@ -400,13 +386,12 @@ export function SessionContentHeader({} catch (err) {log.error('[session move]', err);patchLocal(session.id, oldPatch);- toast.error(- t(- target.kind === 'dialogue'- ? 'ccAgent.sidebar.sessionMenu.moveToDialogueFailed'- : 'ccAgent.sidebar.sessionMenu.moveToProjectFailed',- ),- );+ // 归属守卫在主进程唯一权威地拒绝跨根移动(在关 runtime / 写库 / 转录迁移之前,+ // 不留部分写入);被它拒绝时给产品既定的「暂不支持移出 worktree」说明,其它失败+ // 照旧用通用报错文案。+ const feedback = sessionMoveFailureFeedback(target.kind, err);+ if (feedback.level === 'warning') toast.warning(t(feedback.key));+ else toast.error(t(feedback.key));}},[patchLocal, runningSessionIds, session, t],diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/sessionMoveGuard.test.ts b/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/sessionMoveGuard.test.tsdeleted file mode 100644index 24435c7a4c..0000000000--- a/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/sessionMoveGuard.test.ts+++ /dev/null@@ -1,107 +0,0 @@-import { describe, expect, it, vi } from 'vitest';--import {- crossesWorktreeBoundary,- managedWorktreeRootOf,- shouldBlockWorktreeMove,-} from '../sessionMoveGuard';--describe('managedWorktreeRootOf', () => {- it('folds roots and their descendants to the same managed worktree root', () => {- expect(managedWorktreeRootOf('/repo/.cindy-worktrees/steady-goodall'))- .toBe('/repo/.cindy-worktrees/steady-goodall');- expect(managedWorktreeRootOf('/repo/.cindy-worktrees/steady-goodall/src/nested'))- .toBe('/repo/.cindy-worktrees/steady-goodall');- // 同一 worktree 内的兄弟目录必须归到同一个根(GUI 预检据此放行,与共享写路径一致)。- expect(managedWorktreeRootOf('/repo/.cindy-worktrees/steady-goodall/tests'))- .toBe(managedWorktreeRootOf('/repo/.cindy-worktrees/steady-goodall/src'));- });-- it('keeps the input separator style, including legacy containers and drive paths', () => {- expect(managedWorktreeRootOf('D:\\repo\\.cindy-worktrees\\steady-goodall\\src'))- .toBe('D:\\repo\\.cindy-worktrees\\steady-goodall');- expect(managedWorktreeRootOf('/repo/.xdt-worktrees/legacy-name/sub'))- .toBe('/repo/.xdt-worktrees/legacy-name');- });-- it('treats ordinary projects and user-managed worktrees as having no managed root', () => {- expect(managedWorktreeRootOf('/repo/src')).toBeNull();- expect(managedWorktreeRootOf('/repo/.worktrees/steady-goodall')).toBeNull();- expect(managedWorktreeRootOf('/repo/.claude/worktrees/steady-goodall')).toBeNull();- expect(managedWorktreeRootOf('/repo/.cindy-worktrees')).toBeNull();- expect(managedWorktreeRootOf(null)).toBeNull();- expect(managedWorktreeRootOf(undefined)).toBeNull();- expect(managedWorktreeRootOf('')).toBeNull();- });-});--describe('crossesWorktreeBoundary', () => {- const worktree = '/repo/.cindy-worktrees/steady-goodall';-- it('blocks only targets outside the session\'s own worktree root', () => {- // 跨到别的项目(含它所属的 base repo)→ 拦。- expect(crossesWorktreeBoundary(worktree, '/repo/other-project')).toBe(true);- expect(crossesWorktreeBoundary(worktree, '/repo')).toBe(true);- expect(crossesWorktreeBoundary(worktree, '/repo/.cindy-worktrees/another-name')).toBe(true);- });-- it('allows targets inside the same worktree root', () => {- expect(crossesWorktreeBoundary(worktree, worktree)).toBe(false);- expect(crossesWorktreeBoundary(worktree, `${worktree}/src`)).toBe(false);- // 归属是绑定路径,同根内换目录(绑定根相同)照样放行。- expect(crossesWorktreeBoundary(`${worktree}/src`, `${worktree}/tests`)).toBe(false);- });-- it('never blocks sessions without a live worktree binding', () => { // 没有绑定(普通任务,或 store 里已回收掉登记的会话)一律放行——归属真源是- // worktreeStore,cwd 只是历史路径,不能反过来把它拦死。- expect(crossesWorktreeBoundary(null, '/elsewhere')).toBe(false);- expect(crossesWorktreeBoundary(undefined, '/elsewhere')).toBe(false);- expect(crossesWorktreeBoundary('/repo/.worktrees/user-made', '/elsewhere')).toBe(false);- });-- it('revalidates with Main before blocking a cached binding', async () => {- const revalidate = vi.fn(async () => null);- // 缓存里还有已回收的绑定:复核回来说没有活绑定,就不该拦(否则请求根本发不出去,- // 而共享写路径本来会放行)。- await expect(shouldBlockWorktreeMove(worktree, '/elsewhere', revalidate)).resolves.toBe(false);- expect(revalidate).toHaveBeenCalledTimes(1);-- // 复核确认仍绑定同一个 worktree → 拦。- await expect(- shouldBlockWorktreeMove(worktree, '/elsewhere', async () => worktree),- ).resolves.toBe(true);-- // 缓存判定就不拦时不做多余查询。- const unused = vi.fn(async () => null);- await expect(shouldBlockWorktreeMove(null, '/elsewhere', unused)).resolves.toBe(false);- await expect(shouldBlockWorktreeMove(worktree, `${worktree}/src`, unused)).resolves.toBe(false);- expect(unused).not.toHaveBeenCalled();- });-- it('treats separator and Windows case variants of the same root as the same worktree', () => {- // 目录选择器给原生 `\` 拼写,而 working_dir 落库时是 `/`:不能因此误拦。- expect(- crossesWorktreeBoundary('D:/repo/.cindy-worktrees/steady-goodall', 'D:\\repo\\.cindy-worktrees\\steady-goodall\\tests'),- ).toBe(false);- expect(- crossesWorktreeBoundary('D:\\repo\\.xdt-worktrees\\legacy', 'D:/repo/.xdt-worktrees/legacy/src'),- ).toBe(false);-- // Windows 盘符/UNC 大小写差异也不算跨根(平台显式伪造,非 Windows CI 同样执行)。- const host = globalThis as { electronAPI?: { platform?: string } };- const previous = host.electronAPI;- try {- host.electronAPI = { platform: 'win32' };- expect(- crossesWorktreeBoundary('D:/repo/.cindy-worktrees/steady-goodall', 'd:/REPO/.cindy-worktrees/steady-goodall/src'),- ).toBe(false);- // POSIX 路径大小写敏感:盘符规则不能把两个真实存在的不同目录当成同一个。- expect(- crossesWorktreeBoundary('/repo/.cindy-worktrees/steady-goodall', '/REPO/.cindy-worktrees/steady-goodall/src'),- ).toBe(true);- } finally {- if (previous === undefined) delete host.electronAPI;- else host.electronAPI = previous;- }- });-});diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.ts b/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.tsdeleted file mode 100644index 0e45cbe16f..0000000000--- a/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.ts+++ /dev/null@@ -1,102 +0,0 @@-/**- * 会话移动守卫:worktree 会话的工作区边界就是它自己的 worktree。- *- * 「移动到项目 / 选择项目文件夹」只改 `sessions.working_dir`,而会话绑定的 worktree- * (目录、分支、store 归属与回收义务)不会跟着走:一旦允许改到别处,侧栏按新项目归组,- * 聊天框底部路径、Git 上下文与 worktree 徽标却仍指旧 worktree,形成「半移动」。- * 完整的 worktree → Local Handoff 是独立特性(#2190 / #2585,需显式处置未提交改动),- * 在它落地前 GUI 与 Main(`updateSessionInDb`)同口径拒绝。- *- * 判据只认 **Cindy 托管 worktree**(`.cindy-worktrees` / `.xdt-worktrees`)——用户自建的- * `.worktrees` 不在 Cindy 生命周期内,移动它不构成归属分裂。- *- * 比的是**归属根**,不是前缀:同一 worktree 根内的目录调整(`<wt>/src` → `<wt>/tests`)- * 在共享写路径里本来就允许,GUI 预检不得更严——规则以 Main 的 `managedWorktreeRoot`- * 为准,这里的纯字符串版本只求口径一致。- */--import { managedWorktreeBaseRepo } from '@cindy/maker-shared/worktree-paths';--import { workingDirEquals } from '../../../../shared/workingDir';--/** renderer 里判断宿主平台:优先问 bridge,单测(node 环境)回落 `process`。 */-function isWindowsHost(): boolean {- const bridged = (globalThis as { electronAPI?: { platform?: string } }).electronAPI?.platform;- if (typeof bridged === 'string') return bridged === 'win32';- return typeof process !== 'undefined' && process.platform === 'win32';-}--/** 反斜杠是否算分隔符:只有盘符路径(`C:\`)与反斜杠 UNC(`\\server\share`)才算。 */-function usesBackslashSeparator(value: string): boolean {- return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith('\\\\');-}--/**- * 纯字符串版的 Main `managedWorktreeRoot`:返回 `<base>/<容器>/<worktree 名>`,worktree- * 内的子目录一律归到该根;不是托管 worktree 路径时返回 null。不碰文件系统。- */-export function managedWorktreeRootOf(value: string | null | undefined): string | null {- if (typeof value !== 'string' || value.length === 0) return null;- const base = managedWorktreeBaseRepo(value);- if (base === null) return null;- const allowBackslash = usesBackslashSeparator(value);- const segments: Array<{ start: number; end: number }> = [];- let segmentStart = -1;- // base 是原串的前缀(共享模块按下标切片),从 base 末尾开始取前两段:- // 容器目录 + worktree 名;再深的子目录不影响根。- for (let i = base.length; i <= value.length && segments.length < 2; i += 1) {- const atEnd = i === value.length;- const isSeparator = !atEnd && (value[i] === '/' || (allowBackslash && value[i] === '\\'));- if (!atEnd && !isSeparator) {- if (segmentStart < 0) segmentStart = i;- continue;- }- if (segmentStart >= 0) {- segments.push({ start: segmentStart, end: i });- segmentStart = -1;- }- }- if (segments.length < 2) return null;- return value.slice(0, segments[1].end);-}--/**- * 该会话改到某个**已解析出的项目目录**时,是否跨出了它的 worktree 归属。- *- * 第一个参数是会话**当前活着的 worktree 绑定路径**(renderer 侧取自- * WorktreeContext 的 store 镜像,与 main 的 worktreeStore 同源),不是当前 cwd ——- * worktree 已被回收的会话会留着历史 worktree 路径,拿 cwd 当归属会把它永久拦死;- * 存量半移动行则相反(cwd 在普通项目、绑定仍在旧 worktree),必须按绑定拦。- *- * 只对具体目录比较,不看 target 种类——调用方必须在目标目录确定之后调用- * (browseProject 要等选完目录);目标目录为空的情形(尤其是「移到对话」)- * 根本不改 workingDir,不要拿到这里。- */-export function crossesWorktreeBoundary(- boundWorktreePath: string | null | undefined,- targetWorkingDir: string,-): boolean {- const ownedRoot = managedWorktreeRootOf(boundWorktreePath);- if (ownedRoot === null) return false;- const targetRoot = managedWorktreeRootOf(targetWorkingDir);- // 比的是同一物理目录:分隔符风格(目录选择器给 `\`、库里存 `/`)与 Windows 盘符/- // UNC 大小写差异都不算跨根,比较口径与 Main 的守卫一致。- return targetRoot === null || !workingDirEquals(ownedRoot, targetRoot, { windows: isWindowsHost() });-}--/**- * 移动预检的最终判定:缓存说要拦时,再向 main 复核一次活绑定。- *- * renderer 的绑定表是 main store 的异步镜像(回收后由 `worktree:changed` 触发刷新),- * 事件落地的间隙里缓存可能还持有已回收的绑定 —— 直接拦会把 Main 本会放行的移动挡在- * 请求之前。所以只在「缓存判定为拦」时多花一次查询,用复核结果定论(复核也拦才弹- * toast;复核无绑定则放行,由共享写路径做最终权威判定)。- */-export async function shouldBlockWorktreeMove(- cachedBoundWorktreePath: string | null | undefined,- targetWorkingDir: string,- revalidateBinding: () => Promise<string | null>,-): Promise<boolean> {- if (!crossesWorktreeBoundary(cachedBoundWorktreePath, targetWorkingDir)) return false;- return crossesWorktreeBoundary(await revalidateBinding(), targetWorkingDir);-}diff --git a/apps/desktop/src/shared/__tests__/worktreeMoveGuardError.test.ts b/apps/desktop/src/shared/__tests__/worktreeMoveGuardError.test.tsnew file mode 100644index 0000000000..a5592b7cb5--- /dev/null+++ b/apps/desktop/src/shared/__tests__/worktreeMoveGuardError.test.ts@@ -0,0 +1,71 @@+import { describe, expect, it } from 'vitest';++import { createIpcError } from '../ipc-errors';+import {+ isWorktreeMoveBlockedError,+ sessionMoveFailureFeedback,+ WORKTREE_MOVE_BLOCKED_CODE,+ WORKTREE_MOVE_BLOCKED_MESSAGE,+} from '../worktreeMoveGuardError';++describe('isWorktreeMoveBlockedError', () => {+ it('recognises the guard error in both IPC shapes', () => {+ // 主进程 throwIpcError 的原样形状(同进程调用,如 MCP 工具)。+ expect(+ isWorktreeMoveBlockedError(+ createIpcError(WORKTREE_MOVE_BLOCKED_CODE, WORKTREE_MOVE_BLOCKED_MESSAGE),+ ),+ ).toBe(true);++ // 跨 IPC 后 Electron 只保留 message 前缀,code 从 `[CODE]` 里解出来。+ const overIpc = new Error(+ `Error invoking remote method 'session:update': Error: [${WORKTREE_MOVE_BLOCKED_CODE}] ${WORKTREE_MOVE_BLOCKED_MESSAGE}`,+ );+ expect(isWorktreeMoveBlockedError(overIpc)).toBe(true);++ // 文案尾随换行等噪声不影响判定。+ expect(+ isWorktreeMoveBlockedError(+ new Error(`[${WORKTREE_MOVE_BLOCKED_CODE}] ${WORKTREE_MOVE_BLOCKED_MESSAGE}\n`),+ ),+ ).toBe(true);+ });++ it('ignores other failures that share the code or the wording', () => {+ // PRECONDITION_FAILED 被多个守卫复用:只按码会把别的失败说成「worktree 会话不能移出」。+ expect(+ isWorktreeMoveBlockedError(createIpcError(WORKTREE_MOVE_BLOCKED_CODE, 'session is running')),+ ).toBe(false);+ expect(+ isWorktreeMoveBlockedError(createIpcError('NOT_FOUND', WORKTREE_MOVE_BLOCKED_MESSAGE)),+ ).toBe(false);+ expect(isWorktreeMoveBlockedError(new Error('plain failure'))).toBe(false);+ expect(isWorktreeMoveBlockedError(undefined)).toBe(false);+ expect(isWorktreeMoveBlockedError(null)).toBe(false);+ });+});++describe('sessionMoveFailureFeedback', () => {+ const blocked = createIpcError(WORKTREE_MOVE_BLOCKED_CODE, WORKTREE_MOVE_BLOCKED_MESSAGE);++ it('explains a rejected cross-root move instead of a generic failure', () => {+ expect(sessionMoveFailureFeedback('project', blocked)).toEqual({+ level: 'warning',+ key: 'ccAgent.sidebar.sessionMenu.moveToProjectWorktreeBlocked',+ });+ // browseProject 也是改目录的移动,同样命中。+ expect(sessionMoveFailureFeedback('browseProject', blocked).level).toBe('warning');+ });++ it('keeps the existing wording for other failures and for dialogue moves', () => {+ expect(sessionMoveFailureFeedback('project', new Error('boom'))).toEqual({+ level: 'error',+ key: 'ccAgent.sidebar.sessionMenu.moveToProjectFailed',+ });+ // 「移到对话」不改 workingDir,即使拿到同码错误也不该说成「不能移出 worktree」。+ expect(sessionMoveFailureFeedback('dialogue', blocked)).toEqual({+ level: 'error',+ key: 'ccAgent.sidebar.sessionMenu.moveToDialogueFailed',+ });+ });+});diff --git a/apps/desktop/src/shared/worktreeMoveGuardError.ts b/apps/desktop/src/shared/worktreeMoveGuardError.tsnew file mode 100644index 0000000000..01ddd3a498--- /dev/null+++ b/apps/desktop/src/shared/worktreeMoveGuardError.ts@@ -0,0 +1,64 @@+import { extractIpcError } from './ipcError';++/**+ * 共享写路径拒绝「worktree 会话被移出绑定根」时使用的错误码与文案。+ *+ * 归属判定只有主进程一处权威(`main/localDb/ipc/sessions.ts` 的 `updateSessionInDb`+ * 守卫)。renderer 曾用异步镜像做过预检,但任何「先查询、再决定」都关不掉「查询通过后、+ * 写入前恰好回收」的竞态:缓存或复核拿到旧绑定时会把主进程本会放行的移动挡在请求之前,+ * 用户只能重试。因此 renderer 不再自行判定,只按这条错误识别「被归属守卫拒绝」,并复用+ * 同一条提示文案 —— 拦截与反馈都以共享写路径为准。+ */+export const WORKTREE_MOVE_BLOCKED_CODE = 'PRECONDITION_FAILED';++export const WORKTREE_MOVE_BLOCKED_MESSAGE =+ 'A worktree session cannot be moved outside its worktree; worktree handoff is required';++/**+ * `extractIpcError` 对同一形状有两种返回:`isIpcError` 分支原样给出 `Error.message`+ * (仍带 `[CODE] ` 前缀),message 正则分支给的是去掉前缀的正文。统一按后者比较。+ */+function stripCodePrefix(message: string): string {+ return message.replace(/^\[[A-Z0-9_]+\]\s*/, '').trim();+}++/**+ * 判断错误是否来自 worktree 归属守卫。`PRECONDITION_FAILED` 也被其它守卫复用,所以必须+ * 同时匹配文案,避免把别的失败说成「worktree 会话不能移出」。+ */+export function isWorktreeMoveBlockedError(err: unknown): boolean {+ const ipcError = extractIpcError(err);+ return (+ ipcError?.code === WORKTREE_MOVE_BLOCKED_CODE &&+ stripCodePrefix(ipcError.message) === WORKTREE_MOVE_BLOCKED_MESSAGE+ );+}++/** 移动失败时该给用户的反馈:warning 是「产品暂不支持」的说明,error 是通用报错。 */+export interface SessionMoveFailureFeedback {+ level: 'warning' | 'error';+ key: string;+}++/**+ * 「移动到项目 / 移动到对话」失败后的提示选择。「移到对话」不改 workingDir,不会触发+ * 归属守卫;只有改目录的移动才可能命中它,这时用专门的说明而不是笼统的「移动失败」。+ */+export function sessionMoveFailureFeedback(+ moveKind: string,+ err: unknown,+): SessionMoveFailureFeedback {+ if (moveKind !== 'dialogue' && isWorktreeMoveBlockedError(err)) {+ return {+ level: 'warning',+ key: 'ccAgent.sidebar.sessionMenu.moveToProjectWorktreeBlocked',+ };+ }+ return {+ level: 'error',+ key:+ moveKind === 'dialogue'+ ? 'ccAgent.sidebar.sessionMenu.moveToDialogueFailed'+ : 'ccAgent.sidebar.sessionMenu.moveToProjectFailed',+ };+}