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): 等分享名单期间用户改选了别的供应商时放弃「配置模型」的跳转

fmfsaisaif96530fd49f5
diff --git a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
index 66b5c45c23..f304dbfd5c 100644
--- a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
@@ -1138,4 +1138,20 @@ describe('ProvidersSection — 分享来的供应商深链', () => {
await screen.findByTestId('provider-share-received-detail');
await waitFor(() => expect(screen.getByTestId('search').textContent).toBe('?tab=providers'));
});
+
+ it('名单暂时为空期间用户改选了别的供应商 → 放弃跳转,名单回来后不切走右栏', async () => {
+ providersState.providers = [makeProvider('anthropic', { name: 'Anthropic', connected: true })];
+ const push = stubReceived([]);
+ renderAt('?tab=providers&receivedShare=share-1');
+
+ await waitFor(() => expect(window.electronAPI.providerShare.command).toHaveBeenCalledWith({ action: 'received' }));
+ await act(async () => { await new Promise((resolve) => setTimeout(resolve, 0)); });
+ fireEvent.click(await screen.findByRole('button', { name: /^Anthropic/ }));
+ await waitFor(() => expect(screen.getByTestId('search').textContent).toBe('?tab=providers'));
+
+ push([share]);
+ await act(async () => { await new Promise((resolve) => setTimeout(resolve, 0)); });
+ expect(screen.queryByTestId('provider-share-received-detail')).toBeNull();
+ expect(screen.getByTestId('provider-detail-identity').textContent).toContain('Anthropic');
+ });
});
diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
index 5c69ed3a48..dc1a76ceca 100644
--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
@@ -2766,11 +2766,24 @@ export function ProvidersSection() {
}, [searchParams, setSearchParams]);
// 分享来的供应商深链(?receivedShare=<shareId>,来自模型选择器底部「配置模型」):等分享列表到了再消费
// 并从 URL 摘除;这条分享已不在列表里(刚被撤销或退出)时只停在供应商页。设备互联断开或换账号时 main
- // 会先推一份空列表表示「暂时读不到」(providerShareStore 同一口径),这时保留参数,等列表回来再选中。
+ // 会先推一份空列表表示「暂时读不到」(providerShareStore 同一口径),这时保留参数,等列表回来再选中;
+ // 等待期间用户自己改选了别的,就放弃这次跳转,不在列表回来时把右栏切走。
+ const selectionKey = `${selectedId ?? ''}\n${selectedShareId ?? ''}\n${selectedRemoteKey ?? ''}`;
+ const receivedShareWaitRef = useRef<string | null>(null);
useEffect(() => {
const target = searchParams.get(PROVIDER_SHARE_RECEIVED_PARAM);
- if (!target || !receivedSharesLoaded || receivedShares.length === 0) return;
- if (receivedShares.some((share) => share.shareId === target)) {
+ if (!target) {
+ receivedShareWaitRef.current = null;
+ return;
+ }
+ const waiting = !receivedSharesLoaded || receivedShares.length === 0;
+ const userMoved = receivedShareWaitRef.current !== null && receivedShareWaitRef.current !== selectionKey;
+ if (waiting && !userMoved) {
+ receivedShareWaitRef.current ??= selectionKey;
+ return;
+ }
+ receivedShareWaitRef.current = null;
+ if (!userMoved && receivedShares.some((share) => share.shareId === target)) {
setShareManageProviderId(null);
setFocusedModel(null);
selectShare(target);
@@ -2778,7 +2791,7 @@ export function ProvidersSection() {
const next = new URLSearchParams(searchParams);
next.delete(PROVIDER_SHARE_RECEIVED_PARAM);
setSearchParams(next, { replace: true });
- }, [searchParams, setSearchParams, receivedSharesLoaded, receivedShares, selectShare]);
+ }, [searchParams, setSearchParams, receivedSharesLoaded, receivedShares, selectShare, selectionKey]);
useEffect(() => {
if (loading) return;
const connect = searchParams.get('connect');