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(models): 按被控端收藏恢复跨区分享授权

davida129242636e9
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx
index fe5424f13c..346a966f6c 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx
@@ -147,6 +147,7 @@ vi.mock('@/features/provider-group/useLocalProviderGroups', () => ({
}));
vi.mock('@/features/provider-share/providerShareStore', () => ({
ensureProviderShareReceivedStarted: vi.fn(),
+ requestProviderShareFavoriteRegions: vi.fn(),
useProviderShareReceived: () => ({
received: [{ shareId: 's1', providerLabel: 'X', deviceName: "Magi's Mac Mini", owner: { displayName: 'Magi' } }],
loaded: true,
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx
index a57c613c14..e24bc7e557 100644
--- a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx
@@ -141,6 +141,7 @@ vi.mock('@/features/provider-group/useLocalProviderGroups', () => ({
}));
vi.mock('@/features/provider-share/providerShareStore', () => ({
ensureProviderShareReceivedStarted: vi.fn(),
+ requestProviderShareFavoriteRegions: vi.fn(),
useProviderShareReceived: () => ({ received: [], loaded: true }),
}));
vi.mock('@/state/modelVisibilityPrefs', () => ({
diff --git a/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.ts b/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.ts
index b688c332f4..ebbcf28887 100644
--- a/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.ts
+++ b/apps/desktop/src/renderer/__tests__/providerShareFavoritesSync.test.ts
@@ -6,7 +6,11 @@ import type { ProviderShareCommand } 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';
+import {
+ ensureProviderShareReceivedStarted,
+ requestProviderShareFavoriteRegions,
+ resetProviderShareStoreForTests,
+} from '@/features/provider-share/providerShareStore';
vi.mock('@/hooks/useDeviceProviders', () => ({ getCachedDeviceProviders: () => null }));
vi.mock('@/lib/remoteCatalogSnapshot', () => ({ refreshRemoteCatalogSnapshot: vi.fn(async () => {}) }));
@@ -139,6 +143,37 @@ it('cleans favorites without opening a picker, only after Main confirms the last
expect(listModelFavorites()).toEqual([]);
});
+it('recovers regions hinted by the remote task device favorites, once per account', async () => {
+ snapshot = { ...snapshot, confirmedRegions: ['global'], received: [share] };
+ ensureProviderShareReceivedStarted();
+ await tick();
+ await tick();
+ expect(commands.map((item) => item.action)).toEqual(['received', 'received-snapshot']);
+ commands = [];
+ snapshot = { ...snapshot, confirmedRegions: ['global', 'cn'] };
+ requestProviderShareFavoriteRegions(['cn']);
+ await tick();
+ expect(commands).toEqual([{ action: 'received-snapshot', favoriteRecovery: {
+ ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 1 }, regions: ['global', 'cn'],
+ } }]);
+ requestProviderShareFavoriteRegions(['cn']);
+ requestProviderShareFavoriteRegions([]);
+ await tick();
+ expect(commands).toHaveLength(1);
+ await vi.advanceTimersByTimeAsync(60_000);
+ expect(commands).toHaveLength(1);
+ // 换账号后旧账号的线索作废,不能替新账号去拉对方区域。
+ setDataOwnerGeneration('other', 2);
+ setModelFavoritesOwner('other');
+ commands = [];
+ snapshot = { ownerStamp: { dataOwnerId: 'other', ownerGeneration: 2 }, confirmedRegions: ['global'], received: [] };
+ push([]);
+ await tick();
+ expect(commands).toContainEqual({ action: 'received-snapshot', favoriteRecovery: {
+ ownerStamp: { dataOwnerId: 'other', ownerGeneration: 2 }, regions: [],
+ } });
+});
+
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; });
diff --git a/apps/desktop/src/renderer/__tests__/remoteAgentDeviceFavoritesPanel.test.tsx b/apps/desktop/src/renderer/__tests__/remoteAgentDeviceFavoritesPanel.test.tsx
index 7658a0b27e..2322627e7e 100644
--- a/apps/desktop/src/renderer/__tests__/remoteAgentDeviceFavoritesPanel.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/remoteAgentDeviceFavoritesPanel.test.tsx
@@ -150,6 +150,8 @@ import {
} from '@/state/modelFavorites';
import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
import { providerShareFavoriteSource, reconcileProviderShareFavorites } from '@/state/providerShareFavorites';
+import { resetProviderShareStoreForTests } from '@/features/provider-share/providerShareStore';
+import type { ProviderShareCommand } from '../../shared/providerShare';
const devices = [{ deviceId: 'device-c', name: 'Studio' }];
const C_SOURCE = agentDeviceFavoriteSource({ deviceId: 'device-c', providerId: 'c-open' });
@@ -537,4 +539,39 @@ describe('收藏 / 全部聚合来源,供应商只筛自己的收藏', () => {
expect(listModelFavorites()).toEqual(controllerItems);
expect(invoke.mock.calls.every(([deviceId]) => deviceId === 'device-b')).toBe(true);
});
+
+ it('被控电脑收藏了控制端没加载过的跨区分享:按它的区域恢复授权后照常列出', async () => {
+ resetProviderShareStoreForTests();
+ const cn = { ...share('three'), owner: { displayName: 'three', avatarUrl: null, region: 'cn' as const } };
+ catalogs.byDevice['share:three'] = [{
+ ...(catalogs.local[0] as object), remoteInvocationEnabled: true,
+ models: { 'claude-code': [{ id: 'a-model', name: 'Shared three', efforts: ['low', 'high'], defaultEffort: 'high' }] },
+ }];
+ remoteLists['device-b'] = [{ uid: 'home-cn', providerId: providerShareFavoriteSource(cn), modelId: 'a-model', agent: 'cc' }];
+ const command = vi.fn(async (request: ProviderShareCommand) => {
+ if (request.action !== 'received-snapshot') return shares;
+ // Main 只为线索里的区域加载跨区名单;控制端本机收藏只有 global。
+ const withCn = request.favoriteRecovery?.regions.includes('cn') ?? false;
+ return {
+ ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 1 },
+ confirmedRegions: withCn ? ['global', 'cn'] : ['global'],
+ received: withCn ? [...shares, cn] : shares,
+ };
+ });
+ vi.stubGlobal('electronAPI', {
+ ...(window as unknown as { electronAPI: object }).electronAPI,
+ providerShare: { command, onReceivedChanged: () => () => {} },
+ });
+ renderPanel({ devices: [...allDevices, { deviceId: 'share:three', name: 'three' }], homeDeviceId: 'device-b' }, {
+ deviceId: 'device-b', modelId: 'b-model', currentProviderId: 'b-main',
+ });
+ await act(async () => { await new Promise((resolve) => setTimeout(resolve, 0)); });
+ expect(command).toHaveBeenCalledWith({ action: 'received-snapshot', favoriteRecovery: {
+ ownerStamp: { dataOwnerId: 'recipient', ownerGeneration: 1 }, regions: ['global', 'cn'],
+ } });
+ await clickRail('favorites');
+ expect(within(favoritesGroup()).getByText('Shared three')).toBeTruthy();
+ expect(remoteLists['device-b']).toHaveLength(1);
+ resetProviderShareStoreForTests();
+ });
});
diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
index 636d3fb861..fb1b488c4a 100644
--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx
@@ -1,6 +1,7 @@
import { useRemoteModelFavorites } from '@/state/useRemoteModelFavorites';
import {
parseProviderShareFavoriteSource,
+ providerShareFavoriteRegionsOf,
useProviderShareFavorites,
useProviderShareFavoriteSources,
} from '@/state/providerShareFavorites';
@@ -9,7 +10,10 @@ import {
LOCAL_MODEL_FAVORITE_STORE,
useAgentDeviceFavorites,
} from '@/state/agentDeviceFavorites';
-import { ensureProviderShareReceivedStarted } from '@/features/provider-share/providerShareStore';
+import {
+ ensureProviderShareReceivedStarted,
+ requestProviderShareFavoriteRegions,
+} 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';
@@ -422,6 +426,11 @@ export function UnifiedModelPanel({
useEffect(() => {
if (isSharedProvider || hasRemoteSources) ensureProviderShareReceivedStarted();
}, [isSharedProvider, hasRemoteSources]);
+ // 任务所在电脑收藏的跨区分享,本机可能从没加载过那个区域的名单:按它的区域补一次恢复。
+ const homeFavoriteItems = remoteSources?.favoritesDeviceId ? remoteFavorites.items : null;
+ useEffect(() => {
+ if (homeFavoriteItems) requestProviderShareFavoriteRegions(providerShareFavoriteRegionsOf(homeFavoriteItems));
+ }, [homeFavoriteItems]);
const favorites = selectionPolicy === 'official' ? NO_FAVORITES
: isSharedProvider ? sharedFavorites.items
: remoteSources ? agentDeviceFavorites.items
diff --git a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
index add15b6e1f..6863d2dd84 100644
--- a/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
+++ b/apps/desktop/src/renderer/features/provider-share/providerShareStore.ts
@@ -80,9 +80,20 @@ function setReceived(next: readonly ProviderShareReceived[]): void {
for (const listener of receivedSubscribers) listener();
}
+type ShareRegion = ProviderShareReceived['owner']['region'];
+
let membershipRequest = 0;
let membershipRetryTimer: ReturnType<typeof setTimeout> | null = null;
let membershipFailures = 0;
+/** 远程任务所在电脑的收藏不在本机存储里,它们的区域同样是查询线索;按账号隔离,换账号即作废。 */
+let favoriteRegionHints: { dataOwnerId: string | null; regions: ReadonlySet<ShareRegion> } = {
+ dataOwnerId: null, regions: new Set(),
+};
+
+function hintedFavoriteRegions(dataOwnerId: string | null): readonly ShareRegion[] {
+ return favoriteRegionHints.dataOwnerId === dataOwnerId ? [...favoriteRegionHints.regions] : [];
+}
+
function refreshFavoriteMembership(api: ProviderShareApi): void {
if (membershipRetryTimer) clearTimeout(membershipRetryTimer);
membershipRetryTimer = null;
@@ -99,9 +110,10 @@ function refreshFavoriteMembership(api: ProviderShareApi): void {
};
void (async () => {
try {
- let regions: ProviderShareReceived['owner']['region'][] = [];
- try { regions = getProviderShareFavoriteRegions(owner.dataOwnerId); }
+ let local: ShareRegion[] = [];
+ try { local = getProviderShareFavoriteRegions(owner.dataOwnerId); }
catch { /* 清理器会报告存储错误并安排重试;读取恢复后再补齐区域线索。 */ }
+ const regions = [...new Set([...local, ...hintedFavoriteRegions(owner.dataOwnerId)])];
const snapshot = await api.command({
action: 'received-snapshot',
favoriteRecovery: { ownerStamp: { dataOwnerId: owner.dataOwnerId, ownerGeneration: owner.generation }, regions },
@@ -151,6 +163,18 @@ export function refreshProviderShareFavoriteMembership(): void {
if (api) refreshFavoriteMembership(api);
}
+/**
+ * 远程任务读写任务所在电脑的收藏:其中分享收藏的区域本机可能从没加载过,补进查询线索并重新
+ * 核对一次名单,让对方区域的授权被恢复。区域已在线索里时什么都不做。
+ */
+export function requestProviderShareFavoriteRegions(regions: readonly ShareRegion[]): void {
+ const { dataOwnerId } = getDataOwnerGeneration();
+ const known = favoriteRegionHints.dataOwnerId === dataOwnerId ? favoriteRegionHints.regions : new Set<ShareRegion>();
+ if (regions.every((region) => known.has(region))) return;
+ favoriteRegionHints = { dataOwnerId, regions: new Set([...known, ...regions]) };
+ refreshProviderShareFavoriteMembership();
+}
+
/** 主动再取一次(退出分享后立即刷新列表;推送仍会随后到达)。 */
export function refreshProviderShareReceived(): void {
const api = providerShareApi();
@@ -247,6 +271,7 @@ export function resetProviderShareStoreForTests(): void {
if (membershipRetryTimer) clearTimeout(membershipRetryTimer);
membershipRetryTimer = null;
membershipFailures = 0;
+ favoriteRegionHints = { dataOwnerId: null, regions: new Set() };
receivedSubscribers.clear();
pendingRequests = [];
pendingSubscribers.clear();
diff --git a/apps/desktop/src/renderer/state/providerShareFavorites.ts b/apps/desktop/src/renderer/state/providerShareFavorites.ts
index 62c1687e7a..ad33cea9cc 100644
--- a/apps/desktop/src/renderer/state/providerShareFavorites.ts
+++ b/apps/desktop/src/renderer/state/providerShareFavorites.ts
@@ -52,14 +52,18 @@ const subscribe = (listener: () => void) => {
};
const getSnapshot = () => snapshot;
-/** 原收藏就是未完成清理的持久线索,不依赖另写一份可能同样失败的清理队列。 */
-export function getProviderShareFavoriteRegions(ownerId: string | null): Source['region'][] {
- return [...new Set(accessHostModelFavorites(ownerId).flatMap((item) => {
+export function providerShareFavoriteRegionsOf(items: readonly Pick<ModelFavoriteItem, 'providerId'>[]): Source['region'][] {
+ return [...new Set(items.flatMap((item) => {
const source = parseProviderShareFavoriteSource(item.providerId);
return source ? [source.region] : [];
}))];
}
+/** 原收藏就是未完成清理的持久线索,不依赖另写一份可能同样失败的清理队列。 */
+export function getProviderShareFavoriteRegions(ownerId: string | null): Source['region'][] {
+ return providerShareFavoriteRegionsOf(accessHostModelFavorites(ownerId));
+}
+
/** 可用来源立即发布;仅清理 Main 已确认完整名单的区域,未知区域的收藏保留。 */
export function reconcileProviderShareFavorites(next: ProviderShareReceivedSnapshot): boolean {
if (!next || !isDataOwnerPushStampCurrent(next.ownerStamp)) return false;