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。

Merge origin/main into cindy/dazzling-leakey

DavidShen7360cb87944d
diff --cc apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts
index 0a461c59b3,d64c419ee7..51eebee981
--- a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts
@@@ -64,12 -63,12 +65,13 @@@ function fakeAgentHost(name: string, st
/** 转分享的同意(本机是分享者)。 */
reshare?: Parameters<typeof createRemoteAgentHost>[0]['reshare'];
resolveProvider?: NonNullable<Parameters<typeof createRemoteAgentHost>[0]['providerAccess']>['resolve'];
+ bindGuestProviderRoute?: Parameters<typeof createRemoteAgentHost>[0]['bindGuestProviderRoute'];
}) {
return createRemoteAgentHost({
+ forkHosted: async (_kind, opts) => ({ newSdkSessionId: `${opts.sourceSdkSessionId}-fork`, uuidMap: new Map([['old', 'new']]) }),
prepareImageEvent: options.prepareImageEvent,
imageArtifacts: options.imageArtifacts,
- isAgentAvailable: () => true,
+ isAgentAvailable: options.isAgentAvailable ?? (() => true),
startHosted: async (input) => {
if (options.failStart) throw new Error('the agent could not start');
const queue: AgentEvent[] = [];
@@@ -202,9 -201,9 +204,10 @@@ 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'] };
+ owner?: { failStart?: boolean; prepareImageEvent?: Parameters<typeof createRemoteAgentHost>[0]['prepareImageEvent'];
+ isAgentAvailable?: Parameters<typeof createRemoteAgentHost>[0]['isAgentAvailable'] };
/** 截住组所在电脑发给组内电脑的请求(模拟回包丢失、应答慢)。 */
intercept?: (agentDeviceId: string, request: Record<string, unknown>, forward: () => Promise<unknown>) => Promise<unknown>;
} = {}) {
@@@ -306,36 -304,26 +309,56 @@@ function switchTokenIn(stream: Awaited<
}
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(); }
+ }
+ });
+
+ // Public G -> O -> M handlers, with JSON serialization: a fork must remain pinned
+ // to its original member and preserve the guest ownership needed for another fork.
+ it('forks and resumes on the original member without allocating another group member', async () => {
+ // The group owner need not have the member's harness installed.
+ const env = setup({ owner: { isAgentAvailable: () => false } });
+ const first = await openAsGuest(env, GUEST_A, openPayload(SESSION));
+ const request = { op: 'fork', sourceSessionId: SESSION, newSessionId: 'child-task',
+ agentKind: 'claude-code', sourceSdkSessionId: first.started.id, model: 'claude-opus', upToMessageId: 'old' };
+ await first.client.close('close', 'navigation');
+ const child = await env.owner.handle(GUEST_A, request) as { newSdkSessionId: string; uuidMap: unknown };
+ expect(child).toEqual({ newSdkSessionId: `${first.started.id}-fork`, uuidMap: [['old', 'new']] });
+ await expect(env.owner.handle(GUEST_B, request)).rejects.toThrow('REMOTE_AGENT_INVALID');
+ await expect(env.owner.handle(GUEST_A, { ...request, sourceSessionId: 'child-task',
+ newSessionId: 'grandchild-task', sourceSdkSessionId: child.newSdkSessionId }))
+ .resolves.toMatchObject({ newSdkSessionId: `${child.newSdkSessionId}-fork` });
+ const resumed = await openAsGuest(env, GUEST_A, openPayload('child-task', { options: { resumeSessionId: child.newSdkSessionId } }));
+ expect(env.memberStarted.mini[1].input.options.resumeSessionId).toBe(child.newSdkSessionId);
+ expect(env.relay.plan).toHaveBeenCalledTimes(1);
+ await resumed.client.close('close', 'navigation');
+ });
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 --cc apps/desktop/src/main/remote-agent/host/service.ts
index c0421a5835,9143d02833..1f4283611e
--- a/apps/desktop/src/main/remote-agent/host/service.ts
+++ b/apps/desktop/src/main/remote-agent/host/service.ts
@@@ -139,8 -134,13 +139,9 @@@ export function installRemoteAgentHost(
}
},
startHosted: (input) => options.getMaker().startHostedAgentSession(input.kind, hostedStartOptions(input)),
+ forkHosted: (kind, opts) => options.getMaker().forkSdkSession(kind, opts),
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) => {