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): 保留设置页往返后的设备分组折叠状态

DavidShen4c2ed9667ab3
diff --git a/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx b/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx
index a39cf20e9a..c7aab67f87 100644
--- a/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx
@@ -181,6 +181,58 @@ describe('Online device headers without tasks', () => {
});
});
+// #6615: entering Settings unmounts ProjectsSection. Existing device tests only
+// rerender it, so they miss lost collapse state. Unit tier: real component clicks
+// and unmount/remount with jsdom storage; the smallest input is two empty devices.
+describe('Device collapse state after remounting', () => {
+ const localName = 'ccAgent.sidebar.deviceGroup.local';
+ const remoteName = 'Remote device';
+ const deviceHeader = (name: string) => screen.getByText(name).closest('button')!;
+
+ it.each([
+ { collapsedNames: [localName] },
+ { collapsedNames: [remoteName] },
+ { collapsedNames: [localName, remoteName] },
+ ])(
+ 'restores individually collapsed devices: $collapsedNames',
+ ({ collapsedNames }) => {
+ const p = props(true);
+ const view = render(<ProjectsSection {...p} />);
+ for (const name of [localName, remoteName]) {
+ expect(deviceHeader(name).getAttribute('aria-expanded')).toBe('true');
+ }
+ for (const name of collapsedNames) fireEvent.click(deviceHeader(name));
+ view.unmount();
+
+ render(<ProjectsSection {...p} />);
+ for (const name of [localName, remoteName]) {
+ expect(deviceHeader(name).getAttribute('aria-expanded')).toBe(
+ String(!collapsedNames.includes(name)),
+ );
+ }
+ },
+ );
+
+ it('remembers bulk collapse and clears it after expanding all', () => {
+ const p = props(true);
+ let view = render(<ProjectsSection {...p} />);
+ fireEvent.click(screen.getByText('ccAgent.sidebar.foldAll.collapseDevices'));
+ view.unmount();
+
+ view = render(<ProjectsSection {...p} />);
+ for (const name of [localName, remoteName]) {
+ expect(deviceHeader(name).getAttribute('aria-expanded')).toBe('false');
+ }
+ fireEvent.click(screen.getByText('ccAgent.sidebar.foldAll.expandAll'));
+ view.unmount();
+
+ render(<ProjectsSection {...p} />);
+ for (const name of [localName, remoteName]) {
+ expect(deviceHeader(name).getAttribute('aria-expanded')).toBe('true');
+ }
+ });
+});
+
describe('Offline device header names', () => {
function cachedProjectProps(): ProjectsSectionProps {
const p = props(true);
diff --git a/apps/desktop/src/renderer/__tests__/useSidebarFilter.test.ts b/apps/desktop/src/renderer/__tests__/useSidebarFilter.test.ts
index bf8f6c3568..70b52c5b02 100644
--- a/apps/desktop/src/renderer/__tests__/useSidebarFilter.test.ts
+++ b/apps/desktop/src/renderer/__tests__/useSidebarFilter.test.ts
@@ -26,6 +26,8 @@ import {
PROJECT_ORDER_KEY,
TASK_INFO_KEY,
MANUAL_PROJECT_ORDER_KEY,
+ DEVICE_GROUP_COLLAPSED_KEY,
+ loadDeviceGroupCollapsedKeys,
DIALOGUE_GROUP_COLLAPSED_KEY,
DIALOGUE_GROUP_ALL_KEY,
loadStatus,
@@ -409,6 +411,22 @@ describe('taskInfoFields(任务行右侧信息复选)', () => {
});
});
+// #6615: component remount tests cover valid device preferences; this unit test
+// protects the storage boundary against malformed values before mounting React.
+describe('deviceGroupCollapsedKeys', () => {
+ beforeEach(() => installMemoryLocalStorage());
+ afterEach(() => uninstallLocalStorage());
+
+ it.each([
+ { raw: '{not-json', expected: [] },
+ { raw: '{"local":true}', expected: [] },
+ { raw: '["local",42,null,"device-1"]', expected: ['local', 'device-1'] },
+ ])('safely restores device collapse preferences from $raw', ({ raw, expected }) => {
+ localStorage.setItem(DEVICE_GROUP_COLLAPSED_KEY, raw);
+ expect([...loadDeviceGroupCollapsedKeys()]).toEqual(expected);
+ });
+});
+
describe('dialogueGroupCollapsedKeys(对话组按分组 key 独立折叠)', () => {
beforeEach(() => installMemoryLocalStorage());
afterEach(() => uninstallLocalStorage());
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/helpers/sidebarFilterCore.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/helpers/sidebarFilterCore.ts
index 62756a1be5..5f39f51b04 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/helpers/sidebarFilterCore.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/helpers/sidebarFilterCore.ts
@@ -33,6 +33,7 @@ export const VENDOR_KEY = 'cc-agent.sidebar.filter.vendor';
export const GROUP_BY_KEY = 'cc-agent.sidebar.filter.groupBy';
export const GROUP_DIALOGUE_KEY = 'cc-agent.sidebar.filter.groupDialogue';
export const GROUP_DEVICE_KEY = 'cc-agent.sidebar.filter.groupDevice';
+export const DEVICE_GROUP_COLLAPSED_KEY = 'cc-agent.sidebar.deviceGroupCollapsed';
export const DIALOGUE_GROUP_COLLAPSED_KEY = 'cc-agent.sidebar.dialogueGroupCollapsed';
/** 单一混排列表(未按设备切段)里唯一对话组的折叠状态 key。 */
export const DIALOGUE_GROUP_ALL_KEY = 'all';
@@ -383,6 +384,34 @@ export function persistGroupDevice(groupDevice: boolean): void {
}
}
+/* ==================== device group collapsed load/persist ==================== */
+
+/** 最外层设备段按 'local' / deviceId 记忆折叠,属于本地显示偏好,默认展开。 */
+export function loadDeviceGroupCollapsedKeys(): ReadonlySet<string> {
+ const storage = safeStorage();
+ if (!storage) return new Set();
+ try {
+ const raw = storage.getItem(DEVICE_GROUP_COLLAPSED_KEY);
+ if (!raw) return new Set();
+ const parsed: unknown = JSON.parse(raw);
+ if (!Array.isArray(parsed)) return new Set();
+ return new Set(parsed.filter((v): v is string => typeof v === 'string'));
+ } catch (err) {
+ log.warn('[useSidebarFilter] failed to read deviceGroupCollapsed:', err);
+ return new Set();
+ }
+}
+
+export function persistDeviceGroupCollapsedKeys(keys: ReadonlySet<string>): void {
+ const storage = safeStorage();
+ if (!storage) return;
+ try {
+ storage.setItem(DEVICE_GROUP_COLLAPSED_KEY, JSON.stringify([...keys]));
+ } catch (err) {
+ log.warn('[useSidebarFilter] failed to persist deviceGroupCollapsed:', err);
+ }
+}
+
/* ==================== dialogue group collapsed load/persist ==================== */
/**
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx
index c29579ef4a..b6f4d047ff 100644
--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx
@@ -75,6 +75,8 @@ import {
normalizeManualProjectOrder,
mergeVisibleReorder,
snapshotManualProjectOrder,
+ loadDeviceGroupCollapsedKeys,
+ persistDeviceGroupCollapsedKeys,
loadDialogueGroupCollapsedKeys,
persistDialogueGroupCollapsedKeys,
DIALOGUE_GROUP_ALL_KEY,
@@ -726,8 +728,12 @@ export function ProjectsSection({
filter.manualProjectOrder,
priorityContext,
]);
- // 设备段折叠(E 期):本机段 key 'local'。
- const [collapsedDevices, setCollapsedDevices] = useState<ReadonlySet<string>>(new Set());
+ // 设备段折叠按本地显示偏好恢复,设置页往返导致重挂时也保留。
+ const [collapsedDevices, setCollapsedDevices] = useState(loadDeviceGroupCollapsedKeys);
+ useEffect(() => {
+ // 单设备切换、批量收起和全部展开共用保存路径。
+ persistDeviceGroupCollapsedKeys(collapsedDevices);
+ }, [collapsedDevices]);
// 「对话」组折叠:与项目行折叠同级的分组状态(用户裁决:对话组的折叠交互与
// 项目分组一致,含「收起所有分组」批量操作)。按分组 key 记忆——单一列表只有
// 一个组(DIALOGUE_GROUP_ALL_KEY);按设备分组时每个设备段各有一个对话组,