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): reconcile pinned order after stale writes settle

Chris1c96bafdab2b
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 6c764764c9..dddb92ee35 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
@@ -228,6 +228,75 @@ describe('hidden-project filter synchronization', () => {
);
});
+ it.each(['rejected', 'resolved'] as const)(
+ 'reconciles refreshed pins when an old write is %s after the refresh',
+ async (outcome) => {
+ let resolveWrite!: (order: string[]) => void;
+ let rejectWrite!: (error: Error) => void;
+ const pending = new Promise<string[]>((resolve, reject) => {
+ resolveWrite = resolve;
+ rejectWrite = reject;
+ });
+ vi.mocked(window.electronAPI.sidebarSettings.mutatePinnedOrder).mockReturnValueOnce(pending);
+ const view = renderHook(useSyncedSidebarFilter);
+ let write!: Promise<void>;
+ act(() => { write = view.result.current.promotePin('old-pin'); });
+ await waitFor(() => expect(window.electronAPI.sidebarSettings.mutatePinnedOrder).toHaveBeenCalled());
+ expect(view.result.current.manualPinnedOrder).toEqual(['old-pin']);
+
+ const originalLoad = window.electronAPI.sidebarSettings.loadSnapshot;
+ window.electronAPI.sidebarSettings.loadSnapshot = () => ({
+ ...originalLoad(), ownerGeneration: 2,
+ pinnedOrderIsAuthoritative: true, pinnedOrder: ['saved-pin'],
+ });
+ act(() => setDataOwnerGeneration('owner-a', 2));
+ view.rerender();
+ await act(async () => {
+ if (outcome === 'rejected') {
+ rejectWrite(new Error('PRECONDITION_FAILED'));
+ await expect(write).rejects.toThrow('PRECONDITION_FAILED');
+ } else {
+ resolveWrite(['old-pin']);
+ await write;
+ }
+ });
+ expect(view.result.current.manualPinnedOrder).toEqual(['saved-pin']);
+ },
+ );
+
+ it('does not overwrite a newer optimistic pin while the refreshed write is pending', async () => {
+ let rejectOld!: (error: Error) => void;
+ let resolveNew!: (order: string[]) => void;
+ const oldPending = new Promise<string[]>((_resolve, reject) => { rejectOld = reject; });
+ const newPending = new Promise<string[]>((resolve) => { resolveNew = resolve; });
+ const mutate = vi.mocked(window.electronAPI.sidebarSettings.mutatePinnedOrder);
+ mutate.mockReturnValueOnce(oldPending).mockReturnValueOnce(newPending);
+ const view = renderHook(useSyncedSidebarFilter);
+ let oldWrite!: Promise<void>;
+ act(() => { oldWrite = view.result.current.promotePin('old-pin'); });
+ await waitFor(() => expect(mutate).toHaveBeenCalledTimes(1));
+ const originalLoad = window.electronAPI.sidebarSettings.loadSnapshot;
+ window.electronAPI.sidebarSettings.loadSnapshot = () => ({
+ ...originalLoad(), ownerGeneration: 2,
+ pinnedOrderIsAuthoritative: true, pinnedOrder: ['saved-pin'],
+ });
+ act(() => setDataOwnerGeneration('owner-a', 2));
+ view.rerender();
+ let newWrite!: Promise<void>;
+ act(() => { newWrite = view.result.current.promotePin('new-pin'); });
+ await act(async () => {
+ rejectOld(new Error('PRECONDITION_FAILED'));
+ await expect(oldWrite).rejects.toThrow('PRECONDITION_FAILED');
+ });
+ expect(mutate).toHaveBeenCalledTimes(2);
+ expect(view.result.current.manualPinnedOrder[0]).toBe('new-pin');
+ await act(async () => {
+ resolveNew(['new-pin', 'saved-pin']);
+ await newWrite;
+ });
+ expect(view.result.current.manualPinnedOrder).toEqual(['new-pin', 'saved-pin']);
+ });
+
it('rehydrates current hidden projects after refresh and ignores late old-generation pushes', () => {
const view = renderHook(() => useHiddenProjects());
const refreshed = { ...OWNER_STAMP, ownerGeneration: 2 };
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useSidebarFilter.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useSidebarFilter.ts
index 4f05d758ca..436b652a16 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useSidebarFilter.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useSidebarFilter.ts
@@ -256,6 +256,7 @@ export function useSidebarFilter(
);
const pinnedWriteQueueRef = useRef<Promise<void>>(Promise.resolve());
const pendingPinnedWritesRef = useRef(0);
+ const deferredPinnedSnapshotStampRef = useRef<DataOwnerPushStamp | null>(null);
const legacyMigrationStartedRef = useRef(false);
const legacyMigrationPendingRef = useRef(loadedPinned.needsLegacyMigration);
@@ -276,7 +277,11 @@ export function useSidebarFilter(
} else {
durablePinnedOrderRef.current = snapshot;
}
- if (pendingPinnedWritesRef.current > 0) return;
+ if (pendingPinnedWritesRef.current > 0) {
+ deferredPinnedSnapshotStampRef.current = nextOwnerStamp;
+ return;
+ }
+ deferredPinnedSnapshotStampRef.current = null;
latestPinnedOrderRef.current = snapshot;
setManualPinnedOrderState((prev) => (sameStringArray(prev, snapshot) ? prev : snapshot));
},
@@ -327,10 +332,19 @@ export function useSidebarFilter(
throw err;
} finally {
pendingPinnedWritesRef.current = Math.max(0, pendingPinnedWritesRef.current - 1);
+ const deferredStamp = deferredPinnedSnapshotStampRef.current;
+ if (pendingPinnedWritesRef.current === 0) {
+ deferredPinnedSnapshotStampRef.current = null;
+ }
+ // A refresh may have updated the durable baseline while the old
+ // generation's write was pending. Once the queue drains, show that
+ // baseline even if the old write failed; never overwrite newer
+ // optimistic writes or publish a snapshot from a different account.
if (
- succeeded &&
pendingPinnedWritesRef.current === 0 &&
- isExactOwnerStampCurrent(mutationOwnerStamp, ownerStamp)
+ ((succeeded && isExactOwnerStampCurrent(mutationOwnerStamp, ownerStamp)) ||
+ (deferredStamp?.dataOwnerId === ownerId &&
+ isDataOwnerPushStampCurrent(deferredStamp)))
) {
const persisted = Array.from(durablePinnedOrderRef.current);
latestPinnedOrderRef.current = persisted;