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(remote-agent): 让出时 close 没送到,连接池继续占位并再发一次

fmfsaisaibb84050e57c3
diff --git a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts
index 96f6029243..d589dde83f 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts
@@ -193,6 +193,46 @@ describe('remote connection pool', () => {
expect(await pool.releaseForRetry(self)).toBe(true);
});
+ // PR #6483 review:让出时 close 没送到,对方还占着名额,本机却当已释放,会直接打开撞上限。
+ it('keeps counting a connection whose close did not get through until a retried close succeeds or the provider reclaims it', async () => {
+ vi.useFakeTimers();
+ try {
+ const pool = new RemoteConnectionPool({ idleMinutes: () => 10, now: () => now, checkMs: 60 * MINUTE, closeRetryMs: 2_000, closeHoldMs: 3 * MINUTE });
+ pool.noteMaxRuns(2);
+ const stuck = member('stuck', now - 60 * MINUTE);
+ stuck.occupied = false;
+ const other = member('other', now - 30 * MINUTE);
+ const self = member('self', now, false);
+ [stuck, other, self].forEach((item) => pool.add(item));
+ let retries = 0;
+ let reachable = false;
+ const retryClose = async () => {
+ retries += 1;
+ if (!reachable) throw new Error('link down');
+ };
+ pool.holdAfterFailedClose(stuck, retryClose);
+ // 仍占位:本机已满,打开前先让另一条有资格的。
+ await pool.beforeOpen(self);
+ expect(other.released).toBe(1);
+ expect(pool.occupied(self)).toBe(1);
+ // 再发一次也没送到:一直占到对方自行回收的时间。
+ await vi.advanceTimersByTimeAsync(2_000);
+ expect(retries).toBe(1);
+ expect(pool.occupied(self)).toBe(1);
+ await vi.advanceTimersByTimeAsync(3 * MINUTE);
+ expect(pool.occupied(self)).toBe(0);
+ // 再发送到了:立即不再占位。
+ reachable = true;
+ pool.holdAfterFailedClose(stuck, retryClose);
+ expect(pool.occupied(self)).toBe(1);
+ await vi.advanceTimersByTimeAsync(2_000);
+ expect(retries).toBe(2);
+ expect(pool.occupied(self)).toBe(0);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
it('checks the watermark periodically while connections are registered', async () => {
vi.useFakeTimers();
try {
@@ -835,6 +875,32 @@ describe('remote connection pool with a real host', () => {
expect(scenario.started).toHaveLength(2);
});
+ it('when a release close does not get through, makes room before opening instead of hitting the limit, then closes it', async () => {
+ limits = { perDevice: 2, total: 64 };
+ const pool = new RemoteConnectionPool({ idleMinutes: () => idleMinutes, checkMs: 3_600_000, closeRetryMs: 20 });
+ const a = await start(pool);
+ await ask(a, watch(a), 'hello');
+ await sleep(5);
+ const b = await start(pool);
+ await ask(b, watch(b), 'hello');
+ // 让出 a 时 close 第一次没送到对方。
+ let dropped = false;
+ intercept = (request) => {
+ if (request.op !== 'close' || dropped) return undefined;
+ dropped = true;
+ throw new Error('[DEVICE_LINK_TIMEOUT] link down');
+ };
+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(true);
+ expect(host.limitUsage().total).toBe(2);
+ await sleep(5);
+ opens = 0;
+ await start(pool);
+ // 本机仍按 a 占着算:打开前先让了 b,没有白开一次撞上限。
+ expect(opens).toBe(1);
+ // 再发的 close 送到后,对方结束 a。
+ await vi.waitFor(() => expect(host.limitUsage().total).toBe(1));
+ });
+
it('gives up a release once a send has started', async () => {
const pool = newPool();
const a = await start(pool);
diff --git a/apps/desktop/src/main/remote-agent/controller/connectionPool.ts b/apps/desktop/src/main/remote-agent/controller/connectionPool.ts
index 17842169fd..9592fc4053 100644
--- a/apps/desktop/src/main/remote-agent/controller/connectionPool.ts
+++ b/apps/desktop/src/main/remote-agent/controller/connectionPool.ts
@@ -18,6 +18,13 @@
export const REMOTE_AGENT_POOL_WATERMARK_RATIO = 0.8;
/** 在水位线之上的连接会随时间变得有资格,定期再看一次。 */
export const REMOTE_AGENT_POOL_CHECK_MS = 60_000;
+/** 让出时 close 没送到:隔这么久再原样发一次。 */
+export const REMOTE_AGENT_POOL_CLOSE_RETRY_MS = 2_000;
+/**
+ * close 没送到时本机按仍占着名额计数的最长时间:对方这么久没被读取就自行回收这个任务
+ * (与对方的 REMOTE_AGENT_HOST_IDLE_MS 一致)。
+ */
+export const REMOTE_AGENT_POOL_CLOSE_HOLD_MS = 3 * 60_000;
export interface PooledRemoteConnection {
/** 占着对方的名额(正在连、连着或正在断开)。 */
@@ -46,11 +53,15 @@ export interface RemoteConnectionPoolOptions {
idleMinutes(): number;
now?: () => number;
checkMs?: number;
+ closeRetryMs?: number;
+ closeHoldMs?: number;
log?: { info(message: string, meta?: Record<string, unknown>): void; warn(message: string, meta?: Record<string, unknown>): void };
}
export class RemoteConnectionPool {
private readonly members = new Set<PooledRemoteConnection>();
+ /** 让出时 close 没送到、对方可能还占着名额的连接 → 结束占位。 */
+ private readonly held = new Map<PooledRemoteConnection, () => void>();
private maxRuns: number | null = null;
private timer: ReturnType<typeof setInterval> | null = null;
/** 让出名额一次只做一个,避免几条路径同时挑中不同的连接、多让。 */
@@ -69,6 +80,7 @@ export class RemoteConnectionPool {
(this.timer as { unref?: () => void }).unref?.();
}
return () => {
+ this.held.get(member)?.();
this.members.delete(member);
if (this.members.size === 0 && this.timer) {
clearInterval(this.timer);
@@ -86,13 +98,39 @@ export class RemoteConnectionPool {
return this.members.size;
}
- /** 本机在这台电脑上占着的名额数。 */
+ /** 本机在这台电脑上占着的名额数(含 close 没送到、对方可能还没结束的)。 */
occupied(except?: PooledRemoteConnection): number {
let count = 0;
- for (const member of this.members) if (member !== except && member.occupiesSlot()) count += 1;
+ for (const member of this.members) if (member !== except && (member.occupiesSlot() || this.held.has(member))) count += 1;
return count;
}
+ /**
+ * 让出时 close 没送到(链路抖动等):对方的进程可能还占着名额。在本机计数里继续占位,隔一会儿用
+ * `retryClose` 原样再发一次 close;再发成功(对方不认识这个任务也算)或到了对方自行回收的时间后不再占位。
+ * 占位期间水位线与打开前的判断都算上它,会去让别的有资格的连接,而不是直接打开撞上限。
+ */
+ holdAfterFailedClose(member: PooledRemoteConnection, retryClose: () => Promise<unknown>): void {
+ this.held.get(member)?.();
+ let ended = false;
+ const end = () => {
+ if (ended) return;
+ ended = true;
+ clearTimeout(retry);
+ clearTimeout(expire);
+ if (this.held.get(member) === end) this.held.delete(member);
+ };
+ const retry = setTimeout(() => {
+ retryClose().then(end, (error) => {
+ this.options.log?.warn('remote agent pool: closing a released connection failed again', { error: String(error) });
+ });
+ }, this.options.closeRetryMs ?? REMOTE_AGENT_POOL_CLOSE_RETRY_MS);
+ const expire = setTimeout(end, this.options.closeHoldMs ?? REMOTE_AGENT_POOL_CLOSE_HOLD_MS);
+ (retry as { unref?: () => void }).unref?.();
+ (expire as { unref?: () => void }).unref?.();
+ this.held.set(member, end);
+ }
+
/** 提前让出名额的水位线;上限太小(水位线不低于上限)时没有。 */
watermark(): number | null {
if (this.maxRuns === null) return null;
diff --git a/apps/desktop/src/main/remote-agent/controller/runClient.ts b/apps/desktop/src/main/remote-agent/controller/runClient.ts
index 47993cf48b..9f7d4db8f6 100644
--- a/apps/desktop/src/main/remote-agent/controller/runClient.ts
+++ b/apps/desktop/src/main/remote-agent/controller/runClient.ts
@@ -199,11 +199,13 @@ export class RemoteAgentRunClient implements PolledRun {
async close(mode: 'close' | 'detach', reason: RemoteAgentTeardownReason): Promise<void> {
if (this.closed) return;
+ let delivered = false;
try {
await this.invoke([{ op: 'close', runId: this.runId, mode, reason }]);
+ delivered = true;
} finally {
- // 收尾事件仍会经 poll 到达;流结束时自行收口。
- if (this.registered) await Promise.race([this.drained, sleep(CLOSE_DRAIN_MS)]);
+ // 收尾事件仍会经 poll 到达;流结束时自行收口。close 没送到时对方不会收尾,不用等。
+ if (this.registered && delivered) await Promise.race([this.drained, sleep(CLOSE_DRAIN_MS)]);
this.finish('closed');
}
}
diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.ts
index 49d5c55f58..a6d1e1fbf8 100644
--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts
+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts
@@ -405,6 +405,8 @@ export async function startRemoteAgentSession(
await client.close('close', 'navigation');
} catch (error) {
deps.log?.warn('remote agent: closing a released connection failed', { runId: client.runId, error: String(error) });
+ // 没送到:对方可能还占着名额,连接池继续给它占位并再试一次 close。
+ deps.pool?.holdAfterFailedClose(member, () => poller.invoke([{ op: 'close', runId: client.runId, mode: 'close', reason: 'navigation' }]));
} finally {
// 对方的 Codex 已退出:本机为它起的 exec-server 一并关掉,连回来的 Agent 会重新连。
relay?.reset();
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index bb8802f741..19c7d9761a 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1372,6 +1372,10 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加
不悄悄丢上下文;手机端同步补了 `session.remoteError.REMOTE_AGENT_RESUME_LOST`,旧手机没有这条文案,显示通用的「回复失败」。
- **并发**:让出进行中来的调用等它让完再连回;同时几个调用只连一次;调用开始后让出放弃;已让出时的关闭、归档、删除、换账号、
退出 App(`detach`)只收本机部分,不再联系 B。
+ - **让出时 close 没送到**(链路抖动等):B 的进程可能还占着名额。A 的连接池继续把它算作占位,约 2 秒后原样再发一次
+ `close`(B 不认识这个 run 时直接回空,等同已关闭);再发送到、或过了 B 自行回收的时间(`REMOTE_AGENT_HOST_IDLE_MS`,
+ 3 分钟)后不再占位。占位期间水位线与打开前的判断都算上它,会先让别的有资格的连接,而不是直接打开撞上限。
+ close 没送到时本机也不再等 B 的收尾事件(B 不会收尾)。
- **已知限制**:B 的整机合计上限(`TOTAL_LIMIT`)A 看不到别的设备的占用,只能靠被拒后处理;A 在自己额度内不让出,可能挡住别的
设备,第一期接受。A 作为供应商组所在电脑替受邀者中转的 run 不进连接池(由发起方决定让出,发起方让出后按原有逻辑关掉中转);
同一台 B 的多个分享入口(`share:<id>`)各算一个池,计数可能偏低,靠被拒后处理兜住。