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(providers): separate outgoing shares in settings rail

MagicLizi03857542c900
diff --git a/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsx b/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsx
new file mode 100644
index 0000000000..56918d8571
--- /dev/null
+++ b/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsx
@@ -0,0 +1,59 @@
+import { BUNDLED_CATALOG } from '@cindy/model-providers';
+import { ProvidersSection } from '../../../src/renderer/components/settings/ProvidersSection';
+import { mountPage, subscription, forbid } from '../../ui-page/harness';
+
+const provider = (id: string, name?: string) => ({
+ ...BUNDLED_CATALOG.providers.find(item => item.id === id)!,
+ connected: true, remoteInvocationEnabled: true,
+ ...(name ? { name } : {}),
+});
+const providers = [provider('anthropic'), provider('openai')];
+const group = {
+ strategy: 'least', autoSwitch: true,
+ members: [{ kind: 'local' }, { kind: 'device', agentDeviceId: 'fixture-executor', providerId: 'anthropic' }],
+};
+const entries = [provider('anthropic', 'Team Anthropic'), provider('openai', 'Private OpenAI')];
+entries[0] = { ...entries[0], group } as typeof entries[0];
+const snapshot = {
+ providers, providerOrder: providers.map(item => item.id), ownerGeneration: 1,
+ loading: false, error: null, refetch: () => undefined,
+};
+const received = [{
+ shareId: 'fixture-received', memberId: 'fixture-member', providerId: 'anthropic',
+ providerLabel: 'Anthropic', hostDeviceId: 'fixture-share-host', deviceName: 'Example computer',
+ owner: { displayName: 'Alex', avatarUrl: null, region: 'global' },
+ status: 'paused', hostOnline: true, hostCapable: true,
+}];
+Object.assign(window, { providerSourcesFixture: {
+ snapshot,
+ devices: [{ deviceId: 'fixture-host', name: 'Studio', platform: 'darwin' }],
+ catalogs: new Map([['fixture-host', { providers: entries, loading: false, error: null }]]),
+ received: { received, loaded: true },
+} });
+
+mountPage({
+ route: '/settings?tab=providers&connect=anthropic',
+ host: ctx => ({
+ maker: {
+ listProviders: async () => snapshot,
+ scanLocalCli: async () => ({ detections: [] }),
+ requestProviderModelsAutoRefresh: async () => ({ ok: true }),
+ setProviderOrder: forbid('setProviderOrder'),
+ },
+ deviceLink: { getState: async () => ({ remoteControlEnabled: true }) },
+ providerShare: {
+ command: async () => ({ ready: true, shares: ctx.case === 'no-outgoing-shares' ? [] : [
+ { providerId: 'openai', members: [{ memberId: 'local-member', status: 'active' }] },
+ ] }),
+ onOwnedChanged: subscription('ownedChanged'),
+ },
+ providerGroup: {
+ command: async (command: { action: string }) => command.action === 'list' ? {}
+ : { ready: true, shares: ctx.case === 'no-outgoing-shares' ? [] : [
+ { providerId: 'anthropic', members: [{ memberId: 'remote-member', status: 'paused' }] },
+ ] },
+ onChanged: subscription('groupChanged'),
+ },
+ }),
+ render: () => <div className="h-screen p-5"><ProvidersSection /></div>,
+});
diff --git a/apps/desktop/scripts/fixtures/provider-share-sources/ui-page.mjs b/apps/desktop/scripts/fixtures/provider-share-sources/ui-page.mjs
new file mode 100644
index 0000000000..c7a0ece5be
--- /dev/null
+++ b/apps/desktop/scripts/fixtures/provider-share-sources/ui-page.mjs
@@ -0,0 +1,42 @@
+import assert from 'node:assert/strict';
+
+export default {
+ name: 'provider-share-sources',
+ entry: './fixture.tsx',
+ viewport: { width: 1000, height: 720 },
+ real: 'ProvidersSection rail, outgoing-share classification, remote group rows, translations and themes',
+ notCovered: 'Live accounts, device catalogs, sharing authorization and provider detail usage',
+ stubs: {
+ 'src/renderer/contexts/AuthContext': 'export const useAuth = () => ({ mode: "local", dataOwnerId: "fixture-owner", user: null }); export const useOptionalAuthUser = () => null; export const useOptionalAuthDeviceId = () => "fixture-self";',
+ 'src/renderer/hooks/useProviders': 'export const useProviders = () => window.providerSourcesFixture.snapshot;',
+ 'src/renderer/hooks/useControllableDevices': { partial: 'export const useControllableDevices = () => window.providerSourcesFixture.devices;' },
+ 'src/renderer/hooks/useDevicesProviders': 'export const useDevicesProviders = () => window.providerSourcesFixture.catalogs;',
+ 'src/renderer/hooks/useCodexAuth': 'export const useCodexAuth = () => ({ state: { kind: "unauthenticated" }, recoveryCheck: "idle" }); export const isChatGptConnectionConnected = () => false;',
+ 'src/renderer/hooks/useApiKey': 'export const useApiKey = () => ({ key: "", hasSavedKey: false });',
+ 'src/renderer/hooks/useModelAccessStatus': 'export const useModelAccessStatus = () => ({ state: "failed" });',
+ 'src/renderer/components/settings/useProviderSubscriptionCard': 'export const useProviderSubscriptionCard = () => null; export const useDeviceProviderSubscriptionCard = () => null;',
+ 'src/renderer/components/settings/ProviderAccountUsageModule': 'export const ProviderAccountUsageModule = () => null;',
+ 'src/renderer/features/provider-share/providerShareStore': { partial: 'export const useProviderShareReceived = () => window.providerSourcesFixture.received;' },
+ },
+ cases: {
+ default: { about: 'Local and remote outgoing shares appear together, separately from ordinary providers' },
+ 'shared-sources': { about: 'Local and remote outgoing shares appear together, separately from ordinary providers' },
+ 'no-outgoing-shares': { about: 'The outgoing section disappears without established shares' },
+ },
+ async ready(page) {
+ await page.getByTestId('provider-share-received').waitFor();
+ },
+ async check(page, ui) {
+ const outgoing = page.getByTestId('provider-share-owned');
+ if (ui.case === 'no-outgoing-shares') {
+ assert.equal(await outgoing.count(), 0);
+ return;
+ }
+ await outgoing.waitFor();
+ assert.equal(await outgoing.getByText(await ui.t('providerShare.owned.title'), { exact: true }).count(), 1);
+ assert.equal(await outgoing.locator('[data-sortable-id="openai"]').count(), 1);
+ assert.equal(await outgoing.getByText('Team Anthropic', { exact: true }).count(), 1);
+ assert.equal(await outgoing.getByText('Private OpenAI', { exact: true }).count(), 0);
+ assert.equal(await page.getByText('Team Anthropic', { exact: true }).count(), 1);
+ },
+};
diff --git a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
index ec039a3ff1..1ad5d6dc23 100644
--- a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
@@ -1018,6 +1018,53 @@ describe('ProvidersSection — 深链定位', () => {
describe('ProvidersSection — 允许被远程调用与供应商组', () => {
afterEach(() => localProviderGroupsTesting.reset());
+ // Test value: the real settings rail must separate established outgoing shares and keep local
+ // reordering within that section. Existing deep-link tests never render an owned share.
+ // Minimal input: two shared providers interleaved with one ordinary provider; tier: unit.
+ it('separates outgoing shares, preserves selection and reorders within the shared section', async () => {
+ resetProviderShareStoreForTests();
+ let changed!: () => void;
+ let sharedIds = ['shared-a', 'shared-b'];
+ Object.assign(window.electronAPI, {
+ providerShare: {
+ command: vi.fn(async (cmd: { action: string }) => {
+ if (cmd.action === 'received') return [];
+ if (cmd.action === 'owned') return { ready: true, shares: sharedIds.map(providerId => ({
+ providerId, members: [{ memberId: providerId, status: 'active' }],
+ })) };
+ throw new Error(`unexpected ${cmd.action}`);
+ }),
+ onReceivedChanged: () => () => undefined,
+ onOwnedChanged: (listener: () => void) => { changed = listener; return () => undefined; },
+ },
+ });
+ providersState.providers = [
+ makeProvider('shared-a', { name: 'Shared A', connected: true }),
+ makeProvider('ordinary', { name: 'Ordinary', connected: true }),
+ makeProvider('shared-b', { name: 'Shared B', connected: true }),
+ ];
+ providersState.order = ['shared-a', 'ordinary', 'shared-b'];
+ renderAt('?tab=providers&connect=shared-a');
+ const group = await screen.findByRole('group', { name: 'providerShare.owned.title' });
+ const rowIds = () => [...group.querySelectorAll('[data-sortable-id]')].map(row => row.getAttribute('data-sortable-id'));
+ expect(rowIds()).toEqual(['shared-a', 'shared-b']);
+ expect(within(group).queryByRole('button', { name: /Ordinary/ })).toBeNull();
+ expect(screen.getAllByRole('button', { name: /Shared A/ })).toHaveLength(1);
+ expect(within(group).getByRole('button', { name: /Shared A/ }).getAttribute('aria-current')).toBe('true');
+
+ fireEvent.keyDown(within(group).getAllByRole('button', { name: 'settings.providers.order.handle' })[0], { key: 'ArrowDown' });
+ await waitFor(() => expect(rowIds()).toEqual(['shared-b', 'shared-a']));
+ expect(window.electronAPI.maker.setProviderOrder).toHaveBeenLastCalledWith(undefined, 1, ['shared-b', 'ordinary', 'shared-a']);
+ fireEvent.click(within(group).getByRole('button', { name: /Shared B/ }));
+ expect(screen.getByTestId('provider-detail-identity').textContent).toContain('Shared B');
+
+ sharedIds = [];
+ await act(async () => changed());
+ expect(screen.queryByTestId('provider-share-owned')).toBeNull();
+ expect(screen.getByRole('button', { name: /Shared B/ }).getAttribute('aria-current')).toBe('true');
+ resetProviderShareStoreForTests();
+ });
+
it('folds the provider group into the remote-use row and waits for the group settings before showing it', async () => {
localProviderGroupsTesting.reset();
let answer!: (groups: Record<string, unknown>) => void;
diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
index c91c585318..69cabc94e6 100644
--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
@@ -123,6 +123,7 @@ import { ProviderShareEntryButton } from '@/features/provider-share/ProviderShar
import { useLocalProviderGroupsState } from '@/features/provider-group/useLocalProviderGroups';
import { ProviderShareManagePage } from '@/features/provider-share/ProviderShareManagePage';
import { ProviderSharePasteButton } from '@/features/provider-share/ProviderSharePasteDialog';
+import { useOwnedProviderShares } from '@/features/provider-share/useOwnedProviderShares';
import {
ProviderShareReceivedDetail,
ProviderShareReceivedRailGroup,
@@ -2472,6 +2473,7 @@ export function ProvidersSection() {
? receivedShares.find((share) => share.shareId === selectedShareId) ?? null
: null;
const { entries: ownRemoteProviders, hiddenShareIds: groupedShareIds } = useOwnRemoteProviderList();
+ const ownedShares = useOwnedProviderShares(ownRemoteProviders.map(entry => entry.deviceId));
const selectedRemote = selectedRemoteKey
? ownRemoteProviders.find((entry) => entry.key === selectedRemoteKey) ?? null
: null;
@@ -2640,6 +2642,10 @@ export function ProvidersSection() {
: orderedVisibleProviders,
[orderedVisibleProviders, pendingProviderOrderIds],
);
+ const sharedLocalProviders = listProviders.filter(provider => ownedShares.get(null)?.has(provider.id));
+ const ordinaryLocalProviders = listProviders.filter(provider => !ownedShares.get(null)?.has(provider.id));
+ const sharedRemoteProviders = ownRemoteProviders.filter(entry => ownedShares.get(entry.deviceId)?.has(entry.provider.id));
+ const ordinaryRemoteProviders = ownRemoteProviders.filter(entry => !ownedShares.get(entry.deviceId)?.has(entry.provider.id));
useEffect(() => {
if (pendingProviderOrder && pendingProviderOrder.dataOwnerId !== dataOwnerId) {
@@ -2733,14 +2739,19 @@ export function ProvidersSection() {
const moveProviderWithKeyboard = useCallback(
(providerId: string, delta: -1 | 1): void => {
- const currentIds = listProviders.map((provider) => provider.id);
+ const shared = ownedShares.get(null)?.has(providerId) === true;
+ const currentIds = listProviders
+ .filter(provider => (ownedShares.get(null)?.has(provider.id) === true) === shared)
+ .map(provider => provider.id);
const index = currentIds.indexOf(providerId);
const nextIndex = index + delta;
if (index < 0 || nextIndex < 0 || nextIndex >= currentIds.length) return;
const nextIds = [...currentIds];
const [moved] = nextIds.splice(index, 1);
nextIds.splice(nextIndex, 0, moved!);
- persistVisibleProviderOrder(nextIds);
+ const sectionIds = new Set(currentIds);
+ let sectionIndex = 0;
+ persistVisibleProviderOrder(listProviders.map(provider => sectionIds.has(provider.id) ? nextIds[sectionIndex++]! : provider.id));
const provider = byId.get(providerId);
setOrderAnnouncement(
t('settings.providers.order.moved', {
@@ -2750,7 +2761,7 @@ export function ProvidersSection() {
}),
);
},
- [byId, listProviders, persistVisibleProviderOrder, t],
+ [byId, listProviders, ownedShares, persistVisibleProviderOrder, t],
);
// 检测建议:CLI 已安装 + 对应渠道存在于目录 + 未连接,且**未以任何形态占行**
@@ -3127,6 +3138,52 @@ export function ProvidersSection() {
/>
) : null;
+ const renderLocalProviderList = (sectionProviders: ProviderView[]) => (
+ <SortableList
+ items={sectionProviders}
+ getId={provider => provider.id}
+ onReorder={ids => {
+ const sectionIds = new Set(ids);
+ let index = 0;
+ persistVisibleProviderOrder(listProviders.map(provider => sectionIds.has(provider.id) ? ids[index++]! : provider.id));
+ }}
+ renderItem={(provider, index) => (
+ <ListRow
+ provider={provider}
+ selected={!otherDeviceSelected && !cindySigninActive && effectiveSelected?.id === provider.id}
+ reconnectRequired={
+ (provider.id === 'openai' && openaiReconnectRequired) ||
+ provider.openAiAccount?.reconnectRequired === true
+ }
+ onSelect={() => {
+ setFocusedModel(null);
+ selectProvider(provider.id);
+ }}
+ position={index + 1}
+ total={sectionProviders.length}
+ onMove={delta => moveProviderWithKeyboard(provider.id, delta)}
+ sortable={sectionProviders.length > 1}
+ />
+ )}
+ disabled={sectionProviders.length < 2}
+ reducedMotion={reducedMotion}
+ filter="input, textarea, select, a, [data-no-drag]"
+ className="flex flex-col gap-0.5"
+ rowClassName="provider-settings-sortable-row"
+ />
+ );
+
+ const renderRemoteProviderRows = (entries: readonly OwnRemoteProvider[]) => (
+ <OwnRemoteProviderRows
+ entries={entries}
+ selectedKey={selectedRemote?.key ?? null}
+ onSelect={key => {
+ setFocusedModel(null);
+ selectRemote(key);
+ }}
+ />
+ );
+
return (
<div className="flex h-full min-h-0 flex-col gap-[14px]">
{shareManagePage ?? (<>
@@ -3175,53 +3232,33 @@ export function ProvidersSection() {
}}
/>
)}
- {listProviders.length > 1 && (
+ {(ordinaryLocalProviders.length > 1 || sharedLocalProviders.length > 1) && (
<div className="select-none px-1.5 pb-1 pt-1">
<span className="text-11" style={{ color: 'var(--text-tertiary)' }}>
{t('settings.providers.order.hint')}
</span>
</div>
)}
- <SortableList
- items={listProviders}
- getId={(provider) => provider.id}
- onReorder={persistVisibleProviderOrder}
- renderItem={(provider, index) => (
- <ListRow
- provider={provider}
- selected={!otherDeviceSelected && !cindySigninActive && effectiveSelected?.id === provider.id}
- reconnectRequired={
- (provider.id === 'openai' && openaiReconnectRequired) ||
- provider.openAiAccount?.reconnectRequired === true
- }
- onSelect={() => {
- setFocusedModel(null);
- selectProvider(provider.id);
- }}
- position={index + 1}
- total={listProviders.length}
- onMove={(delta) => moveProviderWithKeyboard(provider.id, delta)}
- sortable={listProviders.length > 1}
- />
- )}
- disabled={listProviders.length < 2}
- reducedMotion={reducedMotion}
- filter="input, textarea, select, a, [data-no-drag]"
- className="flex flex-col gap-0.5"
- rowClassName="provider-settings-sortable-row"
- />
+ {renderLocalProviderList(ordinaryLocalProviders)}
<span className="sr-only" aria-live="polite" aria-atomic="true">
{orderAnnouncement}
</span>
{/* 自己其他电脑上能用的供应商:接在本机供应商后面,图标带远程角标。 */}
- <OwnRemoteProviderRows
- entries={ownRemoteProviders}
- selectedKey={selectedRemote?.key ?? null}
- onSelect={(key) => {
- setFocusedModel(null);
- selectRemote(key);
- }}
- />
+ {renderRemoteProviderRows(ordinaryRemoteProviders)}
+ {(sharedLocalProviders.length > 0 || sharedRemoteProviders.length > 0) && (
+ <div
+ data-testid="provider-share-owned"
+ role="group"
+ aria-label={t('providerShare.owned.title')}
+ className="flex flex-col gap-0.5"
+ >
+ <span className="truncate px-2.5 pb-1 pt-3 text-11 font-medium text-[var(--text-tertiary)]">
+ {t('providerShare.owned.title')}
+ </span>
+ {renderLocalProviderList(sharedLocalProviders)}
+ {renderRemoteProviderRows(sharedRemoteProviders)}
+ </div>
+ )}
{/* 分享给我的供应商(受邀者):单独成组,没有分享时不显示。 */}
<ProviderShareReceivedRailGroup
selectedShareId={selectedShare?.shareId ?? null}
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx
index 3ed976b9a4..4a8bf46767 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx
@@ -1,5 +1,5 @@
// @vitest-environment jsdom
-import { cleanup, fireEvent, render, renderHook, screen } from '@testing-library/react';
+import { act, cleanup, fireEvent, render, renderHook, screen, waitFor } from '@testing-library/react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import {
@@ -10,6 +10,8 @@ import {
useOwnRemoteProviders,
type OwnRemoteProvider,
} from '../OwnRemoteProviders';
+import { useOwnedProviderShares } from '@/features/provider-share/useOwnedProviderShares';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
vi.mock('react-i18next', () => ({
initReactI18next: { type: '3rdParty', init: () => undefined },
@@ -81,6 +83,81 @@ beforeEach(() => {
afterEach(() => cleanup());
+// Test value: settings used to mix shared-out providers with ordinary groups. Exercise the real
+// classification hook through owned/manage-share responses; existing row tests have no sharing state.
+// Minimal input: the same provider on two computers, one paused member, and one pending-only share.
+// Tier: unit; in-memory host responses, including a late response across an account change.
+describe('useOwnedProviderShares', () => {
+ let originalApi: Window['electronAPI'];
+ let changed: () => void;
+ const owned = (providerId: string, members: unknown[] = [{ memberId: 'member', status: 'paused' }]) => ({
+ ready: true, shares: [{ providerId, members }],
+ });
+ const local = vi.fn();
+ const remote = vi.fn();
+
+ beforeEach(() => {
+ originalApi = window.electronAPI;
+ setDataOwnerGeneration('owner-1', 1);
+ local.mockReset().mockResolvedValue(owned('anthropic'));
+ remote.mockReset().mockResolvedValue(owned('openai'));
+ window.electronAPI = {
+ ...originalApi,
+ providerShare: { command: local, onOwnedChanged: (listener: () => void) => {
+ changed = listener;
+ return () => undefined;
+ } },
+ providerGroup: { command: remote },
+ } as unknown as Window['electronAPI'];
+ });
+
+ afterEach(() => {
+ cleanup();
+ window.electronAPI = originalApi;
+ setDataOwnerGeneration(null, 0);
+ });
+
+ it('separates computer identities, keeps paused shares and excludes links or pending requests alone', async () => {
+ local.mockResolvedValue({ ready: true, shares: [
+ ...owned('anthropic').shares,
+ { providerId: 'link-only', members: [], requests: [] },
+ { providerId: 'pending-only', members: [], requests: [{ requestId: 'request' }] },
+ ] });
+ const { result } = renderHook(() => useOwnedProviderShares(['mini-a', 'mini-a']));
+ await waitFor(() => expect(result.current.size).toBe(2));
+ expect([...result.current.get(null)!]).toEqual(['anthropic']);
+ expect([...result.current.get('mini-a')!]).toEqual(['openai']);
+ expect(remote).toHaveBeenCalledExactlyOnceWith({
+ action: 'remote-manage', deviceId: 'mini-a',
+ request: { action: 'manage-share', command: { action: 'owned', range: 'month' } },
+ });
+
+ local.mockResolvedValue(owned('anthropic', []));
+ await act(async () => changed());
+ expect([...result.current.get(null)!]).toEqual([]);
+ expect([...result.current.get('mini-a')!]).toEqual(['openai']);
+ });
+
+ it('retains a known classification on read failure and rejects an old account’s late response', async () => {
+ const { result, rerender } = renderHook(() => useOwnedProviderShares([]));
+ await waitFor(() => expect(result.current.get(null)?.has('anthropic')).toBe(true));
+ local.mockRejectedValueOnce(new Error('offline'));
+ await act(async () => changed());
+ expect(result.current.get(null)?.has('anthropic')).toBe(true);
+
+ let finish!: (value: unknown) => void;
+ local.mockImplementationOnce(() => new Promise(resolve => { finish = resolve; }));
+ act(() => changed());
+ local.mockResolvedValue({ ready: true, shares: [] });
+ setDataOwnerGeneration('owner-2', 2);
+ rerender();
+ expect(result.current.size).toBe(0);
+ await act(async () => finish(owned('anthropic')));
+ await waitFor(() => expect(result.current.has(null)).toBe(true));
+ expect([...result.current.get(null)!]).toEqual([]);
+ });
+});
+
describe('useOwnRemoteProviders', () => {
it.each([
[true, false, 0],
diff --git a/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.ts b/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.ts
new file mode 100644
index 0000000000..290ec8c0cd
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.ts
@@ -0,0 +1,65 @@
+import { useEffect, useState } from 'react';
+
+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
+import { providerShareManagementCommand } from '@/features/provider-group/providerManagement';
+
+type SharedProviders = ReadonlyMap<string | null, ReadonlySet<string>>;
+const EMPTY: SharedProviders = new Map();
+
+/** Settings-only classification; null identifies this computer, other keys identify my other computers. */
+export function useOwnedProviderShares(deviceIds: readonly string[]): SharedProviders {
+ const owner = getDataOwnerGeneration();
+ const devicesKey = JSON.stringify([...new Set(deviceIds)].sort());
+ const [snapshot, setSnapshot] = useState<{ owner: typeof owner; providers: SharedProviders } | null>(null);
+
+ useEffect(() => {
+ let disposed = false;
+ const current = () => !disposed && isDataOwnerGenerationCurrent(owner);
+ const hosts: (string | null)[] = [null, ...JSON.parse(devicesKey)];
+ const inFlight = new Set<string | null>();
+ const refreshAgain = new Set<string | null>();
+ const load = async (deviceId: string | null) => {
+ if (inFlight.has(deviceId)) {
+ refreshAgain.add(deviceId);
+ return;
+ }
+ if (!current()) return;
+ if (deviceId ? !window.electronAPI?.providerGroup : !window.electronAPI?.providerShare) return;
+ inFlight.add(deviceId);
+ try {
+ const state = await providerShareManagementCommand({ action: 'owned', range: 'month' }, deviceId ?? undefined);
+ if (!current() || !state.ready) return;
+ // A generated link or pending request alone is not an established share. Paused members still count.
+ const ids = new Set(state.shares.filter(share => share.members.length > 0).map(share => share.providerId));
+ setSnapshot(previous => {
+ const providers = new Map(previous && previous.owner.dataOwnerId === owner.dataOwnerId
+ && previous.owner.generation === owner.generation ? previous.providers : EMPTY);
+ providers.set(deviceId, ids);
+ return { owner, providers };
+ });
+ } catch {
+ // Keep the last display classification on temporary failures or computers running an older version.
+ } finally {
+ inFlight.delete(deviceId);
+ if (refreshAgain.delete(deviceId) && current()) void load(deviceId);
+ }
+ };
+ const refresh = () => {
+ if (document.visibilityState !== 'hidden') hosts.forEach(deviceId => { void load(deviceId); });
+ };
+ refresh();
+ const off = window.electronAPI?.providerShare?.onOwnedChanged?.(() => { void load(null); });
+ // Other computers do not push their sharing changes to this settings page.
+ const timer = window.setInterval(refresh, 30_000);
+ document.addEventListener('visibilitychange', refresh);
+ return () => {
+ disposed = true;
+ off?.();
+ window.clearInterval(timer);
+ document.removeEventListener('visibilitychange', refresh);
+ };
+ }, [owner, devicesKey]);
+
+ return snapshot && snapshot.owner.dataOwnerId === owner.dataOwnerId
+ && snapshot.owner.generation === owner.generation ? snapshot.providers : EMPTY;
+}
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 6b7b0db19f..f6b5ab99a2 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -317,6 +317,9 @@
"closeAllDescription": "Guests will lose access. Task history is kept."
},
"providerShare": {
+ "owned": {
+ "title": "Providers I Share"
+ },
"memberBudget": {
"recommended": "Recommended model",
"none": "No recommendation",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index a20c19c298..ee52a97b4b 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -317,6 +317,9 @@
"closeAllDescription": "すべてのゲストがアクセスできなくなります。タスクの履歴は保持されます。"
},
"providerShare": {
+ "owned": {
+ "title": "自分が共有したプロバイダー"
+ },
"memberBudget": {
"recommended": "おすすめモデル",
"none": "指定しない",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 5951a45b49..67e44f5e21 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -317,6 +317,9 @@
"closeAllDescription": "모든 게스트의 접근이 차단됩니다. 작업 기록은 유지됩니다."
},
"providerShare": {
+ "owned": {
+ "title": "내가 공유한 제공자"
+ },
"memberBudget": {
"recommended": "추천 모델",
"none": "추천하지 않음",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 3484b7c9c1..25b1233510 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -317,6 +317,9 @@
"closeAllDescription": "所有访客将无法继续访问,任务记录保留。"
},
"providerShare": {
+ "owned": {
+ "title": "我分享的供应商"
+ },
"memberBudget": {
"recommended": "推荐模型",
"none": "不指定",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 12830d5a10..af66dba0c6 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -317,6 +317,9 @@
"closeAllDescription": "所有訪客將無法繼續存取,任務記錄保留。"
},
"providerShare": {
+ "owned": {
+ "title": "我分享的供應商"
+ },
"memberBudget": {
"recommended": "推薦模型",
"none": "不指定",
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 24d3365072..fcc6f453c8 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -234,6 +234,12 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
[useDeviceProviderSubscriptionCard.test.ts](../../apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts)。
实现见 [OwnRemoteProviders.tsx](../../apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx),
回归见 [OwnRemoteProviders.test.tsx](../../apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx)。
+- **我分享的供应商**(2026-10-29 用户裁决)单独一组,接在普通供应商之后、「分享给我的供应商」之前;
+ 本机和自己其他电脑上已建立分享关系的供应商(含供应商组)都归这里,不与普通供应商组混排。
+ 只生成链接或仍在等待同意不算已分享;暂停分享仍保留,删除最后一位分享成员后回到普通列表。
+ 每项只显示一次,原有选中、详情与「远程与分享」管理入口不变;本机供应商可在各自分区内排序。
+ 读取暂时失败时保留上次分类,换账号不沿用;没有已分享的供应商时整组不显示。
+ 实现见 `ProvidersSection.tsx` 与 `useOwnedProviderShares.ts`。
- **分享给我的供应商**单独一组「分享给我的供应商」,没有分享时整组不显示:每条用分享者头像标明来自谁,
带状态点;点开在右栏看来源、状态、对方开放的模型(只读,开关由分享者决定),并可「退出」。来源只写
「来自 Magi 的分享」,不写分享者的电脑名;分享者建了供应商组时补「供应商组 · N 台电脑」。