Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-share): avoid polling side effects when classifying providers
MagicLizi2220f45faab1
diff --git a/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsx b/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsxindex 56918d8571..f1eae73f2c 100644--- a/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsx+++ b/apps/desktop/scripts/fixtures/provider-share-sources/fixture.tsx@@ -42,16 +42,12 @@ mountPage({},deviceLink: { getState: async () => ({ remoteControlEnabled: true }) },providerShare: {- command: async () => ({ ready: true, shares: ctx.case === 'no-outgoing-shares' ? [] : [- { providerId: 'openai', members: [{ memberId: 'local-member', status: 'active' }] },- ] }),+ command: async () => ({ ready: true, providerIds: ctx.case === 'no-outgoing-shares' ? [] : ['openai'] }),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' }] },- ] },+ : { ready: true, providerIds: ctx.case === 'no-outgoing-shares' ? [] : ['anthropic'] },onChanged: subscription('groupChanged'),},}),diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex 840588389b..4ed0f5dd90 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -156,6 +156,40 @@ const historyWithRows = (rows: ProviderUsageHistoryView['self']['days']): Providmembers: [],});+// PR #7772: settings classification must not renew the management page's fast-poll window+// or calculate usage. Existing management tests only read full owned/usage responses.+// Minimal input: active, paused, pending-only and duplicate-provider shares. Tier: unit.+describe('shared provider classification', () => {+ it.each(['local', 'same-account'] as const)('reads only established provider IDs without activating polling (%s)', async (entry) => {+ host.snapshot.mockReturnValue([+ { providerId: 'anthropic', members: [{ memberId: 'm1', status: 'active' }] },+ { providerId: 'openai', members: [{ memberId: 'm2', status: 'paused' }] },+ { providerId: 'anthropic', members: [{ memberId: 'm3', status: 'active' }] },+ { providerId: 'pending-only', members: [], requests: [{ requestId: 'r1' }] },+ ]);+ const raw = { action: 'shared-provider-ids' } as const;+ let result: unknown;+ if (entry === 'local') {+ const handle = vi.spyOn(ipcMain, 'handle');+ try {+ registerProviderShareIpc();+ const handler = handle.mock.calls.find(([channel]) => channel === 'provider-share:command')![1];+ result = await handler({} as Electron.IpcMainInvokeEvent, raw);+ } finally {+ handle.mockRestore();+ }+ } else {+ result = await executeProviderShareManagementCommand(parseProviderShareCommand(raw) as ProviderShareManagementCommand);+ }+ expect(result).toEqual({ ready: true, providerIds: ['anthropic', 'openai'] });+ expect(host.active).not.toHaveBeenCalled();+ expect(host.refresh).not.toHaveBeenCalled();+ expect(memberNotes.read).not.toHaveBeenCalled();+ expect(usageStores.memberTokenSnapshot).not.toHaveBeenCalled();+ expect(listProviders).not.toHaveBeenCalled();+ });+});+describe('provider share usage history wire budget', () => {it('caps the global row count even when the newest day alone has more rows', () => {const trimmed = trimProviderUsageHistory(historyWithRows(Array.from({ length: 5_001 }, (_, index) => historyRow(index))));@@ -259,6 +293,7 @@ describe('same-account share management during account transitions', () => {{ action: 'set-run-limits', limits: { perDevice: 16, total: 64 } },{ action: 'reset-run-limits' },{ action: 'owned', range: '7d' },+ { action: 'shared-provider-ids' },{ action: 'own-usage', providerId: 'anthropic', range: '7d' },{ action: 'usage-history', providerId: 'anthropic' },] satisfies ProviderShareManagementCommand[])('refuses $action at entry while teardown is pending', async (command) => {diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex 81ef4c490c..c49a65eb36 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -395,6 +395,7 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {return { action: 'insights', shareId: text(value.shareId, 'shareId', 128), includeUsage: value.includeUsage };case 'get-run-limits':case 'reset-run-limits':+ case 'shared-provider-ids':return { action: value.action };case 'set-run-limits':if (!isRemoteAgentLimitsPatch(value.limits)) throwIpcError('INVALID_PARAMS', 'Invalid remote task limits');@@ -864,6 +865,13 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => void}return { ...readRemoteAgentLimitsState(), usage: remoteAgentLimitUsage() };}+ case 'shared-provider-ids':+ return {+ ready: running,+ providerIds: running+ ? [...new Set(getProviderShareHostSnapshot().filter(share => share.members.length > 0).map(share => share.providerId))]+ : [],+ };case 'owned':if (running) markProviderShareHostActive(60_000);return ownerState(command.range);diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.tsindex f4791d692d..05e35c444d 100644--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts@@ -639,7 +639,9 @@ describe('provider management receiver account boundary', () => {});// 同账号管理:新增备注与转分享决定共用主人操作入口,受邀者读取仍不在此范围。+ // PR #7772 的分区摘要同样只允许主人读取;复用真实管理 parser,防止新查询在远程被拒。it.each([+ { action: 'shared-provider-ids' },{ action: 'reshare-decide', id: 'rs-pending', decision: 'approve' },{ action: 'set-member-note', memberId: 'm1', note: 'Alice' },] as const)('accepts $action as an owner operation and keeps forwarding operations outside the management scope', async (command) => {diff --git a/apps/desktop/src/main/provider-group/management.ts b/apps/desktop/src/main/provider-group/management.tsindex 41a72371b1..3c042e33be 100644--- a/apps/desktop/src/main/provider-group/management.ts+++ b/apps/desktop/src/main/provider-group/management.ts@@ -20,7 +20,7 @@ export function parseProviderManagementRequest(raw: unknown): ProviderManagementreturn { action: 'manage-group', command: command as ProviderGroupManagementCommand };}const command = parseProviderShareCommand(raw.command);- if (!['owned', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'set-member-note', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits', 'get-visibility', 'set-visibility', 'quota-account', 'get-model-access', 'set-model-access', 'get-fast-policy', 'set-fast-policy'].includes(command.action)) {+ if (!['owned', 'shared-provider-ids', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'set-member-note', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits', 'get-visibility', 'set-visibility', 'quota-account', 'get-model-access', 'set-model-access', 'get-fast-policy', 'set-fast-policy'].includes(command.action)) {throwIpcError('PERMISSION_DENIED', 'Only owner operations are available through management');}return { action: 'manage-share', command: command as ProviderShareManagementCommand };diff --git a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsxindex 1ad5d6dc23..34fd055364 100644--- a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx+++ b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx@@ -1029,9 +1029,7 @@ describe('ProvidersSection — 允许被远程调用与供应商组', () => {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' }],- })) };+ if (cmd.action === 'shared-provider-ids') return { ready: true, providerIds: sharedIds };throw new Error(`unexpected ${cmd.action}`);}),onReceivedChanged: () => () => undefined,diff --git a/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsxindex 4a8bf46767..2d6e3522c2 100644--- a/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx+++ b/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx@@ -84,23 +84,21 @@ 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.+// classification hook through local/manage-share summaries; existing row tests have no sharing state.+// Minimal input: two host summaries, a late old-account response, hidden events and an old host.+// Tier: unit; in-memory responses and fake timers, with no network or real waiting.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 classified = (...providerIds: string[]) => ({ ready: true, providerIds });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'));+ local.mockReset().mockResolvedValue(classified('anthropic'));+ remote.mockReset().mockResolvedValue(classified('openai'));window.electronAPI = {...originalApi,providerShare: { command: local, onOwnedChanged: (listener: () => void) => {@@ -113,26 +111,23 @@ describe('useOwnedProviderShares', () => {afterEach(() => {cleanup();+ vi.useRealTimers();+ vi.restoreAllMocks();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' }] },- ] });+ it('keeps each computer’s classification separate and updates only the changed host', async () => {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' } },+ request: { action: 'manage-share', command: { action: 'shared-provider-ids' } },});- local.mockResolvedValue(owned('anthropic', []));+ local.mockResolvedValue(classified());await act(async () => changed());expect([...result.current.get(null)!]).toEqual([]);expect([...result.current.get('mini-a')!]).toEqual(['openai']);@@ -148,14 +143,56 @@ describe('useOwnedProviderShares', () => {let finish!: (value: unknown) => void;local.mockImplementationOnce(() => new Promise(resolve => { finish = resolve; }));act(() => changed());- local.mockResolvedValue({ ready: true, shares: [] });+ local.mockResolvedValue({ ready: true, providerIds: [] });setDataOwnerGeneration('owner-2', 2);rerender();expect(result.current.size).toBe(0);- await act(async () => finish(owned('anthropic')));+ await act(async () => finish(classified('anthropic')));await waitFor(() => expect(result.current.has(null)).toBe(true));expect([...result.current.get(null)!]).toEqual([]);});++ // Greptile discussion_r4408622288: OWNED_CHANGED previously kept querying while hidden.+ it('pauses event and timer reads while hidden, then refreshes the visible classification', async () => {+ vi.useFakeTimers();+ const visibility = vi.spyOn(document, 'visibilityState', 'get').mockReturnValue('visible');+ const { result } = renderHook(() => useOwnedProviderShares(['mini-a']));+ await act(async () => undefined);+ expect(result.current.get(null)?.has('anthropic')).toBe(true);+ local.mockClear().mockResolvedValue(classified());+ remote.mockClear();+ visibility.mockReturnValue('hidden');+ await act(async () => {+ changed();+ await vi.advanceTimersByTimeAsync(90_000);+ });+ expect(local).not.toHaveBeenCalled();+ expect(remote).not.toHaveBeenCalled();+ visibility.mockReturnValue('visible');+ await act(async () => document.dispatchEvent(new Event('visibilitychange')));+ expect([...result.current.get(null)!]).toEqual([]);+ expect(remote).toHaveBeenCalledTimes(1);+ });++ it('classifies an old computer without renewing its 60-second fast-poll window every 30 seconds', async () => {+ vi.useFakeTimers();+ remote.mockRejectedValueOnce(new Error('[UNSUPPORTED_CAPABILITY] Update the computer'))+ .mockResolvedValue({ ready: true, shares: [{ providerId: 'openai', members: [{ status: 'paused' }] }] });+ const { result } = renderHook(() => useOwnedProviderShares(['mini-a']));+ await act(async () => undefined);+ expect(result.current.get('mini-a')?.has('openai')).toBe(true);+ expect(remote).toHaveBeenCalledTimes(2);+ remote.mockClear();+ await act(async () => vi.advanceTimersByTimeAsync(89_999));+ expect(remote).not.toHaveBeenCalled();+ remote.mockResolvedValue({ ready: true, shares: [] });+ await act(async () => vi.advanceTimersByTimeAsync(1));+ expect(remote).toHaveBeenCalledExactlyOnceWith({+ action: 'remote-manage', deviceId: 'mini-a',+ request: { action: 'manage-share', command: { action: 'owned', range: 'month' } },+ });+ expect([...result.current.get('mini-a')!]).toEqual([]);+ });});describe('useOwnRemoteProviders', () => {diff --git a/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.ts b/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.tsindex 290ec8c0cd..478bfd9f6d 100644--- a/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.ts+++ b/apps/desktop/src/renderer/features/provider-share/useOwnedProviderShares.ts@@ -1,7 +1,8 @@import { useEffect, useState } from 'react';import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';-import { providerShareManagementCommand } from '@/features/provider-group/providerManagement';+import { isProviderManagementOutdated, providerShareManagementCommand } from '@/features/provider-group/providerManagement';+import type { ProviderShareCommandResult } from '../../../shared/providerShare';type SharedProviders = ReadonlyMap<string | null, ReadonlySet<string>>;const EMPTY: SharedProviders = new Map();@@ -15,22 +16,41 @@ export function useOwnedProviderShares(deviceIds: readonly string[]): SharedProvuseEffect(() => {let disposed = false;const current = () => !disposed && isDataOwnerGenerationCurrent(owner);+ const visible = () => document.visibilityState !== 'hidden';const hosts: (string | null)[] = [null, ...JSON.parse(devicesKey)];const inFlight = new Set<string | null>();const refreshAgain = new Set<string | null>();+ const legacyRefreshAfter = new Map<string, number>();+ const readLegacy = async (deviceId: string) => {+ // Old computers only support owned, which enables fast polling for 60 seconds.+ // Leave a quiet period between reads rather than continually extending that window.+ legacyRefreshAfter.set(deviceId, Date.now() + 90_000);+ const state = await providerShareManagementCommand({ action: 'owned', range: 'month' }, deviceId);+ return { ready: state.ready, providerIds: state.shares.filter(share => share.members.length > 0).map(share => share.providerId) };+ };const load = async (deviceId: string | null) => {+ if (!current() || !visible()) return;+ if (deviceId && Date.now() < (legacyRefreshAfter.get(deviceId) ?? 0)) return;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);+ let state: ProviderShareCommandResult['shared-provider-ids'];+ if (deviceId && legacyRefreshAfter.has(deviceId)) {+ state = await readLegacy(deviceId);+ } else {+ try {+ state = await providerShareManagementCommand({ action: 'shared-provider-ids' }, deviceId ?? undefined);+ } catch (error) {+ if (!deviceId || !isProviderManagementOutdated(error) || !current() || !visible()) throw error;+ state = await readLegacy(deviceId);+ }+ }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));+ const ids = new Set(state.providerIds);setSnapshot(previous => {const providers = new Map(previous && previous.owner.dataOwnerId === owner.dataOwnerId&& previous.owner.generation === owner.generation ? previous.providers : EMPTY);@@ -38,14 +58,14 @@ export function useOwnedProviderShares(deviceIds: readonly string[]): SharedProvreturn { owner, providers };});} catch {- // Keep the last display classification on temporary failures or computers running an older version.+ // Keep the last display classification on temporary failures.} finally {inFlight.delete(deviceId);if (refreshAgain.delete(deviceId) && current()) void load(deviceId);}};const refresh = () => {- if (document.visibilityState !== 'hidden') hosts.forEach(deviceId => { void load(deviceId); });+ if (visible()) hosts.forEach(deviceId => { void load(deviceId); });};refresh();const off = window.electronAPI?.providerShare?.onOwnedChanged?.(() => { void load(null); });diff --git a/apps/desktop/src/shared/providerManagement.ts b/apps/desktop/src/shared/providerManagement.tsindex 21872eca70..f1309b58f0 100644--- a/apps/desktop/src/shared/providerManagement.ts+++ b/apps/desktop/src/shared/providerManagement.ts@@ -12,7 +12,7 @@ export type ProviderGroupManagementCommand = Extract<export type ProviderShareManagementCommand = Extract<ProviderShareCommand,- { action: 'owned' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'set-member-note' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' | 'get-visibility' | 'set-visibility' | 'quota-account' | 'get-model-access' | 'set-model-access' | 'get-fast-policy' | 'set-fast-policy' }+ { action: 'owned' | 'shared-provider-ids' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'set-member-note' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' | 'get-visibility' | 'set-visibility' | 'quota-account' | 'get-model-access' | 'set-model-access' | 'get-fast-policy' | 'set-fast-policy' }>;export type ProviderManagementRequest =diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex da5d3bc236..c3e68cb653 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -206,6 +206,8 @@ export type ProviderShareCommand =| { action: 'reset-run-limits' }| { action: 'set-run-limits'; limits: Partial<RemoteAgentLimits> }| { action: 'owned'; range: ProviderShareUsageRange }+ /** 设置页分区只读快照,不计算用量或延长快速拉取窗口。 */+ | { action: 'shared-provider-ids' }/** 这个供应商按使用方的用量(本机与我的其他电脑)。不依赖分享服务。 */| { action: 'own-usage'; providerId: string; range: ProviderShareUsageRange }/** 这个供应商的用量按天明细(你自己、转来的与分享的人),「用量」块据此按时间段、人与电脑筛选。 */@@ -245,6 +247,7 @@ export interface ProviderShareCommandResult {'set-run-limits': RemoteAgentLimitsView;'reset-run-limits': RemoteAgentLimitsView;owned: ProviderShareOwnerState;+ 'shared-provider-ids': { ready: boolean; providerIds: string[] };'own-usage': ProviderOwnUsageView;'usage-history': ProviderUsageHistoryView;'create-link': ProviderShareLinkCreated;diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 981ae31172..e3118b3519 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1,5 +1,15 @@# 跨端协议兼容+## 设置页中我分享的供应商++Desktop 的本机分享命令与既有同账号供应商管理通道增量支持 `shared-provider-ids`,+只返回当前电脑已建立分享的供应商 ID 与就绪状态,包含已暂停的成员,不含仅有链接或申请的项。+查询读取分享运行时快照,不延长快速轮询窗口,不计算用量;原来的 `owned` 与分享管理页行为不变。+新控制端遇到旧电脑不认识此命令时,回退到 `owned`,两次读取至少相隔 90 秒,避免持续续期+60 秒快速轮询窗口;页面隐藏时停止定时与事件读取,重新可见后刷新。+不增加 IPC channel、设备权限、分享授权、重试或持久化;旧控制端继续使用原命令,双方可独立升级。+回归入口:`providerShareManagement.test.ts`、供应商组 `ipc.test.ts`、`OwnRemoteProviders.test.tsx`。+## 本机应用使用远程供应商`remote-agent` caps 增量增加可选 `localApplication: true`。协商成功后,open 的