Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-group): 统一组限额提示与自动继续体验
Dash7c8488068639
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.tsindex f14a7c69a2..e9ae0f562a 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/agent-input-coordinator.test.ts@@ -10,6 +10,7 @@ import { createPluginTaskReviewResolver, type PluginReviewSnapshot } from '../plimport { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { admitTaskAction, bindTaskActionInput, taskActionInputGuard } from '../taskActionAuthorization.js';import { AgentInputCoordinator } from '../agent-input-coordinator.js';+import { ProviderGroupUsageLimitError } from '../../provider-group/failurePolicy.js';import { MCP_APP_MESSAGE_CLIENT_PREFIX, MCP_APP_MESSAGE_GUARD } from '../../mcp-apps/message.js';import { hasAcceptedUserTaskInput } from '../pluginTaskInput.js';import { runSchedulerQueuedPreparation } from '../schedulerQueuedPreparation.js';@@ -14222,6 +14223,38 @@ describe('usage-limit wait (ordinary tasks)', () => {sessionTotal: 0,};+ // Unit regression: group selection rejects before persistence. Existing tests covered only+ // running turns; the original queued message must be sent once, or retained after cancellation.+ it.each([false, true])('waits after a group quota rejection before dispatch (cancel=%s)', async (cancel) => {+ const h = createHarness();+ const sid = 'group-quota-before-send';+ h.sendToAgent.mockRejectedValueOnce(new ProviderGroupUsageLimitError({ resetAtMs: 5_000_000 }));+ h.coordinator.enqueue(sid, makeItem('q-original', 'original task'));+ await flush();+ expect(h.onUserMessagePersisted).not.toHaveBeenCalled();+ const candidate = h.onUsageLimitedTurnError.mock.calls.at(-1)?.[3] as number;+ expect(h.onUsageLimitedTurnError).toHaveBeenCalledWith(sid,+ expect.objectContaining({ usageLimit: true, providerGroupUsageLimit: { resetAtMs: 5_000_000 } }),+ expect.objectContaining({ clientId: 'q-original' }), expect.any(Number));+ expect(h.coordinator.armUsageLimitWait(sid, candidate, 9_000_000)).toBe(true);+ if (cancel) h.coordinator.cancelUsageLimitWait(sid, candidate);+ expect(await h.coordinator.continueAfterUsageLimitReset(sid, candidate, INFO)).toBe(cancel ? 'superseded' : 'resumed');+ await flush();+ expect(h.sendToAgent).toHaveBeenCalledTimes(cancel ? 1 : 2);+ if (!cancel) {+ expect(h.sendToAgent.mock.calls[1][3].persistUserMessage?.clientId).toBe('q-original');+ expect(h.onUserMessagePersisted).toHaveBeenCalledTimes(1);+ }+ });++ it('does not arm a queue wait from an unverified provider error string', async () => {+ const h = createHarness();+ h.sendToAgent.mockRejectedValueOnce(new Error('usage_limit_reached; resets_at: 5000000'));+ h.coordinator.enqueue('unknown-quota', makeItem('q-original', 'original task'));+ await flush();+ expect(h.onUsageLimitedTurnError).not.toHaveBeenCalled();+ });+async function failWithLimit(sid: string, progress: boolean) {const h = createHarness();h.setHasAssistantProgressAfter(async () => progress);diff --git a/apps/desktop/src/main/maker-ipc/__tests__/usageLimitAutoResume.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/usageLimitAutoResume.test.tsindex d513431bf3..51b54f3d8a 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/usageLimitAutoResume.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/usageLimitAutoResume.test.ts@@ -73,6 +73,20 @@ describe('isAccountUsageLimitError', () => {});describe('UsageLimitAutoResume', () => {+ // Unit regression: a pending group switch can still have the previous local route saved.+ // Resetting that local account must not wake the group's wait or consume its retry budget.+ it('keeps a group quota wait until its timer even when the old account resets', async () => {+ const h = harness();+ h.guard.onTurnError('group', { usageLimit: true, providerGroupUsageLimit: { resetAtMs: RESET_AT } });+ await h.flush();+ const matches = vi.fn(async () => true);+ await h.guard.resumeRestored(matches);+ expect(matches).not.toHaveBeenCalled();+ expect(h.deps.continueSession).not.toHaveBeenCalled();+ await h.fireLast();+ expect(h.deps.continueSession).toHaveBeenCalledOnce();+ });+it('resumes only matching armed waits after a reset and respects user cancellation', async () => {const h = harness();h.guard.onTurnError('matching', LIMIT); h.guard.onTurnError('other', LIMIT);diff --git a/apps/desktop/src/main/maker-ipc/agent-input-coordinator.ts b/apps/desktop/src/main/maker-ipc/agent-input-coordinator.tsindex 991b7f676a..f7ad1fe384 100644--- a/apps/desktop/src/main/maker-ipc/agent-input-coordinator.ts+++ b/apps/desktop/src/main/maker-ipc/agent-input-coordinator.ts@@ -5,6 +5,7 @@ import { assertSharedTaskQueueMutation } from './sharedTaskInput.js';import { assertTaskActionCurrent, combineInputGuards, hasTaskActionAuthorization, taskActionInputGuard, TASK_ACTION_INPUT_GUARD } from './taskActionAuthorization.js';import { isBotGroupClientId } from '../../shared/botGroupChat.js';import { SchedulerQueuedPreparationError } from './schedulerQueuedPreparation.js';+import { ProviderGroupUsageLimitError } from '../provider-group/failurePolicy.js';import { MCP_APP_MESSAGE_GUARD, isUnrestorableMcpAppMessage, queuedAppMessageGuard, type McpAppMessageGuard } from '../mcp-apps/message.js';/*** AgentInputCoordinator — main 侧排队输入事务协调器。@@ -3290,10 +3291,11 @@ export class AgentInputCoordinator {};}}- // queue-head recovery 表示消息从未跨过 accepted 边界,自动重发仍然可能重复一条- // 尚未确认是否落库的输入;这条路径继续交给用户。active-turn recovery 则已经落库,- // 零产出克隆重发是安全的,连续失败次数由 host 守卫负责止损。- if (automatic && (recovery.kind !== 'active-turn' || (!continueItem && !progressKnown))) {+ // Only the verified group quota rejection can arm a queue-head wait: selection failed+ // before dispatch, so retry the existing input/receipt, never clone an uncertain send.+ const waitingQueueHead = usageWait && recovery.kind === 'queue-head'+ && state.pendingQueue[0]?.clientId === recovery.clientId;+ if (automatic && !waitingQueueHead && (recovery.kind !== 'active-turn' || (!continueItem && !progressKnown))) {log.debug('auto retry skipped — progress state is not safe to resend', {sessionId,recoveryKind: recovery.kind,@@ -5227,6 +5229,13 @@ export class AgentInputCoordinator {error: latest.error,});this.notifyRejectedUserTurn(sessionId, head);+ if (err instanceof ProviderGroupUsageLimitError) {+ this.notifyUsageLimitedTurnError(sessionId, head, latest.error, {+ usageLimit: true,+ providerGroupUsageLimit: err.limit,+ ...(err.limit.resetAtMs === null ? {} : { usageResetAt: err.limit.resetAtMs }),+ });+ }this.emit(sessionId);return;}@@ -6644,6 +6653,7 @@ export class AgentInputCoordinator {private willNotifyUsageLimitedTurnError(state: SessionInputState,item: AgentInputQueuedMessage,+ beforeDispatch = false,): boolean {// scheduler origin(含复用它的 Slack / X / Telegram Hook 消息)终态失败时本就不留// recovery、由各自 runner 收尾,没有可续的入口。共享任务访客的回合也不自动续:@@ -6652,7 +6662,7 @@ export class AgentInputCoordinator {this.deps.onUsageLimitedTurnError &&!isSchedulerOriginItem(item) &&!item.sharedTaskAuthor &&- state.recovery?.kind === 'active-turn' &&+ (state.recovery?.kind === 'active-turn' || (beforeDispatch && state.recovery?.kind === 'queue-head')) &&state.error !== null,);}@@ -6664,7 +6674,7 @@ export class AgentInputCoordinator {signals?: Omit<InterruptedTurnErrorSignals, 'message'>,): void {const state = this.states.get(sessionId);- if (!state || !this.willNotifyUsageLimitedTurnError(state, item)) return;+ if (!state || !this.willNotifyUsageLimitedTurnError(state, item, signals?.providerGroupUsageLimit !== undefined)) return;const token = ++this.usageLimitWaitSeq;state.usageLimitWait = { resumeAt: null, token, recovery: state.recovery! };try {diff --git a/apps/desktop/src/main/maker-ipc/interruptedTurnAutoResume.ts b/apps/desktop/src/main/maker-ipc/interruptedTurnAutoResume.tsindex 58e38c743e..26a867141c 100644--- a/apps/desktop/src/main/maker-ipc/interruptedTurnAutoResume.ts+++ b/apps/desktop/src/main/maker-ipc/interruptedTurnAutoResume.ts@@ -26,6 +26,7 @@import { hasUserVisibleText } from '../../shared/visibleText.js';import type { AgentInputToolLoopDetails } from '../../shared/agentInputQueue.js';+import type { ProviderGroupUsageLimit } from '../../shared/providerGroup.js';import {isNetworkishErrorMessage,@@ -49,6 +50,8 @@ export interface InterruptedTurnErrorSignals {usageLimit?: boolean;/** 上游给出的限额重置时刻(unix ms)。 */usageResetAt?: number;+ /** Main-only: verified group exhaustion before dispatch; never borrow the old route's quota. */+ providerGroupUsageLimit?: ProviderGroupUsageLimit;/** Codex app-server 的结构化错误 tag(如 `usageLimitExceeded`)。 */codexErrorInfo?: string;}diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 2132346b9b..d3fd14f1ec 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -1566,6 +1566,9 @@ async function resolveSessionUsageResetAt(sessionId: string,signals: InterruptedTurnErrorSignals,): Promise<number | null> {+ // A pending model/location switch has not updated the saved route yet. The group's+ // verified result is authoritative, including an unknown reset; never read the old account.+ if (signals.providerGroupUsageLimit) return signals.providerGroupUsageLimit.resetAtMs;const row = await getSessionRowSnapshot(sessionId);const agentKind = row?.agentKind ? dbToMakerAgentKind(row.agentKind) : null;if (!row || !agentKind) return null;@@ -18330,7 +18333,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions): null,onUsageLimitedTurnError: (sessionId, signals, _item, candidateToken) => {// 供应商组分配的任务先试自动换电脑,不换时由它交回额度重置后自动继续。- if (!providerGroupService) {+ if (!providerGroupService || signals.providerGroupUsageLimit) {usageLimitAutoResume.onTurnError(sessionId, signals, candidateToken);return;}diff --git a/apps/desktop/src/main/maker-ipc/usageLimitAutoResume.ts b/apps/desktop/src/main/maker-ipc/usageLimitAutoResume.tsindex f1325af659..5a7e141397 100644--- a/apps/desktop/src/main/maker-ipc/usageLimitAutoResume.ts+++ b/apps/desktop/src/main/maker-ipc/usageLimitAutoResume.ts@@ -58,7 +58,7 @@ export function isAccountUsageLimitError(signals: InterruptedTurnErrorSignals):}export class UsageLimitAutoResume {- private readonly timers = new Map<string, { token: number; handle: unknown }>();+ private readonly timers = new Map<string, { token: number; handle: unknown; groupQuota: boolean }>();private readonly consecutive = new Map<string, number>();/** 每次新错误 / 用户接手 / 任务关闭都递增;迟到的异步解析结果据此丢弃。 */private readonly generations = new Map<string, number>();@@ -119,7 +119,7 @@ export class UsageLimitAutoResume {const handle = this.deps.setTimer(() => {void this.fire(sessionId, token);}, resumeAt - now);- this.timers.set(sessionId, { token, handle });+ this.timers.set(sessionId, { token, handle, groupQuota: signals.providerGroupUsageLimit !== undefined });this.deps.log('usage-limit auto-resume scheduled', { sessionId, resumeAt });}@@ -161,6 +161,9 @@ export class UsageLimitAutoResume {/** A verified quota refresh may satisfy existing waits before their natural reset time. */async resumeRestored(matches: (sessionId: string) => Promise<boolean>): Promise<void> {for (const [sessionId, pending] of this.timers) {+ // A pending group switch still has the previous route saved. A local reset event+ // says nothing about the group's quota; only its own reset timer may resume it.+ if (pending.groupQuota) continue;if (!await matches(sessionId) || this.timers.get(sessionId) !== pending) continue;this.deps.clearTimer(pending.handle);await this.fire(sessionId, pending.token);diff --git a/apps/desktop/src/main/provider-group/__tests__/failurePolicy.test.ts b/apps/desktop/src/main/provider-group/__tests__/failurePolicy.test.tsindex 9e7312d008..29deefc1fd 100644--- a/apps/desktop/src/main/provider-group/__tests__/failurePolicy.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/failurePolicy.test.ts@@ -12,6 +12,7 @@ import {PROVIDER_GROUP_SUPERSEDED_ERROR,PROVIDER_GROUP_UNAVAILABLE_ERROR,providerGroupFailureSignals,+ providerGroupUnavailableError,type ProviderGroupFailurePhase,} from '../failurePolicy';import type { InterruptedTurnErrorSignals } from '../../maker-ipc/interruptedTurnAutoResume';@@ -135,6 +136,10 @@ describe('decideProviderGroupFailure — not that computer’s problem (stay)',it('the whole group is unavailable', () => {expect(decideProviderGroupFailure({ message: PROVIDER_GROUP_UNAVAILABLE_ERROR }, 'run')).toEqual(stay('group-unavailable'));+ const error = providerGroupUnavailableError({ usageLimit: { resetAtMs: 5_000_000 } });+ for (const phase of PHASES) {+ expect(decideProviderGroupFailure({ message: error.message }, phase)).toEqual(stay('group-unavailable'));+ }});it('the task itself cannot be switched right now (start / target only)', () => {diff --git a/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.ts b/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.tsindex 7c4fdbc9bb..bd45ef8689 100644--- a/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.ts@@ -38,7 +38,7 @@ function harness(options: {row?: Partial<ProviderGroupSessionRow>;/** undefined = 组所在电脑读不到;null = 那台没有这个组。 */config?: ProviderGroupConfig | null | undefined;- picks?: Array<ProviderGroupMember | 'unavailable' | 'none' | Error>;+ picks?: Array<ProviderGroupMember | 'unavailable' | 'none' | Error | { kind: 'unavailable'; usageLimit: { resetAtMs: number | null } }>;view?: Partial<Record<string, ProviderGroupView['members'][number]['state']>>;live?: boolean;} = {}) {@@ -73,6 +73,7 @@ function harness(options: {const next = picks.shift() ?? 'unavailable';if (next instanceof Error) throw next;if (next === 'unavailable' || next === 'none') return { kind: next };+ if (next.kind === 'unavailable') return next;const { key, kind, agentDeviceId, providerId } = next;return { kind: 'member' as const, member: { key, kind, agentDeviceId, providerId }, label: next.label! };}),@@ -197,6 +198,15 @@ describe('assigning through a group on another computer', () => {await expect(h.service.assignBeforeStart(START)).rejects.toThrow(PROVIDER_GROUP_UNAVAILABLE_ERROR);});+ // Unit regression: group quota details must survive both initial allocation and model switches.+ it('preserves the quota error before starting an agent', async () => {+ const h = harness({ picks: [{ kind: 'unavailable', usageLimit: { resetAtMs: 5_000_000 } }] });+ await expect(h.service.assignBeforeStart(START)).rejects.toMatchObject({+ message: expect.stringContaining('REMOTE_AGENT_GROUP_USAGE_LIMIT'), limit: { resetAtMs: 5_000_000 },+ });+ expect(h.deps.persistRoute).not.toHaveBeenCalled();+ });+it('takes in a task that already ran on the group computer without moving it, and leaves shares alone', async () => {const ran = harness({ row: { sdkSessionId: 'native-1' } });expect(await ran.service.assignBeforeStart(START)).toBeNull();@@ -673,6 +683,15 @@ describe('moving a task into a group on another computer from the model list (20expect(h.bindings.size).toBe(0);});+ it('preserves an unknown group quota reset without adopting the requested route', async () => {+ const h = harness({ picks: [{ kind: 'unavailable', usageLimit: { resetAtMs: null } }] });+ await expect(h.service.resolveSwitchTarget('s1', target)).rejects.toMatchObject({+ message: expect.stringContaining('REMOTE_AGENT_GROUP_USAGE_LIMIT'), limit: { resetAtMs: null },+ });+ expect(h.bindings.size).toBe(0);+ expect(h.deps.persistRoute).not.toHaveBeenCalled();+ });+it('keeps the chosen place when it is not a group or the group computer cannot be read', async () => {expect(await harness({ config: null }).service.resolveSwitchTarget('s1', target)).toBeNull();expect(await harness({ config: undefined }).service.resolveSwitchTarget('s1', target)).toBeNull();diff --git a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.tsindex 4f56678f20..65130c125b 100644--- a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts@@ -91,6 +91,15 @@ function deps(overrides: Partial<ProviderGroupRemoteHandlerDeps> = {}) {const PICK = { action: 'pick', sessionId: 's1', providerId: 'anthropic', agentKind: 'claude-code', model: 'opus', exclude: ['local'] };describe('provider-group:remote', () => {+ // Unit protocol regression: the real host/client used to discard the reset at both boundaries.+ it.each([null, 5_000_000])('preserves verified quota exhaustion across computers (reset=%s)', async (resetAtMs) => {+ const d = deps();+ d.router.pick.mockResolvedValueOnce({ kind: 'unavailable', resolved: [], usageLimit: { resetAtMs } } as never);+ const client = createProviderGroupRemoteClient(async (_device, _channel, args) => ({+ ok: true, result: await handleProviderGroupRemote(d, 'laptop', args[0]),+ }));+ expect(await client.pick('mini', { ...PICK, agentKind: 'claude-code' })).toEqual({ kind: 'unavailable', usageLimit: { resetAtMs } });+ });it('carries the optional detail request across the same-account client and host without probing on ordinary reads', async () => {const d = deps();const invoke = vi.fn<ProviderGroupRemoteInvoke>(async (_device, _channel, args) => ({diff --git a/apps/desktop/src/main/provider-group/__tests__/router.usage.test.ts b/apps/desktop/src/main/provider-group/__tests__/router.usage.test.tsindex 58f1eb1976..ca8a706cbf 100644--- a/apps/desktop/src/main/provider-group/__tests__/router.usage.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/router.usage.test.ts@@ -121,6 +121,30 @@ function harness() {}describe('provider-group quota routing', () => {+ // Unit regression: an exhausted model plus a paused backup used to lose the quota reason+ // at pick(), preventing the task from showing/waiting for the actual reset.+ it('reports model quota exhaustion and the earliest usable reset without counting paused members', async () => {+ const h = harness();+ h.config.members[1].paused = true;+ h.usage.set('local', { ...snapshot(4, 66), scoped: [{ modelDisplayName: 'Opus', utilization: 100, resetsAt: 80_000 }] });+ expect(await h.pick()).toMatchObject({ kind: 'unavailable', usageLimit: { resetAtMs: 80_000_000 } });+ expect(await h.pick(SONNET)).toMatchObject({ kind: 'member' });+ h.config.members[1].paused = false;+ h.usage.set(h.config.members[1].key, snapshot(100, 20));+ h.advance(15_001); // refresh the remote quota snapshot+ expect(await h.pick()).toMatchObject({ kind: 'unavailable', usageLimit: { resetAtMs: 3_000_000 } });+ });++ it('keeps unknown resets unknown and does not call a paused or unsupported pool quota-limited', async () => {+ const h = harness();+ h.config.members[1].paused = true;+ h.usage.set('local', { ...snapshot(4, 66), scoped: [{ modelDisplayName: 'Opus', utilization: 100, resetsAt: null }] });+ expect(await h.pick()).toMatchObject({ kind: 'unavailable', usageLimit: { resetAtMs: null } });+ expect(await h.pick('missing-model')).not.toHaveProperty('usageLimit');+ h.config.members[0].paused = true;+ expect(await h.pick()).not.toHaveProperty('usageLimit');+ });+it('isolates error cooldowns by model while total quota and account failures still block all models', async () => {const h = harness();h.config.strategy = 'order';diff --git a/apps/desktop/src/main/provider-group/failurePolicy.ts b/apps/desktop/src/main/provider-group/failurePolicy.tsindex eb0f02c45b..4c20b4db40 100644--- a/apps/desktop/src/main/provider-group/failurePolicy.ts+++ b/apps/desktop/src/main/provider-group/failurePolicy.ts@@ -19,6 +19,7 @@import { SESSION_CLOSED_MID_TURN_MESSAGE } from '@cindy/maker-core';import type { AutoResumeAgentSwitchCause } from '../../shared/agentInputQueue.js';+import type { ProviderGroupUsageLimit } from '../../shared/providerGroup.js';import { isBillingDepletionError } from '../../shared/usageLimitRecovery.js';import { classifyTurnOverload, classifyTurnUsageLimit } from '../goal-host/usageLimit.js';import { isContextOverflowErrorData, isOversizedHistoryErrorData } from '../maker-ipc/contextOverflowRollover.js';@@ -77,6 +78,18 @@ export const PROVIDER_GROUP_SUPERSEDED_ERROR = 'provider group: superseded by usexport const PROVIDER_GROUP_UNAVAILABLE_ERROR ='[REMOTE_AGENT_GROUP_UNAVAILABLE] no computer in the provider group can run this task right now';+/** Created before dispatch, from the group's verified quota result (not provider error text). */+export class ProviderGroupUsageLimitError extends Error {+ constructor(readonly limit: ProviderGroupUsageLimit) {+ super('[REMOTE_AGENT_GROUP_USAGE_LIMIT] usage_limit_reached: the available accounts for this model have reached their usage limit'+ + (limit.resetAtMs === null ? '' : `; resets_at: ${limit.resetAtMs}`));+ }+}++export function providerGroupUnavailableError(pick: { usageLimit?: ProviderGroupUsageLimit }): Error {+ return pick.usageLimit ? new ProviderGroupUsageLimitError(pick.usageLimit) : new Error(PROVIDER_GROUP_UNAVAILABLE_ERROR);+}+/** 远程 Agent 任务结束时本机给的 reason(remote-agent/controller/proxyHandle):lost = 连续拉不到那台,closed = 那台那边结束了。 */const REMOTE_AGENT_LOST_REASON = 'remote_agent_lost';const REMOTE_AGENT_CLOSED_REASON = 'remote_agent_closed';@@ -213,7 +226,7 @@ export function decideProviderGroupFailure(// 本机主动关掉了还在运行的会话(本机的操作,不是那台的问题)。if (message.startsWith(SESSION_CLOSED_MID_TURN_MESSAGE)) return { action: 'stay', why: 'local' };const code = errorCodeOf(message);- if (code === 'REMOTE_AGENT_GROUP_UNAVAILABLE') return { action: 'stay', why: 'group-unavailable' };+ if (code === 'REMOTE_AGENT_GROUP_UNAVAILABLE' || code === 'REMOTE_AGENT_GROUP_USAGE_LIMIT') return { action: 'stay', why: 'group-unavailable' };if (phase !== 'run' && code && TASK_STATE_CODES.has(code)) return { action: 'stay', why: 'task-state' };// ── 换到哪台都一样 ──diff --git a/apps/desktop/src/main/provider-group/remoteHandler.ts b/apps/desktop/src/main/provider-group/remoteHandler.tsindex aa28c4a7f3..1ff63a749c 100644--- a/apps/desktop/src/main/provider-group/remoteHandler.ts+++ b/apps/desktop/src/main/provider-group/remoteHandler.ts@@ -130,7 +130,7 @@ export async function handleProviderGroupRemote(});// 等目录期间换了账号:这是上一个账号的组(占用也记在上一个账号那份里,随它作废),不作数。if (!scope.isCurrent() || pick.kind === 'none') return { kind: 'none' };- if (pick.kind === 'unavailable') return { kind: 'unavailable' };+ if (pick.kind === 'unavailable') return { kind: 'unavailable', ...(pick.usageLimit ? { usageLimit: pick.usageLimit } : {}) };const { key, kind, agentDeviceId, providerId: memberProviderId } = pick.member;return { kind: 'member', member: { key, kind, agentDeviceId, providerId: memberProviderId }, label: pick.label };}diff --git a/apps/desktop/src/main/provider-group/router.ts b/apps/desktop/src/main/provider-group/router.tsindex 5fd9c709f1..b1868a6396 100644--- a/apps/desktop/src/main/provider-group/router.ts+++ b/apps/desktop/src/main/provider-group/router.ts@@ -15,7 +15,7 @@ import { findCatalogModel, isModelSelectableForNewRoute } from '@cindy/model-proimport type { AgentKind } from '@cindy/maker-core';import type { RemoteAgentCaps } from '@cindy/device-link';-import type { ProviderGroupConfig, ProviderGroupMember, ProviderGroupView } from '../../shared/providerGroup.js';+import type { ProviderGroupConfig, ProviderGroupMember, ProviderGroupView, ProviderGroupUsageLimit } from '../../shared/providerGroup.js';import type { ProviderGroupBinding } from './bindings.js';import type { ProviderGroupDirectory, ResolvedProviderGroupMember } from './directory.js';import { pickProviderGroupMember, type SchedulableMember } from './scheduler.js';@@ -89,7 +89,7 @@ export const PROVIDER_GROUP_LOCAL_PROVISIONAL_MS = 30_000;export type ProviderGroupPickResult =| { kind: 'none' }| { kind: 'member'; member: ProviderGroupMember; label: string; resolved: ResolvedProviderGroupMember[] }- | { kind: 'unavailable'; resolved: ResolvedProviderGroupMember[] };+ | { kind: 'unavailable'; resolved: ResolvedProviderGroupMember[]; usageLimit?: ProviderGroupUsageLimit };export interface ProviderGroupRouter {pick(input: ProviderGroupPickInput): Promise<ProviderGroupPickResult>;@@ -245,7 +245,19 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Providrandom: deps.random,now,});- if (!key) return { kind: 'unavailable', resolved };+ if (!key) {+ // Only members that could take this model after a quota reset count. A paused,+ // offline or model-mismatched member must not supply a misleading reset time.+ const limited = resolved.filter((r) => !paused(r) && !input.exclude?.has(r.member.key)+ && offersModel(r, input.agentKind, input.model))+ .map((r) => providerGroupMemberUsageState(r, input.model, now, input.agentKind))+ .filter((quota) => quota.limited);+ const resets = limited.flatMap((quota) => quota.resetAtMs === null ? [] : [quota.resetAtMs]);+ return {+ kind: 'unavailable', resolved,+ ...(limited.length > 0 ? { usageLimit: { resetAtMs: resets.length > 0 ? Math.min(...resets) : null } } : {}),+ };+ }lastPicked.set(input.providerId, key);if (input.reserveFor) {provisional.set(input.reserveFor, {diff --git a/apps/desktop/src/main/provider-group/service.ts b/apps/desktop/src/main/provider-group/service.tsindex 6eab1c4539..536539a4b6 100644--- a/apps/desktop/src/main/provider-group/service.ts+++ b/apps/desktop/src/main/provider-group/service.ts@@ -32,6 +32,7 @@ import type {ProviderGroupRemotePick,ProviderGroupSessionGroup,ProviderGroupView,+ ProviderGroupUsageLimit,} from '../../shared/providerGroup.js';import { providerGroupMemberKey } from '../../shared/providerGroup.js';import { isProviderShareAgentDeviceId } from '../../shared/providerShare.js';@@ -52,7 +53,7 @@ import {import {decideProviderGroupFailure,describeProviderGroupFailure,- PROVIDER_GROUP_UNAVAILABLE_ERROR,+ providerGroupUnavailableError,providerGroupFailureSignals,type ProviderGroupFailureCause,type ProviderGroupFailureDecision,@@ -346,7 +347,7 @@ function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T | undefined>type SourcePick =| { kind: 'none' }- | { kind: 'unavailable' }+ | { kind: 'unavailable'; usageLimit?: ProviderGroupUsageLimit }| { kind: 'member'; member: ProviderGroupMember; label: string; labelOf(memberKey: string): string | undefined };/** 组来源:本机的组,或同账号另一台电脑上的组。 */@@ -665,7 +666,7 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): ProvreserveFor: sessionId,...(exclude.size > 0 ? { fresh: true } : {}),});- if (pick.kind !== 'member') return { kind: pick.kind };+ if (pick.kind !== 'member') return pick;return {kind: 'member',member: pick.member,@@ -728,7 +729,7 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): Provmodel,exclude: [...exclude],});- if (pick.kind !== 'member') return { kind: pick.kind };+ if (pick.kind !== 'member') return pick;const labelOf = (key: string) => {const found = config.members.find((m) => m.key === key);return found ? deps.directory.memberLabel(found) || undefined : undefined;@@ -1420,7 +1421,7 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): Provif (pick.kind === 'none') return null;if (pick.kind === 'unavailable') {deps.log.warn('provider group: no computer available for a new task', { sessionId, groupProviderId, remote: true });- throw new Error(PROVIDER_GROUP_UNAVAILABLE_ERROR);+ throw providerGroupUnavailableError(pick);}const route = source.routeOf(pick.member, null);await deps.writeBinding(sessionId, bindingFor(source, groupProviderId, pick.member.key));@@ -1522,7 +1523,7 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): Provif (pick.kind === 'none') return null;if (pick.kind === 'unavailable') {deps.log.warn('provider group: no computer available for a new task', { sessionId, groupProviderId });- throw new Error(PROVIDER_GROUP_UNAVAILABLE_ERROR);+ throw providerGroupUnavailableError(pick);}const route = localSource.routeOf(pick.member, row.providerId);await deps.writeBinding(sessionId, { providerId: groupProviderId, memberKey: pick.member.key });@@ -1604,7 +1605,7 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): Provif (pick.kind === 'none') return null;if (pick.kind === 'unavailable') {deps.log.warn('provider group: no computer available for a task moved into the group', { sessionId, providerId });- throw new Error(PROVIDER_GROUP_UNAVAILABLE_ERROR);+ throw providerGroupUnavailableError(pick);}const route = source.routeOf(pick.member, source.ownerDeviceId ? null : providerId);if (route.agentDeviceId === target.current.agentDeviceId && route.providerId !== target.current.providerId) return null;diff --git a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsxindex 1faf77c8cb..9a8fba6a14 100644--- a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx+++ b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx@@ -363,7 +363,10 @@ export function ErrorBanner({const remoteGuidance = remoteErrorKey && i18n.exists(remoteErrorKey) ? t(remoteErrorKey) : undefined;const terminalRateLimitRetryProgress = parseTerminalRateLimitRetryProgress(error, errorReason);const isCodexUsageLimitError =- agentKind === 'codex' && usageLimitRecovery?.isAccountUsageLimit === true;+ agentKind === 'codex' && usageLimitRecovery?.isAccountUsageLimit === true+ // Group selection may fail before the new route is saved. A reset card for the+ // previous local account cannot restore the account chosen by that group.+ && remoteErrorCode !== 'REMOTE_AGENT_GROUP_USAGE_LIMIT';const { snapshot: resetSnapshot, refresh: refreshResets } = useCodexRateLimits(isCodexUsageLimitError && isCodexOpenAiSource && !isAnyRemoteSession && !agentDeviceId,normalizedProviderId ?? 'openai',diff --git a/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsxindex d07c7cdf89..9f7d8ef575 100644--- a/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx+++ b/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx@@ -73,7 +73,10 @@ function deferred<T>() {}vi.mock('react-i18next', () => ({- useTranslation: () => ({ t: (key: string) => key }),+ useTranslation: () => ({+ t: (key: string) => key,+ i18n: { language: 'en', exists: (key: string) => key === 'chat.remoteError.REMOTE_AGENT_GROUP_USAGE_LIMIT' },+ }),}));vi.mock('@/components/ui/confirm-dialog-provider', () => ({@@ -1175,6 +1178,20 @@ describe('ErrorBanner OpenAI connection recovery', () => {},);+ // Unit regression: a pending switch still has the previous local route in its projection.+ // Group quota exhaustion must not offer spending a reset card on that unrelated account.+ it('keeps group quota waits without reading the previous local account reset credits', async () => {+ render(<ErrorBanner error="[REMOTE_AGENT_GROUP_USAGE_LIMIT] usage_limit_reached"+ retryText="retry this turn" onRetry={vi.fn()} agentKind="codex" providerId="openai"+ usageLimitRecovery={{ resetAtMs: null, isAccountUsageLimit: true }}+ usageLimitWait={{ resumeAt: Date.now() + 60 * 60 * 1000 }} onCancelUsageLimitWait={vi.fn()} />);+ await act(async () => {});+ expect(screen.getByText('chat.remoteError.REMOTE_AGENT_GROUP_USAGE_LIMIT')).toBeTruthy();+ expect(screen.getByText('chat.errorBanner.usageLimitAutoContinueAt')).toBeTruthy();+ expect(mocks.getCodexRateLimits).not.toHaveBeenCalled();+ expect(screen.queryByRole('button', { name: 'codexResets.limitAction' })).toBeNull();+ });+it('explains an organization Codex limit and keeps the raw 429 response available', () => {const rawError ='API Error: Request rejected (429) · {"error":{"type":"usage_limit_reached","plan_type":"business","resets_at":1788220709}}';diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 30d52b87f2..b1e3740fa7 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -12097,6 +12097,7 @@"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_USAGE_LIMIT": "The available accounts for this model have reached their usage limit. Switch models or continue when the quota resets.","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.",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 5bbdb28a7f..3a1f93b378 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -12053,6 +12053,7 @@"REMOTE_AGENT_SHARE_PAUSED": "共有した人があなたへの共有を一時停止したため、再開されるまでこれらのモデルは使えません。別のモデルに切り替えて続けられます。","REMOTE_AGENT_SHARE_REMOVED": "この共有は利用できなくなりました(共有した人が削除したか、あなたが退出しました)。別のモデルに切り替えて続けられます。","REMOTE_AGENT_SHARE_UNAVAILABLE": "共有されたプロバイダーは一時的に利用できません。共有した人のパソコンがオフラインか、共有が一時的にオフになっている可能性があります。後でもう一度試すか、別のモデルに切り替えて続けられます。",+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "このモデルを利用できるアカウントの使用量が上限に達しました。別のモデルに切り替えるか、上限のリセット後に続行できます。","REMOTE_AGENT_GROUP_UNAVAILABLE": "プロバイダーグループ内のパソコンは現在このセッションを実行できません。オフライン、割り当て停止中、クールダウン中、またはこのモデルがない可能性があります。このプロバイダーの「リモートと共有」ページでグループを確認してください。","REMOTE_AGENT_DEVICE_LIMIT": "このデバイスのリモートセッション数が上限に達しました。不要なセッションをアーカイブするか、提供者に「リモートと共有」で上限の変更を依頼してください。","REMOTE_AGENT_TOTAL_LIMIT": "提供者のパソコンのリモートセッション総数が上限に達しました。提供者に不要なセッションの解放、または「リモートと共有」での上限変更を依頼してください。",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex ec7dd87354..27768ef70c 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -12053,6 +12053,7 @@"REMOTE_AGENT_SHARE_PAUSED": "공유한 사람이 나에 대한 공유를 일시 중지해서 재개될 때까지 이 모델을 사용할 수 없습니다. 다른 모델로 바꿔 계속할 수 있습니다.","REMOTE_AGENT_SHARE_REMOVED": "이 공유는 더 이상 사용할 수 없습니다(공유한 사람이 삭제했거나 내가 나갔습니다). 다른 모델로 바꿔 계속할 수 있습니다.","REMOTE_AGENT_SHARE_UNAVAILABLE": "공유된 제공자를 일시적으로 사용할 수 없습니다. 공유한 사람의 컴퓨터가 오프라인이거나 공유가 잠시 꺼져 있을 수 있습니다. 나중에 다시 시도하거나 다른 모델로 바꿔 계속할 수 있습니다.",+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "이 모델을 사용할 수 있는 계정의 사용량이 한도에 도달했습니다. 다른 모델로 전환하거나 한도가 초기화된 후 계속하세요.","REMOTE_AGENT_GROUP_UNAVAILABLE": "제공자 그룹의 컴퓨터가 지금 이 세션을 실행할 수 없습니다. 모두 오프라인이거나, 배정이 일시 중지되었거나, 대기 중이거나, 이 모델이 없을 수 있습니다. 이 제공자의 원격 및 공유 페이지에서 그룹을 확인하세요.","REMOTE_AGENT_DEVICE_LIMIT": "이 기기의 원격 세션 수가 한도에 도달했습니다. 사용하지 않는 세션을 보관하거나 제공자에게 원격 및 공유에서 한도를 높여 달라고 요청하세요.","REMOTE_AGENT_TOTAL_LIMIT": "제공자 컴퓨터의 전체 원격 세션 수가 한도에 도달했습니다. 제공자에게 불필요한 세션을 해제하거나 원격 및 공유에서 한도를 높여 달라고 요청하세요.",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 3e4bbd17e7..109529e46f 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -12053,6 +12053,7 @@"REMOTE_AGENT_SHARE_PAUSED": "对方已暂停对你的分享,恢复前不能使用这些模型。可以换成其他模型继续。","REMOTE_AGENT_SHARE_REMOVED": "这个分享已不可用(对方删除了分享或你已退出)。可以换成其他模型继续。","REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供应商暂时不可用:对方电脑可能不在线,或对方暂时关闭了分享。可以稍后再试,或换成其他模型继续。",+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "此模型的可用账号已达到用量上限。可换用其他模型,或等配额重置后继续。","REMOTE_AGENT_GROUP_UNAVAILABLE": "供应商组里的电脑现在都不能运行这个任务:可能都不在线、已暂停分配、正在冷却,或没有这个模型。可以到这个供应商的「远程与分享」页查看组内电脑。","REMOTE_AGENT_DEVICE_LIMIT": "这台设备保留的远程任务数已达上限。可归档暂时不用的任务,或请远程电脑的主人在“远程与分享”中提高上限。","REMOTE_AGENT_TOTAL_LIMIT": "远程电脑保留的任务总数已达上限。请那台电脑的主人释放暂时不用的任务,或在“远程与分享”中提高上限。",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 53ea2469c9..96d792aca3 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -12052,6 +12052,7 @@"REMOTE_AGENT_SHARE_PAUSED": "對方已暫停對你的分享,恢復前不能使用這些模型。可以換成其他模型繼續。","REMOTE_AGENT_SHARE_REMOVED": "這個分享已無法使用(對方刪除了分享或你已退出)。可以換成其他模型繼續。","REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供應商暫時無法使用:對方電腦可能不在線,或對方暫時關閉了分享。可以稍後再試,或換成其他模型繼續。",+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "此模型的可用帳號已達到用量上限。可改用其他模型,或等配額重置後繼續。","REMOTE_AGENT_GROUP_UNAVAILABLE": "供應商組裡的電腦現在都不能執行這個任務:可能都離線、已暫停分配、正在冷卻,或沒有這個模型。可以到這個供應商的「遠端與分享」頁查看組內電腦。","REMOTE_AGENT_DEVICE_LIMIT": "這台裝置保留的遠端任務數已達上限。可封存暫時不用的任務,或請遠端電腦的主人在「遠端與分享」中提高上限。","REMOTE_AGENT_TOTAL_LIMIT": "遠端電腦保留的任務總數已達上限。請那台電腦的主人釋放暫時不用的任務,或在「遠端與分享」中提高上限。",diff --git a/apps/desktop/src/shared/__tests__/providerGroup.test.ts b/apps/desktop/src/shared/__tests__/providerGroup.test.tsindex 74faf8c7d0..65128d8788 100644--- a/apps/desktop/src/shared/__tests__/providerGroup.test.ts+++ b/apps/desktop/src/shared/__tests__/providerGroup.test.ts@@ -12,8 +12,16 @@ import {providerGroupSummaryForWire,parseProviderGroupRemoteRequest,parseProviderGroupRemoteView,+ parseProviderGroupRemotePick,} from '../providerGroup';+// Unit protocol: legacy or malformed quota hints cannot manufacture an automatic wait.+it.each([undefined, {}, { resetAtMs: '5000' }, { resetAtMs: -1 }, { resetAtMs: Infinity }])(+ 'ignores unavailable replies without a valid quota hint: %j', (usageLimit) => {+ expect(parseProviderGroupRemotePick({ kind: 'unavailable', usageLimit }, 'anthropic')).toEqual({ kind: 'unavailable' });+ },+);+describe('group detail diagnostics compatibility', () => {const config = { members: [{ kind: 'local' }] };const payload = (extra: Record<string, unknown>) => ({ config, members: [{ key: 'local', state: 'available', ...extra }] });diff --git a/apps/desktop/src/shared/providerGroup.ts b/apps/desktop/src/shared/providerGroup.tsindex b619522cce..9302e46e19 100644--- a/apps/desktop/src/shared/providerGroup.ts+++ b/apps/desktop/src/shared/providerGroup.ts@@ -431,11 +431,17 @@ export interface ProviderGroupRemoteSessionGroup {group: ProviderGroupSessionGroup;}+/** Only verified subscription exhaustion; never inferred from a generic cooldown. */+export interface ProviderGroupUsageLimit {+ /** Earliest reset of an otherwise eligible member; null when no reset is known. */+ resetAtMs: number | null;+}+export type ProviderGroupRemotePick =/** 那个供应商现在没有组(组被删了或旧版本):照常直接在组所在电脑上运行。 */| { kind: 'none' }| { kind: 'member'; member: Pick<ProviderGroupMember, 'key' | 'kind' | 'agentDeviceId' | 'providerId'>; label: string }- | { kind: 'unavailable' };+ | { kind: 'unavailable'; usageLimit?: ProviderGroupUsageLimit };/** 一次最多报告的运行中任务数(每台电脑的任务上限远低于此)。 */export const PROVIDER_GROUP_REMOTE_MAX_LEASES = 512;@@ -585,7 +591,12 @@ export function parseProviderGroupRemoteRequest(raw: unknown): ProviderGroupRemoexport function parseProviderGroupRemotePick(raw: unknown, groupProviderId: string): ProviderGroupRemotePick {if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return { kind: 'none' };const value = raw as Record<string, unknown>;- if (value.kind === 'unavailable') return { kind: 'unavailable' };+ if (value.kind === 'unavailable') {+ const limit = value.usageLimit as Partial<ProviderGroupUsageLimit> | null | undefined;+ const reset = limit?.resetAtMs;+ const valid = limit && (reset === null || (typeof reset === 'number' && Number.isSafeInteger(reset) && reset > 0));+ return { kind: 'unavailable', ...(valid ? { usageLimit: { resetAtMs: reset } as ProviderGroupUsageLimit } : {}) };+ }if (value.kind !== 'member') return { kind: 'none' };const member = normalizeMember(value.member, groupProviderId);if (!member) return { kind: 'none' };diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.jsonindex 6233e47572..6128721003 100644--- a/apps/mobile/src/i18n/locales/en/session.json+++ b/apps/mobile/src/i18n/locales/en/session.json@@ -578,6 +578,7 @@"taskAlreadyCreated": "This task already exists on the computer. Its saved messages will resume there."},"remoteError": {+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "The available accounts for this model have reached their usage limit. Switch models or continue when the quota resets.","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 on the computer.","REMOTE_DAEMON_CLOSED": "The remote connection dropped, possibly during an update. This turn has ended. Send the message again.","REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "Local file/image attachments aren't accessible in remote sessions. Paste the content directly instead.",diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.jsonindex 9f920cd358..546ce97456 100644--- a/apps/mobile/src/i18n/locales/ja/session.json+++ b/apps/mobile/src/i18n/locales/ja/session.json@@ -578,6 +578,7 @@"taskAlreadyCreated": "このセッションはコンピューターに作成済みです。保存されたメッセージは元のセッションで送信を再開します。"},"remoteError": {+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "このモデルを利用できるアカウントの使用量が上限に達しました。別のモデルに切り替えるか、上限のリセット後に続行できます。","REMOTE_AGENT_GROUP_UNAVAILABLE": "プロバイダーグループ内のパソコンは現在このセッションを実行できません。オフライン、割り当て停止中、クールダウン中、またはこのモデルがない可能性があります。パソコンでこのプロバイダーの「リモートと共有」ページを確認してください。","REMOTE_DAEMON_CLOSED": "リモート接続が切れました。更新中の可能性があります。このターンは終了したので、もう一度送信してください。","REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "リモートセッションではローカルのファイル/画像の添付にアクセスできません。内容を直接貼り付けてください。",diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.jsonindex 0fc9d5f507..b1121a85cd 100644--- a/apps/mobile/src/i18n/locales/ko/session.json+++ b/apps/mobile/src/i18n/locales/ko/session.json@@ -574,6 +574,7 @@"taskAlreadyCreated": "이 세션은 컴퓨터에 이미 생성되어 있습니다. 저장된 메시지는 기존 세션에서 전송을 재개합니다."},"remoteError": {+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "이 모델을 사용할 수 있는 계정의 사용량이 한도에 도달했습니다. 다른 모델로 전환하거나 한도가 초기화된 후 계속하세요.","REMOTE_AGENT_GROUP_UNAVAILABLE": "제공자 그룹의 컴퓨터가 지금 이 세션을 실행할 수 없습니다. 모두 오프라인이거나, 배정이 일시 중지되었거나, 대기 중이거나, 이 모델이 없을 수 있습니다. 컴퓨터에서 이 제공자의 원격 및 공유 페이지를 확인하세요.","REMOTE_DAEMON_CLOSED": "원격 연결이 끊겼습니다. 업데이트 중일 수 있습니다. 이번 차례는 끝났으니 다시 보내 주세요.","REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "원격 세션에서는 로컬 파일/이미지 첨부에 접근할 수 없습니다. 내용을 직접 붙여넣으세요.",diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.jsonindex b303b53a95..7b3274970d 100644--- a/apps/mobile/src/i18n/locales/zh-CN/session.json+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json@@ -574,6 +574,7 @@"taskAlreadyCreated": "电脑上已创建这个任务,已保存的消息会在原任务中继续发送。"},"remoteError": {+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "此模型的可用账号已达到用量上限。可换用其他模型,或等配额重置后继续。","REMOTE_AGENT_GROUP_UNAVAILABLE": "供应商组里的电脑现在都不能运行这个任务:可能都不在线、已暂停分配、正在冷却,或没有这个模型。可以在电脑上这个供应商的「远程与分享」页查看组内电脑。","REMOTE_DAEMON_CLOSED": "远程连接中断了,可能正在更新。这一轮已经结束,请重新发送。","REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "远程任务无法访问本地文件或图片附件。请直接粘贴内容。",diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.jsonindex c56e46c0eb..c0b2bf2996 100644--- a/apps/mobile/src/i18n/locales/zh-TW/session.json+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json@@ -578,6 +578,7 @@"taskAlreadyCreated": "電腦上已建立這個任務,已保存的訊息會在原任務中繼續傳送。"},"remoteError": {+ "REMOTE_AGENT_GROUP_USAGE_LIMIT": "此模型的可用帳號已達到用量上限。可改用其他模型,或等配額重置後繼續。","REMOTE_AGENT_GROUP_UNAVAILABLE": "供應商組裡的電腦現在都不能執行這個任務:可能都離線、已暫停分配、正在冷卻,或沒有這個模型。可以在電腦上這個供應商的「遠端與分享」頁查看組內電腦。","REMOTE_DAEMON_CLOSED": "遠端連線中斷了,可能正在更新。這一輪已經結束,請重新傳送。","REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "遠端任務無法存取本地檔案或圖片附件。請直接貼上內容。",diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 31a88e83c5..3d2c13c660 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1595,6 +1595,15 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01## 供应商组:订阅配额筛选与用量均衡(2026-10-12,OpenAI 于 2026-10-20 接入)+2026-10-21:同账号 `pick` 的 `{ kind: 'unavailable' }` 回包可选增加+`usageLimit: { resetAtMs: number | null }`,仅表示已验证的订阅额度耗尽;时刻为可分配成员中+最早的已知恢复时间(unix ms)。不发送账号信息、用量快照或成员名单。控制端保留已知/未知+重置语义,以 `REMOTE_AGENT_GROUP_USAGE_LIMIT` 错误接入现有输入投影与限额等待;+手机和桌面沿用 `usageLimitWait` 显示时间、取消等待。新组配旧控制端忽略可选字段,+新控制端配旧组保留原通用错误,不猜测限额或自动等待;旧查看端仍可显示通用错误和既有等待。+完整体验需要组所在电脑与任务所在电脑更新,查看端更新后有对应本地化文案。+不新增 channel、持久状态、权限或服务端改动。+产品规则见 [`provider-groups.md`](../product-rules/provider-groups.md) §5。选电脑仍由组所在电脑完成:先排除额度耗尽的成员,再按所选策略分配;Claude Code 与 OpenAI 订阅均可参与配额排序,旧策略 `usage` 沿用 `least`。diff --git a/docs/product-rules/usage-limit-auto-continue.md b/docs/product-rules/usage-limit-auto-continue.mdindex deafc8383b..0aa105d191 100644--- a/docs/product-rules/usage-limit-auto-continue.md+++ b/docs/product-rules/usage-limit-auto-continue.md@@ -54,6 +54,13 @@- 自动继续在真正发给模型前被丢弃(任务关闭、准备失败等)时,恢复原错误与手动重试入口,不再自动等待。- 等待由被控电脑持有;手机与另一台电脑只显示等待并可取消。+供应商组在首次分配或应用待生效的模型/电脑切换时,若确认所选模型的可用账号额度耗尽,+同样显示限额原因并接入上述等待。组所在电脑只汇总在线、未暂停、支持该模型的成员,+取已知的最早恢复时间;单个账号仍须等它所有耗尽窗口恢复。没有可信时刻就不自动等待。+此时保存的任务路线可能还是切换前的账号,不得借用原账号的用量或展示原账号的重置卡,+也不因原账号重置而提前续跑。+尚未发给模型的消息保留原队列项和 clientId,到点重新分配后发送一次;取消或改选仍作废等待。+## Codex 重置卡的自动使用手动使用由用户决定:有效重置卡不因剩余额度大于零而禁用。界面确认具体卡和账号,