Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
perf(desktop): 减少多项目侧栏的重复分组与渲染
david1ab32368d39c
diff --git a/apps/desktop/src/renderer/__tests__/botGroupLampRendering.test.tsx b/apps/desktop/src/renderer/__tests__/botGroupLampRendering.test.tsxindex cadf017ce9..208b4b1722 100644--- a/apps/desktop/src/renderer/__tests__/botGroupLampRendering.test.tsx+++ b/apps/desktop/src/renderer/__tests__/botGroupLampRendering.test.tsx@@ -7,6 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { getStartingSessionIds, markSessionStarting, resetSessionStartingStoreForTests, useStartingSessionIds } from '@/lib/sessionStartingStore';import { remoteProjectsStore } from '@/features/device-link/remoteProjectsStore';import type { Session } from '@/lib/ccAgent.types';+import { groupSessions } from '@/features/cc-agent/lib/projectGrouping';import {applyRemoteSessionActivity,clearRemoteSessionActivity,@@ -40,8 +41,12 @@ vi.mock('../features/cc-agent/sidebar/sections/UnclassifiedSection', () => ({ Unvi.mock('@/features/bots/BotAvatar', () => ({ BotAvatar: () => <span>Bot avatar</span> }));// Keep ProjectsSection, its private SessionGroupNode, SessionEntryList, collapse model,// lamp aggregation and remote store real. Only unrelated services/leaf rows are stubbed.+const leafRowRenders = vi.hoisted(() => new Map<string, number>());vi.mock('../features/cc-agent/sidebar/SessionItem', () => ({- SessionItem: ({ session, onClick }: { session: Session; onClick: (id: string) => void }) => <button data-testid={`row-${session.id}`} onClick={() => onClick(session.id)}>{session.title}</button>,+ SessionItem: ({ session, onClick }: { session: Session; onClick: (id: string) => void }) => {+ leafRowRenders.set(session.id, (leafRowRenders.get(session.id) ?? 0) + 1);+ return <button data-testid={`row-${session.id}`} onClick={() => onClick(session.id)}>{session.title}</button>;+ },}));vi.mock('../features/cc-agent/sidebar/SessionCard', () => ({ SessionCard: () => null }));vi.mock('../features/cc-agent/sidebar/AutomationSessionGroupItem', () => ({ AutomationSessionGroupItem: () => null }));@@ -88,6 +93,36 @@ beforeEach(() => {afterEach(() => { remoteProjectsStore.__resetPinnedOriginsForTest(); cleanup(); resetSessionStartingStoreForTests(); vi.useRealTimers(); clearRemoteSessionActivity(); localStorage.clear(); });const phases = ['running', 'needs-interaction', 'error', 'completed'] as const;++// #7469, unit: actual ProjectsSection -> ProjectNode memo -> SessionEntryList.+// Existing lamp tests did not update a different project; two one-row projects+// expose needless subtree rendering while retaining live remote lamp updates.+it('skips an untouched project subtree on a title patch and still updates its remote lamp', () => {+ const p = props(false);+ const rows = p.bots![0].sessions.slice(0, 2).map((s, i) => ({+ ...s, workingDir: `/project-${i}`, workspaceKind: 'project' as const,+ userSendAt: s.updatedAt, _count: { messages: 1 },+ }));+ p.bots = [];+ p.projects = groupSessions(rows).projects;+ p.allKnownProjects = p.projects;+ const view = render(<ProjectsSection {...p} />);+ leafRowRenders.clear();+ const changed = { ...p.projects[0], sessions: [{ ...p.projects[0].sessions[0], title: 'Fresh title' }] };+ view.rerender(<ProjectsSection {...p} projects={[changed, p.projects[1]]} />);+ expect(screen.getByText('Fresh title')).toBeTruthy();+ expect(leafRowRenders.get(rows[1].id) ?? 0).toBe(0);+ const project = p.projects[1];+ view.rerender(<ProjectsSection {...p} projects={[changed, project]} collapsed={new Set([project.projectKey])} />);+ const header = () => screen.getByText(project.displayName).closest('[data-project-header]')!;+ act(() => applyRemoteSessionActivity('remote', {+ sessionId: rows[1].id, phase: 'needs-interaction', attention: true, compactDetail: '',+ }));+ expectLamp(header(), 'needs-interaction');+ act(() => clearRemoteSessionActivity());+ expectLamp(header(), null);+});+function activity(phase: typeof phases[number]) {applyRemoteSessionActivity('remote', { sessionId: 'lit', phase, attention: true, compactDetail: '' });}diff --git a/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts b/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.tsindex 96a2ffa77c..8fe36ba95c 100644--- a/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts+++ b/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts@@ -283,6 +283,28 @@ describe('project grouping projection', () => {expect(select(rows, { remoteProjectAliases, projectAliasMembers: rows }).projects[0].displayName).toBe('Local alias');});+ // #7469, unit: equal-sized alias arrays can change identity even when the+ // displayed rows do not. Existing coverage only added/removed members.+ it.each<Partial<Session>>([+ { remoteHostId: null },+ { workingDir: '/elsewhere' },+ { deviceLinkDeviceId: 'another-device' },+ { workspaceKind: 'dialogue' },+ { status: 'deleted' },+ { orcaRole: 'worker' },+ ])('refreshes alias eligibility for an out-of-filter member change %j', (patch) => {+ const local = session('same-id', { deviceLinkDeviceId: 'device', workingDir: '/repo' });+ const ssh = session('ssh', { deviceLinkDeviceId: 'device', workingDir: '/repo', remoteHostId: 'ssh-a' });+ const rows = [local];+ const remoteProjectAliases = new Map([['device', { platform: 'darwin', aliases: [{ projectKey: 'local:/repo', alias: 'Host alias' }] }]]);+ const select = createProjectGroupsSelector();+ expect(select(rows, { remoteProjectAliases, projectAliasMembers: [local, ssh] }).projects[0].displayName).toBe('repo');+ const options = { remoteProjectAliases, projectAliasMembers: [local, { ...ssh, ...patch }] };+ const result = select(rows, options);+ expect(result).toEqual(groupSessions(rows, options));+ expect(result.projects[0].displayName).toBe('Host alias');+ });+it('reuses equal persistent catalogues but refreshes changed project metadata', () => {const rows = [session('a')];const projects = [diff --git a/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts b/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.tsindex c387de7be6..6943a9c635 100644--- a/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts+++ b/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts@@ -53,6 +53,64 @@ function mk(id: string, partial: Partial<Session> = {}): Session {}describe('remoteProjectsStore', () => {+ // Unit, #7469: a two-row snapshot changing one task must not invalidate the+ // other sidebar row's memo. Existing tests cover whole-snapshot no-ops, not+ // per-row UI identity or its separation from in-flight detail-read fences.+ it('reuses unchanged visible rows without reusing authoritative snapshot identities', () => {+ remoteProjectsStore.setDeviceSessions('host', 'Host', [mk('same'), mk('changed')]);+ remoteProjectsStore.setDeviceSessions('other', 'Other', [mk('same')]);+ const before = remoteProjectsStore.getVisibleMergedRemoteSessions();+ const rawBefore = remoteProjectsStore.getDeviceSessions('host');+ const read = remoteProjectsStore.captureSessionRead('host', 'same');++ remoteProjectsStore.setDeviceSessions('host', 'Host', [+ mk('changed', { title: 'Updated title' }), mk('same'),+ ]);++ const visible = remoteProjectsStore.getVisibleMergedRemoteSessions();+ expect(visible.map(row => [row.deviceLinkDeviceId, row.id, row.title])).toEqual([+ ['host', 'changed', 'Updated title'], ['host', 'same', 'same'], ['other', 'same', 'same'],+ ]);+ expect(visible[0]).not.toBe(before[1]);+ expect(visible[1]).toBe(before[0]);+ expect(visible[2]).toBe(before[2]);+ expect(remoteProjectsStore.getDeviceSessions('host')[1]).not.toBe(rawBefore[0]);+ expect(read()).toBe(false);+ const freshRead = remoteProjectsStore.captureSessionRead('host', 'same');+ expect(freshRead()).toBe(true);+ remoteProjectsStore.applyPatch('host', 'same', { lastActivityAt: '2026-01-02T00:00:00.000Z' });+ expect(freshRead()).toBe(true);+ expect(freshRead.mergeActivity(mk('same')).lastActivityAt).toBe('2026-01-02T00:00:00.000Z');+ });++ // Unit, #7469: structural sharing must compare nested payloads too, and must+ // not resurrect removed rows or hide connection changes behind a UI cache.+ it('updates nested visible data and retires rows on disconnect, deletion and clear', () => {+ const row = { ...mk('a'), extraDirs: ['/first'] };+ remoteProjectsStore.setDeviceSessions('host', 'Host', [row, mk('b')]);+ const before = remoteProjectsStore.getVisibleMergedRemoteSessions();+ remoteProjectsStore.setDeviceSessions('host', 'Host', [+ { ...row, extraDirs: ['/second'] }, mk('b'),+ ]);+ const changed = remoteProjectsStore.getVisibleMergedRemoteSessions();+ expect(changed[0]?.extraDirs).toEqual(['/second']);+ expect(changed[0]).not.toBe(before[0]);+ expect(changed[1]).toBe(before[1]);+ remoteProjectsStore.markDeviceDisconnected('host');+ expect(remoteProjectsStore.getVisibleMergedRemoteSessions().map(s => s.deviceLinkConnectionStatus))+ .toEqual(['disconnected', 'disconnected']);+ remoteProjectsStore.setDeviceSessions('host', 'Renamed host', [row]);+ expect(remoteProjectsStore.getVisibleMergedRemoteSessions()).toMatchObject([+ { id: 'a', deviceLinkDeviceName: 'Renamed host', deviceLinkConnectionStatus: 'connected' },+ ]);+ remoteProjectsStore.applyPatch('host', 'a', { status: 'deleted' });+ expect(remoteProjectsStore.getVisibleMergedRemoteSessions()).toEqual([]);+ remoteProjectsStore.setDeviceSessions('host', 'Host', [row]);+ expect(remoteProjectsStore.getVisibleMergedRemoteSessions()[0]).not.toBe(before[0]);+ remoteProjectsStore.clear();+ expect(remoteProjectsStore.getVisibleMergedRemoteSessions()).toEqual([]);+ });+it('preserves an activity push while accepting an in-flight detail read', () => {const session = mk('handoff');remoteProjectsStore.setDeviceSessions('host', 'Host', [session]);diff --git a/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.ts b/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.tsindex 3430f7502b..3086af646c 100644--- a/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.ts+++ b/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.ts@@ -340,7 +340,12 @@ describe('restoreHiddenProjectIfPresent', () => {});it('reads the latest project catalogue after awaiting the main-process update', async () => {- const projectKeys = new Set([PROJECT_KEY]);+ // #7469, unit: lazy restore must not evaluate an old catalogue before IPC+ // finishes. Exercise actual grouping as the task moves during the await.+ let sessions = [projectSession()];+ const getCurrentProjectKeys = vi.fn(() => collectRestorableProjectKeys({+ sessions, lastActivityCutoff: null, pinnedProjectKeys: new Set(), vendorPredicate: null,+ }));const ensureProjectIncluded = vi.fn();let resolveHidden!: (changed: boolean) => void;const hiddenUpdate = new Promise<boolean>((resolve) => {@@ -351,14 +356,16 @@ describe('restoreHiddenProjectIfPresent', () => {projectKey: PROJECT_KEY,wasHiddenAtPickerOpen: true,setProjectHidden: () => hiddenUpdate,- getCurrentProjectKeys: () => projectKeys,+ getCurrentProjectKeys,ensureProjectIncluded,localPlatform: 'linux',});- projectKeys.delete(PROJECT_KEY);+ expect(getCurrentProjectKeys).not.toHaveBeenCalled();+ sessions = [{ ...sessions[0], workingDir: '/moved' }];resolveHidden(true);await expect(result).resolves.toBe(false);+ expect(getCurrentProjectKeys).toHaveBeenCalledOnce();expect(ensureProjectIncluded).not.toHaveBeenCalled();});});diff --git a/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts b/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.tsindex 5941281e34..4c8293f14e 100644--- a/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts+++ b/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts@@ -59,6 +59,32 @@ function project(}describe('sidebar project sorting', () => {+ // #7469, unit: grouping reuse must survive both production sorting stages.+ // Existing ordering assertions did not catch needless project replacement.+ it('retains an unchanged project through sidebar and main-list sorting but applies a changed order', () => {+ const older = session({ id: 'older', updatedAt: '2026-01-01T00:00:00Z' });+ const newer = session({ id: 'newer', updatedAt: '2026-01-02T00:00:00Z' });+ const node = project({ workingDir: '/repo', displayName: 'repo', sessions: [newer, older] });+ const sorted = sortProjectsForSidebar([node], 'recency', []);+ expect(sorted[0]).toBe(node);+ const entries = buildMainListEntries({+ projects: sorted, dialogues: [], unclassified: [], groupBy: 'project',+ groupDialogue: false, sortBy: 'recency', manualProjectOrder: [],+ });+ expect(entries[0].kind).toBe('project');+ if (entries[0].kind !== 'project') throw new Error('Missing project');+ expect(entries[0].project).toBe(node);+ const reversed = { ...node, sessions: [older, newer] };+ const changed = buildMainListEntries({+ projects: [reversed], dialogues: [], unclassified: [], groupBy: 'project',+ groupDialogue: false, sortBy: 'recency', manualProjectOrder: [],+ });+ expect(changed[0].kind).toBe('project');+ if (changed[0].kind !== 'project') throw new Error('Missing project');+ expect(changed[0].project.sessions).toEqual([newer, older]);+ expect(reversed.sessions).toEqual([older, newer]);+ });+it('applies manual project order with unranked projects after ranked projects', () => {const sorted = sortProjectsForSidebar([diff --git a/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx b/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsxindex 7d451ea99f..3761d6f2d2 100644--- a/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx+++ b/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx@@ -73,7 +73,9 @@ describe('project grouping hook references', () => {it('keeps enriched projects stable and shares identical filtered results', () => {const { result, rerender } = renderHook(({ rows }) => {- const all = useProjectGroups(rows);+ // #7469: the real sidebar rebuilds the complete alias-member array on+ // every snapshot. Existing tests omitted it, hiding full regrouping.+ const all = useProjectGroups(rows, undefined, false, undefined, '', undefined, [...rows]);const filtered = useProjectGroups(rows, undefined, false, undefined, '', all);return { all, filtered };},diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsxindex ea289ccc78..610c98efaf 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx@@ -157,6 +157,7 @@ import {projectIdentityKeyForSession,pinnedSessionIdsInDisplayOrder,persistentProjectMatchesVendor,+ withProjectSessions,type PersistentLocalProject,type ProjectNode,} from './lib/projectGrouping';@@ -1814,7 +1815,9 @@ function ExpandedView({);const provisionalProjectTaskId = useProvisionalDraftProjectTaskId();- const restorableProjectKeys = useMemo(+ // Only a restore operation needs this catalogue. Read current inputs after+ // the awaited IPC instead of grouping twice on every sidebar update.+ const getRestorableProjectKeys = useCallback(() =>collectRestorableProjectKeys({sessions: scopedSidebarSessions,@@ -1835,8 +1838,8 @@ function ExpandedView({visiblePersistentLocalProjects,],);- const restorableProjectKeysRef = useRef(restorableProjectKeys);- restorableProjectKeysRef.current = restorableProjectKeys;+ const restorableProjectKeysRef = useRef(getRestorableProjectKeys);+ restorableProjectKeysRef.current = getRestorableProjectKeys;const hiddenProjectComparisonKeys = useMemo(() => buildProjectKeyComparisonSet(hiddenProjectKeys, localPlatform),[hiddenProjectKeys, localPlatform],@@ -2075,10 +2078,7 @@ function ExpandedView({)return [];return [- {- ...project,- sessions: matchingSessions.filter((session) => session.pinnedAt == null),- },+ withProjectSessions(project, matchingSessions.filter((session) => session.pinnedAt == null)),];});return sortProjectsForSidebar(@@ -2776,7 +2776,7 @@ function ExpandedView({localPlatform,),setProjectHidden,- getCurrentProjectKeys: () => restorableProjectKeysRef.current,+ getCurrentProjectKeys: () => restorableProjectKeysRef.current(),ensureProjectIncluded: filter.ensureProjectIncluded,localPlatform,});@@ -2959,7 +2959,7 @@ function ExpandedView({throw err;}},- [projectAliases, t],+ [projectAliases.updateAlias, t],);const handleRemoveProjectFromSidebar = useCallback(@@ -3047,7 +3047,7 @@ function ExpandedView({toast.error(t('ccAgent.sidebar.pinFailed'));}},- [filter, t],+ [filter.removePin, filter.promotePin, t],);// Event-only state: metadata updates recreate the collapsed Set even whendiff --git a/apps/desktop/src/renderer/features/cc-agent/lib/mainListModel.ts b/apps/desktop/src/renderer/features/cc-agent/lib/mainListModel.tsindex b6f5b00c42..b725e0ada9 100644--- a/apps/desktop/src/renderer/features/cc-agent/lib/mainListModel.ts+++ b/apps/desktop/src/renderer/features/cc-agent/lib/mainListModel.ts@@ -24,6 +24,7 @@*/import type { Session } from '@/lib/ccAgent.types';+import { withProjectSessions } from './projectGrouping';import { CINDY_MAKE_ENABLED } from '@cindy/maker-shared/cindy-make-feature';import { isCindyMakeFamilySource } from '../../../../shared/cindyMakeMerge';import {@@ -432,7 +433,7 @@ export function buildMainListEntries({for (const project of projects) {entries.push({kind: 'project',- project: { ...project, sessions: sortSessionsForMainList(project.sessions, sortBy, ctx) },+ project: withProjectSessions(project, sortSessionsForMainList(project.sessions, sortBy, ctx)),});}diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts b/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.tsindex c10c695fc8..cd7fbf8eae 100644--- a/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts+++ b/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts@@ -118,6 +118,17 @@ export interface BotGroupNode {latestActivityAt: string;}+/** Filtering/sorting must not discard grouping's structural reuse when the+ * actual rows and their order are unchanged. Compare objects, never just IDs:+ * fresh titles/status and same-ID tasks on other devices must still propagate.+ */+export function withProjectSessions(project: ProjectNode, sessions: Session[]): ProjectNode {+ return sessions.length === project.sessions.length &&+ sessions.every((session, index) => session === project.sessions[index])+ ? project+ : { ...project, sessions };+}+/** 分组时用来认伙伴的最小信息。渲染层从 botStore 的会话投影现拼。 */export interface BotSessionOwner {botId: string;diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts b/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.tsindex b87a250ab8..3b553f0a8b 100644--- a/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts+++ b/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts@@ -60,7 +60,15 @@ function sameOptions(a: GroupSessionsOptions, b: GroupSessionsOptions): booleanreturn (a.projectAliases === b.projectAliases &&a.remoteProjectAliases === b.remoteProjectAliases &&- a.projectAliasMembers === b.projectAliasMembers &&+ // Complete alias members are rebuilt even for row-only patches. Reuse the+ // same conservative structural comparison: identity/eligibility changes+ // outside the visible filter must still invalidate the displayed name.+ (a.projectAliasMembers === b.projectAliasMembers ||+ (!!a.projectAliasMembers && !!b.projectAliasMembers &&+ a.projectAliasMembers.length === b.projectAliasMembers.length &&+ a.projectAliasMembers.every((member, i) =>+ member === b.projectAliasMembers![i] || sameGroupingInput(member, b.projectAliasMembers![i]),+ ))) &&a.includePinnedInProjects === b.includePinnedInProjects &&a.includeDraftsInProjects === b.includeDraftsInProjects &&a.provisionalDraftTaskId === b.provisionalDraftTaskId &&diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts b/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.tsindex aff2313ffc..65b4f744c5 100644--- a/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts+++ b/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts@@ -8,7 +8,7 @@ import {} from './mainListModel';import { normalizeManualProjectOrder } from '../hooks/helpers/sidebarFilterCore';import { sessionCreatedMs } from './dateSessionGrouping';-import { projectKeyComparisonKey, type ProjectNode } from './projectGrouping';+import { projectKeyComparisonKey, withProjectSessions, type ProjectNode } from './projectGrouping';/*** 有状态上下文的项目面板沿用主列表优先级;其它调用保留既有顺序。@@ -36,10 +36,9 @@ export function sortProjectsForSidebar(localPlatform: string = '',priorityContext?: MainListPriorityContext,): ProjectNode[] {- const withSortedSessions = projects.map((project) => ({- ...project,- sessions: sortSessionsForSidebar(project.sessions, sortBy, priorityContext),- }));+ const withSortedSessions = projects.map((project) =>+ withProjectSessions(project, sortSessionsForSidebar(project.sessions, sortBy, priorityContext)),+ );if (projectOrder === 'custom') {const normalizedOrder = normalizeManualProjectOrder(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.tsxindex 0601787333..6b4fe32047 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@@ -573,14 +573,20 @@ export function ProjectsSection({// 各自下方**实际渲染的行集合**聚合灯语(sessionLampAggregation,rail 同源):// running → 图标呼吸橙;未读 → AttentionDot(红 error > 蓝 awaiting > 绿 done)。// remoteActivityRevision 已在上方订阅,依赖注释同 priorityContext。- const lampAgg = useCallback(- (list: readonly Session[]): SessionLampAggregate =>- aggregateSessionLamps(list, {- runningSessionIds,- notifications,- attentionKinds,- urgentSessionIds: urgentSet,- }),+ const lampAgg = useMemo(() => {+ // Reuse the presentation object, but always read live lamp sources (also+ // optimistic starting/owner stores) before deciding whether it is equal.+ const cache = new WeakMap<readonly Session[], SessionLampAggregate>();+ return (list: readonly Session[]): SessionLampAggregate => {+ const previous = cache.get(list);+ const lamp = aggregateSessionLamps(list, {+ runningSessionIds, notifications, attentionKinds, urgentSessionIds: urgentSet,+ });+ if (previous?.running === lamp.running && previous.dotTone === lamp.dotTone) return previous;+ cache.set(list, lamp);+ return lamp;+ };+ },// eslint-disable-next-line react-hooks/exhaustive-deps -- remoteActivityRevision 代表 remoteLampOf 读到的整表内容[runningSessionIds, notifications, attentionKinds, urgentSet, remoteActivityRevision],);@@ -658,9 +664,13 @@ export function ProjectsSection({// 活动镜像)——与聚合灯同口径:上层灯为哪条会话点亮(未读或 running),// 该条目就不能被折进「显示全部」(Greptile P1:此前只豁免 attention,// running-only 会话会让呼吸灯指向不可见的条目)。+ const previousLampFoldExemptIds = useRef<ReadonlySet<string>>(new Set());const lampFoldExemptIds = useMemo(() => {const next = new Set(priorityContext.attentionSessionIds);for (const id of priorityContext.runningSessionIds) next.add(id);+ const previous = previousLampFoldExemptIds.current;+ if (next.size === previous.size && [...next].every((id) => previous.has(id))) return previous;+ previousLampFoldExemptIds.current = next;return next;}, [priorityContext]);const collapseEntries = useCallback(diff --git a/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts b/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.tsindex 6596a997bf..895473c316 100644--- a/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts+++ b/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts@@ -476,11 +476,24 @@ function recompute(): void {const nextVisible = CINDY_MAKE_ENABLED? mergedSnapshot: mergedSnapshot.filter((session) => !isCindyMakeSource(session.source));+ // Share only the UI projection. Authoritative rows must keep their new content+ // identities so captureSessionRead still rejects details predating a snapshot.+ // Compare the complete JSON payload (including nested metadata), not a field+ // whitelist that could leave a newly added sidebar field stale. Same-id tasks+ // on different computers are distinct; only the last visible set is retained.+ const visibleKey = (session: Session) => JSON.stringify([session.deviceLinkDeviceId, session.id]);+ const previousVisible = new Map(visibleMergedSnapshot.map((session) => [visibleKey(session), session]));+ const sharedVisible = nextVisible.map((session) => {+ const previous = previousVisible.get(visibleKey(session));+ return previous && (previous === session || JSON.stringify(previous) === JSON.stringify(session))+ ? previous+ : session;+ });if (- visibleMergedSnapshot.length !== nextVisible.length ||- visibleMergedSnapshot.some((session, index) => session !== nextVisible[index])+ visibleMergedSnapshot.length !== sharedVisible.length ||+ visibleMergedSnapshot.some((session, index) => session !== sharedVisible[index])) {- visibleMergedSnapshot = nextVisible;+ visibleMergedSnapshot = sharedVisible;}// 设备列表快照:按 deviceName(再 deviceId 兜底)稳定排序,避免 Map 插入序在设备增删时// 抖动导致切换栏 chip 乱跳;内容不变时保持旧引用(防 useRemoteDevices 无谓重渲染)。