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): gate favorite recovery and resync owner generations

DavidShen33bf700080c0
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
index 2fbaadeb29..991f4772da 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
@@ -18,6 +18,8 @@ const state = vi.hoisted(() => ({
responses: new Map<string, unknown>(),
clients: [] as Array<{ opts: Record<string, unknown>; started: boolean; stopped: boolean }>,
localReceivedError: false,
+ userId: 'user-1',
+ identityCards: [] as string[],
}));
vi.mock('electron', () => ({ app: { getVersion: () => '0.0.0-test' } }));
@@ -25,12 +27,12 @@ vi.mock('ws', () => ({ default: class {} }));
vi.mock('../../logger.js', () => ({ createLogger: () => ({ warn: vi.fn(), info: vi.fn(), debug: vi.fn(), error: vi.fn() }) }));
vi.mock('../../appSessionState.js', () => ({
isAppSessionBoundaryPending: () => false,
- getActiveDataOwnerPushStamp: () => ({ dataOwnerId: 'user-1', ownerGeneration: 1 }),
+ getActiveDataOwnerPushStamp: () => ({ dataOwnerId: state.userId, ownerGeneration: 1 }),
}));
vi.mock('../../authManager.js', () => ({
getActiveAuthRealm: () => 'cn',
getAuthState: () => ({ isAuthenticated: true }),
- getCurrentUserId: () => 'user-1',
+ getCurrentUserId: () => state.userId,
getDeviceId: () => 'device-1',
}));
vi.mock('../../clientEndpointsService.js', () => ({
@@ -49,14 +51,17 @@ vi.mock('../../serverApiClient.js', () => ({
},
}));
vi.mock('../providerShareApi.js', () => ({
- providerShareOwnerKey: () => 'user-1',
+ providerShareOwnerKey: () => state.userId,
providerShareApi: {
listReceived: async () => {
if (state.localReceivedError) throw new Error('local unavailable');
return [{ ...share, shareId: 'share-local', memberId: 'member-local', owner: { ...share.owner, region: 'cn' } }];
},
},
- fetchIdentityCard: async (purpose: string, nonce: string) => `card:${purpose}:${nonce}`,
+ fetchIdentityCard: async (purpose: string, nonce: string) => {
+ state.identityCards.push(purpose);
+ return `card:${purpose}:${nonce}`;
+ },
rethrowProviderShareError: (error: unknown) => { throw error; },
sha256Hex: (value: string) => `h(${value})`.padEnd(64, '0').slice(0, 64).replace(/[^a-f0-9]/g, 'a'),
}));
@@ -101,6 +106,8 @@ beforeEach(() => {
state.responses = new Map();
state.clients = [];
state.localReceivedError = false;
+ state.userId = 'user-1';
+ state.identityCards = [];
});
afterEach(() => {
stopProviderShareGuest();
@@ -110,9 +117,33 @@ afterEach(() => {
});
describe('cross-region provider share', () => {
+ it('does not send identity cards for forged favorite hints or another account history', async () => {
+ const probe = async () => {
+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
+ await refreshReceivedShares('test');
+ for (let i = 0; i < 3; i += 1) {
+ getReceivedSharesSnapshot({ ownerStamp: { dataOwnerId: state.userId, ownerGeneration: 1 }, regions: ['global'] });
+ }
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ expect(state.identityCards).toEqual([]);
+ expect(state.calls).toEqual([]);
+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual(['cn']);
+ stopProviderShareGuest();
+ };
+ await probe();
+ state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });
+ await crossRegionSendRequest('global', TOKEN);
+ state.userId = 'user-2';
+ state.calls = [];
+ state.identityCards = [];
+ await probe();
+ });
+
it('recovers a revoked region from favorite hints after its marker is removed and the runtime restarts', async () => {
state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });
await crossRegionSendRequest('global', TOKEN);
+ // 旧版没有历史字段:删除活动标记前必须保留它的 Main 往来证据。
+ fs.writeFileSync(path.join(dir, 'remote-agent', 'provider-share-regions.json'), JSON.stringify({ version: 1, accounts: __testing.readMarkers() }));
state.responses.set('/session', { credential: null, expiresAt: null, shares: [] });
startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
await refreshReceivedShares('test');
@@ -137,6 +168,9 @@ describe('cross-region provider share', () => {
});
it('keeps network backoff when favorite recovery is requested repeatedly', async () => {
+ state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });
+ await crossRegionSendRequest('global', TOKEN);
+ state.calls = [];
startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
await refreshReceivedShares('test');
const recovery = { ownerStamp: { dataOwnerId: 'user-1', ownerGeneration: 1 }, regions: ['global'] as const };
diff --git a/apps/desktop/src/main/device-link/providerShareCrossRegion.ts b/apps/desktop/src/main/device-link/providerShareCrossRegion.ts
index edd3790299..3da76f3153 100644
--- a/apps/desktop/src/main/device-link/providerShareCrossRegion.ts
+++ b/apps/desktop/src/main/device-link/providerShareCrossRegion.ts
@@ -101,14 +101,15 @@ function markerPath(): string | null {
return userDataDir ? path.join(userDataDir, 'remote-agent', MARKER_FILE) : null;
}
-function readMarkers(): Record<string, Region[]> {
+function readMarkers(field: 'accounts' | 'knownAccounts' = 'accounts'): Record<string, Region[]> {
const file = markerPath();
if (!file) return {};
try {
- const parsed = JSON.parse(fs.readFileSync(file, 'utf8')) as { version?: unknown; accounts?: unknown };
- if (parsed.version !== 1 || !parsed.accounts || typeof parsed.accounts !== 'object') return {};
+ const parsed = JSON.parse(fs.readFileSync(file, 'utf8')) as { version?: unknown; accounts?: unknown; knownAccounts?: unknown };
+ const records = parsed[field];
+ if (parsed.version !== 1 || !records || typeof records !== 'object') return {};
const out: Record<string, Region[]> = {};
- for (const [key, value] of Object.entries(parsed.accounts as Record<string, unknown>)) {
+ for (const [key, value] of Object.entries(records as Record<string, unknown>)) {
if (!/^[a-f0-9]{64}$/.test(key) || !Array.isArray(value)) continue;
out[key] = value.filter((item): item is Region => item === 'cn' || item === 'global');
}
@@ -122,6 +123,12 @@ async function writeMarker(account: string, region: Region, present: boolean): P
const file = markerPath();
if (!file) return;
const markers = readMarkers();
+ const knownAccounts = readMarkers('knownAccounts');
+ // 保留 Main 已确认的跨区往来,不含凭证。旧版活动标记同时是合法的历史证据。
+ for (const [key, active] of Object.entries(markers)) {
+ knownAccounts[key] = [...new Set([...(knownAccounts[key] ?? []), ...active])];
+ }
+ if (present) knownAccounts[account] = [...new Set([...(knownAccounts[account] ?? []), region])];
const regions = new Set(markers[account] ?? []);
if (present) regions.add(region);
else regions.delete(region);
@@ -130,7 +137,7 @@ async function writeMarker(account: string, region: Region, present: boolean): P
const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
await fsp.mkdir(path.dirname(file), { recursive: true });
try {
- await fsp.writeFile(tmp, JSON.stringify({ version: 1, accounts: markers }), { encoding: 'utf8', mode: 0o600 });
+ await fsp.writeFile(tmp, JSON.stringify({ version: 1, accounts: markers, knownAccounts }), { encoding: 'utf8', mode: 0o600 });
await fsp.rename(tmp, file);
} finally {
await fsp.rm(tmp, { force: true }).catch(() => undefined);
@@ -367,11 +374,12 @@ export function getCrossRegionReceived(): ProviderShareReceived[] {
return runtime ? [...runtime.regions.values()].flatMap((state) => state.shares) : [];
}
-/** 空名单会移除发现标记;残留收藏仍可请求重新核对。复用现有请求合并与失败退避。 */
+/** 空名单会移除活动标记;收藏只提示核对 Main 曾确认有往来的区域,不能授权新的跨区请求。 */
export function ensureCrossRegionReceivedForFavorites(regions: readonly Region[]): void {
const rt = runtime;
const region = peerRegion();
if (!rt || !current(rt) || !regions.includes(region)) return;
+ if (!readMarkers()[rt.account]?.includes(region) && !readMarkers('knownAccounts')[rt.account]?.includes(region)) return;
const state = rt.regions.get(region);
if (!state?.loaded && !state?.refreshing && !state?.timer) void refreshRegion(rt, region);
}
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx
index dcd8b90889..7581de2540 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx
@@ -9,6 +9,7 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation, useNavigate } from 'react-router-dom';
+import { useAuth } from '@/contexts/AuthContext';
import { makeGenericNewMakerRouteState } from '@/features/cc-agent/lib/genericNewMakerRouteState';
import { toast } from '@/lib/toast';
@@ -21,7 +22,7 @@ import { pendingRequestsFromOwned } from './providerShareFormat';
import { providerShareManagePath } from './providerShareNavigation';
import {
addProviderShareRequested,
- ensureProviderShareReceivedStarted,
+ refreshProviderShareFavoriteMembership,
getProviderSharePendingRequests,
refreshProviderShareOwnerPending,
useProviderSharePendingRequests,
@@ -32,6 +33,10 @@ const SETTLED_TOAST_MS = 6000;
export function ProviderShareGlobalHost() {
const { t } = useTranslation();
+ const { dataOwnerId, dataOwnerGeneration } = useAuth();
+ useEffect(() => {
+ refreshProviderShareFavoriteMembership();
+ }, [dataOwnerId, dataOwnerGeneration]);
const favoriteCleanupFailed = useProviderShareFavoriteCleanupFailed();
useEffect(() => {
if (favoriteCleanupFailed) toast.error(t('newChat.modelSelector.unified.favoritesCleanupFailed'));
@@ -70,7 +75,6 @@ export function ProviderShareGlobalHost() {
const api = (window as Partial<Window>).electronAPI?.providerShare;
if (!api) return;
let disposed = false;
- ensureProviderShareReceivedStarted();
void refreshProviderShareOwnerPending().then((state) => {
if (disposed || !state?.ready) return;
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx
index cfe0598149..661ea3d3b7 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareGlobalHost.test.tsx
@@ -2,11 +2,16 @@
import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
import { MemoryRouter, useLocation } from 'react-router-dom';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { ProviderShareReceived } from '@cindy/device-link';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+import { __resetForTest, addModelFavorite, listModelFavorites, setModelFavoritesOwner } from '@/state/modelFavorites';
+import { providerShareFavoriteSource } from '@/state/providerShareFavorites';
import type {
ProviderShareOwnerState,
ProviderShareRequestedEvent,
ProviderShareSettledEvent,
+ ProviderShareReceivedSnapshot,
} from '../../../../shared/providerShare';
import { ProviderShareGlobalHost } from '../ProviderShareGlobalHost';
import { resetProviderShareStoreForTests } from '../providerShareStore';
@@ -19,6 +24,7 @@ vi.mock('react-i18next', () => ({
}),
}));
vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn(), info: vi.fn() } }));
+vi.mock('@/contexts/AuthContext', () => ({ useAuth: () => bus.auth }));
vi.mock('@/lib/remoteCatalogSnapshot', () => ({ refreshRemoteCatalogSnapshot: vi.fn(async () => undefined) }));
vi.mock('@/features/cc-agent/lib/genericNewMakerRouteState', () => ({
makeGenericNewMakerRouteState: () => ({ workspacePrompt: 'generic' }),
@@ -44,6 +50,8 @@ function ownerState(requests = [request]): ProviderShareOwnerState {
}
const bus = vi.hoisted(() => ({
+ auth: { dataOwnerId: 'recipient', dataOwnerGeneration: 1 },
+ received: [] as ProviderShareReceived[],
command: vi.fn(),
requested: new Set<(event: ProviderShareRequestedEvent) => void>(),
settled: new Set<(event: ProviderShareSettledEvent) => void>(),
@@ -58,9 +66,24 @@ function listen<T>(set: Set<T>) {
}
let currentOwner: ProviderShareOwnerState = ownerState();
+const receivedShare: ProviderShareReceived = {
+ shareId: 's1', memberId: 'm1', providerId: 'anthropic', providerLabel: 'Anthropic', hostDeviceId: 'host',
+ deviceName: 'Host', owner: { displayName: 'Owner', avatarUrl: null, region: 'global' },
+ status: 'active', hostOnline: true, hostCapable: true,
+};
+const membership = (): ProviderShareReceivedSnapshot => ({
+ ownerStamp: { dataOwnerId: bus.auth.dataOwnerId, ownerGeneration: bus.auth.dataOwnerGeneration },
+ confirmedRegions: ['global'], received: bus.received,
+});
beforeEach(() => {
resetProviderShareStoreForTests();
+ __resetForTest();
+ window.localStorage.clear();
+ bus.auth = { dataOwnerId: 'recipient', dataOwnerGeneration: 1 };
+ bus.received = [receivedShare];
+ setDataOwnerGeneration('recipient', 1);
+ setModelFavoritesOwner('recipient');
bus.command.mockReset();
bus.requested.clear();
bus.settled.clear();
@@ -69,6 +92,7 @@ beforeEach(() => {
bus.command.mockImplementation(async (command: { action: string }) => {
if (command.action === 'owned') return currentOwner;
if (command.action === 'received') return [];
+ if (command.action === 'received-snapshot') return membership();
if (command.action === 'approve' || command.action === 'reject') {
currentOwner = ownerState([]);
return { ok: true };
@@ -90,7 +114,7 @@ beforeEach(() => {
});
});
-afterEach(() => cleanup());
+afterEach(() => { cleanup(); resetProviderShareStoreForTests(); vi.restoreAllMocks(); });
function LocationProbe() {
const location = useLocation();
@@ -107,6 +131,54 @@ function renderHost() {
}
describe('ProviderShareGlobalHost', () => {
+ it('resumes failed favorite cleanup after same-owner repair without a share push', async () => {
+ currentOwner = ownerState([]);
+ bus.received = [];
+ addModelFavorite({ providerId: providerShareFavoriteSource(receivedShare), modelId: 'opus', agent: 'cc' });
+ const writes = vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { throw new Error('storage unavailable'); });
+ const view = renderHost();
+ await waitFor(() => expect(writes).toHaveBeenCalled());
+ expect(listModelFavorites()).toHaveLength(1);
+ writes.mockRestore();
+ bus.auth = { ...bus.auth, dataOwnerGeneration: 2 };
+ setDataOwnerGeneration('recipient', 2);
+ view.rerender(<MemoryRouter><ProviderShareGlobalHost /><LocationProbe /></MemoryRouter>);
+ await waitFor(() => expect(listModelFavorites()).toEqual([]));
+ expect(bus.command).toHaveBeenCalledWith(expect.objectContaining({
+ action: 'received-snapshot',
+ favoriteRecovery: { ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 2 }, regions: ['global'] },
+ }));
+ });
+
+ it('refetches membership on same-owner repair and ignores an earlier generation reply', async () => {
+ currentOwner = ownerState([]);
+ addModelFavorite({ providerId: providerShareFavoriteSource(receivedShare), modelId: 'opus', agent: 'cc' });
+ let finish!: (snapshot: ProviderShareReceivedSnapshot) => void;
+ bus.command.mockImplementation(async (command: { action: string }) => {
+ if (command.action === 'owned') return currentOwner;
+ if (command.action === 'received') return bus.received;
+ if (bus.auth.dataOwnerGeneration === 1) return new Promise((resolve) => { finish = resolve; });
+ return membership();
+ });
+ const view = renderHost();
+ await waitFor(() => expect(finish).toBeTypeOf('function'));
+ const old = { ...membership(), received: [] };
+ bus.auth = { ...bus.auth, dataOwnerGeneration: 2 };
+ setDataOwnerGeneration('recipient', 2);
+ view.rerender(<MemoryRouter><ProviderShareGlobalHost /><LocationProbe /></MemoryRouter>);
+ await waitFor(() => expect(bus.command).toHaveBeenCalledWith(expect.objectContaining({
+ action: 'received-snapshot',
+ favoriteRecovery: { ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 2 }, regions: ['global'] },
+ })));
+ await act(async () => { finish(old); });
+ expect(listModelFavorites()).toHaveLength(1);
+ bus.received = [];
+ bus.auth = { ...bus.auth, dataOwnerGeneration: 3 };
+ setDataOwnerGeneration('recipient', 3);
+ view.rerender(<MemoryRouter><ProviderShareGlobalHost /><LocationProbe /></MemoryRouter>);
+ await waitFor(() => expect(listModelFavorites()).toEqual([]));
+ });
+
it('queues pending requests found at startup and approves from the dialog', async () => {
renderHost();
const dialog = await screen.findByTestId('provider-share-approve-dialog');
diff --git a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
index 21c57368d8..add15b6e1f 100644
--- a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
+++ b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
@@ -141,6 +141,16 @@ export function ensureProviderShareReceivedStarted(): void {
});
}
+/** AuthContext 的同账号修复不会重挂宿主,generation 更新时仍须重新核对收藏。 */
+export function refreshProviderShareFavoriteMembership(): void {
+ if (!receivedStarted) {
+ ensureProviderShareReceivedStarted();
+ return;
+ }
+ const api = providerShareApi();
+ if (api) refreshFavoriteMembership(api);
+}
+
/** 主动再取一次(退出分享后立即刷新列表;推送仍会随后到达)。 */
export function refreshProviderShareReceived(): void {
const api = providerShareApi();