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): honor startup failures and automatic switching

Lizi9ca6ed93f99e
diff --git a/apps/desktop/src/main/provider-group/__tests__/guestRelay.test.ts b/apps/desktop/src/main/provider-group/__tests__/guestRelay.test.ts
index db6ccd7f02..c588cc8508 100644
--- a/apps/desktop/src/main/provider-group/__tests__/guestRelay.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/guestRelay.test.ts
@@ -92,6 +92,38 @@ describe('provider group guest relay planner', () => {
expect(env.router.markCooling.mock.calls[0][2]).toBeLessThan(1_000 + PROVIDER_GROUP_DEFAULT_COOLDOWN_MS);
});
+ it.each(['INVALID_PARAMS', 'SESSION_RUNNING', 'PRECONDITION_FAILED', 'NOT_FOUND', 'UNSUPPORTED_CAPABILITY', 'WORKDIR_MISSING'])(
+ '启动阶段的任务级 %s 错误原样返回,不换电脑也不冷却', (code) => {
+ const env = setup([MINI, FRIEND]);
+ const mini = { memberKey: MINI.key, agentDeviceId: 'mini', providerId: MINI.providerId, sameAccount: true };
+ expect(env.relay.noteStartFailure('anthropic', mini, new Error(`[${code}] task cannot start`))).toBe(false);
+ expect(env.router.markCooling).not.toHaveBeenCalled();
+ },
+ );
+
+ it('成员能力差异仍允许换电脑,组已删除或成员已移出时停止', () => {
+ const env = setup([MINI, FRIEND]);
+ const mini = { memberKey: MINI.key, agentDeviceId: 'mini', providerId: MINI.providerId, sameAccount: true };
+ expect(env.relay.noteStartFailure('anthropic', mini, new Error('[REMOTE_AGENT_PEER_TOO_OLD] old'))).toBe(true);
+ expect(env.relay.noteStartFailure('anthropic', { ...mini, sameAccount: false }, new Error('[REMOTE_AGENT_MODEL_UNAVAILABLE] model'))).toBe(true);
+ expect(env.relay.noteStartFailure('openai', mini, new Error('agent failed'))).toBe(false);
+ expect(env.relay.noteStartFailure('anthropic', { ...mini, memberKey: 'device:gone:anthropic' }, new Error('401 unauthorized'))).toBe(false);
+ expect(env.router.markCooling).not.toHaveBeenCalled();
+ });
+
+ it('关闭自动换电脑后,本机、远端启动和兼容失败都不切换,账号问题仍冷却', () => {
+ const env = setup([LOCAL, MINI, FRIEND], { ...CONFIG, autoSwitch: false });
+ for (const picked of [LOCAL, MINI, FRIEND]) {
+ const target = { memberKey: picked.key, agentDeviceId: picked.agentDeviceId ?? 'owner', providerId: picked.providerId, sameAccount: picked.kind === 'device' };
+ expect(env.relay.noteStartFailure('anthropic', target, new Error('agent failed'))).toBe(false);
+ expect(env.relay.noteStartFailure('anthropic', target, new Error('401 unauthorized'))).toBe(false);
+ }
+ expect(env.router.markCooling).toHaveBeenCalledTimes(3);
+ const mini = { memberKey: MINI.key, agentDeviceId: 'mini', providerId: MINI.providerId, sameAccount: true };
+ expect(env.relay.noteStartFailure('anthropic', mini, new Error('[REMOTE_AGENT_PEER_TOO_OLD] old'))).toBe(false);
+ expect(env.router.markCooling).toHaveBeenCalledTimes(3);
+ });
+
it('reads the latest state when choosing again after a computer did not work', async () => {
const env = setup([MINI, FRIEND]);
await env.relay.plan(PLAN);
diff --git a/apps/desktop/src/main/provider-group/guestRelay.ts b/apps/desktop/src/main/provider-group/guestRelay.ts
index bb94682a43..c2ad486738 100644
--- a/apps/desktop/src/main/provider-group/guestRelay.ts
+++ b/apps/desktop/src/main/provider-group/guestRelay.ts
@@ -92,19 +92,20 @@ export function createProviderGroupGuestRelay(deps: ProviderGroupGuestRelayDeps)
connect: (agentDeviceId) => deps.connect(agentDeviceId),
noteStartFailure(providerId, member: GroupRelayMember, error) {
+ const config = deps.readGroup(providerId);
+ if (!config?.members.some((m) => m.key === member.memberKey)) return false;
const message = errorText(error);
// 同账号那台太旧、还不能按受邀者隔离:不冷却它(本机自己的任务照常分过去),只是一阵子不再给它受邀者的任务。
// 分享来的电脑本来就把本机当受邀者隔离,不会因为这个原因接不下(真接不下时按下面的判定换下一台)。
if (member.sameAccount && /REMOTE_AGENT_PEER_TOO_OLD|REMOTE_AGENT_UNSUPPORTED/.test(message)) {
incapable.set(member.agentDeviceId, deps.now() + PROVIDER_GROUP_GUEST_INCAPABLE_MS);
- return true;
+ return config.autoSwitch;
}
// 与本机自己的任务同一个判定(failurePolicy):换到哪台都一样的不换,那台账号的问题记进组的状态;
// 连不上、起不来不记进组的状态,下次选电脑时现读那台(状态以本机读到的为准,2026-10-11)。
const signals = providerGroupFailureSignals(error);
- // 按运行中的口径判:错误来自那台电脑(它的 Agent、它的准入),不是受邀者这个任务此刻的状态,Cindy 自己的错误码
- // (参数不对、不支持等)在那台上同样说明是那台的问题,换下一台。
- const decision = decideProviderGroupFailure(signals, 'run');
+ // 尚未启动的任务按 start 判:参数和任务状态错误换到哪台都一样;成员能力差异仍按兼容错误码处理。
+ const decision = decideProviderGroupFailure(signals, 'start');
deps.log.info?.('provider group: failure decision', {
phase: 'start',
relay: true,
@@ -120,7 +121,8 @@ export function createProviderGroupGuestRelay(deps: ProviderGroupGuestRelayDeps)
now + (decision.cause === 'usage-limit' ? PROVIDER_GROUP_DEFAULT_COOLDOWN_MS : PROVIDER_GROUP_FAILURE_COOLDOWN_MS),
);
}
- return true;
+ // 账号问题仍冷却,关闭自动换电脑时把原错误交给受邀者,与运行中的口径一致。
+ return config.autoSwitch;
},
noteRunFailure(providerId, member: GroupRelayMember, failure) {
diff --git a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts
index 6d607c9d03..7af3faa66e 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts
@@ -13,6 +13,9 @@ import path from 'node:path';
import { REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER } from '@cindy/device-link';
import type { AgentEvent, AgentSessionHandle } from '@cindy/maker-core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createProviderGroupGuestRelay } from '../../provider-group/guestRelay';
+import { createProviderGroupExternalLoad } from '../../provider-group/externalLoad';
+import type { ProviderGroupRouter } from '../../provider-group/router';
import { RemoteAgentPoller } from '../controller/poller';
import { RemoteAgentRunClient } from '../controller/runClient';
@@ -147,6 +150,22 @@ async function waitFor(condition: () => boolean, ms = 3_000): Promise<void> {
const MEMBER_MINI: GroupRelayMember = { memberKey: 'device:mini:anthropic-2', agentDeviceId: 'mini', providerId: 'anthropic-2', sameAccount: true };
const MEMBER_STUDIO: GroupRelayMember = { memberKey: 'device:studio:anthropic', agentDeviceId: 'studio', providerId: 'anthropic', sameAccount: true };
+/** 真实组启动判定接到三端 harness,验证本机与中转启动入口确实服从任务错误和自动切换开关。 */
+function startFailurePolicy(autoSwitch: boolean) {
+ const router = { markCooling: vi.fn() } as unknown as ProviderGroupRouter;
+ const externalLoad = createProviderGroupExternalLoad({ now: Date.now });
+ return createProviderGroupGuestRelay({
+ scope: () => ({ router, externalLoad, isCurrent: () => true }),
+ readGroup: () => ({ strategy: 'order', autoSwitch, members: [
+ { key: 'local', kind: 'local', agentDeviceId: null, providerId: 'shared-provider', limit: 4, weight: 1, paused: false },
+ ...[MEMBER_MINI, MEMBER_STUDIO].map((m) => ({ key: m.memberKey, kind: 'device' as const, agentDeviceId: m.agentDeviceId, providerId: m.providerId, limit: 4, weight: 1, paused: false })),
+ ] }),
+ connect: () => { throw new Error('not used for failure decisions'); },
+ now: Date.now,
+ log: { warn: vi.fn() },
+ }).noteStartFailure;
+}
+
function setup(options: {
plans?: GroupRelayPlan[];
miniCapable?: boolean;
@@ -187,7 +206,7 @@ function setup(options: {
return { invoke: poller.invoke, poller };
}),
// 与本机任务同一个判定:默认换下一台(guestRelay 的判定见 provider-group/__tests__/guestRelay.test.ts)。
- noteStartFailure: vi.fn(() => true),
+ noteStartFailure: vi.fn<RemoteAgentGroupRelayDeps['noteStartFailure']>(() => true),
noteRunFailure: vi.fn((_providerId: string, _member: GroupRelayMember, failure: RelayRunFailure) =>
options.switchWorthy?.(failure) ?? true),
trackRun: vi.fn(() => ({ setRunning: vi.fn(), release: vi.fn() })),
@@ -322,6 +341,35 @@ describe('provider group relay for shared users', () => {
await client.close('close', 'navigation');
});
+ it.each(['local', 'remote', 'old-peer'] as const)('关闭自动换电脑后 %s 启动失败不尝试下一台', async (kind) => {
+ const env = setup({
+ ...(kind === 'local' ? { owner: { failStart: true } } : { mini: { failStart: true } }),
+ ...(kind === 'old-peer' ? { miniCapable: false } : {}),
+ plans: [kind === 'local' ? { kind: 'local' } : { kind: 'member', ...MEMBER_MINI }, { kind: 'member', ...MEMBER_STUDIO }],
+ });
+ env.relay.noteStartFailure.mockImplementation(startFailurePolicy(false));
+ await expect(openAsGuest(env, GUEST_A, openPayload(SESSION))).rejects.toThrow();
+ expect(env.relay.noteStartFailure).toHaveBeenCalledTimes(1);
+ expect(env.relay.plan).toHaveBeenCalledTimes(1);
+ expect(env.memberStarted.studio).toHaveLength(0);
+ });
+
+ it.each(['INVALID_PARAMS', 'SESSION_RUNNING', 'PRECONDITION_FAILED'])(
+ '中转启动的 %s 任务错误不会逐台重试', async (code) => {
+ const env = setup({
+ plans: [{ kind: 'member', ...MEMBER_MINI }, { kind: 'member', ...MEMBER_STUDIO }],
+ intercept: async (_device, request, forward) => {
+ if (request.op === 'open') throw new Error(`[${code}] task cannot start`);
+ return forward();
+ },
+ });
+ env.relay.noteStartFailure.mockImplementation(startFailurePolicy(true));
+ await expect(openAsGuest(env, GUEST_A, openPayload(SESSION))).rejects.toThrow(code);
+ expect(env.relay.plan).toHaveBeenCalledTimes(1);
+ expect(env.memberStarted.studio).toHaveLength(0);
+ },
+ );
+
it('runs locally when the group picks this computer, and refuses when no computer can run it', async () => {
const local = setup({ plans: [{ kind: 'local' }] });
const { client } = await openAsGuest(local, GUEST_A, openPayload(SESSION));
@@ -562,15 +610,21 @@ describe('provider group "switch to another computer" for shared users', () => {
await reopened.client.close('close', 'navigation');
});
- it('asks the shared user to hand off when the computer that ran the conversation cannot reopen it', async () => {
+ it.each([
+ { code: 'REMOTE_AGENT_UNAVAILABLE', autoSwitch: true, offersSwitch: true },
+ { code: 'INVALID_PARAMS', autoSwitch: true, offersSwitch: false },
+ { code: 'SESSION_RUNNING', autoSwitch: true, offersSwitch: false },
+ { code: 'REMOTE_AGENT_UNAVAILABLE', autoSwitch: false, offersSwitch: false },
+ ])('续接的 $code 错误,autoSwitch=$autoSwitch,是否发换电脑凭证=$offersSwitch', async ({ code, autoSwitch, offersSwitch }) => {
let failResume = false;
const env = setup({
intercept: async (_agentDeviceId, request, forward) => {
- if (failResume && request.op === 'open') throw new Error('[REMOTE_AGENT_UNAVAILABLE] gone');
+ if (failResume && request.op === 'open') throw new Error(`[${code}] cannot reopen`);
return forward();
},
plans: [{ kind: 'member', ...MEMBER_MINI }, { kind: 'member', ...MEMBER_STUDIO }],
});
+ env.relay.noteStartFailure.mockImplementation(startFailurePolicy(autoSwitch));
const first = await openAsGuest(env, GUEST_A, openPayload(SESSION, { acceptsGroupSwitch: true }));
const nativeId = first.started.id as string;
await first.client.close('close', 'navigation');
@@ -589,8 +643,11 @@ describe('provider group "switch to another computer" for shared users', () => {
await expect(client.open('claude-code', openPayload(SESSION, { acceptsGroupSwitch: true, options: { resumeSessionId: nativeId } })))
.rejects.toThrow();
// 续接只能回到原来那台:那台接不下时凭证排在启动失败前面,受邀者交接后作为全新任务重新打开,组换一台。
- expect(stream.some((state) => typeof state.providerGroupSwitch === 'string')).toBe(true);
- expect(env.relay.plan).toHaveBeenLastCalledWith(expect.objectContaining({ exclude: new Set([MEMBER_MINI.memberKey]) }));
+ expect(stream.some((state) => typeof state.providerGroupSwitch === 'string')).toBe(offersSwitch);
+ expect(env.relay.plan).toHaveBeenCalledTimes(offersSwitch ? 2 : 1);
+ if (offersSwitch) {
+ expect(env.relay.plan).toHaveBeenLastCalledWith(expect.objectContaining({ exclude: new Set([MEMBER_MINI.memberKey]) }));
+ }
});
it('accepts a token only once, and only from the shared user and task it was sent to', async () => {
diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.ts
index b75c2b3266..ea51d4fc19 100644
--- a/apps/desktop/src/main/remote-agent/host/runHost.ts
+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts
@@ -1070,7 +1070,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
async function offerSwitchAfterResumeFailure(run: Run, member: GroupRelayMember, error: unknown, model: string): Promise<void> {
if (!run.acceptsGroupSwitch || run.closing) return;
const message = error instanceof Error ? error.message : String(error);
- const token = await groupSwitchOfferFor(run, member, { message }, model).catch(() => null);
+ const token = await groupSwitchOfferFor(run, member, { message }, model, 'start').catch(() => null);
if (token && !run.closing) append(run, { t: 'state', state: { [GROUP_SWITCH_STATE_KEY]: token } });
}
@@ -1223,7 +1223,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
}
/**
- * 受邀者任务在组内电脑(含本机这一台)上运行中失败:问题出在那台时按组的口径冷却它;受邀者声明了支持、组里还有
+ * 受邀者任务在组内电脑(含本机这一台)上失败:按启动或运行阶段的同一判定,问题出在那台时按组的口径冷却它;受邀者声明了支持、组里还有
* 能接的电脑(这一轮换下来的不算)时返回一张「需要换一台」凭证,调用方把它排在那次错误前面送出。
*/
async function groupSwitchOfferFor(
@@ -1231,10 +1231,14 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
member: GroupRelayMember,
failure: RelayRunFailure,
model: string,
+ phase: 'start' | 'run' = 'run',
): Promise<string | null> {
const relayDeps = deps.groupRelay;
if (!relayDeps || !run.providerId || !run.hostSessionId) return null;
- if (!relayDeps.noteRunFailure(run.providerId, member, failure)) return null;
+ const canSwitch = phase === 'start'
+ ? relayDeps.noteStartFailure(run.providerId, member, failure.message ?? '')
+ : relayDeps.noteRunFailure(run.providerId, member, failure);
+ if (!canSwitch) return null;
// 旧版受邀者不认识这个状态:照旧只转出原来的错误。
if (!run.acceptsGroupSwitch) return null;
const exclude = noteGroupSwitchTried(run, member);