Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(usage): keep pauses, retries and compaction out of the live tok/s window
Chris58de18148f06
diff --git a/packages/maker-core/src/agents/claude-code/generation-timing.test.ts b/packages/maker-core/src/agents/claude-code/generation-timing.test.tsindex ed0abf07e1..4ed08da43d 100644--- a/packages/maker-core/src/agents/claude-code/generation-timing.test.ts+++ b/packages/maker-core/src/agents/claude-code/generation-timing.test.ts@@ -2077,6 +2077,28 @@ describe('claude live token speed', () => {expect(ctx.rt.generation.tokenSpeed.snapshot()).toBeUndefined();});+ it('leaves the API retry backoff out of generation time', () => {+ vi.useFakeTimers();+ const ctx = createTranslatorCtx();+ const queue = createAsyncQueue<AgentEvent>();+ const send = (msg: Record<string, unknown>, at: number) => {+ vi.setSystemTime(at);+ translateSdkMessage(msg as never, queue, ctx);+ };+ const stream = (event: Record<string, unknown>, at: number) => send({ type: 'stream_event', event }, at);+ stream({ type: 'message_start', message: { model: 'claude-sonnet-4.5', usage: { input_tokens: 10 } } }, 1_000);+ stream({ type: 'content_block_start', index: 0, content_block: { type: 'text', text: '' } }, 1_000);+ stream({ type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: 'one two three four' } }, 1_500);+ send({ type: 'system', subtype: 'api_retry', attempt: 1, max_retries: 3, retry_delay_ms: 10_000, error_status: 529, error: 'overloaded' }, 1_500);+ // 10s backoff, then the retried request streams again.+ stream({ type: 'message_start', message: { model: 'claude-sonnet-4.5', usage: { input_tokens: 10 } } }, 11_500);+ stream({ type: 'content_block_start', index: 0, content_block: { type: 'text', text: '' } }, 11_500);+ stream({ type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: 'five six seven eight' } }, 12_000);+ expect(ctx.rt.generation.tokenSpeed.snapshot(12_000)).toMatchObject({ tokens: 8, elapsedMs: 1_000 });+ resetClaudeGenerationTiming(ctx.rt.generation);+ queue.end();+ });+it('counts Write tool arguments as generated output', () => {const ctx = createTranslatorCtx();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 3488051308..0ed1cca7d6 100644--- a/packages/maker-core/src/agents/claude-code/translator.ts+++ b/packages/maker-core/src/agents/claude-code/translator.ts@@ -1070,6 +1070,8 @@ function handleSystem(return;}if (msg.subtype === 'api_retry') {+ // The backoff wait is not generation time; the retried request's first block resumes.+ ctx.rt.generation.tokenSpeed.pause();// SDKAPIRetryMessage 明确表示本次 API 失败仍在自动重试,不是 turn 终态。// 除日志外也暂存最后一次 retry 的错误详情,覆盖 SDK 没有额外发送// assistant.error envelope、最终 ResultMessage 又没有 result 文本的路径。diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.tsindex ea94547a48..ed569f0c24 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.ts@@ -2282,6 +2282,32 @@ describe('pi translator live token speed', () => {}});+ it('leaves the retry backoff out of generation time', () => {+ vi.useFakeTimers();+ try {+ const ctx = createPiTranslateContext(noopLogger);+ const { queue, events } = makeQueue();+ const update = (assistantMessageEvent: Record<string, unknown>, at: number) => {+ vi.setSystemTime(at);+ translatePiEvent(ev({ type: 'message_update', assistantMessageEvent }), queue, ctx);+ };+ vi.setSystemTime(1_000);+ translatePiEvent(ev({ type: 'agent_start' }), queue, ctx);+ update({ type: 'text_start', contentIndex: 0 }, 1_000);+ update({ type: 'text_delta', contentIndex: 0, delta: 'one two three four five' }, 1_500);+ vi.setSystemTime(1_500);+ translatePiEvent(ev({ type: 'auto_retry_start', attempt: 1, maxAttempts: 3, errorMessage: 'HTTP status 529: overloaded' }), queue, ctx);+ // 10s backoff, then the retried request streams again.+ update({ type: 'text_start', contentIndex: 0 }, 11_500);+ update({ type: 'text_delta', contentIndex: 0, delta: 'six seven eight nine ten' }, 12_000);+ vi.setSystemTime(12_000);+ translatePiEvent(ev({ type: 'agent_settled' }), queue, ctx);+ expect(speedOf(events.filter((e) => e.type === 'status').at(-1))).toMatchObject({ tokens: 10, elapsedMs: 1_000 });+ } finally {+ vi.useRealTimers();+ }+ });+it('counts file-writing tool arguments and starts each turn fresh', () => {vi.useFakeTimers();try {diff --git a/packages/maker-core/src/agents/pi/translator.ts b/packages/maker-core/src/agents/pi/translator.tsindex 4a98df8398..f953280070 100644--- a/packages/maker-core/src/agents/pi/translator.ts+++ b/packages/maker-core/src/agents/pi/translator.ts@@ -1056,6 +1056,8 @@ export function translatePiEvent(}case 'auto_retry_start': {+ // The backoff wait is not generation time; the retried request's first block resumes.+ ctx.tokenSpeed.pause();// A provider retry may begin without a matching message_end for the// failed request. Drop any stale latch so the next request samples its// own tariff at message_start.diff --git a/packages/maker-core/src/agents/shared/token-speed.test.ts b/packages/maker-core/src/agents/shared/token-speed.test.tsindex cd385845b5..dfc60a0a26 100644--- a/packages/maker-core/src/agents/shared/token-speed.test.ts+++ b/packages/maker-core/src/agents/shared/token-speed.test.ts@@ -94,6 +94,31 @@ describe('TokenSpeedMeter (pi-token-speed algorithm)', () => {expect(meter.snapshot(90_000)!.elapsedMs).toBe(1_500);});+ it('does not credit output from before a short pause to the time after it', () => {+ const meter = new TokenSpeedMeter();+ meter.start(0);+ // 100 tok/s for a second, a 100ms tool call, then 10 tokens over 100ms.+ for (let t = 100; t <= 1_000; t += 100) meter.recordDelta('a b c d e f g h i j', t);+ meter.pause(1_000);+ meter.start(1_100);+ meter.recordDelta('a b c d e f g h i j', 1_200);+ expect(meter.snapshot(1_200)!.rate).toBeCloseTo(100, 5);+ });++ it('keeps measuring from the token before the window across compaction', () => {+ const meter = new TokenSpeedMeter();+ meter.start(0);+ // Two one-token deltas per ms is a steady 2000 tok/s; the stream crosses the+ // compaction threshold while the window's first event is still inside the window.+ let lowest = Infinity;+ for (let t = 1; t <= 8_000; t += 1) {+ meter.recordDelta('a', t);+ meter.recordDelta('a', t);+ if (t >= 1_500) lowest = Math.min(lowest, meter.snapshot(t)!.rate);+ }+ expect(lowest).toBeCloseTo(2_000, 5);+ });+it('snaps to the real output at the end and reports the average', () => {const meter = new TokenSpeedMeter();meter.start(0);diff --git a/packages/maker-core/src/agents/shared/token-speed.ts b/packages/maker-core/src/agents/shared/token-speed.tsindex 357cd9ca92..0010187147 100644--- a/packages/maker-core/src/agents/shared/token-speed.ts+++ b/packages/maker-core/src/agents/shared/token-speed.ts@@ -87,8 +87,9 @@ export class TokenSpeedMeter {this.tokenCount += tokens;this.events.push({ time: now, tokens });if (this.windowStartIndex >= COMPACTION_THRESHOLD) {- this.events.splice(0, this.windowStartIndex);- this.windowStartIndex = 0;+ // Keep the event before the window: it bounds the span of the window's first token.+ this.events.splice(0, this.windowStartIndex - 1);+ this.windowStartIndex = 1;}this.tps = this.windowTps(now) ?? this.tps;if (now - this.lastPublishAt < PUBLISH_INTERVAL_MS) return false;@@ -108,6 +109,8 @@ export class TokenSpeedMeter {this.paused = false;this.pausedMs += now - this.startPause;this.resumedAt = now;+ // Pre-pause output must not count toward the post-pause window, whose span starts here.+ this.windowStartIndex = this.events.length;}/** Turn end. `realOutputTokens` replaces the estimate when the provider reported it. */