Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(agent): ignore native retry progress after cancellation or settlement
zqchrisa4b5d3cc5a71
diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.tsindex dbb3134d9b..a333386e39 100644--- a/packages/maker-core/src/agents/claude-code/translator.ts+++ b/packages/maker-core/src/agents/claude-code/translator.ts@@ -1068,7 +1068,7 @@ function handleSystem(return;}if (msg.subtype === 'api_retry') {- ctx.rt.generation.responseSpeed.beginRetry();+ if (ctx.turn.interruptRequested || !ctx.rt.generation.responseSpeed.beginRetry()) return;queue.push({ type: 'status', data: ccLiveStatus(ctx, 'Working...', true), source: 'claude-code' });// SDKAPIRetryMessage 明确表示本次 API 失败仍在自动重试,不是 turn 终态。// 除日志外也暂存最后一次 retry 的错误详情,覆盖 SDK 没有额外发送diff --git a/packages/maker-core/src/agents/pi/translator.ts b/packages/maker-core/src/agents/pi/translator.tsindex 4d94040da2..c397a0fa17 100644--- a/packages/maker-core/src/agents/pi/translator.ts+++ b/packages/maker-core/src/agents/pi/translator.ts@@ -1067,7 +1067,7 @@ export function translatePiEvent(// own tariff at message_start.ctx.pendingPriceVariants = [];if (isCurrentTurnHostAbortRequested(ctx)) return;- ctx.responseSpeed.beginRetry();+ if (!ctx.responseSpeed.beginRetry()) return;pushStatus(queue, ctx, 'Working…', true);// `(auto-retry N/M)` 只给过载用:mobile / Telegram 把这个后缀当成「模型服务繁忙」。// 网络类改走 `Reconnecting... N/M`,未分类 5xx / LiteLLM in-stream 仍静默。diff --git a/packages/maker-core/src/agents/shared/response-speed-adapters.test.ts b/packages/maker-core/src/agents/shared/response-speed-adapters.test.tsindex 8f20ad7f14..9ffeeba8f5 100644--- a/packages/maker-core/src/agents/shared/response-speed-adapters.test.ts+++ b/packages/maker-core/src/agents/shared/response-speed-adapters.test.ts@@ -124,6 +124,10 @@ it('Pi publishes even an unclassified native retry without adding an error bannetranslatePiEvent({ type: 'message_start', message: { role: 'assistant' } } as PiRpcEvent, queue, ctx);translatePiEvent({ type: 'message_update', assistantMessageEvent: { type: 'text_delta', delta: 'recovered' } } as PiRpcEvent, queue, ctx);expect(usageSnapshotOf(ctx).responseSpeed).toMatchObject({ retrying: false, durationMs: 0 });+ ctx.responseSpeed.finish();+ const settledEvents = events.length;+ translatePiEvent({ type: 'auto_retry_start', attempt: 2, maxAttempts: 3 } as PiRpcEvent, queue, ctx);+ expect(events).toHaveLength(settledEvents);} finally { disposePiTranslateContext(ctx); }});@@ -146,4 +150,9 @@ it('Claude publishes its first native retry without an error banner and excludestranslateSdkMessage({ type: 'stream_event', event: { type: 'content_block_start', content_block: { type: 'text' } } }, queue, ctx);expect(ctx.rt.generation.responseSpeed.snapshot().retrying).not.toBe(true);expect(ctx.rt.generation.responseSpeed.snapshot().durationMs).toBe(0);+ ctx.turn.interruptRequested = true;+ const stoppedEvents = events.length;+ translateSdkMessage({ type: 'system', subtype: 'api_retry', attempt: 2, max_retries: 3,+ retry_delay_ms: 1000, error_status: 529, error: 'overloaded_error' }, queue, ctx);+ expect(events).toHaveLength(stoppedEvents);});diff --git a/packages/maker-core/src/agents/shared/response-speed.ts b/packages/maker-core/src/agents/shared/response-speed.tsindex b58271b30b..f052775a6e 100644--- a/packages/maker-core/src/agents/shared/response-speed.ts+++ b/packages/maker-core/src/agents/shared/response-speed.ts@@ -110,11 +110,12 @@ export class ResponseSpeedTracker {}/** A native retry event proves automatic recovery, even when no error banner is emitted. */- beginRetry(now = Date.now()): void {+ beginRetry(now = Date.now()): boolean {if (this.startedAt === null) this.reset(this.origin, now);- if (this.phase === 'complete') return;+ if (this.phase === 'complete') return false;this.pause(now);this.retrying = this.retryObserved = true;+ return true;}toolStarted(id: string): void { if (id) this.tools.add(id); }