Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(remote-agent): 名额紧张时让出闲置远程任务的 Agent 进程
fmfsaisaif3abce57954f
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex ceee60c1e6..638c9f2b99 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -228,6 +228,16 @@ describe('member note management', () => {});});+describe('idle release setting payloads', () => {+ it.each([0, 1, 10, 120])('accepts %i minutes', idleMinutes => {+ expect(parseProviderShareCommand({ action: 'set-idle-release', value: { idleMinutes } }))+ .toEqual({ action: 'set-idle-release', value: { idleMinutes } });+ });+ it.each([undefined, {}, { idleMinutes: -1 }, { idleMinutes: 121 }, { idleMinutes: 1.5 }, { idleMinutes: '10' }])('rejects %j', value => {+ expect(() => parseProviderShareCommand({ action: 'set-idle-release', value })).toThrow('INVALID_PARAMS');+ });+});+describe('same-account share management during account transitions', () => {it.each([createLink, ...mutations,diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex 308e7c9471..8c2acb6930 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -1,6 +1,8 @@import { isRemoteAgentLimitsPatch } from '../../shared/remoteAgentLimits.js';import { readRemoteAgentLimitsState, saveRemoteAgentLimits } from '../remote-agent/host/limitsStore.js';import { remoteAgentLimitUsage } from './dispatch.js';+import { isRemoteAgentIdleRelease } from '../../shared/remoteAgentIdleRelease.js';+import { readRemoteAgentIdleReleaseState, saveRemoteAgentIdleRelease } from '../remote-agent/controller/idleReleaseStore.js';/*** 供应商分享的本机接线:分享者与受邀者两侧运行时的起停、推送给 Renderer、系统通知,以及* Renderer 的命令通道。账号操作只接受本机应用窗口,不能经设备互联从别的电脑调用。@@ -342,6 +344,12 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {case 'set-run-limits':if (!isRemoteAgentLimitsPatch(value.limits)) throwIpcError('INVALID_PARAMS', 'Invalid remote task limits');return { action: value.action, limits: { ...value.limits } };+ case 'get-idle-release':+ case 'reset-idle-release':+ return { action: value.action };+ case 'set-idle-release':+ if (!isRemoteAgentIdleRelease(value.value)) throwIpcError('INVALID_PARAMS', 'Invalid idle release minutes');+ return { action: value.action, value: { idleMinutes: value.value.idleMinutes } };case 'owned':return { action: 'owned', range: usageRange(value.range) };case 'own-usage':@@ -696,6 +704,14 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => void}return { ...readRemoteAgentLimitsState(), usage: remoteAgentLimitUsage() };}+ case 'get-idle-release':+ case 'set-idle-release':+ case 'reset-idle-release':+ if (command.action !== 'get-idle-release') {+ await saveRemoteAgentIdleRelease(command.action === 'reset-idle-release' ? null : command.value);+ assertCurrent();+ }+ return readRemoteAgentIdleReleaseState();case 'owned':if (running) markProviderShareHostActive(60_000);return ownerState(command.range);diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.tsindex 628d8ef5d8..b4125dbfcb 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -226,6 +226,7 @@ import {getRipgrepBinaryPath,} from './runtime-configs.js';import { createDeviceAgentStarter } from '../remote-agent/controller/service.js';+import { readRemoteAgentIdleReleaseMinutes } from '../remote-agent/controller/idleReleaseStore.js';import { extractReviewPdfTextInChild } from '../reviewer/reviewPdfProcess.js';import { disposeRemoteAgentHost, installRemoteAgentHost } from '../remote-agent/host/service.js';import {@@ -2832,6 +2833,8 @@ export function getMaker(): Maker {const shareId = parseProviderShareAgentDeviceId(deviceId);return shareId !== null && isProviderShareCredentialConsentSkipped(shareId);},+ // 名额紧张时闲置满这么多分钟的任务让出那台电脑上的 Agent 进程(「远程与分享」里的设置,0 = 不让)。+ idleReleaseMinutes: readRemoteAgentIdleReleaseMinutes,logger: desktopMakerLogger,}),makerMemory: makerMemoryManager,diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.tsindex 87e2b76e01..ce0812b7c2 100644--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts@@ -568,6 +568,16 @@ describe('provider management receiver account boundary', () => {.toThrow(/PERMISSION_DENIED/);});+ // 本机作为使用方的闲置释放设置只在本机窗口可改,不经同账号管理通道。+ it.each([+ { action: 'get-idle-release' },+ { action: 'set-idle-release', value: { idleMinutes: 5 } },+ { action: 'reset-idle-release' },+ ] as const)('keeps $action out of the management scope', (command) => {+ vi.mocked(parseProviderShareCommand).mockReturnValueOnce(command);+ expect(() => parseProviderManagementRequest({ action: 'manage-share', command })).toThrow(/PERMISSION_DENIED/);+ });+// 「用量」块的按天明细(provider-groups.md §7):只读的分享者查询,和 own-usage 一样经管理通道转交。it('accepts the daily usage query as an owner operation', () => {const command = { action: 'usage-history', providerId: 'anthropic' } as const;diff --git a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.tsnew file mode 100644index 0000000000..f9582b7f03--- /dev/null+++ b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts@@ -0,0 +1,911 @@+/**+ * 远程模型连接池:只在名额紧张时让出「不忙且闲置满设置时长」的连接;让出只结束对方的 Agent 进程,+ * 本机部分(执行器里的后台命令等)留着,再发消息时带原来的会话 id 连回来。+ *+ * 前半是连接池本身的判定;后半与 roundtrip.test.ts 同一套两端同进程的接线,被控端是真实的+ * createRemoteAgentHost(按设备计名额),Agent 是假的。+ */+import { randomUUID } from 'node:crypto';+import fs from 'node:fs';+import os from 'node:os';+import path from 'node:path';++import type { AgentEvent, AgentSessionHandle, BackgroundTaskSnapshot, StartSessionOptions } from '@cindy/maker-core';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import {+ isRemoteRunLimitError,+ RemoteConnectionPool,+ type PooledRemoteConnection,+} from '../controller/connectionPool';+import { startRemoteAgentSession, type StartRemoteAgentDeps } from '../controller/startRemote';+import { createRemoteAgentHost, type HostedStartInput } from '../host/runHost';+import type { RemoteAgentLimits } from '../../../shared/remoteAgentLimits';++// ─── 连接池本身 ────────────────────────────────────────────────────++interface FakeMember extends PooledRemoteConnection {+ name: string;+ occupied: boolean;+ idle: boolean;+ activity: number;+ released: number;+}++function member(name: string, activity: number, idle = true): FakeMember {+ const item: FakeMember = {+ name,+ occupied: true,+ idle,+ activity,+ released: 0,+ occupiesSlot: () => item.occupied,+ isIdle: () => item.idle,+ lastActivityAt: () => item.activity,+ release: async () => {+ if (!item.occupied || !item.idle) return false;+ item.occupied = false;+ item.released += 1;+ return true;+ },+ };+ return item;+}++const MINUTE = 60_000;++function poolWith(minutes: number, now: number) {+ let idleMinutes = minutes;+ const pool = new RemoteConnectionPool({ idleMinutes: () => idleMinutes, now: () => now, checkMs: 3_600_000 });+ return { pool, setMinutes: (value: number) => { idleMinutes = value; } };+}++describe('remote connection pool', () => {+ const now = 100 * MINUTE;++ it('recognizes capacity rejections from new and old hosts, but not staged-data pressure', () => {+ expect(isRemoteRunLimitError(new Error('[REMOTE_AGENT_BUSY] [DEVICE_LIMIT] remote task limit for this device reached'))).toBe(true);+ expect(isRemoteRunLimitError(new Error('[REMOTE_AGENT_BUSY] [TOTAL_LIMIT] remote task limit for the provider computer reached'))).toBe(true);+ expect(isRemoteRunLimitError(new Error('[REMOTE_AGENT_BUSY] too many tasks are running from this computer'))).toBe(true);+ expect(isRemoteRunLimitError(new Error('[REMOTE_AGENT_BUSY] too much staged data'))).toBe(false);+ expect(isRemoteRunLimitError(new Error('[REMOTE_AGENT_UNAVAILABLE] [DEVICE_LIMIT]'))).toBe(false);+ });++ it('does not release below the watermark, however long a connection has been idle', async () => {+ const { pool } = poolWith(10, now);+ pool.noteMaxRuns(10); // 水位线 8+ const members = Array.from({ length: 7 }, (_, index) => member(`m${index}`, now - 1_000 * MINUTE));+ members.forEach((item) => pool.add(item));+ await pool.trim();+ expect(members.map((item) => item.released)).toEqual([0, 0, 0, 0, 0, 0, 0]);+ });++ it('at the watermark releases eligible connections oldest first until below it', async () => {+ const { pool } = poolWith(10, now);+ pool.noteMaxRuns(10);+ const fresh = Array.from({ length: 6 }, (_, index) => member(`fresh${index}`, now - MINUTE));+ const old = member('old', now - 30 * MINUTE);+ const older = member('older', now - 60 * MINUTE);+ const busy = member('busy', now - 90 * MINUTE, false);+ [...fresh, old, older, busy].forEach((item) => pool.add(item));+ expect(pool.occupied()).toBe(9);+ await pool.trim();+ // 9 → 7:先让最久的 older,再让 old;忙的与闲置不足 10 分钟的不动。+ expect([older.released, old.released, busy.released]).toEqual([1, 1, 0]);+ expect(fresh.every((item) => item.released === 0)).toBe(true);+ expect(pool.occupied()).toBe(7);+ });++ it('at the watermark without eligible connections releases nothing', async () => {+ const { pool } = poolWith(10, now);+ pool.noteMaxRuns(5); // 水位线 4+ const members = [+ member('busy', now - 60 * MINUTE, false),+ member('recent1', now - 9 * MINUTE),+ member('recent2', now - MINUTE),+ member('recent3', now),+ ];+ members.forEach((item) => pool.add(item));+ await pool.trim();+ expect(members.map((item) => item.released)).toEqual([0, 0, 0, 0]);+ });++ it.each([+ [1, null],+ [2, null],+ [4, null],+ [5, 4],+ [16, 13],+ ])('maxRuns %i has watermark %s; small limits never release early', async (maxRuns, watermark) => {+ const { pool } = poolWith(10, now);+ pool.noteMaxRuns(maxRuns);+ expect(pool.watermark()).toBe(watermark);+ const members = Array.from({ length: maxRuns }, (_, index) => member(`m${index}`, now - (100 + index) * MINUTE));+ members.forEach((item) => pool.add(item));+ await pool.trim();+ const released = members.reduce((sum, item) => sum + item.released, 0);+ expect(released).toBe(watermark === null ? 0 : maxRuns - watermark + 1);+ });++ it('when full makes room for exactly one before opening, and only with an eligible connection', async () => {+ const { pool } = poolWith(10, now);+ pool.noteMaxRuns(2);+ const a = member('a', now - 20 * MINUTE);+ const b = member('b', now - 30 * MINUTE);+ const self = member('self', now, false);+ [a, b, self].forEach((item) => pool.add(item));+ await pool.beforeOpen(self);+ expect([a.released, b.released, self.released]).toEqual([0, 1, 0]);+ // 又满了,剩下的那个闲置不足:不让,照常打开(由对方裁决)。+ a.activity = now - MINUTE;+ const c = member('c', now - 5 * MINUTE);+ pool.add(c);+ await pool.beforeOpen(self);+ expect([a.released, c.released]).toEqual([0, 0]);+ });++ it('uses the latest caps value for the per-device limit', async () => {+ const { pool } = poolWith(10, now);+ const a = member('a', now - 20 * MINUTE);+ const self = member('self', now, false);+ [a, self].forEach((item) => pool.add(item));+ pool.noteMaxRuns(4);+ await pool.beforeOpen(self);+ expect(a.released).toBe(0);+ pool.noteMaxRuns(1);+ await pool.beforeOpen(self);+ expect(a.released).toBe(1);+ });++ it('after a capacity rejection releases one eligible connection, none when nothing qualifies', async () => {+ const { pool } = poolWith(10, now);+ pool.noteMaxRuns(16);+ const self = member('self', now, false);+ const a = member('a', now - 20 * MINUTE);+ const b = member('b', now - 40 * MINUTE);+ [self, a, b].forEach((item) => pool.add(item));+ expect(await pool.releaseForRetry(self)).toBe(true);+ expect([a.released, b.released]).toEqual([0, 1]);+ a.idle = false;+ expect(await pool.releaseForRetry(self)).toBe(false);+ });++ it('with 0 minutes never releases on any path', async () => {+ const { pool } = poolWith(0, now);+ pool.noteMaxRuns(5);+ const self = member('self', now, false);+ const members = Array.from({ length: 5 }, (_, index) => member(`m${index}`, now - 1_000 * MINUTE));+ [self, ...members].forEach((item) => pool.add(item));+ await pool.trim();+ await pool.beforeOpen(self);+ expect(await pool.releaseForRetry(self)).toBe(false);+ expect(members.every((item) => item.released === 0)).toBe(true);+ });++ it('only counts the idle threshold that is set when deciding', async () => {+ const { pool, setMinutes } = poolWith(30, now);+ pool.noteMaxRuns(1);+ const self = member('self', now, false);+ const a = member('a', now - 20 * MINUTE);+ [self, a].forEach((item) => pool.add(item));+ expect(await pool.releaseForRetry(self)).toBe(false);+ setMinutes(15);+ expect(await pool.releaseForRetry(self)).toBe(true);+ });++ it('checks the watermark periodically while connections are registered', async () => {+ vi.useFakeTimers();+ try {+ let clock = now;+ const pool = new RemoteConnectionPool({ idleMinutes: () => 10, now: () => clock, checkMs: MINUTE });+ pool.noteMaxRuns(5);+ const members = Array.from({ length: 4 }, (_, index) => member(`m${index}`, now - index * MINUTE));+ const leave = members.map((item) => pool.add(item));+ await vi.advanceTimersByTimeAsync(MINUTE);+ expect(members.every((item) => item.released === 0)).toBe(true);+ clock = now + 12 * MINUTE;+ await vi.advanceTimersByTimeAsync(MINUTE);+ expect(members.reduce((sum, item) => sum + item.released, 0)).toBe(1);+ expect(members[3].released).toBe(1);+ leave.forEach((fn) => fn());+ expect(vi.getTimerCount()).toBe(0);+ } finally {+ vi.useRealTimers();+ }+ });+});++// ─── 两端接线 ────────────────────────────────────────────────────++const RG = path.resolve(__dirname, '../../../../../ripgrep-bin', `${process.platform}-${process.arch}`, process.platform === 'win32' ? 'rg.exe' : 'rg');+const CONTROLLER = 'controller-device-1';++let root: string;+let project: string;+let hostRoot: string;++function queue() {+ const items: AgentEvent[] = [];+ let wake: (() => void) | null = null;+ let ended = false;+ return {+ push(event: AgentEvent) {+ items.push(event);+ wake?.();+ wake = null;+ },+ end() {+ ended = true;+ wake?.();+ wake = null;+ },+ async *[Symbol.asyncIterator]() {+ for (;;) {+ if (items.length) {+ yield items.shift()!;+ continue;+ }+ if (ended) return;+ await new Promise<void>((resolve) => {+ wake = resolve;+ });+ }+ },+ };+}++interface Scenario {+ /** 被控端启动过的 Agent(每次打开一个)。 */+ started: HostedStartInput[];+ /** 被控端 Agent 收到的方法调用。 */+ calls: Array<{ method: string; args: unknown[] }>;+ /** 被控端收到的 close op 次数。 */+ closes: number;+ /** 打开时接不回会话:先问控制端能不能清掉,再开新会话。 */+ failResume: 'callback' | 'silent' | null;+ /** 下一个 Agent 报告的后台任务 / 待唤醒数。 */+ backgroundTasks: BackgroundTaskSnapshot[];+ pendingWake: number;+ /** send 'hold' 时卡住,直到调用它。 */+ releaseHold: (() => void) | null;+}++let scenario: Scenario;+let nextNative = 0;++/** 假 Agent:会话 id 接回 resumeSessionId;按消息内容干活。 */+function fakeAgent(input: HostedStartInput): AgentSessionHandle {+ scenario.started.push(input);+ const events = queue();+ let running = false;+ const resume = input.options.resumeSessionId;+ let id = resume ?? `native-${(nextNative += 1)}`;+ let model = input.options.model;+ 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!);+ }+ const auth = { authorization: `Bearer ${input.tunnel.token}` };+ const tool = async (name: string, args: Record<string, unknown>) => {+ const response = await fetch(`${input.tunnel.url}/mcp/cindy_exec`, {+ method: 'POST',+ headers: { ...auth, 'content-type': 'application/json', accept: 'application/json, text/event-stream' },+ body: JSON.stringify({ jsonrpc: '2.0', id: 1, method: 'tools/call', params: { name, arguments: args } }),+ });+ const body = await response.json() as { result: { content: Array<{ text: string }> } };+ return body.result.content.map((item) => item.text).join('');+ };+ const record = (method: string, args: unknown[]) => scenario.calls.push({ method, args });+ const say = (text: string) => events.push({ type: 'text', data: { text, isFinal: true }, source: input.kind });+ return {+ get id() {+ return id;+ },+ agentKind: input.kind,+ get model() {+ return model;+ },+ async send(message) {+ record('send', [message]);+ const text = typeof message.content === 'string' ? message.content : '';+ running = true;+ if (text === 'hold') {+ await new Promise<void>((resolve) => {+ scenario.releaseHold = resolve;+ });+ } else if (text === 'bg') {+ say(await tool('Bash', { command: 'sleep 0.3; echo bg-finished', run_in_background: true }));+ } else if (text.startsWith('read ')) {+ say(await tool('BashOutput', { bash_id: text.slice(5) }));+ } else if (text === 'whoami') {+ say(`${id} ${model} ${effort ?? ''} plan:${planMode}`);+ } else {+ say(`ok:${text}`);+ }+ running = false;+ events.push({ type: 'done', data: {}, source: input.kind });+ },+ async steer() {},+ async abort() {+ record('abort', []);+ },+ async close() {+ events.end();+ },+ events: () => events,+ getUsageSnapshot: () => ({ tokenUsage: scenario.calls.length ? 7 : 0, contextTokens: scenario.calls.length ? 5 : 0, contextWindow: 100, costUsd: 0 }),+ setInteractionResolver() {},+ isTurnRunning: () => running,+ getPlanMode: () => planMode,+ getEffort: () => effort ?? null,+ listBackgroundTasks: () => backgroundTasks,+ countPendingWakeContinuations: () => pendingWake,+ async setPermissionMode(mode) {+ record('setPermissionMode', [mode]);+ },+ async setModel(next, opts) {+ record('setModel', [next, opts]);+ model = next;+ if (opts?.effort) effort = opts.effort;+ },+ async setEffort(next) {+ record('setEffort', [next]);+ effort = next;+ },+ async setPlanMode(enabled) {+ record('setPlanMode', [enabled]);+ planMode = enabled;+ },+ async setExtraDirs(dirs, libraryRoot) {+ record('setExtraDirs', [dirs, libraryRoot]);+ },+ async requiresModelSwitchRebuild() {+ record('requiresModelSwitchRebuild', []);+ return true;+ },+ async commitRewindFiles(userUuid, priorAssistantUuid) {+ record('commitRewindFiles', [userUuid, priorAssistantUuid]);+ return { ok: true } as never;+ },+ } as AgentSessionHandle;+}++let limits: RemoteAgentLimits;+let host: ReturnType<typeof createRemoteAgentHost>;+/** 改写 / 拦截被控端的回复(模拟旧版文案、暂存过多等)。 */+let intercept: ((request: Record<string, unknown>) => unknown) | null;+let opens: number;++function createHost() {+ return createRemoteAgentHost({+ readLimits: () => limits,+ isAgentAvailable: () => true,+ startHosted: async (input) => fakeAgent(input),+ isControllerAuthorized: () => true,+ captureOwner: () => 'owner',+ isOwnerCurrent: () => true,+ runsRoot: hostRoot,+ });+}++function deps(pool?: RemoteConnectionPool): StartRemoteAgentDeps {+ return {+ invoke: async (args) => {+ const request = JSON.parse(JSON.stringify(args[0])) as Record<string, unknown>;+ if (request.op === 'open') opens += 1;+ if (request.op === 'close') scenario.closes += 1;+ if (intercept) {+ const replaced = intercept(request);+ if (replaced !== undefined) return replaced;+ }+ const result = await host.handle(CONTROLLER, request);+ return JSON.parse(JSON.stringify(result ?? null));+ },+ rgPath: RG,+ prepareMcp: async () => ({ servers: new Map(), dispose() {} }),+ collectProjectFiles: async () => [],+ isGitRepo: async () => false,+ newId: randomUUID,+ ...(pool ? { pool } : {}),+ };+}++/** 极短的闲置阈值(分钟):测试里「闲置满」只要等几毫秒。 */+const TINY_MINUTES = 1 / 60_000;+let idleMinutes: number;++function newPool(): RemoteConnectionPool {+ return new RemoteConnectionPool({ idleMinutes: () => idleMinutes, checkMs: 3_600_000 });+}++const opened: AgentSessionHandle[] = [];++async function start(pool: RemoteConnectionPool | undefined, extra: Partial<StartSessionOptions> = {}): Promise<AgentSessionHandle> {+ const handle = await startRemoteAgentSession('claude-code', {+ sessionId: randomUUID(), workingDir: project, model: 'm1', ...extra,+ } as StartSessionOptions, deps(pool));+ opened.push(handle);+ return handle;+}++/** 收集一个句柄的事件;`until` 等到满足条件的事件。 */+function watch(handle: AgentSessionHandle) {+ const seen: AgentEvent[] = [];+ const waiters: Array<{ test: (event: AgentEvent) => boolean; resolve: (event: AgentEvent) => void }> = [];+ void (async () => {+ for await (const event of handle.events()) {+ seen.push(event);+ for (const waiter of [...waiters]) {+ if (waiter.test(event)) {+ waiters.splice(waiters.indexOf(waiter), 1);+ waiter.resolve(event);+ }+ }+ }+ })();+ return {+ seen,+ until: (test: (event: AgentEvent) => boolean) => new Promise<AgentEvent>((resolve) => {+ const found = seen.find(test);+ if (found) resolve(found);+ else waiters.push({ test, resolve });+ }),+ };+}++const textOf = (event: AgentEvent) => (event.data as { text?: string }).text ?? '';++/** 发一条消息,等它的回答。 */+async function ask(handle: AgentSessionHandle, watcher: ReturnType<typeof watch>, content: string): Promise<string> {+ const doneBefore = watcher.seen.filter((event) => event.type === 'done').length;+ await handle.send({ type: 'user', content });+ await watcher.until(() => watcher.seen.filter((event) => event.type === 'done').length > doneBefore);+ const texts = watcher.seen.filter((event) => event.type === 'text');+ return textOf(texts[texts.length - 1]);+}++const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));++beforeEach(() => {+ root = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-ra-pool-')));+ project = path.join(root, 'project');+ hostRoot = path.join(root, 'host');+ fs.mkdirSync(project);+ scenario = { started: [], calls: [], closes: 0, failResume: null, backgroundTasks: [], pendingWake: 0, releaseHold: null };+ limits = { perDevice: 1, total: 64 };+ intercept = null;+ opens = 0;+ idleMinutes = TINY_MINUTES;+ host = createHost();+});++afterEach(async () => {+ scenario.releaseHold?.();+ await Promise.allSettled(opened.splice(0).map((handle) => handle.close({ reason: 'navigation' })));+ await host.abortAll();+ host.dispose();+ fs.rmSync(root, { recursive: true, force: true });+});++describe('remote connection pool with a real host', () => {+ it('makes room when full, then reconnects the released task to the same conversation', async () => {+ const pool = newPool();+ const a = await start(pool);+ const aEvents = watch(a);+ expect(await ask(a, aEvents, 'hello')).toBe('ok:hello');+ const nativeA = a.id;+ await sleep(5);+ const b = await start(pool);+ // 对方只给 1 个名额:打开 b 之前先让出了 a。+ expect(host.limitUsage().total).toBe(1);+ expect(scenario.started).toHaveLength(2);+ expect(scenario.started[1].options.resumeSessionId).toBeUndefined();+ // a 的状态照常读,界面不变空。+ expect(a.id).toBe(nativeA);+ expect(a.getUsageSnapshot().tokenUsage).toBeGreaterThan(0);+ await sleep(5);+ expect(await ask(a, aEvents, 'whoami')).toBe(`${nativeA} m1 plan:false`);+ expect(scenario.started).toHaveLength(3);+ expect(scenario.started[2].options.resumeSessionId).toBe(nativeA);+ expect(host.limitUsage().total).toBe(1);+ // b 让出后照样能用。+ const bEvents = watch(b);+ await sleep(5);+ expect(await ask(b, bEvents, 'again')).toBe('ok:again');+ });++ it('keeps background commands on this computer across a release and reads them by the same id', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ const started = await ask(a, events, 'bg');+ const id = /with ID: (\S+?)\./.exec(started)?.[1];+ expect(id).toBeTruthy();+ // 本机执行器里的后台命令不算忙:a 照样有资格让出。+ await sleep(5);+ await start(pool);+ expect(scenario.started).toHaveLength(2);+ await sleep(400);+ const output = await ask(a, events, `read ${id}`);+ expect(output).toContain('bg-finished');+ expect(scenario.started[2].options.resumeSessionId).toBe(a.id);+ });++ it('records setting changes while released and opens with them, without reconnecting just for them', async () => {+ const pool = newPool();+ const extra = path.join(root, 'extra');+ fs.mkdirSync(extra);+ const a = await start(pool, { permissionMode: 'default' } as Partial<StartSessionOptions>);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ await start(pool);+ const before = scenario.calls.length;+ await a.setModel!('m2', { providerId: 'p2', effort: 'high' });+ await a.setPermissionMode!('acceptEdits');+ await a.setPlanMode!(true);+ await a.setExtraDirs!([extra]);+ await a.abort();+ expect(scenario.calls.slice(before)).toEqual([]);+ expect(scenario.started).toHaveLength(2);+ expect(a.model).toBe('m2');+ expect(a.getPlanMode?.()).toBe(true);+ expect(a.getEffort?.()).toBe('high');+ await sleep(5);+ expect(await ask(a, events, 'whoami')).toBe(`${a.id} m2 high plan:true`);+ const reopened = scenario.started[2];+ expect(reopened.options).toMatchObject({+ model: 'm2', providerId: 'p2', effort: 'high', permissionMode: 'acceptEdits', planMode: true,+ resumeSessionId: a.id,+ });+ expect(reopened.workspace.extraDirs).toEqual([extra]);+ });++ it('does not reapply one-shot rewind or fork options when reconnecting', async () => {+ const pool = newPool();+ const a = await start(pool, { vendorOptions: { source: 's', resumeSessionAt: 'msg-1', forkSession: true } } as Partial<StartSessionOptions>);+ const events = watch(a);+ await ask(a, events, 'hello');+ expect(scenario.started[0].options.vendorOptions).toEqual({ source: 's', resumeSessionAt: 'msg-1', forkSession: true });+ await sleep(5);+ await start(pool);+ await sleep(5);+ await ask(a, events, 'again');+ expect(scenario.started[2].options.vendorOptions).toEqual({ source: 's' });+ });++ it('tells the user when the conversation could not be resumed, via the invalid-resume callback', async () => {+ const pool = newPool();+ const invalidated: string[] = [];+ const a = await start(pool, { onInvalidResumeSession: async (expected: string) => { invalidated.push(expected); return true; } } as Partial<StartSessionOptions>);+ const events = watch(a);+ await ask(a, events, 'hello');+ const original = a.id;+ await sleep(5);+ await start(pool);+ scenario.failResume = 'callback';+ await sleep(5);+ await ask(a, events, 'again');+ expect(invalidated).toEqual([original]);+ const lost = events.seen.filter((event) => event.type === 'error');+ expect(lost).toHaveLength(1);+ expect(lost[0].data).toMatchObject({ isTerminal: false });+ expect(String((lost[0].data as { message: string }).message)).toContain('[REMOTE_AGENT_RESUME_LOST]');+ });++ it('tells the user when the other computer silently started a different conversation', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ await start(pool);+ scenario.failResume = 'silent';+ await sleep(5);+ await ask(a, events, 'again');+ const errors = events.seen.filter((event) => event.type === 'error');+ expect(errors.map((event) => (event.data as { message: string }).message)).toEqual([+ expect.stringContaining('[REMOTE_AGENT_RESUME_LOST]'),+ ]);+ });++ it('does not release a task while it is busy', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ // 回合进行中。+ const sending = a.send({ type: 'user', content: 'hold' });+ await vi.waitFor(() => expect(scenario.releaseHold).not.toBeNull());+ await sleep(5);+ await expect(start(pool)).rejects.toThrow('[DEVICE_LIMIT]');+ scenario.releaseHold?.();+ await sending;+ await events.until((event) => event.type === 'done');+ expect(scenario.started).toHaveLength(1);+ expect(scenario.closes).toBe(0);+ });++ it.each([+ ['background tasks', () => { scenario.backgroundTasks = [{ taskId: 't1', taskType: 'local_agent' }]; }],+ ['pending wake continuations', () => { scenario.pendingWake = 1; }],+ ])('treats %s on the other computer as busy', async (_label, arrange) => {+ arrange();+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ await expect(start(pool)).rejects.toThrow('[DEVICE_LIMIT]');+ expect(a.id).toBeTruthy();+ });++ it('with a single slot and nothing eligible reports the rejection without retrying', async () => {+ idleMinutes = 30;+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ opens = 0;+ await expect(start(pool)).rejects.toThrow('[REMOTE_AGENT_BUSY] [DEVICE_LIMIT]');+ expect(opens).toBe(1);+ });++ it('with 0 minutes never releases and does not retry', async () => {+ idleMinutes = 0;+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ opens = 0;+ await expect(start(pool)).rejects.toThrow('[DEVICE_LIMIT]');+ expect(opens).toBe(1);+ expect(scenario.closes).toBe(0);+ });++ it.each([+ ['new', '[REMOTE_AGENT_BUSY] [DEVICE_LIMIT] remote task limit for this device reached'],+ ['old', '[REMOTE_AGENT_BUSY] too many tasks are running from this computer'],+ ])('after a capacity rejection (%s host wording) releases one and retries once', async (_label, message) => {+ limits = { perDevice: 16, total: 64 };+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ // 本机计数没到上限(对方刚调小了上限等):对方拒绝第一次打开。+ let rejected = 0;+ intercept = (request) => {+ if (request.op === 'open' && rejected === 0) {+ rejected += 1;+ throw new Error(message);+ }+ return undefined;+ };+ opens = 0;+ await start(pool);+ expect(opens).toBe(2);+ expect(scenario.closes).toBe(1);+ expect(host.limitUsage().total).toBe(1);+ });++ it('retries a capacity rejection only once', async () => {+ limits = { perDevice: 16, total: 64 };+ const pool = newPool();+ for (const content of ['a', 'b']) {+ const handle = await start(pool);+ await ask(handle, watch(handle), content);+ }+ await sleep(5);+ intercept = (request) => {+ if (request.op === 'open') throw new Error('[REMOTE_AGENT_BUSY] [TOTAL_LIMIT] remote task limit for the provider computer reached');+ return undefined;+ };+ opens = 0;+ await expect(start(pool)).rejects.toThrow('[TOTAL_LIMIT]');+ expect(opens).toBe(2);+ expect(scenario.closes).toBe(1);+ });++ it('does not release for staged-data pressure', async () => {+ limits = { perDevice: 16, total: 64 };+ const pool = newPool();+ const a = await start(pool);+ await ask(a, watch(a), 'hello');+ await sleep(5);+ intercept = (request) => {+ if (request.op === 'open') throw new Error('[REMOTE_AGENT_BUSY] too much staged data');+ return undefined;+ };+ opens = 0;+ await expect(start(pool)).rejects.toThrow('too much staged data');+ expect(opens).toBe(1);+ expect(scenario.closes).toBe(0);+ });++ it('a send during a release waits for it and reconnects once; two sends open one connection', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ // 让 close 慢一点,在让出进行中发消息。+ let closeGate: (() => void) | null = null;+ intercept = (request) => {+ if (request.op !== 'close' || closeGate) return undefined;+ return new Promise((resolve) => {+ closeGate = () => resolve(host.handle(CONTROLLER, request).then((value) => value ?? null));+ });+ };+ const releasing = pool.releaseForRetry(member('other', 0, false));+ await vi.waitFor(() => expect(closeGate).not.toBeNull());+ const first = a.send({ type: 'user', content: 'one' });+ const second = a.send({ type: 'user', content: 'two' });+ await sleep(5);+ expect(scenario.started).toHaveLength(1);+ closeGate!();+ expect(await releasing).toBe(true);+ await Promise.all([first, second]);+ await events.until(() => events.seen.filter((event) => event.type === 'done').length >= 3);+ expect(scenario.started).toHaveLength(2);+ expect(scenario.started[1].options.resumeSessionId).toBe(a.id);+ expect(scenario.calls.filter((call) => call.method === 'send')).toHaveLength(3);+ });++ it('gives up a release once a send has started', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await sleep(5);+ // 发送一开始(还没到对方)就不能再让。+ const sending = a.send({ type: 'user', content: 'hold' });+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(false);+ await vi.waitFor(() => expect(scenario.releaseHold).not.toBeNull());+ expect(await pool.releaseForRetry(member('other', 0, false))).toBe(false);+ scenario.releaseHold?.();+ await sending;+ await events.until((event) => event.type === 'done' && events.seen.filter((item) => item.type === 'done').length >= 2);+ expect(scenario.closes).toBe(0);+ });++ it.each(['navigation', 'account-boundary'] as const)('closing a released task (%s) does not contact the other computer', async (reason) => {+ const pool = newPool();+ const a = await start(pool);+ await ask(a, watch(a), 'hello');+ await sleep(5);+ await start(pool);+ const closes = scenario.closes;+ await expect(a.close({ reason })).resolves.toBeUndefined();+ await expect(a.close({ reason })).resolves.toBeUndefined();+ expect(scenario.closes).toBe(closes);+ expect(pool.size).toBe(1);+ });++ it('detaching a released task on app quit does not contact the other computer', async () => {+ const pool = newPool();+ const a = await start(pool);+ await ask(a, watch(a), 'hello');+ await sleep(5);+ await start(pool);+ const closes = scenario.closes;+ await expect(a.detach!({ reason: 'app-quit' })).resolves.toBeUndefined();+ expect(scenario.closes).toBe(closes);+ });++ it('closing during a release waits for it and stays quiet', async () => {+ const pool = newPool();+ const a = await start(pool);+ await ask(a, watch(a), 'hello');+ await sleep(5);+ let closeGate: (() => void) | null = null;+ intercept = (request) => {+ if (request.op !== 'close' || closeGate) return undefined;+ return new Promise((resolve) => {+ closeGate = () => resolve(host.handle(CONTROLLER, request).then((value) => value ?? null));+ });+ };+ const opening = start(pool);+ await vi.waitFor(() => expect(closeGate).not.toBeNull());+ const closing = a.close({ reason: 'navigation' });+ closeGate!();+ await expect(closing).resolves.toBeUndefined();+ await opening;+ expect(scenario.closes).toBe(1);+ });++ it('keeps a task with a pending rewind until its next turn finishes', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await a.commitRewindFiles!('', 'assistant-1');+ await sleep(5);+ await expect(start(pool)).rejects.toThrow('[DEVICE_LIMIT]');+ await ask(a, events, 'after rewind');+ await sleep(5);+ await start(pool);+ expect(scenario.closes).toBe(1);+ });++ it('carries rewind and fork options when released before the first turn ran', async () => {+ const pool = newPool();+ const vendorOptions = { resumeSessionAt: 'msg-1', forkSession: true };+ const a = await start(pool, { resumeSessionId: 'native-old', vendorOptions } as Partial<StartSessionOptions>);+ await sleep(5);+ await start(pool);+ const events = watch(a);+ await sleep(5);+ await ask(a, events, 'first');+ expect(scenario.started[2].options).toMatchObject({ resumeSessionId: 'native-old', vendorOptions });+ });++ it('closes the other computer\'s process when the task is closed while reconnecting', async () => {+ const pool = newPool();+ const a = await start(pool);+ await ask(a, watch(a), 'hello');+ await sleep(5);+ await start(pool);+ await sleep(5);+ // 连回的 open 在路上时关掉任务。+ let openGate: (() => void) | null = null;+ intercept = (request) => {+ if (request.op !== 'open' || openGate) return undefined;+ return new Promise((resolve) => {+ openGate = () => resolve(host.handle(CONTROLLER, request).then((value) => value ?? null));+ });+ };+ const sending = a.send({ type: 'user', content: 'late' });+ await vi.waitFor(() => expect(openGate).not.toBeNull());+ const closing = a.close({ reason: 'navigation' });+ openGate!();+ await closing;+ await expect(sending).rejects.toThrow();+ // b 为 a 让了位;a 连回途中被关掉,对方不能留下 a 的进程。+ await vi.waitFor(() => expect(host.limitUsage().total).toBe(0));+ expect(pool.size).toBe(1);+ });++ it('does not grant a cleared library folder again after reconnecting', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await a.setExtraDirs!([], path.join(root, 'library'));+ await a.setExtraDirs!([]);+ await sleep(5);+ await start(pool);+ await sleep(5);+ const before = scenario.calls.length;+ await ask(a, events, 'again');+ expect(scenario.calls.slice(before).map((call) => call.method)).toEqual(['send']);+ });++ it('answers that a model switch needs no extra rebuild while released, without reconnecting', async () => {+ const pool = newPool();+ const a = await start(pool);+ await ask(a, watch(a), 'hello');+ expect(await a.requiresModelSwitchRebuild!('m2')).toBe(true);+ await sleep(5);+ await start(pool);+ expect(await a.requiresModelSwitchRebuild!('m2')).toBe(false);+ expect(scenario.started).toHaveLength(2);+ });++ it('keeps the last usage reading after reconnecting until the new process reports its own', async () => {+ const pool = newPool();+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ const usage = a.getUsageSnapshot();+ expect(usage.tokenUsage).toBe(7);+ await sleep(5);+ await start(pool);+ expect(a.getUsageSnapshot()).toEqual(usage);+ });+});diff --git a/apps/desktop/src/main/remote-agent/__tests__/execServerRelayBusy.e2e.test.ts b/apps/desktop/src/main/remote-agent/__tests__/execServerRelayBusy.e2e.test.tsnew file mode 100644index 0000000000..db6d13e1bb--- /dev/null+++ b/apps/desktop/src/main/remote-agent/__tests__/execServerRelayBusy.e2e.test.ts@@ -0,0 +1,78 @@+/**+ * Codex 的后台终端在本机 exec-server 里:还有进程在跑时中继算忙,连接池不能让出名额+ * (对方 Codex 一退出,本机 exec-server 随连接关闭,后台终端就没了)。用固定版本的真实 exec-server。+ */+import fs from 'node:fs';+import os from 'node:os';+import path from 'node:path';+import { pathToFileURL } from 'node:url';+import { describe, expect, it } from 'vitest';++import { ExecServerRelay } from '../controller/execServerRelay';+import { ExecutorWorkspace } from '../executor/workspace';++const REPO = path.resolve(__dirname, '../../../../../..');+const CODEX = path.join(REPO, 'apps', 'codex-package-bin', process.platform + '-' + process.arch, 'bin', process.platform === 'win32' ? 'codex.exe' : 'codex');++describe.skipIf(!fs.existsSync(CODEX) || process.platform === 'win32')('exec-server relay busy tracking', () => {+ it('is busy while a started process runs, idle after it closes, and reset drops the exec-server', async () => {+ const root = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-exec-busy-')));+ const workspace = new ExecutorWorkspace({ workingDir: root });+ const messages: Array<{ id?: number; method?: string; params?: { processId?: string }; error?: unknown }> = [];+ let parts = '';+ const relay = new ExecServerRelay({+ codexPath: CODEX,+ cwd: root,+ workspace,+ authorize: (action) => (action.kind === 'exec' && action.command.includes('denied') ? { ok: false, reason: 'no' } : { ok: true }),+ push: async (frames) => {+ for (const frame of frames) {+ if (frame.kind !== 'message') continue;+ parts += frame.data;+ if (!frame.more) { messages.push(JSON.parse(parts)); parts = ''; }+ }+ },+ });+ const send = (message: unknown) => relay.handle({ t: 'ws', connId: 'c1', kind: 'message', data: JSON.stringify(message) });+ const start = (id: number, processId: string, script: string) => send({ id, method: 'process/start', params: {+ processId, argv: ['/bin/sh', '-c', script], cwd: pathToFileURL(root).href, env: {}, tty: false,+ } });+ try {+ relay.handle({ t: 'ws', connId: 'c1', kind: 'open', path: '/ws/exec-server' });+ expect(relay.busy()).toBe(false);+ send({ id: 1, method: 'initialize', params: { clientName: 'cindy-test', clientVersion: '1' } });+ await expect.poll(() => messages.find((item) => item.id === 1), { timeout: 5000 }).toBeDefined();+ send({ method: 'initialized', params: {} });+ await new Promise((resolve) => setTimeout(resolve, 100));+ expect(relay.busy()).toBe(false);++ // 闸门拒绝的启动不会留下进程。+ 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);++ // 短命令跑完就不忙。+ 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);++ // 还在跑的(如 Codex 的后台终端)算忙。+ start(4, 'long', 'sleep 30');+ await expect.poll(() => messages.some((item) => item.id === 4), { timeout: 5000 }).toBe(true);+ expect(relay.busy()).toBe(true);+ 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);++ // 让出名额后关掉 exec-server,中继本身还能接新的连接。+ relay.reset();+ expect(relay.busy()).toBe(false);+ relay.handle({ t: 'ws', connId: 'c2', kind: 'open', path: '/ws/exec-server' });+ relay.handle({ t: 'ws', connId: 'c2', kind: 'message', data: JSON.stringify({ id: 9, method: 'initialize', params: { clientName: 'cindy-test', clientVersion: '1' } }) });+ await expect.poll(() => messages.find((item) => item.id === 9), { timeout: 5000 }).toBeDefined();+ } finally {+ relay.close();+ fs.rmSync(root, { recursive: true, force: true });+ }+ }, 30_000);+});diff --git a/apps/desktop/src/main/remote-agent/__tests__/idleReleaseStore.test.ts b/apps/desktop/src/main/remote-agent/__tests__/idleReleaseStore.test.tsnew file mode 100644index 0000000000..706fb1be94--- /dev/null+++ b/apps/desktop/src/main/remote-agent/__tests__/idleReleaseStore.test.ts@@ -0,0 +1,47 @@+import fs from 'node:fs/promises';+import os from 'node:os';+import path from 'node:path';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++const state = vi.hoisted(() => ({ root: '', owner: 'a', pending: false }));+vi.mock('../../appSessionState.js', () => ({+ activeOwnerScopeKey: () => state.owner,+ ownerScopedUserDataPath: (name: string) => state.root + '/' + state.owner + '/' + name,+ isAppSessionBoundaryPending: () => state.pending,+}));+vi.mock('../../logger.js', () => ({ createLogger: () => ({ info() {}, warn() {}, error() {} }) }));+import { readRemoteAgentIdleReleaseMinutes, readRemoteAgentIdleReleaseState, saveRemoteAgentIdleRelease } from '../controller/idleReleaseStore';++beforeEach(async () => {+ state.root = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-idle-release-store-'));+ state.owner = 'a'; state.pending = false;+});+afterEach(async () => { await fs.rm(state.root, { recursive: true, force: true }); });++describe('idle release setting', () => {+ it('defaults to 10 minutes, keeps explicit choices per account and resets by deleting the override', async () => {+ expect(readRemoteAgentIdleReleaseState()).toEqual({ value: { idleMinutes: 10 }, defaults: { idleMinutes: 10 }, isCustomized: false });+ await saveRemoteAgentIdleRelease({ idleMinutes: 0 });+ expect(readRemoteAgentIdleReleaseMinutes()).toBe(0);+ expect(JSON.parse(await fs.readFile(path.join(state.root, 'a', 'remote-agent-idle-release.json'), 'utf8'))).toEqual({ idleMinutes: 0 });+ await saveRemoteAgentIdleRelease({ idleMinutes: 10 });+ expect(readRemoteAgentIdleReleaseState().isCustomized).toBe(true);+ state.owner = 'b';+ expect(readRemoteAgentIdleReleaseState().isCustomized).toBe(false);+ state.owner = 'a';+ await saveRemoteAgentIdleRelease(null);+ expect(readRemoteAgentIdleReleaseState()).toMatchObject({ value: { idleMinutes: 10 }, isCustomized: false });+ });++ it('rejects invalid values and refuses saves during an account change', async () => {+ await expect(saveRemoteAgentIdleRelease({ idleMinutes: 121 })).rejects.toThrow('INVALID_PARAMS');+ state.pending = true;+ await expect(saveRemoteAgentIdleRelease({ idleMinutes: 5 })).rejects.toThrow('PRECONDITION_FAILED');+ });++ it('treats a hand-edited invalid file as the default', async () => {+ await fs.mkdir(path.join(state.root, 'a'), { recursive: true });+ await fs.writeFile(path.join(state.root, 'a', 'remote-agent-idle-release.json'), JSON.stringify({ idleMinutes: 999 }));+ expect(readRemoteAgentIdleReleaseMinutes()).toBe(10);+ });+});diff --git a/apps/desktop/src/main/remote-agent/controller/connectionPool.ts b/apps/desktop/src/main/remote-agent/controller/connectionPool.tsnew file mode 100644index 0000000000..17842169fd--- /dev/null+++ b/apps/desktop/src/main/remote-agent/controller/connectionPool.ts@@ -0,0 +1,171 @@+/**+ * 远程模型连接池(控制端,这台电脑对每台运行 Agent 的电脑一个)。+ *+ * 对方电脑按「发起设备」限制同时开着的远程任务数(`caps.maxRuns`),开着的 Agent 进程才占名额,+ * 对话记录不占。本机任务闲着时 Agent 进程仍开着,名额紧张时就由这里让出:只断开那台电脑上的 Agent+ * (`close`),对话记录与本机部分(执行器、本机 Cindy 工具、Codex 执行环境)都留着,下次要它干活时+ * 带原来的会话 id 连回来。+ *+ * 只在名额紧张时让:+ * - 本机在这台电脑上开着的连接数到了水位线(maxRuns 的 80%,向上取整):按最久没活动的顺序让,直到降到+ * 水位线以下。上限很小(1~4)时水位线就等于上限,「快满」等同「已满」,不提前让,只走下面两条按需的;+ * - 打开前已满:先让一个再打开;+ * - 对方以名额已满拒绝打开:让一个再重试一次。+ * 只有「不忙」且闲置满设置时长的连接才有资格让;没有就不动,由对方的上限做最终裁决。设置为 0 时+ * 一个都不让(与没有连接池时一样,满了直接报错)。+ * 不排队等名额。对方整机合计上限(TOTAL_LIMIT)本机看不到别的设备的占用,只能靠被拒后处理。+ */+export const REMOTE_AGENT_POOL_WATERMARK_RATIO = 0.8;+/** 在水位线之上的连接会随时间变得有资格,定期再看一次。 */+export const REMOTE_AGENT_POOL_CHECK_MS = 60_000;++export interface PooledRemoteConnection {+ /** 占着对方的名额(正在连、连着或正在断开)。 */+ occupiesSlot(): boolean;+ /** 不忙:没有在跑的回合、没有未完成的请求,对方进程里也没有后台工作。 */+ isIdle(): boolean;+ /** 最后一次活动的时间(毫秒)。 */+ lastActivityAt(): number;+ /** 断开对方电脑上的 Agent(仍然不忙时才断);返回是否让出了名额。 */+ release(): Promise<boolean>;+}++/**+ * 对方以名额已满拒绝打开(`REMOTE_AGENT_BUSY` 的单设备 / 整机上限;旧版对方只有一句+ * `too many tasks are running from this computer`)。暂存数据过多(`too much staged data`)也是+ * `REMOTE_AGENT_BUSY`,但与名额无关,不算。+ */+export function isRemoteRunLimitError(error: unknown): boolean {+ const message = error instanceof Error ? error.message : typeof error === 'string' ? error : '';+ if (!message.includes('REMOTE_AGENT_BUSY')) return false;+ return /\[(?:DEVICE|TOTAL)_LIMIT\]/.test(message) || message.includes('too many tasks are running from this computer');+}++export interface RemoteConnectionPoolOptions {+ /** 闲置满多少分钟才有资格让出名额;0 = 不让。每次判断时读取。 */+ idleMinutes(): number;+ now?: () => number;+ checkMs?: 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>();+ private maxRuns: number | null = null;+ private timer: ReturnType<typeof setInterval> | null = null;+ /** 让出名额一次只做一个,避免几条路径同时挑中不同的连接、多让。 */+ private chain: Promise<unknown> = Promise.resolve();+ private readonly now: () => number;++ constructor(private readonly options: RemoteConnectionPoolOptions) {+ this.now = options.now ?? Date.now;+ }++ /** 登记一个连接;返回注销函数。 */+ add(member: PooledRemoteConnection): () => void {+ this.members.add(member);+ if (!this.timer) {+ this.timer = setInterval(() => void this.trim(), this.options.checkMs ?? REMOTE_AGENT_POOL_CHECK_MS);+ (this.timer as { unref?: () => void }).unref?.();+ }+ return () => {+ this.members.delete(member);+ if (this.members.size === 0 && this.timer) {+ clearInterval(this.timer);+ this.timer = null;+ }+ };+ }++ /** 对方最近一次报的单设备上限(每次打开前 caps 拿到)。 */+ noteMaxRuns(maxRuns: number): void {+ if (Number.isInteger(maxRuns) && maxRuns >= 1) this.maxRuns = maxRuns;+ }++ get size(): number {+ return this.members.size;+ }++ /** 本机在这台电脑上占着的名额数。 */+ occupied(except?: PooledRemoteConnection): number {+ let count = 0;+ for (const member of this.members) if (member !== except && member.occupiesSlot()) count += 1;+ return count;+ }++ /** 提前让出名额的水位线;上限太小(水位线不低于上限)时没有。 */+ watermark(): number | null {+ if (this.maxRuns === null) return null;+ const watermark = Math.ceil(this.maxRuns * REMOTE_AGENT_POOL_WATERMARK_RATIO);+ return watermark < this.maxRuns ? watermark : null;+ }++ /** 有资格让出名额:不忙,且闲置满设置时长(0 = 都没有资格)。 */+ private isEligible(member: PooledRemoteConnection): boolean {+ const minutes = this.options.idleMinutes();+ if (!Number.isFinite(minutes) || minutes <= 0) return false;+ return member.occupiesSlot() && member.isIdle() && this.now() - member.lastActivityAt() >= minutes * 60_000;+ }++ /** 有资格让出名额的连接,最久没活动的在前。 */+ eligible(except?: PooledRemoteConnection): PooledRemoteConnection[] {+ return [...this.members]+ .filter((member) => member !== except && this.isEligible(member))+ .sort((a, b) => a.lastActivityAt() - b.lastActivityAt());+ }++ private serial<T>(task: () => Promise<T>): Promise<T> {+ const next = this.chain.then(task, task);+ this.chain = next.catch(() => undefined);+ return next;+ }++ /** 按顺序试着让一个(候选在等待期间可能变忙,release 会放弃)。 */+ private async releaseNext(except?: PooledRemoteConnection): Promise<boolean> {+ for (const member of this.eligible(except)) {+ // 前一个候选让的时候这个可能刚有了活动。+ if (!this.isEligible(member)) continue;+ try {+ if (await member.release()) return true;+ } catch (error) {+ this.options.log?.warn('remote agent pool: release failed', { error: String(error) });+ }+ }+ return false;+ }++ /** 到水位线就按最久没活动让,直到降到水位线以下或没有有资格的。 */+ trim(): Promise<void> {+ return this.serial(async () => {+ for (;;) {+ const watermark = this.watermark();+ if (watermark === null || this.occupied() < watermark) return;+ if (!await this.releaseNext()) return;+ this.options.log?.info('remote agent pool: released an idle connection', { occupied: this.occupied(), maxRuns: this.maxRuns });+ }+ });+ }++ /**+ * 打开前(`self` 是正要打开的那个,已登记为占名额):已满就先同步让一个;再在后台按水位线整理。+ * 没有有资格的也照常打开,对方才是最终裁判(本机计数可能不准:多实例、对方刚改了上限)。+ */+ async beforeOpen(self: PooledRemoteConnection): Promise<void> {+ await this.serial(async () => {+ 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 });+ }+ });+ void this.trim();+ }++ /** 对方以名额已满拒绝了打开:让一个,让出了就由调用方重试一次。 */+ releaseForRetry(self: PooledRemoteConnection): Promise<boolean> {+ return this.serial(async () => {+ const released = await this.releaseNext(self);+ this.options.log?.info('remote agent pool: open rejected for capacity', { released, maxRuns: this.maxRuns });+ return released;+ });+ }+}diff --git a/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts b/apps/desktop/src/main/remote-agent/controller/execServerRelay.tsindex 6991ccad9e..f8f99aab16 100644--- a/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts+++ b/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts@@ -68,6 +68,13 @@ interface Connection {closed: boolean;/** 有消息在等本机确认时,后面的消息按顺序排在它后面。 */queue?: Promise<void>;+ /**+ * 还在运行的进程(`process/start` 起的,收到 `process/closed` / `process/exited` 或启动失败前都算)。+ * Codex 的后台终端就是这些:编号在对方的 Codex 里,进程在这里,连接一断就没了。+ */+ processes: Set<string>;+ /** 启动请求 id → 进程编号(启动失败时据此移除)。 */+ starting: Map<string, string>;}/** `["/bin/zsh","-lc","cmd"]` → `cmd`;其它形态按空格拼接。 */@@ -346,6 +353,27 @@ export class ExecServerRelay {}}+ /**+ * 还有放不下的工作:有进程在跑(含 Codex 的后台终端)、有消息在等本机确认,或还有帧没推完。+ * 这时断开对方的 Agent 会丢掉它们,连接池不让出名额。+ */+ busy(): boolean {+ if (this.outbox.length || this.flushing) return true;+ for (const connection of this.connections.values()) {+ if (connection.processes.size || connection.starting.size || connection.queue) return true;+ }+ return false;+ }++ /**+ * 对方的 Agent 已断开(连接池让出名额):关掉本机为它起的 exec-server,中继本身留给连回来的 Agent。+ */+ reset(): void {+ if (this.closed) return;+ this.outbox = [];+ for (const connId of [...this.connections.keys()]) this.dropConnection(connId, false);+ }+close(): void {if (this.closed) return;this.closed = true;@@ -372,7 +400,7 @@ export class ExecServerRelay {this.send({ connId, kind: 'close' });return;}- const connection: Connection = { child, buffer: '', closed: false };+ const connection: Connection = { child, buffer: '', closed: false, processes: new Set(), starting: new Map() };this.connections.set(connId, connection);child.stdout.setEncoding('utf8');child.stdout.on('data', (chunk: string) => {@@ -382,7 +410,10 @@ export class ExecServerRelay {if (index < 0) break;const line = connection.buffer.slice(0, index);connection.buffer = connection.buffer.slice(index + 1);- if (line.trim()) this.sendMessage(connId, this.projectOutbound(line));+ if (line.trim()) {+ this.trackOutbound(connection, line);+ this.sendMessage(connId, this.projectOutbound(line));+ }}if (connection.buffer.length > MAX_LINE_CHARS) {this.deps.log?.warn('remote agent: exec-server line too long; closing', { connId });@@ -411,6 +442,10 @@ export class ExecServerRelay {message.params = mapExecServerParams(message.params, this.deps.workspace, message.method, false);data = JSON.stringify(message);actions = execServerActions(message.method, message.params, this.deps.cwd);+ if (message.method === 'process/start') {+ const processId = (message.params as { processId?: unknown } | undefined)?.processId;+ if (typeof processId === 'string') connection.starting.set(JSON.stringify(message.id), processId);+ }}const id = message?.id;// 延迟到所有 action 获准之后,不能为了内容保真提前读取被拒绝的目标。@@ -462,8 +497,36 @@ export class ExecServerRelay {if (!connection.closed) connection.child.stdin.write(line());}+ /** 记下 exec-server 报的进程起止(只看编号,不改消息)。 */+ private trackOutbound(connection: Connection, line: string): void {+ // 大段文件内容不必再解析一遍:进程通知带方法名,启动回包很短。+ if (!line.includes('"process/') && !(connection.starting.size && line.length < 64 * 1024)) return;+ let message: { id?: unknown; method?: unknown; params?: { processId?: unknown }; result?: unknown; error?: unknown };+ try {+ message = JSON.parse(line) as typeof message;+ } catch {+ return;+ }+ if (!message || typeof message !== 'object') return;+ if (message.id !== undefined && message.method === undefined) {+ const key = JSON.stringify(message.id);+ const processId = connection.starting.get(key);+ if (processId === undefined) return;+ connection.starting.delete(key);+ if (message.error === undefined) connection.processes.add(processId);+ return;+ }+ if ((message.method === 'process/closed' || message.method === 'process/exited') && typeof message.params?.processId === 'string') {+ const processId = message.params.processId;+ connection.processes.delete(processId);+ for (const [key, starting] of connection.starting) if (starting === processId) connection.starting.delete(key);+ }+ }+private reject(connId: string, id: unknown, decision: ExecutorGateDecision): void {this.counts.rejected += 1;+ // 被闸门拦下的启动没有到 exec-server,不会有进程。+ this.connections.get(connId)?.starting.delete(JSON.stringify(id));this.sendMessage(connId, JSON.stringify({id,error: { code: -32001, message: this.deps.workspace.mapTextForAgent(decision.reason ?? 'Not allowed in this workspace.') },diff --git a/apps/desktop/src/main/remote-agent/controller/idleReleaseStore.ts b/apps/desktop/src/main/remote-agent/controller/idleReleaseStore.tsnew file mode 100644index 0000000000..2d4df0d7a9--- /dev/null+++ b/apps/desktop/src/main/remote-agent/controller/idleReleaseStore.ts@@ -0,0 +1,51 @@+import { activeOwnerScopeKey, ownerScopedUserDataPath } from '../../appSessionState.js';+import { createLogger } from '../../logger.js';+import { createOverrideSettingsFile } from '../../maker-host/override-settings-file.js';+import { captureProviderManagementScope } from '../../provider-group/managementScope.js';+import { throwIpcError } from '../../utils/ipcValidate.js';+import {+ DEFAULT_REMOTE_AGENT_IDLE_RELEASE,+ isRemoteAgentIdleRelease,+ type RemoteAgentIdleRelease,+ type RemoteAgentIdleReleaseView,+} from '../../../shared/remoteAgentIdleRelease.js';++const log = createLogger('remote-agent:idle-release');++/** 按账号存在这台电脑上,只记用户改过的值;没改过的随版本跟默认值。 */+const store = createOverrideSettingsFile<RemoteAgentIdleRelease>({+ filePath: () => ownerScopedUserDataPath('remote-agent-idle-release.json'),+ scopeKey: () => activeOwnerScopeKey(),+ defaults: DEFAULT_REMOTE_AGENT_IDLE_RELEASE,+ normalize: raw => isRemoteAgentIdleRelease(raw) ? { idleMinutes: raw.idleMinutes } : { ...DEFAULT_REMOTE_AGENT_IDLE_RELEASE },+ log,+ label: 'remote-agent-idle-release',+ preserveUnreadableFile: true,+});++export function readRemoteAgentIdleReleaseState(): RemoteAgentIdleReleaseView {+ store.invalidateIfChanged();+ const { value, defaults, isCustomized } = store.readState();+ return { value, defaults, isCustomized };+}++/** 连接池每次判断时读:读不到(切换账号途中等)按不让出名额处理。 */+export function readRemoteAgentIdleReleaseMinutes(): number {+ try {+ return readRemoteAgentIdleReleaseState().value.idleMinutes;+ } catch (error) {+ log.warn('idle release setting unavailable; not releasing', { error: String(error) });+ return 0;+ }+}++export async function saveRemoteAgentIdleRelease(value: RemoteAgentIdleRelease | null): Promise<void> {+ const assertCurrent = captureProviderManagementScope();+ if (value === null) await store.resetAtomic();+ else {+ if (!isRemoteAgentIdleRelease(value)) throwIpcError('INVALID_PARAMS', 'Invalid idle release minutes');+ // 显式保存默认值也是用户选择;恢复默认才删除 overrides。+ await store.writePatchAtomic({ idleMinutes: value.idleMinutes }, { preserveDefaults: true });+ }+ assertCurrent();+}diff --git a/apps/desktop/src/main/remote-agent/controller/proxyHandle.ts b/apps/desktop/src/main/remote-agent/controller/proxyHandle.tsindex 2eaf6cd2fe..f4d0912c85 100644--- a/apps/desktop/src/main/remote-agent/controller/proxyHandle.ts+++ b/apps/desktop/src/main/remote-agent/controller/proxyHandle.ts@@ -5,10 +5,13 @@* 交给对方电脑上真正运行的 Agent;同步读取的状态(用量、是否在跑、计划模式等)读本地镜像,* 镜像由对方事件流里的状态行更新;权限确认、问题与计划审阅由本机的交互回调回答。* 本机用户在确认卡上允许的文件 / 命令操作同时登记到执行器的权限上限里。+ *+ * 连接池让出名额后(controller/connectionPool.ts)句柄照常是活的:缓存的状态照常读;要对方 Agent 干活的+ * 调用先连回同一个会话;只改设置的调用(换模型、权限档、计划模式、目录等)只记在本机,连回来时带上。*/import fsp from 'node:fs/promises';-import type { RemoteAgentMethod, RemoteAgentReply, RemoteAgentReverseRequest } from '@cindy/device-link';+import type { RemoteAgentMethod, RemoteAgentReply, RemoteAgentReverseRequest, RemoteAgentTeardownReason } from '@cindy/device-link';import type {AgentEvent,AgentKind,@@ -173,8 +176,34 @@ export function approvalActionsFor(return actions;}+/**+ * 句柄与对方电脑之间的连接。连接池让出名额后 `live()` 为 null,`ensure()` 连回同一个会话。+ */+export interface RemoteAgentLink {+ /** 连着的连接;正在连回时等它连上;已让出名额(或正在让)时为 null。 */+ live(): Promise<RemoteAgentRunClient | null>;+ /** 要对方 Agent 干活:已让出名额就连回来。 */+ ensure(): Promise<RemoteAgentRunClient>;+ /** 一次要对方参与的调用开始(期间不让出名额);返回结束回调。 */+ begin(): () => void;+ /** 结束对方的 Agent;已让出名额时什么也不做。 */+ close(mode: 'close' | 'detach', reason: RemoteAgentTeardownReason): Promise<void>;+}++/** 固定的一条连接(不进连接池)。 */+export function fixedRemoteAgentLink(client: RemoteAgentRunClient): RemoteAgentLink {+ return {+ live: async () => client,+ ensure: async () => client,+ begin: () => () => undefined,+ close: (mode, reason) => client.close(mode, reason),+ };+}+export interface RemoteHandleDeps {- client: RemoteAgentRunClient;+ /** 缺省时用 `client` 作为固定连接。 */+ link?: RemoteAgentLink;+ client?: RemoteAgentRunClient;started: RemoteStartedInfo;workspace: ExecutorWorkspace;recordApproval(action: ExecutorAction): void;@@ -189,11 +218,18 @@ export interface RemoteHandleDeps {/** 权限档 / 附加目录等变化时同步给执行器。 */onPermissionMode?: (mode: string) => void;onPlanMode?: (enabled: boolean) => void;- onExtraDirs?: (dirs: string[]) => void;+ onExtraDirs?: (dirs: string[], libraryRoot?: string | null) => void;/** 可写目录变化时同步给执行器(在对方确认成功后调用,保持两边一致)。 */onWritableDirs?: (dirs: string[]) => void;/** 本机 MCP 身份引用的 vendorOptions 同步更新。 */onVendorOptions?: (patch: Record<string, unknown>) => void;+ /** 模型 / 推理强度 / 快速模式 / 思考开关变化(连回对方时按最新值打开)。 */+ onModel?: (model: string, opts?: { providerId?: string | null; effort?: Effort }) => void;+ onEffort?: (effort: Effort) => void;+ onFastMode?: (enabled: boolean) => void;+ onThinkingEnabled?: (enabled: boolean) => void;+ /** 改用 Cindy 自动审查兜底(对方进程里的状态,连回来时要再告诉一次)。 */+ onAutoReviewFallback?: () => void;/** 句柄关闭后释放本机资源(执行器、MCP 身份等)。 */dispose(): Promise<void>;/** 供应商组(分享的人):这次发送要不要告诉对方开始新的一轮(用户亲自接手过)。 */@@ -214,10 +250,22 @@ export interface RemoteAgentHandleController {* 处理。只有本机提供了凭证授权建议的确认卡能返回会话级允许;交互还没接上或任务已结束时按拒绝处理。*/confirm(request: LocalConfirmation, signal?: AbortSignal): Promise<ExecutorConfirmation>;+ /** 当前的状态镜像(只读)。 */+ readState(): Readonly<Record<string, unknown>>;+ /**+ * 没有放不下的事:没有在跑的回合、没在准备回合、对方进程里没有后台任务、没有待唤醒的续跑。+ * (本机执行器里的后台命令留在本机,不算。)+ */+ isQuiet(): boolean;+ /** 连回了对方(新的 Agent 进程,同一个会话):合入它的状态,用量先保留上一次的读数。 */+ onReconnected(started: RemoteStartedInfo): void;+ /** 连回时没能接上原来的会话、对方开了新会话:告诉用户之前的上下文没接上。 */+ notifyResumeLost(): void;}export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandleController {- const { client, started } = deps;+ const { started } = deps;+ const link = deps.link ?? fixedRemoteAgentLink(deps.client!);const queue = new EventQueue();const projection = new RemoteEventProjection(deps.workspace);let state: Record<string, unknown> = { ...started.state };@@ -229,6 +277,10 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHand}>();const readImage = deps.readImage ?? ((file: string) => fsp.readFile(file));const supported = new Set(started.methods);+ /** 连回后的新进程还没报过有内容的用量:先保留上一次的读数,界面不清零。 */+ let carriedUsage: unknown;+ /** 回到某条消息后、下一轮跑完前(Claude Code 要到下一次发送才在对方截断):不能让出名额。 */+ let rewindPending = false;const dispose = async () => {if (disposed) return;@@ -238,7 +290,29 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandawait deps.dispose().catch(() => undefined);};- const call = (method: RemoteAgentMethod, ...args: unknown[]) => client.call(method, args);+ /** 要对方 Agent 参与的调用:已让出名额就先连回来。 */+ const call = async (method: RemoteAgentMethod, ...args: unknown[]) => {+ const end = link.begin();+ try {+ return await (await link.ensure()).call(method, args);+ } finally {+ end();+ }+ };+ /**+ * 只改设置的调用:连着就交给对方;已让出名额时只记在本机(连回来时随打开带上),返回 false。+ */+ const callIfLive = async (method: RemoteAgentMethod, ...args: unknown[]): Promise<boolean> => {+ const end = link.begin();+ try {+ const live = await link.live();+ if (!live) return false;+ await live.call(method, args);+ return true;+ } finally {+ end();+ }+ };async function sendLike(method: 'send' | 'steer', message: UserMessage, opts?: SendOptions): Promise<void> {const encoded = await encodeSendOptions(opts, readImage);@@ -264,7 +338,16 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandsendCallbacks.delete(sendCallbacks.keys().next().value as string);}}- await client.callWithId(callId, method, [wireMessage, encoded.wire]);+ await (await link.ensure()).callWithId(callId, method, [wireMessage, encoded.wire]);+ }++ async function sendLikeTracked(method: 'send' | 'steer', message: UserMessage, opts?: SendOptions): Promise<void> {+ const end = link.begin();+ try {+ await sendLike(method, message, opts);+ } finally {+ end();+ }}const optional = <K extends keyof AgentSessionHandle>(method: RemoteAgentMethod, fn: AgentSessionHandle[K]) =>@@ -297,16 +380,17 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandreturn Array.isArray(state.disabledSkillPaths) ? state.disabledSkillPaths as string[] : undefined;},- send: (message, opts) => sendLike('send', message, opts),- steer: (message, opts) => sendLike('steer', message, opts),+ send: (message, opts) => sendLikeTracked('send', message, opts),+ steer: (message, opts) => sendLikeTracked('steer', message, opts),+ // 已让出名额时对方没有在跑的回合,停止什么也不用做。abort: async () => {deps.cancelPendingConfirmations?.();- await call('abort');+ await callIfLive('abort');},close: async (opts?: AgentSessionTeardownOptions) => {deps.cancelPendingConfirmations?.();try {- await client.close('close', opts?.reason ?? 'navigation');+ await link.close('close', opts?.reason ?? 'navigation');} finally {await dispose();}@@ -314,7 +398,7 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHanddetach: async (opts?: AgentSessionTeardownOptions) => {deps.cancelPendingConfirmations?.();try {- await client.close('detach', opts?.reason ?? 'navigation');+ await link.close('detach', opts?.reason ?? 'navigation');} finally {await dispose();}@@ -336,38 +420,52 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandlistBackgroundTasks: () => (Array.isArray(state.backgroundTasks) ? state.backgroundTasks as BackgroundTaskSnapshot[] : []),countPendingWakeContinuations: () => (typeof state.pendingWake === 'number' ? state.pendingWake : 0),...optional('requestGracefulStop', async () => {- await call('requestGracefulStop');+ await callIfLive('requestGracefulStop');}),...optional('setModel', async (model: string, opts?: { providerId?: string | null; effort?: Effort }) => {- await call('setModel', model, opts);+ if (!await callIfLive('setModel', model, opts)) {+ state = { ...state, model, ...(opts?.effort ? { effort: opts.effort } : {}) };+ }+ deps.onModel?.(model, opts);+ }),+ // 已让出名额时下一次连回本来就是带新模型的冷启动接回,不用另外重建。+ ...optional('requiresModelSwitchRebuild', async (model: string, opts?: { providerId?: string | null }) => {+ const end = link.begin();+ try {+ const live = await link.live();+ return live ? (await live.call('requiresModelSwitchRebuild', [model, opts])) === true : false;+ } finally {+ end();+ }}),- ...optional('requiresModelSwitchRebuild', async (model: string, opts?: { providerId?: string | null }) =>- (await call('requiresModelSwitchRebuild', model, opts)) === true),...optional('previewModelSwitch', (async (model: string, opts?: { providerId?: string | null }) =>call('previewModelSwitch', model, opts)) as AgentSessionHandle['previewModelSwitch']),...optional('setPermissionMode', async (mode: string) => {- await call('setPermissionMode', mode);+ await callIfLive('setPermissionMode', mode);deps.onPermissionMode?.(mode);}),...optional('setEffort', async (effort: Effort) => {- await call('setEffort', effort);+ if (!await callIfLive('setEffort', effort)) state = { ...state, effort };+ deps.onEffort?.(effort);}),...optional('setFastMode', async (enabled: boolean) => {- await call('setFastMode', enabled);+ if (!await callIfLive('setFastMode', enabled)) state = { ...state, fastMode: enabled };+ deps.onFastMode?.(enabled);}),...optional('setPlanMode', async (enabled: boolean) => {- await call('setPlanMode', enabled);+ if (!await callIfLive('setPlanMode', enabled)) state = { ...state, planMode: enabled };deps.onPlanMode?.(enabled);}),...optional('setThinkingEnabled', async (enabled: boolean) => {- await call('setThinkingEnabled', enabled);+ await callIfLive('setThinkingEnabled', enabled);+ deps.onThinkingEnabled?.(enabled);}),...optional('setExtraDirs', async (dirs: string[], libraryRoot?: string | null) => {- deps.onExtraDirs?.(dirs);- await call('setExtraDirs', deps.workspace.virtualizeDirs(dirs), libraryRoot ? deps.workspace.virtualizeDirs([libraryRoot])[0] : null);+ deps.onExtraDirs?.(dirs, libraryRoot);+ await callIfLive('setExtraDirs', deps.workspace.virtualizeDirs(dirs), libraryRoot ? deps.workspace.virtualizeDirs([libraryRoot])[0] : null);}),...optional('setWritableDirs', async (dirs: string[]) => {- await call('setWritableDirs', deps.workspace.virtualizeDirs(dirs));+ await callIfLive('setWritableDirs', deps.workspace.virtualizeDirs(dirs));// 对方成功后才更新本机执行器的根目录:新建的可写目录在本机也能过 root 判定,// 撤掉的不再被本机上限当可信根;失败时两边都保持原状。deps.onWritableDirs?.(dirs);@@ -375,10 +473,11 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHand// 本机 MCP 身份(协同等工具)必须立即看到改动;对方不支持时也照样更新本机这一份。setVendorOptions: async (patch: Record<string, unknown>) => {deps.onVendorOptions?.(patch ?? {});- if (supported.has('setVendorOptions')) await call('setVendorOptions', JSON.parse(JSON.stringify(patch ?? {})));+ if (supported.has('setVendorOptions')) await callIfLive('setVendorOptions', JSON.parse(JSON.stringify(patch ?? {})));},+ // 已让出名额时对方进程里没有后台任务(有后台任务时不会让)。...optional('stopBackgroundTask', async (taskId: string) => {- await call('stopBackgroundTask', taskId);+ await callIfLive('stopBackgroundTask', taskId);}),...optional('resumeBackgroundTask', async (taskId: string, message: string, childId?: string) => {await call('resumeBackgroundTask', taskId, message, childId);@@ -389,12 +488,16 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHand...optional('getCodexContextWindowInfo', (async () =>call('getCodexContextWindowInfo')) as AgentSessionHandle['getCodexContextWindowInfo']),...optional('useCindyAutoReviewFallback', async () => {- await call('useCindyAutoReviewFallback');+ await callIfLive('useCindyAutoReviewFallback');+ deps.onAutoReviewFallback?.();}),...optional('previewRewindFiles', (async (userUuid: string) =>call('previewRewindFiles', userUuid)) as AgentSessionHandle['previewRewindFiles']),- ...optional('commitRewindFiles', (async (userUuid: string, priorAssistantUuid: string, opts?: unknown) =>- call('commitRewindFiles', userUuid, priorAssistantUuid, opts ?? null)) as AgentSessionHandle['commitRewindFiles']),+ ...optional('commitRewindFiles', (async (userUuid: string, priorAssistantUuid: string, opts?: unknown) => {+ const result = await call('commitRewindFiles', userUuid, priorAssistantUuid, opts ?? null);+ rewindPending = true;+ return result;+ }) as AgentSessionHandle['commitRewindFiles']),};async function answerInteraction(request: InteractionRequest): Promise<RemoteAgentReply> {@@ -431,10 +534,41 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHand&& (typed.data as { kind?: unknown } | null)?.kind === 'generation') {typed = { ...typed, data: { ...(typed.data as object), pathOrigin: 'remote-agent' } };}+ if (typed.type === 'done') rewindPending = false;for (const projected of projection.project(deps.mapEvent ? deps.mapEvent(typed) : typed)) queue.push(projected);},onState(next) {state = { ...state, ...next };+ if (carriedUsage !== undefined) {+ // 新进程开始干活或报了有内容的用量后,以它为准。+ if (state.turnRunning === true || !isEmptyUsage(state.usage)) carriedUsage = undefined;+ else state = { ...state, usage: carriedUsage };+ }+ },+ readState: () => state,+ isQuiet: () => !rewindPending+ && state.turnRunning !== true+ && state.preparing !== true+ && !(Array.isArray(state.backgroundTasks) && state.backgroundTasks.length > 0)+ && !(typeof state.pendingWake === 'number' && state.pendingWake > 0),+ onReconnected(next) {+ const previousUsage = state.usage;+ state = { ...state, ...next.state };+ if (!isEmptyUsage(previousUsage) && isEmptyUsage(state.usage) && state.turnRunning !== true) {+ carriedUsage = previousUsage;+ state = { ...state, usage: previousUsage };+ }+ },+ notifyResumeLost() {+ if (disposed) return;+ queue.push({+ type: 'error',+ data: {+ message: '[REMOTE_AGENT_RESUME_LOST] The earlier conversation on the other computer could not be resumed, so the agent continues without it.',+ isTerminal: false,+ },+ source: started.agentKind,+ });},onRequest(request) {if (request.type === 'interaction') {@@ -492,6 +626,13 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHand};}+/** 用量读数是不是空的(新进程还没跑过回合)。 */+function isEmptyUsage(value: unknown): boolean {+ if (!value || typeof value !== 'object') return true;+ const usage = value as Partial<UsageSnapshot>;+ return !usage.tokenUsage && !usage.contextTokens;+}+/** 对方错误还原成本机能识别的错误(保留类名,供 Maker 判断登录失效等)。 */export function localizeRemoteError(error: unknown): Error {if (error instanceof RemoteAgentRemoteError) {diff --git a/apps/desktop/src/main/remote-agent/controller/runClient.ts b/apps/desktop/src/main/remote-agent/controller/runClient.tsindex 7626eb9657..47993cf48b 100644--- a/apps/desktop/src/main/remote-agent/controller/runClient.ts+++ b/apps/desktop/src/main/remote-agent/controller/runClient.ts@@ -72,6 +72,10 @@ export class RemoteAgentRunClient implements PolledRun {private readonly drained: Promise<void>;private markDrained!: () => void;private pushSeq = 0;+ /** 在途的 push 批次(含重试中的)。 */+ private pushing = 0;+ /** 正在回答的反向请求(从收到到回包交付完)。 */+ private answering = 0;private readonly pendingCalls = new Map<string, { resolve(value: unknown): void; reject(error: Error): void }>();private started: { resolve(handle: Record<string, unknown>): void; reject(error: Error): void } | null = null;private readonly splitter = new LineSplitter(MAX_LINE_BYTES);@@ -168,23 +172,28 @@ export class RemoteAgentRunClient implements PolledRun {this.pushSeq += 1;const seq = this.pushSeq;let delay = 500;- for (let attempt = 1; ; attempt += 1) {- if (this.closed) return;- try {- await this.invoke([{ op: 'push', runId: this.runId, seq, frames }]);- return;- } catch (error) {- const retryable = isRetryableLinkError(error) && attempt < MAX_PUSH_DELIVER_ATTEMPTS;- this.log?.warn(retryable ? 'remote agent: push failed; retrying' : 'remote agent: push failed', {- runId: this.runId,- seq,- attempt,- error: String(error),- });- if (!retryable) throw error;- await sleep(delay);- delay = Math.min(delay * 2, 5_000);+ this.pushing += 1;+ try {+ for (let attempt = 1; ; attempt += 1) {+ if (this.closed) return;+ try {+ await this.invoke([{ op: 'push', runId: this.runId, seq, frames }]);+ return;+ } catch (error) {+ const retryable = isRetryableLinkError(error) && attempt < MAX_PUSH_DELIVER_ATTEMPTS;+ this.log?.warn(retryable ? 'remote agent: push failed; retrying' : 'remote agent: push failed', {+ runId: this.runId,+ seq,+ attempt,+ error: String(error),+ });+ if (!retryable) throw error;+ await sleep(delay);+ delay = Math.min(delay * 2, 5_000);+ }}+ } finally {+ this.pushing -= 1;}}@@ -208,6 +217,11 @@ export class RemoteAgentRunClient implements PolledRun {return this.closed;}+ /** 还有没收尾的往来:在等的方法结果、正在回答的反向请求(权限确认、执行器 / MCP 请求等)或在推的帧。 */+ get hasPendingWork(): boolean {+ return this.pendingCalls.size > 0 || this.answering > 0 || this.pushing > 0 || this.started !== null;+ }+private finish(reason: string, error?: RemoteAgentErrorInfo): void {if (this.closed) return;this.closed = true;@@ -297,16 +311,21 @@ export class RemoteAgentRunClient implements PolledRun {private async answer(requestId: string, request: RemoteAgentReverseRequest): Promise<void> {const abort = new AbortController();this.inflight.set(requestId, abort);- let reply: RemoteAgentReply;+ this.answering += 1;try {- reply = await this.handlers.onRequest(request, abort.signal);- } catch (error) {- reply = { type: 'error', error: { code: 'CONTROLLER_ERROR', message: error instanceof Error ? error.message : String(error) } };+ let reply: RemoteAgentReply;+ try {+ reply = await this.handlers.onRequest(request, abort.signal);+ } catch (error) {+ reply = { type: 'error', error: { code: 'CONTROLLER_ERROR', message: error instanceof Error ? error.message : String(error) } };+ } finally {+ this.inflight.delete(requestId);+ }+ if (this.closed || abort.signal.aborted) return;+ await this.deliverReply(requestId, reply);} finally {- this.inflight.delete(requestId);+ this.answering -= 1;}- if (this.closed || abort.signal.aborted) return;- await this.deliverReply(requestId, reply);}/**diff --git a/apps/desktop/src/main/remote-agent/controller/service.ts b/apps/desktop/src/main/remote-agent/controller/service.tsindex e8c8619439..7c0e7801f4 100644--- a/apps/desktop/src/main/remote-agent/controller/service.ts+++ b/apps/desktop/src/main/remote-agent/controller/service.ts@@ -28,6 +28,7 @@ import { credentialGrantFor } from '../executor/credentialGrants';import type { ExecutorCaptureHooks } from '../executor/executor';import type { PdfTextExtractor } from '../executor/files';import type { GuardedFetch } from '../executor/webFetch';+import { RemoteConnectionPool } from './connectionPool';import { remoteAgentEventMapper } from './eventMap';import {collectAncestorInstructionFiles,@@ -79,6 +80,11 @@ export interface DeviceAgentServiceDeps {webFetch?: GuardedFetch;/** 受邀者任务里凭证类操作确认卡上的说明(按界面语言)。 */sharedProviderCredentialNotice?(): string;+ /**+ * 名额紧张时,闲置满多少分钟的任务可以让出那台电脑上的 Agent 进程(0 = 不让)。缺省时不让,+ * 与没有连接池时一样。每次判断时读取,设置改了立即生效。+ */+ idleReleaseMinutes?(): number;logger: Logger;}@@ -153,6 +159,16 @@ export function remoteAgentPollerFor(export function createDeviceAgentStarter(deps: DeviceAgentServiceDeps) {const log = deps.logger.child('remote-agent');const pollerFor = (deviceId: string): RemoteAgentPoller => remoteAgentPollerFor(deviceId, deps.remoteInvoke, log);+ // 每台运行 Agent 的电脑一个连接池:对方按这台设备计名额,池里算的是本机在那台上开着的连接。+ const pools = new Map<string, RemoteConnectionPool>();+ const poolFor = (deviceId: string): RemoteConnectionPool => {+ let pool = pools.get(deviceId);+ if (!pool) {+ pool = new RemoteConnectionPool({ idleMinutes: () => deps.idleReleaseMinutes?.() ?? 0, log });+ pools.set(deviceId, pool);+ }+ return pool;+ };return async (input: { agentKind: AgentKind; deviceId: string; options: StartSessionOptions }): Promise<AgentSessionHandle> => {const opts: StartSessionOptions = { ...input.options };const poller = pollerFor(input.deviceId);@@ -183,6 +199,7 @@ export function createDeviceAgentStarter(deps: DeviceAgentServiceDeps) {readImageDeliveryEpoch: deps.readImageDeliveryEpoch,invoke: poller.invoke,poller,+ pool: poolFor(input.deviceId),rgPath: deps.rgPath(),codexPath: () => deps.codexPath?.(),...(sessionId && deps.isGroupAssigned?.(sessionId) ? { groupAssigned: true } : {}),diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.tsindex 6eaa53b38c..049931072f 100644--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts@@ -4,6 +4,10 @@* 本机为这个任务准备好执行器(文件与命令在本机执行,过本机权限上限)、本机 Cindy 工具的 MCP* 身份与项目说明快照,然后让对方用它自己的 Agent 程序、登录与供应商启动 Agent。返回的句柄对* 本机 Maker / Session 来说就是普通会话。+ *+ * 本机部分(执行器及其中的后台命令、本机 MCP 身份、Codex 执行环境中继)跟着句柄走;对方电脑上的+ * Agent 进程是一条可以让出的连接:名额紧张时连接池(connectionPool.ts)只结束对方的进程,要它干活时+ * 带原来的会话 id 连回来,接回同一套本机部分。*/import os from 'node:os';import path from 'node:path';@@ -12,11 +16,12 @@ import {REMOTE_AGENT_GROUP_SWITCH_STATE_KEY,REMOTE_AGENT_RELAY_KEY_PATTERN,type RemoteAgentKind,+ type RemoteAgentMethod,type RemoteAgentReply,type RemoteAgentReverseRequest,type RemoteAgentStreamItem,} from '@cindy/device-link';-import type { AgentEvent, AgentSessionHandle, StartSessionOptions } from '@cindy/maker-core';+import type { AgentEvent, AgentSessionHandle, Effort, StartSessionOptions } from '@cindy/maker-core';import { PROVIDER_SHARE_CREDENTIAL_SESSION_APPROVAL } from '../../../shared/providerShareCredentialConsent';import { credentialGrantPermission, type CredentialGrantRecord } from '../executor/credentialGrants';@@ -34,12 +39,15 @@ import type {RemoteAgentWirePersonal,} from '../wire';import { encodeStartOptions } from '../wire';+import { isRemoteRunLimitError, type PooledRemoteConnection, type RemoteConnectionPool } from './connectionPool';import {createRemoteAgentHandle,localizeRemoteError,parseStartedInfo,type LocalConfirmation,type RemoteAgentHandleController,+ type RemoteAgentLink,+ type RemoteStartedInfo,} from './proxyHandle';import { ExecServerRelay } from './execServerRelay';import { createReverseHttpRouter, type LocalMcpTarget } from './router';@@ -56,6 +64,8 @@ export interface StartRemoteAgentDeps {invoke: RemoteAgentInvoke;/** 这台电脑的共享拉取器(同一台电脑上的任务共用一个 poll);缺省时本任务单独一个。 */poller?: RemoteAgentPoller;+ /** 这台电脑的连接池(名额紧张时让出闲置任务的 Agent 进程);缺省时不让。 */+ pool?: RemoteConnectionPool;rgPath: string;/** 为本任务登记本机 Cindy 工具的身份,返回可转发的 MCP 服务。 *//**@@ -219,13 +229,23 @@ function shellName(): string {return (process.env.SHELL ?? '/bin/bash').split('/').pop() || 'bash';}+/** 真正的原生会话 id(Claude Code 首轮完成前是占位)。 */+function isNativeSessionId(id: unknown): id is string {+ return typeof id === 'string' && id.length > 0 && id !== '<pending>' && id !== '<failed>';+}++/**+ * 连接的状态:connecting(第一次打开或连回中)→ connected → releasing(连接池在让出名额)→ released+ * → connecting …;closed 是句柄已关闭或对方意外结束。+ */+type LinkState = 'connecting' | 'connected' | 'releasing' | 'released' | 'closed';+export async function startRemoteAgentSession(kind: RemoteAgentKind,opts: StartSessionOptions,deps: StartRemoteAgentDeps,): Promise<AgentSessionHandle> {if (!opts.sessionId) throw new Error('remote agent sessions require a session id');- const imageDeliveryEpoch = await deps.readImageDeliveryEpoch?.(opts.sessionId);// 附加目录(只读引用)与可写目录分开跟踪,运行中任一侧变化都重算执行器根目录:// 否则新授予的目录过不了本机 shell/root 判定,撤掉的还被本机上限当可信根。let extraDirs = [...new Set(opts.extraDirs ?? [])];@@ -275,12 +295,40 @@ export async function startRemoteAgentSession(});const router = createReverseHttpRouter({ executor, mcpTarget: (name) => mcp.servers.get(name) });+ // 连回对方时按最新值打开(换模型、推理强度等在已让出名额时只记在这里)。+ let model = opts.model;+ let providerId = opts.providerId;+ let effort = opts.effort;+ let fastMode = opts.fastMode;+ let thinkingEnabled = opts.thinkingEnabled;+ let libraryRoot: string | null | undefined;+ let autoReviewFallback = false;+ /** setVendorOptions 改过的内容:对方进程里的状态,连回后再告诉它一次。 */+ const vendorPatches: Record<string, unknown> = {};+ let firstStarted: RemoteStartedInfo | null = null;+ /**+ * 回退 / 分叉的一次性选项(resumeSessionAt / forkSession)要等第一轮跑完才在对方生效:在那之前让出名额,+ * 连回时还要带上,否则回退悄悄失效。跑完一轮后再带会再截断一次,就不带了。+ */+ let oneShotPending = opts.vendorOptions?.resumeSessionAt !== undefined || opts.vendorOptions?.forkSession !== undefined;+ let lastStarted: RemoteStartedInfo | null = null;+let personalRoots: Array<{ relative: string; local: string }> = [];- let projectionReady = false;- const early: Array<{ type: 'event' | 'state'; value: unknown }> = [];- let closedEarly: { reason: string; message?: string } | null = null;- // Codex:对方的 Codex 把本机当作 exec-server 执行环境。客户端在下面创建,帧推送时再取。- let pushFrames: ((frames: Parameters<RemoteAgentRunClient['push']>[0]) => Promise<void>) | null = null;+ /** 正在连或连着的那条连接(Codex 的执行环境帧经它推给对方)。 */+ let active: RemoteAgentRunClient | null = null;+ let linkState: LinkState = 'connecting';+ /** 进行中的、要对方参与的调用数(期间不让出名额)。 */+ let inflight = 0;+ let lastActivity = Date.now();+ let releasing: Promise<void> | null = null;+ let reconnecting: Promise<RemoteAgentRunClient> | null = null;+ const touch = () => {+ lastActivity = Date.now();+ };+ // 其它回调会改这两个值:读的时候不让 TypeScript 按局部赋值收窄。+ const stateNow = (): LinkState => linkState;+ const activeNow = (): RemoteAgentRunClient | null => active;+ // Codex:对方的 Codex 把本机当作 exec-server 执行环境。const codexPath = kind === 'codex' ? deps.codexPath?.() : undefined;const relay = codexPath? new ExecServerRelay({@@ -290,13 +338,61 @@ export async function startRemoteAgentSession(authorize: (action) => executor.check(action),...(credentialConsent ? { confirm: (action: ExecutorAction) => executor.confirm(action) } : {}),push: async (frames) => {- await pushFrames?.(frames);+ await active?.push(frames);},log: deps.log,}): null;+ const isIdle = () => linkState === 'connected'+ && !!active+ && inflight === 0+ && !active.hasPendingWork+ && !relay?.busy()+ && controller?.isQuiet() === true;++ /** 连接池让出名额:只结束对方的 Agent 进程,本机部分与对话记录都留着。 */+ async function release(): Promise<boolean> {+ if (!isIdle() || !active) return false;+ const client = active;+ linkState = 'releasing';+ const done = (async () => {+ try {+ // 用 close 而不是 detach:detach 不结束对方的进程,名额让不出来。+ await client.close('close', 'navigation');+ } catch (error) {+ deps.log?.warn('remote agent: closing a released connection failed', { runId: client.runId, error: String(error) });+ } finally {+ // 对方的 Codex 已退出:本机为它起的 exec-server 一并关掉,连回来的 Agent 会重新连。+ relay?.reset();+ if (active === client) active = null;+ if (linkState === 'releasing') linkState = 'released';+ }+ })();+ releasing = done;+ try {+ await done;+ } finally {+ if (releasing === done) releasing = null;+ }+ deps.log?.info('remote agent connection released', { kind, runId: client.runId });+ return true;+ }++ const member: PooledRemoteConnection = {+ occupiesSlot: () => linkState === 'connecting' || linkState === 'connected' || linkState === 'releasing',+ isIdle,+ lastActivityAt: () => lastActivity,+ release,+ };+ const leavePool = deps.pool?.add(member);++ let disposed = false;const disposeLocal = async () => {+ if (disposed) return;+ disposed = true;+ linkState = 'closed';+ leavePool?.();relay?.close();try {mcp.dispose();@@ -307,147 +403,367 @@ export async function startRemoteAgentSession(};const poller = deps.poller ?? new RemoteAgentPoller(deps.invoke, deps.log);- const client = new RemoteAgentRunClient(deps.newId(), poller, {- onEvent: (event) => {- if (controller) controller.onEvent(event);- else early.push({ type: 'event', value: event });- },- onState: (incoming) => {- // 组所在电脑发来的「需要换一台」凭证(排在那次错误前面):交给供应商组服务,不进任务状态。- const remaining = takeGroupSwitchState(incoming, deps.groupSwitch?.offer);- if (!remaining) return;- let state = remaining;- const projection = state.workspaceProjection as Parameters<typeof shadowAliases>[0] | undefined;- if (projection?.virtualWorkspace === true && typeof projection.shadowDir === 'string') {- workspace.setAliases(shadowAliases(projection, workspace.workingDir, personalRoots, { extraDirs, writableDirs }));- workspace.setVirtualRoot(projection.mirrorRoot);- projectionReady = true;- state = { ...state };- delete state.workspaceProjection;- if (!Object.keys(state).length) return;++ /**+ * 开一个 Agent 进程(一个 run)。`onOpened` 在打开成功后同步执行(中间不让出事件循环),第一次打开时+ * 建句柄,连回时合入状态。+ */+ async function openRun(+ payload: RemoteAgentOpenPayload,+ reconnect: boolean,+ onOpened: (started: RemoteStartedInfo) => void,+ ): Promise<RemoteAgentRunClient> {+ let projectionReady = false;+ let opened = false;+ const early: Array<{ type: 'event' | 'state'; value: unknown }> = [];+ let closedEarly: { reason: string; message?: string } | null = null;+ const expectedResume = payload.options.resumeSessionId;+ let resumeLost = false;+ // 只处理当前这条连接的往来;正在让出名额的那条剩下的收尾不再进任务。+ const isCurrent = () => active === client && linkState !== 'releasing';+ const client: RemoteAgentRunClient = new RemoteAgentRunClient(deps.newId(), poller, {+ onEvent: (event) => {+ if (!isCurrent()) return;+ touch();+ if ((event as { type?: unknown } | null)?.type === 'done') oneShotPending = false;+ // 打开完成前到的先攒着:连回时要先合入对方启动时的状态,再按顺序交给任务。+ if (controller && opened) controller.onEvent(event);+ else early.push({ type: 'event', value: event });+ },+ onState: (incoming) => {+ if (!isCurrent()) return;+ // 组所在电脑发来的「需要换一台」凭证(排在那次错误前面):交给供应商组服务,不进任务状态。+ const remaining = takeGroupSwitchState(incoming, deps.groupSwitch?.offer);+ if (!remaining) return;+ let state = remaining;+ const projection = state.workspaceProjection as Parameters<typeof shadowAliases>[0] | undefined;+ if (projection?.virtualWorkspace === true && typeof projection.shadowDir === 'string') {+ workspace.setAliases(shadowAliases(projection, workspace.workingDir, personalRoots, { extraDirs, writableDirs }));+ workspace.setVirtualRoot(projection.mirrorRoot);+ projectionReady = true;+ state = { ...state };+ delete state.workspaceProjection;+ if (!Object.keys(state).length) return;+ }+ if (controller && opened) controller.onState(state);+ else early.push({ type: 'state', value: state });+ },+ onRequest: async (request: RemoteAgentReverseRequest, signal): Promise<RemoteAgentReply> => {+ if (!isCurrent()) {+ return { type: 'error', error: { code: 'REMOTE_AGENT_EXPIRED', message: 'This connection has been released.' } };+ }+ touch();+ if (request.type === 'http') return router(request, signal);+ if (request.type === 'callback' && request.name === 'onInvalidResumeSession') {+ const expected = request.args[0];+ const value = typeof expected === 'string' && opts.onInvalidResumeSession+ ? await opts.onInvalidResumeSession(expected)+ : false;+ // 连回时原来的会话接不上、对方改开新会话(与 App 重启后接回同一条规则):不能悄悄丢掉上下文。+ if (reconnect && value && expected === expectedResume && !resumeLost) {+ resumeLost = true;+ controller?.notifyResumeLost();+ }+ return { type: 'callback', value };+ }+ const answered = controller?.onRequest(request);+ if (answered) return answered;+ return { type: 'error', error: { code: 'REMOTE_AGENT_UNAVAILABLE', message: 'This computer is not ready to answer yet.' } };+ },+ onWs: (item: Extract<RemoteAgentStreamItem, { t: 'ws' }>) => {+ if (!isCurrent()) return;+ if (relay) relay.handle(item);+ else if (item.kind === 'open') void client.push([{ connId: item.connId, kind: 'close' }]).catch(() => undefined);+ },+ onClosed: (reason, error) => {+ // 让出名额或已被换下的连接:不是任务结束。+ if (active !== client || linkState === 'releasing') return;+ if (!opened) {+ closedEarly = { reason, message: error?.message };+ return;+ }+ active = null;+ linkState = 'closed';+ if (controller) controller.onClosed(reason, error?.message);+ else void disposeLocal();+ },+ }, deps.newId, deps.log);+ if (stateNow() === 'closed') throw new Error('[REMOTE_AGENT_EXPIRED] The task has ended on this computer.');+ active = client;+ try {+ const raw = await client.open(kind, payload);+ if (closedEarly) throw new Error((closedEarly as { message?: string }).message ?? '[REMOTE_AGENT_UNAVAILABLE] The agent stopped right after starting.');+ if (stateNow() === 'closed') {+ // 连回途中任务关掉了(那时还没有这条连接可关):对方已经起了进程,关掉它让出名额。+ await client.close('close', 'navigation').catch(() => undefined);+ throw new Error('[REMOTE_AGENT_EXPIRED] The task has ended on this computer.');}- if (controller) controller.onState(state);- else early.push({ type: 'state', value: state });- },- onRequest: async (request: RemoteAgentReverseRequest, signal): Promise<RemoteAgentReply> => {- if (request.type === 'http') return router(request, signal);- if (request.type === 'callback' && request.name === 'onInvalidResumeSession' && !controller) {- const expected = request.args[0];- const value = typeof expected === 'string' && opts.onInvalidResumeSession- ? await opts.onInvalidResumeSession(expected)- : false;- return { type: 'callback', value };+ const started = parseStartedInfo(raw, kind);+ if (!projectionReady) {+ workspace.setAliases(shadowAliases(started, workspace.workingDir, personalRoots, { extraDirs, writableDirs }));+ workspace.setVirtualRoot(started.virtualWorkspace ? started.mirrorRoot : undefined);}- const answered = controller?.onRequest(request);- if (answered) return answered;- return { type: 'error', error: { code: 'REMOTE_AGENT_UNAVAILABLE', message: 'This computer is not ready to answer yet.' } };- },- onWs: (item: Extract<RemoteAgentStreamItem, { t: 'ws' }>) => {- if (relay) relay.handle(item);- else if (item.kind === 'open') void pushFrames?.([{ connId: item.connId, kind: 'close' }])?.catch(() => undefined);- },- onClosed: (reason, error) => {- if (controller) controller.onClosed(reason, error?.message);- else {- closedEarly = { reason, message: error?.message };- void disposeLocal();+ opened = true;+ linkState = 'connected';+ lastStarted = started;+ onOpened(started);+ for (const item of early.splice(0)) {+ if (item.type === 'event') controller?.onEvent(item.value);+ else controller?.onState(item.value as Record<string, unknown>);}- },- }, deps.newId, deps.log);- pushFrames = (frames) => client.push(frames);+ // 对方没走会话失效回调、却开了别的会话(如 Codex 接不回线程时新开):同样告诉用户。+ if (reconnect && expectedResume && isNativeSessionId(started.id) && started.id !== expectedResume && !resumeLost) {+ resumeLost = true;+ controller?.notifyResumeLost();+ }+ return client;+ } catch (error) {+ client.abandon('start-failed');+ if (active === client) active = null;+ throw error;+ }+ }- const projectFiles = await deps.collectProjectFiles(opts.workingDir).catch(() => []);- const ancestorFiles = await (deps.collectAncestorFiles?.(opts.workingDir) ?? Promise.resolve([])).catch(() => []);- const collectedPersonal = await (deps.collectPersonal?.(kind, projectFiles) ?? Promise.resolve(null))- .catch(() => null);- personalRoots = collectedPersonal?.roots ?? [];- const personal = collectedPersonal?.personal ?? { files: [] };- const importFiles = kind === 'claude-code' && deps.collectImports- ? await deps.collectImports({ workingDir: opts.workingDir, projectFiles, ancestorFiles, personal }).catch(() => [])- : [];- const payload: RemoteAgentOpenPayload = {- sessionId: opts.sessionId,- acceptsImageDeliveryReceipts: true,- ...(imageDeliveryEpoch !== undefined ? { imageDeliveryEpoch } : {}),- virtualWorkspace: true,- options: encodeStartOptions(opts),- workspace: {- workingDir: opts.workingDir,- extraDirs: opts.extraDirs ?? [],- writableDirs: opts.writableDirs ?? [],- platform: process.platform,- shell: shellName(),- osVersion: `${os.type()} ${os.release()}`,- // 仅供被控端把项目说明中的本机 Home 路径投影到虚拟工作区;不会进入 deviceHosted。- homeDir: os.homedir(),- isGitRepo: await deps.isGitRepo(opts.workingDir).catch(() => false),- },- projectFiles,- ancestorFiles,- ...(importFiles.length ? { importFiles } : {}),- personal,- mcpServers: [...mcp.servers.keys()],- ...(deps.groupAssigned ? { groupAssigned: true } : {}),- ...(deps.groupSwitch ? { acceptsGroupSwitch: true } : {}),- ...(deps.groupSwitch?.token ? { groupSwitchToken: deps.groupSwitch.token } : {}),- };+ /** 打开时带的启动选项:第一次就是 Maker 给的;连回时换成最新的设置,并接回同一个会话。 */+ function openOptions(reconnect: boolean): StartSessionOptions {+ if (!reconnect || !controller) return opts;+ const state = controller.readState();+ const resumeId = isNativeSessionId(controller.handle.id) ? controller.handle.id : undefined;+ const vendor = { ...vendorOptions };+ if (!oneShotPending) {+ delete vendor.resumeSessionAt;+ delete vendor.forkSession;+ }+ const delivery = lastStarted?.codexProductPromptDelivery;+ const historyHasProductPrompt = delivery && delivery.threadId === resumeId+ ? delivery.historyHasProductPrompt+ : resumeId && resumeId === opts.resumeSessionId ? opts.codexHistoryHasProductPrompt : undefined;+ const next: StartSessionOptions = {+ ...opts,+ model,+ providerId,+ effort: typeof state.effort === 'string' ? state.effort as Effort : effort,+ fastMode: typeof state.fastMode === 'boolean' ? state.fastMode : fastMode,+ thinkingEnabled,+ permissionMode,+ planMode: typeof state.planMode === 'boolean' ? state.planMode : planMode,+ extraDirs,+ writableDirs,+ vendorOptions: vendor,+ resumeSessionId: resumeId,+ codexHistoryHasProductPrompt: historyHasProductPrompt,+ };+ for (const key of ['resumeSessionId', 'codexHistoryHasProductPrompt', 'effort', 'fastMode', 'thinkingEnabled', 'providerId'] as const) {+ if (next[key] === undefined) delete next[key];+ }+ return next;+ }- let startedRaw: Record<string, unknown>;- try {+ async function buildPayload(reconnect: boolean): Promise<RemoteAgentOpenPayload> {+ // 每次打开都读最新的图片清空代次:让出期间清空过的,连回的新进程按新代次交付。+ const imageDeliveryEpoch = await deps.readImageDeliveryEpoch?.(opts.sessionId!);+ const startOptions = openOptions(reconnect);+ const projectFiles = await deps.collectProjectFiles(opts.workingDir).catch(() => []);+ const ancestorFiles = await (deps.collectAncestorFiles?.(opts.workingDir) ?? Promise.resolve([])).catch(() => []);+ const collectedPersonal = await (deps.collectPersonal?.(kind, projectFiles) ?? Promise.resolve(null))+ .catch(() => null);+ personalRoots = collectedPersonal?.roots ?? [];+ const personal = collectedPersonal?.personal ?? { files: [] };+ const importFiles = kind === 'claude-code' && deps.collectImports+ ? await deps.collectImports({ workingDir: opts.workingDir, projectFiles, ancestorFiles, personal }).catch(() => [])+ : [];+ return {+ sessionId: opts.sessionId!,+ acceptsImageDeliveryReceipts: true,+ ...(imageDeliveryEpoch !== undefined ? { imageDeliveryEpoch } : {}),+ virtualWorkspace: true,+ options: encodeStartOptions(startOptions),+ workspace: {+ workingDir: opts.workingDir,+ extraDirs: reconnect ? extraDirs : opts.extraDirs ?? [],+ writableDirs: reconnect ? writableDirs : opts.writableDirs ?? [],+ platform: process.platform,+ shell: shellName(),+ osVersion: `${os.type()} ${os.release()}`,+ // 仅供被控端把项目说明中的本机 Home 路径投影到虚拟工作区;不会进入 deviceHosted。+ homeDir: os.homedir(),+ isGitRepo: await deps.isGitRepo(opts.workingDir).catch(() => false),+ },+ projectFiles,+ ancestorFiles,+ ...(importFiles.length ? { importFiles } : {}),+ personal,+ mcpServers: [...mcp.servers.keys()],+ ...(deps.groupAssigned ? { groupAssigned: true } : {}),+ ...(deps.groupSwitch ? { acceptsGroupSwitch: true } : {}),+ // 交接凭证只给全新打开用;连回是接着原来的会话。+ ...(!reconnect && deps.groupSwitch?.token ? { groupSwitchToken: deps.groupSwitch.token } : {}),+ };+ }++ /**+ * 打开前问对方的能力与当前上限(每次都问:对方可能刚改了上限);名额紧张时先由连接池让出名额。+ * 对方以名额已满拒绝时让一个再重试一次,没有能让的就照原样报错。+ */+ async function connect(+ reconnect: boolean,+ onOpened: (started: RemoteStartedInfo) => void,+ ): Promise<RemoteAgentRunClient> {const caps = await RemoteAgentRunClient.caps(deps.invoke);if (caps.virtualWorkspace !== true) {throw new Error('[REMOTE_AGENT_UNSUPPORTED] The other computer does not support the virtual workspace required to protect local paths.');}- startedRaw = await client.open(kind, payload);- } catch (error) {- client.abandon('start-failed');- await disposeLocal();- throw localizeRemoteError(error);+ deps.pool?.noteMaxRuns(caps.maxRuns);+ await deps.pool?.beforeOpen(member);+ const payload = await buildPayload(reconnect);+ try {+ return await openRun(payload, reconnect, onOpened);+ } catch (error) {+ if (!deps.pool || linkState === 'closed' || !isRemoteRunLimitError(error) || !await deps.pool.releaseForRetry(member)) throw error;+ return await openRun(payload, reconnect, onOpened);+ }}- if (closedEarly) throw new Error((closedEarly as { message?: string }).message ?? '[REMOTE_AGENT_UNAVAILABLE] The agent stopped right after starting.');- const started = parseStartedInfo(startedRaw, kind);- if (!projectionReady) {- workspace.setAliases(shadowAliases(started, workspace.workingDir, collectedPersonal?.roots ?? [], { extraDirs, writableDirs }));- workspace.setVirtualRoot(started.virtualWorkspace ? started.mirrorRoot : undefined);++ /** 连回后补上对方进程里的状态(不在启动选项里的)。失败只记日志:不影响接着干活。 */+ async function reapply(client: RemoteAgentRunClient): Promise<void> {+ const methods = new Set(firstStarted?.methods ?? []);+ const steps: Array<[RemoteAgentMethod, unknown[]]> = [];+ if (Object.keys(vendorPatches).length && methods.has('setVendorOptions')) steps.push(['setVendorOptions', [vendorPatches]]);+ if (libraryRoot && methods.has('setExtraDirs')) {+ steps.push(['setExtraDirs', [workspace.virtualizeDirs(extraDirs), workspace.virtualizeDirs([libraryRoot])[0]]]);+ }+ if (autoReviewFallback && methods.has('useCindyAutoReviewFallback')) steps.push(['useCindyAutoReviewFallback', []]);+ for (const [method, args] of steps) {+ try {+ await client.call(method, args);+ } catch (error) {+ deps.log?.warn('remote agent: restoring state after reconnect failed', { method, error: String(error) });+ }+ }}- controller = createRemoteAgentHandle({- client,- started,- workspace,- recordApproval: (action) => executor.recordApproval(action),- cancelPendingConfirmations: () => executor.cancelPendingConfirmations(),- onInvalidResumeSession: opts.onInvalidResumeSession,- mapEvent: deps.mapEvent?.(kind),- newId: deps.newId,- ...(deps.groupSwitch?.takeNewRound ? { takeGroupNewRound: deps.groupSwitch.takeNewRound } : {}),- onPermissionMode: (mode) => {- if (permissionMode === mode) return;- permissionMode = mode as typeof permissionMode;- executor.setGateMode(executorGateModeFor(permissionMode, planMode));- },- onPlanMode: (enabled) => {- if (planMode === enabled) return;- planMode = enabled;- executor.setGateMode(executorGateModeFor(permissionMode, planMode));- },- onExtraDirs: (dirs) => {- extraDirs = [...new Set(dirs)];- applyDirs();+ /** 要对方 Agent 干活时:已让出名额就连回同一个会话。正在让就等它让完;同时只连一次。 */+ async function ensureConnected(): Promise<RemoteAgentRunClient> {+ for (;;) {+ if (linkState === 'closed') throw new Error('[REMOTE_AGENT_EXPIRED] The task has ended on this computer.');+ if (linkState === 'connected' && active) return active;+ if (reconnecting) return reconnecting;+ if (!releasing) break;+ await releasing.catch(() => undefined);+ }+ linkState = 'connecting';+ const attempt = (async () => {+ try {+ const client = await connect(true, (started) => {+ controller?.onReconnected(started);+ });+ touch();+ deps.log?.info('remote agent reconnected', { kind, runId: client.runId });+ await reapply(client);+ if (stateNow() !== 'connected' || activeNow() !== client) throw new Error('[REMOTE_AGENT_EXPIRED] The task has ended on this computer.');+ return client;+ } catch (error) {+ // 连不回(对方忙、离线等):保持已让出名额,下次发送再试。+ if (stateNow() === 'connecting') linkState = 'released';+ throw localizeRemoteError(error);+ }+ })();+ reconnecting = attempt;+ try {+ return await attempt;+ } finally {+ if (reconnecting === attempt) reconnecting = null;+ }+ }++ const link: RemoteAgentLink = {+ live: async () => {+ if (reconnecting) return reconnecting.catch(() => null);+ return linkState === 'connected' ? active : null;},- onWritableDirs: (dirs) => {- writableDirs = [...new Set(dirs)];- applyDirs();+ ensure: ensureConnected,+ begin: () => {+ inflight += 1;+ touch();+ let ended = false;+ return () => {+ if (ended) return;+ ended = true;+ inflight -= 1;+ touch();+ };},- onVendorOptions: (patch) => {- Object.assign(vendorOptions, patch);+ close: async (mode, reason) => {+ if (releasing) await releasing.catch(() => undefined);+ const client = active;+ linkState = 'closed';+ // 已让出名额时对方没有这个任务的进程,不用再关;正在连回的那条一起关掉。+ if (client) await client.close(mode, reason);},- dispose: disposeLocal,- });- for (const item of early.splice(0)) {- if (item.type === 'event') controller.onEvent(item.value);- else controller.onState(item.value as Record<string, unknown>);+ };++ try {+ await connect(false, (started) => {+ firstStarted = started;+ controller = createRemoteAgentHandle({+ link,+ started,+ workspace,+ recordApproval: (action) => executor.recordApproval(action),+ cancelPendingConfirmations: () => executor.cancelPendingConfirmations(),+ onInvalidResumeSession: opts.onInvalidResumeSession,+ mapEvent: deps.mapEvent?.(kind),+ newId: deps.newId,+ ...(deps.groupSwitch?.takeNewRound ? { takeGroupNewRound: deps.groupSwitch.takeNewRound } : {}),+ onPermissionMode: (mode) => {+ if (permissionMode === mode) return;+ permissionMode = mode as typeof permissionMode;+ executor.setGateMode(executorGateModeFor(permissionMode, planMode));+ },+ onPlanMode: (enabled) => {+ if (planMode === enabled) return;+ planMode = enabled;+ executor.setGateMode(executorGateModeFor(permissionMode, planMode));+ },+ onExtraDirs: (dirs, root) => {+ extraDirs = [...new Set(dirs)];+ // 与发给对方的一致:没带就是清掉。+ libraryRoot = root ?? null;+ applyDirs();+ },+ onWritableDirs: (dirs) => {+ writableDirs = [...new Set(dirs)];+ applyDirs();+ },+ onVendorOptions: (patch) => {+ Object.assign(vendorOptions, patch);+ Object.assign(vendorPatches, JSON.parse(JSON.stringify(patch)) as Record<string, unknown>);+ },+ onModel: (next, modelOpts) => {+ model = next;+ if (modelOpts?.providerId !== undefined) providerId = modelOpts.providerId;+ if (modelOpts?.effort) effort = modelOpts.effort;+ },+ onEffort: (next) => {+ effort = next;+ },+ onFastMode: (enabled) => {+ fastMode = enabled;+ },+ onThinkingEnabled: (enabled) => {+ thinkingEnabled = enabled;+ },+ onAutoReviewFallback: () => {+ autoReviewFallback = true;+ },+ dispose: disposeLocal,+ });+ });+ } catch (error) {+ await disposeLocal();+ throw localizeRemoteError(error);}- deps.log?.info('remote agent session started', { kind, runId: client.runId });- return controller.handle;+ touch();+ deps.log?.info('remote agent session started', { kind, runId: activeNow()?.runId });+ return (controller as RemoteAgentHandleController | null)!.handle;}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsxindex 0ec63ba950..8de780702a 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx@@ -1,3 +1,4 @@+import { RemoteAgentIdleReleaseSection } from './RemoteAgentIdleReleaseSection';import { RemoteAgentLimitsSection } from './RemoteAgentLimitsSection';/*** 「{供应商} · 远程与分享」页(供应商分享 §7.2;供应商组 §10)。从设置 → 模型供应商「允许被远程调用」一行的@@ -520,6 +521,9 @@ export function ProviderShareManagePage({time={time}/>+ {/* 这台电脑作为使用方的设置(与上面提供方的额度分开):不管管理的是哪台电脑,改的都是这台。 */}+ <RemoteAgentIdleReleaseSection />+{linkOpen && (<ProviderShareLinkDialogdeviceId={deviceId}diff --git a/apps/desktop/src/renderer/features/provider-share/RemoteAgentIdleReleaseSection.tsx b/apps/desktop/src/renderer/features/provider-share/RemoteAgentIdleReleaseSection.tsxnew file mode 100644index 0000000000..8b3bd2efe1--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/RemoteAgentIdleReleaseSection.tsx@@ -0,0 +1,109 @@+import { useCallback, useEffect, useRef, useState } from 'react';+import { useTranslation } from 'react-i18next';+import { toast } from '@/lib/toast';++import { Button } from '@/components/ui/button';+import { FormField } from '@/components/ui/form-field';+import { Input } from '@/components/ui/input';+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';+import { mapIpcErrorToI18nKey } from '@/utils/ipcError';+import {+ isRemoteAgentIdleRelease,+ REMOTE_AGENT_IDLE_RELEASE_MAX_MINUTES,+ type RemoteAgentIdleReleaseView,+} from '../../../shared/remoteAgentIdleRelease';++/**+ * 这台电脑作为使用方:用其他电脑上的模型时,快到那台电脑的任务数上限时,闲置多久的任务先暂时断开+ * (main 的 remote-agent/controller/connectionPool.ts)。设置只在这台电脑上,不随管理的电脑切换。+ */+export function RemoteAgentIdleReleaseSection() {+ const { t } = useTranslation();+ const [view, setView] = useState<RemoteAgentIdleReleaseView | null>(null);+ const [draft, setDraft] = useState<string | null>(null);+ const [errorKey, setErrorKey] = useState<string | null>(null);+ const [busy, setBusy] = useState(false);+ const sequence = useRef(0);++ const load = useCallback(async () => {+ const seq = ++sequence.current;+ const owner = getDataOwnerGeneration();+ try {+ const next = await window.electronAPI.providerShare.command({ action: 'get-idle-release' });+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ setView(next);+ setErrorKey(null);+ } catch (error) {+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ setErrorKey(mapIpcErrorToI18nKey(error));+ }+ }, []);++ useEffect(() => {+ void load();+ return () => { sequence.current += 1; };+ }, [load]);++ const value = draft ?? String(view?.value.idleMinutes ?? '');+ const minutes = Number(value);+ const valid = value.trim() !== '' && isRemoteAgentIdleRelease({ idleMinutes: minutes });+ const changed = view !== null && draft !== null && (minutes !== view.value.idleMinutes || !view.isCustomized);++ const save = async (reset: boolean) => {+ if (busy || (!reset && !valid)) return;+ setBusy(true);+ const seq = ++sequence.current;+ const owner = getDataOwnerGeneration();+ try {+ const next = await window.electronAPI.providerShare.command(reset+ ? { action: 'reset-idle-release' }+ : { action: 'set-idle-release', value: { idleMinutes: minutes } });+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ setView(next);+ setDraft(null);+ setErrorKey(null);+ toast.success(t('providerShare.idleRelease.saved'));+ } catch (error) {+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ toast.error(t(mapIpcErrorToI18nKey(error)));+ } finally {+ if (seq === sequence.current) setBusy(false);+ }+ };++ return (+ <section className="mt-8 shrink-0" data-testid="remote-agent-idle-release" aria-labelledby="remote-agent-idle-release-title">+ <h3 id="remote-agent-idle-release-title" className="text-13 font-medium text-[var(--settings-section-title)]">+ {t('providerShare.idleRelease.title')}+ </h3>+ <p className="mt-1 text-12 leading-[1.5] text-[var(--settings-section-desc)]">{t('providerShare.idleRelease.description')}</p>+ {errorKey && <p role="alert" className="mt-3 text-12 leading-[1.5] text-[var(--text-danger)]">{t(errorKey)}</p>}+ {!view ? (+ <Button variant="secondary" size="sm" className="mt-3" onClick={() => void load()}>+ {t(errorKey ? 'providerShare.idleRelease.retry' : 'providerShare.idleRelease.loading')}+ </Button>+ ) : (+ <form className="mt-4 flex flex-col gap-3" onSubmit={event => { event.preventDefault(); void save(false); }}>+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">+ <FormField label={t('providerShare.idleRelease.minutes')} hint={t('providerShare.idleRelease.hint')}>+ {control => <Input {...control} type="number" min={0} max={REMOTE_AGENT_IDLE_RELEASE_MAX_MINUTES} step={1}+ disabled={busy} value={value} data-testid="remote-agent-idle-release-minutes"+ onChange={next => setDraft(next)} />}+ </FormField>+ </div>+ {draft !== null && !valid && (+ <p role="alert" className="text-12 leading-[1.5] text-[var(--text-danger)]">+ {t('providerShare.idleRelease.invalid', { max: REMOTE_AGENT_IDLE_RELEASE_MAX_MINUTES })}+ </p>+ )}+ <div className="flex flex-wrap gap-2">+ <Button type="submit" variant="cta" size="sm" disabled={busy || !valid || !changed}>{t('providerShare.idleRelease.save')}</Button>+ <Button type="button" variant="secondary" size="sm" disabled={busy || !view.isCustomized} onClick={() => void save(true)}>+ {t('providerShare.idleRelease.reset')}+ </Button>+ </div>+ </form>+ )}+ </section>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsxindex ec9ab39874..70565e1c1e 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx@@ -204,6 +204,7 @@ beforeEach(() => {value: { perDevice: 16, total: 64 }, defaults: { perDevice: 16, total: 64 },isCustomized: false, customizedKeys: [], usage: { total: 0, devices: 0, largestDevice: 0 },};+ if (cmd.action === 'get-idle-release') return { value: { idleMinutes: 10 }, defaults: { idleMinutes: 10 }, isCustomized: false };if (cmd.action === 'received-snapshot') return { ownerStamp: { dataOwnerId: null, ownerGeneration: 0 }, received: [], confirmedRegions: [] };if (cmd.action === 'set-member' || cmd.action === 'approve' || cmd.action === 'reject') return { ok: true };throw new Error(`unexpected ${cmd.action}`);diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentIdleReleaseSection.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentIdleReleaseSection.test.tsxnew file mode 100644index 0000000000..0112bfb46c--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentIdleReleaseSection.test.tsx@@ -0,0 +1,53 @@+// @vitest-environment jsdom+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';+import { RemoteAgentIdleReleaseSection } from '../RemoteAgentIdleReleaseSection';++vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));+vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn() } }));++const command = vi.fn();+const view = (idleMinutes = 10, isCustomized = false) => ({ value: { idleMinutes }, defaults: { idleMinutes: 10 }, isCustomized });+const input = () => screen.getByTestId('remote-agent-idle-release-minutes') as HTMLInputElement;+const button = (key: 'save' | 'reset') => screen.getByRole('button', { name: `providerShare.idleRelease.${key}` }) as HTMLButtonElement;++beforeEach(() => {+ setDataOwnerGeneration('owner-a');+ command.mockReset().mockImplementation(async (cmd: { action: string; value?: { idleMinutes: number } }) => (+ cmd.action === 'set-idle-release' ? view(cmd.value!.idleMinutes, true) : view()+ ));+ Object.assign(window, { electronAPI: { providerShare: { command } } });+});+afterEach(() => cleanup());++describe('RemoteAgentIdleReleaseSection', () => {+ it('reads and saves the setting on this computer, including 0 and an explicit default', async () => {+ render(<RemoteAgentIdleReleaseSection />);+ await waitFor(() => expect(input().value).toBe('10'));+ expect(command).toHaveBeenCalledWith({ action: 'get-idle-release' });+ expect(screen.getByText('providerShare.idleRelease.hint')).toBeTruthy();+ expect(button('save').disabled).toBe(true);+ fireEvent.change(input(), { target: { value: '0' } });+ fireEvent.click(button('save'));+ await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'set-idle-release', value: { idleMinutes: 0 } }));+ await waitFor(() => expect(button('reset').disabled).toBe(false));+ fireEvent.change(input(), { target: { value: '10' } });+ fireEvent.click(button('save'));+ await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'set-idle-release', value: { idleMinutes: 10 } }));+ });++ it('rejects values outside 0–120 and restores the default', async () => {+ command.mockImplementation(async (cmd: { action: string }) => (cmd.action === 'reset-idle-release' ? view() : view(30, true)));+ render(<RemoteAgentIdleReleaseSection />);+ await waitFor(() => expect(input().value).toBe('30'));+ for (const value of ['121', '-1', '1.5', '']) {+ fireEvent.change(input(), { target: { value } });+ expect(button('save').disabled).toBe(true);+ }+ expect(screen.getByRole('alert').textContent).toBe('providerShare.idleRelease.invalid');+ fireEvent.click(button('reset'));+ await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'reset-idle-release' }));+ await waitFor(() => expect(input().value).toBe('10'));+ });+});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 8059012e83..16ce5eaa91 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -479,6 +479,18 @@"saved": "Remote session limits saved","retry": "Reload","loading": "Loading…"+ },+ "idleRelease": {+ "title": "When this computer uses models on other computers",+ "description": "When tasks on this computer use models on another computer, that computer limits how many of them it runs at once. As the limit gets close, tasks idle longer than the time below are temporarily disconnected to make room for new tasks. Send one a message and it reconnects automatically, with the earlier conversation intact. Tasks that are running or still have background work are never disconnected.",+ "minutes": "Idle release (minutes)",+ "hint": "Set 0 to never disconnect; when the limit is reached you see the limit message. 1–120 disconnects a task only after it has been idle this long.",+ "invalid": "Enter a whole number from 0 to {{max}}.",+ "save": "Save",+ "reset": "Restore defaults",+ "saved": "Idle release setting saved",+ "retry": "Reload",+ "loading": "Loading…"}},"providerGroup": {@@ -11998,7 +12010,8 @@"REMOTE_AGENT_SHARE_UNAVAILABLE": "The shared provider is temporarily unavailable. The owner's computer may be offline, or sharing is turned off for now. Try again later, or switch to another model to continue.","REMOTE_AGENT_GROUP_UNAVAILABLE": "No computer in the provider group can run this task right now. They may be offline, paused, cooling down, or missing this model. Check the group on this provider’s Remote & Sharing page.","REMOTE_AGENT_DEVICE_LIMIT": "This device has reached its remote session limit. Archive unused sessions or ask the provider owner to raise the limit in Remote & sharing.",- "REMOTE_AGENT_TOTAL_LIMIT": "The provider computer has reached its total remote session limit. Ask the owner to release unused sessions or raise the limit in Remote & sharing."+ "REMOTE_AGENT_TOTAL_LIMIT": "The provider computer has reached its total remote session limit. Ask the owner to release unused sessions or raise the limit in Remote & sharing.",+ "REMOTE_AGENT_RESUME_LOST": "The earlier conversation on the other computer could not be reconnected, so the agent continues without that context."},"generatedFiles": {"title": "Files created this message",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex dfdc6ea1e0..2a0f26305a 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -475,6 +475,18 @@"saved": "リモートセッション数を保存しました","retry": "再読み込み","loading": "読み込み中…"+ },+ "idleRelease": {+ "title": "このパソコンで他のパソコンのモデルを使うとき",+ "description": "このパソコンのセッションが他のパソコンのモデルを使うとき、そのパソコンで同時に実行できる数には上限があります。上限に近づくと、下の時間より長くアイドル状態のセッションを一時的に切断し、新しいセッションに枠を譲ります。そのセッションにメッセージを送ると自動で再接続され、それまでの会話はそのまま残ります。実行中、またはバックグラウンドの作業が残っているセッションは切断しません。",+ "minutes": "アイドル解放(分)",+ "hint": "0 にすると切断しません。上限に達したときは上限のメッセージが表示されます。1~120 は、その分数だけアイドル状態が続いた場合にのみ切断します。",+ "invalid": "0~{{max}} の整数を入力してください。",+ "save": "保存",+ "reset": "既定値に戻す",+ "saved": "アイドル解放の設定を保存しました",+ "retry": "再読み込み",+ "loading": "読み込み中…"}},"providerGroup": {@@ -11954,7 +11966,8 @@"REMOTE_AGENT_SHARE_UNAVAILABLE": "共有されたプロバイダーは一時的に利用できません。共有した人のパソコンがオフラインか、共有が一時的にオフになっている可能性があります。後でもう一度試すか、別のモデルに切り替えて続けられます。","REMOTE_AGENT_GROUP_UNAVAILABLE": "プロバイダーグループ内のパソコンは現在このセッションを実行できません。オフライン、割り当て停止中、クールダウン中、またはこのモデルがない可能性があります。このプロバイダーの「リモートと共有」ページでグループを確認してください。","REMOTE_AGENT_DEVICE_LIMIT": "このデバイスのリモートセッション数が上限に達しました。不要なセッションをアーカイブするか、提供者に「リモートと共有」で上限の変更を依頼してください。",- "REMOTE_AGENT_TOTAL_LIMIT": "提供者のパソコンのリモートセッション総数が上限に達しました。提供者に不要なセッションの解放、または「リモートと共有」での上限変更を依頼してください。"+ "REMOTE_AGENT_TOTAL_LIMIT": "提供者のパソコンのリモートセッション総数が上限に達しました。提供者に不要なセッションの解放、または「リモートと共有」での上限変更を依頼してください。",+ "REMOTE_AGENT_RESUME_LOST": "相手のパソコンでのこれまでの会話に再接続できなかったため、Agent はその文脈なしで続行します。"},"generatedFiles": {"title": "このメッセージで作成されたファイル",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex f06b817167..2ad23344f5 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -475,6 +475,18 @@"saved": "원격 세션 수 제한을 저장했습니다","retry": "새로고침","loading": "불러오는 중…"+ },+ "idleRelease": {+ "title": "이 컴퓨터가 다른 컴퓨터의 모델을 사용할 때",+ "description": "이 컴퓨터의 세션이 다른 컴퓨터의 모델을 사용할 때, 그 컴퓨터가 동시에 실행할 수 있는 수에는 한도가 있습니다. 한도에 가까워지면 아래 시간보다 오래 유휴 상태인 세션을 잠시 연결 해제해 새 세션에 자리를 양보합니다. 해당 세션에 메시지를 보내면 자동으로 다시 연결되며 이전 대화는 그대로 남아 있습니다. 실행 중이거나 백그라운드 작업이 남아 있는 세션은 연결을 해제하지 않습니다.",+ "minutes": "유휴 해제(분)",+ "hint": "0으로 설정하면 연결을 해제하지 않으며, 한도에 도달하면 한도 안내가 표시됩니다. 1~120은 그 시간(분) 동안 유휴 상태일 때만 연결을 해제합니다.",+ "invalid": "0~{{max}} 사이의 정수를 입력하세요.",+ "save": "저장",+ "reset": "기본값 복원",+ "saved": "유휴 해제 설정을 저장했습니다",+ "retry": "새로고침",+ "loading": "불러오는 중…"}},"providerGroup": {@@ -11954,7 +11966,8 @@"REMOTE_AGENT_SHARE_UNAVAILABLE": "공유된 제공자를 일시적으로 사용할 수 없습니다. 공유한 사람의 컴퓨터가 오프라인이거나 공유가 잠시 꺼져 있을 수 있습니다. 나중에 다시 시도하거나 다른 모델로 바꿔 계속할 수 있습니다.","REMOTE_AGENT_GROUP_UNAVAILABLE": "제공자 그룹의 컴퓨터가 지금 이 세션을 실행할 수 없습니다. 모두 오프라인이거나, 배정이 일시 중지되었거나, 대기 중이거나, 이 모델이 없을 수 있습니다. 이 제공자의 원격 및 공유 페이지에서 그룹을 확인하세요.","REMOTE_AGENT_DEVICE_LIMIT": "이 기기의 원격 세션 수가 한도에 도달했습니다. 사용하지 않는 세션을 보관하거나 제공자에게 원격 및 공유에서 한도를 높여 달라고 요청하세요.",- "REMOTE_AGENT_TOTAL_LIMIT": "제공자 컴퓨터의 전체 원격 세션 수가 한도에 도달했습니다. 제공자에게 불필요한 세션을 해제하거나 원격 및 공유에서 한도를 높여 달라고 요청하세요."+ "REMOTE_AGENT_TOTAL_LIMIT": "제공자 컴퓨터의 전체 원격 세션 수가 한도에 도달했습니다. 제공자에게 불필요한 세션을 해제하거나 원격 및 공유에서 한도를 높여 달라고 요청하세요.",+ "REMOTE_AGENT_RESUME_LOST": "상대 컴퓨터의 이전 대화에 다시 연결하지 못해 Agent가 그 맥락 없이 계속합니다."},"generatedFiles": {"title": "이 메시지에서 생성된 파일",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 92263d3a19..b1af976ff4 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -475,6 +475,18 @@"saved": "远程任务数量设置已保存","retry": "重新加载","loading": "正在加载…"+ },+ "idleRelease": {+ "title": "这台电脑使用其他电脑的模型",+ "description": "这台电脑上的任务使用其他电脑上的模型时,那台电脑能同时运行的任务数量有上限。快到上限时,闲置超过下面时长的任务会先暂时断开,把位置让给新任务;再给它发消息时会自动接上,之前的对话都还在。正在运行或还有后台工作的任务不会断开。",+ "minutes": "闲置释放(分钟)",+ "hint": "设为 0 时从不断开,满了就直接提示已达上限;1~120 表示闲置超过该时长后才可能断开。",+ "invalid": "请填写 0~{{max}} 的整数。",+ "save": "保存",+ "reset": "恢复默认",+ "saved": "闲置释放设置已保存",+ "retry": "重新加载",+ "loading": "正在加载…"}},"providerGroup": {@@ -11954,7 +11966,8 @@"REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供应商暂时不可用:对方电脑可能不在线,或对方暂时关闭了分享。可以稍后再试,或换成其他模型继续。","REMOTE_AGENT_GROUP_UNAVAILABLE": "供应商组里的电脑现在都不能运行这个任务:可能都不在线、已暂停分配、正在冷却,或没有这个模型。可以到这个供应商的「远程与分享」页查看组内电脑。","REMOTE_AGENT_DEVICE_LIMIT": "这台设备保留的远程任务数已达上限。可归档暂时不用的任务,或请远程电脑的主人在“远程与分享”中提高上限。",- "REMOTE_AGENT_TOTAL_LIMIT": "远程电脑保留的任务总数已达上限。请那台电脑的主人释放暂时不用的任务,或在“远程与分享”中提高上限。"+ "REMOTE_AGENT_TOTAL_LIMIT": "远程电脑保留的任务总数已达上限。请那台电脑的主人释放暂时不用的任务,或在“远程与分享”中提高上限。",+ "REMOTE_AGENT_RESUME_LOST": "之前在那台电脑上的对话没能接上,Agent 会在没有之前上下文的情况下继续。"},"generatedFiles": {"title": "本条消息生成的文件",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 41c838463c..1280ab9517 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -475,6 +475,18 @@"saved": "遠端任務數量設定已儲存","retry": "重新載入","loading": "正在載入…"+ },+ "idleRelease": {+ "title": "這台電腦使用其他電腦的模型",+ "description": "這台電腦上的任務使用其他電腦上的模型時,那台電腦能同時執行的任務數量有上限。快到上限時,閒置超過下面時長的任務會先暫時斷開,把位置讓給新任務;再給它傳訊息時會自動接上,之前的對話都還在。正在執行或還有背景工作的任務不會斷開。",+ "minutes": "閒置釋放(分鐘)",+ "hint": "設為 0 時從不斷開,滿了就直接提示已達上限;1~120 表示閒置超過該時長後才可能斷開。",+ "invalid": "請填寫 0~{{max}} 的整數。",+ "save": "儲存",+ "reset": "恢復預設",+ "saved": "閒置釋放設定已儲存",+ "retry": "重新載入",+ "loading": "正在載入…"}},"providerGroup": {@@ -11953,7 +11965,8 @@"REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供應商暫時無法使用:對方電腦可能不在線,或對方暫時關閉了分享。可以稍後再試,或換成其他模型繼續。","REMOTE_AGENT_GROUP_UNAVAILABLE": "供應商組裡的電腦現在都不能執行這個任務:可能都離線、已暫停分配、正在冷卻,或沒有這個模型。可以到這個供應商的「遠端與分享」頁查看組內電腦。","REMOTE_AGENT_DEVICE_LIMIT": "這台裝置保留的遠端任務數已達上限。可封存暫時不用的任務,或請遠端電腦的主人在「遠端與分享」中提高上限。",- "REMOTE_AGENT_TOTAL_LIMIT": "遠端電腦保留的任務總數已達上限。請那台電腦的主人釋放暫時不用的任務,或在「遠端與分享」中提高上限。"+ "REMOTE_AGENT_TOTAL_LIMIT": "遠端電腦保留的任務總數已達上限。請那台電腦的主人釋放暫時不用的任務,或在「遠端與分享」中提高上限。",+ "REMOTE_AGENT_RESUME_LOST": "之前在那台電腦上的對話沒能接上,Agent 會在沒有之前上下文的情況下繼續。"},"generatedFiles": {"title": "本條訊息生成的檔案",diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex e3e9c4039e..faf18cf59a 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -2,6 +2,7 @@* 供应商分享的 Renderer ↔ Main 契约(只在本机进程之间;服务端契约见* docs/provider-sharing-contract.md)。身份只有昵称与头像。*/+import type { RemoteAgentIdleRelease, RemoteAgentIdleReleaseView } from './remoteAgentIdleRelease';import type { RemoteAgentLimits, RemoteAgentLimitsView } from './remoteAgentLimits';import type {@@ -193,6 +194,10 @@ export type ProviderShareCommand =| { action: 'get-run-limits' }| { action: 'reset-run-limits' }| { action: 'set-run-limits'; limits: Partial<RemoteAgentLimits> }+ /** 本机作为使用方的闲置让出设置;只在本机窗口可用,不进同账号管理通道。 */+ | { action: 'get-idle-release' }+ | { action: 'reset-idle-release' }+ | { action: 'set-idle-release'; value: RemoteAgentIdleRelease }| { action: 'owned'; range: ProviderShareUsageRange }/** 这个供应商按使用方的用量(本机与我的其他电脑)。不依赖分享服务。 */| { action: 'own-usage'; providerId: string; range: ProviderShareUsageRange }@@ -224,6 +229,9 @@ export interface ProviderShareCommandResult {'get-run-limits': RemoteAgentLimitsView;'set-run-limits': RemoteAgentLimitsView;'reset-run-limits': RemoteAgentLimitsView;+ 'get-idle-release': RemoteAgentIdleReleaseView;+ 'set-idle-release': RemoteAgentIdleReleaseView;+ 'reset-idle-release': RemoteAgentIdleReleaseView;owned: ProviderShareOwnerState;'own-usage': ProviderOwnUsageView;'usage-history': ProviderUsageHistoryView;diff --git a/apps/desktop/src/shared/remoteAgentIdleRelease.ts b/apps/desktop/src/shared/remoteAgentIdleRelease.tsnew file mode 100644index 0000000000..07b43ad0c7--- /dev/null+++ b/apps/desktop/src/shared/remoteAgentIdleRelease.ts@@ -0,0 +1,22 @@+/**+ * 本机作为使用方:用其他电脑上的模型时,那台电脑给这台电脑的任务数有上限。快到上限时,闲置满这么多+ * 分钟的任务先断开那台电脑上的 Agent,把位置让给新任务;再发消息时自动接回原来的对话。0 = 从不断开。+ */+export interface RemoteAgentIdleRelease {+ idleMinutes: number;+}++export const REMOTE_AGENT_IDLE_RELEASE_MAX_MINUTES = 120;+export const DEFAULT_REMOTE_AGENT_IDLE_RELEASE: Readonly<RemoteAgentIdleRelease> = { idleMinutes: 10 };++export function isRemoteAgentIdleRelease(value: unknown): value is RemoteAgentIdleRelease {+ if (!value || typeof value !== 'object' || Array.isArray(value)) return false;+ const minutes = (value as RemoteAgentIdleRelease).idleMinutes;+ return Number.isInteger(minutes) && minutes >= 0 && minutes <= REMOTE_AGENT_IDLE_RELEASE_MAX_MINUTES;+}++export interface RemoteAgentIdleReleaseView {+ value: RemoteAgentIdleRelease;+ defaults: RemoteAgentIdleRelease;+ isCustomized: boolean;+}diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 1fb6948600..b35f3f7f38 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1331,6 +1331,41 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加主进程拒绝。- **移动项目可用**:B 上的影子目录只按「控制端 + 任务 id」定址(虚拟工作区为必需能力),与 A 的工作目录无关;A 换目录后关闭空闲 handle,下次发送按新目录重建,B 上的会话记录原样续用。+- **控制端连接池:名额紧张时让出闲置任务的 Agent 进程**(2026-10-17):B 按发起设备限制同时开着的 run(`caps.maxRuns`),+ A 上开着的任务即使闲着也占名额。A 对每台 B 一个连接池(`controller/connectionPool.ts`,计数口径与 B 的 `limitDeviceOf`+ 一致:这台设备),**只在名额紧张时**让出「不忙且闲置满 N 分钟」的连接;N 是 A 本机设置(「远程与分享」页「这台电脑使用+ 其他电脑的模型」,默认 10,0~120,**0 = 从不让出**,与没有连接池时一样满了直接报错)。三条路径都只让有资格的:+ A 在这台 B 上开着的连接数到了水位线 `ceil(maxRuns×80%)`(只在水位线低于上限、即 maxRuns ≥ 5 时;每次 open 前与每分钟查一次)+ 按最久没活动的顺序让,直到降到水位线以下;open 前已满先同步让一个;open 被拒且是名额类 `REMOTE_AGENT_BUSY`+ (`[DEVICE_LIMIT]` / `[TOTAL_LIMIT]`,旧 B 是 `too many tasks are running from this computer`;`too much staged data` 不算)+ 让一个再**只重试一次**。没有有资格的就照常 open / 照原样报错,B 才是最终裁判;不排队等名额。+ - **不改 wire**:让出用已有的 `close`(mode `close`、reason `navigation`;不用 `detach`,它不结束 B 上的进程),连回用已有的+ `open` + `options.resumeSessionId`(远程 Agent 第一版就有);maxRuns 每次 open 前从 `caps` 读最新值(旧 B 固定回 16,正是它的+ 硬上限)。四种版本组合:A 新 × B 新 / B 旧都只用这两个 op;A 旧行为不变(不让出);B 侧代码未改,没有新的会话状态字段,+ 手机端无感知。+ - **本机部分跟句柄走**:执行器(含 `ShellSession` 后台命令,让出后仍可按原 ID 读取)、本机 MCP 身份、Codex exec-server 中继+ 都不随让出关闭;中继只关掉为 B 上 Codex 起的 exec-server(B 的 Codex 已退出),连回来的 Codex 重新连。句柄对 Maker 一直是活的,+ 状态镜像(用量、模型、计划模式等)照常读;连回后新进程还没报有内容的用量前保留上一次的读数。+ - **「不忙」**:A 侧没有进行中的方法调用、回包与推帧;状态镜像里没有在跑 / 在准备的回合、没有后台任务(`backgroundTasks`:+ Claude Code 后台子代理与后台任务、Pi 子代理)与待唤醒续跑(`pendingWake`);Codex 中继里没有仍在运行的 `process/start` 进程+ (后台终端;按 exec-server 的 `process/closed` / `process/exited` 与启动失败判断,固定 Codex 0.159.2 实测),也没有在等本机确认的消息;+ 回到某条消息后、下一轮跑完前也算忙(Claude Code 要到下一次发送才在 B 上截断)。A 本机执行器里的后台命令不算忙。+ - **连回**:只有要 B 上的 Agent 干活的调用触发(`send` / `steer` / `resumeBackgroundTask` / `compactSession` / 回退,以及要 B 回答的+ `previewModelSwitch` / `getContextUsage` / `getCodexContextWindowInfo`);`requiresModelSwitchRebuild` 已让出时回 false(下一次连回+ 本来就是带新模型的冷启动接回);只改设置的+ (`setModel` / `setEffort` / `setFastMode` / `setPlanMode` / `setThinkingEnabled` / `setPermissionMode` / 目录 / `setVendorOptions`)+ 已让出时只记在 A,`abort` / `requestGracefulStop` / `stopBackgroundTask` 已让出时什么也不做。连回带当前原生会话 id 与最新的+ 模型、来源、推理强度、快速模式、思考开关、权限档、计划模式、附加 / 可写目录;回退 / 分叉用的一次性 `resumeSessionAt` /+ `forkSession` 只在第一轮跑完前带(之后再带会再截断一次);`setVendorOptions` 改过的内容、`libraryRoot`、`useCindyAutoReviewFallback` 连回后再告诉 B 一次。受邀者归属校验、+ 供应商组 `relayMemberOf` 回到原组内电脑与 App 重启后接回同一条路径。B 接不回原会话时(会话失效回调里正是这次带的 id,或 B+ 返回了别的会话 id)沿用 `onInvalidResumeSession` 语义,同时在任务里插一条非终止的 `[REMOTE_AGENT_RESUME_LOST]` 提示,+ 不悄悄丢上下文;旧手机没有这条文案,显示 message 的英文兜底。+ - **并发**:让出进行中来的调用等它让完再连回;同时几个调用只连一次;调用开始后让出放弃;已让出时的关闭、归档、删除、换账号、+ 退出 App(`detach`)只收本机部分,不再联系 B。+ - **已知限制**:B 的整机合计上限(`TOTAL_LIMIT`)A 看不到别的设备的占用,只能靠被拒后处理;A 在自己额度内不让出,可能挡住别的+ 设备,第一期接受。A 作为供应商组所在电脑替受邀者中转的 run 不进连接池(由发起方决定让出,发起方让出后按原有逻辑关掉中转);+ 同一台 B 的多个分享入口(`share:<id>`)各算一个池,计数可能偏低,靠被拒后处理兜住。+ 回归见 `remote-agent/__tests__/connectionPool.test.ts` 与 `execServerRelayBusy.e2e.test.ts`。## 协同远端 Worker:Worker 在另一台电脑运行diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.mdindex 91a9192990..08f8568291 100644--- a/docs/dev-rules/remote-and-mobile-adaptation.md+++ b/docs/dev-rules/remote-and-mobile-adaptation.md@@ -125,6 +125,16 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即被控端连续立即返回空结果时控制端放慢到 1s 一次,防止空转。2 台控制端共享被控端、其中一台静默的回归仍需在双实例实机验证中补测。+**控制端连接池的让出与连回**(2026-10-17,协议见 [`protocol-compatibility.md`](protocol-compatibility.md)「控制端连接池」):++1. **故障层级**:B 的单设备名额(`caps.maxRuns`)快满或已满,或 B 以名额类 `REMOTE_AGENT_BUSY` 拒绝一次 open;只涉及这台 A 在+ 这台 B 上的连接。+2. **动作层级**:与故障同半径——只结束这台 B 上一个不忙且闲置满设置时长的 run(`close`),本机部分与对话记录不动,不碰 link、+ relay、拉取器与其它 B;被拒后只重试一次,没有能让的就按原错误返回,不排队、不循环。连回只在这个任务下一次要 Agent 干活时发生,+ 连不回(B 离线、仍满等)保持已让出、按原错误报给用户,下次发送再试,不自动重放。+3. **多 peer**:B 按 `(控制端, runId)` 计数,A 的计数只算自己的连接;多实例、别的设备的占用与 B 刚改的上限都可能让 A 的计数不准,+ 因此 A 不据此拒绝打开,只据此决定要不要先让,最终以 B 的裁决为准。设置为 0 时三条路径都不让,与没有连接池时一致。+**托管 Codex 的关键线程 RPC**(#5764):Agent 所在电脑上的 Codex 经 exec-server 逐个读任务所在电脑的项目说明与 Skill,`thread/start` 实测约 35 轮串行往返,耗时 ≈ 轮数 × 链路往返,慢链路下合法地超过`CRITICAL_THREAD_RPC_TIMEOUT_MS`(60s)。`thread/start`、`thread/resume`、`turn/start` 因此在任务隧道