Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote-agent): 自己让出时没关掉的旧 run,连回前先关掉并计入名额
fmfsaisai0658d8cb782e
diff --git a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.tsindex 17e8f55a6b..188aa16985 100644--- a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts@@ -956,6 +956,41 @@ describe('remote connection pool with a real host', () => {expect(scenario.started).toHaveLength(3);});+ // PR #6483 第三轮:self 让出时 close 没送到,接回前本机不算自己的旧 run,对方按上限拒绝,且不会选 self 让出。+ it.each([+ ['gets through', 1, 'ok:again'],+ ['still fails', Infinity, '[DEVICE_LIMIT]'],+ ])('when its own release close did not get through and the retried close %s, a reconnect closes the old run first', async (_label, drops, outcome) => {+ const pool = new RemoteConnectionPool({ idleMinutes: () => idleMinutes, checkMs: 3_600_000, closeRetryMs: 3_600_000 });+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ let dropped = 0;+ intercept = (request) => {+ if (request.op !== 'close' || dropped >= drops) return undefined;+ dropped += 1;+ throw new Error('[DEVICE_LINK_TIMEOUT] link down');+ };+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(true);+ // 对方还开着 a 的旧 run(名额 1 已占满)。+ expect(host.limitUsage().total).toBe(1);+ opens = 0;+ if (outcome.startsWith('ok:')) {+ expect(await ask(a, events, 'again')).toBe(outcome);+ // 先关掉了 a 的旧 run 再打开,没有撞上限。+ expect(opens).toBe(1);+ expect(dropped).toBe(1);+ expect(host.limitUsage().total).toBe(1);+ expect(scenario.started).toHaveLength(2);+ } else {+ // 旧 run 还是关不掉:照常按对方的上限报错,不死循环。+ await expect(a.send({ type: 'user', content: 'again' })).rejects.toThrow(outcome);+ expect(opens).toBe(1);+ expect(dropped).toBeLessThanOrEqual(3);+ }+ });+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.tsindex 9592fc4053..11716d0710 100644--- a/apps/desktop/src/main/remote-agent/controller/connectionPool.ts+++ b/apps/desktop/src/main/remote-agent/controller/connectionPool.ts@@ -60,8 +60,8 @@ export interface RemoteConnectionPoolOptions {export class RemoteConnectionPool {private readonly members = new Set<PooledRemoteConnection>();- /** 让出时 close 没送到、对方可能还占着名额的连接 → 结束占位。 */- private readonly held = new Map<PooledRemoteConnection, () => void>();+ /** 让出时 close 没送到、对方可能还占着名额的连接 → 结束占位、再发一次 close。 */+ private readonly held = new Map<PooledRemoteConnection, { end: () => void; retryClose: () => Promise<unknown> }>();private maxRuns: number | null = null;private timer: ReturnType<typeof setInterval> | null = null;/** 让出名额一次只做一个,避免几条路径同时挑中不同的连接、多让。 */@@ -80,7 +80,7 @@ export class RemoteConnectionPool {(this.timer as { unref?: () => void }).unref?.();}return () => {- this.held.get(member)?.();+ this.held.get(member)?.end();this.members.delete(member);if (this.members.size === 0 && this.timer) {clearInterval(this.timer);@@ -98,10 +98,16 @@ export class RemoteConnectionPool {return this.members.size;}- /** 本机在这台电脑上占着的名额数(含 close 没送到、对方可能还没结束的)。 */+ /**+ * 本机在这台电脑上占着的名额数。`except` 只排除它正要开的那个位置:它让出时 close 没送到、对方可能还没+ * 结束的旧 run 照样算(对方要到新进程启动时才替换同一任务的旧实例,打开时的名额检查会算上它)。+ */occupied(except?: PooledRemoteConnection): number {let count = 0;- for (const member of this.members) if (member !== except && (member.occupiesSlot() || this.held.has(member))) count += 1;+ for (const member of this.members) {+ if (member !== except && member.occupiesSlot()) count += 1;+ if (this.held.has(member)) count += 1;+ }return count;}@@ -111,15 +117,16 @@ export class RemoteConnectionPool {* 占位期间水位线与打开前的判断都算上它,会去让别的有资格的连接,而不是直接打开撞上限。*/holdAfterFailedClose(member: PooledRemoteConnection, retryClose: () => Promise<unknown>): void {- this.held.get(member)?.();+ this.held.get(member)?.end();let ended = false;const end = () => {if (ended) return;ended = true;clearTimeout(retry);clearTimeout(expire);- if (this.held.get(member) === end) this.held.delete(member);+ if (this.held.get(member) === record) this.held.delete(member);};+ const record = { end, retryClose };const retry = setTimeout(() => {retryClose().then(end, (error) => {this.options.log?.warn('remote agent pool: closing a released connection failed again', { error: String(error) });@@ -128,7 +135,21 @@ export class RemoteConnectionPool {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);+ this.held.set(member, record);+ }++ /** 立刻再发一次 close 关掉这个连接 close 没送到的旧 run;关掉了(对方不认识也算)就不再占位。 */+ private async closeHeld(member: PooledRemoteConnection): Promise<boolean> {+ const record = this.held.get(member);+ if (!record) return false;+ try {+ await record.retryClose();+ } catch (error) {+ this.options.log?.warn('remote agent pool: closing a released connection failed again', { error: String(error) });+ return false;+ }+ record.end();+ return true;}/** 提前让出名额的水位线;上限太小(水位线不低于上限)时没有。 */@@ -190,6 +211,8 @@ export class RemoteConnectionPool {*/async beforeOpen(self: PooledRemoteConnection): Promise<void> {await this.serial(async () => {+ // 自己让出时没关掉的旧 run:先关掉它再看名额。+ await this.closeHeld(self);if (this.maxRuns === null || this.occupied(self) < this.maxRuns) return;if (await this.releaseNext(self)) {this.options.log?.info('remote agent pool: made room before opening', { maxRuns: this.maxRuns });@@ -198,10 +221,10 @@ export class RemoteConnectionPool {void this.trim();}- /** 对方以名额已满拒绝了打开:让一个,让出了就由调用方重试一次。 */+ /** 对方以名额已满拒绝了打开:先试着关掉自己没关掉的旧 run,否则让一个;腾出了就由调用方重试一次。 */releaseForRetry(self: PooledRemoteConnection): Promise<boolean> {return this.serial(async () => {- const released = await this.releaseNext(self);+ const released = await this.closeHeld(self) || await this.releaseNext(self);this.options.log?.info('remote agent pool: open rejected for capacity', { released, maxRuns: this.maxRuns });return released;});diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 1ed4931bfd..954f2faef5 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1378,7 +1378,9 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加- **让出时 close 没送到**(链路抖动等):B 的进程可能还占着名额。A 的连接池继续把它算作占位,约 2 秒后原样再发一次`close`(B 不认识这个 run 时直接回空,等同已关闭);再发送到、或过了 B 自行回收的时间(`REMOTE_AGENT_HOST_IDLE_MS`,3 分钟)后不再占位。占位期间水位线与打开前的判断都算上它,会先让别的有资格的连接,而不是直接打开撞上限。- close 没送到时本机也不再等 B 的收尾事件(B 不会收尾)。+ close 没送到时本机也不再等 B 的收尾事件(B 不会收尾)。这个任务自己要连回时,打开前与被拒后都先立刻对旧 run 再发+ 一次 close,关掉了才不再占位;计数时只排除它正要开的那个位置,旧 run 照样算(B 打开时的名额检查会算上旧 run,+ 同一任务的旧实例要到新进程启动时才被替换)。还是关不掉就照常让别的连接或按 B 的上限报错。- **已知限制**:B 的整机合计上限(`TOTAL_LIMIT`)A 看不到别的设备的占用,只能靠被拒后处理;A 在自己额度内不让出,可能挡住别的设备,第一期接受。A 作为供应商组所在电脑替受邀者中转的 run 不进连接池(由发起方决定让出,发起方让出后按原有逻辑关掉中转);同一台 B 的多个分享入口(`share:<id>`)各算一个池,计数可能偏低,靠被拒后处理兜住。