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): 后台工作结束算一次活动,闲置从结束时算起

fmfsaisai29aa63522d5c
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 e25cb74ff6..17e8f55a6b 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts
@@ -320,7 +320,7 @@ interface Scenario {
closes: number;
/** 打开时接不回会话:先问控制端能不能清掉,再开新会话。 */
failResume: 'callback' | 'silent' | null;
- /** 下一个 Agent 报告的后台任务 / 待唤醒数。 */
+ /** 对方 Agent 当前报告的后台任务 / 待唤醒数(实时读取)。 */
backgroundTasks: BackgroundTaskSnapshot[];
pendingWake: number;
/** send 'hold' 时卡住,直到调用它。 */
@@ -354,8 +354,6 @@ function fakeAgent(input: HostedStartInput): AgentSessionHandle {
let planMode = input.options.planMode === true;
let effort = input.options.effort;
const failResume = resume ? scenario.failResume : null;
- const backgroundTasks = scenario.backgroundTasks;
- const pendingWake = scenario.pendingWake;
if (failResume) {
id = `native-${(nextNative += 1)}`;
if (failResume === 'callback') void input.onInvalidResumeSession?.(resume!);
@@ -416,8 +414,8 @@ function fakeAgent(input: HostedStartInput): AgentSessionHandle {
isTurnRunning: () => running,
getPlanMode: () => planMode,
getEffort: () => effort ?? null,
- listBackgroundTasks: () => backgroundTasks,
- countPendingWakeContinuations: () => pendingWake,
+ listBackgroundTasks: () => scenario.backgroundTasks,
+ countPendingWakeContinuations: () => scenario.pendingWake,
async setPermissionMode(mode) {
record('setPermissionMode', [mode]);
},
@@ -726,6 +724,35 @@ describe('remote connection pool with a real host', () => {
expect(a.id).toBeTruthy();
});
+ // PR #6483 复审:后台工作结束的状态更新不算活动,连接池拿后台工作开始前的时间判断,一结束就让出。
+ it.each([
+ ['background tasks', () => { scenario.backgroundTasks = [{ taskId: 't1', taskType: 'local_agent' }]; }, () => { scenario.backgroundTasks = []; }],
+ ['pending wake continuations', () => { scenario.pendingWake = 1; }, () => { scenario.pendingWake = 0; }],
+ ])('counts the end of long %s as activity and waits the full idle time after it', async (_label, arrange, finish) => {
+ // 只假时钟与对方的定时状态推送(每 2 秒):时间用 setSystemTime 跳,推送由 advanceTimers 触发。
+ vi.useFakeTimers({ toFake: ['Date', 'setInterval', 'clearInterval'] });
+ try {
+ limits = { perDevice: 16, total: 64 };
+ idleMinutes = 10;
+ arrange();
+ const pool = new RemoteConnectionPool({ idleMinutes: () => idleMinutes, now: () => Date.now(), checkMs: 3_600_000 });
+ const a = await start(pool);
+ await ask(a, watch(a), 'hello');
+ // 后台工作持续了 30 分钟,期间不让。
+ vi.setSystemTime(Date.now() + 30 * 60_000);
+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(false);
+ finish();
+ await vi.advanceTimersByTimeAsync(2_000);
+ await vi.waitFor(() => expect(a.listBackgroundTasks!().length + a.countPendingWakeContinuations!()).toBe(0));
+ // 刚结束:从这时起算闲置,不立即让。
+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(false);
+ vi.setSystemTime(Date.now() + 10 * 60_000);
+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(true);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
it.each([
['0 minutes (the default: never release)', 0],
['an idle threshold not reached yet', 30],
diff --git a/apps/desktop/src/main/remote-agent/__tests__/execServerProjection.e2e.test.ts b/apps/desktop/src/main/remote-agent/__tests__/execServerProjection.e2e.test.ts
index 2c26a2c3c5..4e4fa48889 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/execServerProjection.e2e.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/execServerProjection.e2e.test.ts
@@ -89,11 +89,16 @@ describe.skipIf(!fs.existsSync(CODEX) || process.platform === 'win32')('exec-ser
const workspace = new ExecutorWorkspace({ workingDir: root });
const messages: Array<{ id?: number; method?: string; params?: { processId?: string }; error?: unknown }> = [];
let parts = '';
+ let ended = 0;
const relay = new ExecServerRelay({
codexPath: CODEX,
cwd: root,
workspace,
authorize: (action) => (action.kind === 'exec' && action.command.includes('denied') ? { ok: false, reason: 'no' } : { ok: true }),
+ // 最后一个进程结束 = 一次活动(连接池的闲置从这时算起)。
+ onProcessesEnded: () => {
+ ended += 1;
+ },
push: async (frames) => {
for (const frame of frames) {
if (frame.kind !== 'message') continue;
@@ -117,19 +122,24 @@ describe.skipIf(!fs.existsSync(CODEX) || process.platform === 'win32')('exec-ser
start(2, 'denied', 'echo denied');
await expect.poll(() => messages.find((item) => item.id === 2)?.error, { timeout: 5000 }).toBeDefined();
await expect.poll(() => relay.busy(), { timeout: 5000 }).toBe(false);
+ expect(ended).toBe(0);
// 短命令跑完就不忙。
start(3, 'short', 'exit 0');
await expect.poll(() => messages.some((item) => item.method === 'process/closed' && item.params?.processId === 'short'), { timeout: 5000 }).toBe(true);
await expect.poll(() => relay.busy(), { timeout: 5000 }).toBe(false);
+ expect(ended).toBe(1);
// 还在跑的(如 Codex 的后台终端)算忙。
start(4, 'long', 'sleep 30');
await expect.poll(() => messages.some((item) => item.id === 4), { timeout: 5000 }).toBe(true);
expect(relay.busy()).toBe(true);
+ expect(ended).toBe(1);
send({ id: 5, method: 'process/terminate', params: { processId: 'long' } });
await expect.poll(() => messages.some((item) => item.method === 'process/closed' && item.params?.processId === 'long'), { timeout: 5000 }).toBe(true);
await expect.poll(() => relay.busy(), { timeout: 5000 }).toBe(false);
+ // closed / exited 可能都会来,只算一次。
+ expect(ended).toBe(2);
// 让出名额后关掉 exec-server,中继本身还能接新的连接。
relay.reset();
diff --git a/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts b/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts
index f8f99aab16..c9cfa25317 100644
--- a/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts
+++ b/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts
@@ -46,6 +46,8 @@ export interface ExecServerRelayDeps {
env?: NodeJS.ProcessEnv;
log?: { warn(message: string, meta?: Record<string, unknown>): void };
now?: () => number;
+ /** 最后一个在跑的进程(含后台终端)结束了:对连接池来说这是一次活动。 */
+ onProcessesEnded?(): void;
}
/**
@@ -518,8 +520,9 @@ export class ExecServerRelay {
}
if ((message.method === 'process/closed' || message.method === 'process/exited') && typeof message.params?.processId === 'string') {
const processId = message.params.processId;
- connection.processes.delete(processId);
+ const ended = connection.processes.delete(processId);
for (const [key, starting] of connection.starting) if (starting === processId) connection.starting.delete(key);
+ if (ended && ![...this.connections.values()].some((item) => item.processes.size)) this.deps.onProcessesEnded?.();
}
}
diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.ts
index 65b41d5efd..dd3e0d85d8 100644
--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts
+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts
@@ -377,6 +377,8 @@ export async function startRemoteAgentSession(
await active?.push(frames);
},
log: deps.log,
+ // 后台终端跑完:闲置从这时算起。
+ onProcessesEnded: () => touch(),
})
: null;
@@ -502,7 +504,12 @@ export async function startRemoteAgentSession(
delete state.workspaceProjection;
if (!Object.keys(state).length) return;
}
- if (controller && opened) controller.onState(state);
+ if (controller && opened) {
+ // 对方的后台任务、待唤醒续跑等刚结束(由忙转闲):工作结束本身算一次活动,闲置从这时算起。
+ const wasQuiet = controller.isQuiet();
+ controller.onState(state);
+ if (!wasQuiet && controller.isQuiet()) touch();
+ }
else early.push({ type: 'state', value: state });
},
onRequest: async (request: RemoteAgentReverseRequest, signal): Promise<RemoteAgentReply> => {
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 338b2e7411..1ed4931bfd 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1349,7 +1349,8 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加
- **「不忙」**:A 侧没有进行中的方法调用、回包与推帧;状态镜像里没有在跑 / 在准备的回合、没有后台任务(`backgroundTasks`:
Claude Code 后台子代理与后台任务、Pi 子代理)与待唤醒续跑(`pendingWake`);Codex 中继里没有仍在运行的 `process/start` 进程
(后台终端;按 exec-server 的 `process/closed` / `process/exited` 与启动失败判断,固定 Codex 0.159.2 实测),也没有在等本机确认的消息;
- 回到某条消息后、下一轮跑完前也算忙(Claude Code 要到下一次发送才在 B 上截断)。A 本机执行器里的后台命令不算忙。
+ 回到某条消息后、下一轮跑完前也算忙(Claude Code 要到下一次发送才在 B 上截断)。A 本机执行器里的后台命令不算忙。「闲置满 N 分钟」从最后一次活动算起:由忙转闲(后台任务、待唤醒续跑清空,
+ Codex 中继里最后一个进程结束)本身算一次活动,后台工作再久,结束后也要再闲置满 N 分钟才让。
会话 id 会被 B 改写的也不让:B 打开时把启动选项里的字符串按 A 的工作目录及各级上级目录、用户目录与附加目录投影到虚拟
工作区,`resumeSessionId` 也不例外;Pi 的会话 id 是 B 上的会话文件路径,两台同为 Mac(`/Users`)或同为 Windows 时
常落在这些前缀下,带过去会变成不存在的文件。A 按同一规则预判(`hostRewritesResumeId`),这样的 Pi 任务不让出。