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(provider-groups): recover management views without delaying local shares

MagicLizib41f67e4ceed
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
index df5d83d107..33a978aeb9 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
@@ -20,6 +20,8 @@ const state = vi.hoisted(() => ({
clients: [] as Array<{ opts: Record<string, unknown>; started: boolean; stopped: boolean }>,
localReceivedError: false,
localHasGroupShare: false,
+ localReceivedReads: 0,
+ localReceivedGate: null as Promise<void> | null,
userId: 'user-1',
identityCards: [] as string[],
invokes: [] as Array<{ target: string; channel: string }>,
@@ -57,6 +59,8 @@ vi.mock('../providerShareApi.js', () => ({
providerShareOwnerKey: () => state.userId,
providerShareApi: {
listReceived: async () => {
+ state.localReceivedReads += 1;
+ await state.localReceivedGate;
if (state.localReceivedError) throw new Error('local unavailable');
return [
{ ...share, shareId: 'share-local', memberId: 'member-local', owner: { ...share.owner, region: 'cn' } },
@@ -129,6 +133,8 @@ beforeEach(() => {
state.clients = [];
state.localReceivedError = false;
state.localHasGroupShare = false;
+ state.localReceivedReads = 0;
+ state.localReceivedGate = null;
state.userId = 'user-1';
state.identityCards = [];
state.invokes = [];
@@ -210,12 +216,35 @@ describe('cross-region provider share', () => {
const { client } = remoteGroup();
await client.view('group-owner', 'openai');
await expect(resolveRemoteAgentTargetWhenReady('share:share-x')).rejects.toThrow('DEVICE_LINK_NOT_CONNECTED');
+ const localReads = state.localReceivedReads;
await client.view('group-owner', 'openai');
+ await expect(resolveRemoteAgentTargetWhenReady('share:share-x')).rejects.toThrow('DEVICE_LINK_NOT_CONNECTED');
+ expect(state.localReceivedReads).toBe(localReads);
expect(state.calls).toHaveLength(1);
await expect(resolveRemoteAgentTargetWhenReady('share:share-local')).resolves.toBe(providerShareHostPeer('share-local', 'owner-pc'));
expect(state.clients).toEqual([]);
});
+ it('resolves a newly loaded local share while an unrelated cross-region recovery is pending', async () => {
+ const local = deferred();
+ const peer = deferred<unknown>();
+ state.localReceivedGate = local.promise;
+ state.responses.set('/session', peer.promise);
+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
+ await remoteGroup().client.view('group-owner', 'openai');
+ let target: string | undefined;
+ const route = resolveRemoteAgentTargetWhenReady('share:share-local').then((value) => { target = value; });
+ const peerRoute = resolveRemoteAgentTargetWhenReady('share:share-x').catch(() => undefined);
+ local.resolve();
+ try {
+ await vi.waitFor(() => expect(target).toBe(providerShareHostPeer('share-local', 'owner-pc')));
+ expect(getCrossRegionReceived()).toEqual([]);
+ } finally {
+ peer.resolve({ credential: null, expiresAt: null, shares: [] });
+ await Promise.all([route, peerRoute]);
+ }
+ });
+
it.each(['group', 'session'] as const)('does not restore another account from a late %s response', async (phase) => {
startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
await refreshReceivedShares('test');
diff --git a/apps/desktop/src/main/device-link/providerShareGuest.ts b/apps/desktop/src/main/device-link/providerShareGuest.ts
index a71cce756a..0f1b4dc28e 100644
--- a/apps/desktop/src/main/device-link/providerShareGuest.ts
+++ b/apps/desktop/src/main/device-link/providerShareGuest.ts
@@ -52,6 +52,7 @@ const RECEIVED_POLL_MS = 60_000;
const RECEIVED_IDLE_POLL_MS = 5 * 60_000;
const REQUEST_POLL_MS = 4_000;
const ACCESS_FAILURE_REFRESH_MS = 10_000;
+const GROUP_LOCAL_REFRESH_INTERVAL_MS = 30_000;
const SHARE_DEVICE_PREFIX = 'share:';
// 任务记录里的电脑 id 最长 128 个字符(含 `share:` 前缀)。
const SHARE_ID = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,121}$/;
@@ -82,6 +83,7 @@ interface Runtime {
refreshing: Promise<void> | null;
pending: Map<string, PendingRequest>;
groupRecoveries: Set<Promise<void>>;
+ nextGroupLocalRefreshAt: number;
stopped: boolean;
}
@@ -206,6 +208,8 @@ export async function resolveRemoteAgentTargetWhenReady(agentDeviceId: string):
// An already loaded share remains usable even while the other region is unavailable.
if (findReceivedShare(shareId)) return resolveRemoteAgentTarget(agentDeviceId);
if (rt.fetchedAt === 0) await refreshReceivedShares('resolve');
+ if (!current(rt)) throw new Error('[DEVICE_LINK_NOT_CONNECTED] provider sharing account changed');
+ if (findReceivedShare(shareId)) return resolveRemoteAgentTarget(agentDeviceId);
await Promise.all(rt.groupRecoveries);
if (!current(rt)) throw new Error('[DEVICE_LINK_NOT_CONNECTED] provider sharing account changed');
if (findReceivedShare(shareId)) return resolveRemoteAgentTarget(agentDeviceId);
@@ -226,7 +230,13 @@ export function captureProviderShareGroupRecovery(): (agentDeviceIds: readonly s
if (missing.length === 0) return Promise.resolve();
const recovery = (async () => {
// Check the local service first: a recently accepted same-region share needs no peer lookup.
- await refreshReceivedShares('remote-group');
+ // Bound this check too, so repeated group views cannot bypass either region's retry policy.
+ if (Date.now() >= rt.nextGroupLocalRefreshAt) {
+ rt.nextGroupLocalRefreshAt = Date.now() + GROUP_LOCAL_REFRESH_INTERVAL_MS;
+ await refreshReceivedShares('remote-group');
+ } else {
+ await rt.refreshing;
+ }
if (!current(rt)) return;
await restoreCrossRegionReceivedForRemoteGroup(missing.filter((id) => !findReceivedShare(id)));
})();
@@ -259,6 +269,7 @@ export function startProviderShareGuest(events: ProviderShareGuestEvents, option
refreshing: null,
pending: new Map(),
groupRecoveries: new Set(),
+ nextGroupLocalRefreshAt: 0,
stopped: false,
};
runtime = rt;
diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts
index 6ea9379285..f4791d692d 100644
--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts
@@ -25,6 +25,9 @@ vi.mock('../../security/trustedAppRenderer.js', () => ({ assertTrustedAppRendere
vi.mock('../../device-link/index.js', () => ({ broadcast: vi.fn(), getSelfDeviceId: vi.fn(() => 'self'), remoteInvoke: vi.fn(), remoteBackgroundInvoke: vi.fn() }));
// 同账号管理的转发另有 managementClient.test.ts;IPC 回归只替换转发,不拉进分享运行时。
vi.mock('../managementClient.js', () => ({ invokeProviderManagement: vi.fn() }));
+vi.mock('../../device-link/providerShareGuest.js', () => ({
+ captureProviderShareGroupRecovery: vi.fn<() => (ids: readonly string[]) => Promise<void>>(() => async () => {}),
+}));
vi.mock('../../device-link/providerShareRuntime.js', () => ({
executeProviderShareManagementCommand: vi.fn(), parseProviderShareCommand: vi.fn(),
}));
@@ -46,6 +49,7 @@ import { activeOwnerScopeKey, isAppSessionBoundaryPending } from '../../appSessi
import { executeProviderShareManagementCommand, parseProviderShareCommand } from '../../device-link/providerShareRuntime';
import { getProviderGroupDirectory, getProviderGroupRouter } from '../runtime';
import { invokeProviderManagement } from '../managementClient';
+import { captureProviderShareGroupRecovery } from '../../device-link/providerShareGuest';
import { pruneProviderGroupBindings } from '../bindings';
import { readProviderGroup, writeProviderGroup } from '../store';
import { broadcast } from '../../device-link/index';
@@ -331,6 +335,31 @@ describe('provider group IPC remote management', () => {
expect(sharedView.members[0]).not.toHaveProperty('unreachableHere');
});
+ // Regression 2026-10-26, unit: the settings page uses remote-manage instead of
+ // remote-view. One authorized shared member missing locally used to appear unreachable.
+ it.each(groupRequests)('restores a missing shared member before probing the remote $command.action view', async (request) => {
+ const d = deps([]);
+ const sharedView = {
+ ...view, config: { ...config, members: [LOCAL, SHARED] },
+ members: [{ ...view.members[0], key: SHARED.key, kind: SHARED.kind }],
+ };
+ const restored = new Set<string>();
+ let recovery: Promise<void> | undefined;
+ vi.mocked(captureProviderShareGroupRecovery).mockReturnValueOnce((ids) => {
+ recovery = Promise.resolve().then(() => { ids.forEach((id) => restored.add(id)); });
+ return recovery;
+ });
+ const readDeviceCatalog = vi.fn(async (id: string) => {
+ await recovery;
+ if (!restored.has(id)) throw new Error('[REMOTE_AGENT_SHARE_REMOVED] share not found');
+ return [];
+ });
+ Object.assign(d, { directory: { ...d.directory, readDeviceCatalog } });
+ const result = await invokeRemoteCommand(d, async () => sharedView, request);
+ expect(result).toEqual(sharedView);
+ expect(readDeviceCatalog).toHaveBeenCalledExactlyOnceWith(SHARED.agentDeviceId);
+ });
+
it('keeps candidates and share management results unchanged, and accepts a deleted group without probing members', async () => {
const d = deps([]);
const readDeviceCatalog = vi.fn();
diff --git a/apps/desktop/src/main/provider-group/ipc.ts b/apps/desktop/src/main/provider-group/ipc.ts
index c582808413..8500918b59 100644
--- a/apps/desktop/src/main/provider-group/ipc.ts
+++ b/apps/desktop/src/main/provider-group/ipc.ts
@@ -24,6 +24,7 @@ import { tapWindowBroadcast } from '../device-link/broadcast-tap.js';
import { broadcast, getSelfDeviceId, remoteBackgroundInvoke, remoteInvoke } from '../device-link/index.js';
import { isProviderManagementRequest } from '../../shared/providerManagement.js';
import { getDeviceLinkInvokeContext } from '../device-link/invoke-context.js';
+import { captureProviderShareGroupRecovery } from '../device-link/providerShareGuest.js';
import { createLogger } from '../logger.js';
import { MAKER_PUSH } from '../maker-ipc/channels.js';
import { assertTrustedAppRendererEvent } from '../security/trustedAppRenderer.js';
@@ -41,6 +42,7 @@ import {
} from './runtime.js';
import { listProviderGroups, readProviderGroup, writeProviderGroup } from './store.js';
import { invokeProviderManagement } from './managementClient.js';
+import { recoverProviderGroupViewShares } from './remoteClient.js';
import { captureProviderManagementScope } from './managementScope.js';
import { groupFastPolicyPending, syncGroupFastPolicy } from './fastPolicyRuntime.js';
import { notifyProviderShareCatalogChanged } from '../device-link/dispatch.js';
@@ -377,12 +379,15 @@ export function registerProviderGroupIpc(options: { reshare?: ProviderGroupIpcRe
const command = parseProviderGroupCommand(raw);
if (command.action === 'remote-manage') {
const assertOwner = captureProviderManagementScope(deps.ownerKey);
+ const recoverShares = captureProviderShareGroupRecovery();
const result = await invokeProviderManagement(remoteInvoke, command.deviceId, command.request, remoteBackgroundInvoke);
assertOwner();
if (command.request.action !== 'manage-group' || command.request.command.action === 'candidates') return result;
+ const remoteView = parseProviderGroupRemoteView(result, command.request.command.providerId);
+ recoverProviderGroupViewShares(remoteView, recoverShares);
// 管理读取与保存后的组视图也按查看端直连能力投影,不能把组所在电脑看到的可用误当成本机可达。
const view = await markMembersUnreachableHere(
- parseProviderGroupRemoteView(result, command.request.command.providerId),
+ remoteView,
deps.directory,
deps.localDeviceId(),
);
diff --git a/apps/desktop/src/main/provider-group/remoteClient.ts b/apps/desktop/src/main/provider-group/remoteClient.ts
index b8e2ae64a7..b096b3d4ff 100644
--- a/apps/desktop/src/main/provider-group/remoteClient.ts
+++ b/apps/desktop/src/main/provider-group/remoteClient.ts
@@ -61,6 +61,18 @@ export class ProviderGroupRemoteUnsupportedError extends Error {
}
}
+/** Start recovery before catalog probes without delaying the owner's group snapshot. */
+export function recoverProviderGroupViewShares(
+ view: ProviderGroupView,
+ recoverShares?: (agentDeviceIds: readonly string[]) => Promise<void>,
+): void {
+ const usable = new Set(view.members.filter((member) => member.state === 'available' || member.state === 'full').map((member) => member.key));
+ const shares = view.config?.members.filter((member) => member.kind === 'share' && usable.has(member.key))
+ .flatMap((member) => member.agentDeviceId ? [member.agentDeviceId] : []) ?? [];
+ // Catalog resolution waits within the settings page's existing per-member deadline.
+ void recoverShares?.(shares).catch(() => undefined);
+}
+
export function createProviderGroupRemoteClient(invoke: ProviderGroupRemoteInvoke, options: {
/** Capture the account before the request; only verified same-account group responses can restore shares. */
captureShareRecovery?(): (agentDeviceIds: readonly string[]) => Promise<void>;
@@ -140,12 +152,7 @@ export function createProviderGroupRemoteClient(invoke: ProviderGroupRemoteInvok
...(agentKind ? { agentKind } : {}),
...(includeGuestSupport ? { includeGuestSupport: true } : {}),
}), providerId);
- const usable = new Set(view.members.filter((member) => member.state === 'available' || member.state === 'full').map((member) => member.key));
- const shares = view.config?.members.filter((member) => member.kind === 'share' && usable.has(member.key))
- .flatMap((member) => member.agentDeviceId ? [member.agentDeviceId] : []) ?? [];
- // Keep the owner snapshot responsive. Catalog resolution waits for this recovery,
- // within the existing per-member reachability deadline used by the settings page.
- void recoverShares?.(shares).catch(() => undefined);
+ recoverProviderGroupViewShares(view, recoverShares);
return view;
},
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 59b0046122..91d4bf8300 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1893,11 +1893,11 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01
## 供应商组:同账号直连(P2a)
跨区组员恢复(2026-10-26):控制端 Main 仅在同账号 `provider-group:remote` 的有效 `view` / `pick`
-回包引用分享时,恢复本机缺失的区域标记并通过既有 `/provider-shares/x/session` 核验成员关系。
+回包或 `manage-group` 组视图引用分享时,恢复本机缺失的区域标记并通过既有 `/provider-shares/x/session` 核验成员关系。
不新增 wire 字段、channel 或权限,兼容旧组所在电脑;手机仍由任务所在电脑执行。旧控制端保留原行为。
本机已加载的分享直接使用;尚在恢复或请求失败时不按已移除处理。Renderer 收藏和任意分享 ID 不能触发
跨区激活。凭证只留内存、区域标记格式不变,降级后已恢复的分享沿原连接路径继续使用。
-回归:`device-link/__tests__/providerShareCrossRegion.test.ts`。
+回归:`device-link/__tests__/providerShareCrossRegion.test.ts`、`provider-group/__tests__/ipc.test.ts`。
产品规则见 [`provider-groups.md`](../product-rules/provider-groups.md) §4、§5、§6.1、§10。组所在电脑 O 把某个供应商建成组后,
同账号另一台电脑 C 上选了 O 的这个供应商的新任务:C 问 O 该用哪台,再自己直接连到选中的组内电脑运行。
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index a9423afd77..c81fbfff0b 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -96,8 +96,9 @@ Mobile `useSessionListActions`、`SessionMenuSheet`、`orphanSessionActions.test
2026-10-26:① 故障是任务所在电脑没有加载同账号组已能用的跨区分享;② 仅恢复当前账号在另一
官方区域的分享列表与专用连接,不重启本区 relay、不重放任务、不扩大分享权限。首次请求合并,失败
-沿用现有退避,重复的组查询不绕过退避;组视图先返回,成员目录仍受原有 3 秒读取上限约束;③ 回归
-通过真实组 `view` / `pick` 与分享路由入口验证恢复,同时核对本区分享仍可用、暂停与撤销仍拒绝、
+沿用现有退避,重复的组查询不绕过退避;本区名单的额外核验也限为每 30 秒最多一次,本区已加载的
+目标不等待无关的跨区恢复。组视图先返回,成员目录仍受原有 3 秒读取上限约束;③ 回归
+通过真实组 `view` / `pick`、设置页 `remote-manage` IPC 与分享路由入口验证恢复,同时核对本区分享仍可用、暂停与撤销仍拒绝、
换账号后的迟到组回包和服务端回包不能激活新账号。手机及桌面远控共用任务所在电脑的这条路径,
SSH 与跨账号组中转不变。实现见 `provider-group/remoteClient.ts`、`device-link/providerShareGuest.ts`
与 `providerShareCrossRegion.ts`。
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 83409eef78..f52f7a90d9 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -182,8 +182,8 @@ Desktop 与 Mobile 使用同一写法。
该分享为前提。Desktop 复用控制端的已收到列表与分享读取通道,并通过既有
`maker:provider-share:received-catalogs` 核对任务所在电脑也已加载且未暂停该分享;跨区域连接的启用
标记保存在各电脑本地,不能仅凭控制端名单认定被控端可用,也不自动替被控端开启跨区连接。
-同账号供应商组是已加入分享的另一条有效来源:任务所在电脑从组所在电脑的 `view` / `pick` 回包确认
-分享引用后,可自行向另一区域的官方分享服务核验已有授权并恢复连接,无需再次申请;不从 Renderer
+同账号供应商组是已加入分享的另一条有效来源:任务所在电脑从组所在电脑的 `view` / `pick` 回包或
+`manage-group` 组视图确认分享引用后,可自行向另一区域的官方分享服务核验已有授权并恢复连接,无需再次申请;不从 Renderer
自报的分享 ID 或收藏恢复联网资格。名单仍由服务端裁决,暂停、撤销与账号切换照常生效。
本区和跨区名单独立可用:返回名单里已加载且有效的分享立即参与候选筛选;仍有区域尚未就绪时,
控制端继续有上限地退避查询,补上稍后加载的分享,不让单一区域故障阻塞另一区域。
@@ -390,8 +390,9 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
- **同账号换电脑**:另一台电脑使用已建供应商组时,组中获准使用的跨区分享必须可正常连接。
本机没有区域标记时,以同账号组的有效回包触发核验,复用既有身份名片与分享连接凭证,不重新申请。
标记仍只保存区域;加载期间或查询失败不得误报「分享已移除」,已加载区域的分享仍可独立使用。
- 实现与回归见 `providerShareGuest.ts`、`providerShareCrossRegion.ts`、`provider-group/remoteClient.ts`
- 与 `device-link/__tests__/providerShareCrossRegion.test.ts`(2026-10-26)。
+ 实现与回归见 `providerShareGuest.ts`、`providerShareCrossRegion.ts`、`provider-group/remoteClient.ts`、
+ `provider-group/ipc.ts`、`device-link/__tests__/providerShareCrossRegion.test.ts`
+ 与 `provider-group/__tests__/ipc.test.ts`(2026-10-26)。
- **合规开关**:跨区会让用户内容跨境流动,并让一方用户通过分享使用另一区域的模型。跨区分享须经
公司合规确认后,由服务端开关开启;开关关闭时跨区链接提示暂不支持,同区域分享不受影响。
- **网络**:跨区连接质量不能保证时,需要服务端评估区域间转发;客户端对跨区连接的断线与重试沿用