Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(goal): Claude 订阅用量受限后按限额重置时刻自动续跑
Dashef21e062ec23
diff --git a/apps/desktop/src/main/goal-host/__tests__/controller.test.ts b/apps/desktop/src/main/goal-host/__tests__/controller.test.tsindex d5a81dfbe1..f99009595c 100644--- a/apps/desktop/src/main/goal-host/__tests__/controller.test.ts+++ b/apps/desktop/src/main/goal-host/__tests__/controller.test.ts@@ -4064,6 +4064,18 @@ describe('GoalController', () => {expect(h.session.sends).toHaveLength(1); // 无续轮});+ it('reactive: prefers the reset time carried by the error over the account snapshot', async () => {+ // Claude 订阅:账号快照(LiteLLM 预算)读不到 5h 窗口,只有错误带的重置时刻可用。+ h.setAccountLimit(null);+ await startGoal(h);+ h.session.emitErrorTurn({ sdkError: 'rate_limit', message: "You've hit your session limit", usageResetAt: 7_201_000 });+ await tick();+ const st = await h.storage.get('s1');+ expect(st?.status).toBe('usageLimited');+ expect(st?.usageResetAt).toBe(7_201_000);+ expect(h.session.sends).toHaveLength(1);+ });+it('proactive: a would-be-continue turn flips to usageLimited when the account is limited', async () => {h.setAccountLimit({ limited: true, resetAtMs: 3_601_000 });await startGoal(h);diff --git a/apps/desktop/src/main/goal-host/__tests__/usageLimit.test.ts b/apps/desktop/src/main/goal-host/__tests__/usageLimit.test.tsindex 774dad36bc..889df0ae5e 100644--- a/apps/desktop/src/main/goal-host/__tests__/usageLimit.test.ts+++ b/apps/desktop/src/main/goal-host/__tests__/usageLimit.test.ts@@ -5,6 +5,7 @@ import {OVERLOAD_RESUME_DELAY_MS,classifyTurnOverload,classifyTurnUsageLimit,+ readTurnUsageResetAt,} from '../usageLimit';describe('classifyTurnUsageLimit', () => {@@ -123,3 +124,16 @@ describe('classifyTurnOverload', () => {expect(MAX_CONSECUTIVE_OVERLOAD_TURNS).toBe(3);});});++describe('readTurnUsageResetAt', () => {+ it('reads the reset time carried by the error', () => {+ expect(readTurnUsageResetAt({ sdkError: 'rate_limit', usageResetAt: 1_791_202_800_000 })).toBe(1_791_202_800_000);+ });++ it('returns null when absent or malformed', () => {+ expect(readTurnUsageResetAt({ sdkError: 'rate_limit' })).toBeNull();+ expect(readTurnUsageResetAt({ usageResetAt: '1791202800000' })).toBeNull();+ expect(readTurnUsageResetAt({ usageResetAt: 0 })).toBeNull();+ expect(readTurnUsageResetAt(null)).toBeNull();+ });+});diff --git a/apps/desktop/src/main/goal-host/controller.ts b/apps/desktop/src/main/goal-host/controller.tsindex d275b8fc98..f00e18ca20 100644--- a/apps/desktop/src/main/goal-host/controller.ts+++ b/apps/desktop/src/main/goal-host/controller.ts@@ -27,6 +27,7 @@ import {OVERLOAD_RESUME_DELAY_MS,classifyTurnOverload,classifyTurnUsageLimit,+ readTurnUsageResetAt,} from './usageLimit';import { parseVerdict, type GoalVerdict } from './verdict';import {@@ -1969,12 +1970,18 @@ export class GoalController {let lastReason = decision.lastReason;let shouldFire = decision.shouldFire;let usageResetAt: number | null = null;+ const reportedResetAt =+ outcome.errorKind === 'usage_limit' ? readTurnUsageResetAt(event.data) : null;// 过载改判:上游没容量与账号限流是两种恢复时机。这里用固定短窗口,不去查// getAccountLimit——账号并没有被限流,那个接口不会给出可用的 resetAt,查了只会// 让目标停在 usageLimited 等人手动 resume。if (status === 'usageLimited' && outcome.errorKind === 'overload') {usageResetAt = this.now() + OVERLOAD_RESUME_DELAY_MS;shouldFire = false;+ } else if (status === 'usageLimited' && reportedResetAt != null) {+ // 错误自带重置时刻(Claude 订阅):比账号快照准,直接用。+ usageResetAt = reportedResetAt;+ shouldFire = false;} else if (status === 'usageLimited' || shouldFire) {const limit = this.deps.getAccountLimit? await this.deps.getAccountLimit(state.agentKind).catch(() => null)diff --git a/apps/desktop/src/main/goal-host/usageLimit.ts b/apps/desktop/src/main/goal-host/usageLimit.tsindex 9049525f46..354b2f257e 100644--- a/apps/desktop/src/main/goal-host/usageLimit.ts+++ b/apps/desktop/src/main/goal-host/usageLimit.ts@@ -29,6 +29,17 @@ export function classifyTurnUsageLimit(data: unknown): boolean {return /rate.?limit|usage.?limit|quota|too\s*many\s*requests/i.test(msg);}+/**+ * turn error 自带的限额重置时刻(unix ms)。Claude 订阅会话由 translator 从 SDK+ * `rate_limit_event` 带上 —— 账号快照(getAccountLimit)读不到订阅的 5h / 周窗口,+ * 没有它目标会停在 usageLimited 等人手动恢复。+ */+export function readTurnUsageResetAt(data: unknown): number | null {+ if (!data || typeof data !== 'object') return null;+ const v = (data as { usageResetAt?: unknown }).usageResetAt;+ return typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : null;+}+/*** turn error 的 data 是否表示"上游模型服务没有可用容量"(Codex 的* `Selected model is at capacity` / Anthropic 的 529 overloaded)。diff --git a/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.tsindex 8db000eb5d..e4e777cf23 100644--- a/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts+++ b/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts@@ -392,6 +392,30 @@ describe('Claude Code translator is_error result guard', () => {expect(JSON.stringify(events)).not.toContain('secret-token');});+ it('attaches the rejected rate-limit reset time to limit errors until an allowed event arrives', async () => {+ const ctx = createCtx(new UsageTracker(), 'anthropic');+ const resetsAtSec = Math.floor(Date.now() / 1000) + 3600;+ const limitTurn = async (): Promise<AgentEvent | undefined> => {+ const queue = createAsyncQueue<AgentEvent>();+ translateSdkMessage({ type: 'assistant', error: 'rate_limit',+ message: { content: [{ type: 'text', text: "You've hit your session limit · resets 1:20am" }] } }, queue, ctx);+ translateSdkMessage({ type: 'result', is_error: true, result: "You've hit your session limit · resets 1:20am" }, queue, ctx);+ return (await drain(queue)).find((event) => event.type === 'error');+ };++ translateSdkMessage({ type: 'rate_limit_event',+ rate_limit_info: { status: 'rejected', resetsAt: resetsAtSec, rateLimitType: 'five_hour' } },+ createAsyncQueue<AgentEvent>(), ctx);+ expect((await limitTurn())?.data).toMatchObject({ sdkError: 'rate_limit', usageResetAt: resetsAtSec * 1000 });+ // CLI 已知被拒后本地短路的下一轮不再发事件,仍带同一重置时刻。+ expect((await limitTurn())?.data).toMatchObject({ usageResetAt: resetsAtSec * 1000 });++ translateSdkMessage({ type: 'rate_limit_event',+ rate_limit_info: { status: 'allowed', resetsAt: resetsAtSec, rateLimitType: 'five_hour' } },+ createAsyncQueue<AgentEvent>(), ctx);+ expect((await limitTurn())?.data).not.toHaveProperty('usageResetAt');+ });+it('falls back to reason=turn-failed when is_error carries no result text', async () => {const tracker = new UsageTracker();const queue = createAsyncQueue<AgentEvent>();diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.tsindex 9ed98154b4..690966d2f0 100644--- a/packages/maker-core/src/agents/claude-code/translator.ts+++ b/packages/maker-core/src/agents/claude-code/translator.ts@@ -211,6 +211,12 @@ export interface RuntimeState {toolResultBatchSeq: number;usageSegmentSeq: number;generation: ClaudeGenerationState;+ /**+ * 最近一条 status=rejected 的 `rate_limit_event` 给出的重置时刻(unix ms);+ * 之后任一 allowed 事件清空。会话级而非 turn 级:CLI 已知被拒后会本地短路后续+ * 请求,那些 turn 直接报限额错误、不再重发事件,仍要能带上同一个重置时刻。+ */+ rateLimitRejectedResetAtMs: number | null;}export function newRuntimeState(): RuntimeState {@@ -236,6 +242,7 @@ export function newRuntimeState(): RuntimeState {toolResultBatchSeq: 0,usageSegmentSeq: 0,generation: newClaudeGenerationState(),+ rateLimitRejectedResetAtMs: null,};}@@ -931,6 +938,27 @@ export function translateSdkMessage(return;}+ case 'rate_limit_event': {+ // 订阅额度快照另由 index.ts 旁路转给 host;这里只记被拒窗口的重置时刻,+ // 供限额错误带给下游(目标模式据此到点自动续跑)。+ const info = (rawMsg as {+ rate_limit_info?: { status?: unknown; resetsAt?: unknown; rateLimitType?: unknown };+ }).rate_limit_info;+ if (info?.status === 'rejected') {+ const resetsAt = typeof info.resetsAt === 'number' && info.resetsAt > 0 ? info.resetsAt : null;+ // resetsAt 是 epoch 秒;误给毫秒时不再放大。+ ctx.rt.rateLimitRejectedResetAtMs =+ resetsAt == null ? null : resetsAt > 1e12 ? resetsAt : resetsAt * 1000;+ ctx.log.info('SDK ▷ rate limit rejected', {+ rateLimitType: info.rateLimitType,+ resetAtMs: ctx.rt.rateLimitRejectedResetAtMs,+ });+ } else if (typeof info?.status === 'string') {+ ctx.rt.rateLimitRejectedResetAtMs = null;+ }+ return;+ }+case 'control_response': {// SDK 对每个 control request (setModel / applyFlagSettings / setPermissionMode / interrupt 等)// 都会回一条 control_response。这里只打日志做可见性 —— 排查"我点了切模型怎么没反应"很有用。@@ -2356,6 +2384,10 @@ function handleResult(const errDetail = redactSensitiveText(rawResult);const errorStatus = resultSignals.errorStatus ?? pendingApiError?.errorStatus;const usageLimit = pendingApiError?.usageLimit === true || resultSignals.usageLimit;+ const rejectedResetAt = ctx.rt.rateLimitRejectedResetAtMs;+ const usageReset = rejectedResetAt != null && rejectedResetAt > Date.now()+ ? { usageResetAt: rejectedResetAt }+ : {};const errorMessage = pendingApiError?.agentMeta? pendingApiError.message: errDetail || pendingApiError?.message;@@ -2391,6 +2423,7 @@ function handleResult(...classifiedReason,...(errorStatus !== undefined ? { errorStatus } : {}),...(usageLimit ? { usageLimit: true } : {}),+ ...usageReset,...(pendingApiError.retryAttempt !== undefined? { retryAttempt: pendingApiError.retryAttempt }: {}),@@ -2406,6 +2439,7 @@ function handleResult(...classifiedReason,...(errorStatus !== undefined ? { errorStatus } : {}),...(usageLimit ? { usageLimit: true } : {}),+ ...usageReset,...modelAccessError,}// reason 是稳定 key, renderer 按它走 i18n(规则 18); message 仅作非diff --git a/packages/maker-core/src/types/events.ts b/packages/maker-core/src/types/events.tsindex 2058bd6f73..bb07e997f3 100644--- a/packages/maker-core/src/types/events.ts+++ b/packages/maker-core/src/types/events.ts@@ -69,6 +69,8 @@ export interface AgentErrorEventData {willRetry?: boolean;sdkError?: string;reason?: string;+ /** 账号用量受限时上游给出的重置时刻(unix ms);未知时省略。 */+ usageResetAt?: number;/** Structured details for reason='tool_use_loop_detected'. */toolLoop?: ToolLoopErrorDetails;[key: string]: unknown;