Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 修复分享模型收藏并按区域清理撤权记录
DavidShendf51a8b73e45
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.tsindex 497570ca55..c1f9fc1d28 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts@@ -17,11 +17,16 @@ const state = vi.hoisted(() => ({calls: [] as Array<{ path: string; opts: Record<string, unknown> }>,responses: new Map<string, unknown>(),clients: [] as Array<{ opts: Record<string, unknown>; started: boolean; stopped: boolean }>,+ localReceivedError: false,}));vi.mock('electron', () => ({ app: { getVersion: () => '0.0.0-test' } }));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 }),+}));vi.mock('../../authManager.js', () => ({getActiveAuthRealm: () => 'cn',getAuthState: () => ({ isAuthenticated: true }),@@ -29,6 +34,7 @@ vi.mock('../../authManager.js', () => ({getDeviceId: () => 'device-1',}));vi.mock('../../clientEndpointsService.js', () => ({+ getClientEndpoint: () => LOCAL,loadClientEndpointsForRealm: async () => ({}),getClientEndpointForRealm: (region: string) => (region === 'global' ? PEER : LOCAL),}));@@ -43,6 +49,13 @@ vi.mock('../../serverApiClient.js', () => ({},}));vi.mock('../providerShareApi.js', () => ({+ providerShareOwnerKey: () => 'user-1',+ 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}`,rethrowProviderShareError: (error: unknown) => { throw error; },sha256Hex: (value: string) => `h(${value})`.padEnd(64, '0').slice(0, 64).replace(/[^a-f0-9]/g, 'a'),@@ -65,11 +78,14 @@ import {crossRegionOfIntent,crossRegionSendRequest,getCrossRegionReceived,+ getConfirmedCrossRegionReceivedRegions,+ refreshProviderShareCrossRegion,isCrossRegionProviderShareTarget,startProviderShareCrossRegion,stopProviderShareCrossRegion,} from '../providerShareCrossRegion';import { providerShareHostPeer } from '@cindy/device-link';+import { getReceivedSharesSnapshot, refreshReceivedShares, startProviderShareGuest, stopProviderShareGuest } from '../providerShareGuest';const share = {shareId: 'share-x', memberId: 'member-x', providerId: 'openai', providerLabel: 'OpenAI', hostDeviceId: 'owner-pc',@@ -84,14 +100,43 @@ beforeEach(() => {state.calls = [];state.responses = new Map();state.clients = [];+ state.localReceivedError = false;});afterEach(() => {+ stopProviderShareGuest();stopProviderShareCrossRegion();__testing.setUserDataDir(null);fs.rmSync(dir, { recursive: true, force: true });});describe('cross-region provider share', () => {+ it.each(['local', 'peer'] as const)('confirms the available region independently when %s list loading fails', async (failed) => {+ state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });+ await crossRegionSendRequest('global', TOKEN);+ state.localReceivedError = failed === 'local';+ if (failed === 'local') state.responses.set('/session', { credential: CREDENTIAL, expiresAt: new Date(Date.now() + 86_400_000).toISOString(), shares: [share] });+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });+ await refreshReceivedShares('test');+ await refreshProviderShareCrossRegion('global');+ const snapshot = getReceivedSharesSnapshot();+ expect(snapshot.confirmedRegions).toEqual([failed === 'local' ? 'global' : 'cn']);+ expect(snapshot.received.map((item) => item.shareId)).toEqual([failed === 'local' ? 'share-x' : 'share-local']);+ });++ it('does not confirm an incomplete or failed peer list for favorite cleanup', async () => {+ expect(getConfirmedCrossRegionReceivedRegions()).toEqual([]);+ state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });+ await crossRegionSendRequest('global', TOKEN);+ startProviderShareCrossRegion({ changed: vi.fn() }, { userDataDir: dir });+ expect(getConfirmedCrossRegionReceivedRegions()).toEqual([]);+ await refreshProviderShareCrossRegion('global');+ expect(getConfirmedCrossRegionReceivedRegions()).toEqual([]);+ state.responses.set('/session', { credential: null, expiresAt: null, deviceId: 'x:cn:abc', shares: [] });+ await refreshProviderShareCrossRegion('global');+ expect(getConfirmedCrossRegionReceivedRegions()).toEqual(['global']);+ stopProviderShareCrossRegion();+ expect(getConfirmedCrossRegionReceivedRegions()).toEqual([]);+ });it('only accepts the two official regions', async () => {await expect(crossRegionOfIntent({ invitation: TOKEN, server: LOCAL }, LOCAL)).resolves.toBeNull();await expect(crossRegionOfIntent({ invitation: TOKEN, server: PEER }, LOCAL)).resolves.toBe('global');diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.tsindex fca644067e..859f3a7c96 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareRuntime.test.ts@@ -13,14 +13,17 @@ const state = vi.hoisted(() => ({allowed: new Set<string>(['anthropic']),owned: [] as ProviderShareOwned[],received: [] as ProviderShareReceived[],+ receivedError: false,}));vi.mock('../../appSessionState.js', () => ({activeOwnerScopeKey: () => state.scope,isAppSessionBoundaryPending: () => false,+ getActiveDataOwnerPushStamp: () => ({ dataOwnerId: state.scope, ownerGeneration: 1 }),}));vi.mock('../../authManager.js', () => ({getAuthState: () => ({ isAuthenticated: state.authenticated }),+ getActiveAuthRealm: () => 'global',getDeviceId: () => 'host-device',}));vi.mock('../../logger.js', () => ({ createLogger: () => ({ warn: vi.fn(), info: vi.fn(), debug: vi.fn() }) }));@@ -32,7 +35,10 @@ vi.mock('../settings-store.js', () => ({ readDeviceLinkSettings: () => ({ remotevi.mock('../providerShareApi.js', () => ({providerShareApi: {listOwned: async () => state.owned,- listReceived: async () => state.received,+ listReceived: async () => {+ if (state.receivedError) throw new Error('offline');+ return state.received;+ },},fetchIdentityCard: vi.fn(),sha256Hex: (value: string) => value,@@ -56,6 +62,8 @@ import {resolveRemoteAgentTargetWhenReady,startProviderShareGuest,stopProviderShareGuest,+ getReceivedSharesSnapshot,+ refreshReceivedShares,} from '../providerShareGuest';const person = { displayName: 'Lizi', avatarUrl: null, region: 'global' as const };@@ -77,6 +85,7 @@ beforeEach(() => {state.allowed = new Set(['anthropic']);state.owned = [];state.received = [];+ state.receivedError = false;});afterEach(() => {stopProviderShareHost();@@ -178,6 +187,20 @@ describe('provider share host purge after pause', () => {});describe('provider share guest routing', () => {+ it('distinguishes an authoritative empty membership list from startup, failure, disconnect and account switch', async () => {+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual([]);+ state.receivedError = true;+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() });+ await refreshReceivedShares('test');+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual([]);+ state.receivedError = false;+ await refreshReceivedShares('test');+ expect(getReceivedSharesSnapshot()).toMatchObject({ confirmedRegions: ['global'], received: [], ownerStamp: { dataOwnerId: state.scope } });+ state.scope = 'cloud:other:2';+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual([]);+ stopProviderShareGuest();+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual([]);+ });const received = (status: 'active' | 'paused'): ProviderShareReceived => ({shareId: 'share-1', memberId: 'm1', providerId: 'anthropic', providerLabel: 'Anthropic', hostDeviceId: 'owner-mac',deviceName: "Magi's Mac Mini", owner: { displayName: 'Magi', avatarUrl: null, region: 'global' }, status,diff --git a/apps/desktop/src/main/device-link/providerShareCrossRegion.ts b/apps/desktop/src/main/device-link/providerShareCrossRegion.tsindex 68c2d20482..c7dfe434a7 100644--- a/apps/desktop/src/main/device-link/providerShareCrossRegion.ts+++ b/apps/desktop/src/main/device-link/providerShareCrossRegion.ts@@ -69,6 +69,7 @@ interface RegionState {timer: ReturnType<typeof setTimeout> | null;/** 连续失败次数,用于退避重试(网络或对方区域暂时不可用时不让分享整段消失)。 */failures: number;+ loaded: boolean;}interface Runtime {@@ -276,7 +277,7 @@ function refreshRegion(rt: Runtime, region: Region): Promise<void> {let state = rt.regions.get(region);if (state?.refreshing) return state.refreshing;if (!state) {- state = { region, apiBase: '', credential: null, expiresAt: 0, shares: [], client: null, refreshing: null, timer: null, failures: 0 };+ state = { region, apiBase: '', credential: null, expiresAt: 0, shares: [], client: null, refreshing: null, timer: null, failures: 0, loaded: false };rt.regions.set(region, state);}const target = state;@@ -302,6 +303,7 @@ function refreshRegion(rt: Runtime, region: Region): Promise<void> {state.credential = credential;state.expiresAt = expiresAt;state.shares = shares;+ state.loaded = true;if (shares.length === 0 || !credential) {state.client?.stop();state.client = null;@@ -365,6 +367,12 @@ export function getCrossRegionReceived(): ProviderShareReceived[] {return runtime ? [...runtime.regions.values()].flatMap((state) => state.shares) : [];}+/** 只确认已成功返回名单的区域,失败区域不能阻塞其它区域的收藏。 */+export function getConfirmedCrossRegionReceivedRegions(): Region[] {+ const rt = runtime;+ return rt && current(rt) ? [...rt.regions.values()].filter((state) => state.loaded).map((state) => state.region) : [];+}+function stateForShare(shareId: string): RegionState | null {for (const state of runtime?.regions.values() ?? []) {if (state.shares.some((share) => share.shareId === shareId)) return state;diff --git a/apps/desktop/src/main/device-link/providerShareGuest.ts b/apps/desktop/src/main/device-link/providerShareGuest.tsindex 5a413e323d..af2ca1a71b 100644--- a/apps/desktop/src/main/device-link/providerShareGuest.ts+++ b/apps/desktop/src/main/device-link/providerShareGuest.ts@@ -19,8 +19,9 @@ import {type ProviderShareRequestState,} from '@cindy/device-link';-import { isAppSessionBoundaryPending } from '../appSessionState.js';-import { getAuthState } from '../authManager.js';+import { getActiveDataOwnerPushStamp, isAppSessionBoundaryPending } from '../appSessionState.js';+import type { ProviderShareReceivedSnapshot } from '../../shared/providerShare.js';+import { getActiveAuthRealm, getAuthState } from '../authManager.js';import { getClientEndpoint } from '../clientEndpointsService.js';import { createLogger } from '../logger.js';import { throwIpcError } from '../utils/ipcValidate.js';@@ -33,6 +34,7 @@ import {crossRegionSendRequest,crossRegionWithdraw,getCrossRegionReceived,+ getConfirmedCrossRegionReceivedRegions,refreshProviderShareCrossRegion,startProviderShareCrossRegion,stopProviderShareCrossRegion,@@ -238,6 +240,18 @@ export function getReceivedShares(): readonly ProviderShareReceived[] {return allReceived(runtime);}+export function getReceivedSharesSnapshot(): ProviderShareReceivedSnapshot {+ const rt = runtime;+ const valid = !!rt && current(rt);+ return {+ ownerStamp: getActiveDataOwnerPushStamp(),+ confirmedRegions: valid+ ? [...(rt.fetchedAt > 0 ? [getActiveAuthRealm()] : []), ...getConfirmedCrossRegionReceivedRegions()]+ : [],+ received: valid ? allReceived(rt) : [],+ };+}+// ─── 加入 ────────────────────────────────────────────────────────/** 粘贴的链接或 scheme intent → 口令与它所属的区域。只认两个官方区域。 */diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex bdae6af1e6..a83684bafd 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -48,6 +48,7 @@ import { getDeviceLinkInvokeContext } from './invoke-context.js';import { fetchIdentityCard, providerShareApi, providerShareLinkFor, sha256Hex } from './providerShareApi.js';import {getReceivedShares,+ getReceivedSharesSnapshot,leaveProviderShare,previewProviderShare,refreshReceivedShares,@@ -235,6 +236,8 @@ function parseCommand(raw: unknown): ProviderShareCommand {}case 'received':return { action: 'received' };+ case 'received-snapshot':+ return { action: 'received-snapshot' };case 'preview':case 'send-request':return { action: value.action, link: text(value.link, 'link', 4096) };@@ -389,6 +392,8 @@ async function execute(command: ProviderShareCommand): Promise<unknown> {case 'received':if (running) void refreshReceivedShares('ui');return getReceivedShares();+ case 'received-snapshot':+ return getReceivedSharesSnapshot();case 'preview':return previewProviderShare(command.link);case 'send-request':diff --git a/apps/desktop/src/renderer/__tests__/providerShareFavorites.test.tsx b/apps/desktop/src/renderer/__tests__/providerShareFavorites.test.tsxnew file mode 100644index 0000000000..4f54bde04a--- /dev/null+++ b/apps/desktop/src/renderer/__tests__/providerShareFavorites.test.tsx@@ -0,0 +1,152 @@+// @vitest-environment jsdom+import { act, cleanup, renderHook } from '@testing-library/react';+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, useModelFavorites,+} from '@/state/modelFavorites';+import {+ parseProviderShareFavoriteSource, providerShareFavoriteSource, reconcileProviderShareFavorites,+ useProviderShareFavorites, useProviderShareFavoriteCleanupFailed,+} from '@/state/providerShareFavorites';++const share = (shareId = 's1', memberId = 'm1'): ProviderShareReceived => ({+ shareId, memberId, providerId: 'anthropic', providerLabel: 'Anthropic',+ hostDeviceId: 'host', deviceName: 'Host', status: 'active', hostOnline: true, hostCapable: true,+ owner: { displayName: 'Owner', avatarUrl: null, region: 'global' },+});+const config = { providerId: 'anthropic', modelId: 'opus', agent: 'cc' as const, effort: 'high' as const, fast: true as const };+const publish = (received: ProviderShareReceived[], confirmed = true, dataOwnerId = 'recipient', ownerGeneration = 1) =>+ reconcileProviderShareFavorites({ received, confirmedRegions: confirmed ? ['global', 'cn'] : [], ownerStamp: { dataOwnerId, ownerGeneration } });+const mount = (deviceId = 'share:s1') => renderHook(() => useProviderShareFavorites(deviceId, useModelFavorites()));++beforeEach(() => {+ __resetForTest();+ window.localStorage.clear();+ setDataOwnerGeneration('recipient', 1);+ setModelFavoritesOwner('recipient');+ publish([share(), share('s2', 'm2')]);+});+afterEach(() => { cleanup(); vi.restoreAllMocks(); });++describe('recipient-owned shared model favorites', () => {+ it.each(['cn', 'global'] as const)('keeps %s favorites usable and cleans only confirmed regions when the other region fails to load', (region) => {+ const localShare = { ...share(), owner: { ...share().owner, region } };+ const peerRegion = region === 'cn' ? 'global' as const : 'cn' as const;+ const peerShare = { ...share('peer', 'peer-member'), owner: { ...share().owner, region: peerRegion } };+ // 模拟重启前已有对方区域收藏,启动后该区域尚未成功加载。+ addModelFavorite({ ...config, providerId: providerShareFavoriteSource(peerShare) });+ publish([], false);+ const view = mount();+ const update = (received: ProviderShareReceived[], confirmedRegions: Array<'cn' | 'global'>) =>+ reconcileProviderShareFavorites({ received, confirmedRegions, ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 1 } });+ act(() => update([localShare], [region]));+ act(() => view.result.current.store.add(config));+ expect(view.result.current.items).toHaveLength(1);+ expect(listModelFavorites()).toHaveLength(2);+ const uid = view.result.current.items[0]!.uid;+ act(() => view.result.current.store.update(uid, { effort: 'low' }));+ expect(view.result.current.items[0]?.effort).toBe('low');+ // 已确认区域撤权立即清理,未知区域继续保留。+ act(() => update([], [region]));+ expect(view.result.current.items).toEqual([]);+ expect(listModelFavorites()).toEqual([expect.objectContaining({ providerId: providerShareFavoriteSource(peerShare) })]);+ // 对方区域恢复并确认空名单后,才清掉它的最后一条收藏。+ act(() => update([], [region, peerRegion]));+ expect(listModelFavorites()).toEqual([]);+ });++ it('persists the complete configuration and distinguishes local providers, shares and grants', () => {+ addModelFavorite(config);+ const a = mount();+ const b = mount('share:s2');+ act(() => { a.result.current.store.add(config); b.result.current.store.add(config); });+ expect(listModelFavorites()).toHaveLength(3);+ expect(parseProviderShareFavoriteSource(listModelFavorites()[1]!.providerId)).toEqual({ shareId: 's1', memberId: 'm1', providerId: 'anthropic', region: 'global' });+ expect(a.result.current.items).toEqual([{ ...config, uid: listModelFavorites()[1]!.uid }]);+ expect(b.result.current.items).toEqual([{ ...config, uid: listModelFavorites()[2]!.uid }]);+ act(() => a.result.current.store.add(config));+ expect(listModelFavorites()).toHaveLength(3);+ act(() => a.result.current.store.add({ ...config, effort: 'low' }));+ expect(a.result.current.items).toHaveLength(2);+ // 换账号再回来强制从持久化值加载,配置和来源仍完整。+ act(() => { setModelFavoritesOwner('other'); setModelFavoritesOwner('recipient'); });+ expect(a.result.current.items[0]).toMatchObject(config);+ expect(b.result.current.items).toHaveLength(1);+ });++ it('edits and removes only the selected copy while preserving its share source', () => {+ const view = mount();+ act(() => view.result.current.store.add(config));+ const uid = view.result.current.items[0]!.uid;+ act(() => view.result.current.store.update(uid, { effort: 'low', fast: false }));+ expect(listModelFavorites()[0]).toMatchObject({ providerId: providerShareFavoriteSource(share()), effort: 'low' });+ expect(view.result.current.items[0]?.fast).toBeUndefined();+ act(() => view.result.current.store.remove(uid));+ expect(listModelFavorites()).toEqual([]);+ });++ it('never clears on an unknown empty list, pause, offline, or a stale account snapshot', () => {+ const view = mount();+ act(() => view.result.current.store.add(config));+ act(() => {+ publish([], false);+ publish([{ ...share(), status: 'paused', hostOnline: false }]);+ publish([], true, 'other');+ publish([], true, 'recipient', 0);+ });+ expect(listModelFavorites()).toHaveLength(1);+ expect(view.result.current.items).toHaveLength(1);+ });++ it('clears revoked shares including the last share and a replaced membership, preserving unrelated favorites', () => {+ addModelFavorite(config);+ const a = mount();+ const b = mount('share:s2');+ act(() => { a.result.current.store.add(config); b.result.current.store.add(config); });+ const staleStore = a.result.current.store;+ act(() => publish([share('s1', 'new-member'), share('s2', 'm2')]));+ expect(a.result.current.items).toEqual([]);+ expect(() => staleStore.add(config)).toThrow('Shared favorite source unavailable');+ expect(b.result.current.items).toHaveLength(1);+ act(() => publish([]));+ expect(listModelFavorites()).toEqual([expect.objectContaining(config)]);+ });++ it('fences writes and cleanup across account changes', () => {+ const view = mount();+ act(() => view.result.current.store.add(config));+ const oldStore = view.result.current.store;+ act(() => {+ setDataOwnerGeneration('other', 2);+ setModelFavoritesOwner('other');+ publish([], true, 'recipient', 1);+ });+ expect(() => oldStore.add(config)).toThrow();+ expect(listModelFavorites()).toEqual([]);+ act(() => { setDataOwnerGeneration('recipient', 3); setModelFavoritesOwner('recipient'); });+ expect(listModelFavorites()).toHaveLength(1);+ act(() => publish([], true, 'recipient', 3));+ expect(listModelFavorites()).toEqual([]);+ });++ it('reports persistence failures without claiming a save or losing the previous copy', () => {+ const view = mount();+ act(() => view.result.current.store.add(config));+ const uid = view.result.current.items[0]!.uid;+ const writes = vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { throw new Error('quota'); });+ expect(() => view.result.current.store.add({ ...config, effort: 'low' })).toThrow('quota');+ expect(() => view.result.current.store.update(uid, { effort: 'low' })).toThrow('quota');+ expect(() => view.result.current.store.remove(uid)).toThrow('quota');+ expect(view.result.current.items).toEqual([{ uid, ...config }]);+ const failed = renderHook(() => useProviderShareFavoriteCleanupFailed());+ act(() => publish([]));+ expect(failed.result.current).toBe(true);+ expect(listModelFavorites()).toHaveLength(1);+ writes.mockRestore();+ act(() => publish([]));+ expect(failed.result.current).toBe(false);+ expect(listModelFavorites()).toEqual([]);+ });+});diff --git a/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.ts b/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.tsnew file mode 100644index 0000000000..1810257239--- /dev/null+++ b/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.ts@@ -0,0 +1,75 @@+// @vitest-environment jsdom+import { afterEach, beforeEach, expect, it, vi } from 'vitest';+import type { ProviderShareReceived } from '@cindy/device-link';+import type { ProviderShareReceivedSnapshot } from '../../shared/providerShare';+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';+import { __resetForTest, addModelFavorite, listModelFavorites, setModelFavoritesOwner } from '@/state/modelFavorites';+import { providerShareFavoriteSource } from '@/state/providerShareFavorites';+import { ensureProviderShareReceivedStarted, resetProviderShareStoreForTests } from '@/features/provider-share/providerShareStore';++vi.mock('@/hooks/useDeviceProviders', () => ({ getCachedDeviceProviders: () => null }));+vi.mock('@/lib/remoteCatalogSnapshot', () => ({ refreshRemoteCatalogSnapshot: vi.fn(async () => {}) }));+const share: 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,+};+let push: (list: ProviderShareReceived[]) => void;+let snapshot: ProviderShareReceivedSnapshot;+let readSnapshot: () => Promise<ProviderShareReceivedSnapshot>;+const tick = async () => { await Promise.resolve(); await Promise.resolve(); await Promise.resolve(); };++beforeEach(() => {+ resetProviderShareStoreForTests();+ __resetForTest();+ window.localStorage.clear();+ setDataOwnerGeneration('recipient', 1);+ setModelFavoritesOwner('recipient');+ snapshot = { ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 1 }, confirmedRegions: [], received: [] };+ readSnapshot = async () => snapshot;+ Object.assign(window, { electronAPI: { providerShare: {+ command: (command: { action: string }) => command.action === 'received-snapshot' ? readSnapshot() : Promise.resolve(snapshot.received),+ onReceivedChanged: (listener: typeof push) => { push = listener; return () => {}; },+ } } });+ addModelFavorite({ providerId: providerShareFavoriteSource(share), modelId: 'opus', agent: 'cc' });+});+afterEach(() => { resetProviderShareStoreForTests(); vi.restoreAllMocks(); });++it('cleans favorites without opening a picker, only after Main confirms the last share was removed', async () => {+ ensureProviderShareReceivedStarted();+ await tick();+ expect(listModelFavorites()).toHaveLength(1);+ push([]); // 断线时的空推送。+ await tick();+ expect(listModelFavorites()).toHaveLength(1);+ snapshot = { ...snapshot, confirmedRegions: ['global'], received: [{ ...share, status: 'paused', hostOnline: false }] };+ push([...snapshot.received]);+ await tick();+ expect(listModelFavorites()).toHaveLength(1);+ snapshot = { ...snapshot, received: [] };+ push([]);+ await tick();+ expect(listModelFavorites()).toEqual([]);+});++it('does not apply a superseded membership reply or an earlier account response', async () => {+ let finish!: (snapshot: ProviderShareReceivedSnapshot) => void;+ readSnapshot = () => new Promise((resolve) => { finish = resolve; });+ ensureProviderShareReceivedStarted();+ await tick();+ const stale = finish;+ readSnapshot = async () => ({ ...snapshot, confirmedRegions: ['global'], received: [share] });+ push([share]);+ await tick();+ stale({ ...snapshot, confirmedRegions: ['global'], received: [] });+ await tick();+ expect(listModelFavorites()).toHaveLength(1);+ readSnapshot = () => new Promise((resolve) => { finish = resolve; });+ push([]);+ setDataOwnerGeneration('other', 2);+ setModelFavoritesOwner('other');+ addModelFavorite({ providerId: providerShareFavoriteSource(share), modelId: 'opus', agent: 'cc' });+ finish({ ...snapshot, confirmedRegions: ['global'], received: [] });+ await tick();+ expect(listModelFavorites()).toHaveLength(1);+});diff --git a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsxindex 90a27f9cbe..89200ccfdb 100644--- a/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx+++ b/apps/desktop/src/renderer/__tests__/unifiedModelPanelRendering.test.tsx@@ -182,6 +182,8 @@ vi.mock('@/hooks/useProviders', () => ({}));const remoteProvidersRef = vi.hoisted(() => ({ providers: [] as unknown[] }));vi.mock('@/hooks/useDeviceProviders', () => ({+ getCachedDeviceProviders: () => ({ providers: remoteProvidersRef.providers }),+ subscribeDeviceProviders: () => () => {},evictDeviceProviders: vi.fn(),prefetchDeviceProviders: vi.fn(async () => {}),useDeviceProviders: () => ({@@ -217,7 +219,11 @@ import {addModelFavorite,listModelFavorites,updateModelFavorite,+ setModelFavoritesOwner,} from '@/state/modelFavorites';+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';+import { providerShareFavoriteSource, reconcileProviderShareFavorites } from '@/state/providerShareFavorites';+import { toast } from '@/lib/toast';import { setModelEngineOverride } from '@/state/modelEnginePrefs';const onProviderChange = vi.fn();@@ -265,6 +271,63 @@ beforeEach(() => {resetFavorites();});+describe('分享模型收藏', () => {+ const received = {+ shareId: 's1', memberId: 'm1', providerId: 'anthropic', providerLabel: 'Anthropic',+ hostDeviceId: 'host', deviceName: 'Host', status: 'active' as const, hostOnline: true, hostCapable: true,+ owner: { displayName: 'Owner', avatarUrl: null, region: 'global' as const },+ };+ beforeEach(() => {+ setDataOwnerGeneration('recipient', 1);+ setModelFavoritesOwner('recipient');+ reconcileProviderShareFavorites({ ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 1 }, confirmedRegions: ['global'], received: [received] });+ remoteProvidersRef.providers = providersRef.providers.map((provider) => ({ ...provider as object, remoteInvocationEnabled: true }));+ });+ afterEach(() => {+ remoteProvidersRef.providers = [];+ setDataOwnerGeneration(null, 0);+ vi.restoreAllMocks();+ });++ it('点击收藏后可见、可重新选择,完整配置保存在受邀者账号', async () => {+ const onUnifiedSelect = vi.fn();+ renderPanel({ deviceId: 'share:s1', onUnifiedSelect });+ await act(async () => fireEvent.click(within(rowFor('Opus 5')).getByRole('button', { name: '存为收藏' })));+ expect(listModelFavorites()).toEqual([expect.objectContaining({+ providerId: providerShareFavoriteSource(received), modelId: 'claude-opus-5', agent: 'cc', effort: 'medium',+ })]);+ fireEvent.click(document.querySelector('[data-rail-item="favorites"]')!);+ expect(within(screen.getByRole('listbox')).getAllByText('Opus 5')).toHaveLength(1);+ await act(async () => fireEvent.click(rowFor('Opus 5')));+ expect(onUnifiedSelect).toHaveBeenCalledWith(expect.objectContaining({ providerId: 'anthropic', modelId: 'claude-opus-5', engine: 'cc', effort: 'medium', fast: false }));+ });++ it('存储写失败显示提示,收藏区不会出现未保存的条目', async () => {+ const failed = vi.spyOn(toast, 'error').mockImplementation(() => 'test');+ renderPanel({ deviceId: 'share:s1' });+ vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { throw new Error('quota'); });+ await act(async () => fireEvent.click(within(rowFor('Opus 5')).getByRole('button', { name: '存为收藏' })));+ expect(failed).toHaveBeenCalledWith('newChat.modelSelector.unified.favoritesSaveFailed');+ expect(listModelFavorites()).toEqual([]);+ });++ it('从分享供应商切到收藏侧栏仍保留分享来源,选择回传完整路由', async () => {+ const onUnifiedSelect = vi.fn();+ renderPanel({+ remoteAgent: { devices: [{ deviceId: 'share:s1', name: '来自 Owner 的分享' }], selectedDeviceId: 'share:s1' },+ onUnifiedSelect,+ });+ await act(async () => fireEvent.click(within(rowFor('Opus 5')).getByRole('button', { name: '存为收藏' })));+ fireEvent.click(document.querySelector('[data-rail-item="favorites"]')!);+ expect(within(screen.getByRole('listbox')).getAllByText('Opus 5')).toHaveLength(1);+ await act(async () => fireEvent.click(rowFor('Opus 5')));+ expect(onUnifiedSelect).toHaveBeenCalledWith(expect.objectContaining({+ providerId: 'anthropic', modelId: 'claude-opus-5', engine: 'cc', effort: 'medium', fast: false,+ agentDevice: expect.objectContaining({ deviceId: 'share:s1' }),+ }));+ });+});+describe('统一面板 · 打折 GPT-5.6 与 GPT-6 包月互切', () => {const originalProviders = providersRef.providers;const routes = [diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsxindex 82b5c3af7e..d667c09ed2 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx@@ -1,4 +1,7 @@import { useRemoteModelFavorites } from '@/state/useRemoteModelFavorites';+import { useProviderShareFavorites } from '@/state/providerShareFavorites';+import { ensureProviderShareReceivedStarted } from '@/features/provider-share/providerShareStore';+import { toast } from '@/lib/toast';import { matchesModelName } from '@/lib/modelDisplayNames';import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';import { Check, Loader2, TriangleAlert } from 'lucide-react';@@ -357,9 +360,14 @@ export function UnifiedModelPanel({}: UnifiedModelPanelProps) {const { t } = useTranslation();const storedFavorites = useModelFavorites();- // 分享来的供应商(`share:<id>`)不是同账号的电脑,没有可同步的收藏:不去读,也不报同步失败。- const remoteFavorites = useRemoteModelFavorites(isProviderShareAgentDeviceId(deviceId) ? undefined : deviceId);- const favorites = selectionPolicy === 'official' ? NO_FAVORITES : deviceId ? remoteFavorites.items : storedFavorites;+ const isSharedProvider = isProviderShareAgentDeviceId(deviceId);+ const remoteFavorites = useRemoteModelFavorites(isSharedProvider ? undefined : deviceId);+ const sharedFavorites = useProviderShareFavorites(deviceId, storedFavorites);+ useEffect(() => {+ if (isSharedProvider) ensureProviderShareReceivedStarted();+ }, [isSharedProvider]);+ const favorites = selectionPolicy === 'official' ? NO_FAVORITES+ : isSharedProvider ? sharedFavorites.items : deviceId ? remoteFavorites.items : storedFavorites;// 引擎 override / 深度 / Fast 三份 store 的版本号:任一变化都要重算行三元组与浮层// (其它窗口的 storage 事件、device-link 推送同样经这两个版本号进来)。远程 Agent 的档位记忆// 是另一份 store,版本号并进 memoryVersion。@@ -481,19 +489,22 @@ export function UnifiedModelPanel({: null,[remoteActiveDeviceId, remoteActiveProviderId],);- const effectiveRail = remoteRail ?? (query.trim() ? RAIL_ALL : rail);+ const effectiveRail = isSharedProvider && rail.kind === 'favorites' && !query.trim()+ ? rail : remoteRail ?? (query.trim() ? RAIL_ALL : rail);// 切到另一台电脑的途中(或读取失败)列表数据还不是那台的目录:列表区只显示状态,不出行。const remoteListPending = remoteRail !== null && !remoteSources?.ready;const handleRailSelect = useCallback((item: UnifiedRailItem) => {if (item.kind === 'remote-provider') {+ setRail(RAIL_ALL);remoteSources?.onActivate({ deviceId: item.deviceId, providerId: item.providerId });return;}- if (remoteSources?.active) remoteSources.onActivate(null);+ // 分享收藏属于受邀者,但条目仍要在该分享的目录里解析与选用。+ if (remoteSources?.active && !(isSharedProvider && item.kind === 'favorites')) remoteSources.onActivate(null);setRail(item);},- [remoteSources],+ [remoteSources, isSharedProvider],);// ── 行配置合成 ────────────────────────────────────────────────────────────@@ -870,7 +881,8 @@ export function UnifiedModelPanel({optimistic: optimisticConfig,runExternal,} = useUnifiedRowActions({- favoriteStore: deviceId ? remoteFavorites.store : undefined,+ favoriteStore: isSharedProvider ? sharedFavorites.store : deviceId ? remoteFavorites.store : undefined,+ onFavoriteError: () => toast.error(t('newChat.modelSelector.unified.favoritesSaveFailed')),interactionDisabled,isLiveRow,// 两笔实时写入(深度 + Fast)里第二笔失败时回滚第一笔用的原值,以及收藏 live 判定diff --git a/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts b/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.tsindex c8a542d2db..44796f4ea1 100644--- a/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts+++ b/apps/desktop/src/renderer/components/new-chat/useUnifiedRowActions.ts@@ -50,6 +50,7 @@ type ActionResult = void | boolean | Promise<void | boolean>;export interface UnifiedRowActionsOptions {favoriteStore?: FavoriteStore;+ onFavoriteError?: () => void;interactionDisabled: boolean;/** 这一行是不是当前会话 / 草稿正在用的那一行(来源 + 模型 + 引擎都对上)。 */isLiveRow: (entry: UnifiedModelEntry, config: UnifiedRowConfig) => boolean;@@ -384,12 +385,30 @@ export function useUnifiedRowActions(options: UnifiedRowActionsOptions): UnifiedonBeforeRemoveFavorite,} = options;- const favorites: FavoriteStore = options.favoriteStore ?? {+ const favoriteStore: FavoriteStore = options.favoriteStore ?? {get: getModelFavorite,add: config => { addModelFavorite(config); },update: updateModelFavorite,remove: removeModelFavorite,};+ const favoriteWrite = (write: () => void | Promise<void>): void | Promise<void> => {+ try {+ const result = write();+ if (result) return result.catch((error: unknown) => {+ options.onFavoriteError?.();+ throw error;+ });+ } catch (error) {+ options.onFavoriteError?.();+ throw error;+ }+ };+ const favorites: FavoriteStore = {+ get: favoriteStore.get,+ add: (config) => favoriteWrite(() => favoriteStore.add(config)),+ update: (uid, patch) => favoriteWrite(() => favoriteStore.update(uid, patch)),+ remove: (uid) => favoriteWrite(() => favoriteStore.remove(uid)),+ };// ── 「把一份配置真的应用到正在跑的那一份上」的三条链路 ─────────────────────// 恢复推荐(§1.4)与「删除当前选中的收藏」(§1.5)是同一件事的两个入口:都要把行回落到diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsxindex 4111d3e7be..dcd8b90889 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareGlobalHost.tsx@@ -12,6 +12,7 @@ import { useLocation, useNavigate } from 'react-router-dom';import { makeGenericNewMakerRouteState } from '@/features/cc-agent/lib/genericNewMakerRouteState';import { toast } from '@/lib/toast';+import { useProviderShareFavoriteCleanupFailed } from '@/state/providerShareFavorites';import type { ProviderShareSettledEvent } from '../../../shared/providerShare';import { ProviderShareApplyDialog, isProviderShareRequestTrackedByDialog } from './ProviderShareApplyDialog';@@ -31,6 +32,10 @@ const SETTLED_TOAST_MS = 6000;export function ProviderShareGlobalHost() {const { t } = useTranslation();+ const favoriteCleanupFailed = useProviderShareFavoriteCleanupFailed();+ useEffect(() => {+ if (favoriteCleanupFailed) toast.error(t('newChat.modelSelector.unified.favoritesCleanupFailed'));+ }, [favoriteCleanupFailed, t]);const navigate = useNavigate();const location = useLocation();const navigateRef = useRef(navigate);diff --git a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts b/apps/desktop/src/renderer/features/provider-share/providerShareStore.tsindex dc7ca9885b..a94823be9e 100644--- a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts+++ b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts@@ -17,6 +17,8 @@ import type { ProviderShareReceived } from '@cindy/device-link';import { getCachedDeviceProviders } from '@/hooks/useDeviceProviders';import { refreshRemoteCatalogSnapshot } from '@/lib/remoteCatalogSnapshot';import { createLogger } from '@/lib/logger';+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';+import { reconcileProviderShareFavorites } from '@/state/providerShareFavorites';import type {ProviderShareOwnerState,@@ -78,6 +80,16 @@ function setReceived(next: readonly ProviderShareReceived[]): void {for (const listener of receivedSubscribers) listener();}+let membershipRequest = 0;+function refreshFavoriteMembership(api: ProviderShareApi): void {+ const request = ++membershipRequest;+ const owner = getDataOwnerGeneration();+ void api.command({ action: 'received-snapshot' }).then((snapshot) => {+ if (request === membershipRequest && isDataOwnerGenerationCurrent(owner))+ reconcileProviderShareFavorites(snapshot);+ }).catch(() => undefined); // 读失败不是撤权,下次分享快照到达时再核对。+}+/** 启动已收到分享的同步(幂等)。Preload 不可用(测试 / 旧窗口)时什么都不做。 */export function ensureProviderShareReceivedStarted(): void {if (receivedStarted) return;@@ -87,6 +99,7 @@ export function ensureProviderShareReceivedStarted(): void {api.onReceivedChanged((list) => {receivedPushSeq += 1;setReceived(Array.isArray(list) ? list : []);+ refreshFavoriteMembership(api);});const seqAtRequest = receivedPushSeq;void api@@ -94,6 +107,7 @@ export function ensureProviderShareReceivedStarted(): void {.then((list) => {if (receivedPushSeq !== seqAtRequest) return;setReceived(list);+ refreshFavoriteMembership(api);}).catch((error: unknown) => {log.debug('provider share received list unavailable', {@@ -112,6 +126,7 @@ export function refreshProviderShareReceived(): void {.then((list) => {if (receivedPushSeq !== seqAtRequest) return;setReceived(list);+ refreshFavoriteMembership(api);}).catch(() => undefined);}@@ -193,6 +208,7 @@ export function resetProviderShareStoreForTests(): void {receivedSnapshot = { received: [], loaded: false };receivedStarted = false;receivedPushSeq = 0;+ membershipRequest += 1;receivedSubscribers.clear();pendingRequests = [];pendingSubscribers.clear();diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 82019c9eee..885f5c783c 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -9782,6 +9782,8 @@"railRemoteProvider": "{{provider}} · {{device}}","remoteLoading": "Loading models from that computer…","favoritesGroup": "Favorites",+ "favoritesSaveFailed": "Could not save favorite changes",+ "favoritesCleanupFailed": "Could not remove favorites for revoked provider shares","favoritesEmpty": "No favorites yet — hover a model and hit ☆ to pin it here","addFavorite": "Save to favorites","customize": "Customize",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 06dfced78d..3b34757ae1 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -9744,6 +9744,8 @@"railRemoteProvider": "{{provider}} · {{device}}","remoteLoading": "そのパソコンのモデルを読み込み中…","favoritesGroup": "お気に入り",+ "favoritesSaveFailed": "お気に入りの変更を保存できませんでした",+ "favoritesCleanupFailed": "共有が解除されたモデルのお気に入りを削除できませんでした","favoritesEmpty": "お気に入りはまだありません——モデルの行にカーソルを合わせて ☆ で保存できます","addFavorite": "お気に入りに保存","customize": "カスタマイズ",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 94bd506dd4..c70827b563 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -9744,6 +9744,8 @@"railRemoteProvider": "{{provider}} · {{device}}","remoteLoading": "그 컴퓨터의 모델을 불러오는 중…","favoritesGroup": "즐겨찾기",+ "favoritesSaveFailed": "즐겨찾기 변경 사항을 저장하지 못했습니다",+ "favoritesCleanupFailed": "공유가 해제된 모델의 즐겨찾기를 삭제하지 못했습니다","favoritesEmpty": "즐겨찾기가 없습니다 — 모델 행에 마우스를 올리고 ☆를 눌러 저장하세요","addFavorite": "즐겨찾기에 저장","customize": "사용자 지정",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex d87aa77c41..a046dad5fa 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -9744,6 +9744,8 @@"railRemoteProvider": "{{provider}} · {{device}}","remoteLoading": "正在读取那台电脑的模型…","favoritesGroup": "收藏",+ "favoritesSaveFailed": "未能保存收藏更改",+ "favoritesCleanupFailed": "未能清理已失效的分享模型收藏","favoritesEmpty": "还没有收藏——把鼠标停到模型行上,点 ☆ 存到这里","addFavorite": "存为收藏","customize": "自定义",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 97b22b6400..760e1a60c5 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -9743,6 +9743,8 @@"railRemoteProvider": "{{provider}} · {{device}}","remoteLoading": "正在讀取那臺電腦的模型…","favoritesGroup": "收藏",+ "favoritesSaveFailed": "未能儲存收藏變更",+ "favoritesCleanupFailed": "未能清理已失效的分享模型收藏","favoritesEmpty": "還沒有收藏——把滑鼠停到模型列上,點 ☆ 存到這裡","addFavorite": "存為收藏","customize": "自訂",diff --git a/apps/desktop/src/renderer/state/providerShareFavorites.ts b/apps/desktop/src/renderer/state/providerShareFavorites.tsnew file mode 100644index 0000000000..99e7da8ad4--- /dev/null+++ b/apps/desktop/src/renderer/state/providerShareFavorites.ts@@ -0,0 +1,128 @@+import { useMemo, useSyncExternalStore } from 'react';+import type { ProviderShareReceived } from '@cindy/device-link';+import {+ getDataOwnerGeneration,+ isDataOwnerGenerationCurrent,+ isDataOwnerPushStampCurrent,+} from '@/contexts/dataOwnerGeneration';+import type { ProviderShareReceivedSnapshot } from '../../shared/providerShare';+import {+ accessHostModelFavorites,+ type ModelFavoriteConfig,+ type ModelFavoriteItem,+} from './modelFavorites';+import type { FavoriteStore } from './useRemoteModelFavorites';++const PREFIX = 'provider-share-favorite:';+type Source = { shareId: string; memberId: string; providerId: string; region: ProviderShareReceived['owner']['region'] };++/**+ * 复用受邀者账号的收藏存储和同步协议。providerId 是带分享/成员身份的存储键,+ * 只在对应分享的选择器里投影为真实 providerId,绝不用于模型请求。+ * 老客户端不认识这个来源时不会把它误认成本机同名供应商。+ */+export function providerShareFavoriteSource(source: Pick<ProviderShareReceived, 'shareId' | 'memberId' | 'providerId' | 'owner'>): string {+ const key = PREFIX + JSON.stringify([source.shareId, source.memberId, source.providerId, source.owner.region]);+ if (!source.shareId || !source.memberId || !source.providerId || key.length > 512)+ throw new Error('Invalid shared favorite source');+ return key;+}++export function parseProviderShareFavoriteSource(value: string): Source | null {+ if (!value.startsWith(PREFIX)) return null;+ try {+ const parts: unknown = JSON.parse(value.slice(PREFIX.length));+ if (!Array.isArray(parts) || parts.length !== 4 || !parts.every((part) => typeof part === 'string' && part.length > 0) ||+ (parts[3] !== 'cn' && parts[3] !== 'global'))+ return null;+ return { shareId: parts[0], memberId: parts[1], providerId: parts[2], region: parts[3] };+ } catch {+ return null;+ }+}++let snapshot: { membership: ProviderShareReceivedSnapshot | null; cleanupFailed: boolean } = {+ membership: null, cleanupFailed: false,+};+const listeners = new Set<() => void>();+const subscribe = (listener: () => void) => {+ listeners.add(listener);+ return () => { listeners.delete(listener); };+};+const getSnapshot = () => snapshot;++/** 可用来源立即发布;仅清理 Main 已确认完整名单的区域,未知区域的收藏保留。 */+export function reconcileProviderShareFavorites(next: ProviderShareReceivedSnapshot): void {+ if (!next || !isDataOwnerPushStampCurrent(next.ownerStamp)) return;+ let cleanupFailed = false;+ try {+ const items = accessHostModelFavorites(next.ownerStamp.dataOwnerId);+ const sources = new Set(next.received.map(providerShareFavoriteSource));+ for (const item of items) {+ const source = parseProviderShareFavoriteSource(item.providerId);+ if (!source || !next.confirmedRegions.includes(source.region) || sources.has(item.providerId)) continue;+ accessHostModelFavorites(next.ownerStamp.dataOwnerId, { kind: 'remove', expected: item });+ }+ } catch {+ cleanupFailed = true;+ }+ snapshot = { membership: next, cleanupFailed };+ for (const listener of listeners) listener();+}++export function useProviderShareFavoriteCleanupFailed(): boolean {+ const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);+ return !!state.membership && isDataOwnerPushStampCurrent(state.membership.ownerStamp) && state.cleanupFailed;+}++export function useProviderShareFavorites(+ deviceId: string | undefined,+ stored: readonly ModelFavoriteItem[],+): { items: readonly ModelFavoriteItem[]; store: FavoriteStore } {+ const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);+ const owner = getDataOwnerGeneration();+ const membership = state.membership && isDataOwnerPushStampCurrent(state.membership.ownerStamp)+ ? state.membership : null;+ const share = membership?.received.find((item) => `share:${item.shareId}` === deviceId);+ const source = share ? providerShareFavoriteSource(share) : null;+ const project = (item: ModelFavoriteItem): ModelFavoriteItem => ({ ...item, providerId: share!.providerId });+ const assertCurrent = () => {+ const current = snapshot.membership;+ if (!source || !share || !current || !isDataOwnerGenerationCurrent(owner) || !isDataOwnerPushStampCurrent(current.ownerStamp) ||+ current.ownerStamp.dataOwnerId !== owner.dataOwnerId ||+ !current.received.some((item) => providerShareFavoriteSource(item) === source))+ throw new Error('Shared favorite source unavailable');+ };+ const expected = (uid: string) => {+ assertCurrent();+ const item = accessHostModelFavorites(owner.dataOwnerId).find((item) => item.uid === uid && item.providerId === source);+ if (!item) throw new Error('Shared favorite unavailable');+ return item;+ };+ const store: FavoriteStore = {+ get: (uid) => {+ const item = stored.find((item) => item.uid === uid && item.providerId === source);+ return item ? project(item) : undefined;+ },+ add: (config: ModelFavoriteConfig) => {+ assertCurrent();+ if (config.providerId !== share!.providerId) throw new Error('Shared provider changed');+ accessHostModelFavorites(owner.dataOwnerId, { kind: 'add', item: { ...config, providerId: source! } });+ },+ update: (uid, patch) => {+ const before = expected(uid);+ const item = { ...before, ...patch };+ accessHostModelFavorites(owner.dataOwnerId, {+ kind: 'update', expected: before,+ item: { ...item, effort: item.effort ?? undefined, fast: item.fast ? true : undefined },+ });+ },+ remove: (uid) => {+ accessHostModelFavorites(owner.dataOwnerId, { kind: 'remove', expected: expected(uid) });+ },+ };+ const items = useMemo(() => source && share+ ? stored.filter((item) => item.providerId === source).map((item) => ({ ...item, providerId: share.providerId }))+ : [], [stored, source, share?.providerId]);+ return { items, store };+}diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex b6556d0e6b..7356653159 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -9,6 +9,15 @@ import type {ProviderShareRequestItem,ProviderShareRequestState,} from '@cindy/device-link';+import type { DataOwnerPushStamp } from './dataOwnerPush';++/** 本机收藏清理依据。未加载、断线和账号切换的空列表不能用于撤权清理。 */+export interface ProviderShareReceivedSnapshot {+ ownerStamp: DataOwnerPushStamp;+ /** 仅这些区域的名单完整,可据此清理已撤权收藏;其它区域不受影响。 */+ confirmedRegions: readonly ProviderShareReceived['owner']['region'][];+ received: readonly ProviderShareReceived[];+}export const PROVIDER_SHARE_IPC = {/** Renderer → Main:全部操作走同一个命令通道。 */@@ -121,6 +130,7 @@ export type ProviderShareCommand =| { action: 'approve' | 'reject'; requestId: string }| { action: 'set-member'; memberId: string; status: 'pause' | 'resume' | 'remove' }| { action: 'received' }+ | { action: 'received-snapshot' }| { action: 'preview'; link: string }| { action: 'send-request'; link: string }| { action: 'get-request'; requestId: string }@@ -135,6 +145,7 @@ export interface ProviderShareCommandResult {reject: { ok: true };'set-member': { ok: true };received: ProviderShareReceived[];+ 'received-snapshot': ProviderShareReceivedSnapshot;preview: ProviderShareLinkPreview;'send-request': ProviderShareRequestState;'get-request': ProviderShareRequestState;