Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(usage-limit): 远程 Agent 任务撞限额时不拿本机账号快照推算重置时刻
Lizifa2ea01b6c77
diff --git a/apps/desktop/src/main/goal-host/index.ts b/apps/desktop/src/main/goal-host/index.tsindex 07c36bfa90..e3f8883410 100644--- a/apps/desktop/src/main/goal-host/index.ts+++ b/apps/desktop/src/main/goal-host/index.ts@@ -21,7 +21,11 @@ import { isSessionSharedTaskActive } from '../device-link/sharedTaskDispatch.js'import { createMessage } from '../localDb/ipc/messages.js';import { readGoalSettings, writeGoalSettings } from '../maker-host/goal-settings-store.js';import { getSessionRowSnapshot } from '../localDb/ipc/sessions.js';-import { readAccountUsageLimit, subscriptionFamilyOf } from '../usage/accountUsageLimit.js';+import {+ readAccountUsageLimit,+ sessionUsesOtherMachineAccount,+ subscriptionFamilyOf,+} from '../usage/accountUsageLimit.js';import { readClaudeAccountUsageSnapshot } from '../usage/claudeAccountUsage.js';import { GoalController } from './controller';import { readTurnUsageResetAt } from './usageLimit.js';@@ -99,17 +103,23 @@ export function startGoalController(deps: StartGoalControllerDeps): GoalControllconst row = await getSessionRowSnapshot(sessionId);const { providerId, modelId } = resolveSessionRuntimeRoute(sessionId, agentKind, row);if (subscriptionFamilyOf(agentKind, providerId)) {+ const otherMachineAccount = sessionUsesOtherMachineAccount(row);// 报错原文写明的重置时刻只对订阅账号可信(非订阅来源的是分钟级请求限流)。if (turnError !== undefined) {- // SSH 远程会话的报错用远端主机的本地时间:不带时区的钟点不按本机时区理解。+ // SSH 远程会话 / 远程 Agent 的报错用那台机器的本地时间:不带时区的钟点不按本机时区理解。const fromError = readTurnUsageResetAt(turnError, Date.now(), {- localTimeZoneTrusted: !row?.remoteHostId,+ localTimeZoneTrusted: !otherMachineAccount,});if (fromError !== null) return { limited: true, resetAtMs: fromError };}- // SSH 远程会话用远端主机自己的登录,本机订阅快照属于另一个账号(与普通任务同一边界)。- if (row?.remoteHostId) return null;+ // SSH 远端主机 / 远程 Agent 所在电脑用自己的登录,本机订阅快照属于另一个账号+ // (与普通任务同一边界)。+ if (otherMachineAccount) return null;}+ // 远程 Agent 用 Agent 所在电脑自己的登录与来源:本机的订阅 / 网关快照都不是它的账号。+ // 那台的独立账号本机目录认不出(上面判不出订阅家族)时也到这里,同样不读。+ // SSH 沿用原有的网关预算回落。+ if (row?.agentDeviceId && !row.remoteHostId) return null;const subscription = await readAccountUsageLimit(agentKind, providerId, modelId).catch(() => null,);diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.tsindex 4c3356a420..cb7453c15c 100644--- a/apps/desktop/src/main/localDb/ipc/sessions.ts+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts@@ -829,6 +829,8 @@ export interface SessionRowSnapshot {providerId: string | null;/** Hook exact-takeover must reject SSH-owned sessions. */remoteHostId?: string | null;+ /** 远程 Agent 所在电脑(null = 本机);限额自动继续据此不拿本机账号快照推算。 */+ agentDeviceId?: string | null;/** Hook exact-takeover must reject internal Orca worker sessions. */orcaRole?: 'lead' | 'worker' | null;/** Collab policy gate: remote session 的 codex / claude-code 均放行。 */@@ -857,6 +859,7 @@ async function selectSessionRowSnapshot(id: string): Promise<SessionRowSnapshotproviderId: sessions.providerId,clearedAt: sessions.clearedAt,remoteHostId: sessions.remoteHostId,+ agentDeviceId: sessions.agentDeviceId,orcaRole: sessions.orcaRole,agentKind: sessions.agentKind,source: sessions.source,diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex d28b525c27..79f07c20cf 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -916,7 +916,11 @@ import { clearSealedCodexPlanState, readCodexPlanState } from '../localDb/codexPimport { buildCompletedPlanGuardNote, buildPlanReconcileNote } from './planReconcile.js';import { peekGoalInactiveNote } from '../goal-host/inactiveNote.js';import { readTurnUsageResetAt } from '../goal-host/usageLimit.js';-import { readAccountUsageLimit, subscriptionFamilyOf } from '../usage/accountUsageLimit.js';+import {+ readAccountUsageLimit,+ sessionUsesOtherMachineAccount,+ subscriptionFamilyOf,+} from '../usage/accountUsageLimit.js';import { UsageLimitAutoResume } from './usageLimitAutoResume.js';import { type MakerSessionCreateOpts, withCreateSessionStderr } from './sessionRequest.js';import { persistAndHydrateSessionProvider } from './sessionProviderBootstrap.js';@@ -1374,13 +1378,14 @@ async function resolveSessionUsageResetAt(if (!row || !agentKind) return null;const { providerId, modelId } = resolveSessionRuntimeRoute(sessionId, agentKind, row);if (!subscriptionFamilyOf(agentKind, providerId)) return null;- // SSH 远程会话的报错用远端主机的本地时间:不带时区的钟点不按本机时区理解。+ // SSH 远程会话 / 远程 Agent 的报错用那台机器的本地时间:不带时区的钟点不按本机时区理解。+ const otherMachineAccount = sessionUsesOtherMachineAccount(row);const fromError = readTurnUsageResetAt(signals, Date.now(), {- localTimeZoneTrusted: !row.remoteHostId,+ localTimeZoneTrusted: !otherMachineAccount,});if (fromError !== null) return fromError;- // SSH 远程会话用远端主机自己的登录,本机快照属于另一个账号,不能拿来推算。- if (row.remoteHostId) return null;+ // SSH 远端主机 / 远程 Agent 所在电脑用自己的登录,本机快照属于另一个账号,不能拿来推算。+ if (otherMachineAccount) return null;const limit = await readAccountUsageLimit(agentKind, providerId, modelId);return limit?.limited ? limit.resetAtMs : null;}diff --git a/apps/desktop/src/main/usage/__tests__/accountUsageLimit.test.ts b/apps/desktop/src/main/usage/__tests__/accountUsageLimit.test.tsindex 32d84c8e6d..493b7a3943 100644--- a/apps/desktop/src/main/usage/__tests__/accountUsageLimit.test.ts+++ b/apps/desktop/src/main/usage/__tests__/accountUsageLimit.test.ts@@ -1,3 +1,5 @@+import { readFileSync } from 'node:fs';+import { resolve } from 'node:path';import { beforeEach, describe, expect, it, vi } from 'vitest';const mocks = vi.hoisted(() => ({@@ -24,10 +26,39 @@ import {claudeAccountUsageLimit,codexAccountUsageLimit,readAccountUsageLimit,+ sessionUsesOtherMachineAccount,subscriptionFamilyOf,xaiAccountUsageLimit,} from '../accountUsageLimit';+// 远程 Agent 的任务撞上限额时,本机订阅快照属于另一个账号(2026-10-09:与 SSH 同一边界)。+describe('sessionUsesOtherMachineAccount', () => {+ it('SSH 远程工作区与远程 Agent(含分享来的供应商)都用另一台机器的账号', () => {+ expect(sessionUsesOtherMachineAccount({ remoteHostId: 'host-1' })).toBe(true);+ expect(sessionUsesOtherMachineAccount({ agentDeviceId: 'device-agent' })).toBe(true);+ expect(sessionUsesOtherMachineAccount({ agentDeviceId: 'share:share-1' })).toBe(true);+ });++ it('Agent 在本机运行的任务读本机账号', () => {+ expect(sessionUsesOtherMachineAccount({ remoteHostId: null, agentDeviceId: null })).toBe(false);+ expect(sessionUsesOtherMachineAccount({})).toBe(false);+ expect(sessionUsesOtherMachineAccount(null)).toBe(false);+ });++ it('普通任务与目标模式都按它判定,且任务行快照带上 agentDeviceId', () => {+ const read = (relative: string) => readFileSync(resolve(__dirname, relative), 'utf8');+ expect(read('../../maker-ipc/register.ts')).toContain('sessionUsesOtherMachineAccount(row)');+ expect(read('../../goal-host/index.ts')).toContain('sessionUsesOtherMachineAccount(row)');+ // 目标模式对远程 Agent 也不回落本机网关预算(那台的独立账号本机目录认不出时同样如此)。+ expect(read('../../goal-host/index.ts')).toContain(+ 'if (row?.agentDeviceId && !row.remoteHostId) return null;',+ );+ expect(read('../../localDb/ipc/sessions.ts')).toContain(+ 'agentDeviceId: sessions.agentDeviceId,',+ );+ });+});+// 必须在未来:过期窗口的 app-server 桶会被选桶逻辑当作陈旧桶跳过。const NOW_SEC = Math.floor(Date.now() / 1000);const RESET_5H = NOW_SEC + 3 * 60 * 60;diff --git a/apps/desktop/src/main/usage/accountUsageLimit.ts b/apps/desktop/src/main/usage/accountUsageLimit.tsindex 096c689e77..5db253d8f6 100644--- a/apps/desktop/src/main/usage/accountUsageLimit.ts+++ b/apps/desktop/src/main/usage/accountUsageLimit.ts@@ -155,6 +155,17 @@ export function subscriptionFamilyOf(return provider?.auth.native ?? null;}+/**+ * 会话的模型请求是否用另一台机器的登录发出:SSH 远程工作区用远端主机的登录,远程 Agent 用+ * Agent 所在电脑的登录。此时本机订阅快照属于另一个账号,不能拿来推算重置时刻;报错原文里不带+ * 时区的钟点也是那台的本地时间,不按本机时区理解。+ */+export function sessionUsesOtherMachineAccount(+ row: { remoteHostId?: string | null; agentDeviceId?: string | null } | null | undefined,+): boolean {+ return Boolean(row?.remoteHostId || row?.agentDeviceId);+}+/*** @returns `undefined` = 不是订阅家族(调用方另找来源);`null` = 是订阅家族但暂无可用快照。*/diff --git a/docs/product-rules/usage-limit-auto-continue.md b/docs/product-rules/usage-limit-auto-continue.mdindex 8b54ddd4a4..a6ae0122d1 100644--- a/docs/product-rules/usage-limit-auto-continue.md+++ b/docs/product-rules/usage-limit-auto-continue.md@@ -26,8 +26,12 @@重试时刻也不等(那多半是按分钟的请求速率限制),**不等待、也不定时试探**,只报错交给用户。快照只看会话模型实际受限的那一格:Codex 按模型取对应的用量桶(如 Spark 单独计),Claude 订阅-除 5 小时 / 周窗口外只计该模型的分模型窗口,其它模型用满不影响本会话。SSH 远程会话不读本机快照(目标模式同样只用远端报错里的时刻),且不采用远端报错里不带时区的钟点-(如 Codex `try again at 3:05 PM` 用的是远端主机本地时间);相对时长与带时区的时刻照常。+除 5 小时 / 周窗口外只计该模型的分模型窗口,其它模型用满不影响本会话。SSH 远程会话与远程 Agent 任务(Agent 在+另一台电脑、含分享来的供应商,2026-10-09 起)都用那台机器的登录,不读本机快照(目标模式同样只用远端报错里的时刻),且不采用远端报错里不带时区的钟点+(如 Codex `try again at 3:05 PM` 用的是那台机器的本地时间);相对时长与带时区的时刻照常。判定见+`apps/desktop/src/main/usage/accountUsageLimit.ts` 的 `sessionUsesOtherMachineAccount`。+已知限制:订阅家族按本机供应商目录认,远程 Agent 用的是那台电脑独有的独立账号(本机目录里没有)时认不出是订阅,+按非订阅处理,只报错不等待;内置默认账号(Claude / ChatGPT / SuperGrok)不受影响。快照不可靠时同样不等:用满的窗口没有重置时刻(不拿别的窗口的时刻顶替)、窗口已过重置点(快照在翻篇前取的)、SuperGrok 缓存快照超过有效期。目标模式同样只对订阅账号采信报错原文里的时刻,快照也须显示已用满才采纳其时刻。只认具体窗口显示用满,不认快照级「已触顶」标记(说不清来源,且混有需要充值的余额耗尽)。