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): refresh project owner state after same-account renewal

Chrisd5718d8b5140
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index 8e5c2dd165..964cd0cd81 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -3018,7 +3018,7 @@ export function NewMakerDraftRoute() {
handleWorkingDirChange(path);
} catch (err) {
log.warn('[new-maker] restore selected project failed', err);
- toast.error(t('ccAgent.sidebar.createProjectFailed'));
+ toast.error(t('ccAgent.sidebar.selectFolderFailed'));
} finally {
markSendInFlight(false);
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHiddenProjectsFilterSync.test.tsx b/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHiddenProjectsFilterSync.test.tsx
index b44c537ccf..6c764764c9 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHiddenProjectsFilterSync.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHiddenProjectsFilterSync.test.tsx
@@ -5,10 +5,15 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
import { PROJECTS_KEY, useSidebarFilter } from '../useSidebarFilter';
import { useHiddenProjects } from '../useHiddenProjects';
-import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+import { getDataOwnerGeneration, setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
import { sidebarOwnerStorageKey } from '@/lib/sidebarOwnerStorage';
+import { restoreSelectedHiddenProject } from '../../lib/sidebarProjectRestore';
import type { DataOwnerPushStamp } from '../../../../../shared/dataOwnerPush';
+vi.mock('@/contexts/AuthContext', () => ({
+ useAuth: () => ({ dataOwnerGeneration: getDataOwnerGeneration().generation }),
+}));
+
type HiddenProjectsListener = (projectKeys: string[], ownerStamp: DataOwnerPushStamp) => void;
const PROJECT_A = 'local:/workspace/a';
@@ -164,6 +169,12 @@ describe('hidden-project filter synchronization', () => {
ownerGeneration: 2,
});
});
+ const originalLoad = window.electronAPI.sidebarSettings.loadSnapshot;
+ window.electronAPI.sidebarSettings.loadSnapshot = () => ({
+ ...originalLoad(), dataOwnerId: 'owner-b', ownerGeneration: 2,
+ hiddenProjectKeys: [PROJECT_A],
+ });
+ view.rerender();
expect([...view.result.current.hiddenProjectKeys]).toEqual([]);
await act(async () => {
@@ -172,6 +183,74 @@ describe('hidden-project filter synchronization', () => {
expect(setProjectHidden).toHaveBeenCalledWith(PROJECT_A, true, OWNER_STAMP);
});
+ it('restores a selected folder after a same-account refresh without remounting', async () => {
+ initialHiddenProjectKeys = [PROJECT_A];
+ window.localStorage.setItem(OWNER_PROJECTS_KEY, JSON.stringify([PROJECT_B]));
+ const view = renderHook(() => {
+ const hidden = useHiddenProjects();
+ const filter = useSidebarFilter(hidden.hiddenProjectKeys, hidden.initialSnapshot);
+ return { ...hidden, filter };
+ });
+ const staleWrite = view.result.current.setProjectHidden;
+ const refreshed = { ...OWNER_STAMP, ownerGeneration: 2 };
+ const originalLoad = window.electronAPI.sidebarSettings.loadSnapshot;
+ window.electronAPI.sidebarSettings.loadSnapshot = () => ({ ...originalLoad(), ...refreshed });
+ setProjectHidden.mockImplementation(async (_key, _hidden, stamp) => {
+ if (stamp.ownerGeneration !== refreshed.ownerGeneration) {
+ throw new Error('[PRECONDITION_FAILED] active account changed during sidebar mutation');
+ }
+ for (const listener of hiddenProjectsListeners) listener([], refreshed);
+ return true;
+ });
+ act(() => setDataOwnerGeneration('owner-a', 2));
+ view.rerender();
+ await expect(staleWrite(PROJECT_A, false)).rejects.toThrow('PRECONDITION_FAILED');
+
+ await act(async () => {
+ await restoreSelectedHiddenProject({
+ projectKey: PROJECT_A,
+ hiddenProjectKeys: view.result.current.hiddenProjectKeys,
+ setProjectHidden: view.result.current.setProjectHidden,
+ getCurrentProjectKeys: () => new Set([PROJECT_A, PROJECT_B]),
+ ensureProjectIncluded: view.result.current.filter.ensureProjectIncluded,
+ localPlatform: 'linux',
+ });
+ });
+ expect(setProjectHidden).toHaveBeenCalledWith(PROJECT_A, false, refreshed);
+ expect([...view.result.current.hiddenProjectKeys]).toEqual([]);
+ expect(view.result.current.filter.projects).toEqual([PROJECT_B, PROJECT_A]);
+ await act(async () => {
+ await view.result.current.filter.promotePin(PROJECT_A);
+ });
+ expect(window.electronAPI.sidebarSettings.mutatePinnedOrder).toHaveBeenLastCalledWith(
+ { kind: 'promote', entryId: PROJECT_A },
+ refreshed,
+ );
+ });
+
+ it('rehydrates current hidden projects after refresh and ignores late old-generation pushes', () => {
+ const view = renderHook(() => useHiddenProjects());
+ const refreshed = { ...OWNER_STAMP, ownerGeneration: 2 };
+ const originalLoad = window.electronAPI.sidebarSettings.loadSnapshot;
+ window.electronAPI.sidebarSettings.loadSnapshot = () => ({
+ ...originalLoad(), ...refreshed, hiddenProjectKeys: [PROJECT_B],
+ });
+ act(() => setDataOwnerGeneration('owner-a', 2));
+ view.rerender();
+ expect([...view.result.current.hiddenProjectKeys]).toEqual([PROJECT_B]);
+ act(() => {
+ for (const listener of hiddenProjectsListeners) listener([PROJECT_A], OWNER_STAMP);
+ });
+ expect([...view.result.current.hiddenProjectKeys]).toEqual([PROJECT_B]);
+ act(() => {
+ for (const listener of hiddenProjectsListeners) listener([PROJECT_A], refreshed);
+ });
+ expect([...view.result.current.hiddenProjectKeys]).toEqual([PROJECT_A]);
+ expect(hiddenProjectsListeners).toHaveLength(1);
+ view.unmount();
+ expect(hiddenProjectsListeners).toHaveLength(0);
+ });
+
it('fails closed when the synchronous snapshot belongs to another owner', () => {
window.electronAPI.sidebarSettings.loadSnapshot = () => ({
dataOwnerId: 'owner-b',
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useHiddenProjects.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useHiddenProjects.ts
index 5adc6c320b..6ff867ea64 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useHiddenProjects.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useHiddenProjects.ts
@@ -4,6 +4,7 @@ import {
getDataOwnerGeneration,
isDataOwnerPushStampCurrent,
} from '@/contexts/dataOwnerGeneration';
+import { useAuth } from '@/contexts/AuthContext';
import type { DataOwnerPushStamp } from '../../../../shared/dataOwnerPush';
import type { SidebarSettingsSnapshot } from '../../../../shared/sidebarSettings';
import { normalizeProjectKey } from '../lib/projectGrouping';
@@ -19,6 +20,7 @@ function normalizeHiddenProjectKeys(rawKeys: readonly string[]): Set<string> {
export interface UseHiddenProjectsReturn {
hiddenProjectKeys: ReadonlySet<string>;
+ /** Initial snapshot for the current same-account generation. */
initialSnapshot: SidebarSettingsSnapshot;
/** Resolves true only when the latest main-process snapshot changed. */
setProjectHidden: (projectKey: string, hidden: boolean) => Promise<boolean>;
@@ -29,10 +31,23 @@ export interface UseHiddenProjectsReturn {
* every renderer window in sync with the main-process preference store.
*/
export function useHiddenProjects(): UseHiddenProjectsReturn {
- const [initialSnapshot] = useState<SidebarSettingsSnapshot>(() => {
+ const { dataOwnerGeneration } = useAuth();
+ const [mountedOwner] = useState(getDataOwnerGeneration);
+ // Same-account repairs keep this tree mounted but advance Main's write fence.
+ // Rehydrate the snapshot and its consumers (including pinned order) for that
+ // generation. A real account switch must never rebind this old tree to B.
+ const initialSnapshot = useMemo<SidebarSettingsSnapshot>(() => {
+ const currentOwner = getDataOwnerGeneration();
+ const owner =
+ currentOwner.dataOwnerId === mountedOwner.dataOwnerId ? currentOwner : mountedOwner;
const snapshot = window.electronAPI.sidebarSettings.loadSnapshot();
- if (isDataOwnerPushStampCurrent(snapshot)) return snapshot;
- const owner = getDataOwnerGeneration();
+ if (
+ snapshot.dataOwnerId === mountedOwner.dataOwnerId &&
+ snapshot.ownerGeneration === dataOwnerGeneration &&
+ isDataOwnerPushStampCurrent(snapshot)
+ ) {
+ return snapshot;
+ }
return {
dataOwnerId: owner.dataOwnerId,
ownerGeneration: owner.generation,
@@ -41,7 +56,7 @@ export function useHiddenProjects(): UseHiddenProjectsReturn {
hiddenProjectKeys: [],
hiddenMainViewGhostIds: [],
};
- });
+ }, [mountedOwner, dataOwnerGeneration]);
const [hiddenProjectKeys, setHiddenProjectKeys] = useState<Set<string>>(() =>
normalizeHiddenProjectKeys(initialSnapshot.hiddenProjectKeys),
);
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 44535bce64..2bd856505a 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -10498,6 +10498,7 @@
"projects": "Projects",
"newProject": "New project",
"createProjectFailed": "Failed to create project",
+ "selectFolderFailed": "Could not select folder. Try again.",
"projectsToggleExpand": "Expand all project sessions",
"projectsToggleCollapse": "Collapse all project sessions",
"filterAria": "Sidebar settings (Status: {{status}}, Harness: {{vendor}}, Last activity: {{lastActivity}}, Group by: {{groupBy}}, Sort by: {{sortBy}}, Projects: {{projects}})",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index b187137c6e..6f5bca2578 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -10483,6 +10483,7 @@
"projects": "プロジェクト",
"newProject": "新規プロジェクト",
"createProjectFailed": "プロジェクトの作成に失敗しました",
+ "selectFolderFailed": "フォルダーを選択できませんでした。もう一度お試しください。",
"projectsToggleExpand": "すべてのプロジェクトセッションを展開",
"projectsToggleCollapse": "すべてのプロジェクトセッションを折りたたむ",
"filterAria": "サイドバー表示設定(ステータス:{{status}}、Harness:{{vendor}}、最終アクティビティ:{{lastActivity}}、グループ:{{groupBy}}、並び替え:{{sortBy}}、プロジェクト:{{projects}})",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 6b3d1d63c1..401ca14b36 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -10483,6 +10483,7 @@
"projects": "프로젝트",
"newProject": "새 프로젝트",
"createProjectFailed": "프로젝트 생성 실패",
+ "selectFolderFailed": "폴더를 선택하지 못했습니다. 다시 시도해 주세요.",
"projectsToggleExpand": "모든 프로젝트 세션 펼치기",
"projectsToggleCollapse": "모든 프로젝트 세션 접기",
"filterAria": "사이드바 표시 설정(상태: {{status}}, Harness: {{vendor}}, 최근 활동: {{lastActivity}}, 그룹: {{groupBy}}, 정렬: {{sortBy}}, 프로젝트: {{projects}})",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 13934cdbe2..3b917ee24f 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -10483,6 +10483,7 @@
"projects": "项目",
"newProject": "新建项目",
"createProjectFailed": "新建项目失败",
+ "selectFolderFailed": "选择目录失败,请重试",
"projectsToggleExpand": "展开所有项目任务",
"projectsToggleCollapse": "收起所有项目任务",
"filterAria": "侧边栏显示设置(状态:{{status}},Harness:{{vendor}},最近活跃:{{lastActivity}},分组:{{groupBy}},排序:{{sortBy}},项目:{{projects}})",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 755a7e5b4a..52a5d77ba6 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -10483,6 +10483,7 @@
"projects": "專案",
"newProject": "新建專案",
"createProjectFailed": "新建專案失敗",
+ "selectFolderFailed": "選擇目錄失敗,請重試",
"projectsToggleExpand": "展開所有專案任務",
"projectsToggleCollapse": "收起所有專案任務",
"filterAria": "側邊欄顯示設定(狀態:{{status}},Harness:{{vendor}},最近活躍:{{lastActivity}},分組:{{groupBy}},排序:{{sortBy}},專案:{{projects}})",