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(device-link): preserve project names through owner repair

xuzini-xzn87beacf718ee
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts
index a403aaf3b0..54eeeb4ada 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts
@@ -14535,9 +14535,9 @@ describe('usage-limit wait (ordinary tasks)', () => {
getSession: () => rehydrate ? session : undefined,
closeSession: async () => {}, preflightBotRuntimeResources: async () => {},
getSessionMeta: async () => ({}), ensureRemoteReadyForSessionStart: async () => {},
- statDirectory: async () => ({ isDirectory: () => true }),
checkWorkDirExists: async () => true, isOrcaMcpHydrated: () => !rehydrate,
buildCreateOptsWithStderr: x => x, synthesizeOrcaVendorOptionsFromDb: async () => rehydrate,
+ statDirectory: async () => ({ isDirectory: () => true }),
readSessionExtraDirsFromDb: async () => [], readSessionWorkingDirFromDb: async () => '/repo',
readWorkingDirectoryRecoveryCreateOpts: async () => ({ agentKind: 'claude-code', workingDir: '/repo', model: 'claude-opus-4-7' }),
withRehydrateCloseSuppressed: async (_id, fn) => fn(), bootstrapSession: bootstrap,
diff --git a/apps/desktop/src/renderer/__tests__/remoteProjectAliases.test.ts b/apps/desktop/src/renderer/__tests__/remoteProjectAliases.test.ts
index 10caff3be6..ec890a7ec4 100644
--- a/apps/desktop/src/renderer/__tests__/remoteProjectAliases.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteProjectAliases.test.ts
@@ -57,6 +57,45 @@ describe('Desktop project alias mirror adapter', () => {
expect(remoteProjectAliases.getSnapshot().size).toBe(0);
});
+ it('retains same-owner names across a local generation change while fencing old reads', async () => {
+ invoke.mockResolvedValueOnce(snapshot('A')).mockResolvedValueOnce(snapshot('B'));
+ await remoteProjectAliases.refresh('a', () => true);
+ await remoteProjectAliases.refresh('b', () => true);
+ const previous = remoteProjectAliases.getSnapshot();
+ let complete!: (value: unknown) => void;
+ invoke.mockImplementationOnce(() => new Promise((resolve) => { complete = resolve; }));
+ const pending = remoteProjectAliases.refresh('a', () => true);
+ await vi.waitFor(() => expect(invoke).toHaveBeenCalledTimes(3));
+
+ setDataOwnerGeneration('owner', 2);
+ const duringRepair = remoteProjectAliases.getSnapshot();
+ complete(snapshot('Stale local generation'));
+ await pending;
+ expect(duringRepair).toBe(previous);
+ expect(remoteProjectAliases.getSnapshot()).toBe(previous);
+
+ invoke.mockResolvedValueOnce(snapshot('Fresh A'));
+ await remoteProjectAliases.refresh('a', () => true);
+ expect(remoteProjectAliases.getSnapshot().get('a')?.aliases[0].alias).toBe('Fresh A');
+ expect(remoteProjectAliases.getSnapshot().get('b')).toBe(previous.get('b'));
+ setDataOwnerGeneration('other', 3);
+ expect(remoteProjectAliases.getSnapshot().size).toBe(0);
+ });
+
+ it('retains host watermarks and rejects old local pushes across same-owner repair', async () => {
+ const hostStamp = { dataOwnerId: 'owner', ownerGeneration: 8 };
+ invoke.mockResolvedValueOnce({ ...snapshot('Current host'), ownerStamp: hostStamp });
+ await remoteProjectAliases.refresh('a', () => true);
+ setDataOwnerGeneration('owner', 2);
+ expect(remoteProjectAliases.acceptChanged('a', hostStamp,
+ { dataOwnerId: 'owner', ownerGeneration: 1 }, () => true)).toBe(false);
+ invoke.mockResolvedValueOnce(snapshot('Old host generation'));
+ await remoteProjectAliases.refresh('a', () => true);
+ expect(remoteProjectAliases.getSnapshot().get('a')?.aliases[0].alias).toBe('Current host');
+ expect(remoteProjectAliases.acceptChanged('a', hostStamp,
+ { dataOwnerId: 'owner', ownerGeneration: 2 }, () => true)).toBe(true);
+ });
+
it('accepts a restarted host generation after suspension while rejecting older reads within one link', async () => {
invoke.mockResolvedValueOnce({ ...snapshot('Before restart'), ownerStamp: { dataOwnerId: 'owner', ownerGeneration: 8 } });
await remoteProjectAliases.refresh('a', () => true);
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts
index cb65f25114..bd9f6c0d11 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts
@@ -34,8 +34,8 @@ export function useProjectGroups(
equivalentResult?: ProjectGroupsResult,
): ProjectGroupsResult {
const sshHosts = useRemoteSshHosts();
- const selectGroups = useMemo(() => createProjectGroupsSelector(), []);
const hostProjectAliases = useSyncExternalStore(remoteProjectAliases.subscribe, remoteProjectAliases.getSnapshot);
+ const selectGroups = useMemo(() => createProjectGroupsSelector(), []);
/*
伙伴归属表。会话行本身不带 botId,归属只有伙伴档案知道 —— 档案还没加载完的
那一瞬间这张表是空的,伙伴任务就走原来的分组落到别处,**不会消失**。
diff --git a/apps/desktop/src/renderer/features/device-link/remoteProjectAliases.ts b/apps/desktop/src/renderer/features/device-link/remoteProjectAliases.ts
index b6010afca2..37c23c1d0f 100644
--- a/apps/desktop/src/renderer/features/device-link/remoteProjectAliases.ts
+++ b/apps/desktop/src/renderer/features/device-link/remoteProjectAliases.ts
@@ -6,6 +6,7 @@ import {
import {
getDataOwnerGeneration,
isDataOwnerGenerationCurrent,
+ isDataOwnerIdCurrent,
isDataOwnerPushCurrent,
type DataOwnerGeneration,
} from '@/contexts/dataOwnerGeneration';
@@ -17,7 +18,7 @@ let owner: DataOwnerGeneration | null = null;
const ownerStamps = new Map<string, SyncedProjectOrderOwnerStamp>();
function selectOwner(requestOwner: DataOwnerGeneration): void {
- if (owner && isDataOwnerGenerationCurrent(owner)) return;
+ if (owner && isDataOwnerIdCurrent(owner)) return;
ownerStamps.clear();
mirror.clear();
owner = requestOwner;
@@ -35,8 +36,10 @@ function acceptOwnerStamp(deviceId: string, raw: unknown): boolean {
/** Renderer-only display mirror. Its lifecycle is owned by the existing remote-project synchronizer. */
export const remoteProjectAliases = {
subscribe: mirror.subscribe,
+ // A same-account repair changes the ingress generation, not display ownership.
+ // Keep accepted names/watermarks; refresh still fences each in-flight read below.
getSnapshot: (): ProjectAliasesByDevice =>
- owner && isDataOwnerGenerationCurrent(owner) ? mirror.getSnapshot() : EMPTY,
+ owner && isDataOwnerIdCurrent(owner) ? mirror.getSnapshot() : EMPTY,
clear(): void {
owner = null;
ownerStamps.clear();