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): 由提供方按闲置时长收回远程任务
MagicLizi19fbc717915c
diff --git a/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx b/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsxindex 09d3092d1d..ecdb3b5b30 100644--- a/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx+++ b/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx@@ -6,10 +6,7 @@ import type {ProviderShareQuotaAccount,} from '../../../src/shared/providerShareInsights';import type { ProviderShareReceived } from '@cindy/device-link';-import {- DEFAULT_REMOTE_AGENT_IDLE_RELEASE,- type RemoteAgentIdleReleaseView,-} from '../../../src/shared/remoteAgentIdleRelease';+import { DEFAULT_REMOTE_AGENT_LIMITS, type RemoteAgentLimitsView } from '../../../src/shared/remoteAgentLimits';const now = Date.parse('2026-10-19T12:00:00Z');const share: ProviderShareReceived = {@@ -188,8 +185,6 @@ void mountPage({};case 'get-credential-consent':return { skip: false };- case 'get-idle-release':- return { value: { idleMinutes: 0 }, defaults: { idleMinutes: 0 }, isCustomized: false };case 'owned':return {ready: true,@@ -210,18 +205,12 @@ void mountPage({return { providerId: 'xd', local: null, devices: [], relays: [] };case 'get-run-limits':return {- value: { perDevice: 16, total: 64 },- defaults: { perDevice: 16, total: 64 },+ value: { ...DEFAULT_REMOTE_AGENT_LIMITS },+ defaults: { ...DEFAULT_REMOTE_AGENT_LIMITS },isCustomized: false,customizedKeys: [],usage: { total: 0, devices: 0, largestDevice: 0 },- };- case 'get-idle-release':- return {- value: { ...DEFAULT_REMOTE_AGENT_IDLE_RELEASE },- defaults: { ...DEFAULT_REMOTE_AGENT_IDLE_RELEASE },- isCustomized: false,- } satisfies RemoteAgentIdleReleaseView;+ } satisfies RemoteAgentLimitsView;default:return forbid(`providerShare.${cmd.action}`)();}diff --git a/apps/desktop/scripts/fixtures/provider-share-insights/ui-page.mjs b/apps/desktop/scripts/fixtures/provider-share-insights/ui-page.mjsindex ad95946066..4460d502e1 100644--- a/apps/desktop/scripts/fixtures/provider-share-insights/ui-page.mjs+++ b/apps/desktop/scripts/fixtures/provider-share-insights/ui-page.mjs@@ -57,11 +57,11 @@ export default {},async check(page, ui) {if (ui.case === 'owner') {- // The owner page reads idle-release settings on mount. A missing fixture reply- // used to turn that read into a forbidden operation and render an error.- const idleMinutes = page.getByTestId('remote-agent-idle-release-minutes');+ // The owner page reads run limits (including idle reclaim) on mount. A missing fixture+ // reply would turn that read into a forbidden operation and render an error.+ const idleMinutes = page.getByTestId('remote-agent-limit-idleMinutes');await idleMinutes.waitFor();- assert.equal(await idleMinutes.inputValue(), '0');+ assert.equal(await idleMinutes.inputValue(), '30');assert.equal(await page.getByRole('alert').count(), 0);const quota = page.getByRole('switch', {name: await ui.t('providerShare.insights.allowQuota'),diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex 8c0929315b..b188220f99 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -179,10 +179,14 @@ describe('provider share usage history wire budget', () => {});describe('remote task limit management payloads', () => {- it.each([{ perDevice: 24 }, { total: 80 }, { perDevice: 16, total: 64 }])('preserves only supplied fields in %j', limits => {+ // idleMinutes:提供方的闲置收回时长,0 = 不收回(provider-sharing.md §3)。+ it.each([{ perDevice: 24 }, { total: 80 }, { perDevice: 16, total: 64 }, { idleMinutes: 0 }, { idleMinutes: 1440 }])('preserves only supplied fields in %j', limits => {expect(parseProviderShareCommand({ action: 'set-run-limits', limits })).toEqual({ action: 'set-run-limits', limits });});- it.each([{}, { unknown: 1 }, { perDevice: '16' }, { perDevice: 0 }, { total: 1001 }, { total: 1.5 }])('rejects malformed patches %j', limits => {+ it.each([+ {}, { unknown: 1 }, { perDevice: '16' }, { perDevice: 0 }, { total: 1001 }, { total: 1.5 },+ { idleMinutes: -1 }, { idleMinutes: 1441 }, { idleMinutes: '30' },+ ])('rejects malformed patches %j', limits => {expect(() => parseProviderShareCommand({ action: 'set-run-limits', limits })).toThrow('INVALID_PARAMS');});});@@ -236,16 +240,6 @@ 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 b5eba08fd5..cde52ef723 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -1,8 +1,6 @@import { isRemoteAgentLimitsPatch } from '../../shared/remoteAgentLimits.js';import { readRemoteAgentLimitsState, saveRemoteAgentLimits } from '../remote-agent/host/limitsStore.js';import { remoteAgentLimitUsage, revalidateRemoteModelAccess } from './dispatch.js';-import { isRemoteAgentIdleRelease } from '../../shared/remoteAgentIdleRelease.js';-import { readRemoteAgentIdleReleaseState, saveRemoteAgentIdleRelease } from '../remote-agent/controller/idleReleaseStore.js';/*** 供应商分享的本机接线:分享者与受邀者两侧运行时的起停、推送给 Renderer、系统通知,以及* Renderer 的命令通道。账号操作只接受本机应用窗口,不能经设备互联从别的电脑调用。@@ -382,12 +380,6 @@ 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':@@ -813,14 +805,6 @@ 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 7a13db07ea..d8a16f5e6c 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -233,7 +233,6 @@ 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 {@@ -2883,8 +2882,6 @@ 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 3cd82ce68f..d73591f579 100644--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts@@ -582,16 +582,6 @@ 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.tsindex 1abc22554b..bdf317b118 100644--- a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts@@ -689,6 +689,33 @@ describe('remote connection pool with a real host', () => {expect(scenario.started).toHaveLength(3);});+ // provider-sharing.md §3「闲置收回由提供方决定」:对方按闲置收回结束了 Agent 进程(closed 带 idleReclaimed)。新控制端不报错、+ // 不关句柄,本机后台命令留着;下一次发送带原来的会话 id 连回。改动前会当作任务结束关掉句柄,下一次发送直接失败。+ it('keeps this computer\'s part when the provider reclaims an idle task, then reconnects to the same conversation', async () => {+ vi.useFakeTimers({ toFake: ['setInterval', 'clearInterval'] });+ try {+ limits = { perDevice: 16, total: 64, idleMinutes: TINY_MINUTES };+ const a = await start(undefined);+ const events = watch(a);+ const started = await ask(a, events, 'bg');+ const id = /with ID: (\S+?)\./.exec(started)?.[1];+ expect(id).toBeTruthy();+ const nativeA = a.id;+ await sleep(5);+ // 对方巡检:不忙且闲置满设置的时长,收回。+ await vi.advanceTimersByTimeAsync(5_000);+ await vi.waitFor(() => expect(host.runCount()).toBe(0));+ expect(events.seen.filter((event) => event.type === 'error')).toEqual([]);+ expect(await ask(a, events, `read ${id}`)).toContain('<status>running</status>');+ expect(scenario.started).toHaveLength(2);+ expect(scenario.started[1].options.resumeSessionId).toBe(nativeA);+ fs.writeFileSync(path.join(project, 'bg.go'), '');+ await vi.waitFor(async () => expect(await ask(a, events, `read ${id}`)).toContain('bg-finished'), { timeout: 5_000, interval: 20 });+ } finally {+ vi.useRealTimers();+ }+ });+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');diff --git a/apps/desktop/src/main/remote-agent/__tests__/hostLifecycle.test.ts b/apps/desktop/src/main/remote-agent/__tests__/hostLifecycle.test.tsindex 4bd9c060cd..c26d58b9bf 100644--- a/apps/desktop/src/main/remote-agent/__tests__/hostLifecycle.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/hostLifecycle.test.ts@@ -182,6 +182,109 @@ describe('duplicate op payloads', () => {});});+/*+ * 测试价值+ * - 生产入口与可观察结果:createRemoteAgentHost 的 handle(open / call / poll / caps)与巡检;控制端读到的事件流收尾行与+ * caps 声明的闲置收回时长。+ * - Bug/规则依据:provider-sharing.md §3「闲置收回由提供方决定」;闲着的任务一直被拉取,原来的「控制端离开」回收永远不触发。+ * - 现有覆盖缺口:上面只覆盖收尾清理;没有用例证明忙的任务不被收回、闲置满时长才收回、收尾行让旧控制端静默收起。+ * - 最小失败输入:设置 1 分钟;回合在跑 / 后台任务 / 待唤醒续跑 / 控制端报 hold / 回退后下一轮没跑完时各推进 2 分钟。+ * - tier:unit,假时钟 + 假 setInterval,Agent 是内存假句柄。+ */+describe('idle reclaim by the provider', () => {+ interface Busy { turn: boolean; background: number; wake: number }++ function busyHandle(input: HostedStartInput, busy: Busy) {+ const queued: AgentEvent[] = [];+ let wake: (() => void) | null = null;+ const handle: AgentSessionHandle & { emit(event: AgentEvent): void } = {+ ...idleHandle(input),+ isTurnRunning: () => busy.turn,+ listBackgroundTasks: () => Array.from({ length: busy.background }, (_, index) => ({ taskId: `bg-${index}` }) as never),+ countPendingWakeContinuations: () => busy.wake,+ commitRewindFiles: async () => ({ ok: true }) as never,+ events: () => ({+ async *[Symbol.asyncIterator]() {+ for (;;) {+ if (queued.length) { yield queued.shift()!; continue; }+ await new Promise<void>((resolve) => { wake = resolve; });+ }+ },+ }),+ emit(event) { queued.push(event); wake?.(); wake = null; },+ };+ return handle;+ }++ async function openBusy(minutes: number, busy: Busy) {+ vi.useFakeTimers({ toFake: ['setInterval', 'clearInterval'] });+ let handle!: ReturnType<typeof busyHandle>;+ const started = whenStarted();+ const host = createRemoteAgentHost({+ readLimits: () => ({ perDevice: 16, total: 64, idleMinutes: minutes }),+ isAgentAvailable: () => true,+ startHosted: async (input) => { handle = busyHandle(input, busy); started.resolve(); return handle; },+ isControllerAuthorized: () => true, captureOwner: () => 'owner', isOwnerCurrent: () => true, runsRoot,+ now: () => clock,+ });+ await host.handle('controller-1', { op: 'open', runId: RUN_1, agentKind: 'claude-code', payload: { json: openPayload('task-1') } });+ await started.promise;+ await settle();+ let cursor = 0;+ const rows: Array<Record<string, unknown>> = [];+ /** 控制端照常拉取(闲着的任务也一直在拉),推进时钟并跑一轮巡检。 */+ const pass = async (ms: number, hold = false) => {+ clock += ms;+ const result = await host.handle('controller-1', {+ op: 'poll', runs: [{ runId: RUN_1, cursor, ...(hold ? { hold: true } : {}) }], waitMs: 0,+ }) as { runs: Array<{ cursor: number; data?: string }> };+ const entry = result.runs[0];+ if (entry) {+ cursor = entry.cursor;+ if (entry.data) rows.push(...Buffer.from(entry.data, 'base64').toString().trim().split('\n').map((line) => JSON.parse(line)));+ }+ await vi.advanceTimersByTimeAsync(5_000);+ await settle();+ };+ return { host, handle: () => handle, pass, rows };+ }++ it.each(['turn', 'background', 'wake', 'hold', 'rewind'] as const)('keeps a run while it is busy (%s) and reclaims it after a full idle period', async (reason) => {+ const busy: Busy = { turn: reason === 'turn', background: reason === 'background' ? 1 : 0, wake: reason === 'wake' ? 1 : 0 };+ const { host, handle, pass, rows } = await openBusy(1, busy);+ try {+ if (reason === 'rewind') {+ await host.handle('controller-1', { op: 'call', runId: RUN_1, callId: RUN_2, method: 'commitRewindFiles', payload: { json: ['user-1', 'assistant-1'] } });+ await settle();+ }+ for (let i = 0; i < 3; i += 1) await pass(50_000, reason === 'hold');+ expect(host.runCount()).toBe(1);+ // 忙完之后从这一刻重新计时:再闲置不满 1 分钟不收回。+ busy.turn = false; busy.background = 0; busy.wake = 0;+ if (reason === 'rewind') {+ handle().emit({ type: 'done', data: {}, source: 'claude-code' } as AgentEvent);+ await settle();+ }+ await pass(50_000);+ expect(host.runCount()).toBe(1);+ await pass(20_000);+ await pass(0);+ expect(host.runCount()).toBe(0);+ // 旧控制端按 `ended` 静默收起;新控制端看 idleReclaimed。+ expect(rows.at(-1)).toEqual({ t: 'closed', reason: 'ended', idleReclaimed: true });+ } finally { host.dispose(); }+ });++ it('never reclaims with 0 minutes and declares the setting in caps', async () => {+ const { host, pass } = await openBusy(0, { turn: false, background: 0, wake: 0 });+ try {+ for (let i = 0; i < 4; i += 1) await pass(50_000);+ expect(host.runCount()).toBe(1);+ expect(await host.handle('controller-1', { op: 'caps' })).toMatchObject({ idleReclaimMinutes: 0 });+ } finally { host.dispose(); }+ });+});+// #6412: asynchronous source reads used to lose the final image when the native stream ended.it.each([false, true])('drains image preparation and forwards the controller receipt capability (%s)', async (receipts) => {let release!: () => void;diff --git a/apps/desktop/src/main/remote-agent/__tests__/limits.test.ts b/apps/desktop/src/main/remote-agent/__tests__/limits.test.tsindex 6c78417845..3b7944f2f3 100644--- a/apps/desktop/src/main/remote-agent/__tests__/limits.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/limits.test.ts@@ -59,7 +59,7 @@ function request(runId = randomUUID(), extra: Record<string, unknown> = {}) {}describe('provider computer session limits', () => {it('keeps defaults and advertises the configured limit', async () => {- expect(DEFAULT_REMOTE_AGENT_LIMITS).toEqual({ perDevice: 16, total: 64 });+ expect(DEFAULT_REMOTE_AGENT_LIMITS).toEqual({ perDevice: 16, total: 64, idleMinutes: 30 });const host = makeHost();expect(await host.handle('a', { op: 'caps' })).toMatchObject({ maxRuns: 2 });limits = { perDevice: 70, total: 100 };diff --git a/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.ts b/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.tsindex 867eac23da..c01877ac5e 100644--- a/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.ts@@ -11,7 +11,6 @@ vi.mock('../../appSessionState.js', () => ({}));vi.mock('../../logger.js', () => ({ createLogger: () => ({ info() {}, warn() {}, error() {} }) }));import { readRemoteAgentLimitsState, saveRemoteAgentLimits } from '../host/limitsStore';-import { readRemoteAgentIdleReleaseMinutes, readRemoteAgentIdleReleaseState, saveRemoteAgentIdleRelease } from '../controller/idleReleaseStore';import { isRemoteAgentLimits } from '../../../shared/remoteAgentLimits';beforeEach(async () => {@@ -33,7 +32,7 @@ describe('remote task limit overrides', () => {value: { perDevice: 16, total: 80 }, customizedKeys: ['perDevice', 'total'],});await expect(saveRemoteAgentLimits({ total: 8 })).rejects.toThrow('INVALID_PARAMS');- expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 16, total: 80 });+ expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 16, total: 80, idleMinutes: 30 });});it('validates concurrent partial updates against the value inside the write lock', async () => {@@ -50,16 +49,31 @@ describe('remote task limit overrides', () => {expect(readRemoteAgentLimitsState().customizedKeys).toEqual(['perDevice', 'total']);await saveRemoteAgentLimits({ perDevice: 32, total: 128 });state.owner = 'b';- expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 16, total: 64 });+ expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 16, total: 64, idleMinutes: 30 });state.owner = 'a';- expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 32, total: 128 });+ expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 32, total: 128, idleMinutes: 30 });await saveRemoteAgentLimits(null);- expect(readRemoteAgentLimitsState()).toMatchObject({ isCustomized: false, value: { perDevice: 16, total: 64 } });+ expect(readRemoteAgentLimitsState()).toMatchObject({ isCustomized: false, value: { perDevice: 16, total: 64, idleMinutes: 30 } });+ });+ // provider-sharing.md §3「闲置收回由提供方决定」:旧版写下的设置文件没有这一项时按默认 30 读;+ // 0 是有效的「不收回」,只存用户改过的这一项,不改动另外两项的覆盖。+ it('reads idle reclaim minutes from files written before the setting existed and stores 0 as an explicit choice', async () => {+ await fs.mkdir(path.join(state.root, 'a'), { recursive: true });+ await fs.writeFile(path.join(state.root, 'a', 'remote-agent-limits.json'), JSON.stringify({ perDevice: 24 }));+ expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 24, total: 64, idleMinutes: 30 });+ await saveRemoteAgentLimits({ idleMinutes: 0 });+ expect(readRemoteAgentLimitsState()).toMatchObject({+ value: { perDevice: 24, total: 64, idleMinutes: 0 }, customizedKeys: ['perDevice', 'idleMinutes'],+ });+ expect(JSON.parse(await fs.readFile(path.join(state.root, 'a', 'remote-agent-limits.json'), 'utf8')))+ .toEqual({ perDevice: 24, idleMinutes: 0 });});it.each([{ perDevice: 0, total: 64 }, { perDevice: 2, total: 1 },{ perDevice: 1.5, total: 64 }, { perDevice: 16, total: 1001 },{ perDevice: NaN, total: 64 }, { perDevice: 16, total: Infinity },+ { perDevice: 16, total: 64, idleMinutes: -1 }, { perDevice: 16, total: 64, idleMinutes: 1441 },+ { perDevice: 16, total: 64, idleMinutes: 2.5 },])('rejects invalid settings %j', async value => {expect(isRemoteAgentLimits(value)).toBe(false);await expect(saveRemoteAgentLimits(value)).rejects.toThrow('INVALID_PARAMS');@@ -70,32 +84,3 @@ describe('remote task limit overrides', () => {await expect(saveRemoteAgentLimits({ perDevice: 4, total: 8 })).rejects.toThrow('PRECONDITION_FAILED');});});--// 使用方这台电脑的闲置释放设置(连接池):同一套按账号存储的覆盖文件。-describe('idle release setting', () => {- it('defaults to off (0), keeps explicit choices per account and resets by deleting the override', async () => {- expect(readRemoteAgentIdleReleaseState()).toEqual({ value: { idleMinutes: 0 }, defaults: { idleMinutes: 0 }, isCustomized: false });- await saveRemoteAgentIdleRelease({ idleMinutes: 10 });- expect(readRemoteAgentIdleReleaseMinutes()).toBe(10);- expect(JSON.parse(await fs.readFile(path.join(state.root, 'a', 'remote-agent-idle-release.json'), 'utf8'))).toEqual({ idleMinutes: 10 });- await saveRemoteAgentIdleRelease({ idleMinutes: 0 });- expect(readRemoteAgentIdleReleaseState().isCustomized).toBe(true);- state.owner = 'b';- expect(readRemoteAgentIdleReleaseState().isCustomized).toBe(false);- state.owner = 'a';- await saveRemoteAgentIdleRelease(null);- expect(readRemoteAgentIdleReleaseState()).toMatchObject({ value: { idleMinutes: 0 }, 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(0);- });-});diff --git a/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts b/apps/desktop/src/main/remote-agent/__tests__/poll.test.tsindex d64e7e2a5e..b1925f912d 100644--- a/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts@@ -145,6 +145,35 @@ describe('multiplexed poll', () => {await vi.advanceTimersByTimeAsync(REMOTE_AGENT_READ_WAIT_MS);}});+ // provider-sharing.md §3「闲置收回由提供方决定」:本机还有对方看不到的工作(Codex 在本机起的进程)时,拉取带 hold,+ // 对方不按闲置收回;工作结束就不再带。判断出错时照常拉取、不带 hold(否则可能永远不收回)。+ it('marks only runs with local work as held, and stops once that work ends', async () => {+ const host = fakeHost(20);+ const busy = collector('busy');+ const idle = collector('idle');+ const broken = collector('broken');+ let holding = true;+ busy.run.holdsRemote = () => holding;+ broken.run.holdsRemote = () => { throw new Error('boom'); };+ const sinks = [busy, idle, broken];+ for (const sink of sinks) host.add(sink.run.runId);+ const poller = new RemoteAgentPoller((args) => host.invoke(args));+ const held = (call: (typeof host.calls)[number]) =>+ (call.runs as Array<{ runId: string; hold?: true }>).filter((run) => run.hold).map((run) => run.runId);+ try {+ for (const sink of sinks) poller.register(sink.run);+ await until(() => host.calls.some((call) => call.runs.length === 3));+ expect(held(host.calls.find((call) => call.runs.length === 3)!)).toEqual(['busy']);+ holding = false;+ const seen = host.calls.length;+ await until(() => host.calls.length > seen + 2);+ expect(held(host.calls.at(-1)!)).toEqual([]);+ expect(sinks.every((sink) => sink.lost === null)).toBe(true);+ } finally {+ sinks.forEach((sink) => poller.unregister(sink.run.runId));+ }+ });+it('keeps pulling a run registered during a long wait, without waiting for the old poll to time out', async () => {// 被控端照实挂满等待时间:旧的长等待只覆盖第一个任务。const host = fakeHost(10_000);diff --git a/apps/desktop/src/main/remote-agent/__tests__/runClientClose.test.ts b/apps/desktop/src/main/remote-agent/__tests__/runClientClose.test.tsindex fb70bbdd62..23630ae38c 100644--- a/apps/desktop/src/main/remote-agent/__tests__/runClientClose.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/runClientClose.test.ts@@ -29,6 +29,6 @@ describe('RemoteAgentRunClient.close', () => {message: expect.stringMatching(/DEVICE_LINK_NOT_CONNECTED/),});expect(client.isClosed).toBe(true);- expect(seen.onClosed).toHaveBeenCalledWith('closed', undefined);+ expect(seen.onClosed).toHaveBeenCalledWith('closed', undefined, false);});});diff --git a/apps/desktop/src/main/remote-agent/controller/connectionPool.ts b/apps/desktop/src/main/remote-agent/controller/connectionPool.tsindex 2b3a1f40fe..3f41b61a98 100644--- a/apps/desktop/src/main/remote-agent/controller/connectionPool.ts+++ b/apps/desktop/src/main/remote-agent/controller/connectionPool.ts@@ -11,8 +11,9 @@* 水位线以下。上限很小(1~4)时水位线就等于上限,「快满」等同「已满」,不提前让,只走下面两条按需的;* - 打开前已满:先让一个再打开;* - 对方以名额已满拒绝打开:让一个再重试一次。- * 只有「不忙」且闲置满设置时长的连接才有资格让;没有就不动,由对方的上限做最终裁决。设置为 0 时- * 一个都不让(与没有连接池时一样,满了直接报错)。+ * 只有「不忙」且闲置满对方电脑声明的闲置收回时长(`caps.idleReclaimMinutes`,由对方主人设置)的连接才有资格让;+ * 没有就不动,由对方的上限做最终裁决。对方没声明(旧版)或设为 0 时一个都不让(满了直接报错)。闲置满这个时长的+ * 任务对方本来也会自己收回(本机按 idleReclaimed 处理成已让出),这里只是名额紧张时不必等它那一轮巡检。* 不排队等名额。对方整机合计上限(TOTAL_LIMIT)本机看不到别的设备的占用,只能靠被拒后处理。*/export const REMOTE_AGENT_POOL_WATERMARK_RATIO = 0.8;@@ -50,8 +51,11 @@ export function isRemoteRunLimitError(error: unknown): boolean {}export interface RemoteConnectionPoolOptions {- /** 闲置满多少分钟才有资格让出名额;0 = 不让。每次判断时读取。 */- idleMinutes(): number;+ /**+ * 闲置满多少分钟才有资格让出名额;0 = 不让。每次判断时读取。缺省用对方电脑最近一次在 caps 里声明的+ * 闲置收回时长(noteIdleReclaimMinutes)。+ */+ idleMinutes?(): number;now?: () => number;checkMs?: number;closeRetryMs?: number;@@ -67,6 +71,8 @@ export class RemoteConnectionPool {*/private readonly held = new Map<PooledRemoteConnection, { end: () => void; retryClose: () => Promise<unknown> }>();private maxRuns: number | null = null;+ /** 对方最近一次声明的闲置收回时长(分钟);旧版对方不声明,按 0。 */+ private idleReclaimMinutes = 0;private timer: ReturnType<typeof setInterval> | null = null;/** 让出名额一次只做一个,避免几条路径同时挑中不同的连接、多让。 */private chain: Promise<unknown> = Promise.resolve();@@ -97,6 +103,11 @@ export class RemoteConnectionPool {if (Number.isInteger(maxRuns) && maxRuns >= 1) this.maxRuns = maxRuns;}+ /** 对方最近一次声明的闲置收回时长(每次打开前 caps 拿到;没声明 = 旧版,不让)。 */+ noteIdleReclaimMinutes(minutes: number | undefined): void {+ this.idleReclaimMinutes = Number.isInteger(minutes) && minutes! > 0 ? minutes! : 0;+ }+get size(): number {return this.members.size;}@@ -162,7 +173,7 @@ export class RemoteConnectionPool {/** 有资格让出名额:不忙,且闲置满设置时长(0 = 都没有资格)。 */private isEligible(member: PooledRemoteConnection): boolean {- const minutes = this.options.idleMinutes();+ const minutes = this.options.idleMinutes?.() ?? this.idleReclaimMinutes;if (!Number.isFinite(minutes) || minutes <= 0) return false;return member.occupiesSlot() && member.isIdle() && this.now() - member.lastActivityAt() >= minutes * 60_000;}diff --git a/apps/desktop/src/main/remote-agent/controller/idleReleaseStore.ts b/apps/desktop/src/main/remote-agent/controller/idleReleaseStore.tsdeleted file mode 100644index 2d4df0d7a9..0000000000--- a/apps/desktop/src/main/remote-agent/controller/idleReleaseStore.ts+++ /dev/null@@ -1,51 +0,0 @@-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/poller.ts b/apps/desktop/src/main/remote-agent/controller/poller.tsindex cb22a60676..483a1ad2e3 100644--- a/apps/desktop/src/main/remote-agent/controller/poller.ts+++ b/apps/desktop/src/main/remote-agent/controller/poller.ts@@ -35,6 +35,8 @@ export interface PolledRun {onData(data: Buffer, done: boolean): void;/** 任务已不能再拉取(对方不认识这个任务、协议错误或对方长时间不可达)。 */onLost(reason: string, error: RemoteAgentErrorInfo): void;+ /** 本机还有这个任务的工作在进行、对方看不到(拉取时报 hold,对方不按闲置收回)。 */+ holdsRemote?(): boolean;}interface Entry {@@ -107,8 +109,16 @@ export class RemoteAgentPoller {void this.pollOnce();}- private snapshot(): Array<{ runId: string; cursor: number }> {- const all = [...this.entries.values()].map((entry) => ({ runId: entry.run.runId, cursor: entry.cursor }));+ private snapshot(): Array<{ runId: string; cursor: number; hold?: true }> {+ const all = [...this.entries.values()].map((entry) => {+ let hold = false;+ try {+ hold = entry.run.holdsRemote?.() === true;+ } catch {+ // 判断失败时照常拉取,不报 hold。+ }+ return { runId: entry.run.runId, cursor: entry.cursor, ...(hold ? { hold: true as const } : {}) };+ });if (all.length <= REMOTE_AGENT_MAX_POLL_RUNS) return all;// 按整批推进,避免大量空闲任务在下次被拉取前超过 host 的存活期限。const start = this.rotation % all.length;diff --git a/apps/desktop/src/main/remote-agent/controller/runClient.ts b/apps/desktop/src/main/remote-agent/controller/runClient.tsindex 9f7d4db8f6..a772a6a03f 100644--- a/apps/desktop/src/main/remote-agent/controller/runClient.ts+++ b/apps/desktop/src/main/remote-agent/controller/runClient.ts@@ -59,7 +59,10 @@ export interface RemoteAgentRunHandlers {onState(state: Record<string, unknown>): void;onRequest(request: RemoteAgentReverseRequest, signal: AbortSignal): Promise<RemoteAgentReply>;onWs(item: Extract<RemoteAgentStreamItem, { t: 'ws' }>): void;- onClosed(reason: string, error?: RemoteAgentErrorInfo): void;+ /** idleReclaimed:对方按主人设置的时长收回了这个闲置任务(事件流 `closed` 带 idleReclaimed)。 */+ onClosed(reason: string, error?: RemoteAgentErrorInfo, idleReclaimed?: boolean): void;+ /** 本机还有这个任务的工作在进行、对方看不到(拉取时报 hold,对方不按闲置收回)。 */+ holdsRemote?(): boolean;}function sleep(ms: number): Promise<void> {@@ -219,12 +222,16 @@ export class RemoteAgentRunClient implements PolledRun {return this.closed;}+ holdsRemote(): boolean {+ return !this.closed && this.handlers.holdsRemote?.() === true;+ }+/** 还有没收尾的往来:在等的方法结果、正在回答的反向请求(权限确认、执行器 / 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 {+ private finish(reason: string, error?: RemoteAgentErrorInfo, idleReclaimed = false): void {if (this.closed) return;this.closed = true;this.poller.unregister(this.runId);@@ -236,7 +243,7 @@ export class RemoteAgentRunClient implements PolledRun {this.inflight.clear();for (const pending of this.pendingCalls.values()) pending.reject(failure);this.pendingCalls.clear();- this.handlers.onClosed(reason, error);+ this.handlers.onClosed(reason, error, idleReclaimed);}/** 拉取器交付的新数据(已去重,从上次的游标开始)。 */@@ -305,7 +312,7 @@ export class RemoteAgentRunClient implements PolledRun {this.handlers.onWs(item);return;case 'closed':- this.finish(item.reason, item.error);+ this.finish(item.reason, item.error, item.idleReclaimed === true);return;}}diff --git a/apps/desktop/src/main/remote-agent/controller/service.ts b/apps/desktop/src/main/remote-agent/controller/service.tsindex 7c0e7801f4..ad6f25c18f 100644--- a/apps/desktop/src/main/remote-agent/controller/service.ts+++ b/apps/desktop/src/main/remote-agent/controller/service.ts@@ -80,11 +80,6 @@ export interface DeviceAgentServiceDeps {webFetch?: GuardedFetch;/** 受邀者任务里凭证类操作确认卡上的说明(按界面语言)。 */sharedProviderCredentialNotice?(): string;- /**- * 名额紧张时,闲置满多少分钟的任务可以让出那台电脑上的 Agent 进程(0 = 不让)。缺省时不让,- * 与没有连接池时一样。每次判断时读取,设置改了立即生效。- */- idleReleaseMinutes?(): number;logger: Logger;}@@ -159,12 +154,13 @@ 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 的电脑一个连接池:对方按这台设备计名额,池里算的是本机在那台上开着的连接。+ // 每台运行 Agent 的电脑一个连接池:对方按这台设备计名额,池里算的是本机在那台上开着的连接;+ // 闲置多久可以让出按那台主人设置的闲置收回时长(每次打开前从 caps 读)。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 });+ pool = new RemoteConnectionPool({ log });pools.set(deviceId, pool);}return pool;diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.tsindex 499ef9ab6e..c9b2611924 100644--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts@@ -6,8 +6,9 @@* 本机 Maker / Session 来说就是普通会话。** 本机部分(执行器及其中的后台命令、本机 MCP 身份、Codex 执行环境中继)跟着句柄走;对方电脑上的- * Agent 进程是一条可以让出的连接:名额紧张时连接池(connectionPool.ts)只结束对方的进程,要它干活时- * 带原来的会话 id 连回来,接回同一套本机部分。+ * Agent 进程是一条可以让出的连接:名额紧张时连接池(connectionPool.ts)只结束对方的进程,对方按主人+ * 设置的时长收回闲置任务(事件流 `closed` 带 idleReclaimed)时也一样,要它干活时带原来的会话 id 连回来,+ * 接回同一套本机部分。*/import os from 'node:os';import path from 'node:path';@@ -552,7 +553,7 @@ export async function startRemoteAgentSession(if (relay) relay.handle(item);else if (item.kind === 'open') void client.push([{ connId: item.connId, kind: 'close' }]).catch(() => undefined);},- onClosed: (reason, error) => {+ onClosed: (reason, error, idleReclaimed) => {// 让出名额或已被换下的连接:不是任务结束。if (active !== client || linkState === 'releasing') return;if (!opened) {@@ -560,10 +561,20 @@ export async function startRemoteAgentSession(return;}active = null;+ // 对方按闲置收回了它的 Agent 进程(它只收回不忙的任务):与连接池让出名额一样,本机部分与对话都留着,+ // 要它干活时带原来的会话 id 连回。+ if (idleReclaimed && controller) {+ relay?.reset();+ linkState = 'released';+ deps.log?.info('remote agent connection reclaimed by the other computer', { kind, runId: client.runId });+ return;+ }linkState = 'closed';if (controller) controller.onClosed(reason, error?.message);else void disposeLocal();},+ // Codex 经执行环境在本机起的进程还在跑(对方看不到):拉取时告诉对方,免得被当成闲置收回。+ holdsRemote: () => isCurrent() && relay?.busy() === true,}, deps.newId, deps.log);if (stateNow() === 'closed') throw new Error('[REMOTE_AGENT_EXPIRED] The task has ended on this computer.');active = client;@@ -693,6 +704,7 @@ export async function startRemoteAgentSession(throw new Error('[REMOTE_AGENT_UNSUPPORTED] The other computer does not support the virtual workspace required to protect local paths.');}deps.pool?.noteMaxRuns(caps.maxRuns);+ deps.pool?.noteIdleReclaimMinutes(caps.idleReclaimMinutes);await deps.pool?.beforeOpen(member);const payload = await buildPayload(reconnect);try {diff --git a/apps/desktop/src/main/remote-agent/host/limitsStore.ts b/apps/desktop/src/main/remote-agent/host/limitsStore.tsindex 9dc696d366..562b269f29 100644--- a/apps/desktop/src/main/remote-agent/host/limitsStore.ts+++ b/apps/desktop/src/main/remote-agent/host/limitsStore.ts@@ -10,7 +10,8 @@ const store = createOverrideSettingsFile<RemoteAgentLimits>({scopeKey: () => { captureProviderManagementScope(); return activeOwnerScopeKey(); },defaults: DEFAULT_REMOTE_AGENT_LIMITS,normalize: raw => isRemoteAgentLimits(raw)- ? { perDevice: raw.perDevice, total: raw.total } : { ...DEFAULT_REMOTE_AGENT_LIMITS },+ ? { perDevice: raw.perDevice, total: raw.total, idleMinutes: raw.idleMinutes ?? DEFAULT_REMOTE_AGENT_LIMITS.idleMinutes }+ : { ...DEFAULT_REMOTE_AGENT_LIMITS },log: createLogger('remote-agent:limits'),label: 'remote-agent-limits',preserveUnreadableFile: true,diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex b18bab1e7b..5a07b39f3d 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -14,6 +14,8 @@ import { DEFAULT_REMOTE_AGENT_LIMITS, type RemoteAgentLimits, type RemoteAgentLi* - 其他账号的控制端(供应商分享的受邀者,deps.controllerTrust 判定)不可信:载荷按白名单复核* (guestIsolation.ts),只开放已隔离的 Agent,只能恢复自己建立的会话;* - 本机从不主动向控制端发起请求,一切经控制端拉取的事件流交付;控制端长时间不拉取视为离开;+ * - 任务不忙且闲置满主人设置的时长(远程任务数量里的「闲置收回」)就结束它的 Agent 进程,事件流以带+ * idleReclaimed 的 `closed` 收尾,控制端再要它干活时带原来的会话 id 重新打开;* - 本机的地址、凭证与供应商配置不进事件流:事件只含 Agent 输出与反向请求;* - open / call / reply / push / close 都按各自的 id 去重,poll 按游标幂等;* - 同一控制端的全部任务共用一个 poll,任务再多也只占设备互联的一个在途请求。@@ -97,6 +99,11 @@ const gunzipAsync = promisify(gunzip);export const REMOTE_AGENT_HOST_UNREAD_BYTES = 64 * 1024 * 1024;/** 运行中的任务超过这么久没有被读取,视为控制端已离开。 */export const REMOTE_AGENT_HOST_IDLE_MS = 3 * 60_000;+/**+ * 控制端在 poll 里报「这边还有工作在进行」(hold)后,本机多久内仍按有活动算。只给中转用:组所在电脑据此+ * 在拉取组内电脑时接着报 hold;控制端每次 poll 最长挂起 10 秒,任务很多时按批轮转,留足余量。+ */+const REMOTE_HOLD_FRESH_MS = 60_000;/** 结束后保留一段时间供控制端读完收尾事件。 */export const REMOTE_AGENT_HOST_RETAIN_MS = 60_000;/** 「需要换一台」凭证多久内有效(受邀者那边交接通常几秒内完成,重开时带回)。 */@@ -332,6 +339,8 @@ interface RelayBackend {started: boolean;/** 那台上正在运行一轮(按它报来的状态)。 */turnRunning: boolean;+ /** 那台报来的忙闲状态(在准备回合、后台任务、待唤醒续跑):本机按闲置收回时与本机 Agent 同一判据。 */+ activity: Record<string, unknown>;/** 推帧按任务串行,保证 Codex exec-server 帧的顺序。 */pushChain: Promise<void>;model?: string;@@ -364,6 +373,17 @@ interface Run {kind: RemoteAgentKind;log: EventLog;lastReadAt: number;+ /**+ * 最后一次活动(闲置收回从这里算起):打开、控制端的调用 / 回包 / 推帧、写进事件流的非状态行、控制端报 hold,+ * 以及巡检时看到它还忙。只被拉取(poll)不算:闲着的任务控制端也一直在拉。+ */+ activeAt: number;+ /** 控制端最近一次在 poll 里报 hold 的时间(中转时接着报给组内电脑)。 */+ heldAt?: number;+ /** 回到某条消息后、下一轮跑完前:Claude Code 要到下一次发送才截断对话,结束进程会丢掉这次回退。 */+ rewindPending?: boolean;+ /** 按闲置收回结束(收尾的 `closed` 行带 idleReclaimed)。 */+ idleReclaimed?: boolean;closedAt?: number;closing: boolean;handle?: AgentSessionHandle;@@ -516,6 +536,26 @@ export function snapshotHandleState(handle: AgentSessionHandle): Record<string,return JSON.parse(JSON.stringify(state)) as Record<string, unknown>;}+/**+ * 状态里还有放不下的事:在跑或在准备的回合、后台任务、待唤醒续跑。与控制端判断能否让出名额同一判据+ * (controller/proxyHandle.ts isQuiet)。+ */+function activityBusy(state: Record<string, unknown>): boolean {+ return state.turnRunning === true+ || state.preparing === true+ || (Array.isArray(state.backgroundTasks) && state.backgroundTasks.length > 0)+ || (typeof state.pendingWake === 'number' && state.pendingWake > 0);+}++function handleActivity(handle: AgentSessionHandle): Record<string, unknown> {+ return {+ turnRunning: safeCall(handle.isTurnRunning?.bind(handle)),+ preparing: safeCall(handle.isPreparingUserTurn?.bind(handle)),+ backgroundTasks: safeCall(handle.listBackgroundTasks?.bind(handle)),+ pendingWake: safeCall(handle.countPendingWakeContinuations?.bind(handle)),+ };+}+/** 启动结果里给控制端的会话描述(静态部分 + 支持哪些可选方法)。 */function describeHandle(handle: AgentSessionHandle, shadowDir: string, mirrorRoot: string, extraDirs: readonly string[], writableDirs: readonly string[], virtualWorkspace: boolean, previousMirrorRoots: readonly string[] = []): Record<string, unknown> {const methods = REMOTE_AGENT_METHODS.filter((method) => typeof (handle as unknown as Record<string, unknown>)[method] === 'function');@@ -779,11 +819,34 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}}+ /** 主人设置的闲置收回时长(分钟,0 = 不收回);caps 声明的与巡检用的是同一个值。 */+ function idleReclaimMinutes(): number {+ return (deps.readLimits?.() ?? DEFAULT_REMOTE_AGENT_LIMITS).idleMinutes ?? 0;+ }++ /**+ * 不能按闲置收回:有在等控制端回包的反向请求(权限确认、执行器 / MCP 请求)、在执行的方法调用、待生效的回退,+ * 还没启动好,或 Agent 那边还有放不下的事(中转任务按组内电脑报来的状态)。+ */+ function busyForReclaim(run: Run): boolean {+ if (run.pending.size > 0 || run.rewindPending) return true;+ for (const status of run.calls.values()) if (status === 'running') return true;+ if (run.relay) return !run.relay.started || activityBusy(run.relay.activity);+ return !run.handle || activityBusy(handleActivity(run.handle));+ }+function sweep(): void {const t = now();for (const [uploadKey, upload] of uploads) {if (t - upload.touchedAt > UPLOAD_IDLE_MS) uploads.delete(uploadKey);}+ let reclaimMs = 0;+ try {+ reclaimMs = idleReclaimMinutes() * 60_000;+ } catch (error) {+ // 换账号途中读不到设置:这一轮不收回。+ deps.log?.warn('remote agent: idle reclaim setting unavailable', { error: String(error) });+ }for (const run of runs.values()) {if (run.closedAt !== undefined) {if (t - run.closedAt > REMOTE_AGENT_HOST_RETAIN_MS) void disposeRun(run);@@ -795,6 +858,16 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {void finishRun(run, 'account-changed', 'account-boundary');} else if (t - run.lastReadAt > REMOTE_AGENT_HOST_IDLE_MS) {void finishRun(run, 'controller-gone', 'navigation');+ } else if (run.closing) {+ continue;+ } else if (busyForReclaim(run)) {+ // 忙到哪一刻,闲置就从哪一刻算起(后台任务跑得再久,结束后也要再闲置满设置的时长)。+ run.activeAt = t;+ } else if (reclaimMs > 0 && t - run.activeAt >= reclaimMs) {+ deps.log?.info('remote agent: reclaiming an idle run', { runId: run.id, idleMinutes: reclaimMs / 60_000 });+ // 原因写旧控制端也认识的 `ended`(静默收起,下次发消息重建并接回);新控制端按 idleReclaimed 保留本机部分。+ run.idleReclaimed = true;+ void finishRun(run, 'ended', 'navigation');}}stopSweepIfIdle();@@ -871,6 +944,10 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}function appendPrepared(run: Run, item: unknown): void {+ const line = item as { t?: unknown; event?: { type?: unknown } };+ // 状态行在闲着时也可能有变化(用量等),不算活动;忙闲由巡检直接看。+ if (line.t !== 'state') run.activeAt = now();+ if (line.t === 'event' && line.event?.type === 'done') run.rewindPending = false;if (run.log.append(item)) return;if (!run.closing) {deps.log?.warn('remote agent event log overflow; ending run', { runId: run.id });@@ -1525,6 +1602,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {attempt,started: false,turnRunning: false,+ activity: {},pushChain: Promise.resolve(),load,};@@ -1554,11 +1632,20 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {for (const fn of queue) fn();});};- /** 那台上的任务开始运行之后结束了:这个任务也结束。 */- const relayClosed = (reason: string, error?: RemoteAgentErrorInfo) => {+ /**+ * 那台上的任务开始运行之后结束了:这个任务也结束。那台按闲置收回的(idleReclaimed)原样转告受邀者,+ * 它连回时组所在电脑按会话记录回到同一台。+ */+ const relayClosed = (reason: string, error?: RemoteAgentErrorInfo, idleReclaimed = false) => {const finish = () => {if (run.closing) return;- append(run, { t: 'closed', reason, ...(error ? { error: relayErrorForGuest(error) } : {}) });+ if (idleReclaimed) run.idleReclaimed = true;+ append(run, {+ t: 'closed',+ reason,+ ...(error ? { error: relayErrorForGuest(error) } : {}),+ ...(idleReclaimed ? { idleReclaimed: true } : {}),+ });void finishRun(run, reason, 'navigation', false, true);};// 一轮进行中那台的任务意外结束(离线、崩溃等):与终态错误一样可以换一台。@@ -1610,6 +1697,9 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {backend.turnRunning = state.turnRunning;backend.load.setRunning(state.turnRunning);}+ for (const field of ['turnRunning', 'preparing', 'backgroundTasks', 'pendingWake'] as const) {+ if (field in state) backend.activity[field] = state[field];+ }if (run.hostSessionId) {void recordGuestSession(run.controller, undefined, run.hostSessionId, [typeof state.id === 'string' ? state.id : undefined,@@ -1640,14 +1730,16 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {if (!run.closing) append(run, { ...item, connId });});},- onClosed: (reason, error) => {+ onClosed: (reason, error, idleReclaimed) => {if (run.relay !== backend || run.closing) return;if (!backend.started) {closedEarly = { reason, ...(error ? { error } : {}) };return;}- relayClosed(reason, error);+ relayClosed(reason, error, idleReclaimed);},+ // 受邀者那边还有这个任务的工作(它在拉取本机时报的 hold):接着报给组内电脑,免得那台按闲置收回。+ holdsRemote: () => run.heldAt !== undefined && now() - run.heldAt < REMOTE_HOLD_FRESH_MS,}, randomUUID, deps.log);run.relay = backend;try {@@ -1773,6 +1865,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}const value = await relay.client.callWithId(callId, method, callArgs);if (method === 'setModel' && typeof args[0] === 'string') run.authorizedModel = args[0];+ if (method === 'commitRewindFiles') run.rewindPending = true;append(run, { t: 'result', callId, ok: true, ...(value !== undefined ? { value: JSON.parse(JSON.stringify(value)) } : {}) });} catch (error) {append(run, { t: 'result', callId, ok: false, error: relayErrorInfoFrom(error) });@@ -1831,10 +1924,10 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {// Native image materialization must finish before the log becomes unreadable.await imagePreparation.get(run);// 收尾事件绕过 closing 判断直接写入。- if (!skipClosedEvent) run.log.append({ t: 'closed', reason });+ if (!skipClosedEvent) run.log.append({ t: 'closed', reason, ...(run.idleReclaimed ? { idleReclaimed: true } : {}) });run.log.end();run.closedAt = now();- deps.log?.info('remote agent run finished', { runId: run.id, reason });+ deps.log?.info('remote agent run finished', { runId: run.id, reason, ...(run.idleReclaimed ? { idleReclaimed: true } : {}) });}async function disposeRun(run: Run): Promise<void> {@@ -1960,6 +2053,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}if (nextProviderId && !run.closing) run.providerId = nextProviderId;if (method === 'setModel' && typeof args[0] === 'string' && !run.closing) run.authorizedModel = args[0];+ if (method === 'commitRewindFiles') run.rewindPending = true;append(run, { t: 'result', callId, ok: true, ...(value !== undefined ? { value: JSON.parse(JSON.stringify(value)) } : {}) });} catch (error) {append(run, { t: 'result', callId, ok: false, error: remoteAgentErrorInfo(error) });@@ -1980,15 +2074,18 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {async function poll(controller: string,- wanted: ReadonlyArray<{ runId: string; cursor: number }>,+ wanted: ReadonlyArray<{ runId: string; cursor: number; hold?: true }>,waitMs: number,signal?: AbortSignal,): Promise<RemoteAgentPollResult> {const touch = () => {const t = now();- for (const { runId } of wanted) {+ for (const { runId, hold } of wanted) {const run = runs.get(key(controller, runId));- if (run) run.lastReadAt = t;+ if (!run) continue;+ run.lastReadAt = t;+ // 控制端那边还有这个任务的工作在进行:按有活动算,不按闲置收回。+ if (hold) run.activeAt = run.heldAt = t;}};const live = () => wanted.flatMap(({ runId, cursor }) => {@@ -2281,13 +2378,15 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}case 'caps': {const guest = trustOf(controller) === 'guest';+ const limits = deps.readLimits?.() ?? DEFAULT_REMOTE_AGENT_LIMITS;const caps: RemoteAgentCaps = {version: REMOTE_AGENT_VERSION,agents: (['claude-code', 'codex', 'pi'] as const).map((kind) => ({kind,available: deps.isAgentAvailable(kind) && (!guest || GUEST_SUPPORTED_AGENTS.has(kind)),})),- maxRuns: (deps.readLimits?.() ?? DEFAULT_REMOTE_AGENT_LIMITS).perDevice,+ maxRuns: limits.perDevice,+ idleReclaimMinutes: limits.idleMinutes ?? 0,uploadChunkBytes: REMOTE_AGENT_UPLOAD_CHUNK_BYTES,maxPayloadBytes: REMOTE_AGENT_MAX_PAYLOAD_BYTES,virtualWorkspace: true,@@ -2458,6 +2557,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {kind: request.agentKind,log: new EventLog(REMOTE_AGENT_HOST_UNREAD_BYTES),lastReadAt: now(),+ activeAt: now(),closing: false,// runId 由控制端取,按控制端分目录:不同控制端的同名 runId 不会共用、互删附件。attachmentsDir: path.join(deps.runsRoot, 'attachments', controllerDir(controller), request.runId),@@ -2501,6 +2601,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {return {};}run.calls.set(request.callId, 'running');+ run.activeAt = now();void call(run, request.callId, request.method, request.payload);return {};}@@ -2516,6 +2617,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}const reply = parseRemoteAgentReply(await resolvePayload(controller, request.payload));run.pending.delete(request.requestId);+ run.activeAt = now();pending.resolve(reply);return {};}@@ -2523,6 +2625,8 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {const run = requireRun(controller, request.runId);if (run.pushSeq.has(request.seq)) return {};run.pushSeq.add(request.seq);+ // Codex 执行环境在控制端的输出与回包:控制端那边还在干活。+ run.activeAt = now();if (run.pushSeq.size > 1024) run.pushSeq.delete(run.pushSeq.values().next().value as number);const relay = run.relay;if (relay) {diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsxindex 821a688aff..e28e47133a 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx@@ -1,6 +1,5 @@import { ProviderShareVisibilitySection } from './ProviderShareVisibilitySection';import { RemoteModelAccessSection, RemoteModelAccessDialog } from './RemoteModelAccessSection';-import { RemoteAgentIdleReleaseSection } from './RemoteAgentIdleReleaseSection';import { RemoteAgentLimitsSection } from './RemoteAgentLimitsSection';/*** 「{供应商} · 远程与分享」页(供应商分享 §7.2;供应商组 §10)。从设置 → 模型供应商「允许被远程调用」一行的@@ -531,9 +530,6 @@ export function ProviderShareManagePage({time={time}/>- {/* 这台电脑作为使用方的设置(与上面提供方的额度分开):只对这台生效,管理另一台电脑时不显示,免得以为改的是那台。 */}- {!deviceId && <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.tsxdeleted file mode 100644index 8b3bd2efe1..0000000000--- a/apps/desktop/src/renderer/features/provider-share/RemoteAgentIdleReleaseSection.tsx+++ /dev/null@@ -1,109 +0,0 @@-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/RemoteAgentLimitsSection.tsx b/apps/desktop/src/renderer/features/provider-share/RemoteAgentLimitsSection.tsxindex d8e726377d..cb2efebc50 100644--- a/apps/desktop/src/renderer/features/provider-share/RemoteAgentLimitsSection.tsx+++ b/apps/desktop/src/renderer/features/provider-share/RemoteAgentLimitsSection.tsx@@ -6,14 +6,22 @@ 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 { isRemoteAgentLimits, REMOTE_AGENT_LIMIT_MAX, type RemoteAgentLimitsView } from '../../../shared/remoteAgentLimits';+import {+ isRemoteAgentLimits,+ isRemoteAgentLimitsPatch,+ REMOTE_AGENT_IDLE_MINUTES_MAX,+ REMOTE_AGENT_LIMIT_MAX,+ type RemoteAgentLimitsView,+} from '../../../shared/remoteAgentLimits';import { providerManagementErrorKey, providerShareManagementCommand } from '../provider-group/providerManagement';-/** 各供应商管理页共用同一份提供方额度;只展示提供方自己的占用合计。 */+type LimitKey = 'perDevice' | 'total' | 'idleMinutes';++/** 各供应商管理页共用同一份提供方额度与闲置收回时长;只展示提供方自己的占用合计。 */export function RemoteAgentLimitsSection({ deviceId }: { deviceId?: string }) {const { t } = useTranslation();const [view, setView] = useState<RemoteAgentLimitsView | null>(null);- const [draft, setDraft] = useState<Partial<{ perDevice: string; total: string }> | null>(null);+ const [draft, setDraft] = useState<Partial<Record<LimitKey, string>> | null>(null);const [errorKey, setErrorKey] = useState<string | null>(null);const [busy, setBusy] = useState(false);const saving = useRef(false);@@ -46,10 +54,22 @@ export function RemoteAgentLimitsSection({ deviceId }: { deviceId?: string }) {return () => { sequence.current += 1; reading.current = null; window.clearInterval(timer); };}, [load]);- const values = { perDevice: String(view?.value.perDevice ?? ''), total: String(view?.value.total ?? ''), ...draft };- const limits = { perDevice: Number(values.perDevice), total: Number(values.total) };- const valid = isRemoteAgentLimits(limits);- const changed = view && (['perDevice', 'total'] as const).some(key =>+ // 远程管理旧版电脑时它的设置里没有闲置收回:不显示这一项,也不提交(旧版会拒绝不认识的字段)。+ const idleSupported = typeof view?.value.idleMinutes === 'number';+ const keys: LimitKey[] = idleSupported ? ['perDevice', 'total', 'idleMinutes'] : ['perDevice', 'total'];+ const values: Record<LimitKey, string> = {+ perDevice: String(view?.value.perDevice ?? ''),+ total: String(view?.value.total ?? ''),+ idleMinutes: String(view?.value.idleMinutes ?? ''),+ ...draft,+ };+ const limits: Record<LimitKey, number> = {+ perDevice: Number(values.perDevice), total: Number(values.total), idleMinutes: Number(values.idleMinutes),+ };+ const countsValid = isRemoteAgentLimits({ perDevice: limits.perDevice, total: limits.total });+ const idleValid = !idleSupported || (values.idleMinutes.trim() !== '' && isRemoteAgentLimitsPatch({ idleMinutes: limits.idleMinutes }));+ const valid = countsValid && idleValid;+ const changed = view && keys.some(key =>draft?.[key] !== undefined && (limits[key] !== view.value[key] || !view.customizedKeys.includes(key)));const save = async (reset: boolean) => {@@ -60,10 +80,9 @@ export function RemoteAgentLimitsSection({ deviceId }: { deviceId?: string }) {const owner = getDataOwnerGeneration();try {const next = await providerShareManagementCommand(reset- ? { action: 'reset-run-limits' } : { action: 'set-run-limits', limits: {- ...(draft?.perDevice !== undefined ? { perDevice: limits.perDevice } : {}),- ...(draft?.total !== undefined ? { total: limits.total } : {}),- } }, deviceId);+ ? { action: 'reset-run-limits' } : { action: 'set-run-limits', limits: Object.fromEntries(+ keys.filter(key => draft?.[key] !== undefined).map(key => [key, limits[key]]),+ ) }, deviceId);if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;setView(next);setDraft(null);@@ -98,10 +117,21 @@ export function RemoteAgentLimitsSection({ deviceId }: { deviceId?: string }) {</FormField>))}</div>- {draft && !valid && <p role="alert" className="text-12 leading-[1.5] text-[var(--text-danger)]">{t('providerShare.runLimits.invalid', { max: REMOTE_AGENT_LIMIT_MAX })}</p>}+ {(draft?.perDevice !== undefined || draft?.total !== undefined) && !countsValid && <p role="alert" className="text-12 leading-[1.5] text-[var(--text-danger)]">{t('providerShare.runLimits.invalid', { max: REMOTE_AGENT_LIMIT_MAX })}</p>}<p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]" aria-live="polite">{t('providerShare.runLimits.usage', { used: view.usage.total, total: view.value.total, devices: view.usage.devices, largest: view.usage.largestDevice })}</p>+ {idleSupported && (+ <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">+ <FormField label={t('providerShare.runLimits.idleMinutes')} hint={t('providerShare.runLimits.idleHint')}+ error={draft?.idleMinutes !== undefined && !idleValid+ ? t('providerShare.runLimits.idleInvalid', { max: REMOTE_AGENT_IDLE_MINUTES_MAX }) : undefined}>+ {control => <Input {...control} type="number" min={0} max={REMOTE_AGENT_IDLE_MINUTES_MAX} step={1}+ disabled={busy || Boolean(errorKey)} value={values.idleMinutes} data-testid="remote-agent-limit-idleMinutes"+ onChange={value => setDraft(previous => ({ ...previous, idleMinutes: value }))} />}+ </FormField>+ </div>+ )}<p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">{t('providerShare.runLimits.applyHint')}</p><div className="flex flex-wrap gap-2"><Button type="submit" variant="cta" size="sm" disabled={busy || !valid || !changed || Boolean(errorKey)}>{t('providerShare.runLimits.save')}</Button>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 772eecb93c..04e9f01249 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@@ -10,7 +10,6 @@ import type { ProviderOwnUsageView, ProviderShareOwnerState, ProviderUsageHistorimport { __testing as localGroupsTesting } from '../../provider-group/useLocalProviderGroups';import { ProviderShareVisibilitySection } from '../ProviderShareVisibilitySection';import { ProviderShareManagePage } from '../ProviderShareManagePage';-import { RemoteAgentIdleReleaseSection } from '../RemoteAgentIdleReleaseSection';import {getProviderSharePendingRequests,getProviderSharePendingReshares,@@ -208,7 +207,6 @@ 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: 0 }, defaults: { idleMinutes: 0 }, 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}`);@@ -387,19 +385,6 @@ describe('ProviderShareManagePage', () => {expect(screen.getByText(/providerShare\.manage\.members\.statusRunning/)).toBeTruthy();});- // 闲置释放只对这台电脑生效:管理另一台电脑时不显示,免得以为改的是那台。- it('shows the idle release setting only when managing this computer', async () => {- renderPage();- expect(await screen.findByTestId('remote-agent-idle-release')).toBeTruthy();- expect(command).toHaveBeenCalledWith({ action: 'get-idle-release' });- cleanup();- command.mockClear();- renderPage('on', { deviceId: 'studio' });- await screen.findByTestId('remote-agent-limits');- expect(screen.queryByTestId('remote-agent-idle-release')).toBeNull();- expect(command).not.toHaveBeenCalledWith({ action: 'get-idle-release' });- });-/** 测试价值* - 生产入口与可观察结果:远程管理页构造待审批项;审批弹窗必须把决定发回目标电脑。@@ -918,52 +903,3 @@ describe('share visibility switches', () => {} finally { vi.useRealTimers(); }});});--/*- * 测试价值- * - 生产入口与可观察结果:RemoteAgentIdleReleaseSection 读、存、恢复默认这台电脑的闲置释放分钟数,非法值不能保存。- * - Bug/规则依据:protocol-compatibility.md「控制端连接池」,设置 0~120、默认 0 = 从不让出。- * - 现有覆盖缺口:页面用例只断言显示与否;主进程校验见 providerShareManagement.test.ts,界面这一侧的输入拦截与命令没有覆盖。- * - 最小失败输入:输入 121 / -1 / 1.5 / 空;保存 0 与默认值相同时也要按用户改过记下。- * - tier:unit(jsdom),并入同一功能的页面测试文件,共用宿主 mock。- */-const idleView = (idleMinutes = 0, isCustomized = false) => ({ value: { idleMinutes }, defaults: { idleMinutes: 0 }, isCustomized });-const idleInput = () => screen.getByTestId('remote-agent-idle-release-minutes') as HTMLInputElement;-const idleButton = (key: 'save' | 'reset') => screen.getByRole('button', { name: `providerShare.idleRelease.${key}` }) as HTMLButtonElement;--describe('RemoteAgentIdleReleaseSection', () => {- beforeEach(() => {- command.mockImplementation(async (cmd: { action: string; value?: { idleMinutes: number } }) => (- cmd.action === 'set-idle-release' ? idleView(cmd.value!.idleMinutes, true) : idleView()- ));- });-- it('reads and saves the setting on this computer, including 0 and an explicit default', async () => {- render(<RemoteAgentIdleReleaseSection />);- await waitFor(() => expect(idleInput().value).toBe('0'));- expect(command).toHaveBeenCalledWith({ action: 'get-idle-release' });- expect(screen.getByText('providerShare.idleRelease.hint')).toBeTruthy();- expect(idleButton('save').disabled).toBe(true);- fireEvent.change(idleInput(), { target: { value: '10' } });- fireEvent.click(idleButton('save'));- await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'set-idle-release', value: { idleMinutes: 10 } }));- await waitFor(() => expect(idleButton('reset').disabled).toBe(false));- fireEvent.change(idleInput(), { target: { value: '0' } });- fireEvent.click(idleButton('save'));- await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'set-idle-release', value: { idleMinutes: 0 } }));- });-- it('rejects values outside 0–120 and restores the default', async () => {- command.mockImplementation(async (cmd: { action: string }) => (cmd.action === 'reset-idle-release' ? idleView() : idleView(30, true)));- render(<RemoteAgentIdleReleaseSection />);- await waitFor(() => expect(idleInput().value).toBe('30'));- for (const value of ['121', '-1', '1.5', '']) {- fireEvent.change(idleInput(), { target: { value } });- expect(idleButton('save').disabled).toBe(true);- }- expect(screen.getByRole('alert').textContent).toContain('providerShare.idleRelease.invalid');- fireEvent.click(idleButton('reset'));- await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'reset-idle-release' }));- await waitFor(() => expect(idleInput().value).toBe('0'));- });-});diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentLimitsSection.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentLimitsSection.test.tsxindex 1816cbf41e..db780dbccb 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentLimitsSection.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentLimitsSection.test.tsx@@ -92,6 +92,37 @@ describe('RemoteAgentLimitsSection', () => {expect(screen.queryByTestId('remote-agent-limit-perDevice')).toBeNull();});+ // provider-sharing.md §3「闲置收回由提供方决定」:只有设置里带 idleMinutes 的电脑显示这一项;旧版电脑会拒绝+ // 不认识的字段,所以读不到时既不显示也不提交。+ it('edits idle reclaim minutes only on computers that report the setting', async () => {+ const withIdle = (idleMinutes: number, isCustomized = false) => ({+ ...view(), value: { perDevice: 16, total: 64, idleMinutes }, defaults: { perDevice: 16, total: 64, idleMinutes: 30 },+ isCustomized, customizedKeys: isCustomized ? ['idleMinutes'] : [],+ });+ command.mockResolvedValue(withIdle(30));+ render(<RemoteAgentLimitsSection deviceId="provider-computer" />);+ const idle = () => screen.getByTestId('remote-agent-limit-idleMinutes') as HTMLInputElement;+ await waitFor(() => expect(idle().value).toBe('30'));+ fireEvent.change(idle(), { target: { value: '1441' } });+ expect(button('save').disabled).toBe(true);+ expect(screen.getByText('providerShare.runLimits.idleInvalid')).toBeTruthy();+ fireEvent.change(idle(), { target: { value: '' } });+ expect(button('save').disabled).toBe(true);+ fireEvent.change(idle(), { target: { value: '0' } });+ command.mockResolvedValue(withIdle(0, true));+ fireEvent.click(button('save'));+ await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'set-run-limits', limits: { idleMinutes: 0 } }, 'provider-computer'));+ await waitFor(() => expect(idle().value).toBe('0'));+ cleanup();+ command.mockResolvedValue(view());+ render(<RemoteAgentLimitsSection deviceId="old-computer" />);+ await waitFor(() => expect(input('perDevice').value).toBe('16'));+ expect(screen.queryByTestId('remote-agent-limit-idleMinutes')).toBeNull();+ fireEvent.change(input('perDevice'), { target: { value: '20' } });+ fireEvent.click(button('save'));+ await waitFor(() => expect(command).toHaveBeenLastCalledWith({ action: 'set-run-limits', limits: { perDevice: 20 } }, 'old-computer'));+ });+it('keeps failed edits for retry and shows an unsupported remote computer', async () => {render(<RemoteAgentLimitsSection deviceId="old-computer" />);await waitFor(() => expect(input('perDevice').value).toBe('16'));diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 9fe45aac97..de1ac63cf2 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -513,10 +513,13 @@},"runLimits": {"title": "Remote session limits",- "description": "Applies to all providers on this computer, including your other computers and devices using shared providers. Idle sessions count until released. Sessions run directly on this computer do not count.",+ "description": "Applies to all providers on this computer, including your other computers and devices using shared providers. Idle sessions count until they are reclaimed. Sessions run directly on this computer do not count.","perDevice": "Maximum sessions per connected device","total": "Maximum sessions across all connected devices","invalid": "Enter whole numbers from 1 to {{max}}. The per-device limit cannot exceed the total limit.",+ "idleMinutes": "Reclaim idle sessions after (minutes)",+ "idleHint": "When a session has been idle this long, this computer stops its agent and frees the slot. The next message reconnects to the same conversation. Running sessions are never reclaimed. Enter 0 to never reclaim.",+ "idleInvalid": "Enter a whole number from 0 to {{max}}.","usage": "{{used}} / {{total}} sessions held by {{devices}} devices; the busiest device holds {{largest}}.","applyHint": "Changes apply immediately. Lowering a limit only blocks new sessions; existing sessions continue. Group relays count toward the directly connected device.","save": "Save",@@ -558,18 +561,6 @@"updated": "Updated {{time}}","usageTitle": "Usage Details","allowUsageDescription": "When enabled, everyone using this shared provider can view the sharer's and every other user's display names and detailed usage history."- },- "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, you can let tasks idle longer than the time below disconnect temporarily to make room for new tasks. Send one a message and it reconnects automatically, with the earlier conversation intact. Tasks that are running are never disconnected; while a task is disconnected, its background commands on this computer keep running.",- "minutes": "Idle release (minutes)",- "hint": "The default is 0, which never disconnects; when the limit is reached you see the limit message. With 1–120, a task can disconnect 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": {diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex ce62f8bcc8..872757ca97 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -509,10 +509,13 @@},"runLimits": {"title": "リモートセッション数",- "description": "自分の他のパソコンと共有先のデバイスを含め、このパソコンのすべてのプロバイダーに適用されます。応答済みでも解放されていないセッションは含まれます。このパソコンで直接実行するセッションは含まれません。",+ "description": "自分の他のパソコンと共有先のデバイスを含め、このパソコンのすべてのプロバイダーに適用されます。応答済みのセッションも回収されるまでは含まれます。このパソコンで直接実行するセッションは含まれません。","perDevice": "接続デバイスごとの最大セッション数","total": "全接続デバイスの合計最大セッション数","invalid": "1~{{max}} の整数を入力してください。デバイスごとの上限は合計上限以下にしてください。",+ "idleMinutes": "アイドル回収(分)",+ "idleHint": "セッションがこの時間アイドル状態になると、このパソコンはそのエージェントを終了して枠を解放します。次にメッセージを送ると、同じ会話に自動で再接続されます。実行中のセッションは回収しません。0 にすると回収しません。",+ "idleInvalid": "0~{{max}} の整数を入力してください。","usage": "使用中 {{used}} / {{total}}、{{devices}} 台から接続。1 台あたりの最多使用数は {{largest}} です。","applyHint": "保存後すぐに適用されます。上限を下げても既存のセッションは中断せず、新規作成のみ制限します。グループ経由の接続は直接接続しているデバイスに集計されます。","save": "保存",@@ -554,18 +557,6 @@"updated": "更新:{{time}}","usageTitle": "使用量の詳細","allowUsageDescription": "オンにすると、この共有のすべての利用者が、共有元と他のすべての利用者の表示名および過去の使用量の詳細を閲覧できます。"- },- "idleRelease": {- "title": "このパソコンで他のパソコンのモデルを使うとき",- "description": "このパソコンのセッションが他のパソコンのモデルを使うとき、そのパソコンで同時に実行できる数には上限があります。上限に近づいたとき、下の時間より長くアイドル状態のセッションを一時的に切断し、新しいセッションに枠を譲るように設定できます。そのセッションにメッセージを送ると自動で再接続され、それまでの会話はそのまま残ります。実行中のセッションは切断しません。切断中も、このパソコン上のバックグラウンドコマンドは実行を続けます。",- "minutes": "アイドル解放(分)",- "hint": "既定値は 0 で、切断しません。上限に達したときは上限のメッセージが表示されます。1~120 にすると、その分数だけアイドル状態が続いた場合にのみ切断します。",- "invalid": "0~{{max}} の整数を入力してください。",- "save": "保存",- "reset": "既定値に戻す",- "saved": "アイドル解放の設定を保存しました",- "retry": "再読み込み",- "loading": "読み込み中…"}},"providerGroup": {diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 3e27287d8d..1acae1528a 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -509,10 +509,13 @@},"runLimits": {"title": "원격 세션 수 제한",- "description": "내 다른 컴퓨터와 공유받은 기기를 포함해 이 컴퓨터의 모든 제공자에 적용됩니다. 응답이 끝나도 해제되지 않은 세션은 포함됩니다. 이 컴퓨터에서 직접 실행하는 세션은 제외됩니다.",+ "description": "내 다른 컴퓨터와 공유받은 기기를 포함해 이 컴퓨터의 모든 제공자에 적용됩니다. 응답이 끝난 세션도 회수되기 전까지는 포함됩니다. 이 컴퓨터에서 직접 실행하는 세션은 제외됩니다.","perDevice": "연결된 기기당 최대 세션 수","total": "연결된 모든 기기의 총 최대 세션 수","invalid": "1~{{max}} 사이의 정수를 입력하세요. 기기당 한도는 전체 한도를 넘을 수 없습니다.",+ "idleMinutes": "유휴 회수(분)",+ "idleHint": "세션이 이 시간 동안 유휴 상태이면 이 컴퓨터가 해당 에이전트를 종료하고 자리를 비웁니다. 다음 메시지를 보내면 같은 대화에 자동으로 다시 연결됩니다. 실행 중인 세션은 회수하지 않습니다. 0으로 설정하면 회수하지 않습니다.",+ "idleInvalid": "0~{{max}} 사이의 정수를 입력하세요.","usage": "{{devices}}개 기기에서 {{used}} / {{total}}개 사용 중. 기기 한 대의 최대 사용 수는 {{largest}}개입니다.","applyHint": "저장 즉시 적용됩니다. 한도를 낮춰도 기존 세션은 중단되지 않고 새 세션만 제한됩니다. 그룹 중계는 직접 연결된 기기에 합산됩니다.","save": "저장",@@ -554,18 +557,6 @@"updated": "업데이트: {{time}}","usageTitle": "사용량 세부 정보","allowUsageDescription": "켜면 이 공유 제공자의 모든 사용자가 공유자와 다른 모든 사용자의 표시 이름 및 과거 사용량 상세 내역을 볼 수 있습니다."- },- "idleRelease": {- "title": "이 컴퓨터가 다른 컴퓨터의 모델을 사용할 때",- "description": "이 컴퓨터의 세션이 다른 컴퓨터의 모델을 사용할 때, 그 컴퓨터가 동시에 실행할 수 있는 수에는 한도가 있습니다. 한도에 가까워지면 아래 시간보다 오래 유휴 상태인 세션을 잠시 연결 해제해 새 세션에 자리를 양보하도록 설정할 수 있습니다. 해당 세션에 메시지를 보내면 자동으로 다시 연결되며 이전 대화는 그대로 남아 있습니다. 실행 중인 세션은 연결을 해제하지 않습니다. 연결이 해제된 동안에도 이 컴퓨터의 백그라운드 명령은 계속 실행됩니다.",- "minutes": "유휴 해제(분)",- "hint": "기본값은 0이며 연결을 해제하지 않습니다. 한도에 도달하면 한도 안내가 표시됩니다. 1~120으로 설정하면 그 시간(분) 동안 유휴 상태일 때만 연결을 해제합니다.",- "invalid": "0~{{max}} 사이의 정수를 입력하세요.",- "save": "저장",- "reset": "기본값 복원",- "saved": "유휴 해제 설정을 저장했습니다",- "retry": "새로고침",- "loading": "불러오는 중…"}},"providerGroup": {diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 87f6a7dd33..97f68fe965 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -509,10 +509,13 @@},"runLimits": {"title": "远程任务数量",- "description": "适用于这台电脑提供的所有供应商,包括自己的其他电脑和分享给他人的设备。已回答完但尚未释放的任务也占名额,本机直接运行的任务不计入。",+ "description": "适用于这台电脑提供的所有供应商,包括自己的其他电脑和分享给他人的设备。已回答完的任务在被收回前也占名额,本机直接运行的任务不计入。","perDevice": "每台使用设备最多保留的任务数","total": "所有使用设备合计最多保留的任务数","invalid": "请填写 1~{{max}} 的整数,单台设备的上限不能超过合计上限。",+ "idleMinutes": "闲置收回(分钟)",+ "idleHint": "任务闲置满这个时长后,这台电脑会结束它的 Agent,名额随即释放;对方再发消息时会自动接回原来的对话。正在运行的任务不会被收回。填 0 表示从不收回。",+ "idleInvalid": "请填写 0~{{max}} 的整数。","usage": "当前占用 {{used}} / {{total}},来自 {{devices}} 台设备;单台设备最多占用 {{largest}} 个。","applyHint": "保存后立即生效。调低上限不会中断已有任务,只会限制新增。供应商组中转按直接连接的设备计数。","save": "保存",@@ -554,18 +557,6 @@"updated": "更新于 {{time}}","usageTitle": "用量明细","allowUsageDescription": "开启后,此分享的所有使用者都能查看分享者及其他所有使用者的昵称和历史用量明细。"- },- "idleRelease": {- "title": "这台电脑使用其他电脑的模型",- "description": "这台电脑上的任务使用其他电脑上的模型时,那台电脑能同时运行的任务数量有上限。快到上限时,可以让闲置超过下面时长的任务先暂时断开,把位置让给新任务;再给它发消息时会自动接上,之前的对话都还在。正在运行的任务不会断开;断开期间,这台电脑上的后台命令会继续运行。",- "minutes": "闲置释放(分钟)",- "hint": "默认为 0,即从不断开,满了就直接提示已达上限;设为 1~120 时,闲置超过该时长的任务才可能断开。",- "invalid": "请填写 0~{{max}} 的整数。",- "save": "保存",- "reset": "恢复默认",- "saved": "闲置释放设置已保存",- "retry": "重新加载",- "loading": "正在加载…"}},"providerGroup": {diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex c83a340cb0..d1fbfde88e 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -509,10 +509,13 @@},"runLimits": {"title": "遠端任務數量",- "description": "適用於這台電腦提供的所有供應商,包括自己的其他電腦和分享給他人的裝置。已回答完但尚未釋放的任務也佔名額,本機直接執行的任務不計入。",+ "description": "適用於這台電腦提供的所有供應商,包括自己的其他電腦和分享給他人的裝置。已回答完的任務在被收回前也佔名額,本機直接執行的任務不計入。","perDevice": "每台使用裝置最多保留的任務數","total": "所有使用裝置合計最多保留的任務數","invalid": "請填寫 1~{{max}} 的整數,單台裝置的上限不能超過合計上限。",+ "idleMinutes": "閒置收回(分鐘)",+ "idleHint": "任務閒置滿這個時長後,這台電腦會結束它的 Agent,名額隨即釋放;對方再傳訊息時會自動接回原來的對話。正在執行的任務不會被收回。填 0 表示從不收回。",+ "idleInvalid": "請填寫 0~{{max}} 的整數。","usage": "目前佔用 {{used}} / {{total}},來自 {{devices}} 台裝置;單台裝置最多佔用 {{largest}} 個。","applyHint": "儲存後立即生效。調低上限不會中斷現有任務,只會限制新增。供應商組轉送按直接連線的裝置計數。","save": "儲存",@@ -554,18 +557,6 @@"updated": "更新於 {{time}}","usageTitle": "用量明細","allowUsageDescription": "開啟後,此分享的所有使用者都能查看分享者及其他所有使用者的暱稱和歷史用量明細。"- },- "idleRelease": {- "title": "這台電腦使用其他電腦的模型",- "description": "這台電腦上的任務使用其他電腦上的模型時,那台電腦能同時執行的任務數量有上限。快到上限時,可以讓閒置超過下面時長的任務先暫時斷開,把位置讓給新任務;再給它傳訊息時會自動接上,之前的對話都還在。正在執行的任務不會斷開;斷開期間,這台電腦上的背景命令會繼續執行。",- "minutes": "閒置釋放(分鐘)",- "hint": "預設為 0,即從不斷開,滿了就直接提示已達上限;設為 1~120 時,閒置超過該時長的任務才可能斷開。",- "invalid": "請填寫 0~{{max}} 的整數。",- "save": "儲存",- "reset": "恢復預設",- "saved": "閒置釋放設定已儲存",- "retry": "重新載入",- "loading": "正在載入…"}},"providerGroup": {diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex 86f92ca00a..566198cac9 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -2,7 +2,6 @@* 供应商分享的 Renderer ↔ Main 契约(只在本机进程之间;服务端契约见* docs/provider-sharing-contract.md)。身份只有昵称与头像。*/-import type { RemoteAgentIdleRelease, RemoteAgentIdleReleaseView } from './remoteAgentIdleRelease';import type { RemoteAgentLimits, RemoteAgentLimitsView } from './remoteAgentLimits';import type { RemoteModelAccessView, RemoteModelSelection } from './remoteModelAccess';@@ -203,10 +202,6 @@ 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 }@@ -244,9 +239,6 @@ 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.tsdeleted file mode 100644index dab84e2030..0000000000--- a/apps/desktop/src/shared/remoteAgentIdleRelease.ts+++ /dev/null@@ -1,23 +0,0 @@-/**- * 本机作为使用方:用其他电脑上的模型时,那台电脑给这台电脑的任务数有上限。快到上限时,闲置满这么多- * 分钟的任务先断开那台电脑上的 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: 0 };--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/apps/desktop/src/shared/remoteAgentLimits.ts b/apps/desktop/src/shared/remoteAgentLimits.tsindex f78135dca1..b427a79912 100644--- a/apps/desktop/src/shared/remoteAgentLimits.ts+++ b/apps/desktop/src/shared/remoteAgentLimits.ts@@ -1,27 +1,39 @@-/** 提供方整台电脑的远程任务额度;包含空闲但尚未释放的运行实例。 */+/**+ * 提供方整台电脑的远程任务额度;包含空闲但尚未释放的运行实例。+ * idleMinutes:任务不忙且闲置满这么多分钟,提供方就结束它的 Agent 进程、还出名额(0 = 不收回)。+ * 远程管理旧版电脑时读到的值不带这一项。+ */export interface RemoteAgentLimits {perDevice: number;total: number;+ idleMinutes?: number;}// maxRuns 的旧版解析上限为 1000,保持 wire 兼容。export const REMOTE_AGENT_LIMIT_MAX = 1000;-export const DEFAULT_REMOTE_AGENT_LIMITS: Readonly<RemoteAgentLimits> = { perDevice: 16, total: 64 };+/** 与 caps.idleReclaimMinutes 的解析上限一致(`@cindy/device-link` REMOTE_AGENT_IDLE_RECLAIM_MAX_MINUTES)。 */+export const REMOTE_AGENT_IDLE_MINUTES_MAX = 1440;+export const DEFAULT_REMOTE_AGENT_LIMITS: Readonly<RemoteAgentLimits> = { perDevice: 16, total: 64, idleMinutes: 30 };++function isIdleMinutes(value: unknown): value is number {+ return Number.isInteger(value) && (value as number) >= 0 && (value as number) <= REMOTE_AGENT_IDLE_MINUTES_MAX;+}export function isRemoteAgentLimits(value: unknown): value is RemoteAgentLimits {if (!value || typeof value !== 'object' || Array.isArray(value)) return false;const v = value as RemoteAgentLimits;return Number.isInteger(v.perDevice) && Number.isInteger(v.total)- && v.perDevice >= 1 && v.perDevice <= v.total && v.total <= REMOTE_AGENT_LIMIT_MAX;+ && v.perDevice >= 1 && v.perDevice <= v.total && v.total <= REMOTE_AGENT_LIMIT_MAX+ && (v.idleMinutes === undefined || isIdleMinutes(v.idleMinutes));}/** 仅接收用户编辑过的字段;合并后的大小关系由写入端在锁内校验。 */export function isRemoteAgentLimitsPatch(value: unknown): value is Partial<RemoteAgentLimits> {if (!value || typeof value !== 'object' || Array.isArray(value)) return false;const entries = Object.entries(value);- return entries.length > 0 && entries.every(([key, limit]) =>- (key === 'perDevice' || key === 'total')- && Number.isInteger(limit) && limit >= 1 && limit <= REMOTE_AGENT_LIMIT_MAX);+ return entries.length > 0 && entries.every(([key, limit]) => key === 'idleMinutes'+ ? isIdleMinutes(limit)+ : (key === 'perDevice' || key === 'total') && Number.isInteger(limit) && limit >= 1 && limit <= REMOTE_AGENT_LIMIT_MAX);}export interface RemoteAgentLimitUsage {diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 43bb327b6d..702b81afcc 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1449,10 +1449,35 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加主进程拒绝。- **移动项目可用**:B 上的影子目录只按「控制端 + 任务 id」定址(虚拟工作区为必需能力),与 A 的工作目录无关;A 换目录后关闭空闲 handle,下次发送按新目录重建,B 上的会话记录原样续用。-- **控制端连接池:名额紧张时让出闲置任务的 Agent 进程**(2026-10-17):B 按发起设备限制同时开着的 run(`caps.maxRuns`),+- **提供方闲置收回**(2026-10-22,用户确认由提供方决定;产品规则 `provider-sharing.md` §3):B 的主人在「远程任务数量」里设+ 「闲置收回(分钟)」(`RemoteAgentLimits.idleMinutes`,0~1440,默认 30,0 = 不收回),对全部控制端统一生效。仍用+ `maker:remote-agent:v1`,不改 relay、服务器、数据库或协议版本;新增的都是可选字段:+ - **B 收回**:巡检(每 5 秒)看到任务不忙且闲置满这个时长,就结束它的 Agent 进程。「忙」= 有等 A 回包的反向请求、+ 执行中的调用、待生效的回退(`commitRewindFiles` 成功后到下一个 `done`)、还没启动好,或 Agent 状态里有在跑 / 在准备的+ 回合、后台任务、待唤醒续跑(中转任务看组内电脑报来的同一组字段);巡检时忙就把闲置起点移到此刻。活动 = 打开、+ `call` / `reply` / `push`、写进事件流的非 `state` 行;只被 `poll` 不算(闲着的任务 A 也一直在拉)。+ - **收尾**:`closed` 行写 `reason: 'ended'` 并带可选 `idleReclaimed: true`。旧 A 不认识这个字段,按 `ended` 静默收起,+ Maker 把事件流结束当成句柄已死、自动关闭任务,下次发送照常重建并带原生会话 id 接回(本机后台命令随句柄结束);+ 新 A 不关句柄,与连接池让出名额同一状态(released),本机部分保留,下次要 B 干活时连回。中转时组所在电脑把这个字段+ 原样转给受邀者(`relayClosed`),`ended` 本来就在正常收尾的原因里,不触发换电脑。+ - **A 报 hold**:`poll` 的每个任务项可选 `hold: true`,表示 A 这边还有 B 看不到的工作(当前只有 Codex 经执行环境在 A 上起的、+ 仍在运行的进程,`ExecServerRelay.busy()`)。B 收到就按有活动算;组所在电脑在 60 秒内接着给组内电脑报 hold。旧 B 解析 poll+ 时丢弃不认识的字段。+ - **caps**:B 声明 `idleReclaimMinutes`(不合法时当作没声明,不让整个 caps 作废)。A 的连接池按它判定「闲置满」,+ 旧 B 不声明 = 0,不让出。+ - **四种组合**:A 新 × B 新 按上面;A 新 × B 旧 不收回、不让出;A 旧 × B 新 被收回后静默重建;A 旧 × B 旧 不变。+ 远程管理时,旧版电脑的设置读不到 `idleMinutes`,界面不显示这一项、也不提交(旧版会拒绝不认识的字段);+ 旧控制端管理新电脑时只提交原来的两项。+ - **故障半径**:只结束这一个任务的 Agent 进程,不动 relay、链路或同一台 B 上的其他任务。+ - **已知限制**:B 结束进程与 A 同时发来调用的窄窗口里,那次调用会失败(B 没有执行它),下一次发送正常连回。+ Pi 任务经供应商组转给旧版组内电脑时,旧版会改写接回用的会话 id,接回时提示上下文没接上。+ 回归见 `remote-agent/__tests__/hostLifecycle.test.ts`(收回判据与收尾行)、`connectionPool.test.ts`(新控制端保留本机部分+ 并连回)、`poll.test.ts`(hold)与 `packages/device-link/src/__tests__/remoteAgent.test.ts`(字段解析)。+- **控制端连接池:名额紧张时让出闲置任务的 Agent 进程**(2026-10-17;2026-10-22 起闲置时长改由 B 声明):B 按发起设备限制同时开着的 run(`caps.maxRuns`),A 上开着的任务即使闲着也占名额。A 对每台 B 一个连接池(`controller/connectionPool.ts`,计数口径与 B 的 `limitDeviceOf`- 一致:这台设备),**只在名额紧张时**让出「不忙且闲置满 N 分钟」的连接;N 是 A 本机设置(「远程与分享」页「这台电脑使用- 其他电脑的模型」,只在管理本机时显示,0~120,**默认 0 = 从不让出**,与没有连接池时一样满了直接报错;升级后行为不变,用户自己打开才生效)。三条路径都只让有资格的:+ 一致:这台设备),**只在名额紧张时**让出「不忙且闲置满 N 分钟」的连接;N 是 B 在 `caps.idleReclaimMinutes` 里声明的闲置+ 收回时长(A 原来的本机设置已删除;B 没声明或为 0 时从不让出,满了直接报错)。闲置满 N 分钟的任务 B 本来也会自己收回,+ 连接池只是名额紧张时不必等它那一轮巡检。三条路径都只让有资格的: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` 不算)diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.mdindex c44f3be941..8b4ad7004b 100644--- a/docs/dev-rules/remote-and-mobile-adaptation.md+++ b/docs/dev-rules/remote-and-mobile-adaptation.md@@ -136,7 +136,8 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即连不回(B 离线、仍满等)保持已让出、按原错误报给用户,下次发送再试,不自动重放;发送路径上 Maker 会按通用发送失败关闭句柄,本机后台命令随之结束,对话由下次发送重建时接回(已知限制,见协议文档同节)。3. **多 peer**:B 按 `(控制端, runId)` 计数,A 的计数只算自己的连接;多实例、别的设备的占用与 B 刚改的上限都可能让 A 的计数不准,- 因此 A 不据此拒绝打开,只据此决定要不要先让,最终以 B 的裁决为准。设置为 0(默认)时三条路径都不让,与没有连接池时一致。+ 因此 A 不据此拒绝打开,只据此决定要不要先让,最终以 B 的裁决为准。闲置时长按 B 主人在「远程与分享」设置的+ `caps.idleReclaimMinutes` 判断(默认 30 分钟);旧版 B 没声明或主人设为 0 时三条路径都不让,与没有连接池时一致。**托管 Codex 的关键线程 RPC**(#5764):Agent 所在电脑上的 Codex 经 exec-server 逐个读任务所在电脑的项目说明与 Skill,`thread/start` 实测约 35 轮串行往返,耗时 ≈ 轮数 × 链路往返,慢链路下合法地超过diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 076b4e4a56..1c4c07b1b8 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -57,6 +57,13 @@每台使用设备默认 16 个,所有设备合计默认 64 个;两项均为 1~1000 的整数,单设备不得高于合计。同账号其他电脑与分享设备都计入,同一设备跨供应商、分享入口合并计数;本机直接运行的任务不计入。已回答完但尚未关闭释放的任务、协同成员与中转任务仍占名额,关闭清理完成后才释放。+ **闲置收回由提供方决定**(2026-10-22 用户确认):同一处设置「闲置收回(分钟)」,0~1440 的整数,+ 默认 30,0 表示不收回;对所有使用设备统一生效,包括同账号其他电脑。任务不忙且闲置满这个时长,+ 提供方结束它的 Agent 进程、释放名额;在跑或在准备的回合、后台任务、待唤醒续跑、等使用方回答的确认、+ 执行中的调用、待生效的回退都算忙,使用方报告本机仍有进行中的工作(Codex 经执行环境在使用方电脑起的进程)+ 时也不收回。新版使用方无感接回:本机部分(含后台命令)保留,下次发消息带原来的会话 id 连回同一段对话;+ 旧版使用方静默收起任务,下次发消息时重建并接回原来的对话,本机正在跑的后台命令会结束。使用方不再有+ 自己的「闲置释放」设置。旧版提供方不收回,行为不变。修改立即生效,降低上限不终止已有任务;恢复默认清除本账号在这台电脑的覆盖设置。供应商组中转每一跳按直接连接的设备计数,不按中转声明的受邀者额外分配额度;转分享同意规则不变。页面显示合计占用、使用设备数及单设备最大占用;只有本机主人及其同账号电脑可以查看、修改。diff --git a/packages/device-link/src/__tests__/remoteAgent.test.ts b/packages/device-link/src/__tests__/remoteAgent.test.tsindex 5f4d5c4850..314e8450bc 100644--- a/packages/device-link/src/__tests__/remoteAgent.test.ts+++ b/packages/device-link/src/__tests__/remoteAgent.test.ts@@ -68,6 +68,24 @@ describe('remote agent channel', () => {}});+ // 提供方闲置收回(provider-sharing.md §3):三个都是可选字段,旧端忽略;不合法的值只当作没有,不能让整条 caps 作废,+ // 也不能把非 true 的值当成 hold / idleReclaimed(前者会让任务永不收回,后者会让控制端误留已结束的连接)。+ it('parses idle reclaim minutes, the poll hold flag and the reclaimed close marker', () => {+ const caps = { version: 1, agents: [], maxRuns: 16, uploadChunkBytes: 1024, maxPayloadBytes: 2048 };+ for (const minutes of [0, 30, 1440]) {+ expect(parseRemoteAgentCaps({ ...caps, idleReclaimMinutes: minutes }).idleReclaimMinutes).toBe(minutes);+ }+ for (const minutes of [-1, 1441, 2.5, '30', null]) {+ expect(parseRemoteAgentCaps({ ...caps, idleReclaimMinutes: minutes })).not.toHaveProperty('idleReclaimMinutes');+ }+ expect(parseRemoteAgentRequest({ op: 'poll', runs: [{ runId, cursor: 3, hold: true }, { runId: otherId, cursor: 0, hold: 'yes' }] }))+ .toEqual({ op: 'poll', runs: [{ runId, cursor: 3, hold: true }, { runId: otherId, cursor: 0 }] });+ expect(parseRemoteAgentStreamItem(JSON.stringify({ t: 'closed', reason: 'ended', idleReclaimed: true })))+ .toEqual({ t: 'closed', reason: 'ended', idleReclaimed: true });+ expect(parseRemoteAgentStreamItem(JSON.stringify({ t: 'closed', reason: 'ended', idleReclaimed: 'yes' })))+ .toEqual({ t: 'closed', reason: 'ended' });+ });+// 转分享(provider-sharing.md §4.3):组所在电脑把它分享的人报给分享来的组内电脑,由那台的主人逐人同意。it('parses the reshare op, its result and the consent capability', () => {const key = 'a1b2c3d4e5f60718293a4b5c6d7e8f90';diff --git a/packages/device-link/src/remoteAgent.ts b/packages/device-link/src/remoteAgent.tsindex a4b42fbf94..f3d7cd29f6 100644--- a/packages/device-link/src/remoteAgent.ts+++ b/packages/device-link/src/remoteAgent.ts@@ -39,6 +39,8 @@ export const REMOTE_AGENT_MAX_POLL_RUNS = 64;export const REMOTE_AGENT_INVOKE_TIMEOUT_MS = 30_000;/** 同一控制端在一台被控端上同时运行的远程 Agent 任务上限。 */export const REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER = 16;+/** 被控端设置的闲置收回时长上限(分钟,`caps.idleReclaimMinutes`)。 */+export const REMOTE_AGENT_IDLE_RECLAIM_MAX_MINUTES = 1440;/** 一次 push 最多携带的 WebSocket 帧数。 */export const REMOTE_AGENT_MAX_PUSH_FRAMES = 64;@@ -159,8 +161,10 @@ export type RemoteAgentRequest =* waitMs:没有新数据时最多挂起多久(缺省 READ_WAIT_MS)。控制端在已有一个长等待在途时,* 可以再发一个 waitMs=0 的短 poll 立刻取新任务或刚触发的数据;两个 poll 返回的数据可能重叠,* 控制端按 from 去重。+ * hold:控制端这边还有这个任务的工作在进行、被控端看不到(如 Codex 经执行环境在控制端起的后台进程),+ * 被控端按有活动处理,不按闲置收回。旧被控端忽略。*/- | { op: 'poll'; runs: Array<{ runId: string; cursor: number }>; waitMs?: number }+ | { op: 'poll'; runs: Array<{ runId: string; cursor: number; hold?: true }>; waitMs?: number }| { op: 'reply'; runId: string; requestId: string; payload: RemoteAgentPayload }| { op: 'push'; runId: string; seq: number; frames: RemoteAgentPushFrame[] }| { op: 'close'; runId: string; mode: 'close' | 'detach'; reason: RemoteAgentTeardownReason }@@ -273,6 +277,11 @@ export interface RemoteAgentCaps {reshareConsent?: boolean;/** 是否支持带 batch 的转分享请求;未声明时只能使用单片旧协议。 */reshareBatch?: boolean;+ /**+ * 这台电脑的主人设置的闲置收回时长(分钟,0 = 不收回):任务不忙且闲置满这么久,这台就结束它的 Agent 进程+ * (事件流 `closed` 带 `idleReclaimed`)。旧版电脑不声明,也不收回。+ */+ idleReclaimMinutes?: number;}export interface RemoteAgentReadResult {@@ -303,7 +312,12 @@ export type RemoteAgentStreamItem =/** 被控端放弃了一个尚未回包的反向请求(如 Agent 取消了工具调用),控制端应中止对应执行。 */| { t: 'cancel'; requestId: string }| { t: 'ws'; connId: string; kind: 'open' | 'message' | 'close'; path?: string; data?: string }- | { t: 'closed'; reason: string; error?: RemoteAgentErrorInfo };+ /**+ * idleReclaimed:被控端按主人设置的时长收回了这个闲置任务(reason 写 `ended`)。新控制端只断开对方的 Agent+ * 进程、保留本机部分,下次要它干活时带原来的会话 id 连回;旧控制端不认识这个字段,按 `ended` 静默收起,+ * 下次发消息时重建任务并接回原来的对话。+ */+ | { t: 'closed'; reason: string; error?: RemoteAgentErrorInfo; idleReclaimed?: true };const ID = /^[0-9a-f-]{36}$/;const CONN_ID = /^[A-Za-z0-9_-]{1,64}$/;@@ -481,7 +495,11 @@ export function parseRemoteAgentRequest(value: unknown): RemoteAgentRequest {if (!Array.isArray(v.runs) || v.runs.length === 0 || v.runs.length > REMOTE_AGENT_MAX_POLL_RUNS) invalid();const runs = v.runs.map((item) => {const entry = record(item);- return { runId: id(entry.runId), cursor: count(entry.cursor, Number.MAX_SAFE_INTEGER) };+ return {+ runId: id(entry.runId),+ cursor: count(entry.cursor, Number.MAX_SAFE_INTEGER),+ ...(entry.hold === true ? { hold: true as const } : {}),+ };});if (new Set(runs.map((run) => run.runId)).size !== runs.length) invalid();return {@@ -612,6 +630,10 @@ export function parseRemoteAgentCaps(value: unknown): RemoteAgentCaps {...(v.relayModelAccess === true ? { relayModelAccess: true } : {}),...(v.reshareConsent === true ? { reshareConsent: true } : {}),...(v.reshareBatch === true ? { reshareBatch: true } : {}),+ // 可选能力:不合法时当作没声明,不让整个 caps 作废。+ ...(Number.isSafeInteger(v.idleReclaimMinutes) && (v.idleReclaimMinutes as number) >= 0+ && (v.idleReclaimMinutes as number) <= REMOTE_AGENT_IDLE_RECLAIM_MAX_MINUTES+ ? { idleReclaimMinutes: v.idleReclaimMinutes as number } : {}),};if (caps.version < 1 || caps.maxRuns < 1 || caps.uploadChunkBytes < 1) invalid();return caps;@@ -742,6 +764,7 @@ export function parseRemoteAgentStreamItem(line: string): RemoteAgentStreamItemt: 'closed',reason: typeof v.reason === 'string' ? v.reason.slice(0, 128) : 'unknown',...(v.error !== undefined ? { error: errorInfo(v.error) } : {}),+ ...(v.idleReclaimed === true ? { idleReclaimed: true as const } : {}),};default:return null;