Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(providers): retain guest routes for same-account group relays
DavidShen79d16188afa7
diff --git a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.tsindex 26334d2623..0a461c59b3 100644--- a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts@@ -21,6 +21,8 @@ import { decideProviderGroupFailure } from '../../provider-group/failurePolicy';import { RemoteAgentPoller } from '../controller/poller';import { RemoteAgentRunClient } from '../controller/runClient';import { relayKeyFor, reshareKeyFor, type RelayRunFailure } from '../host/groupRelay';+import { createGuestProviderRouteBinder } from '../host/providerAccess';+import { guestProviderRouteForToken } from '../../maker-host/guest-provider-route-store';import {createRemoteAgentHost,hostSessionIdFor,@@ -62,6 +64,7 @@ function fakeAgentHost(name: string, started: Started[], options: {/** 转分享的同意(本机是分享者)。 */reshare?: Parameters<typeof createRemoteAgentHost>[0]['reshare'];resolveProvider?: NonNullable<Parameters<typeof createRemoteAgentHost>[0]['providerAccess']>['resolve'];+ bindGuestProviderRoute?: Parameters<typeof createRemoteAgentHost>[0]['bindGuestProviderRoute'];}) {return createRemoteAgentHost({prepareImageEvent: options.prepareImageEvent,@@ -121,7 +124,7 @@ function fakeAgentHost(name: string, started: Started[], options: {isAllowed: () => true,},...(options.guestRelayCapable === false ? {} : {- bindGuestProviderRoute: async () => ({ routeToken: 'route', modelIds: ['claude-opus'], release: () => {} }),+ bindGuestProviderRoute: options.bindGuestProviderRoute ?? (async () => ({ routeToken: 'route', modelIds: ['claude-opus'], release: () => {} })),}),...(options.purge ? { purgeHostedTranscripts: options.purge } : {}),...(options.groupRelay ? { groupRelay: options.groupRelay } : {}),@@ -199,6 +202,7 @@ function setup(options: {switchWorthy?: (failure: RelayRunFailure) => boolean;/** mini 这台的 Agent 表现。 */mini?: { failStart?: boolean; endImmediately?: boolean };+ memberBinder?: Parameters<typeof createRemoteAgentHost>[0]['bindGuestProviderRoute'];/** 组所在电脑本机的 Agent 表现(组选中本机这一台时)。 */owner?: { failStart?: boolean; prepareImageEvent?: Parameters<typeof createRemoteAgentHost>[0]['prepareImageEvent'] };/** 截住组所在电脑发给组内电脑的请求(模拟回包丢失、应答慢)。 */@@ -209,6 +213,7 @@ function setup(options: {mini: fakeAgentHost('mini', memberStarted.mini, {trust: () => 'owner',guestRelayCapable: options.miniCapable ?? true,+ bindGuestProviderRoute: options.memberBinder,purge: async () => undefined,...options.mini,}),@@ -301,6 +306,36 @@ function switchTokenIn(stream: Awaited<ReturnType<typeof openAsGuest>>['stream']}describe('provider group relay for shared users', () => {+ // Unit regression for review 4328468761: existing three-computer tests stubbed+ // the production binding. The real binder must start an owner-relayed guest,+ // keep its isolated home/provider, and release the proxy token on close.+ it('starts and releases a same-account group relay through the production guest binder', async () => {+ const binder = createGuestProviderRouteBinder({+ readProviders: async () => [],+ guestAccess: () => null,+ ownerAllowed: controller => controller === OWNER_DEVICE,+ providerAllowed: provider => provider === MEMBER_MINI.providerId,+ modelAccess: { allows: () => true, read: () => ({ models: null, providerModels: null }) },+ });+ const env = setup({ memberBinder: binder });+ try {+ const { client } = await openAsGuest(env, GUEST_A, openPayload(SESSION));+ try {+ const input = env.memberStarted.mini[0].input;+ expect(input.guest).toBe(true);+ expect(input.guestHome).toContain(path.join('mini', 'guest-homes'));+ const token = input.guestProvider!.routeToken;+ expect(guestProviderRouteForToken(token)).toEqual({ sessionId: input.hostSessionId, providerId: MEMBER_MINI.providerId });+ await client.call('send', [{ content: 'hello', attachments: [] }, {}]);+ expect(env.memberStarted.mini[0].sends).toHaveLength(1);+ await client.close('close', 'navigation');+ await vi.waitFor(() => expect(guestProviderRouteForToken(token)).toBeNull());+ } finally { await client.close('close', 'navigation'); }+ } finally {+ for (const host of [env.owner, ...Object.values(env.members)]) { await host.abortAll(); host.dispose(); }+ }+ });+it('hands a shared user’s new task to the chosen computer, which runs it isolated as a shared user', async () => {const env = setup();const { client, started } = await openAsGuest(env, GUEST_A, openPayload(SESSION));diff --git a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.tsindex 9c1ea5c7d3..fdeb4c48d3 100644--- a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts@@ -9,11 +9,13 @@ import path from 'node:path';import type { AgentEvent, AgentSessionHandle } from '@cindy/maker-core';import type { ProviderView } from '@cindy/model-providers';+import { providerShareGuestPeer } from '@cindy/device-link';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { startRemoteAgentSession } from '../controller/startRemote';-import { guestProviderModelIds, resolveGuestProviderId, resolveSharedProviderId } from '../host/providerAccess';+import { createGuestProviderRouteBinder, guestProviderModelIds, resolveGuestProviderId, resolveSharedProviderId } from '../host/providerAccess';import { createRemoteAgentHost, type HostedStartInput } from '../host/runHost';+import { guestProviderModelAllowed, guestProviderRouteForToken, resetGuestProviderRoutesForTest } from '../../maker-host/guest-provider-route-store';const RG = path.resolve(__dirname, '../../../../../ripgrep-bin', `${process.platform}-${process.arch}`, process.platform === 'win32' ? 'rg.exe' : 'rg');@@ -82,9 +84,54 @@ beforeEach(() => {});afterEach(() => {+ resetGuestProviderRoutesForTest();fs.rmSync(root, { recursive: true, force: true });});+// Unit regression for review 4328468761 / provider-groups §4, sharing §12.+// The host tests stubbed this production binder and missed that relay controllers+// have no direct-share member. Minimum: an authorized same-account controller+// binding a guest-isolated task. Verify the real proxy grant, including revocation.+describe('guest proxy binding for direct shares and same-account group relays', () => {+ it.each(['relay', 'share'])('binds a %s with its live model permissions and a stable CLI catalog', async (kind) => {+ const controller = kind === 'relay' ? 'owner-device' : providerShareGuestPeer('share-1', 'member-1', 'guest-device');+ let active = true;+ let providerEnabled = true;+ const providerModels = new Set(['opus']);+ const memberModels = new Set(['opus']);+ const binder = createGuestProviderRouteBinder({+ readProviders: async () => [view('spark', ['opus', 'sonnet'])],+ guestAccess: () => kind === 'share' && active ? { providerId: 'spark', memberId: 'member-1' } : null,+ ownerAllowed: () => active,+ providerAllowed: () => providerEnabled,+ modelAccess: {+ allows: (_providerId, model, memberId) => providerModels.has(model) && (!memberId || memberModels.has(model)),+ read: (_providerId, memberId) => ({ models: [...(memberId ? memberModels : providerModels)], providerModels: [...providerModels] }),+ },+ });+ const input = { kind: 'claude-code' as const, hostSessionId: 'bound-guest', providerId: 'spark', controller, isCurrent: () => true };+ const binding = await binder(input);+ expect(binding).not.toBeNull();+ expect(binding!.modelIds).toEqual(['opus', 'sonnet']);+ expect(guestProviderRouteForToken(binding!.routeToken)).toEqual({ sessionId: input.hostSessionId, providerId: 'spark' });+ const allows = (model: string) => guestProviderModelAllowed('spark', model, input.hostSessionId);+ expect(allows('opus')).toBe(true);+ expect(allows('sonnet')).toBe(false);+ providerModels.add('sonnet');+ expect(allows('sonnet')).toBe(kind === 'relay');+ memberModels.add('sonnet');+ expect(allows('sonnet')).toBe(true);+ providerEnabled = false;+ expect(allows('opus')).toBe(false);+ providerEnabled = true;+ active = false;+ expect(allows('opus')).toBe(false);+ expect(await binder(input)).toBeNull();+ binding!.release();+ expect(guestProviderRouteForToken(binding!.routeToken)).toBeNull();+ });+});+function recordingHandle(input: HostedStartInput, calls: { sends: number; models: unknown[][] }): AgentSessionHandle {// 事件流保持打开到 close,任务才不会在第一次调用前就结束。let closed!: () => void;diff --git a/apps/desktop/src/main/remote-agent/host/providerAccess.ts b/apps/desktop/src/main/remote-agent/host/providerAccess.tsindex 7e0b97223f..a698bc0404 100644--- a/apps/desktop/src/main/remote-agent/host/providerAccess.ts+++ b/apps/desktop/src/main/remote-agent/host/providerAccess.ts@@ -8,6 +8,51 @@ import {type AgentKind,type ProviderView,} from '@cindy/model-providers';+import { isProviderSharePeer } from '@cindy/device-link';+import { registerGuestProviderRoute } from '../../maker-host/guest-provider-route-store.js';+import type { RemoteAgentHostDeps } from './runHost.js';++/** Shared users and same-account group relays both need a guest-isolated proxy binding. */+export function createGuestProviderRouteBinder(deps: {+ readProviders(): Promise<readonly ProviderView[]>;+ guestAccess(controller: string): { providerId: string; memberId: string } | null;+ ownerAllowed(controller: string): boolean;+ providerAllowed(providerId: string): boolean;+ modelAccess: {+ allows(providerId: string, model: string, memberId?: string): boolean;+ read(providerId: string, memberId?: string): { models: readonly string[] | null; providerModels: readonly string[] | null };+ };+}): NonNullable<RemoteAgentHostDeps['bindGuestProviderRoute']> {+ return async ({ kind, hostSessionId, providerId, controller, isCurrent }) => {+ const views = await deps.readProviders();+ // An obsolete asynchronous launch must never replace the current binding.+ if (!isCurrent()) return null;+ // A same-account group relay is isolated as a guest, but the group owner is+ // not a direct-share member of this computer. Its grants are provider-wide.+ const sharedPeer = isProviderSharePeer(controller);+ const memberId = sharedPeer ? deps.guestAccess(controller)?.memberId : undefined;+ const providerAllowed = (): boolean => {+ const access = sharedPeer ? deps.guestAccess(controller) : null;+ return (sharedPeer+ ? !!access && access.memberId === memberId && access.providerId === providerId+ : deps.ownerAllowed(controller)) && deps.providerAllowed(providerId);+ };+ if (!providerAllowed()) return null;+ const allowsModel = (model: string) => providerAllowed() && deps.modelAccess.allows(providerId, model, memberId);+ const binding = registerGuestProviderRoute(hostSessionId, providerId, allowsModel, () => {+ try {+ const rule = deps.modelAccess.read(providerId, memberId);+ return rule.models !== null || rule.providerModels !== null;+ } catch { return true; }+ });+ return {+ routeToken: binding.token,+ // Keep the CLI catalog stable; the proxy checks live grants per request.+ modelIds: guestProviderModelIds(views, providerId, kind),+ release: binding.release,+ };+ };+}/*** 对方指定了来源时只核对它是否开放;没指定时按本机默认规则在开放的供应商里挑(新路由口径diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.tsindex 459c04a5c7..c0421a5835 100644--- a/apps/desktop/src/main/remote-agent/host/service.ts+++ b/apps/desktop/src/main/remote-agent/host/service.ts@@ -30,10 +30,9 @@ import { currentProviderPartyUsageStore, flushProviderPartyUsage } from '../../uimport { readDeviceLinkSettings } from '../../device-link/settings-store.js';import { readTurnUsageResetAt } from '../../goal-host/usageLimit.js';import { getDesktopProviderService } from '../../maker-host/createDesktopProviderService.js';-import { registerGuestProviderRoute } from '../../maker-host/guest-provider-route-store.js';import { bindHostedSessionProvider } from '../../maker-host/session-provider-store.js';import { isRemoteProviderInvocationAllowed } from '../../maker-host/remote-provider-access-store.js';-import { guestProviderModelIds, resolveGuestProviderId, resolveSharedProviderId } from './providerAccess';+import { createGuestProviderRouteBinder, resolveGuestProviderId, resolveSharedProviderId } from './providerAccess';import { createRemoteAgentHost, type HostedStartInput, type RemoteAgentHost, type RunUsageRecord } from './runHost';import { purgeClaudeHostedSessionArtifacts, purgeClaudeHostedTranscripts, purgePiHostedSubagentRuns } from './transcripts';import { captureGeneratedImageStorage, generatedImageErrorCode, handleGeneratedImageArtifacts, prepareGeneratedImageTransport } from '../../cindy-media/generatedImageStorage';@@ -103,6 +102,11 @@ function guestAllows(controller: string, providerId: string): boolean {export function installRemoteAgentHost(options: { getMaker: () => Maker; userDataDir: string }): void {if (host) return;const usage = installProviderShareUsageStore(options.userDataDir);+ const isControllerAuthorized = (controller: string): boolean => {+ if (isProviderSharePeer(controller)) return providerShareGuestAccess(controller) !== null;+ const settings = readDeviceLinkSettings();+ return settings.remoteControlEnabled && !settings.revokedControllers.includes(controller);+ };// 同一份受邀者分配器同时提供匿名状态,沿用实际分配时记录的版本兼容情况。const groupRelay = createProviderGroupGuestRelay({scope: getProviderGroupOwnerScope,@@ -136,11 +140,7 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDat},startHosted: (input) => options.getMaker().startHostedAgentSession(input.kind, hostedStartOptions(input)),bindOwnerProviderRoute: bindHostedSessionProvider,- isControllerAuthorized: (controller) => {- if (isProviderSharePeer(controller)) return providerShareGuestAccess(controller) !== null;- const settings = readDeviceLinkSettings();- return settings.remoteControlEnabled && !settings.revokedControllers.includes(controller);- },+ isControllerAuthorized,controllerTrust: (controller) => (isProviderSharePeer(controller) ? 'guest' : 'owner'),providerAccess: {resolve: async (kind, model, providerId, controller) => {@@ -167,29 +167,13 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDat},},// 受邀者任务的出站登记:本机 proxy 只让它经分享的供应商、用它提供的模型。- bindGuestProviderRoute: async ({ kind, hostSessionId, providerId, controller, isCurrent }) => {- const views = await getDesktopProviderService().listProviders({ allowSideEffects: false });- // 读目录期间这次启动可能已被取代:此时不再登记(登记与检查之间没有 await)。- if (!isCurrent()) return null;- const access = providerShareGuestAccess(controller);- if (!access || access.providerId !== providerId || !guestAllows(controller, providerId)) return null;- const memberId = access.memberId;- const allowsModel = (model: string) => providerShareGuestAccess(controller)?.memberId === memberId- && guestAllows(controller, providerId) && remoteModelAccess.allows(providerId, model, memberId);- const binding = registerGuestProviderRoute(hostSessionId, providerId, allowsModel, () => {- try {- const rule = remoteModelAccess.read(providerId, memberId);- return rule.models !== null || rule.providerModels !== null;- } catch { return true; }- });- return {- routeToken: binding.token,- // Keep the provider catalog stable for the CLI; the proxy checks the live grant on every request.- // Filtering this launch-time snapshot would prevent using newly granted models until the task restarts.- modelIds: guestProviderModelIds(views, providerId, kind),- release: binding.release,- };- },+ bindGuestProviderRoute: createGuestProviderRouteBinder({+ readProviders: () => getDesktopProviderService().listProviders({ allowSideEffects: false }),+ guestAccess: providerShareGuestAccess,+ ownerAllowed: isControllerAuthorized,+ providerAllowed: isRemoteProviderInvocationAllowed,+ modelAccess: remoteModelAccess,+ }),// Codex 与 Pi 的会话历史在受邀者目录里,随它整体删除;这里清 Claude Code 的项目记录与 Pi 子代理运行目录。purgeHostedTranscripts: async (hostSessionIds, nativeIds) => {const images = captureGeneratedImageStorage();