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): 支持配置每台设备和整机任务数量上限
fmfsaisai99892c476b9b
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex 44574302a1..d9b991239f 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -83,6 +83,9 @@ afterEach(() => stopProviderShareRuntime());describe('same-account share management during account transitions', () => {it.each([createLink, ...mutations,+ { action: 'get-run-limits' },+ { action: 'set-run-limits', limits: { perDevice: 16, total: 64 } },+ { action: 'reset-run-limits' },{ action: 'owned', range: '7d' },{ action: 'own-usage', providerId: 'anthropic', range: '7d' },] satisfies ProviderShareManagementCommand[])('refuses $action at entry while teardown is pending', async (command) => {diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.tsindex db76d308ef..2dceda1f04 100644--- a/apps/desktop/src/main/device-link/dispatch.ts+++ b/apps/desktop/src/main/device-link/dispatch.ts@@ -1,3 +1,4 @@+import type { RemoteAgentLimitUsage } from '../../shared/remoteAgentLimits.js';import { executeTaskTags, TASK_TAG_CHANNEL } from '../localDb/ipc/taskTags.js';import { encodeMessageBodies, versionMessageBody } from './sessionMessageReuse.js';import type { TaskTagRequest } from '@cindy/maker-shared';@@ -398,6 +399,7 @@ export interface RemoteAgentHandler {purgeControllers?(match: (controller: string) => boolean): Promise<void>;/** 有进行中任务的控制端。 */activeControllers?(): string[];+ limitUsage?(): RemoteAgentLimitUsage;/** 正在运行一轮的任务的控制端(每个任务一项)。 */turnRunningControllers?(): string[];/**@@ -4865,3 +4867,8 @@ export const __testing = {activeClient = c;},};++/** 提供方管理用的本机占用,不暴露给分享受邀者。 */+export function remoteAgentLimitUsage(): RemoteAgentLimitUsage {+ return remoteAgentHandler?.limitUsage?.() ?? { total: 0, devices: 0, largestDevice: 0 };+}diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex 45ee2cf38d..0a9046b9d3 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -1,3 +1,6 @@+import { isRemoteAgentLimits } from '../../shared/remoteAgentLimits.js';+import { readRemoteAgentLimitsState, saveRemoteAgentLimits } from '../remote-agent/host/limitsStore.js';+import { remoteAgentLimitUsage } from './dispatch.js';/*** 供应商分享的本机接线:分享者与受邀者两侧运行时的起停、推送给 Renderer、系统通知,以及* Renderer 的命令通道。账号操作只接受本机应用窗口,不能经设备互联从别的电脑调用。@@ -328,6 +331,12 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {if (!raw || typeof raw !== 'object' || Array.isArray(raw)) throwIpcError('INVALID_PARAMS', 'Invalid command');const value = raw as Record<string, unknown>;switch (value.action) {+ case 'get-run-limits':+ case 'reset-run-limits':+ return { action: value.action };+ case 'set-run-limits':+ if (!isRemoteAgentLimits(value.limits)) throwIpcError('INVALID_PARAMS', 'Invalid remote task limits');+ return { action: value.action, limits: { perDevice: value.limits.perDevice, total: value.limits.total } };case 'owned':return { action: 'owned', range: usageRange(value.range) };case 'own-usage':@@ -517,6 +526,15 @@ async function createLink(async function execute(command: ProviderShareCommand, assertCurrent: () => void = () => undefined): Promise<unknown> {assertCurrent();switch (command.action) {+ case 'get-run-limits':+ case 'set-run-limits':+ case 'reset-run-limits': {+ if (command.action !== 'get-run-limits') {+ await saveRemoteAgentLimits(command.action === 'reset-run-limits' ? null : command.limits);+ assertCurrent();+ }+ return { ...readRemoteAgentLimitsState(), usage: remoteAgentLimitUsage() };+ }case 'owned':if (running) markProviderShareHostActive(60_000);return ownerState(command.range);diff --git a/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts b/apps/desktop/src/main/provider-group/__tests__/managementClient.test.tsindex ff9eac7780..d5f530eb83 100644--- a/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/managementClient.test.ts@@ -39,6 +39,11 @@ beforeEach(() => {});describe('provider management client', () => {+ it.each(['get-run-limits', 'set-run-limits', 'reset-run-limits'] as const)('reports an old computer for %s instead of accepting an unknown command', async (action) => {+ const invoke: ProviderGroupRemoteInvoke = async () => ({ ok: false, error: { code: 'IPC_ERROR', message: '[INVALID_PARAMS] Unknown command' } });+ const command = action === 'set-run-limits' ? { action, limits: { perDevice: 16, total: 64 } } : { action };+ await expect(invokeProviderManagement(invoke, 'old-computer', { action: 'manage-share', command })).rejects.toThrow(/UNSUPPORTED_CAPABILITY/);+ });it('does not dispatch management while account teardown is pending with the same owner key', async () => {state.boundaryPending = true;const invoke = replying(null);diff --git a/apps/desktop/src/main/provider-group/management.ts b/apps/desktop/src/main/provider-group/management.tsindex 5d8b3256dc..a92a94b954 100644--- a/apps/desktop/src/main/provider-group/management.ts+++ b/apps/desktop/src/main/provider-group/management.ts@@ -20,7 +20,7 @@ export function parseProviderManagementRequest(raw: unknown): ProviderManagementreturn { action: 'manage-group', command: command as ProviderGroupManagementCommand };}const command = parseProviderShareCommand(raw.command);- if (!['owned', 'own-usage', 'create-link', 'approve', 'reject', 'set-member', 'reshare-decide'].includes(command.action)) {+ if (!['owned', 'own-usage', 'create-link', 'approve', 'reject', 'set-member', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits'].includes(command.action)) {throwIpcError('PERMISSION_DENIED', 'Only owner operations are available through management');}return { action: 'manage-share', command: command as ProviderShareManagementCommand };diff --git a/apps/desktop/src/main/provider-group/managementClient.ts b/apps/desktop/src/main/provider-group/managementClient.tsindex c64e2bf75f..bf51d98418 100644--- a/apps/desktop/src/main/provider-group/managementClient.ts+++ b/apps/desktop/src/main/provider-group/managementClient.ts@@ -23,7 +23,9 @@ export async function invokeProviderManagement(assertOwner();if (!response.ok) {const message = response.error?.message ?? '';- if (response.error?.code === 'CHANNEL_NOT_ALLOWED' || /unknown provider group action/.test(message)) {+ if (response.error?.code === 'CHANNEL_NOT_ALLOWED' || /unknown provider group action/.test(message)+ || (request.action === 'manage-share' && ['get-run-limits', 'set-run-limits', 'reset-run-limits'].includes(request.command.action)+ && /Unknown command/.test(message))) {throwIpcError('UNSUPPORTED_CAPABILITY', 'Provider management requires an update on the computer with the group');}throw new Error(/^\[[A-Z_]+\]/.test(message) ? message : '[REMOTE_AGENT_UNAVAILABLE] Provider management failed');diff --git a/apps/desktop/src/main/remote-agent/__tests__/limits.test.ts b/apps/desktop/src/main/remote-agent/__tests__/limits.test.tsnew file mode 100644index 0000000000..6c78417845--- /dev/null+++ b/apps/desktop/src/main/remote-agent/__tests__/limits.test.ts@@ -0,0 +1,139 @@+import fs from 'node:fs/promises';+import os from 'node:os';+import path from 'node:path';+import { randomUUID } from 'node:crypto';+import { providerShareGuestPeer, isProviderSharePeer } from '@cindy/device-link';+import type { AgentEvent, AgentSessionHandle } from '@cindy/maker-core';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { createRemoteAgentHost, type RemoteAgentHostDeps } from '../host/runHost';+import { DEFAULT_REMOTE_AGENT_LIMITS, type RemoteAgentLimits } from '../../../shared/remoteAgentLimits';++let root: string;+let limits: RemoteAgentLimits;+const hosts: ReturnType<typeof createRemoteAgentHost>[] = [];+const handles: AgentSessionHandle[] = [];+beforeEach(async () => {+ root = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-run-limits-'));+ limits = { perDevice: 2, total: 3 };+});+afterEach(async () => {+ for (const host of hosts.splice(0)) { await host.abortAll(); host.dispose(); }+ handles.length = 0;+ await new Promise(resolve => setTimeout(resolve, 30));+ await fs.rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });+});++function makeHost(extra: Partial<RemoteAgentHostDeps> = {}) {+ const host = createRemoteAgentHost({+ readLimits: () => limits,+ isAgentAvailable: () => true,+ isControllerAuthorized: () => true,+ controllerTrust: c => isProviderSharePeer(c) ? 'guest' : 'owner',+ providerAccess: { resolve: async () => 'provider', isAllowed: () => true },+ bindGuestProviderRoute: async () => ({ routeToken: 'test', modelIds: ['m'], release() {} }),+ startHosted: async input => {+ const handle: AgentSessionHandle = {+ id: input.hostSessionId, agentKind: input.kind, model: input.options.model,+ send: async () => {}, steer: async () => {}, abort: async () => {}, close: vi.fn(async () => {}),+ events: () => ({ [Symbol.asyncIterator]: () => ({ next: () => new Promise<IteratorResult<AgentEvent>>(() => {}) }) }),+ getUsageSnapshot: () => ({ tokenUsage: 0, contextTokens: 0, contextWindow: 0, costUsd: 0 }),+ setInteractionResolver() {},+ };+ handles.push(handle);+ return handle;+ },+ captureOwner: () => 'owner',+ isOwnerCurrent: () => true,+ runsRoot: root,+ ...extra,+ });+ hosts.push(host);+ return host;+}+function request(runId = randomUUID(), extra: Record<string, unknown> = {}) {+ return { op: 'open', runId, agentKind: 'claude-code', payload: { json: {+ sessionId: runId, virtualWorkspace: true, options: { model: 'm' },+ workspace: { workingDir: '/project', platform: 'darwin', shell: 'bash' },+ projectFiles: [], ancestorFiles: [], personal: { files: [] }, mcpServers: [], ...extra,+ } } };+}+describe('provider computer session limits', () => {+ it('keeps defaults and advertises the configured limit', async () => {+ expect(DEFAULT_REMOTE_AGENT_LIMITS).toEqual({ perDevice: 16, total: 64 });+ const host = makeHost();+ expect(await host.handle('a', { op: 'caps' })).toMatchObject({ maxRuns: 2 });+ limits = { perDevice: 70, total: 100 };+ expect(await host.handle('a', { op: 'caps' })).toMatchObject({ maxRuns: 70 });+ });+ it('combines shares and direct connections from one authenticated device', async () => {+ const host = makeHost();+ await host.handle(providerShareGuestPeer('share-a', 'member-a', 'device-a'), request());+ await host.handle(providerShareGuestPeer('share-b', 'member-b', 'device-a'), request());+ await expect(host.handle('device-a', request())).rejects.toThrow('[REMOTE_AGENT_BUSY] [DEVICE_LIMIT]');+ expect(host.limitUsage()).toEqual({ total: 2, devices: 1, largestDevice: 2 });+ await host.handle('device-b', request());+ await expect(host.handle('device-c', request())).rejects.toThrow('[REMOTE_AGENT_BUSY] [TOTAL_LIMIT]');+ });+ it('does not multiply capacity with different relay identifiers', async () => {+ const host = makeHost();+ await host.handle('group-device', request(undefined, { relay: 'aaaaaaaaaaaaaaaa' }));+ await host.handle('group-device', request(undefined, { relay: 'bbbbbbbbbbbbbbbb' }));+ await expect(host.handle('group-device', request(undefined, { relay: 'cccccccccccccccc' }))).rejects.toThrow('[DEVICE_LIMIT]');+ });+ it('still refuses unapproved reshares with free capacity', async () => {+ const host = makeHost({ reshare: { allows: () => false, sync: async () => ({ entries: [] }) } });+ await expect(host.handle(providerShareGuestPeer('s', 'm', 'd'),+ request(undefined, { relay: 'aaaaaaaaaaaaaaaa', reshareKey: 'bbbbbbbbbbbbbbbb' }))).rejects.toThrow('REMOTE_AGENT_RESHARE_NOT_ALLOWED');+ expect(host.limitUsage().total).toBe(0);+ });+ it('rechecks after async preparation to prevent concurrent opens exceeding the total', async () => {+ limits = { perDevice: 1, total: 1 };+ let ready!: () => void;+ const gate = new Promise<void>(resolve => { ready = resolve; });+ const host = makeHost({ providerAccess: { resolve: async () => { await gate; return 'p'; }, isAllowed: () => true } });+ const pending = Array.from({ length: 8 }, (_, i) => host.handle('device-' + i, request()));+ ready();+ const results = await Promise.allSettled(pending);+ expect(results.filter(r => r.status === 'fulfilled')).toHaveLength(1);+ expect(host.limitUsage().total).toBe(1);+ });+ it('keeps retries idempotent and existing tasks alive after lowering limits', async () => {+ const host = makeHost();+ const first = request();+ await host.handle('a', first);+ await host.handle('a', request());+ await host.handle('a', first);+ await vi.waitFor(() => expect(handles).toHaveLength(2));+ limits = { perDevice: 1, total: 1 };+ expect(host.limitUsage().total).toBe(2);+ expect(handles.every(h => vi.mocked(h.close).mock.calls.length === 0)).toBe(true);+ await expect(host.handle('b', request())).rejects.toThrow('[TOTAL_LIMIT]');+ await host.handle('a', { op: 'close', runId: first.runId, mode: 'close', reason: 'navigation' });+ expect(host.limitUsage().total).toBe(1);+ limits = { perDevice: 2, total: 3 };+ await host.handle('b', request());+ expect(host.limitUsage().total).toBe(2);+ });+ it('counts a slot until asynchronous close finishes', async () => {+ limits = { perDevice: 1, total: 1 };+ const host = makeHost();+ const first = request();+ await host.handle('a', first);+ await vi.waitFor(() => expect(handles).toHaveLength(1));+ let finish!: () => void;+ vi.mocked(handles[0].close).mockImplementation(() => new Promise<void>(resolve => { finish = resolve; }));+ const closing = host.handle('a', { op: 'close', runId: first.runId, mode: 'close', reason: 'navigation' });+ await expect(host.handle('a', request())).rejects.toThrow('[DEVICE_LIMIT]');+ finish();+ await closing;+ await host.handle('a', request());+ expect(host.limitUsage().total).toBe(1);+ });+ it('returns a slot after agent startup failure', async () => {+ limits = { perDevice: 1, total: 1 };+ const host = makeHost({ startHosted: async () => { throw new Error('startup failed'); } });+ await host.handle('a', request());+ await vi.waitFor(() => expect(host.limitUsage().total).toBe(0));+ await expect(host.handle('a', request())).resolves.toEqual({});+ });+});diff --git a/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.ts b/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.tsnew file mode 100644index 0000000000..184c359a98--- /dev/null+++ b/apps/desktop/src/main/remote-agent/__tests__/limitsStore.test.ts@@ -0,0 +1,48 @@+import fs from 'node:fs/promises';+import os from 'node:os';+import path from 'node:path';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++const state = vi.hoisted(() => ({ root: '', owner: 'a', pending: false }));+vi.mock('../../appSessionState.js', () => ({+ activeOwnerScopeKey: () => state.owner,+ ownerScopedUserDataPath: (name: string) => state.root + '/' + state.owner + '/' + name,+ isAppSessionBoundaryPending: () => state.pending,+}));+vi.mock('../../logger.js', () => ({ createLogger: () => ({ info() {}, warn() {}, error() {} }) }));+import { readRemoteAgentLimitsState, saveRemoteAgentLimits } from '../host/limitsStore';+import { isRemoteAgentLimits } from '../../../shared/remoteAgentLimits';++beforeEach(async () => {+ state.root = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-limit-store-'));+ state.owner = 'a'; state.pending = false;+});+afterEach(async () => { await fs.rm(state.root, { recursive: true, force: true }); });++describe('remote task limit overrides', () => {+ it('keeps explicit defaults, isolates accounts, and resets by deleting overrides', async () => {+ expect(readRemoteAgentLimitsState().isCustomized).toBe(false);+ await saveRemoteAgentLimits({ perDevice: 16, total: 64 });+ expect(readRemoteAgentLimitsState().customizedKeys).toEqual(['perDevice', 'total']);+ await saveRemoteAgentLimits({ perDevice: 32, total: 128 });+ state.owner = 'b';+ expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 16, total: 64 });+ state.owner = 'a';+ expect(readRemoteAgentLimitsState().value).toEqual({ perDevice: 32, total: 128 });+ await saveRemoteAgentLimits(null);+ expect(readRemoteAgentLimitsState()).toMatchObject({ isCustomized: false, value: { perDevice: 16, total: 64 } });+ });+ 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 },+ ])('rejects invalid settings %j', async value => {+ expect(isRemoteAgentLimits(value)).toBe(false);+ await expect(saveRemoteAgentLimits(value)).rejects.toThrow('INVALID_PARAMS');+ expect(readRemoteAgentLimitsState().isCustomized).toBe(false);+ });+ it('rejects writes during account teardown', async () => {+ state.pending = true;+ await expect(saveRemoteAgentLimits({ perDevice: 4, total: 8 })).rejects.toThrow('PRECONDITION_FAILED');+ });+});diff --git a/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts b/apps/desktop/src/main/remote-agent/__tests__/poll.test.tsindex c191497e11..c2c28651ec 100644--- a/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts@@ -136,7 +136,7 @@ describe('multiplexed poll', () => {await until(() => firstSink.done && secondSink.done);});- it('delivers every run exactly once with at most two polls in flight', async () => {+ it.each([12, 130])('delivers %i runs exactly once with at most two polls in flight', async count => {const host = fakeHost();let inflight = 0;let peak = 0;@@ -149,7 +149,7 @@ describe('multiplexed poll', () => {inflight -= 1;}});- const ids = Array.from({ length: 12 }, () => randomUUID());+ const ids = Array.from({ length: count }, () => randomUUID());const logs = ids.map((runId) => host.add(runId));const sinks = ids.map((runId) => collector(runId));for (const sink of sinks) poller.register(sink.run);diff --git a/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts b/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.tsindex 76d0e9b8e9..9074c235fb 100644--- a/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts@@ -25,6 +25,7 @@ import { credentialGrantFor, forgetCredentialGrants } from '../executor/credentiimport { startRemoteAgentSession, type StartRemoteAgentDeps } from '../controller/startRemote';import { createRemoteAgentHost, type HostedStartInput } from '../host/runHost';import { PROVIDER_SHARE_CREDENTIAL_SESSION_APPROVAL } from '../../../shared/providerShareCredentialConsent';+import { DEFAULT_REMOTE_AGENT_LIMITS, type RemoteAgentLimits } from '../../../shared/remoteAgentLimits';const RG = path.resolve(__dirname, '../../../../../ripgrep-bin', `${process.platform}-${process.arch}`, process.platform === 'win32' ? 'rg.exe' : 'rg');const CONTROLLER = 'controller-device-1';@@ -151,11 +152,11 @@ function fakeHostedAgent(input: HostedStartInput, credentialPaths?: string[]): A};}-function makeDeps(host: ReturnType<typeof createRemoteAgentHost>): StartRemoteAgentDeps {+function makeDeps(host: ReturnType<typeof createRemoteAgentHost>, controller = CONTROLLER): StartRemoteAgentDeps {return {invoke: async (args) => {// JSON 往返模拟设备互联的序列化。- const result = await host.handle(CONTROLLER, JSON.parse(JSON.stringify(args[0])));+ const result = await host.handle(controller, JSON.parse(JSON.stringify(args[0])));return JSON.parse(JSON.stringify(result ?? null));},rgPath: RG,@@ -183,8 +184,9 @@ afterEach(() => {fs.rmSync(root, { recursive: true, force: true });});-function createHost() {+function createHost(readLimits: () => RemoteAgentLimits = () => DEFAULT_REMOTE_AGENT_LIMITS) {return createRemoteAgentHost({+ readLimits,isAgentAvailable: () => true,startHosted: async (input) => {hostInputs.push(input);@@ -198,6 +200,35 @@ function createHost() {}describe('remote agent round trip', () => {+ it('enforces limits through the controller and releases capacity after close', async () => {+ let limits = { perDevice: 1, total: 2 };+ const host = createHost(() => limits);+ const opened: AgentSessionHandle[] = [];+ const open = async (controller: string) => {+ const handle = await startRemoteAgentSession('claude-code', {+ sessionId: randomUUID(), workingDir: project, model: 'm',+ }, makeDeps(host, controller));+ opened.push(handle);+ return handle;+ };+ try {+ const first = await open('a');+ await expect(open('a')).rejects.toThrow('[REMOTE_AGENT_BUSY] [DEVICE_LIMIT]');+ await open('b');+ await expect(open('c')).rejects.toThrow('[REMOTE_AGENT_BUSY] [TOTAL_LIMIT]');+ limits = { perDevice: 1, total: 1 };+ expect(host.limitUsage().total).toBe(2);+ await first.close({ reason: 'navigation' });+ await expect(open('c')).rejects.toThrow('[TOTAL_LIMIT]');+ limits = { perDevice: 2, total: 3 };+ await open('a');+ expect(host.limitUsage()).toEqual({ total: 2, devices: 2, largestDevice: 1 });+ } finally {+ await Promise.all(opened.map(handle => handle.close({ reason: 'navigation' })));+ await host.abortAll();+ host.dispose();+ }+ });it('keeps a shared-provider credential grant on this computer across turns and resets it on reopen', async () => {const env = path.join(project, '.env');const production = path.join(project, '.env.production');diff --git a/apps/desktop/src/main/remote-agent/host/limitsStore.ts b/apps/desktop/src/main/remote-agent/host/limitsStore.tsnew file mode 100644index 0000000000..9319d9f098--- /dev/null+++ b/apps/desktop/src/main/remote-agent/host/limitsStore.ts@@ -0,0 +1,33 @@+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_LIMITS, isRemoteAgentLimits, type RemoteAgentLimits } from '../../../shared/remoteAgentLimits.js';++const store = createOverrideSettingsFile<RemoteAgentLimits>({+ filePath: () => ownerScopedUserDataPath('remote-agent-limits.json'),+ scopeKey: () => { captureProviderManagementScope(); return activeOwnerScopeKey(); },+ defaults: DEFAULT_REMOTE_AGENT_LIMITS,+ normalize: raw => isRemoteAgentLimits(raw)+ ? { perDevice: raw.perDevice, total: raw.total } : { ...DEFAULT_REMOTE_AGENT_LIMITS },+ log: createLogger('remote-agent:limits'),+ label: 'remote-agent-limits',+ preserveUnreadableFile: true,+});++export function readRemoteAgentLimitsState() {+ store.invalidateIfChanged();+ return store.readState();+}++export async function saveRemoteAgentLimits(value: RemoteAgentLimits | null): Promise<void> {+ const assertCurrent = captureProviderManagementScope();+ if (value === null) await store.resetAtomic();+ else {+ if (!isRemoteAgentLimits(value)) throwIpcError('INVALID_PARAMS', 'Invalid remote task limits');+ // 显式保存默认值也是用户选择;恢复默认才删除 overrides。+ await store.writePatchAtomic(value, { preserveDefaults: true });+ }+ assertCurrent();+}diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex aa3ee38554..9b1bc5c217 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -1,3 +1,5 @@+import { parseProviderSharePeer } from '@cindy/device-link';+import { DEFAULT_REMOTE_AGENT_LIMITS, type RemoteAgentLimits, type RemoteAgentLimitUsage } from '../../../shared/remoteAgentLimits.js';/*** 远程 Agent 运行服务(被控端:提供 Agent 登录、订阅与供应商的电脑)。*@@ -23,7 +25,6 @@ import { gunzip } from 'node:zlib';import {REMOTE_AGENT_MAX_PAYLOAD_BYTES,- REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER,REMOTE_AGENT_METHODS,REMOTE_AGENT_POLL_MAX_BYTES,REMOTE_AGENT_READ_MAX_BYTES,@@ -94,11 +95,6 @@ export const REMOTE_AGENT_HOST_UNREAD_BYTES = 64 * 1024 * 1024;export const REMOTE_AGENT_HOST_IDLE_MS = 3 * 60_000;/** 结束后保留一段时间供控制端读完收尾事件。 */export const REMOTE_AGENT_HOST_RETAIN_MS = 60_000;-/**- * 供应商组的组所在电脑(同账号控制端)替多个受邀者中转过来时,它在本机的任务按受邀者(relay)各算- * REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER;这个控制端合计不超过这里。受邀者控制端填的 relay 不放宽额度。- */-export const REMOTE_AGENT_MAX_RELAYED_RUNS_PER_CONTROLLER = REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER * 4;/** 「需要换一台」凭证多久内有效(受邀者那边交接通常几秒内完成,重开时带回)。 */export const GROUP_SWITCH_TOKEN_TTL_MS = 10 * 60_000;/** 距上一次换电脑超过这么久算新的一轮(与供应商组本机任务的一轮同一口径)。 */@@ -165,6 +161,7 @@ export interface OwnerProviderRouteBinding {}export interface RemoteAgentHostDeps {+ readLimits?(): RemoteAgentLimits;isAgentAvailable(kind: RemoteAgentKind): boolean;startHosted(input: HostedStartInput): Promise<AgentSessionHandle>;/** 本机仍允许该控制端远程控制(总开关打开且未撤销)。 */@@ -536,6 +533,27 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {const shadowLocks = new Map<string, Promise<unknown>>();let sweepTimer: ReturnType<typeof setInterval> | null = null;const key = (controller: string, id: string) => `${controller}\0${id}`;+ const limitDeviceOf = (controller: string) => parseProviderSharePeer(controller)?.deviceId ?? controller;+ function usageByDevice(): Map<string, number> {+ const counts = new Map<string, number>();+ for (const run of runs.values()) {+ // 清理完成前仍占名额,包括正在关闭的实例。+ if (run.closedAt !== undefined) continue;+ const device = limitDeviceOf(run.controller);+ counts.set(device, (counts.get(device) ?? 0) + 1);+ }+ return counts;+ }+ function assertRunCapacity(controller: string): void {+ const limits = deps.readLimits?.() ?? DEFAULT_REMOTE_AGENT_LIMITS;+ const counts = usageByDevice();+ if ((counts.get(limitDeviceOf(controller)) ?? 0) >= limits.perDevice) {+ fail('REMOTE_AGENT_BUSY', '[DEVICE_LIMIT] remote task limit for this device reached');+ }+ if ([...counts.values()].reduce((sum, count) => sum + count, 0) >= limits.total) {+ fail('REMOTE_AGENT_BUSY', '[TOTAL_LIMIT] remote task limit for the provider computer reached');+ }+ }const trustOf = (controller: string): RemoteAgentControllerTrust => deps.controllerTrust?.(controller) ?? 'owner';/** 按控制端分开存放的目录名(影子工作区、附件与受邀者目录)。 */const controllerDir = (controller: string) => createHash('sha256').update(controller).digest('hex').slice(0, 16);@@ -2027,7 +2045,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {kind,available: deps.isAgentAvailable(kind) && (!guest || GUEST_SUPPORTED_AGENTS.has(kind)),})),- maxRuns: REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER,+ maxRuns: (deps.readLimits?.() ?? DEFAULT_REMOTE_AGENT_LIMITS).perDevice,uploadChunkBytes: REMOTE_AGENT_UPLOAD_CHUNK_BYTES,maxPayloadBytes: REMOTE_AGENT_MAX_PAYLOAD_BYTES,virtualWorkspace: true,@@ -2094,16 +2112,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {if (reshareKey) fail('REMOTE_AGENT_RESHARE_NOT_ALLOWED', 'the owner of this computer has not agreed to this user');failProviderNotAllowed();}- // 运行数按受邀者作用域各算一份;同一控制端替多个受邀者中转时另有合计上限。只有同账号控制端(组所在电脑)- // 的 relay 才各算一份:受邀者自己填的 relay 只把它的数据分开存放,不能用来绕开它的运行数上限。- const active = [...runs.values()].filter((run) => run.controller === controller && run.closedAt === undefined);- const scope = guestScopeOf(controller, relayKey);- const scoped = controllerTrust === 'guest'- ? active.length- : active.filter((run) => guestScopeOf(run.controller, run.relayKey) === scope).length;- if (scoped >= REMOTE_AGENT_MAX_RUNS_PER_CONTROLLER || active.length >= REMOTE_AGENT_MAX_RELAYED_RUNS_PER_CONTROLLER) {- fail('REMOTE_AGENT_BUSY', 'too many tasks are running from this computer');- }+ assertRunCapacity(controller);if (trust === 'guest') {// 受邀者必须用虚拟工作区:本机 Agent 只看到会话目录内的路径,附加目录也映射在其中。if (payload.virtualWorkspace !== true) {@@ -2181,6 +2190,13 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {if (reshareKey) fail('REMOTE_AGENT_RESHARE_NOT_ALLOWED', 'the owner of this computer has not agreed to this user');failProviderNotAllowed();}+ // 供应商查询/组分配有 await;最终检查与登记间不能再等待,防止并发 open 超额。+ try {+ assertRunCapacity(controller);+ } catch (error) {+ reserved?.release();+ throw error;+ }const run: Run = {id: request.runId,controller,@@ -2309,6 +2325,10 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {return {handle,+ limitUsage(): RemoteAgentLimitUsage {+ const counts = [...usageByDevice().values()];+ return { total: counts.reduce((sum, count) => sum + count, 0), devices: counts.length, largestDevice: Math.max(0, ...counts) };+ },resolveClaudeSessionId(sdkSessionId: string): string | null {if (disposed || !sdkSessionId || sdkSessionId === '<pending>') return null;for (const run of runs.values()) {diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.tsindex 3dfd3dbf14..bd92d20bfe 100644--- a/apps/desktop/src/main/remote-agent/host/service.ts+++ b/apps/desktop/src/main/remote-agent/host/service.ts@@ -1,3 +1,4 @@+import { readRemoteAgentLimitsState } from './limitsStore.js';/*** 远程 Agent 运行服务的被控端接线:把 `maker:remote-agent:v1` 接到本机 Maker 的 Agent。* 准入:本机打开了「允许远程控制」且没有撤销该控制端;账号切换后进行中的任务全部结束。@@ -118,6 +119,7 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatlog,});host = createRemoteAgentHost({+ readLimits: () => readRemoteAgentLimitsState().value,isAgentAvailable: (kind) => {try {return options.getMaker().listAvailableAgents().includes(kind);@@ -196,6 +198,7 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatabortReshare: (match, reshareKey) => current.abortReshare(match, reshareKey),purgeControllers: (match) => current.purgeControllers(match),activeControllers: () => current.activeControllers(),+ limitUsage: () => current.limitUsage(),turnRunningControllers: () => current.turnRunningControllers(),sharedGroupStatus: (providerId, guestController) => groupRelay.sharedStatus(providerId, guestController),});diff --git a/apps/desktop/src/renderer/__tests__/remoteErrorDecode.test.ts b/apps/desktop/src/renderer/__tests__/remoteErrorDecode.test.tsindex 5b28b4c698..602d3bafe8 100644--- a/apps/desktop/src/renderer/__tests__/remoteErrorDecode.test.ts+++ b/apps/desktop/src/renderer/__tests__/remoteErrorDecode.test.ts@@ -63,3 +63,11 @@ describe('decodeRemoteErrorMessage', () => {);});});++describe('remote session limit guidance', () => {+ it.each(['DEVICE_LIMIT', 'TOTAL_LIMIT'])('decodes %s inside lazy-create failures', reason => {+ const message = 'LAZY_CREATE_FAILED: [REMOTE_AGENT_BUSY] [' + reason + '] limit reached';+ expect(decodeRemoteErrorMessage(message)).toBe(i18n.t('chat.remoteError.REMOTE_AGENT_' + reason));+ expect(remoteErrorMessageForBanner(message)).toBe(message);+ });+});diff --git a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsxindex b0826ef404..570d4a8af9 100644--- a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx+++ b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx@@ -1,3 +1,4 @@+import { remoteAgentLimitErrorKey } from '../../../shared/remoteAgentLimits';import { useCodexRateLimits } from '@/hooks/useCodexRateLimits';import { useCodexRateLimitReset } from '@/hooks/useCodexRateLimitReset';import { Button } from '@/components/ui/button';@@ -358,7 +359,7 @@ export function ErrorBanner({? t(errorReasonI18nKey): undefined;const remoteErrorCode = parseAgentErrorCode(error)?.code;- const remoteErrorKey = chatRemoteErrorGuidanceKey(remoteErrorCode, sessionSource);+ const remoteErrorKey = remoteAgentLimitErrorKey(error) ?? chatRemoteErrorGuidanceKey(remoteErrorCode, sessionSource);const remoteGuidance = remoteErrorKey && i18n.exists(remoteErrorKey) ? t(remoteErrorKey) : undefined;const terminalRateLimitRetryProgress = parseTerminalRateLimitRetryProgress(error, errorReason);const isCodexUsageLimitError =diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/collaborationErrors.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/collaborationErrors.test.tsindex 420aa7873b..778527fa93 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/collaborationErrors.test.ts+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/collaborationErrors.test.ts@@ -76,3 +76,12 @@ describe('executionDeviceErrorMessage', () => {},);});++describe('remote session capacity errors', () => {+ it.each(['DEVICE_LIMIT', 'TOTAL_LIMIT'])('retains %s through INTERNAL and IPC wrappers', reason => {+ const error = new Error('Error invoking remote method: Error: [INTERNAL] [REMOTE_AGENT_BUSY] [' + reason + '] reached');+ expect(getCollaborationStartErrorMessage(error, t)).toBe('chat.remoteError.REMOTE_AGENT_' + reason);+ expect(getCollaborationStartErrorMessage(error, t, { continueAsSingleSession: true }))+ .toContain('newChat.collaboration.remoteContinueNotice');+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts b/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.tsindex 21040c2362..307198a42e 100644--- a/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts+++ b/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts@@ -1,3 +1,4 @@+import { remoteAgentLimitErrorKey } from '../../../shared/remoteAgentLimits';import type { TFunction } from 'i18next';import { extractIpcError } from '@/utils/ipcError';@@ -26,6 +27,8 @@ export function getCollaborationStartErrorMessage(): string {const ipcError = extractIpcError(err);const base = (() => {+ const limitKey = remoteAgentLimitErrorKey(err);+ if (limitKey) return t(limitKey);if (options.remoteDevice && ipcError?.code === 'DEVICE_LINK_CHANNEL_NOT_ALLOWED') {return t('newChat.collaboration.unsupportedRemoteHint');}@@ -47,7 +50,7 @@ export function getCollaborationStartErrorMessage(// 用户据此可能以为没发、再提交一次,或在不知情下让首轮脱离协同运行(codex review P2)。// remoteDevice 已经占掉了 `_CONTINUE` 后缀那一档,所以用一句独立的补充说明,而不是再// 铺一套 `_REMOTE_CONTINUE` 文案 —— 两句都是完整句子,拼接不会产生语法碎片。- if (options.remoteDevice && options.continueAsSingleSession) {+ if (options.continueAsSingleSession && (options.remoteDevice || remoteAgentLimitErrorKey(err))) {return `${base}${t('newChat.collaboration.remoteContinueNotice')}`;}return base;diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsxindex 20a6c85b70..493fa3fe06 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx@@ -1,3 +1,4 @@+import { RemoteAgentLimitsSection } from './RemoteAgentLimitsSection';/*** 「{供应商} · 远程与分享」页(供应商分享 §7.2;供应商组 §10)。从设置 → 模型供应商「允许被远程调用」一行的* 「远程与分享」入口进入,可返回。本机或同账号组所在电脑共用这一页,设置、分享与用量始终读取管理对象所在电脑。@@ -444,6 +445,8 @@ export function ProviderShareManagePage({initialConfig={initialGroup} remoteProvider={remoteProvider} onConfigChange={setRemoteGroup}/>+ <RemoteAgentLimitsSection key={deviceId ?? 'local'} deviceId={deviceId} />+<ProviderUsageSectionproviderId={providerId}providerName={providerName}diff --git a/apps/desktop/src/renderer/features/provider-share/RemoteAgentLimitsSection.tsx b/apps/desktop/src/renderer/features/provider-share/RemoteAgentLimitsSection.tsxnew file mode 100644index 0000000000..c8e912e956--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/RemoteAgentLimitsSection.tsx@@ -0,0 +1,106 @@+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 { isRemoteAgentLimits, REMOTE_AGENT_LIMIT_MAX, type RemoteAgentLimitsView } from '../../../shared/remoteAgentLimits';+import { providerManagementErrorKey, providerShareManagementCommand } from '../provider-group/providerManagement';++/** 各供应商管理页共用同一份提供方额度;只展示提供方自己的占用合计。 */+export function RemoteAgentLimitsSection({ deviceId }: { deviceId?: string }) {+ const { t } = useTranslation();+ const [view, setView] = useState<RemoteAgentLimitsView | null>(null);+ const [draft, setDraft] = useState<{ perDevice: string; total: string } | null>(null);+ const [errorKey, setErrorKey] = useState<string | null>(null);+ const [busy, setBusy] = useState(false);+ const saving = useRef(false);+ const sequence = useRef(0);++ const load = useCallback(async () => {+ if (saving.current) return;+ const seq = ++sequence.current;+ const owner = getDataOwnerGeneration();+ try {+ const next = await providerShareManagementCommand({ action: 'get-run-limits' }, deviceId);+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ setView(next);+ setErrorKey(null);+ } catch (error) {+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ setErrorKey(providerManagementErrorKey(error, Boolean(deviceId)));+ }+ }, [deviceId]);++ useEffect(() => {+ void load();+ const timer = window.setInterval(() => {+ if (document.visibilityState !== 'hidden') void load();+ }, 5_000);+ return () => { sequence.current += 1; window.clearInterval(timer); };+ }, [load]);++ const values = draft ?? { perDevice: String(view?.value.perDevice ?? ''), total: String(view?.value.total ?? '') };+ const limits = { perDevice: Number(values.perDevice), total: Number(values.total) };+ const valid = isRemoteAgentLimits(limits);+ const changed = view && (limits.perDevice !== view.value.perDevice || limits.total !== view.value.total);++ const save = async (reset: boolean) => {+ if (saving.current || (!reset && !valid)) return;+ saving.current = true;+ setBusy(true);+ const seq = ++sequence.current;+ const owner = getDataOwnerGeneration();+ try {+ const next = await providerShareManagementCommand(reset+ ? { action: 'reset-run-limits' } : { action: 'set-run-limits', limits }, deviceId);+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ setView(next);+ setDraft(null);+ setErrorKey(null);+ toast.success(t('providerShare.runLimits.saved'));+ } catch (error) {+ if (seq !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;+ toast.error(t(providerManagementErrorKey(error, Boolean(deviceId))));+ } finally {+ saving.current = false;+ if (seq === sequence.current) setBusy(false);+ }+ };++ return (+ <section className="mt-8 shrink-0" data-testid="remote-agent-limits" aria-labelledby="remote-agent-limits-title">+ <h3 id="remote-agent-limits-title" className="text-13 font-medium text-[var(--settings-section-title)]">+ {t('providerShare.runLimits.title')}+ </h3>+ <p className="mt-1 text-12 leading-[1.5] text-[var(--settings-section-desc)]">{t('providerShare.runLimits.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" onClick={() => void load()}>{t(errorKey ? 'providerShare.runLimits.retry' : 'providerShare.runLimits.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">+ {(['perDevice', 'total'] as const).map(key => (+ <FormField key={key} label={t(`providerShare.runLimits.${key}`)}>+ {control => <Input {...control} type="number" min={1} max={REMOTE_AGENT_LIMIT_MAX} step={1}+ disabled={busy || Boolean(errorKey)} value={values[key]} data-testid={`remote-agent-limit-${key}`}+ onChange={value => setDraft({ ...values, [key]: value })} />}+ </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>}+ <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>+ <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>+ <Button type="button" variant="secondary" size="sm" disabled={busy || !view.isCustomized || Boolean(errorKey)} onClick={() => void save(true)}>{t('providerShare.runLimits.reset')}</Button>+ </div>+ </form>+ )}+ </section>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsxindex 560f978c5f..d2b933cfaa 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@@ -160,6 +160,10 @@ beforeEach(() => {if (cmd.action === 'owned') return currentOwned;if (cmd.action === 'own-usage') return ownUsage();if (cmd.action === 'received') return [];+ if (cmd.action === 'get-run-limits') return {+ value: { perDevice: 16, total: 64 }, defaults: { perDevice: 16, total: 64 },+ isCustomized: false, customizedKeys: [], usage: { total: 0, devices: 0, largestDevice: 0 },+ };if (cmd.action === 'received-snapshot') return { ownerStamp: { dataOwnerId: null, ownerGeneration: 0 }, received: [], confirmedRegions: [] };if (cmd.action === 'set-member') return { ok: true };if (cmd.action === 'approve' || cmd.action === 'reject') {@@ -193,6 +197,7 @@ beforeEach(() => {const action = cmd.request?.command?.action;if (action === 'owned') return currentOwned;if (action === 'own-usage') return ownUsage();+ if (action === 'get-run-limits') return command(cmd.request?.command);if (action === 'approve' || action === 'reject') {currentOwned = { ...currentOwned, shares: currentOwned.shares.map((share) => ({ ...share, requests: [] })) };return { ok: true };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.tsxnew file mode 100644index 0000000000..8f7026c239--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteAgentLimitsSection.test.tsx@@ -0,0 +1,83 @@+// @vitest-environment jsdom+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';+import { RemoteAgentLimitsSection } from '../RemoteAgentLimitsSection';++const command = vi.hoisted(() => vi.fn());+vi.mock('../../provider-group/providerManagement', () => ({+ providerShareManagementCommand: command,+ providerManagementErrorKey: () => 'providerGroup.management.unsupported',+}));+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));+vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn() } }));++const view = (perDevice = 16, total = 64, isCustomized = false) => ({+ value: { perDevice, total }, defaults: { perDevice: 16, total: 64 }, isCustomized,+ customizedKeys: isCustomized ? ['perDevice', 'total'] : [],+ usage: { total: 0, devices: 0, largestDevice: 0 },+});+const input = (key: 'perDevice' | 'total') => screen.getByTestId(`remote-agent-limit-${key}`) as HTMLInputElement;+const button = (key: 'save' | 'reset') => screen.getByRole('button', { name: `providerShare.runLimits.${key}` }) as HTMLButtonElement;++beforeEach(() => {+ setDataOwnerGeneration('owner-a');+ command.mockReset().mockResolvedValue(view());+});+afterEach(() => { cleanup(); vi.useRealTimers(); });++describe('RemoteAgentLimitsSection', () => {+ it('validates both limits, saves on the selected computer and resets its overrides', async () => {+ render(<RemoteAgentLimitsSection deviceId="provider-computer" />);+ await waitFor(() => expect(input('perDevice').value).toBe('16'));+ fireEvent.change(input('perDevice'), { target: { value: '65' } });+ expect(button('save').disabled).toBe(true);+ expect(screen.getByRole('alert').textContent).toBe('providerShare.runLimits.invalid');+ fireEvent.change(input('total'), { target: { value: '100' } });+ command.mockResolvedValueOnce(view(65, 100, true));+ fireEvent.click(button('save'));+ await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'set-run-limits', limits: { perDevice: 65, total: 100 } }, 'provider-computer'));+ await waitFor(() => expect(button('reset').disabled).toBe(false));+ command.mockResolvedValueOnce(view());+ fireEvent.click(button('reset'));+ await waitFor(() => expect(input('perDevice').value).toBe('16'));+ expect(command).toHaveBeenLastCalledWith({ action: 'reset-run-limits' }, 'provider-computer');+ expect(button('reset').disabled).toBe(true);+ });++ it('refreshes usage without overwriting an unsaved edit', async () => {+ vi.useFakeTimers();+ render(<RemoteAgentLimitsSection />);+ await act(async () => {});+ fireEvent.change(input('perDevice'), { target: { value: '32' } });+ command.mockResolvedValue(view(20, 80, true));+ await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });+ expect(command).toHaveBeenCalledTimes(2);+ expect(input('perDevice').value).toBe('32');+ expect(input('total').value).toBe('64');+ });++ it('does not show an old account response after an account switch', async () => {+ let resolve!: (next: ReturnType<typeof view>) => void;+ command.mockImplementationOnce(() => new Promise(done => { resolve = done; }));+ render(<RemoteAgentLimitsSection />);+ setDataOwnerGeneration('owner-b');+ await act(async () => { resolve(view(99, 100, true)); });+ expect(screen.queryByTestId('remote-agent-limit-perDevice')).toBeNull();+ });++ 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'));+ fireEvent.change(input('perDevice'), { target: { value: '32' } });+ command.mockRejectedValueOnce(new Error('offline'));+ fireEvent.click(button('save'));+ await waitFor(() => expect(button('save').disabled).toBe(false));+ expect(input('perDevice').value).toBe('32');+ cleanup();+ command.mockRejectedValue(new Error('UNSUPPORTED_CAPABILITY'));+ render(<RemoteAgentLimitsSection deviceId="old-computer" />);+ await waitFor(() => expect(screen.getByRole('alert').textContent).toBe('providerGroup.management.unsupported'));+ expect(screen.queryByTestId('remote-agent-limit-perDevice')).toBeNull();+ });+});diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 3d6356449d..9e00d8ddfc 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -451,6 +451,20 @@"rejectedBody": "{{name}} declined to share {{provider}}","reshareTitle": "New Usage Request","reshareBody": "{{name}} wants to use your shared {{provider}} through {{owner}}’s provider group"+ },+ "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.",+ "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.",+ "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",+ "reset": "Restore defaults",+ "saved": "Remote session limits saved",+ "retry": "Reload",+ "loading": "Loading…"}},"providerGroup": {@@ -11723,7 +11737,9 @@"REMOTE_AGENT_SHARE_PAUSED": "The owner has paused this share for you, so these models can’t be used until it’s resumed. Switch to another model to continue.","REMOTE_AGENT_SHARE_REMOVED": "This share is no longer available (the owner removed it or you left). Switch to another model to continue.","REMOTE_AGENT_SHARE_UNAVAILABLE": "The shared provider is temporarily unavailable. The owner's computer may be offline, or sharing is turned off for now. Try again later, or switch to another model to continue.",- "REMOTE_AGENT_GROUP_UNAVAILABLE": "No computer in the provider group can run this task right now. They may be offline, paused, cooling down, or missing this model. Check the group on this provider’s Remote & Sharing page."+ "REMOTE_AGENT_GROUP_UNAVAILABLE": "No computer in the provider group can run this task right now. They may be offline, paused, cooling down, or missing this model. Check the group on this provider’s Remote & Sharing page.",+ "REMOTE_AGENT_DEVICE_LIMIT": "This device has reached its remote session limit. Archive unused sessions or ask the provider owner to raise the limit in Remote & sharing.",+ "REMOTE_AGENT_TOTAL_LIMIT": "The provider computer has reached its total remote session limit. Ask the owner to release unused sessions or raise the limit in Remote & sharing."},"generatedFiles": {"title": "Files created this message",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex a16547d418..2af7fab718 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -447,6 +447,20 @@"rejectedBody": "{{name}} は {{provider}} の共有を承認しませんでした","reshareTitle": "新しい利用リクエスト","reshareBody": "{{name}} が {{owner}} のプロバイダーグループ経由で、あなたの共有した {{provider}} を使いたいと希望しています"+ },+ "runLimits": {+ "title": "リモートセッション数",+ "description": "自分の他のパソコンと共有先のデバイスを含め、このパソコンのすべてのプロバイダーに適用されます。応答済みでも解放されていないセッションは含まれます。このパソコンで直接実行するセッションは含まれません。",+ "perDevice": "接続デバイスごとの最大セッション数",+ "total": "全接続デバイスの合計最大セッション数",+ "invalid": "1~{{max}} の整数を入力してください。デバイスごとの上限は合計上限以下にしてください。",+ "usage": "使用中 {{used}} / {{total}}、{{devices}} 台から接続。1 台あたりの最多使用数は {{largest}} です。",+ "applyHint": "保存後すぐに適用されます。上限を下げても既存のセッションは中断せず、新規作成のみ制限します。グループ経由の接続は直接接続しているデバイスに集計されます。",+ "save": "保存",+ "reset": "既定値に戻す",+ "saved": "リモートセッション数を保存しました",+ "retry": "再読み込み",+ "loading": "読み込み中…"}},"providerGroup": {@@ -11673,7 +11687,9 @@"REMOTE_AGENT_SHARE_PAUSED": "共有した人があなたへの共有を一時停止したため、再開されるまでこれらのモデルは使えません。別のモデルに切り替えて続けられます。","REMOTE_AGENT_SHARE_REMOVED": "この共有は利用できなくなりました(共有した人が削除したか、あなたが退出しました)。別のモデルに切り替えて続けられます。","REMOTE_AGENT_SHARE_UNAVAILABLE": "共有されたプロバイダーは一時的に利用できません。共有した人のパソコンがオフラインか、共有が一時的にオフになっている可能性があります。後でもう一度試すか、別のモデルに切り替えて続けられます。",- "REMOTE_AGENT_GROUP_UNAVAILABLE": "プロバイダーグループ内のパソコンは現在このセッションを実行できません。オフライン、割り当て停止中、クールダウン中、またはこのモデルがない可能性があります。このプロバイダーの「リモートと共有」ページでグループを確認してください。"+ "REMOTE_AGENT_GROUP_UNAVAILABLE": "プロバイダーグループ内のパソコンは現在このセッションを実行できません。オフライン、割り当て停止中、クールダウン中、またはこのモデルがない可能性があります。このプロバイダーの「リモートと共有」ページでグループを確認してください。",+ "REMOTE_AGENT_DEVICE_LIMIT": "このデバイスのリモートセッション数が上限に達しました。不要なセッションをアーカイブするか、提供者に「リモートと共有」で上限の変更を依頼してください。",+ "REMOTE_AGENT_TOTAL_LIMIT": "提供者のパソコンのリモートセッション総数が上限に達しました。提供者に不要なセッションの解放、または「リモートと共有」での上限変更を依頼してください。"},"generatedFiles": {"title": "このメッセージで作成されたファイル",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 6003396199..949b211696 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -447,6 +447,20 @@"rejectedBody": "{{name}}님이 {{provider}} 공유를 거절했습니다","reshareTitle": "새 사용 요청","reshareBody": "{{name}}님이 {{owner}}님의 제공자 그룹을 통해 내가 공유한 {{provider}}을(를) 사용하려고 합니다"+ },+ "runLimits": {+ "title": "원격 세션 수 제한",+ "description": "내 다른 컴퓨터와 공유받은 기기를 포함해 이 컴퓨터의 모든 제공자에 적용됩니다. 응답이 끝나도 해제되지 않은 세션은 포함됩니다. 이 컴퓨터에서 직접 실행하는 세션은 제외됩니다.",+ "perDevice": "연결된 기기당 최대 세션 수",+ "total": "연결된 모든 기기의 총 최대 세션 수",+ "invalid": "1~{{max}} 사이의 정수를 입력하세요. 기기당 한도는 전체 한도를 넘을 수 없습니다.",+ "usage": "{{devices}}개 기기에서 {{used}} / {{total}}개 사용 중. 기기 한 대의 최대 사용 수는 {{largest}}개입니다.",+ "applyHint": "저장 즉시 적용됩니다. 한도를 낮춰도 기존 세션은 중단되지 않고 새 세션만 제한됩니다. 그룹 중계는 직접 연결된 기기에 합산됩니다.",+ "save": "저장",+ "reset": "기본값 복원",+ "saved": "원격 세션 수 제한을 저장했습니다",+ "retry": "새로고침",+ "loading": "불러오는 중…"}},"providerGroup": {@@ -11673,7 +11687,9 @@"REMOTE_AGENT_SHARE_PAUSED": "공유한 사람이 나에 대한 공유를 일시 중지해서 재개될 때까지 이 모델을 사용할 수 없습니다. 다른 모델로 바꿔 계속할 수 있습니다.","REMOTE_AGENT_SHARE_REMOVED": "이 공유는 더 이상 사용할 수 없습니다(공유한 사람이 삭제했거나 내가 나갔습니다). 다른 모델로 바꿔 계속할 수 있습니다.","REMOTE_AGENT_SHARE_UNAVAILABLE": "공유된 제공자를 일시적으로 사용할 수 없습니다. 공유한 사람의 컴퓨터가 오프라인이거나 공유가 잠시 꺼져 있을 수 있습니다. 나중에 다시 시도하거나 다른 모델로 바꿔 계속할 수 있습니다.",- "REMOTE_AGENT_GROUP_UNAVAILABLE": "제공자 그룹의 컴퓨터가 지금 이 세션을 실행할 수 없습니다. 모두 오프라인이거나, 배정이 일시 중지되었거나, 대기 중이거나, 이 모델이 없을 수 있습니다. 이 제공자의 원격 및 공유 페이지에서 그룹을 확인하세요."+ "REMOTE_AGENT_GROUP_UNAVAILABLE": "제공자 그룹의 컴퓨터가 지금 이 세션을 실행할 수 없습니다. 모두 오프라인이거나, 배정이 일시 중지되었거나, 대기 중이거나, 이 모델이 없을 수 있습니다. 이 제공자의 원격 및 공유 페이지에서 그룹을 확인하세요.",+ "REMOTE_AGENT_DEVICE_LIMIT": "이 기기의 원격 세션 수가 한도에 도달했습니다. 사용하지 않는 세션을 보관하거나 제공자에게 원격 및 공유에서 한도를 높여 달라고 요청하세요.",+ "REMOTE_AGENT_TOTAL_LIMIT": "제공자 컴퓨터의 전체 원격 세션 수가 한도에 도달했습니다. 제공자에게 불필요한 세션을 해제하거나 원격 및 공유에서 한도를 높여 달라고 요청하세요."},"generatedFiles": {"title": "이 메시지에서 생성된 파일",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 8e1aeb61cd..9445ea24d6 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -447,6 +447,20 @@"rejectedBody": "{{name}} 没有同意分享 {{provider}}","reshareTitle": "新的使用请求","reshareBody": "{{name}} 想经 {{owner}} 的供应商组使用你分享的 {{provider}}"+ },+ "runLimits": {+ "title": "远程任务数量",+ "description": "适用于这台电脑提供的所有供应商,包括自己的其他电脑和分享给他人的设备。已回答完但尚未释放的任务也占名额,本机直接运行的任务不计入。",+ "perDevice": "每台使用设备最多保留的任务数",+ "total": "所有使用设备合计最多保留的任务数",+ "invalid": "请填写 1~{{max}} 的整数,单台设备的上限不能超过合计上限。",+ "usage": "当前占用 {{used}} / {{total}},来自 {{devices}} 台设备;单台设备最多占用 {{largest}} 个。",+ "applyHint": "保存后立即生效。调低上限不会中断已有任务,只会限制新增。供应商组中转按直接连接的设备计数。",+ "save": "保存",+ "reset": "恢复默认",+ "saved": "远程任务数量设置已保存",+ "retry": "重新加载",+ "loading": "正在加载…"}},"providerGroup": {@@ -11673,7 +11687,9 @@"REMOTE_AGENT_SHARE_PAUSED": "对方已暂停对你的分享,恢复前不能使用这些模型。可以换成其他模型继续。","REMOTE_AGENT_SHARE_REMOVED": "这个分享已不可用(对方删除了分享或你已退出)。可以换成其他模型继续。","REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供应商暂时不可用:对方电脑可能不在线,或对方暂时关闭了分享。可以稍后再试,或换成其他模型继续。",- "REMOTE_AGENT_GROUP_UNAVAILABLE": "供应商组里的电脑现在都不能运行这个任务:可能都不在线、已暂停分配、正在冷却,或没有这个模型。可以到这个供应商的「远程与分享」页查看组内电脑。"+ "REMOTE_AGENT_GROUP_UNAVAILABLE": "供应商组里的电脑现在都不能运行这个任务:可能都不在线、已暂停分配、正在冷却,或没有这个模型。可以到这个供应商的「远程与分享」页查看组内电脑。",+ "REMOTE_AGENT_DEVICE_LIMIT": "这台设备保留的远程任务数已达上限。可归档暂时不用的任务,或请远程电脑的主人在“远程与分享”中提高上限。",+ "REMOTE_AGENT_TOTAL_LIMIT": "远程电脑保留的任务总数已达上限。请那台电脑的主人释放暂时不用的任务,或在“远程与分享”中提高上限。"},"generatedFiles": {"title": "本条消息生成的文件",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 0f73335de9..1ea519c1d9 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -447,6 +447,20 @@"rejectedBody": "{{name}} 沒有同意分享 {{provider}}","reshareTitle": "新的使用請求","reshareBody": "{{name}} 想經 {{owner}} 的供應商組使用你分享的 {{provider}}"+ },+ "runLimits": {+ "title": "遠端任務數量",+ "description": "適用於這台電腦提供的所有供應商,包括自己的其他電腦和分享給他人的裝置。已回答完但尚未釋放的任務也佔名額,本機直接執行的任務不計入。",+ "perDevice": "每台使用裝置最多保留的任務數",+ "total": "所有使用裝置合計最多保留的任務數",+ "invalid": "請填寫 1~{{max}} 的整數,單台裝置的上限不能超過合計上限。",+ "usage": "目前佔用 {{used}} / {{total}},來自 {{devices}} 台裝置;單台裝置最多佔用 {{largest}} 個。",+ "applyHint": "儲存後立即生效。調低上限不會中斷現有任務,只會限制新增。供應商組轉送按直接連線的裝置計數。",+ "save": "儲存",+ "reset": "恢復預設",+ "saved": "遠端任務數量設定已儲存",+ "retry": "重新載入",+ "loading": "正在載入…"}},"providerGroup": {@@ -11672,7 +11686,9 @@"REMOTE_AGENT_SHARE_PAUSED": "對方已暫停對你的分享,恢復前不能使用這些模型。可以換成其他模型繼續。","REMOTE_AGENT_SHARE_REMOVED": "這個分享已無法使用(對方刪除了分享或你已退出)。可以換成其他模型繼續。","REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供應商暫時無法使用:對方電腦可能不在線,或對方暫時關閉了分享。可以稍後再試,或換成其他模型繼續。",- "REMOTE_AGENT_GROUP_UNAVAILABLE": "供應商組裡的電腦現在都不能執行這個任務:可能都離線、已暫停分配、正在冷卻,或沒有這個模型。可以到這個供應商的「遠端與分享」頁查看組內電腦。"+ "REMOTE_AGENT_GROUP_UNAVAILABLE": "供應商組裡的電腦現在都不能執行這個任務:可能都離線、已暫停分配、正在冷卻,或沒有這個模型。可以到這個供應商的「遠端與分享」頁查看組內電腦。",+ "REMOTE_AGENT_DEVICE_LIMIT": "這台裝置保留的遠端任務數已達上限。可封存暫時不用的任務,或請遠端電腦的主人在「遠端與分享」中提高上限。",+ "REMOTE_AGENT_TOTAL_LIMIT": "遠端電腦保留的任務總數已達上限。請那台電腦的主人釋放暫時不用的任務,或在「遠端與分享」中提高上限。"},"generatedFiles": {"title": "本條訊息生成的檔案",diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.tsindex f06887a59f..7c2b9097ec 100644--- a/apps/desktop/src/renderer/lib/makerChatStore.ts+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts@@ -1,3 +1,4 @@+import { remoteAgentLimitErrorKey } from '../../shared/remoteAgentLimits';import { readBotTaskResults } from '@cindy/maker-shared/botCollaboration';import { asyncQuestionNeedsSupplement, formatAsyncQuestionSupplement } from '@cindy/maker-shared/interaction';import { isComposerTypingRecently } from './composerTypingActivity';@@ -350,11 +351,15 @@ function resolveEstimatedTurnCostUsd(/** Translation candidate only; callers must check their active i18n resources.* Unknown-code fallback text is diagnostic content, not curated guidance. */export function remoteErrorI18nKey(msg: string): string | undefined {+ const limitKey = remoteAgentLimitErrorKey(msg);+ if (limitKey) return limitKey;const parsed = parseAgentErrorCode(msg);return parsed ? `chat.remoteError.${parsed.code}` : undefined;}export function decodeRemoteErrorMessage(msg: string): string {+ const limitKey = remoteAgentLimitErrorKey(msg);+ if (limitKey) return i18n.t(limitKey);const parsed = parseAgentErrorCode(msg);return parsed? i18n.t(`chat.remoteError.${parsed.code}`, { defaultValue: parsed.fallback })diff --git a/apps/desktop/src/shared/providerManagement.ts b/apps/desktop/src/shared/providerManagement.tsindex bef533f243..c739956d2b 100644--- a/apps/desktop/src/shared/providerManagement.ts+++ b/apps/desktop/src/shared/providerManagement.ts@@ -12,7 +12,7 @@ export type ProviderGroupManagementCommand = Extract<export type ProviderShareManagementCommand = Extract<ProviderShareCommand,- { action: 'owned' | 'own-usage' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'reshare-decide' }+ { action: 'owned' | 'own-usage' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' }>;export type ProviderManagementRequest =diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex 631b6d1db4..65549decca 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -2,6 +2,8 @@* 供应商分享的 Renderer ↔ Main 契约(只在本机进程之间;服务端契约见* docs/provider-sharing-contract.md)。身份只有昵称与头像。*/+import type { RemoteAgentLimits, RemoteAgentLimitsView } from './remoteAgentLimits';+import type {ProviderShareLinkPreview,ProviderShareMember,@@ -156,6 +158,9 @@ export interface ProviderShareSettledEvent {}export type ProviderShareCommand =+ | { action: 'get-run-limits' }+ | { action: 'reset-run-limits' }+ | { action: 'set-run-limits'; limits: RemoteAgentLimits }| { action: 'owned'; range: ProviderShareUsageRange }/** 这个供应商按使用方的用量(本机与我的其他电脑)。不依赖分享服务。 */| { action: 'own-usage'; providerId: string; range: ProviderShareUsageRange }@@ -181,6 +186,9 @@ export interface ProviderShareCredentialConsentView {}export interface ProviderShareCommandResult {+ 'get-run-limits': RemoteAgentLimitsView;+ 'set-run-limits': RemoteAgentLimitsView;+ 'reset-run-limits': RemoteAgentLimitsView;owned: ProviderShareOwnerState;'own-usage': ProviderOwnUsageView;'create-link': ProviderShareLinkCreated;diff --git a/apps/desktop/src/shared/remoteAgentLimits.ts b/apps/desktop/src/shared/remoteAgentLimits.tsnew file mode 100644index 0000000000..8c11c57d77--- /dev/null+++ b/apps/desktop/src/shared/remoteAgentLimits.ts@@ -0,0 +1,40 @@+/** 提供方整台电脑的远程任务额度;包含空闲但尚未释放的运行实例。 */+export interface RemoteAgentLimits {+ perDevice: number;+ total: number;+}++// maxRuns 的旧版解析上限为 1000,保持 wire 兼容。+export const REMOTE_AGENT_LIMIT_MAX = 1000;+export const DEFAULT_REMOTE_AGENT_LIMITS: Readonly<RemoteAgentLimits> = { perDevice: 16, total: 64 };++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;+}++export interface RemoteAgentLimitUsage {+ total: number;+ devices: number;+ largestDevice: number;+}++export interface RemoteAgentLimitsView {+ value: RemoteAgentLimits;+ defaults: RemoteAgentLimits;+ isCustomized: boolean;+ customizedKeys: string[];+ usage: RemoteAgentLimitUsage;+}++/** 继续使用旧版认识的 BUSY 错误码;原因标记经过 IPC / LAZY_CREATE_FAILED 包装后仍可识别。 */+export function remoteAgentLimitErrorKey(error: unknown): string | null {+ const message = error instanceof Error ? error.message : typeof error === 'string'+ ? error : (error as { message?: unknown } | null)?.message;+ if (typeof message !== 'string') return null;+ const reason = /\[REMOTE_AGENT_BUSY\] \[(DEVICE_LIMIT|TOTAL_LIMIT)\]/.exec(message)?.[1];+ return reason ? `chat.remoteError.REMOTE_AGENT_${reason}`+ : message.includes('[REMOTE_AGENT_BUSY]') ? 'chat.remoteError.REMOTE_AGENT_BUSY' : null;+}diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 30342424d1..abc361270e 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1282,11 +1282,15 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01- **open 载荷新增可选 `relay`**(`remote-agent/wire.ts`,`REMOTE_AGENT_RELAY_KEY_PATTERN`,16–64 位 `[A-Za-z0-9_-]`):O 为受邀者取的不透明键(按受邀者派生,不含分享与成员信息)。M 收到带 `relay` 的 open 一律按受邀者隔离运行(即使控制端是同账号的 O):- 受邀者目录、会话索引、续接校验与运行数按(控制端, relay)分开;同一控制端按受邀者各 16 个、合计 64 个任务。只有同账号- 控制端的 `relay` 才各算一份运行数:受邀者控制端自己填的 `relay` 只把它的数据分开存放,运行数仍按这个受邀者合计 16 个,- 不能借此放宽额度(分享来的 M 上 O 本身就是受邀者,O 替各受邀者中转的任务在那台合计 16 个)。O 同时带+ 受邀者目录、会话索引、续接校验按(控制端, relay)分开。数量上限按认证的直接连接设备合计,分享 peer 取其 deviceId,+ 同一设备跨供应商、分享入口及 relay 共用额度;默认单设备 16、提供方整机 64(可配置),不会因 relay 获得额外额度。O 同时带`groupAssigned`,并把 `sessionId` 换成按(受邀者, 任务 id)派生的 id、`providerId` 换成 M 上的供应商。旧 M 丢弃这个字段,所以 O 只把受邀者任务交给 caps 声明了 `guestRelay` 的同账号 M;分享来的 M 本来就把 O 当受邀者隔离,不要求这个能力。+- **提供方远程任务数量设置**:沿用 `maker:remote-agent:v1`,不加必填字段;`caps.maxRuns` 返回当前单设备上限(1~1000,旧解析器可读)。+ 超限仍回 `REMOTE_AGENT_BUSY`,message 用 `[DEVICE_LIMIT]` / `[TOTAL_LIMIT]` 区分原因,旧端继续按忙碌处理。+ 本机 `provider-share:command` 与同账号管理通道增加 `get-run-limits` / `set-run-limits` / `reset-run-limits`;+ 不向受邀者开放。旧端不认识这些管理命令时显示需要更新,不回退伪造成功。设置只影响新增实例,不中断存量。+ 大额度下控制端仍按每批最多 64 个任务轮转 poll,不提高 wire 上限。- **caps 新增可选 `guestRelay: true`**(`RemoteAgentCaps`):被控端能按受邀者隔离运行(供应商级授权与受邀者出站边界都已接上)。- **新 op `forget { relay }`**(`parseRemoteAgentRequest`):O 删除受邀者后请 M 清掉替它运行过的任务、受邀者目录与会话记录;只作用于调用方自己的 relay。旧 M 回 `REMOTE_AGENT_INVALID`(它从没接过被中转的任务)。diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.mdindex 421a477642..4e76dfb640 100644--- a/docs/product-rules/provider-groups.md+++ b/docs/product-rules/provider-groups.md@@ -147,9 +147,10 @@那台的 Cindy 太旧、给不出同意时不分给分享的人。分享的人看到的匿名状态里这台写「暂不可用」(或「需要更新」),组的台数不变。同账号的电脑经组使用(组所在电脑自己与我的其他电脑)不需要同意。协议见 `docs/dev-rules/protocol-compatibility.md`「供应商组:转分享需原主人逐人同意」。- - 被中转过来的任务,组内电脑一律按受邀者隔离运行(即使来自同账号的组所在电脑):受邀者目录、会话索引与运行数按+ - 被中转过来的任务,组内电脑一律按受邀者隔离运行(即使来自同账号的组所在电脑):受邀者目录、会话索引按(组所在电脑, 受邀者)分开,受邀者在那台的身份是组所在电脑为它取的不透明键,任务 id 也按受邀者派生,两个受邀者- 用同一个任务 id 不会撞车。组所在电脑在同一台组内电脑上按受邀者各算 16 个任务、合计不超过 64 个。+ 用同一个任务 id 不会撞车。数量上限独立于数据隔离:组内电脑按直接连接的组所在电脑合计,+ 不因受邀者不同增加额度;单设备默认 16、整台提供方电脑默认 64,可在「远程与分享」页统一调整,见 provider-sharing.md §3。- **续接**只回到当初运行这个会话的那台(组所在电脑记着「哪个会话在哪台」,那台被移出组后也回到那台),不在别处重试;受邀者不能凭 id 接回别的受邀者的会话。- **启动阶段**(新任务还没开始运行)那台接不下时直接换组里下一台,受邀者无感,旧版本受邀者也享受;每台最多试一次,@@ -173,7 +174,7 @@- **选择方式**:最少占用(默认,选正在运行任务最少的那台)、轮询、按顺序(排在前面的优先,前面的不可用才用后面的)、按权重。读得到 Claude Code 订阅用量时,先按下方「配额先比」筛,组策略只在剩下的几台里挑(2026-10-15)。原来单列的「用量均衡」不再出现在设置里;已经存了它的组挑法与最少占用相同,界面按最少占用显示,用户改选时才写回新值。-- **并发上限**:每台组内电脑单独设置,默认 4,最多 16(远程 Agent 对每个控制端的上限);只统计经本组分到这台的任务,+- **并发上限**:每台组内电脑单独设置,默认 4,最多 16(组分配的独立设置,不随远程任务数量设置改变);只统计经本组分到这台的任务,包括同账号其他电脑经本组直连过去的任务:它们由任务所在的电脑在每一轮开始、结束时报告,运行期间每分钟再报一次,组所在电脑 150 秒收不到就不再计入;刚选中、还没报告的任务先按占用记 30 秒,同时开的几个任务不会全落到同一台。- **分享来的电脑**(2026-10-10):分享者电脑在给组所在电脑的供应商目录里报告**本账号**(组所在电脑这个账号的每台电脑)diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 1eb8a02996..769b132d70 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -53,7 +53,13 @@- **所有供应商都能分享**:API Key、订阅登录、本机 CLI 账号、组织发放的供应商一视同仁。凡是能被远程调用的供应商,分享者自己的其他电脑能用,也都能分享给他人。- **分享人数不限**,链接也可以无限生成。分享者电脑上同时运行的受邀者任务沿用远程 Agent 的- 运行数保护(每个发起方的上限),这不是人数限制。+ 数量保护,这不是人数限制。提供方可在任一供应商的「远程与分享」页设置整台电脑共用的额度:+ 每台使用设备默认 16 个,所有设备合计默认 64 个;两项均为 1~1000 的整数,单设备不得高于合计。+ 同账号其他电脑与分享设备都计入,同一设备跨供应商、分享入口合并计数;本机直接运行的任务不计入。+ 已回答完但尚未关闭释放的任务、协同成员与中转任务仍占名额,关闭清理完成后才释放。+ 修改立即生效,降低上限不终止已有任务;恢复默认清除本账号在这台电脑的覆盖设置。+ 供应商组中转每一跳按直接连接的设备计数,不按中转声明的受邀者额外分配额度;转分享同意规则不变。+ 页面显示合计占用、使用设备数及单设备最大占用;只有本机主人及其同账号电脑可以查看、修改。- **只能在电脑上申请和使用**:手机打开分享链接时,只提示到电脑上的 Cindy 打开,不提供申请。- **能力逐级开启**:1. 电脑打开「允许远程控制」,才能提供远程供应商;