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): 移动预检的拦截判定前先向 main 复核活绑定

Zhang Yunjind46256063ecd
diff --git a/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx b/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx
index a1148f98a7..65edeefa4c 100644
--- a/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/worktreeContextRecycleRefresh.test.tsx
@@ -13,6 +13,7 @@ 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', () => ({
@@ -125,7 +126,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<void>;
+ let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;
function Actions() {
refresh = useRefreshWorktreeForSession();
return <><Probe /><ActiveProbe /></>;
@@ -160,7 +161,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<void>;
+ let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;
function Actions() {
refresh = useRefreshWorktreeForSession();
return <><Probe /><ActiveProbe /></>;
@@ -204,7 +205,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<void>;
+ let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;
function Actions() {
report = useReportWorktreeLiveness();
original = useWorktreeForSession('open') ?? original;
@@ -392,7 +393,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<void>;
+ let refresh!: (sessionId: string) => Promise<WorktreeMeta | null>;
function Actions() {
refresh = useRefreshWorktreeForSession();
return <Probe />;
diff --git a/apps/desktop/src/renderer/contexts/WorktreeContext.tsx b/apps/desktop/src/renderer/contexts/WorktreeContext.tsx
index 02281d042a..735e054d5a 100644
--- a/apps/desktop/src/renderer/contexts/WorktreeContext.tsx
+++ b/apps/desktop/src/renderer/contexts/WorktreeContext.tsx
@@ -35,8 +35,11 @@ interface WorktreeContextValue {
/** 保留失效目录的登记信息,供打开中的任务在聚焦/恢复时重新探测。 */
rawMetas: Record<string, WorktreeMeta>;
reportLiveness: (meta: WorktreeMeta, live: boolean) => void;
- /** 从 main 查询并更新单个 session 的 worktree 缓存。 */
- refreshSession: (sessionId: string) => Promise<void>;
+ /**
+ * 从 main 查询并更新单个 session 的 worktree 缓存,并返回本次查询结果 ——
+ * 调用方(如移动前的归属复核)可以直接用它判定,不必等缓存重渲染。
+ */
+ refreshSession: (sessionId: string) => Promise<WorktreeMeta | null>;
}
const WorktreeContext = createContext<WorktreeContextValue | null>(null);
@@ -77,9 +80,9 @@ export function WorktreeProvider({ children }: { children: ReactNode }) {
}
}, []);
- const refreshSession = useCallback(async (sessionId: string) => {
+ const refreshSession = useCallback(async (sessionId: string): Promise<WorktreeMeta | null> => {
const getForSession = window.electronAPI?.worktreeGetForSession;
- if (!getForSession) return;
+ if (!getForSession) return null;
const generation = ++eventGenerationRef.current;
sessionEventGenerationsRef.current.set(sessionId, generation);
const fullRefreshGenerationAtStart = fullRefreshGenerationRef.current;
@@ -88,10 +91,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;
+ // 代次已被更新的请求取代时不再回写缓存,但本次查询结果依旧新鲜,照常返回。
+ if (!isCurrent()) return next;
setSnapshot((current) => {
if (!isCurrent()) return current;
const metas = { ...current.metas };
@@ -101,8 +104,10 @@ 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;
}
}, []);
@@ -201,6 +206,6 @@ export function useRawWorktrees(): Record<string, WorktreeMeta> {
}
/** 让创建/恢复等明确知道 sessionId 的调用方只刷新对应 worktree。 */
-export function useRefreshWorktreeForSession(): (sessionId: string) => Promise<void> {
+export function useRefreshWorktreeForSession(): (sessionId: string) => Promise<WorktreeMeta | null> {
return useCtx().refreshSession;
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
index d8722c6010..89eebdf671 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
@@ -49,7 +49,7 @@ 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 } from '@/contexts/WorktreeContext';
+import { useRawWorktrees, useRefreshWorktreeForSession } from '@/contexts/WorktreeContext';
import { useCCSessions } from '@/hooks/useCCSessions';
import { useRecentWorkdirs } from '@/hooks/useRecentWorkdirs';
import { refreshPendingAlerts } from '@/hooks/usePendingAlertAttention';
@@ -223,7 +223,7 @@ import {
} from './lib/sidebarCollapseConfig';
import { getSessionListCollapseView } from './lib/sessionListCollapse';
import { hasSessionSelectionModifier, type SessionClickModifiers } from './sidebar/SessionItem';
-import { crossesWorktreeBoundary } from './lib/sessionMoveGuard';
+import { crossesWorktreeBoundary, shouldBlockWorktreeMove } from './lib/sessionMoveGuard';
import type { SessionMoveTarget } from './sidebar/sessionMoveTarget';
import {
DIALOGUE_FILTER_KEY,
@@ -832,6 +832,7 @@ function ExpandedView({
// worktree 归属取 store 镜像(与 main 的 worktreeStore 同源):回收后仍留历史路径、
// 或存量半移动行的会话,不能靠 cwd 猜归属。
const worktreeBindings = useRawWorktrees();
+ const refreshWorktreeBinding = useRefreshWorktreeForSession();
const { sessions, refreshSessions, patchLocal, effectiveIncludeArchived } = sessionsHook;
const {
hiddenProjectKeys,
@@ -2722,8 +2723,15 @@ function ExpandedView({
// (侧栏按新项目归组,聊天框底部路径仍指旧 worktree)。判定放在目标目录确定**之后**:
// browseProject 选同一 worktree 根内的子目录仍然放行,跨根才拦;归属取活绑定
// (worktreeStore 镜像),口径与 Main 的守卫一致;「移到对话」不改目录、不经过这里。
- const boundWorktreePath = worktreeBindings[sessionId]?.path ?? null;
- if (targetWorkingDir && crossesWorktreeBoundary(boundWorktreePath, targetWorkingDir)) {
+ // 缓存判定要拦时再向 main 复核一次,避免拿已被回收的旧绑定误拦。
+ if (
+ targetWorkingDir &&
+ (await shouldBlockWorktreeMove(
+ worktreeBindings[sessionId]?.path ?? null,
+ targetWorkingDir,
+ async () => (await refreshWorktreeBinding(sessionId))?.path ?? null,
+ ))
+ ) {
toast.warning(t('ccAgent.sidebar.sessionMenu.moveToProjectWorktreeBlocked'));
return;
}
@@ -2783,6 +2791,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.tsx
index a7418ae117..7d9681af31 100644
--- a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
@@ -76,8 +76,8 @@ import {
MENU_SUB_CONTENT_CLASS,
} from './sidebar/menuStyles';
import { SessionProjectMoveSubmenu } from './sidebar/SessionProjectMoveSubmenu';
-import { crossesWorktreeBoundary } from './lib/sessionMoveGuard';
-import { useWorktreeForSession } from '@/contexts/WorktreeContext';
+import { crossesWorktreeBoundary, shouldBlockWorktreeMove } from './lib/sessionMoveGuard';
+import { useRefreshWorktreeForSession, useWorktreeForSession } from '@/contexts/WorktreeContext';
import type { SessionMoveTarget } from './sidebar/sessionMoveTarget';
import { SessionShareExportDialog } from './sidebar/SessionShareExportDialog';
import { SessionBranchTreeDialog } from './SessionBranchTreeDialog';
@@ -153,6 +153,7 @@ export function SessionContentHeader({
// worktree 归属取 store 镜像(与 main 的 worktreeStore 同源):回收后仍留历史路径、
// 或存量半移动行的会话,不能靠 cwd 猜归属。
const worktreeBinding = useWorktreeForSession(session.id, { includeInvalid: true });
+ const refreshWorktreeBinding = useRefreshWorktreeForSession();
const { confirm: confirmDialog } = useConfirmDialog();
const { runSessionAction, unarchiveSession } = useSessionLifecycleActions();
@@ -360,9 +361,16 @@ export function SessionContentHeader({
// 与 CCAgentSidebarUpper 同款:worktree 会话不能改到它绑定 worktree 之外的目录
// (半移动)。同样放在目标目录确定之后,同一 worktree 根内的目录调整仍放行,
- // 归属取活绑定;
+ // 归属取活绑定;缓存判定要拦时再向 main 复核一次(回收事件落地有间隙)。
// 「移到对话」不改目录、不经过这里。
- if (targetWorkingDir && crossesWorktreeBoundary(worktreeBinding?.path ?? null, targetWorkingDir)) {
+ if (
+ targetWorkingDir &&
+ (await shouldBlockWorktreeMove(
+ worktreeBinding?.path ?? null,
+ targetWorkingDir,
+ async () => (await refreshWorktreeBinding(session.id))?.path ?? null,
+ ))
+ ) {
toast.warning(t('ccAgent.sidebar.sessionMenu.moveToProjectWorktreeBlocked'));
return;
}
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.ts
index 01f359c846..24435c7a4c 100644
--- 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.ts
@@ -1,6 +1,10 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
-import { crossesWorktreeBoundary, managedWorktreeRootOf } from '../sessionMoveGuard';
+import {
+ crossesWorktreeBoundary,
+ managedWorktreeRootOf,
+ shouldBlockWorktreeMove,
+} from '../sessionMoveGuard';
describe('managedWorktreeRootOf', () => {
it('folds roots and their descendants to the same managed worktree root', () => {
@@ -48,14 +52,32 @@ describe('crossesWorktreeBoundary', () => {
expect(crossesWorktreeBoundary(`${worktree}/src`, `${worktree}/tests`)).toBe(false);
});
- it('never blocks sessions without a live worktree binding', () => {
- // 没有绑定(普通任务,或 store 里已回收掉登记的会话)一律放行——归属真源是
+ 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(
diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.ts b/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.ts
index 02629cf049..0e45cbe16f 100644
--- a/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/lib/sessionMoveGuard.ts
@@ -83,3 +83,20 @@ export function crossesWorktreeBoundary(
// 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);
+}