Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(goal): 限额重置时刻按额度窗口记录,已过点也带给下游
Dasha84cc68d2a5e
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 e4e777cf23..23cdba5adb 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,28 +392,53 @@ 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> => {+ describe('rate-limit reset time on limit errors', () => {+ const limitTurn = async (ctx: ReturnType<typeof createCtx>): 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');};+ const rateLimitEvent = (+ ctx: ReturnType<typeof createCtx>,+ status: string,+ rateLimitType: string,+ resetsAt: number,+ ): void => {+ translateSdkMessage({ type: 'rate_limit_event', rate_limit_info: { status, resetsAt, rateLimitType } },+ createAsyncQueue<AgentEvent>(), ctx);+ };++ it('keeps the rejected window reset across turns until that window recovers', async () => {+ const ctx = createCtx(new UsageTracker(), 'anthropic');+ const resetsAtSec = Math.floor(Date.now() / 1000) + 3600;+ rateLimitEvent(ctx, 'rejected', 'five_hour', resetsAtSec);+ expect((await limitTurn(ctx))?.data).toMatchObject({ sdkError: 'rate_limit', usageResetAt: resetsAtSec * 1000 });+ // CLI 已知被拒后本地短路的下一轮不再发事件,仍带同一重置时刻。+ expect((await limitTurn(ctx))?.data).toMatchObject({ usageResetAt: resetsAtSec * 1000 });++ rateLimitEvent(ctx, 'allowed', 'five_hour', resetsAtSec);+ expect((await limitTurn(ctx))?.data).not.toHaveProperty('usageResetAt');+ });- 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('ignores allowed events from other windows and reports the latest rejected reset', async () => {+ const ctx = createCtx(new UsageTracker(), 'anthropic');+ const nowSec = Math.floor(Date.now() / 1000);+ rateLimitEvent(ctx, 'rejected', 'five_hour', nowSec + 3600);+ rateLimitEvent(ctx, 'allowed_warning', 'seven_day', nowSec + 86_400);+ expect((await limitTurn(ctx))?.data).toMatchObject({ usageResetAt: (nowSec + 3600) * 1000 });++ rateLimitEvent(ctx, 'rejected', 'seven_day', nowSec + 86_400);+ expect((await limitTurn(ctx))?.data).toMatchObject({ usageResetAt: (nowSec + 86_400) * 1000 });+ });++ it('still reports a reset time that already passed so the goal resumes immediately', async () => {+ const ctx = createCtx(new UsageTracker(), 'anthropic');+ const pastSec = Math.floor(Date.now() / 1000) - 60;+ rateLimitEvent(ctx, 'rejected', 'five_hour', pastSec);+ expect((await limitTurn(ctx))?.data).toMatchObject({ usageResetAt: pastSec * 1000 });+ });});it('falls back to reason=turn-failed when is_error carries no result text', async () => {diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.tsindex 690966d2f0..25d41250ac 100644--- a/packages/maker-core/src/agents/claude-code/translator.ts+++ b/packages/maker-core/src/agents/claude-code/translator.ts@@ -212,11 +212,12 @@ export interface RuntimeState {usageSegmentSeq: number;generation: ClaudeGenerationState;/**- * 最近一条 status=rejected 的 `rate_limit_event` 给出的重置时刻(unix ms);- * 之后任一 allowed 事件清空。会话级而非 turn 级:CLI 已知被拒后会本地短路后续- * 请求,那些 turn 直接报限额错误、不再重发事件,仍要能带上同一个重置时刻。+ * 被拒额度窗口(`rateLimitType`)→ 重置时刻(unix ms)。每条 `rate_limit_event`+ * 只描述一个窗口,只有同一窗口再报非 rejected 才移除,别的窗口的 allowed 不影响。+ * 会话级而非 turn 级:CLI 已知被拒后会本地短路后续请求,那些 turn 直接报限额+ * 错误、不再重发事件,仍要能带上同一个重置时刻。*/- rateLimitRejectedResetAtMs: number | null;+ rateLimitRejectedResetAtMs: Map<string, number>;}export function newRuntimeState(): RuntimeState {@@ -242,7 +243,7 @@ export function newRuntimeState(): RuntimeState {toolResultBatchSeq: 0,usageSegmentSeq: 0,generation: newClaudeGenerationState(),- rateLimitRejectedResetAtMs: null,+ rateLimitRejectedResetAtMs: new Map(),};}@@ -944,17 +945,16 @@ export function translateSdkMessage(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;+ if (typeof info?.status !== 'string') return;+ const windowKey = typeof info.rateLimitType === 'string' ? info.rateLimitType : '';+ const resetsAt = typeof info.resetsAt === 'number' && info.resetsAt > 0 ? info.resetsAt : null;+ if (info.status === 'rejected' && 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;+ const resetAtMs = resetsAt > 1e12 ? resetsAt : resetsAt * 1000;+ ctx.rt.rateLimitRejectedResetAtMs.set(windowKey, resetAtMs);+ ctx.log.info('SDK ▷ rate limit rejected', { rateLimitType: windowKey, resetAtMs });+ } else if (info.status !== 'rejected') {+ ctx.rt.rateLimitRejectedResetAtMs.delete(windowKey);}return;}@@ -2384,9 +2384,11 @@ 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 rejectedResets = [...ctx.rt.rateLimitRejectedResetAtMs.values()];+ const usageReset = rejectedResets.length > 0+ ? { usageResetAt: Math.max(...rejectedResets) }: {};const errorMessage = pendingApiError?.agentMeta? pendingApiError.message