Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(goal): 过期的限额重置时刻只带出一次

Dashf763891f7ec9
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.ts
index 23cdba5adb..258f131cab 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
@@ -433,11 +433,13 @@ describe('Claude Code translator is_error result guard', () => {
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 () => {
+ it('reports a reset time that already passed once, then drops it to avoid an immediate-retry loop', 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 });
+ // 到点后仍被本地短路拒绝、没有新事件:不再带同一个过期时刻。
+ expect((await limitTurn(ctx))?.data).not.toHaveProperty('usageResetAt');
});
});
diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.ts
index 25d41250ac..050b24fa22 100644
--- a/packages/maker-core/src/agents/claude-code/translator.ts
+++ b/packages/maker-core/src/agents/claude-code/translator.ts
@@ -2385,11 +2385,16 @@ function handleResult(
const errorStatus = resultSignals.errorStatus ?? pendingApiError?.errorStatus;
const usageLimit = pendingApiError?.usageLimit === true || resultSignals.usageLimit;
// 多个窗口同时被拒时取最晚的重置,早醒只会再撞一次限额。已过点也照带:
- // 下游按零延迟立即续跑,丢掉反而只能等手动恢复。
+ // 下游按零延迟立即续跑,丢掉反而只能等手动恢复。但过点的只用一次——到点后
+ // 仍被本地短路拒绝时不会有新事件,反复带同一个过期时刻会让下游无限立即重试。
const rejectedResets = [...ctx.rt.rateLimitRejectedResetAtMs.values()];
const usageReset = rejectedResets.length > 0
? { usageResetAt: Math.max(...rejectedResets) }
: {};
+ const nowMs = Date.now();
+ for (const [windowKey, resetAtMs] of ctx.rt.rateLimitRejectedResetAtMs) {
+ if (resetAtMs <= nowMs) ctx.rt.rateLimitRejectedResetAtMs.delete(windowKey);
+ }
const errorMessage = pendingApiError?.agentMeta
? pendingApiError.message
: errDetail || pendingApiError?.message;